aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
commit55f64675b42ac8d3c557cc850f78664bee006f6f (patch)
tree2afd26dd3d5e6f763119bc192b57c66a1a075922 /src
parent0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff)
downloadGT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz
GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2
GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src')
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/AutomationSimulator.java148
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/BigintStorage.java18
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java101
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/Reactor.java72
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/SimulationData.java6
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/TaloniusDecoder.java2
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/components/Condensator.java15
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/components/CoolantCell.java15
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/components/Exchanger.java20
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/components/FuelRod.java23
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/components/Plating.java21
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/components/ReactorItem.java134
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/components/Reflector.java15
-rw-r--r--src/main/java/Ic2ExpReactorPlanner/components/Vent.java21
-rw-r--r--src/main/java/gregtech/api/enums/TAE.java16
-rw-r--r--src/main/java/gregtech/api/util/EmptyRecipeMap.java61
-rw-r--r--src/main/java/gregtech/api/util/FishPondFakeRecipe.java35
-rw-r--r--src/main/java/gregtech/api/util/GTPP_Recipe.java1049
-rw-r--r--src/main/java/gregtech/api/util/GasSpargingRecipe.java16
-rw-r--r--src/main/java/gregtech/api/util/GasSpargingRecipeMap.java14
-rw-r--r--src/main/java/gregtech/api/util/HotFuel.java16
-rw-r--r--src/main/java/gregtech/api/util/SemiFluidFuelHandler.java38
-rw-r--r--src/main/java/gregtech/api/util/ThermalFuel.java17
-rw-r--r--src/main/java/gtPlusPlus/GTplusplus.java238
-rw-r--r--src/main/java/gtPlusPlus/GenerateDictionaries.java12
-rw-r--r--src/main/java/gtPlusPlus/RoadMap.java59
-rw-r--r--src/main/java/gtPlusPlus/api/damage/DamageTeslaTower.java3
-rw-r--r--src/main/java/gtPlusPlus/api/enums/Quality.java3
-rw-r--r--src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java63
-rw-r--r--src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java52
-rw-r--r--src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java1
-rw-r--r--src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java3
-rw-r--r--src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java3
-rw-r--r--src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java2
-rw-r--r--src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java14
-rw-r--r--src/main/java/gtPlusPlus/api/interfaces/IPlugin.java5
-rw-r--r--src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java46
-rw-r--r--src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java3
-rw-r--r--src/main/java/gtPlusPlus/api/objects/Logger.java7
-rw-r--r--src/main/java/gtPlusPlus/api/objects/data/AutoMap.java6
-rw-r--r--src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java3
-rw-r--r--src/main/java/gtPlusPlus/api/objects/data/ObjMap.java24
-rw-r--r--src/main/java/gtPlusPlus/api/objects/data/Pair.java3
-rw-r--r--src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java7
-rw-r--r--src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java3
-rw-r--r--src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java4
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java13
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java18
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java81
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java9
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java3
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java8
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java29
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java29
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java7
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java4
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java3
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java5
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java7
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java62
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java4
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java23
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java3
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java3
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java3
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java10
-rw-r--r--src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java125
-rw-r--r--src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java120
-rw-r--r--src/main/java/gtPlusPlus/api/objects/random/XSTR.java142
-rw-r--r--src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java1
-rw-r--r--src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java4
-rw-r--r--src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java5
-rw-r--r--src/main/java/gtPlusPlus/core/block/ModBlocks.java16
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java33
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BasicBlock.java12
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java75
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java39
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java64
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java34
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java83
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/MetaBlock.java5
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java5
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java18
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/BlockNet.java10
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java43
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java110
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/FirePit.java51
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java41
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/HellFire.java239
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/LightGlass.java26
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java87
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java82
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java67
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java54
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java13
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java99
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java27
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java3
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java33
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java23
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java63
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java82
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/EggBox.java76
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/FishTrap.java79
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java34
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java42
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java61
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java79
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java44
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java48
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java144
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java34
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java69
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java40
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java40
-rw-r--r--src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java24
-rw-r--r--src/main/java/gtPlusPlus/core/client/CustomTextureSet.java1
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java19
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java6
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java12
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java26
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java26
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java29
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java8
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java12
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java1146
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java112
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java35
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java5
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java38
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java62
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java14
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java50
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java122
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java25
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java42
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java15
-rw-r--r--src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java13
-rw-r--r--src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java65
-rw-r--r--src/main/java/gtPlusPlus/core/commands/CommandMath.java9
-rw-r--r--src/main/java/gtPlusPlus/core/common/BasePlayer.java81
-rw-r--r--src/main/java/gtPlusPlus/core/common/CommonProxy.java47
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java51
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java3
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java3
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java3
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java3
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java9
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java10
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java5
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java3
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java3
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java3
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java3
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java22
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java15
-rw-r--r--src/main/java/gtPlusPlus/core/config/ConfigHandler.java358
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_BackpackBase.java80
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java48
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java29
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_EggBox.java29
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_FishTrap.java31
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_Grindle.java96
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_HeliumGenerator.java52
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_ModularityTable.java138
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_PestKiller.java35
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java86
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java22
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java46
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_TradeTable.java83
-rw-r--r--src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java49
-rw-r--r--src/main/java/gtPlusPlus/core/container/box/LunchBoxContainer.java10
-rw-r--r--src/main/java/gtPlusPlus/core/container/box/MagicBagContainer.java10
-rw-r--r--src/main/java/gtPlusPlus/core/container/box/ToolBoxContainer.java10
-rw-r--r--src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java15
-rw-r--r--src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java5
-rw-r--r--src/main/java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java26
-rw-r--r--src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java25
-rw-r--r--src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java25
-rw-r--r--src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java84
-rw-r--r--src/main/java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java111
-rw-r--r--src/main/java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java26
-rw-r--r--src/main/java/gtPlusPlus/core/entity/monster/EntityBatKing.java135
-rw-r--r--src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java19
-rw-r--r--src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java40
-rw-r--r--src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java39
-rw-r--r--src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java23
-rw-r--r--src/main/java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java19
-rw-r--r--src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java23
-rw-r--r--src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java29
-rw-r--r--src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java42
-rw-r--r--src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java18
-rw-r--r--src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java16
-rw-r--r--src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java20
-rw-r--r--src/main/java/gtPlusPlus/core/fluids/FluidFactory.java75
-rw-r--r--src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java27
-rw-r--r--src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java33
-rw-r--r--src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java15
-rw-r--r--src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java1
-rw-r--r--src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java1
-rw-r--r--src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java38
-rw-r--r--src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java104
-rw-r--r--src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java59
-rw-r--r--src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java29
-rw-r--r--src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java4
-rw-r--r--src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java4
-rw-r--r--src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java4
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java15
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java15
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java21
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java15
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java15
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java25
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java40
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java17
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java59
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java38
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java18
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java21
-rw-r--r--src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java26
-rw-r--r--src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java46
-rw-r--r--src/main/java/gtPlusPlus/core/handler/AchievementHandler.java193
-rw-r--r--src/main/java/gtPlusPlus/core/handler/BookHandler.java727
-rw-r--r--src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java5
-rw-r--r--src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java31
-rw-r--r--src/main/java/gtPlusPlus/core/handler/GuiHandler.java45
-rw-r--r--src/main/java/gtPlusPlus/core/handler/MobMentality.java10
-rw-r--r--src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java8
-rw-r--r--src/main/java/gtPlusPlus/core/handler/PacketHandler.java26
-rw-r--r--src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java6
-rw-r--r--src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java9
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java117
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java17
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java24
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java50
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java21
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java73
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java10
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java26
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java29
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java3
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/SneakManager.java5
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java39
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java19
-rw-r--r--src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java48
-rw-r--r--src/main/java/gtPlusPlus/core/handler/render/FirepitModel.java24
-rw-r--r--src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java6
-rw-r--r--src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java27
-rw-r--r--src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java2
-rw-r--r--src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java3
-rw-r--r--src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java5
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java15
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java19
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java14
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java40
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java92
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java14
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java18
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java14
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java4
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/box/MagicBagInventory.java4
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java4
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java14
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java20
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java11
-rw-r--r--src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java11
-rw-r--r--src/main/java/gtPlusPlus/core/item/ModItems.java410
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java166
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java15
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java40
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java17
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java39
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java127
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java40
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java28
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java26
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java45
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java31
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java7
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java53
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/CoreItem.java134
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java15
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java19
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java11
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java19
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java31
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java12
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java12
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java27
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java45
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java23
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java19
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java40
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java6
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java40
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java20
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java36
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java20
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java13
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java30
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java52
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java9
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java15
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java39
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java3
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java79
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java17
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java34
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java32
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java80
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java98
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java27
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java9
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java230
-rw-r--r--src/main/java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java44
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java130
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java143
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java658
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java32
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java284
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java42
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java744
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java49
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java57
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java17
-rw-r--r--src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java72
-rw-r--r--src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java21
-rw-r--r--src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java21
-rw-r--r--src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/effects/RarityRare.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java108
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java16
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java27
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/BufferCore.java39
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java26
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java21
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java66
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java119
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java26
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemEmpty.java3
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java31
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java31
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java76
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java18
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java122
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java12
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java43
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java35
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java23
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java102
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java41
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java40
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java32
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java32
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java45
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java40
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java68
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java9
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java9
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java32
-rw-r--r--src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java79
-rw-r--r--src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java22
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java29
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java26
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java339
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java15
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java8
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java23
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java119
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java12
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java5
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java6
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java89
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java26
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java77
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java137
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java99
-rw-r--r--src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java13
-rw-r--r--src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java22
-rw-r--r--src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java30
-rw-r--r--src/main/java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java8
-rw-r--r--src/main/java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java21
-rw-r--r--src/main/java/gtPlusPlus/core/lib/CORE.java102
-rw-r--r--src/main/java/gtPlusPlus/core/lib/LoadedMods.java7
-rw-r--r--src/main/java/gtPlusPlus/core/lib/VanillaColours.java4
-rw-r--r--src/main/java/gtPlusPlus/core/material/ALLOY.java635
-rw-r--r--src/main/java/gtPlusPlus/core/material/ELEMENT.java294
-rw-r--r--src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java88
-rw-r--r--src/main/java/gtPlusPlus/core/material/Material.java449
-rw-r--r--src/main/java/gtPlusPlus/core/material/MaterialGenerator.java93
-rw-r--r--src/main/java/gtPlusPlus/core/material/MaterialStack.java12
-rw-r--r--src/main/java/gtPlusPlus/core/material/NONMATERIAL.java8
-rw-r--r--src/main/java/gtPlusPlus/core/material/ORES.java630
-rw-r--r--src/main/java/gtPlusPlus/core/material/Particle.java21
-rw-r--r--src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java94
-rw-r--r--src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java116
-rw-r--r--src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java153
-rw-r--r--src/main/java/gtPlusPlus/core/material/state/MaterialState.java2
-rw-r--r--src/main/java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java3
-rw-r--r--src/main/java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java6
-rw-r--r--src/main/java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java3
-rw-r--r--src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java7
-rw-r--r--src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java7
-rw-r--r--src/main/java/gtPlusPlus/core/players/FakeFarmer.java15
-rw-r--r--src/main/java/gtPlusPlus/core/proxy/ClientProxy.java88
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java55
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java33
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java31
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java1531
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java290
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java240
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java14
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java3
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java2131
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java324
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java43
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java171
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java3
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java7
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java3
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java17
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/common/CI.java291
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java10
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java5
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotCrafting.java36
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java56
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotDataStick.java5
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotFrame.java3
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java5
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotGtTool.java5
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java15
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java10
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java4
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java5
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java5
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java3
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java16
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotOutput.java27
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotRTG.java3
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotToolBox.java23
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java3
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java4
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java144
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java238
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java1436
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java14
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java33
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java33
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java1
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java91
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java9
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java13
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java13
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java64
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java30
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java33
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java73
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java22
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java34
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java74
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java37
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java9
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java272
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java35
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java7
-rw-r--r--src/main/java/gtPlusPlus/core/util/MovingAverageLong.java3
-rw-r--r--src/main/java/gtPlusPlus/core/util/Utils.java224
-rw-r--r--src/main/java/gtPlusPlus/core/util/data/AES.java4
-rw-r--r--src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java16
-rw-r--r--src/main/java/gtPlusPlus/core/util/data/EnumUtils.java9
-rw-r--r--src/main/java/gtPlusPlus/core/util/data/FileUtils.java14
-rw-r--r--src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java19
-rw-r--r--src/main/java/gtPlusPlus/core/util/data/StringUtils.java5
-rw-r--r--src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java14
-rw-r--r--src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java12
-rw-r--r--src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java138
-rw-r--r--src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java24
-rw-r--r--src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java32
-rw-r--r--src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java2323
-rw-r--r--src/main/java/gtPlusPlus/core/util/math/MathUtils.java136
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java3
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java12
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java193
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java274
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/FoodUtils.java3
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java87
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java35
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java277
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java27
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java205
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java63
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java9
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java90
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java1
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java31
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java295
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java4
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java10
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java291
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java3
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java8
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java3
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java36
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java18
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java14
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java3
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java11
-rw-r--r--src/main/java/gtPlusPlus/core/util/player/PlayerCache.java40
-rw-r--r--src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java158
-rw-r--r--src/main/java/gtPlusPlus/core/util/reflect/ProxyFinder.java3
-rw-r--r--src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java134
-rw-r--r--src/main/java/gtPlusPlus/core/util/sys/KeyboardUtils.java5
-rw-r--r--src/main/java/gtPlusPlus/core/util/sys/Log.java1
-rw-r--r--src/main/java/gtPlusPlus/core/util/sys/SystemUtils.java4
-rw-r--r--src/main/java/gtPlusPlus/core/world/explosions/ExplosionHandler.java22
-rw-r--r--src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java64
-rw-r--r--src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java71
-rw-r--r--src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java44
-rw-r--r--src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java25
-rw-r--r--src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java4
-rw-r--r--src/main/java/gtPlusPlus/everglades/biome/GenLayerEverglades.java2
-rw-r--r--src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java3
-rw-r--r--src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java10
-rw-r--r--src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java5
-rw-r--r--src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java41
-rw-r--r--src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java93
-rw-r--r--src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java21
-rw-r--r--src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java1011
-rw-r--r--src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java7
-rw-r--r--src/main/java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java1
-rw-r--r--src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java20
-rw-r--r--src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java31
-rw-r--r--src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java317
-rw-r--r--src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java401
-rw-r--r--src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java205
-rw-r--r--src/main/java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java4
-rw-r--r--src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java45
-rw-r--r--src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java12
-rw-r--r--src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java1
-rw-r--r--src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java1
-rw-r--r--src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java55
-rw-r--r--src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java43
-rw-r--r--src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java9
-rw-r--r--src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java44
-rw-r--r--src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java286
-rw-r--r--src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java12
-rw-r--r--src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java42
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java10
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java716
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java3
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java54
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java8
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java57
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java22
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java15
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java3
-rw-r--r--src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java13
-rw-r--r--src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java19
-rw-r--r--src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java14
-rw-r--r--src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java6
-rw-r--r--src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java27
-rw-r--r--src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java35
-rw-r--r--src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java15
-rw-r--r--src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java32
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java15
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/NameLists.java10718
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java31
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java14
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/VillagerUtils.java10
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java14
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java13
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java52
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java4
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java20
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java4
-rw-r--r--src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java27
-rw-r--r--src/main/java/gtPlusPlus/preloader/CORE_Preloader.java3
-rw-r--r--src/main/java/gtPlusPlus/preloader/ChunkDebugger.java20
-rw-r--r--src/main/java/gtPlusPlus/preloader/CustomClassLoader.java1
-rw-r--r--src/main/java/gtPlusPlus/preloader/DevHelper.java811
-rw-r--r--src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java30
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java14
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java27
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java13
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java38
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java3
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java55
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java165
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java164
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java41
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java164
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java47
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java45
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java15
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java152
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java25
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java15
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java11
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java61
-rw-r--r--src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java62
-rw-r--r--src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java29
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java70
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java60
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java29
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java30
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java20
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java23
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java23
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java20
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java98
-rw-r--r--src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java48
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java39
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java91
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java800
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java49
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java22
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java50
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java23
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java56
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java40
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java20
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java32
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java129
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java52
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java23
-rw-r--r--src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java22
-rw-r--r--src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java25
-rw-r--r--src/main/java/gtPlusPlus/xmod/goodgenerator/GG_Utils.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java164
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java65
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java92
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java37
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java33
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java1853
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java41
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java75
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java180
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/DataStickSlotWidget.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java808
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java45
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java19
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java50
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java60
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java69
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java207
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java58
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java267
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java167
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java91
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java74
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java192
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java160
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java30
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java20
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java104
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java329
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java49
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java37
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java54
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java104
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java67
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java78
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java320
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java108
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java48
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java49
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java66
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java52
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java56
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java46
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java52
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java78
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java46
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java77
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java44
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java186
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java159
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java68
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java42
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java24
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java164
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java260
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java32
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java38
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java66
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java342
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java28
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java76
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java1311
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java139
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java227
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java180
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java70
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java164
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java126
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java61
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java145
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java20
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java30
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java90
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java44
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java206
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java19
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java76
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java324
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java41
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java119
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java211
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java25
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java74
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java21
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java47
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java31
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java32
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java24
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java50
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java50
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java51
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java70
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java113
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java149
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java58
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java654
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java171
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_ComputerCube_Setup.java76
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_Computercube_Description.java754
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_Computercube_Simulator.java72
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java158
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java103
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java56
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java57
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java152
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java37
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java230
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java24
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java54
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java107
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java49
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java1534
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java64
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java54
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java86
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java44
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java73
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java127
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java184
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java295
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java640
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java179
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java161
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java55
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java19
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java19
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java19
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java78
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java192
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java79
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java92
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java88
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java75
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java175
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java141
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java17
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java19
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java19
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java86
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java237
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java95
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java315
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java171
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java113
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java133
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java159
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java179
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java86
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java72
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java44
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java186
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java187
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java188
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java47
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java36
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java202
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java89
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java118
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java111
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java113
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java54
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java81
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java67
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java55
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java103
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java49
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java52
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java66
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java63
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java89
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java58
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java70
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java125
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java55
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java73
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java329
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java38
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java86
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java88
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java81
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java280
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java113
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java115
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java201
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java137
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java130
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java70
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java228
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java31
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java41
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java41
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java265
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java63
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java301
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java254
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java87
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java623
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java444
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java201
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java205
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java198
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java76
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java164
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java226
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java111
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java112
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java74
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java189
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java719
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java61
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java597
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java126
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java51
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java51
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java68
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java202
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java517
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java25
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java63
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java35
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java33
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java333
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java850
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java306
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java1035
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java126
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java37
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java109
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java360
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java93
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java33
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java480
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java155
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java119
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java63
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java229
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java46
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java17
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java98
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java17
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java99
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java86
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java41
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java76
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java43
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java41
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java28
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java137
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java73
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java63
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java54
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java47
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java165
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java76
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java110
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java94
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java297
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java93
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java129
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java54
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java17
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java270
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java133
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java131
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java148
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java32
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java23
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java538
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java168
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java88
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java249
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java229
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java1498
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java33
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java131
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java131
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java71
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java55
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java160
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java19
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java220
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java310
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java1069
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java152
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java218
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java192
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java24
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java76
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java105
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java434
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java66
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java36
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java50
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java67
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java98
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java110
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java34
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java238
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java181
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java20
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java55
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java17
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java101
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java175
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java57
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java256
-rw-r--r--src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java68
-rw-r--r--src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java98
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java20
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java31
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java42
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java39
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java67
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java65
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java78
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java33
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java33
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java112
-rw-r--r--src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java61
-rw-r--r--src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java31
-rw-r--r--src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java106
-rw-r--r--src/main/java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java30
-rw-r--r--src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java35
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java101
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java29
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java69
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java21
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java169
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java57
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java91
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java34
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java52
-rw-r--r--src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java35
-rw-r--r--src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java147
-rw-r--r--src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java26
-rw-r--r--src/main/java/vswe/stevescarts/ModuleData/GppModuleData.java22
1134 files changed, 42207 insertions, 62984 deletions
diff --git a/src/main/java/Ic2ExpReactorPlanner/AutomationSimulator.java b/src/main/java/Ic2ExpReactorPlanner/AutomationSimulator.java
index e83e46ce59..45c1f5bdf5 100644
--- a/src/main/java/Ic2ExpReactorPlanner/AutomationSimulator.java
+++ b/src/main/java/Ic2ExpReactorPlanner/AutomationSimulator.java
@@ -1,12 +1,13 @@
package Ic2ExpReactorPlanner;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
import Ic2ExpReactorPlanner.components.ReactorItem;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.common.tileentities.misc.GT_TileEntity_ComputerCube;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
/**
*
@@ -85,8 +86,8 @@ public class AutomationSimulator {
return null;
}
- public AutomationSimulator(
- final Reactor reactor, final ArrayList<String> output2, final GT_TileEntity_ComputerCube aTile) {
+ public AutomationSimulator(final Reactor reactor, final ArrayList<String> output2,
+ final GT_TileEntity_ComputerCube aTile) {
this.reactor = reactor;
this.output = output2;
this.mReactor = aTile;
@@ -208,9 +209,8 @@ public class AutomationSimulator {
if (active) {
activeTime++;
currentActiveTime++;
- if (reactor.isPulsed()
- && (reactor.getCurrentHeat() >= suspendTemp
- || (reactorTicks % clockPeriod) >= onPulseDuration)) {
+ if (reactor.isPulsed() && (reactor.getCurrentHeat() >= suspendTemp
+ || (reactorTicks % clockPeriod) >= onPulseDuration)) {
active = false;
minActiveTime = Math.min(currentActiveTime, minActiveTime);
maxActiveTime = Math.max(currentActiveTime, maxActiveTime);
@@ -221,14 +221,13 @@ public class AutomationSimulator {
currentInactiveTime++;
if (reactor.isAutomated() && pauseTimer > 0) {
pauseTimer--;
- } else if ((reactor.isPulsed()
- && reactor.getCurrentHeat() <= resumeTemp
+ } else if ((reactor.isPulsed() && reactor.getCurrentHeat() <= resumeTemp
&& (reactorTicks % clockPeriod) < onPulseDuration)) {
- active = true;
- minInactiveTime = Math.min(currentInactiveTime, minInactiveTime);
- maxInactiveTime = Math.max(currentInactiveTime, maxInactiveTime);
- currentInactiveTime = 0;
- }
+ active = true;
+ minInactiveTime = Math.min(currentInactiveTime, minInactiveTime);
+ maxInactiveTime = Math.max(currentInactiveTime, maxInactiveTime);
+ currentInactiveTime = 0;
+ }
}
}
minEUoutput = Math.min(lastEUoutput, minEUoutput);
@@ -405,8 +404,10 @@ public class AutomationSimulator {
ReactorItem component = reactor.getComponentAt(row, col);
if (component != null) {
if (component.getVentCoolingCapacity() > 0) {
- component.info.append("ComponentInfo.UsedCooling " + component.getBestVentCooling() + " | "
- + component.getVentCoolingCapacity());
+ component.info.append(
+ "ComponentInfo.UsedCooling " + component.getBestVentCooling()
+ + " | "
+ + component.getVentCoolingCapacity());
totalEffectiveVentCooling += component.getBestVentCooling();
totalVentCoolingCapacity += component.getVentCoolingCapacity();
} else if (component.getBestCellCooling() > 0) {
@@ -417,15 +418,21 @@ public class AutomationSimulator {
totalCondensatorCooling += component.getBestCondensatorCooling();
} else if (component.getMaxHeatGenerated() > 0) {
if (!reactor.isFluid() && component.getMaxEUGenerated() > 0) {
- component.info.append("ComponentInfo.GeneratedEU " + component.getMinEUGenerated() + " | "
- + component.getMaxEUGenerated());
+ component.info.append(
+ "ComponentInfo.GeneratedEU " + component.getMinEUGenerated()
+ + " | "
+ + component.getMaxEUGenerated());
}
- component.info.append("ComponentInfo.GeneratedHeat " + component.getMinHeatGenerated() + " | "
- + component.getMaxHeatGenerated());
+ component.info.append(
+ "ComponentInfo.GeneratedHeat " + component.getMinHeatGenerated()
+ + " | "
+ + component.getMaxHeatGenerated());
}
if (component.getMaxReachedHeat() > 0) {
- component.info.append("ComponentInfo.ReachedHeat " + component.getMaxReachedHeat() + " | "
- + component.getMaxHeat());
+ component.info.append(
+ "ComponentInfo.ReachedHeat " + component.getMaxReachedHeat()
+ + " | "
+ + component.getMaxHeat());
}
}
}
@@ -464,15 +471,11 @@ public class AutomationSimulator {
// }
// return null;
- /* catch (Throwable e) {
- if (cooldownTicks == 0) {
- publish("Simulation.ErrorReactor", reactorTicks);
- } else {
- publish("Simulation.ErrorCooldown", cooldownTicks);
- }
- publish(e.toString(), " ", Arrays.toString(e.getStackTrace()); // NO18N
-
- }*/
+ /*
+ * catch (Throwable e) { if (cooldownTicks == 0) { publish("Simulation.ErrorReactor", reactorTicks); } else {
+ * publish("Simulation.ErrorCooldown", cooldownTicks); } publish(e.toString(), " ",
+ * Arrays.toString(e.getStackTrace()); // NO18N }
+ */
data.explosionPower = (int) explosionPower;
data.totalReactorTicks = reactorTicks;
long endTime = System.nanoTime();
@@ -508,29 +511,28 @@ public class AutomationSimulator {
}
} else if (component.getAutomationThreshold() < component.getInitialHeat()
&& component.getCurrentHeat() <= component.getAutomationThreshold()) {
- component.clearCurrentHeat();
- component.info.append("ComponentInfo.ReplacedTime | " + reactorTicks);
- if (component.getReactorPause() > 0) {
- active = false;
- pauseTimer = Math.max(pauseTimer, component.getReactorPause());
- minActiveTime = Math.min(currentActiveTime, minActiveTime);
- maxActiveTime = Math.max(currentActiveTime, maxActiveTime);
- currentActiveTime = 0;
+ component.clearCurrentHeat();
+ component.info.append("ComponentInfo.ReplacedTime | " + reactorTicks);
+ if (component.getReactorPause() > 0) {
+ active = false;
+ pauseTimer = Math.max(pauseTimer, component.getReactorPause());
+ minActiveTime = Math.min(currentActiveTime, minActiveTime);
+ maxActiveTime = Math.max(currentActiveTime, maxActiveTime);
+ currentActiveTime = 0;
+ }
+ }
+ } else if (component.isBroken() || (component.getMaxDamage() > 1
+ && component.getCurrentDamage() >= component.getAutomationThreshold())) {
+ component.clearDamage();
+ component.info.append("ComponentInfo.ReplacedTime | " + reactorTicks);
+ if (component.getReactorPause() > 0) {
+ active = false;
+ pauseTimer = Math.max(pauseTimer, component.getReactorPause());
+ minActiveTime = Math.min(currentActiveTime, minActiveTime);
+ maxActiveTime = Math.max(currentActiveTime, maxActiveTime);
+ currentActiveTime = 0;
+ }
}
- }
- } else if (component.isBroken()
- || (component.getMaxDamage() > 1
- && component.getCurrentDamage() >= component.getAutomationThreshold())) {
- component.clearDamage();
- component.info.append("ComponentInfo.ReplacedTime | " + reactorTicks);
- if (component.getReactorPause() > 0) {
- active = false;
- pauseTimer = Math.max(pauseTimer, component.getReactorPause());
- minActiveTime = Math.min(currentActiveTime, minActiveTime);
- maxActiveTime = Math.max(currentActiveTime, maxActiveTime);
- currentActiveTime = 0;
- }
- }
}
if (reactor.isUsingReactorCoolantInjectors() && component != null && component.needsCoolantInjected()) {
component.injectCoolant();
@@ -668,34 +670,16 @@ public class AutomationSimulator {
protected void process(List<String> chunks) {
/*
- for (String chunk : chunks) {
- if (chunk.isEmpty()) {
- output.add(""); // NO18N
- }
- else {
- if (chunk.matches("R\\dC\\d:.*")) { // NO18N
- String temp = chunk.substring(5);
- int row = chunk.charAt(1) - '0';
- int col = chunk.charAt(3) - '0';
- if (temp.startsWith("0x")) { // NO18N
- mReactorComponents[row][col].setBackground(Color.decode(temp));
- if ("0xC0C0C0".equals(temp)) {
- mReactorComponents[row][col].setToolTipText(null);
- }
- else if ("0xFF0000".equals(temp)) {
- mReactorComponents[row][col].setToolTipText(getI18n("ComponentTooltip.Broken"));
- }
- else if ("0xFFA500".equals(temp)) {
- mReactorComponents[row][col].setToolTipText(getI18n("ComponentTooltip.ResidualHeat"));
- }
- }
- }
- else {
- output.add(chunk);
- }
- }
- }
- */
+ * for (String chunk : chunks) { if (chunk.isEmpty()) { output.add(""); // NO18N } else { if
+ * (chunk.matches("R\\dC\\d:.*")) { // NO18N String temp = chunk.substring(5); int row = chunk.charAt(1) - '0';
+ * int col = chunk.charAt(3) - '0'; if (temp.startsWith("0x")) { // NO18N
+ * mReactorComponents[row][col].setBackground(Color.decode(temp)); if ("0xC0C0C0".equals(temp)) {
+ * mReactorComponents[row][col].setToolTipText(null); } else if ("0xFF0000".equals(temp)) {
+ * mReactorComponents[row][col].setToolTipText(getI18n("ComponentTooltip.Broken")); } else if
+ * ("0xFFA500".equals(temp)) {
+ * mReactorComponents[row][col].setToolTipText(getI18n("ComponentTooltip.ResidualHeat")); } } } else {
+ * output.add(chunk); } } }
+ */
}
public void cancel() {
diff --git a/src/main/java/Ic2ExpReactorPlanner/BigintStorage.java b/src/main/java/Ic2ExpReactorPlanner/BigintStorage.java
index b9ca1760c6..d9d4d62c3c 100644
--- a/src/main/java/Ic2ExpReactorPlanner/BigintStorage.java
+++ b/src/main/java/Ic2ExpReactorPlanner/BigintStorage.java
@@ -4,20 +4,21 @@ import java.math.BigInteger;
import java.util.Base64;
/**
- * Stores numbers of varying size inside a BigInteger, expecting each to have
- * a defined limit (which need not be an exact power of 2). Numbers are to be
- * extracted in reverse order they were stored, and special values can be used
- * to make certain values optional for inclusion (the calling class is
- * responsible for handling this logic, though).
+ * Stores numbers of varying size inside a BigInteger, expecting each to have a defined limit (which need not be an
+ * exact power of 2). Numbers are to be extracted in reverse order they were stored, and special values can be used to
+ * make certain values optional for inclusion (the calling class is responsible for handling this logic, though).
+ *
* @author Brian McCloud
*/
public class BigintStorage {
+
private BigInteger storedValue = BigInteger.ZERO;
/**
- * Stores the specified value. Requires that 0 &lt;= value &lt;= max.
+ * Stores the specified value. Requires that 0 &lt;= value &lt;= max.
+ *
* @param value the value to store.
- * @param max the expected maximum for the value.
+ * @param max the expected maximum for the value.
*/
public void store(int value, int max) {
if (value < 0 || value > max) {
@@ -28,6 +29,7 @@ public class BigintStorage {
/**
* Extracts a value based on the specified maximum.
+ *
* @param max the expected maximum for the value.
* @return the extracted value.
*/
@@ -39,6 +41,7 @@ public class BigintStorage {
/**
* Takes input of a Base64 string, and converts it to a BigintStorage.
+ *
* @param code the Base64-encoded string (presumed to be from @outputBase64)
* @return the converted storage object.
*/
@@ -51,6 +54,7 @@ public class BigintStorage {
/**
* Outputs the current value of this BigintStorage as a Base64-encoded string.
+ *
* @return the Base64-encoded string.
*/
public String outputBase64() {
diff --git a/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java b/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java
index 865c3d7c41..6b35efd47b 100644
--- a/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java
+++ b/src/main/java/Ic2ExpReactorPlanner/ComponentFactory.java
@@ -1,10 +1,14 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import Ic2ExpReactorPlanner.components.Condensator;
import Ic2ExpReactorPlanner.components.CoolantCell;
import Ic2ExpReactorPlanner.components.Exchanger;
@@ -22,21 +26,18 @@ import gtPlusPlus.xmod.bartworks.BW_Utils;
import gtPlusPlus.xmod.bartworks.BW_Utils.NonMeta_MaterialItem;
import gtPlusPlus.xmod.goodgenerator.GG_Utils;
import gtPlusPlus.xmod.goodgenerator.GG_Utils.GG_Fuel_Rod;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
/**
* Factory class to handle creating components by id or name.
+ *
* @author Brian McCloud
*/
public class ComponentFactory {
public static int MAX_COMPONENT_ID = 64;
- static ItemList[] aGtItems =
- new ItemList[] {ItemList.Neutron_Reflector, ItemList.Moxcell_1, ItemList.Moxcell_2, ItemList.Moxcell_4};
+ static ItemList[] aGtItems = new ItemList[] { ItemList.Neutron_Reflector, ItemList.Moxcell_1, ItemList.Moxcell_2,
+ ItemList.Moxcell_4 };
private ComponentFactory() {
// do nothing, this class should not be instantiated.
@@ -52,8 +53,7 @@ public class ComponentFactory {
new FuelRod(
1,
"fuelRodUranium",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorUraniumSimple", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorUraniumSimple", 1).copy()),
20e3,
1,
null,
@@ -66,8 +66,7 @@ public class ComponentFactory {
new FuelRod(
2,
"dualFuelRodUranium",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorUraniumDual", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorUraniumDual", 1).copy()),
20e3,
1,
null,
@@ -80,8 +79,7 @@ public class ComponentFactory {
new FuelRod(
3,
"quadFuelRodUranium",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorUraniumQuad", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorUraniumQuad", 1).copy()),
20e3,
1,
null,
@@ -92,7 +90,16 @@ public class ComponentFactory {
ITEM_LIST.put(
aID++,
new FuelRod(
- 4, "fuelRodMox", new GT_ItemStack(aGtItems[1].get(1).copy()), 10e3, 1, null, 100, 2, 1, true));
+ 4,
+ "fuelRodMox",
+ new GT_ItemStack(aGtItems[1].get(1).copy()),
+ 10e3,
+ 1,
+ null,
+ 100,
+ 2,
+ 1,
+ true));
ITEM_LIST.put(
aID++,
new FuelRod(
@@ -124,8 +131,7 @@ public class ComponentFactory {
new Reflector(
7,
"neutronReflector",
- new GT_ItemStack(
- GT_ModHandler.getIC2Item("reactorReflector", 1).copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorReflector", 1).copy()),
30e3,
1,
null));
@@ -134,8 +140,7 @@ public class ComponentFactory {
new Reflector(
8,
"thickNeutronReflector",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorReflectorThick", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorReflectorThick", 1).copy()),
120e3,
1,
null));
@@ -144,8 +149,7 @@ public class ComponentFactory {
new Vent(
9,
"heatVent",
- new GT_ItemStack(
- GT_ModHandler.getIC2Item("reactorVent", 1).copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorVent", 1).copy()),
1,
1000,
null,
@@ -157,8 +161,7 @@ public class ComponentFactory {
new Vent(
10,
"advancedHeatVent",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorVentDiamond", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorVentDiamond", 1).copy()),
1,
1000,
null,
@@ -170,8 +173,7 @@ public class ComponentFactory {
new Vent(
11,
"reactorHeatVent",
- new GT_ItemStack(
- GT_ModHandler.getIC2Item("reactorVentCore", 1).copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorVentCore", 1).copy()),
1,
1000,
null,
@@ -183,8 +185,7 @@ public class ComponentFactory {
new Vent(
12,
"componentHeatVent",
- new GT_ItemStack(
- GT_ModHandler.getIC2Item("reactorVentSpread", 1).copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorVentSpread", 1).copy()),
1,
1,
null,
@@ -196,8 +197,7 @@ public class ComponentFactory {
new Vent(
13,
"overclockedHeatVent",
- new GT_ItemStack(
- GT_ModHandler.getIC2Item("reactorVentGold", 1).copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorVentGold", 1).copy()),
1,
1000,
null,
@@ -209,8 +209,7 @@ public class ComponentFactory {
new CoolantCell(
14,
"coolantCell10k",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorCoolantSimple", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorCoolantSimple", 1).copy()),
1,
10e3,
null));
@@ -219,8 +218,7 @@ public class ComponentFactory {
new CoolantCell(
15,
"coolantCell30k",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorCoolantTriple", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorCoolantTriple", 1).copy()),
1,
30e3,
null));
@@ -229,8 +227,7 @@ public class ComponentFactory {
new CoolantCell(
16,
"coolantCell60k",
- new GT_ItemStack(
- GT_ModHandler.getIC2Item("reactorCoolantSix", 1).copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorCoolantSix", 1).copy()),
1,
60e3,
null));
@@ -239,8 +236,7 @@ public class ComponentFactory {
new Exchanger(
17,
"heatExchanger",
- new GT_ItemStack(
- GT_ModHandler.getIC2Item("reactorHeatSwitch", 1).copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorHeatSwitch", 1).copy()),
1,
2500,
null,
@@ -251,8 +247,7 @@ public class ComponentFactory {
new Exchanger(
18,
"advancedHeatExchanger",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1).copy()),
1,
10e3,
null,
@@ -263,8 +258,7 @@ public class ComponentFactory {
new Exchanger(
19,
"coreHeatExchanger",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorHeatSwitchCore", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorHeatSwitchCore", 1).copy()),
1,
5000,
null,
@@ -275,8 +269,7 @@ public class ComponentFactory {
new Exchanger(
20,
"componentHeatExchanger",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorHeatSwitchSpread", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorHeatSwitchSpread", 1).copy()),
1,
5000,
null,
@@ -287,8 +280,7 @@ public class ComponentFactory {
new Plating(
21,
"reactorPlating",
- new GT_ItemStack(
- GT_ModHandler.getIC2Item("reactorPlating", 1).copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorPlating", 1).copy()),
1,
1,
null,
@@ -299,8 +291,7 @@ public class ComponentFactory {
new Plating(
22,
"heatCapacityReactorPlating",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorPlatingHeat", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorPlatingHeat", 1).copy()),
1,
1,
null,
@@ -311,8 +302,7 @@ public class ComponentFactory {
new Plating(
23,
"containmentReactorPlating",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorPlatingExplosive", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorPlatingExplosive", 1).copy()),
1,
1,
null,
@@ -323,8 +313,7 @@ public class ComponentFactory {
new Condensator(
24,
"rshCondensator",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorCondensator", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorCondensator", 1).copy()),
1,
20e3,
null));
@@ -333,8 +322,7 @@ public class ComponentFactory {
new Condensator(
25,
"lzhCondensator",
- new GT_ItemStack(GT_ModHandler.getIC2Item("reactorCondensatorLap", 1)
- .copy()),
+ new GT_ItemStack(GT_ModHandler.getIC2Item("reactorCondensatorLap", 1).copy()),
1,
100e3,
null));
@@ -784,6 +772,7 @@ public class ComponentFactory {
/**
* Gets a default instances of the specified component (such as for drawing button images)
+ *
* @param id the id of the component.
* @return the component with the specified id, or null if the id is out of range.
*/
@@ -798,6 +787,7 @@ public class ComponentFactory {
/**
* Gets a default instances of the specified component (such as for drawing button images)
+ *
* @param name the name of the component.
* @return the component with the specified name, or null if the name is not found.
*/
@@ -810,6 +800,7 @@ public class ComponentFactory {
/**
* Creates a new instance of the specified component.
+ *
* @param id the id of the component to create.
* @return a new instance of the specified component, or null if the id is out of range.
*/
@@ -824,6 +815,7 @@ public class ComponentFactory {
/**
* Creates a new instance of the specified component.
+ *
* @param name the name of the component to create.
* @return a new instance of the specified component, or null if the name is not found.
*/
@@ -836,6 +828,7 @@ public class ComponentFactory {
/**
* Get the number of defined components.
+ *
* @return the number of defined components.
*/
public static int getComponentCount() {
diff --git a/src/main/java/Ic2ExpReactorPlanner/Reactor.java b/src/main/java/Ic2ExpReactorPlanner/Reactor.java
index 6dfc379b8d..cbfd549552 100644
--- a/src/main/java/Ic2ExpReactorPlanner/Reactor.java
+++ b/src/main/java/Ic2ExpReactorPlanner/Reactor.java
@@ -1,16 +1,17 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner;
-import Ic2ExpReactorPlanner.components.ReactorItem;
import java.awt.HeadlessException;
import java.util.ArrayList;
+import Ic2ExpReactorPlanner.components.ReactorItem;
+
/**
* Represents an IndustrialCraft2 Nuclear Reactor.
+ *
* @author Brian McCloud
*/
public class Reactor {
@@ -106,6 +107,7 @@ public class Reactor {
/**
* Adjust the maximum heat
+ *
* @param adjustment the adjustment amount (negative values decrease the max heat).
*/
public void adjustMaxHeat(final double adjustment) {
@@ -113,7 +115,9 @@ public class Reactor {
}
/**
- * Set the current heat of the reactor. Mainly to be used for simulating a pre-heated reactor, or for resetting to 0 for a new simulation.
+ * Set the current heat of the reactor. Mainly to be used for simulating a pre-heated reactor, or for resetting to 0
+ * for a new simulation.
+ *
* @param currentHeat the heat to set
*/
public void setCurrentHeat(final double currentHeat) {
@@ -122,6 +126,7 @@ public class Reactor {
/**
* Adjusts the reactor's current heat by a specified amount
+ *
* @param adjustment the adjustment amount.
*/
public void adjustCurrentHeat(final double adjustment) {
@@ -133,6 +138,7 @@ public class Reactor {
/**
* add some EU output.
+ *
* @param amount the amount of EU to output over 1 reactor tick (20 game ticks).
*/
public void addEUOutput(final double amount) {
@@ -148,6 +154,7 @@ public class Reactor {
/**
* Gets a list of the materials needed to build the components.
+ *
* @return a list of the materials needed to build the components.
*/
public ArrayList getMaterials() {
@@ -174,7 +181,9 @@ public class Reactor {
}
/**
- * Adds to the amount of heat vented this reactor tick, in case it is a new-style reactor with a pressure vessel and outputting heat to fluid instead of EU.
+ * Adds to the amount of heat vented this reactor tick, in case it is a new-style reactor with a pressure vessel and
+ * outputting heat to fluid instead of EU.
+ *
* @param amount the amount to add.
*/
public void ventHeat(final double amount) {
@@ -190,14 +199,18 @@ public class Reactor {
/**
* Get a code that represents the component set, which can be passed between forum users, etc.
- * @return a code representing some ids for the components and arrangement. Passing the same code to setCode() should re-create an identical reactor setup, even if other changes have happened in the meantime.
+ *
+ * @return a code representing some ids for the components and arrangement. Passing the same code to setCode()
+ * should re-create an identical reactor setup, even if other changes have happened in the meantime.
*/
public String getCode() {
return "erp=" + buildCodeString();
}
/**
- * Sets a code to configure the entire grid all at once. Expects the code to have originally been output by getCode().
+ * Sets a code to configure the entire grid all at once. Expects the code to have originally been output by
+ * getCode().
+ *
* @param code the code of the reactor setup to use.
*/
public void setCode(final String code) {
@@ -329,8 +342,7 @@ public class Reactor {
} else {
String tempCode = code;
if (code.startsWith("http://www.talonfiremage.pwp.blueyonder.co.uk/v3/reactorplanner.html?")) { // NOI18N
- tempCode = code.replace(
- "http://www.talonfiremage.pwp.blueyonder.co.uk/v3/reactorplanner.html?", ""); // NOI18N
+ tempCode = code.replace("http://www.talonfiremage.pwp.blueyonder.co.uk/v3/reactorplanner.html?", ""); // NOI18N
}
if (tempCode.matches("[0-9a-z]+")) { // NOI18N
// Possibly a code from Talonius's old planner
@@ -569,7 +581,7 @@ public class Reactor {
if (component != null) {
int id = component.id;
// only store automation details for a component if non-default, and add a flag bit to indicate
- // their presence. null components don't even need the flag bit.
+ // their presence. null components don't even need the flag bit.
if (component.getInitialHeat() > 0
|| component.getAutomationThreshold()
!= ComponentFactory.getDefaultComponent(id).getAutomationThreshold()
@@ -605,32 +617,22 @@ public class Reactor {
final ReactorItem component = getComponentAt(row, col);
final int id = (component != null) ? component.id : 0;
result.append(String.format("%02X", id)); // NOI18N
- if (component != null
- && (component.getInitialHeat() > 0
- || (automated
- && component.getAutomationThreshold()
- != ComponentFactory.getDefaultComponent(id)
- .getAutomationThreshold())
- || (automated
- && component.getReactorPause()
- != ComponentFactory.getDefaultComponent(id)
- .getReactorPause()))) {
+ if (component != null && (component.getInitialHeat() > 0
+ || (automated && component.getAutomationThreshold()
+ != ComponentFactory.getDefaultComponent(id).getAutomationThreshold())
+ || (automated && component.getReactorPause()
+ != ComponentFactory.getDefaultComponent(id).getReactorPause()))) {
result.append("(");
if (component.getInitialHeat() > 0) {
- result.append(String.format(
- "h%s,", Integer.toString((int) component.getInitialHeat(), 36))); // NOI18N
+ result.append(String.format("h%s,", Integer.toString((int) component.getInitialHeat(), 36))); // NOI18N
}
- if (automated
- && component.getAutomationThreshold()
- != ComponentFactory.getDefaultComponent(id).getAutomationThreshold()) {
- result.append(String.format(
- "a%s,", Integer.toString(component.getAutomationThreshold(), 36))); // NOI18N
+ if (automated && component.getAutomationThreshold()
+ != ComponentFactory.getDefaultComponent(id).getAutomationThreshold()) {
+ result.append(String.format("a%s,", Integer.toString(component.getAutomationThreshold(), 36))); // NOI18N
}
- if (automated
- && component.getReactorPause()
- != ComponentFactory.getDefaultComponent(id).getReactorPause()) {
- result.append(
- String.format("p%s,", Integer.toString(component.getReactorPause(), 36))); // NOI18N
+ if (automated && component.getReactorPause()
+ != ComponentFactory.getDefaultComponent(id).getReactorPause()) {
+ result.append(String.format("p%s,", Integer.toString(component.getReactorPause(), 36))); // NOI18N
}
result.setLength(result.length() - 1); // remove the last comma, whichever parameter it came from.
result.append(")");
@@ -675,6 +677,7 @@ public class Reactor {
/**
* Checks whether the reactor is to simulate a fluid-style reactor, rather than a direct EU-output reactor.
+ *
* @return true if this was set to be a fluid-style reactor, false if this was set to be direct EU-output reactor.
*/
public boolean isFluid() {
@@ -683,6 +686,7 @@ public class Reactor {
/**
* Sets whether the reactor is to simulate a fluid-style reactor, rather than a direct EU-output reactor.
+ *
* @param fluid true if this is to be a fluid-style reactor, false if this is to be direct EU-output reactor.
*/
public void setFluid(final boolean fluid) {
@@ -691,6 +695,7 @@ public class Reactor {
/**
* Checks whether the reactor is using Reactor Coolant Injectors (RCIs)
+ *
* @return true if this reactor was set to use RCIs, false otherwise.
*/
public boolean isUsingReactorCoolantInjectors() {
@@ -699,6 +704,7 @@ public class Reactor {
/**
* Sets whether the reactor is to use Reactor Coolant Injectors (RCIs)
+ *
* @param usingReactorCoolantInjectors true if this reactor should use RCIs, false otherwise.
*/
public void setUsingReactorCoolantInjectors(final boolean usingReactorCoolantInjectors) {
diff --git a/src/main/java/Ic2ExpReactorPlanner/SimulationData.java b/src/main/java/Ic2ExpReactorPlanner/SimulationData.java
index 0e32a186cb..614e903250 100644
--- a/src/main/java/Ic2ExpReactorPlanner/SimulationData.java
+++ b/src/main/java/Ic2ExpReactorPlanner/SimulationData.java
@@ -1,12 +1,12 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner;
/**
* Simple container for data from a simulation of an IC2 nuclear reactor, to allow comparison wtih another simulation.
+ *
* @author Brian McCloud
*/
public class SimulationData {
diff --git a/src/main/java/Ic2ExpReactorPlanner/TaloniusDecoder.java b/src/main/java/Ic2ExpReactorPlanner/TaloniusDecoder.java
index 13d73a3df6..1927275485 100644
--- a/src/main/java/Ic2ExpReactorPlanner/TaloniusDecoder.java
+++ b/src/main/java/Ic2ExpReactorPlanner/TaloniusDecoder.java
@@ -4,9 +4,11 @@ import java.math.BigInteger;
/**
* Pulls values out of codes from Talonius's old reactor planner.
+ *
* @author Brian McCloud
*/
public class TaloniusDecoder {
+
private BigInteger dataStack = null;
public TaloniusDecoder(final String dataCode) {
diff --git a/src/main/java/Ic2ExpReactorPlanner/components/Condensator.java b/src/main/java/Ic2ExpReactorPlanner/components/Condensator.java
index e4b73aa838..2ae559d9c6 100644
--- a/src/main/java/Ic2ExpReactorPlanner/components/Condensator.java
+++ b/src/main/java/Ic2ExpReactorPlanner/components/Condensator.java
@@ -1,7 +1,6 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner.components;
@@ -9,17 +8,13 @@ import gregtech.api.objects.GT_ItemStack;
/**
* Represents a condensator in a reactor, either RSH or LZH.
+ *
* @author Brian McCloud
*/
public class Condensator extends ReactorItem {
- public Condensator(
- final int id,
- final String baseName,
- GT_ItemStack aItem,
- final double maxDamage,
- final double maxHeat,
- final String sourceMod) {
+ public Condensator(final int id, final String baseName, GT_ItemStack aItem, final double maxDamage,
+ final double maxHeat, final String sourceMod) {
super(id, baseName, aItem, maxDamage, maxHeat, sourceMod);
}
diff --git a/src/main/java/Ic2ExpReactorPlanner/components/CoolantCell.java b/src/main/java/Ic2ExpReactorPlanner/components/CoolantCell.java
index a9a90ceb6b..ab7b2e5867 100644
--- a/src/main/java/Ic2ExpReactorPlanner/components/CoolantCell.java
+++ b/src/main/java/Ic2ExpReactorPlanner/components/CoolantCell.java
@@ -1,7 +1,6 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner.components;
@@ -9,17 +8,13 @@ import gregtech.api.objects.GT_ItemStack;
/**
* Represents a coolant cell in a reactor.
+ *
* @author Brian McCloud
*/
public class CoolantCell extends ReactorItem {
- public CoolantCell(
- final int id,
- final String baseName,
- GT_ItemStack aItem,
- final double maxDamage,
- final double maxHeat,
- final String sourceMod) {
+ public CoolantCell(final int id, final String baseName, GT_ItemStack aItem, final double maxDamage,
+ final double maxHeat, final String sourceMod) {
super(id, baseName, aItem, maxDamage, maxHeat, sourceMod);
}
diff --git a/src/main/java/Ic2ExpReactorPlanner/components/Exchanger.java b/src/main/java/Ic2ExpReactorPlanner/components/Exchanger.java
index 9c2f470eba..9a168bfa06 100644
--- a/src/main/java/Ic2ExpReactorPlanner/components/Exchanger.java
+++ b/src/main/java/Ic2ExpReactorPlanner/components/Exchanger.java
@@ -1,16 +1,17 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner.components;
-import gregtech.api.objects.GT_ItemStack;
import java.util.ArrayList;
import java.util.List;
+import gregtech.api.objects.GT_ItemStack;
+
/**
* Represents a heat exchanger of some sort in a reactor.
+ *
* @author Brian McCloud
*/
public class Exchanger extends ReactorItem {
@@ -18,15 +19,8 @@ public class Exchanger extends ReactorItem {
private final int switchSide;
private final int switchReactor;
- public Exchanger(
- final int id,
- final String baseName,
- GT_ItemStack aItem,
- final double maxDamage,
- final double maxHeat,
- final String sourceMod,
- final int switchSide,
- final int switchReactor) {
+ public Exchanger(final int id, final String baseName, GT_ItemStack aItem, final double maxDamage,
+ final double maxHeat, final String sourceMod, final int switchSide, final int switchReactor) {
super(id, baseName, aItem, maxDamage, maxHeat, sourceMod);
this.switchSide = switchSide;
this.switchReactor = switchReactor;
diff --git a/src/main/java/Ic2ExpReactorPlanner/components/FuelRod.java b/src/main/java/Ic2ExpReactorPlanner/components/FuelRod.java
index abeea45a37..2beac5c226 100644
--- a/src/main/java/Ic2ExpReactorPlanner/components/FuelRod.java
+++ b/src/main/java/Ic2ExpReactorPlanner/components/FuelRod.java
@@ -1,16 +1,17 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner.components;
-import gregtech.api.objects.GT_ItemStack;
import java.util.ArrayList;
import java.util.List;
+import gregtech.api.objects.GT_ItemStack;
+
/**
* Represents some form of fuel rod (may be single, dual, or quad).
+ *
* @author Brian McCloud
*/
public class FuelRod extends ReactorItem {
@@ -31,17 +32,9 @@ public class FuelRod extends ReactorItem {
GTNHbehavior = value;
}
- public FuelRod(
- final int id,
- final String baseName,
- GT_ItemStack aItem,
- final double maxDamage,
- final double maxHeat,
- final String sourceMod,
- final int energyMult,
- final double heatMult,
- final int rodCount,
- final boolean moxStyle) {
+ public FuelRod(final int id, final String baseName, GT_ItemStack aItem, final double maxDamage,
+ final double maxHeat, final String sourceMod, final int energyMult, final double heatMult,
+ final int rodCount, final boolean moxStyle) {
super(id, baseName, aItem, maxDamage, maxHeat, sourceMod);
this.energyMult = energyMult;
this.heatMult = heatMult;
diff --git a/src/main/java/Ic2ExpReactorPlanner/components/Plating.java b/src/main/java/Ic2ExpReactorPlanner/components/Plating.java
index de49dfa13c..8a1edf8d8f 100644
--- a/src/main/java/Ic2ExpReactorPlanner/components/Plating.java
+++ b/src/main/java/Ic2ExpReactorPlanner/components/Plating.java
@@ -1,7 +1,6 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner.components;
@@ -9,23 +8,17 @@ import Ic2ExpReactorPlanner.Reactor;
import gregtech.api.objects.GT_ItemStack;
/**
- * Represents some form of plating, which changes how much heat the reactor can
- * hold before causing external effects (up to and including explosion), as well
- * as somewhat reducing explosion power.
+ * Represents some form of plating, which changes how much heat the reactor can hold before causing external effects (up
+ * to and including explosion), as well as somewhat reducing explosion power.
+ *
* @author Brian McCloud
*/
public class Plating extends ReactorItem {
private final int heatAdjustment;
- public Plating(
- final int id,
- final String baseName,
- GT_ItemStack aItem,
- final double maxDamage,
- final double maxHeat,
- final String sourceMod,
- final int heatAdjustment,
+ public Plating(final int id, final String baseName, GT_ItemStack aItem, final double maxDamage,
+ final double maxHeat, final String sourceMod, final int heatAdjustment,
final double explosionPowerMultiplier) {
super(id, baseName, aItem, maxDamage, maxHeat, sourceMod);
this.heatAdjustment = heatAdjustment;
diff --git a/src/main/java/Ic2ExpReactorPlanner/components/ReactorItem.java b/src/main/java/Ic2ExpReactorPlanner/components/ReactorItem.java
index aee7f1c441..8319f6931b 100644
--- a/src/main/java/Ic2ExpReactorPlanner/components/ReactorItem.java
+++ b/src/main/java/Ic2ExpReactorPlanner/components/ReactorItem.java
@@ -1,17 +1,16 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner.components;
+import java.util.HashMap;
+
import Ic2ExpReactorPlanner.Reactor;
import gregtech.api.objects.GT_ItemStack;
-import java.util.HashMap;
/**
- * Represents an item (component) in an IndustrialCraft2 Experimental Nuclear
- * Reactor.
+ * Represents an item (component) in an IndustrialCraft2 Experimental Nuclear Reactor.
*
* @author Brian McCloud
*/
@@ -206,13 +205,8 @@ public class ReactorItem {
protected double explosionPowerMultiplier = 1;
- protected ReactorItem(
- final int id,
- final String baseName,
- GT_ItemStack aItem,
- final double maxDamage,
- final double maxHeat,
- String sourceMod) {
+ protected ReactorItem(final int id, final String baseName, GT_ItemStack aItem, final double maxDamage,
+ final double maxHeat, String sourceMod) {
this.id = id;
this.baseName = baseName;
this.name = aItem.mItem.getItemStackDisplayName(aItem.toStack());
@@ -262,8 +256,7 @@ public class ReactorItem {
}
/**
- * Checks if this component can accept heat. (e.g. from adjacent fuel rods,
- * or from an exchanger)
+ * Checks if this component can accept heat. (e.g. from adjacent fuel rods, or from an exchanger)
*
* @return true if this component can accept heat, false otherwise.
*/
@@ -274,8 +267,7 @@ public class ReactorItem {
}
/**
- * Determines if this component can be cooled down, such as by a component
- * heat vent.
+ * Determines if this component can be cooled down, such as by a component heat vent.
*
* @return true if this component can be cooled down, false otherwise.
*/
@@ -284,9 +276,8 @@ public class ReactorItem {
}
/**
- * Checks if this component acts as a neutron reflector, and boosts
- * performance of adjacent fuel rods, either by being a "neutron reflector"
- * item or by being a fuel rod.
+ * Checks if this component acts as a neutron reflector, and boosts performance of adjacent fuel rods, either by
+ * being a "neutron reflector" item or by being a fuel rod.
*
* @return true if this component reflects neutrons, false otherwise.
*/
@@ -309,8 +300,7 @@ public class ReactorItem {
}
/**
- * Generate heat if appropriate for component type, and spread to reactor or
- * adjacent cells.
+ * Generate heat if appropriate for component type, and spread to reactor or adjacent cells.
*
* @return the amount of heat generated by this component.
*/
@@ -321,8 +311,7 @@ public class ReactorItem {
/**
* Generate energy if appropriate for component type.
*
- * @return the number of EU generated by this component during the current
- * reactor tick.
+ * @return the number of EU generated by this component during the current reactor tick.
*/
public double generateEnergy() {
return 0.0;
@@ -331,31 +320,26 @@ public class ReactorItem {
/**
* Dissipate (aka vent) heat if appropriate for component type.
*
- * @return the amount of heat successfully vented during the current reactor
- * tick.
+ * @return the amount of heat successfully vented during the current reactor tick.
*/
public double dissipate() {
return 0.0;
}
/**
- * Transfer heat between component, neighbors, and/or reactor, if
- * appropriate for component type.
+ * Transfer heat between component, neighbors, and/or reactor, if appropriate for component type.
*/
public void transfer() {
// do nothing by default.
}
/**
- * Adds this component to a new reactor, and applies changes to the reactor
- * when adding this component if appropriate, such as for reactor plating.
+ * Adds this component to a new reactor, and applies changes to the reactor when adding this component if
+ * appropriate, such as for reactor plating.
*
- * @param parent
- * the reactor to add this component to.
- * @param row
- * the row this component will be in.
- * @param col
- * the column this component will be in.
+ * @param parent the reactor to add this component to.
+ * @param row the row this component will be in.
+ * @param col the column this component will be in.
*/
public void addToReactor(final Reactor parent, final int row, final int col) {
// call removeFromReactor first, in case it had previously been added to
@@ -367,9 +351,8 @@ public class ReactorItem {
}
/**
- * Removes this component from its reactor (if any), and applies changes to
- * the reactor when removing this component if appropriate, such as for
- * reactor plating.
+ * Removes this component from its reactor (if any), and applies changes to the reactor when removing this component
+ * if appropriate, such as for reactor plating.
*/
public void removeFromReactor() {
parent = null;
@@ -395,12 +378,9 @@ public class ReactorItem {
/**
* Adjusts the component heat up or down
*
- * @param heat
- * the amount of heat to adjust by (positive to add heat,
- * negative to remove heat).
- * @return the amount of heat adjustment refused. (e.g. due to going below
- * minimum heat, breaking due to excessive heat, or attempting to
- * remove heat from a condensator)
+ * @param heat the amount of heat to adjust by (positive to add heat, negative to remove heat).
+ * @return the amount of heat adjustment refused. (e.g. due to going below minimum heat, breaking due to excessive
+ * heat, or attempting to remove heat from a condensator)
*/
public double adjustCurrentHeat(final double heat) {
if (isHeatAcceptor()) {
@@ -422,20 +402,18 @@ public class ReactorItem {
}
/**
- * Clears the damage back to 0 (used when resetting simulation, or replacing
- * the component in an automation simulation).
+ * Clears the damage back to 0 (used when resetting simulation, or replacing the component in an automation
+ * simulation).
*/
public final void clearDamage() {
currentDamage = 0.0;
}
/**
- * Applies damage to the component, as opposed to heat. Mainly used for fuel
- * rods and neutron reflectors that lose durability as the reactor runs, but
- * can't recover it via cooling.
+ * Applies damage to the component, as opposed to heat. Mainly used for fuel rods and neutron reflectors that lose
+ * durability as the reactor runs, but can't recover it via cooling.
*
- * @param damage
- * the damage to apply (only used if positive).
+ * @param damage the damage to apply (only used if positive).
*/
public final void applyDamage(final double damage) {
// maxDamage of 1 is treated as meaning the component doesn't accept
@@ -448,23 +426,19 @@ public class ReactorItem {
}
/**
- * Determines if this component is broken in the current tick of the
- * simulation
+ * Determines if this component is broken in the current tick of the simulation
*
- * @return true if the component has broken either from damage (e.g. neutron
- * reflectors, fuel rods) or from heat (e.g. heat vents, coolant
- * cells), false otherwise.
+ * @return true if the component has broken either from damage (e.g. neutron reflectors, fuel rods) or from heat
+ * (e.g. heat vents, coolant cells), false otherwise.
*/
public boolean isBroken() {
return currentHeat >= getMaxHeat() || currentDamage >= getMaxDamage();
}
/**
- * The number of fuel rods in this component (0 for non-fuel-rod
- * components).
+ * The number of fuel rods in this component (0 for non-fuel-rod components).
*
- * @return The number of fuel rods in this component, or 0 if this component
- * has no fuel rods.
+ * @return The number of fuel rods in this component, or 0 if this component has no fuel rods.
*/
public int getRodCount() {
return 0;
@@ -473,9 +447,8 @@ public class ReactorItem {
/**
* Gets a value added in the formula for calculating explosion power.
*
- * @return the additive value for explosion power caused by this component,
- * or 0 if this component doesn't affect the addition part of the
- * explosion calculation.
+ * @return the additive value for explosion power caused by this component, or 0 if this component doesn't affect
+ * the addition part of the explosion calculation.
*/
public double getExplosionPowerOffset() {
if (!isBroken()) {
@@ -493,18 +466,16 @@ public class ReactorItem {
/**
* Gets a value multiplied in the formula for calculating explosion power.
*
- * @return the multiplier value for explosion power caused by this
- * component, or 1 if this component doesn't affect the
- * multiplication part of the explosion calculation.
+ * @return the multiplier value for explosion power caused by this component, or 1 if this component doesn't affect
+ * the multiplication part of the explosion calculation.
*/
public double getExplosionPowerMultiplier() {
return explosionPowerMultiplier;
}
/**
- * Finds the theoretical maximum venting of this component, regardless of
- * whether this venting is from itself, directly from the reactor, or from
- * adjacent components.
+ * Finds the theoretical maximum venting of this component, regardless of whether this venting is from itself,
+ * directly from the reactor, or from adjacent components.
*
* @return the capacity of this component to vent heat.
*/
@@ -515,17 +486,15 @@ public class ReactorItem {
/**
* Finds the theoretical maximum hull cooling of this component.
*
- * @return the capacity of this component to remove heat from the reactor
- * hull.
+ * @return the capacity of this component to remove heat from the reactor hull.
*/
public double getHullCoolingCapacity() {
return 0;
}
/**
- * Gets the current "output" of this component, presumably for writing to
- * CSV data. What this "output" means may vary by component type or reactor
- * type.
+ * Gets the current "output" of this component, presumably for writing to CSV data. What this "output" means may
+ * vary by component type or reactor type.
*
* @return the output of this component for the current reactor tick.
*/
@@ -534,22 +503,21 @@ public class ReactorItem {
}
/**
- * Determines whether this component expects to produces some sort of output
- * each reactor tick, e.g. for purposes of tracking in a CSV file.
+ * Determines whether this component expects to produces some sort of output each reactor tick, e.g. for purposes of
+ * tracking in a CSV file.
*
- * @return true if this component produces output (such as EU or vented
- * heat), false otherwise.
+ * @return true if this component produces output (such as EU or vented heat), false otherwise.
*/
public boolean producesOutput() {
return getVentCoolingCapacity() > 0 || getRodCount() > 0;
}
/**
- * Determines if this component needs input from a Reactor Coolant Injector.
- * Simply returns false for non-condensator items.
+ * Determines if this component needs input from a Reactor Coolant Injector. Simply returns false for
+ * non-condensator items.
*
- * @return true if this is a condensator that has absorbed enough heat to
- * require the appropriate item added to repair it, false otherwise.
+ * @return true if this is a condensator that has absorbed enough heat to require the appropriate item added to
+ * repair it, false otherwise.
*/
public boolean needsCoolantInjected() {
return false;
diff --git a/src/main/java/Ic2ExpReactorPlanner/components/Reflector.java b/src/main/java/Ic2ExpReactorPlanner/components/Reflector.java
index bca0e9f43a..f0b16f3d14 100644
--- a/src/main/java/Ic2ExpReactorPlanner/components/Reflector.java
+++ b/src/main/java/Ic2ExpReactorPlanner/components/Reflector.java
@@ -1,7 +1,6 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner.components;
@@ -9,19 +8,15 @@ import gregtech.api.objects.GT_ItemStack;
/**
* Represents a neutron reflector in a reactor.
+ *
* @author Brian McCloud
*/
public class Reflector extends ReactorItem {
private static String mcVersion = "1.12.2";
- public Reflector(
- final int id,
- final String baseName,
- final GT_ItemStack aStack,
- final double maxDamage,
- final double maxHeat,
- final String sourceMod) {
+ public Reflector(final int id, final String baseName, final GT_ItemStack aStack, final double maxDamage,
+ final double maxHeat, final String sourceMod) {
super(id, baseName, aStack, maxDamage, maxHeat, sourceMod);
}
diff --git a/src/main/java/Ic2ExpReactorPlanner/components/Vent.java b/src/main/java/Ic2ExpReactorPlanner/components/Vent.java
index 9eb9f3aa66..e0f26416ac 100644
--- a/src/main/java/Ic2ExpReactorPlanner/components/Vent.java
+++ b/src/main/java/Ic2ExpReactorPlanner/components/Vent.java
@@ -1,16 +1,17 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * To change this license header, choose License Headers in Project Properties. To change this template file, choose
+ * Tools | Templates and open the template in the editor.
*/
package Ic2ExpReactorPlanner.components;
-import gregtech.api.objects.GT_ItemStack;
import java.util.ArrayList;
import java.util.List;
+import gregtech.api.objects.GT_ItemStack;
+
/**
* Represents some kind of vent in a reactor.
+ *
* @author Brian McCloud
*/
public class Vent extends ReactorItem {
@@ -19,16 +20,8 @@ public class Vent extends ReactorItem {
private final int hullDraw;
private final int sideVent;
- public Vent(
- final int id,
- final String baseName,
- GT_ItemStack aItem,
- final double maxDamage,
- final double maxHeat,
- final String sourceMod,
- final int selfVent,
- final int hullDraw,
- final int sideVent) {
+ public Vent(final int id, final String baseName, GT_ItemStack aItem, final double maxDamage, final double maxHeat,
+ final String sourceMod, final int selfVent, final int hullDraw, final int sideVent) {
super(id, baseName, aItem, maxDamage, maxHeat, sourceMod);
this.selfVent = selfVent;
this.hullDraw = hullDraw;
diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java
index e45e9e4e58..4baafada2c 100644
--- a/src/main/java/gregtech/api/enums/TAE.java
+++ b/src/main/java/gregtech/api/enums/TAE.java
@@ -1,5 +1,9 @@
package gregtech.api.enums;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.HashSet;
+
import gregtech.api.interfaces.ITexture;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
@@ -8,9 +12,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.HashSet;
public class TAE {
@@ -31,8 +32,8 @@ public class TAE {
/**
*
- * @param aPage - The Texture page (0-3)
- * @param aID - The ID on the specified page (0-15)
+ * @param aPage - The Texture page (0-3)
+ * @param aID - The ID on the specified page (0-15)
* @param GTPP_CopiedBlockTexture - The Texture to register
* @return - Did it register correctly?
*/
@@ -90,8 +91,9 @@ public class TAE {
if (h != null) {
h[64][secondaryIndex++] = GTPP_CopiedBlockTexture;
x.set(null, h);
- Logger.INFO("[TAE} Registered Texture with ID " + (secondaryIndex - 1)
- + " in secondary index.");
+ Logger.INFO(
+ "[TAE} Registered Texture with ID " + (secondaryIndex - 1)
+ + " in secondary index.");
return true;
}
}
diff --git a/src/main/java/gregtech/api/util/EmptyRecipeMap.java b/src/main/java/gregtech/api/util/EmptyRecipeMap.java
index 45a31b7c1d..6a6e786610 100644
--- a/src/main/java/gregtech/api/util/EmptyRecipeMap.java
+++ b/src/main/java/gregtech/api/util/EmptyRecipeMap.java
@@ -1,28 +1,18 @@
package gregtech.api.util;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import java.util.Collection;
+
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+
public class EmptyRecipeMap extends GT_Recipe_Map {
- public EmptyRecipeMap(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
- boolean aNEIAllowed) {
+ public EmptyRecipeMap(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName,
+ String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems,
+ int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, int aNEISpecialValueMultiplier,
+ String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) {
super(
aRecipeList,
aUnlocalizedName,
@@ -42,42 +32,21 @@ public class EmptyRecipeMap extends GT_Recipe_Map {
}
@Override
- public GT_Recipe addRecipe(
- boolean aOptimize,
- ItemStack[] aInputs,
- ItemStack[] aOutputs,
- Object aSpecial,
- int[] aOutputChances,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- int aDuration,
- int aEUt,
+ public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial,
+ int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt,
int aSpecialValue) {
return null;
}
@Override
- public GT_Recipe addRecipe(
- int[] aOutputChances,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- int aDuration,
- int aEUt,
- int aSpecialValue) {
+ public GT_Recipe addRecipe(int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
+ int aDuration, int aEUt, int aSpecialValue) {
return null;
}
@Override
- public GT_Recipe addRecipe(
- boolean aOptimize,
- ItemStack[] aInputs,
- ItemStack[] aOutputs,
- Object aSpecial,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- int aDuration,
- int aEUt,
- int aSpecialValue) {
+ public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial,
+ FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
return null;
}
@@ -87,8 +56,8 @@ public class EmptyRecipeMap extends GT_Recipe_Map {
}
@Override
- protected GT_Recipe addRecipe(
- GT_Recipe aRecipe, boolean aCheckForCollisions, boolean aFakeRecipe, boolean aHidden) {
+ protected GT_Recipe addRecipe(GT_Recipe aRecipe, boolean aCheckForCollisions, boolean aFakeRecipe,
+ boolean aHidden) {
return null;
}
diff --git a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
index 3c11c5f801..57e210a8f2 100644
--- a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
+++ b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
@@ -1,16 +1,18 @@
package gregtech.api.util;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.util.ArrayList;
+
import net.minecraft.item.ItemStack;
import net.minecraft.util.WeightedRandomFishable;
import net.minecraftforge.common.FishingHooks;
import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class FishPondFakeRecipe {
public static ArrayList<WeightedRandomFishable> fish = new ArrayList<WeightedRandomFishable>();
@@ -21,12 +23,10 @@ public class FishPondFakeRecipe {
public static boolean generateFishPondRecipes() {
try {
- fish = (ArrayList<WeightedRandomFishable>)
- ReflectionUtils.getField(FishingHooks.class, "fish").get(null);
- junk = (ArrayList<WeightedRandomFishable>)
- ReflectionUtils.getField(FishingHooks.class, "junk").get(null);
- treasure = (ArrayList<WeightedRandomFishable>)
- ReflectionUtils.getField(FishingHooks.class, "treasure").get(null);
+ fish = (ArrayList<WeightedRandomFishable>) ReflectionUtils.getField(FishingHooks.class, "fish").get(null);
+ junk = (ArrayList<WeightedRandomFishable>) ReflectionUtils.getField(FishingHooks.class, "junk").get(null);
+ treasure = (ArrayList<WeightedRandomFishable>) ReflectionUtils.getField(FishingHooks.class, "treasure")
+ .get(null);
} catch (IllegalArgumentException | IllegalAccessException e) {
Logger.INFO("Error generating Fish Pond Recipes. [1]");
e.printStackTrace();
@@ -43,10 +43,9 @@ public class FishPondFakeRecipe {
if (f.get(e) != null) {
WeightedRandomFishable u = f.get(e);
try {
- ItemStack t =
- (ItemStack) ReflectionUtils.getField(WeightedRandomFishable.class, "field_150711_b")
- .get(u);
- addNewFishPondLoot(mType, new ItemStack[] {t}, new int[] {10000});
+ ItemStack t = (ItemStack) ReflectionUtils
+ .getField(WeightedRandomFishable.class, "field_150711_b").get(u);
+ addNewFishPondLoot(mType, new ItemStack[] { t }, new int[] { 10000 });
} catch (IllegalArgumentException | IllegalAccessException e1) {
Logger.INFO("Error generating Fish Pond Recipes. [2]");
e1.printStackTrace();
@@ -62,12 +61,12 @@ public class FishPondFakeRecipe {
public static void addNewFishPondLoot(int circuit, ItemStack[] outputItems, int[] chances) {
GTPP_Recipe x = new GTPP_Recipe(
true,
- new ItemStack[] {CI.getNumberedCircuit(circuit)},
+ new ItemStack[] { CI.getNumberedCircuit(circuit) },
outputItems,
null,
chances,
- new FluidStack[] {null},
- new FluidStack[] {null},
+ new FluidStack[] { null },
+ new FluidStack[] { null },
100, // 1 Tick
0, // No Eu produced
0);
diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java
index 94a0671a08..0ed296cd66 100644
--- a/src/main/java/gregtech/api/util/GTPP_Recipe.java
+++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java
@@ -3,9 +3,15 @@ package gregtech.api.util;
import static gregtech.api.enums.GT_Values.*;
import static net.minecraft.util.EnumChatFormatting.GRAY;
+import java.util.*;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.*;
+
import com.gtnewhorizons.modularui.api.math.Pos2d;
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
import com.gtnewhorizons.modularui.common.widget.ProgressBar.Direction;
+
import gregtech.api.gui.modularui.GT_UITextures;
import gregtech.common.gui.modularui.UIHelper;
import gregtech.nei.GT_NEI_DefaultHandler.FixedPositionedStack;
@@ -17,28 +23,18 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
-import java.util.*;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.*;
/**
* Custom GT Recipe Class
+ *
* @author Alkalus
*
*/
public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
- public GTPP_Recipe(
- final boolean aOptimize,
- final ItemStack[] aInputs,
- final ItemStack[] aOutputs,
- final Object aSpecialItems,
- final int[] aChances,
- final FluidStack[] aFluidInputs,
- final FluidStack[] aFluidOutputs,
- final int aDuration,
- final int aEUt,
- final int aSpecialValue) {
+ public GTPP_Recipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs,
+ final Object aSpecialItems, final int[] aChances, final FluidStack[] aFluidInputs,
+ final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
super(
aOptimize,
aInputs,
@@ -59,18 +55,12 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
}
// aSpecialValue = EU per Liter! If there is no Liquid for this Object, then it gets multiplied with 1000!
- public GTPP_Recipe(
- final ItemStack aInput1,
- final ItemStack aOutput1,
- final ItemStack aOutput2,
- final ItemStack aOutput3,
- final ItemStack aOutput4,
- final int aSpecialValue,
- final int aType) {
+ public GTPP_Recipe(final ItemStack aInput1, final ItemStack aOutput1, final ItemStack aOutput2,
+ final ItemStack aOutput3, final ItemStack aOutput4, final int aSpecialValue, final int aType) {
this(
true,
- new ItemStack[] {aInput1},
- new ItemStack[] {aOutput1, aOutput2, aOutput3, aOutput4},
+ new ItemStack[] { aInput1 },
+ new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4 },
null,
null,
null,
@@ -82,28 +72,28 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
Logger.WARNING("Switch case method for adding fuels");
if ((this.mInputs.length > 0) && (aSpecialValue > 0)) {
switch (aType) {
- // Diesel Generator
+ // Diesel Generator
case 0:
Logger.WARNING("Added fuel " + aInput1.getDisplayName() + " is ROCKET FUEL - continuing");
GTPP_Recipe_Map.sRocketFuels.addRecipe(this);
break;
- // Gas Turbine
+ // Gas Turbine
case 1:
GTPP_Recipe_Map.sGeoThermalFuels.addRecipe(this);
break;
- // Thermal Generator
+ // Thermal Generator
case 2:
GTPP_Recipe_Map.sRTGFuels.addRecipe(this);
break;
- // Plasma Generator
+ // Plasma Generator
case 4:
// Gregtech_Recipe_Map.sPlasmaFuels.addRecipe(this);
break;
- // Magic Generator
+ // Magic Generator
case 5:
// Gregtech_Recipe_Map.sMagicFuels.addRecipe(this);
break;
- // Fluid Generator. Usually 3. Every wrong Type ends up in the Semifluid Generator
+ // Fluid Generator. Usually 3. Every wrong Type ends up in the Semifluid Generator
default:
// Gregtech_Recipe_Map.sDenseLiquidFuels.addRecipe(this);
break;
@@ -112,29 +102,18 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
}
/**
- * Even though this is deprecated, it's still used to keep binary compatibility.
- * (GoodGenerator and GTNHLanthanides reference to `sSimpleWasherRecipes` and `sChemicalDehydratorRecipes`)
+ * Even though this is deprecated, it's still used to keep binary compatibility. (GoodGenerator and GTNHLanthanides
+ * reference to `sSimpleWasherRecipes` and `sChemicalDehydratorRecipes`)
*/
public static class GTPP_Recipe_Map_Internal extends GT_Recipe_Map {
@Deprecated
public static final Collection<GTPP_Recipe_Map_Internal> sMappingsEx = new ArrayList<>();
- public GTPP_Recipe_Map_Internal(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
+ public GTPP_Recipe_Map_Internal(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName,
+ String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount,
+ int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI,
boolean aNEIAllowed) {
super(
aRecipeList,
@@ -156,196 +135,181 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
}
public static class GTPP_Recipe_Map {
+
public static final GT_Recipe_Map sCokeOvenRecipes = new GT_Recipe_Map(
- new HashSet<>(200),
- "gtpp.recipe.cokeoven",
- "Coke Oven",
- null,
- RES_PATH_GUI + "basicmachines/Dehydrator",
- 2,
- 9,
- 1,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN);
+ new HashSet<>(200),
+ "gtpp.recipe.cokeoven",
+ "Coke Oven",
+ null,
+ RES_PATH_GUI + "basicmachines/Dehydrator",
+ 2,
+ 9,
+ 1,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN);
public static final GT_Recipe_Map sMatterFab2Recipes = new GT_Recipe_Map(
- new HashSet<>(200),
- "gtpp.recipe.matterfab2",
- "Matter Fabricator",
- null,
- RES_PATH_GUI + "basicmachines/Default",
- 2,
- 0,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .useModularUI(true);
+ new HashSet<>(200),
+ "gtpp.recipe.matterfab2",
+ "Matter Fabricator",
+ null,
+ RES_PATH_GUI + "basicmachines/Default",
+ 2,
+ 0,
+ 0,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).useModularUI(true);
public static final GT_Recipe_Map sRocketFuels = new GT_Recipe_Map_Fuel(
- new HashSet<>(10),
- "gtpp.recipe.rocketenginefuel",
- "Rocket Engine Fuel",
- null,
- RES_PATH_GUI + "basicmachines/Default",
- 0,
- 0,
- 0,
- 0,
- 1,
- "Fuel Value: ",
- 3000,
- " EU",
- true,
- true)
- .useModularUI(true);
+ new HashSet<>(10),
+ "gtpp.recipe.rocketenginefuel",
+ "Rocket Engine Fuel",
+ null,
+ RES_PATH_GUI + "basicmachines/Default",
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ "Fuel Value: ",
+ 3000,
+ " EU",
+ true,
+ true).useModularUI(true);
public static final GT_Recipe_Map sQuantumForceTransformerRecipes = new GT_Recipe_Map_LargeNEI(
- new HashSet<>(20),
- "gtpp.recipe.quantumforcesmelter",
- "Quantum Force Transformer",
- null,
- RES_PATH_GUI + "basicmachines/LCRNEI",
- 6,
- 6,
- 1,
- 0,
- 1,
- "Tier: ",
- 1,
- E,
- true,
- true)
- .useModularUI(true)
- .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, Direction.RIGHT)
- .setUsualFluidInputCount(6)
- .setUsualFluidOutputCount(6);
+ new HashSet<>(20),
+ "gtpp.recipe.quantumforcesmelter",
+ "Quantum Force Transformer",
+ null,
+ RES_PATH_GUI + "basicmachines/LCRNEI",
+ 6,
+ 6,
+ 1,
+ 0,
+ 1,
+ "Tier: ",
+ 1,
+ E,
+ true,
+ true).useModularUI(true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, Direction.RIGHT)
+ .setUsualFluidInputCount(6).setUsualFluidOutputCount(6);
public static final GT_Recipe_Map sGeoThermalFuels = new GT_Recipe_Map(
- new HashSet<>(10),
- "gtpp.recipe.geothermalfuel",
- "GeoThermal Fuel",
- null,
- RES_PATH_GUI + "basicmachines/Default",
- 1,
- 1,
- 0,
- 0,
- 1,
- "Fuel Value: ",
- 1000,
- " EU",
- true,
- true)
- .useModularUI(true);
- public static final GTPP_Recipe_Map_Internal sChemicalDehydratorRecipes =
- (GTPP_Recipe_Map_Internal) new GTPP_Recipe_Map_Internal(
- new HashSet<>(200),
- "gtpp.recipe.chemicaldehydrator",
- "Dehydrator",
- null,
- RES_PATH_GUI + "basicmachines/Dehydrator",
- 2,
- 9,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN);
+ new HashSet<>(10),
+ "gtpp.recipe.geothermalfuel",
+ "GeoThermal Fuel",
+ null,
+ RES_PATH_GUI + "basicmachines/Default",
+ 1,
+ 1,
+ 0,
+ 0,
+ 1,
+ "Fuel Value: ",
+ 1000,
+ " EU",
+ true,
+ true).useModularUI(true);
+ public static final GTPP_Recipe_Map_Internal sChemicalDehydratorRecipes = (GTPP_Recipe_Map_Internal) new GTPP_Recipe_Map_Internal(
+ new HashSet<>(200),
+ "gtpp.recipe.chemicaldehydrator",
+ "Dehydrator",
+ null,
+ RES_PATH_GUI + "basicmachines/Dehydrator",
+ 2,
+ 9,
+ 0,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN);
public static final GT_Recipe_Map sVacuumFurnaceRecipes = new GT_Recipe_Map_LargeNEI(
- new HashSet<>(500),
- "gtpp.recipe.vacfurnace",
- "Vacuum Furnace",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 9,
- 9,
- 1,
- 0,
- 1,
- "Heat Capacity: ",
- 1,
- " K",
- false,
- true)
- .setUsualFluidInputCount(3)
- .setUsualFluidOutputCount(3);
+ new HashSet<>(500),
+ "gtpp.recipe.vacfurnace",
+ "Vacuum Furnace",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 9,
+ 9,
+ 1,
+ 0,
+ 1,
+ "Heat Capacity: ",
+ 1,
+ " K",
+ false,
+ true).setUsualFluidInputCount(3).setUsualFluidOutputCount(3);
public static final GT_Recipe_Map sAlloyBlastSmelterRecipes = new GT_Recipe_Map_LargeNEI(
- new HashSet<>(200),
- "gtpp.recipe.alloyblastsmelter",
- "Alloy Blast Smelter",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 9,
- 9,
- 1,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .setUsualFluidInputCount(3)
- .setUsualFluidOutputCount(3);
+ new HashSet<>(200),
+ "gtpp.recipe.alloyblastsmelter",
+ "Alloy Blast Smelter",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 9,
+ 9,
+ 1,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).setUsualFluidInputCount(3).setUsualFluidOutputCount(3);
public static final GT_Recipe_Map sSteamTurbineFuels = new GT_Recipe_Map(
- new HashSet<>(10),
- "gtpp.recipe.steamturbinefuel",
- "GeoThermal Fuel",
- null,
- RES_PATH_GUI + "basicmachines/Default",
- 1,
- 1,
- 0,
- 0,
- 1,
- "Fuel Value: ",
- 1000,
- " EU",
- true,
- false)
- .useModularUI(true);
+ new HashSet<>(10),
+ "gtpp.recipe.steamturbinefuel",
+ "GeoThermal Fuel",
+ null,
+ RES_PATH_GUI + "basicmachines/Default",
+ 1,
+ 1,
+ 0,
+ 0,
+ 1,
+ "Fuel Value: ",
+ 1000,
+ " EU",
+ true,
+ false).useModularUI(true);
// LFTR recipes
public static final GT_Recipe_Map sLiquidFluorineThoriumReactorRecipes = new GT_Recipe_Map_FluidOnly(
- new HashSet<>(50),
- "gtpp.recipe.lftr",
- "Liquid Fluoride Thorium Reactor",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 0,
- 0,
- 0,
- 2,
- 0,
- "Power: ",
- 1,
- " EU/t per Dynamo",
- true,
- true)
- .setUsualFluidInputCount(6)
- .setUsualFluidOutputCount(6)
- .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> {
- final long tEUt = recipeInfo.recipe.mSpecialValue;
- final int tDuration = recipeInfo.recipe.mDuration;
- return Arrays.asList(
- applyPrefixAndSuffix.apply(recipeInfo.recipe.mSpecialValue),
- "Dynamo: " + MathUtils.formatNumbers(tDuration * tEUt) + " EU",
- "Total: " + MathUtils.formatNumbers(tDuration * tEUt * 4) + " EU");
- });
+ new HashSet<>(50),
+ "gtpp.recipe.lftr",
+ "Liquid Fluoride Thorium Reactor",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 0,
+ 0,
+ 0,
+ 2,
+ 0,
+ "Power: ",
+ 1,
+ " EU/t per Dynamo",
+ true,
+ true).setUsualFluidInputCount(6).setUsualFluidOutputCount(6)
+ .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> {
+ final long tEUt = recipeInfo.recipe.mSpecialValue;
+ final int tDuration = recipeInfo.recipe.mDuration;
+ return Arrays.asList(
+ applyPrefixAndSuffix.apply(recipeInfo.recipe.mSpecialValue),
+ "Dynamo: " + MathUtils.formatNumbers(tDuration * tEUt) + " EU",
+ "Total: " + MathUtils.formatNumbers(tDuration * tEUt * 4) + " EU");
+ });
// Ore Milling Map
public static final GT_Recipe_Map sOreMillRecipes = new GT_Recipe_Map(
@@ -364,6 +328,7 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
E,
true,
true) {
+
@Override
protected List<String> handleNEIItemInputTooltip(List<String> currentTip, FixedPositionedStack pStack) {
if (ItemUtils.isMillingBall(pStack.item)) {
@@ -386,101 +351,94 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
// Fission Fuel Plant Recipes
public static final GT_Recipe_Map sFissionFuelProcessing = new GT_Recipe_Map_FluidOnly(
- new HashSet<>(50),
- "gtpp.recipe.fissionfuel",
- "Nuclear Fuel Processing",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 0,
- 0,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .setUsualFluidInputCount(6)
- .setUsualFluidOutputCount(6);
+ new HashSet<>(50),
+ "gtpp.recipe.fissionfuel",
+ "Nuclear Fuel Processing",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).setUsualFluidInputCount(6).setUsualFluidOutputCount(6);
// Cold Trap
public static final GT_Recipe_Map sColdTrapRecipes = new GT_Recipe_Map(
- new HashSet<>(10000),
- "gtpp.recipe.coldtrap",
- "Cold Trap",
- null,
- RES_PATH_GUI + "basicmachines/Dehydrator",
- 2,
- 9,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN);
+ new HashSet<>(10000),
+ "gtpp.recipe.coldtrap",
+ "Cold Trap",
+ null,
+ RES_PATH_GUI + "basicmachines/Dehydrator",
+ 2,
+ 9,
+ 0,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN);
// Reactor Processing Unit
public static final GT_Recipe_Map sReactorProcessingUnitRecipes = new GT_Recipe_Map(
- new HashSet<>(10000),
- "gtpp.recipe.reactorprocessingunit",
- "Reactor Processing Unit",
- null,
- RES_PATH_GUI + "basicmachines/Dehydrator",
- 2,
- 9,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN);
+ new HashSet<>(10000),
+ "gtpp.recipe.reactorprocessingunit",
+ "Reactor Processing Unit",
+ null,
+ RES_PATH_GUI + "basicmachines/Dehydrator",
+ 2,
+ 9,
+ 0,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN);
// Basic Washer Map
- public static final GTPP_Recipe_Map_Internal sSimpleWasherRecipes =
- (GTPP_Recipe_Map_Internal) new GTPP_Recipe_Map_Internal(
- new HashSet<>(3),
- "gtpp.recipe.simplewasher",
- "Simple Dust Washer",
- null,
- RES_PATH_GUI + "basicmachines/PotionBrewer",
- 1,
- 1,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CAULDRON)
+ public static final GTPP_Recipe_Map_Internal sSimpleWasherRecipes = (GTPP_Recipe_Map_Internal) new GTPP_Recipe_Map_Internal(
+ new HashSet<>(3),
+ "gtpp.recipe.simplewasher",
+ "Simple Dust Washer",
+ null,
+ RES_PATH_GUI + "basicmachines/PotionBrewer",
+ 1,
+ 1,
+ 0,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CAULDRON)
.setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE);
// Molecular Transformer Map
public static final GT_Recipe_Map sMolecularTransformerRecipes = new GT_Recipe_Map(
- new HashSet<>(3),
- "gtpp.recipe.moleculartransformer",
- "Molecular Transformer",
- null,
- RES_PATH_GUI + "basicmachines/Scanner",
- 1,
- 1,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_MICROSCOPE);
+ new HashSet<>(3),
+ "gtpp.recipe.moleculartransformer",
+ "Molecular Transformer",
+ null,
+ RES_PATH_GUI + "basicmachines/Scanner",
+ 1,
+ 1,
+ 0,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_MICROSCOPE);
// Elemental Duplicator Map
public static final GT_Recipe_Map sElementalDuplicatorRecipes = new GT_Recipe_Map(
@@ -519,142 +477,134 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
// RTG Fuel Map
public static final GT_Recipe.GT_Recipe_Map_Fuel sRTGFuels = (GT_Recipe_Map_Fuel) new GT_Recipe_Map_Fuel(
- new HashSet<>(10),
- "gtpp.recipe.RTGgenerators",
- "RTG",
- null,
- "gregtech:textures/gui/basicmachines/Default",
- 1,
- 0,
- 0,
- 0,
- 1,
- "Fuel Value: ",
- 365,
- " Minecraft Days",
- true,
- true)
- .useModularUI(true);
+ new HashSet<>(10),
+ "gtpp.recipe.RTGgenerators",
+ "RTG",
+ null,
+ "gregtech:textures/gui/basicmachines/Default",
+ 1,
+ 0,
+ 0,
+ 0,
+ 1,
+ "Fuel Value: ",
+ 365,
+ " Minecraft Days",
+ true,
+ true).useModularUI(true);
// Thermal Boiler map
public static final GT_Recipe_Map sThermalFuels = new GT_Recipe_Map_LargeNEI(
- new HashSet<>(10),
- "gtpp.recipe.thermalgeneratorfuel",
- "Thermal Generator Fuel",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 9,
- 9,
- 0,
- 0,
- 1,
- null,
- 1000,
- null,
- true,
- true)
- .setUsualFluidInputCount(3)
- .setUsualFluidOutputCount(3);
+ new HashSet<>(10),
+ "gtpp.recipe.thermalgeneratorfuel",
+ "Thermal Generator Fuel",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 9,
+ 9,
+ 0,
+ 0,
+ 1,
+ null,
+ 1000,
+ null,
+ true,
+ true).setUsualFluidInputCount(3).setUsualFluidOutputCount(3);
// Solar Tower map
public static final GT_Recipe_Map sSolarTowerRecipes = new GT_Recipe_Map_FluidOnly(
- new HashSet<>(10),
- "gtpp.recipe.solartower",
- "Solar Tower",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 0,
- 0,
- 0,
- 0,
- 1,
- null,
- 1000,
- null,
- true,
- true)
- .useModularUI(true)
- .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> Arrays.asList(
- "Solar Heater rings boost tier",
- "R1:T1, R2:T2, R3:T4, R4:T8, R5:T16",
- "Input Amount = 1000 x T"));
+ new HashSet<>(10),
+ "gtpp.recipe.solartower",
+ "Solar Tower",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ null,
+ 1000,
+ null,
+ true,
+ true).useModularUI(true).setNEISpecialInfoFormatter(
+ (recipeInfo, applyPrefixAndSuffix) -> Arrays.asList(
+ "Solar Heater rings boost tier",
+ "R1:T1, R2:T2, R3:T4, R4:T8, R5:T16",
+ "Input Amount = 1000 x T"));
// Cyclotron recipe map
public static final GT_Recipe_Map sCyclotronRecipes = new GT_Recipe_Map(
- new HashSet<>(200),
- "gtpp.recipe.cyclotron",
- "COMET - Compact Cyclotron",
- null,
- RES_PATH_GUI + "basicmachines/BlastSmelter",
- 9,
- 9,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .useModularUI(true);
+ new HashSet<>(200),
+ "gtpp.recipe.cyclotron",
+ "COMET - Compact Cyclotron",
+ null,
+ RES_PATH_GUI + "basicmachines/BlastSmelter",
+ 9,
+ 9,
+ 0,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).useModularUI(true);
// Mini Fusion
public static final GT_Recipe_Map sSlowFusionRecipes = new GT_Recipe_Map(
- new HashSet<>(50),
- "gtpp.recipe.slowfusionreactor",
- "Mimir - Slow Fusion",
- null,
- "gregtech:textures/gui/basicmachines/LFTR",
- 0,
- 0,
- 0,
- 2,
- 1,
- "Start: ",
- 1,
- " EU",
- true,
- true)
- .useModularUI(true);
+ new HashSet<>(50),
+ "gtpp.recipe.slowfusionreactor",
+ "Mimir - Slow Fusion",
+ null,
+ "gregtech:textures/gui/basicmachines/LFTR",
+ 0,
+ 0,
+ 0,
+ 2,
+ 1,
+ "Start: ",
+ 1,
+ " EU",
+ true,
+ true).useModularUI(true);
// Component Assembler
public static final GT_Recipe_Map sComponentAssemblerRecipes = new GT_Recipe_Map_Assembler(
- new HashSet<>(300),
- "gtpp.recipe.componentassembler",
- "Component Assembler",
- null,
- RES_PATH_GUI + "basicmachines/Assembler",
- 6,
- 1,
- 1,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .useModularUI(true);
+ new HashSet<>(300),
+ "gtpp.recipe.componentassembler",
+ "Component Assembler",
+ null,
+ RES_PATH_GUI + "basicmachines/Assembler",
+ 6,
+ 1,
+ 1,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).useModularUI(true);
// Special Maps for Multis
public static final GT_Recipe_Map sFishPondRecipes = new GT_Recipe_Map(
- new HashSet<>(3),
- "gtpp.recipe.fishpond",
- "Zhuhai - Fishing Port",
- null,
- RES_PATH_GUI + "basicmachines/PotionBrewer",
- 1,
- 1,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true)
- .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CAULDRON)
- .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE);
+ new HashSet<>(3),
+ "gtpp.recipe.fishpond",
+ "Zhuhai - Fishing Port",
+ null,
+ RES_PATH_GUI + "basicmachines/PotionBrewer",
+ 1,
+ 1,
+ 0,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CAULDRON)
+ .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE);
public static final GT_Recipe_Map sSpargeTowerRecipes = new GT_Recipe_Map(
new HashSet<>(10000),
"gtpp.recipe.spargetower",
@@ -673,60 +623,55 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
false);
public static final GT_Recipe_Map sAdvFreezerRecipes_GT = new GT_Recipe_Map(
- new HashSet<>(2000),
- "gtpp.recipe.cryogenicfreezer",
- "Cryogenic Freezer",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 1,
- 1,
- 0,
- 0,
- 1,
- "",
- 0,
- "",
- false,
- true)
- .setUsualFluidInputCount(2);
+ new HashSet<>(2000),
+ "gtpp.recipe.cryogenicfreezer",
+ "Cryogenic Freezer",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 1,
+ 1,
+ 0,
+ 0,
+ 1,
+ "",
+ 0,
+ "",
+ false,
+ true).setUsualFluidInputCount(2);
public static final GT_Recipe_Map sMultiblockCentrifugeRecipes_GT = new GT_Recipe_Map_LargeNEI(
- new HashSet<>(2000),
- "gtpp.recipe.multicentrifuge",
- "Multiblock Centrifuge",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 6,
- 6,
- 0,
- 0,
- 1,
- "",
- 0,
- "",
- false,
- true)
- .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT)
- .setUsualFluidInputCount(6)
- .setUsualFluidOutputCount(6);
+ new HashSet<>(2000),
+ "gtpp.recipe.multicentrifuge",
+ "Multiblock Centrifuge",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 6,
+ 6,
+ 0,
+ 0,
+ 1,
+ "",
+ 0,
+ "",
+ false,
+ true).setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT).setUsualFluidInputCount(6)
+ .setUsualFluidOutputCount(6);
public static final GT_Recipe_Map sMultiblockElectrolyzerRecipes_GT = new GT_Recipe_Map_LargeNEI(
- new HashSet<>(2000),
- "gtpp.recipe.multielectro",
- "Multiblock Electrolyzer",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 6,
- 6,
- 0,
- 0,
- 1,
- "",
- 0,
- "",
- false,
- true)
- .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT)
- .setUsualFluidInputCount(6)
- .setUsualFluidOutputCount(6);
+ new HashSet<>(2000),
+ "gtpp.recipe.multielectro",
+ "Multiblock Electrolyzer",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 6,
+ 6,
+ 0,
+ 0,
+ 1,
+ "",
+ 0,
+ "",
+ false,
+ true).setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT).setUsualFluidInputCount(6)
+ .setUsualFluidOutputCount(6);
// internal copy of sChemicalPlantRecipes
public static final GT_Recipe_Map sChemicalPlant_GT = new GT_Recipe_Map(
@@ -746,81 +691,75 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
false,
false);
public static final GT_Recipe_Map sMultiblockMixerRecipes_GT = new GT_Recipe_Map_LargeNEI(
- new HashSet<>(2000),
- "gtpp.recipe.multimixer",
- "Multiblock Mixer",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 9,
- 9,
- 0,
- 0,
- 1,
- "",
- 0,
- "",
- false,
- true)
- .setProgressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW)
- .setUsualFluidInputCount(6)
- .setUsualFluidOutputCount(6);
+ new HashSet<>(2000),
+ "gtpp.recipe.multimixer",
+ "Multiblock Mixer",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 9,
+ 9,
+ 0,
+ 0,
+ 1,
+ "",
+ 0,
+ "",
+ false,
+ true).setProgressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW)
+ .setUsualFluidInputCount(6).setUsualFluidOutputCount(6);
public static final GT_Recipe_Map sMultiblockChemicalDehydratorRecipes = new GT_Recipe_Map_LargeNEI(
- new HashSet<>(2000),
- "gtpp.recipe.multidehydrator",
- "Multiblock Dehydrator",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 6,
- 9,
- 0,
- 0,
- 1,
- "",
- 0,
- "",
- false,
- true)
- .setUsualFluidInputCount(3)
- .setUsualFluidOutputCount(3);
+ new HashSet<>(2000),
+ "gtpp.recipe.multidehydrator",
+ "Multiblock Dehydrator",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 6,
+ 9,
+ 0,
+ 0,
+ 1,
+ "",
+ 0,
+ "",
+ false,
+ true).setUsualFluidInputCount(3).setUsualFluidOutputCount(3);
// Semi-Fluid Fuel Map
public static final GT_Recipe_Map_Fuel sSemiFluidLiquidFuels = (GT_Recipe_Map_Fuel) new GT_Recipe_Map_Fuel(
- new HashSet<>(10),
- "gtpp.recipe.semifluidgeneratorfuels",
- "Semifluid Generator Fuels",
- null,
- RES_PATH_GUI + "basicmachines/Default",
- 0,
- 0,
- 0,
- 0,
- 1,
- "Fuel Value: ",
- 1000,
- " EU",
- true,
- true)
- .useModularUI(true);
+ new HashSet<>(10),
+ "gtpp.recipe.semifluidgeneratorfuels",
+ "Semifluid Generator Fuels",
+ null,
+ RES_PATH_GUI + "basicmachines/Default",
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ "Fuel Value: ",
+ 1000,
+ " EU",
+ true,
+ true).useModularUI(true);
// Flotation Cell
public static final GT_Recipe_Map sFlotationCellRecipes = new GT_Recipe_Map(
- new HashSet<>(10000),
- "gtpp.recipe.flotationcell",
- "Flotation Cell",
- null,
- RES_PATH_GUI + "basicmachines/LFTR",
- 6,
- 0,
- 1,
- 1,
- 1,
- "",
- 1,
- E,
- true,
- true)
- .useModularUI(true);
+ new HashSet<>(10000),
+ "gtpp.recipe.flotationcell",
+ "Flotation Cell",
+ null,
+ RES_PATH_GUI + "basicmachines/LFTR",
+ 6,
+ 0,
+ 1,
+ 1,
+ 1,
+ "",
+ 1,
+ E,
+ true,
+ true).useModularUI(true);
// Tree Growth Simulator
public static final GT_Recipe_Map sTreeSimFakeRecipes = new GT_Recipe_Map(
@@ -839,6 +778,7 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
"",
false,
true) {
+
@Override
protected void drawNEIEnergyInfo(NEIRecipeInfo recipeInfo) {}
@@ -848,8 +788,8 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
@Override
protected List<String> handleNEIItemOutputTooltip(List<String> currentTip, FixedPositionedStack pStack) {
if (ModItems.fluidFertBasic != null && pStack.isChanceBased()) {
- currentTip.add(
- GRAY + "Outputted if " + ModItems.fluidFertBasic.getLocalizedName() + " is provided");
+ currentTip
+ .add(GRAY + "Outputted if " + ModItems.fluidFertBasic.getLocalizedName() + " is provided");
} else {
super.handleNEIItemOutputTooltip(currentTip, pStack);
}
@@ -881,21 +821,10 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
"Laurenium",
"Botmium");
- public GTPP_Recipe_Map_ChemicalPlant(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
+ public GTPP_Recipe_Map_ChemicalPlant(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName,
+ String aLocalName, String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount,
+ int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI,
boolean aNEIAllowed) {
super(
aRecipeList,
diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipe.java b/src/main/java/gregtech/api/util/GasSpargingRecipe.java
index 578ec687a0..304dd24384 100644
--- a/src/main/java/gregtech/api/util/GasSpargingRecipe.java
+++ b/src/main/java/gregtech/api/util/GasSpargingRecipe.java
@@ -1,10 +1,11 @@
package gregtech.api.util;
+import net.minecraftforge.fluids.FluidStack;
+
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.util.data.ArrayUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import net.minecraftforge.fluids.FluidStack;
public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> {
@@ -17,16 +18,12 @@ public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> {
public final int mDuration;
public final int mEUt;
- public GasSpargingRecipe(
- FluidStack aSpargeGas,
- FluidStack aSpentFuel,
- FluidStack aSpargedFuel,
- FluidStack[] aOutputs,
- int[] aMaxOutputQuantity) {
+ public GasSpargingRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack aSpargedFuel,
+ FluidStack[] aOutputs, int[] aMaxOutputQuantity) {
mInputGas = aSpargeGas;
mInputSpentFuel = aSpentFuel;
mOutputSpargedFuel = aSpargedFuel;
- mFluidInputs = new FluidStack[] {mInputGas, mInputSpentFuel};
+ mFluidInputs = new FluidStack[] { mInputGas, mInputSpentFuel };
aOutputs = ArrayUtils.insertElementAtIndex(aOutputs, 0, aSpargeGas);
aOutputs = ArrayUtils.insertElementAtIndex(aOutputs, 1, aSpargedFuel);
mFluidOutputs = aOutputs;
@@ -60,8 +57,7 @@ public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> {
}
public boolean isValid() {
- if (mInputGas == null
- || mInputGas.amount <= 0
+ if (mInputGas == null || mInputGas.amount <= 0
|| mInputSpentFuel == null
|| mInputSpentFuel.amount <= 0
|| mFluidOutputs == null
diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java
index ec124ae422..f6618cb1f8 100644
--- a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java
+++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java
@@ -2,9 +2,10 @@ package gregtech.api.util;
import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
-import gtPlusPlus.api.objects.data.AutoMap;
import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class GasSpargingRecipeMap extends AutoMap<GasSpargingRecipe> {
public static final AutoMap<GasSpargingRecipe> mRecipes = new AutoMap<GasSpargingRecipe>();
@@ -13,14 +14,9 @@ public class GasSpargingRecipeMap extends AutoMap<GasSpargingRecipe> {
public static final String mNEIDisplayName = "LFTR Gas Sparging";
public static final String mNEIGUIPath = RES_PATH_GUI + "basicmachines/FissionFuel.png";
- public static boolean addRecipe(
- FluidStack aSpargeGas,
- FluidStack aSpentFuel,
- FluidStack aSpargedFuel,
- FluidStack[] aOutputs,
- int[] aMaxOutputs) {
- if (aSpargeGas == null
- || aSpargeGas.amount <= 0
+ public static boolean addRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack aSpargedFuel,
+ FluidStack[] aOutputs, int[] aMaxOutputs) {
+ if (aSpargeGas == null || aSpargeGas.amount <= 0
|| aSpentFuel == null
|| aSpentFuel.amount <= 0
|| aSpargedFuel == null
diff --git a/src/main/java/gregtech/api/util/HotFuel.java b/src/main/java/gregtech/api/util/HotFuel.java
index 53ab85a455..b8fcef1308 100644
--- a/src/main/java/gregtech/api/util/HotFuel.java
+++ b/src/main/java/gregtech/api/util/HotFuel.java
@@ -5,20 +5,20 @@ import net.minecraftforge.fluids.FluidStack;
public class HotFuel {
- public static void addNewHotFuel(
- FluidStack aInput1, FluidStack aOutput1, ItemStack[] outputItems, int[] chances, int aSpecialValue) {
+ public static void addNewHotFuel(FluidStack aInput1, FluidStack aOutput1, ItemStack[] outputItems, int[] chances,
+ int aSpecialValue) {
GTPP_Recipe.GTPP_Recipe_Map.sThermalFuels.addRecipe(
true,
null,
outputItems,
null,
chances,
- new FluidStack[] {aInput1},
- new FluidStack[] {aOutput1},
+ new FluidStack[] { aInput1 },
+ new FluidStack[] { aOutput1 },
1, // 1 Tick
0, // No Eu produced
aSpecialValue // Magic Number
- );
+ );
}
public static void addNewHotFuel(FluidStack aInput1, FluidStack aOutput1, FluidStack aOutput2, int aSpecialValue) {
@@ -28,11 +28,11 @@ public class HotFuel {
null,
null,
null,
- new FluidStack[] {aInput1},
- new FluidStack[] {aOutput1, aOutput2},
+ new FluidStack[] { aInput1 },
+ new FluidStack[] { aOutput1, aOutput2 },
20, // 1 Second
0, // No Eu produced
aSpecialValue // Magic Number
- );
+ );
}
}
diff --git a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java
index 08a9dbf3af..2a40cad100 100644
--- a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java
+++ b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java
@@ -2,14 +2,16 @@ package gregtech.api.util;
import static gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map.sSemiFluidLiquidFuels;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
import java.util.HashMap;
+
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+
public class SemiFluidFuelHandler {
public static boolean addSemiFluidFuel(ItemStack aFuelItem, int aFuelValue) {
@@ -31,15 +33,17 @@ public class SemiFluidFuelHandler {
new ItemStack[] {},
null,
new int[] {},
- new FluidStack[] {p},
+ new FluidStack[] { p },
null,
0,
0,
aFuelValue);
if (aRecipe.mSpecialValue > 0) {
- Logger.INFO("Added " + aRecipe.mFluidInputs[0].getLocalizedName()
- + " to the Semi-Fluid Generator fuel map. Fuel Produces " + (aRecipe.mSpecialValue * 1000)
- + "EU per 1000L.");
+ Logger.INFO(
+ "Added " + aRecipe.mFluidInputs[0].getLocalizedName()
+ + " to the Semi-Fluid Generator fuel map. Fuel Produces "
+ + (aRecipe.mSpecialValue * 1000)
+ + "EU per 1000L.");
sSemiFluidLiquidFuels.add(aRecipe);
return true;
}
@@ -53,8 +57,7 @@ public class SemiFluidFuelHandler {
final FluidStack aCreosote = FluidUtils.getFluidStack("creosote", 1000);
final FluidStack aHeavyFuel = FluidUtils.getFluidStack("liquid_heavy_fuel", 1000);
final FluidStack aHeavyOil = FluidUtils.getFluidStack("liquid_heavy_oil", 1000);
- final HashMap<Integer, Pair<FluidStack, Integer>> aFoundFluidsFromItems =
- new HashMap<Integer, Pair<FluidStack, Integer>>();
+ final HashMap<Integer, Pair<FluidStack, Integer>> aFoundFluidsFromItems = new HashMap<Integer, Pair<FluidStack, Integer>>();
// Find Fluids From items
for (final GT_Recipe r : gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDenseLiquidFuels.mRecipeList) {
@@ -76,8 +79,11 @@ public class SemiFluidFuelHandler {
}
}
g.mSpecialValue *= aContainsCreosote ? 6 : 3;
- Logger.INFO("Added " + g.mFluidInputs[0].getLocalizedName()
- + " to the Semi-Fluid Generator fuel map. Fuel Produces " + g.mSpecialValue + "EU per 1000L.");
+ Logger.INFO(
+ "Added " + g.mFluidInputs[0].getLocalizedName()
+ + " to the Semi-Fluid Generator fuel map. Fuel Produces "
+ + g.mSpecialValue
+ + "EU per 1000L.");
sSemiFluidLiquidFuels.add(g);
}
}
@@ -99,15 +105,17 @@ public class SemiFluidFuelHandler {
new ItemStack[] {},
null,
new int[] {},
- new FluidStack[] {p.getKey()},
+ new FluidStack[] { p.getKey() },
null,
0,
0,
aFuelValue);
if (aRecipe.mSpecialValue > 0) {
- Logger.INFO("Added " + aRecipe.mFluidInputs[0].getLocalizedName()
- + " to the Semi-Fluid Generator fuel map. Fuel Produces "
- + (aRecipe.mSpecialValue * 1000) + "EU per 1000L.");
+ Logger.INFO(
+ "Added " + aRecipe.mFluidInputs[0].getLocalizedName()
+ + " to the Semi-Fluid Generator fuel map. Fuel Produces "
+ + (aRecipe.mSpecialValue * 1000)
+ + "EU per 1000L.");
sSemiFluidLiquidFuels.add(aRecipe);
}
} else {
diff --git a/src/main/java/gregtech/api/util/ThermalFuel.java b/src/main/java/gregtech/api/util/ThermalFuel.java
index f5f882dafb..7bfb2b6a07 100644
--- a/src/main/java/gregtech/api/util/ThermalFuel.java
+++ b/src/main/java/gregtech/api/util/ThermalFuel.java
@@ -1,24 +1,25 @@
package gregtech.api.util;
-import gtPlusPlus.core.util.math.MathUtils;
import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.core.util.math.MathUtils;
+
public class ThermalFuel {
- public static void addThermalFuel(
- FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int euValue, int aSpecialValue) {
+ public static void addThermalFuel(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int euValue,
+ int aSpecialValue) {
GTPP_Recipe x = new GTPP_Recipe(
true,
null,
null,
null,
null,
- new FluidStack[] {aInput1, aInput2},
- new FluidStack[] {aOutput1},
+ new FluidStack[] { aInput1, aInput2 },
+ new FluidStack[] { aOutput1 },
20, // 1 Tick
euValue, // No Eu produced
aSpecialValue // Magic Number
- );
+ );
GTPP_Recipe.GTPP_Recipe_Map.sGeoThermalFuels.addRecipe(x);
}
@@ -29,12 +30,12 @@ public class ThermalFuel {
null,
null,
null,
- new FluidStack[] {aInput1},
+ new FluidStack[] { aInput1 },
null,
20, // 1 Tick
MathUtils.findPercentageOfInt((aInput1.amount / 2), 95), // No Eu produced
0 // Magic Number
- );
+ );
GTPP_Recipe.GTPP_Recipe_Map.sSteamTurbineFuels.addRecipe(x);
}
}
diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
index a5e80f5569..429537cc4a 100644
--- a/src/main/java/gtPlusPlus/GTplusplus.java
+++ b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -2,6 +2,15 @@ package gtPlusPlus;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collection;
+import java.util.HashMap;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.launchwrapper.Launch;
+
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.SidedProxy;
@@ -50,30 +59,24 @@ import gtPlusPlus.xmod.gregtech.loaders.GT_Material_Loader;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT_GTNH;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells;
import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Collection;
-import java.util.HashMap;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.launchwrapper.Launch;
@MCVersion(value = "1.7.10")
@Mod(
modid = CORE.MODID,
name = CORE.name,
version = CORE.VERSION,
- dependencies =
- "required-after:Forge; after:TConstruct; after:PlayerAPI; after:dreamcraft; after:IC2; after:ihl; after:psychedelicraft; required-after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO; after:tectech; after:GTRedtech; after:beyondrealitycore; after:OpenBlocks; after:IC2NuclearControl; after:TGregworks; after:StevesCarts; after:xreliquary; required-after:gtnhlib@[0.0.10,)")
+ dependencies = "required-after:Forge; after:TConstruct; after:PlayerAPI; after:dreamcraft; after:IC2; after:ihl; after:psychedelicraft; required-after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO; after:tectech; after:GTRedtech; after:beyondrealitycore; after:OpenBlocks; after:IC2NuclearControl; after:TGregworks; after:StevesCarts; after:xreliquary; required-after:gtnhlib@[0.0.10,)")
public class GTplusplus implements ActionListener {
public static enum INIT_PHASE {
+
SUPER(null),
PRE_INIT(SUPER),
INIT(PRE_INIT),
POST_INIT(INIT),
SERVER_START(POST_INIT),
STARTED(SERVER_START);
+
protected boolean mIsPhaseActive = false;
private final INIT_PHASE mPrev;
@@ -117,20 +120,16 @@ public class GTplusplus implements ActionListener {
public static void loadTextures() {
Logger.INFO("Loading some textures on the client.");
// Tools
- Logger.WARNING("Processing texture: "
- + TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath());
- Logger.WARNING("Processing texture: "
- + TexturesGtTools.ANGLE_GRINDER.getTextureFile().getResourcePath());
- Logger.WARNING("Processing texture: "
- + TexturesGtTools.ELECTRIC_SNIPS.getTextureFile().getResourcePath());
- Logger.WARNING("Processing texture: "
- + TexturesGtTools.ELECTRIC_LIGHTER.getTextureFile().getResourcePath());
- Logger.WARNING("Processing texture: "
- + TexturesGtTools.ELECTRIC_BUTCHER_KNIFE.getTextureFile().getResourcePath());
+ Logger.WARNING("Processing texture: " + TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath());
+ Logger.WARNING("Processing texture: " + TexturesGtTools.ANGLE_GRINDER.getTextureFile().getResourcePath());
+ Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_SNIPS.getTextureFile().getResourcePath());
+ Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_LIGHTER.getTextureFile().getResourcePath());
+ Logger.WARNING(
+ "Processing texture: " + TexturesGtTools.ELECTRIC_BUTCHER_KNIFE.getTextureFile().getResourcePath());
// Blocks
- Logger.WARNING("Processing texture: "
- + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath());
+ Logger.WARNING(
+ "Processing texture: " + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath());
}
public GTplusplus() {
@@ -209,15 +208,17 @@ public class GTplusplus implements ActionListener {
BlockEventHandler.init();
Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
- Logger.INFO("| Recipes succesfully Loaded: "
- + RegistrationHandler.recipesSuccess + " | Failed: "
- + RegistrationHandler.recipesFailed + " |");
+ Logger.INFO(
+ "| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess
+ + " | Failed: "
+ + RegistrationHandler.recipesFailed
+ + " |");
Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
Logger.INFO("Finally, we are finished. Have some cripsy bacon as a reward.");
// Log free GT++ Meta IDs
if (CORE.DEVENV) {
- // 750 - 999 are reserved for Alkalus.
+ // 750 - 999 are reserved for Alkalus.
for (int i = 750; i < 1000; i++) {
if (gregtech.api.GregTech_API.METATILEENTITIES[i] == null) {
Logger.INFO("MetaID " + i + " is free.");
@@ -254,15 +255,12 @@ public class GTplusplus implements ActionListener {
public void actionPerformed(final ActionEvent arg0) {}
/**
- * This {@link EventHandler} is called after the
- * {@link FMLPostInitializationEvent} stages of all loaded mods executes
- * successfully. {@link #onLoadComplete(FMLLoadCompleteEvent)} exists to
- * inject recipe generation after Gregtech and all other mods are entirely
- * loaded and initialized.
+ * This {@link EventHandler} is called after the {@link FMLPostInitializationEvent} stages of all loaded mods
+ * executes successfully. {@link #onLoadComplete(FMLLoadCompleteEvent)} exists to inject recipe generation after
+ * Gregtech and all other mods are entirely loaded and initialized.
*
- * @param event
- * - The {@link EventHandler} object passed through from FML to
- * {@link #GTplusplus()}'s {@link #instance}.
+ * @param event - The {@link EventHandler} object passed through from FML to {@link #GTplusplus()}'s
+ * {@link #instance}.
*/
@Mod.EventHandler
public void onLoadComplete(FMLLoadCompleteEvent event) {
@@ -272,9 +270,9 @@ public class GTplusplus implements ActionListener {
protected void generateGregtechRecipeMaps() {
- int[] mValidCount = new int[] {0, 0, 0};
- int[] mInvalidCount = new int[] {0, 0, 0, 0, 0};
- int[] mOriginalCount = new int[] {0, 0, 0};
+ int[] mValidCount = new int[] { 0, 0, 0 };
+ int[] mInvalidCount = new int[] { 0, 0, 0, 0, 0 };
+ int[] mOriginalCount = new int[] { 0, 0, 0 };
RecipeGen_BlastSmelterGT_GTNH.generateGTNHBlastSmelterRecipesFromEBFList();
FishPondFakeRecipe.generateFishPondRecipes();
@@ -289,102 +287,54 @@ public class GTplusplus implements ActionListener {
GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes,
GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT);
mInvalidCount[2] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
- GT_Recipe.GT_Recipe_Map.sVacuumRecipes, GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT);
+ GT_Recipe.GT_Recipe_Map.sVacuumRecipes,
+ GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT);
mInvalidCount[3] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
- GT_Recipe.GT_Recipe_Map.sMixerRecipes, GTPP_Recipe.GTPP_Recipe_Map.sMultiblockMixerRecipes_GT);
+ GT_Recipe.GT_Recipe_Map.sMixerRecipes,
+ GTPP_Recipe.GTPP_Recipe_Map.sMultiblockMixerRecipes_GT);
mInvalidCount[4] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes,
GTPP_Recipe.GTPP_Recipe_Map.sMultiblockChemicalDehydratorRecipes);
/*
-
- //Large Centrifuge generation
- mOriginalCount[0] = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.size();
- for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList) {
- if (x != null) {
- if (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) {
- if (CORE.RA.addMultiblockCentrifugeRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue)) {
- mValidCount[0]++;
- }
- else {
- mInvalidCount[0]++;
- }
- }
- else {
- Logger.INFO("[Recipe] Error generating Large Centrifuge recipe.");
- Logger.INFO("Inputs: "+ItemUtils.getArrayStackNames(x.mInputs));
- Logger.INFO("Fluid Inputs: "+ItemUtils.getArrayStackNames(x.mFluidInputs));
- Logger.INFO("Outputs: "+ItemUtils.getArrayStackNames(x.mOutputs));
- Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(x.mFluidOutputs));
- }
- }
- else {
- mInvalidCount[0]++;
- }
- }
-
- if (GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.size() < 1) {
- for (GT_Recipe a : GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList) {
- GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.add(a);
- }
- }
-
- //Large Electrolyzer generation
- mOriginalCount[1] = GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.size();
- for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList) {
- if (x != null) {
- if (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) {
- if (CORE.RA.addMultiblockElectrolyzerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue)) {
- mValidCount[1]++;
- }
- else {
- mInvalidCount[1]++;
- }
- }
- else {
- Logger.INFO("[Recipe] Error generating Large Electrolyzer recipe.");
- Logger.INFO("Inputs: "+ItemUtils.getArrayStackNames(x.mInputs));
- Logger.INFO("Fluid Inputs: "+ItemUtils.getArrayStackNames(x.mFluidInputs));
- Logger.INFO("Outputs: "+ItemUtils.getArrayStackNames(x.mOutputs));
- Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(x.mFluidOutputs));
- }
- }
- else {
- mInvalidCount[1]++;
- }
- }
-
- if (GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mRecipeList.size() < 1) {
- for (GT_Recipe a : GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mRecipeList) {
- GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.add(a);
- }
- }
-
- //Advanced Vacuum Freezer generation
- mOriginalCount[2] = GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList.size();
- for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList) {
- if (x != null && RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) {
- if (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) {
- if (CORE.RA.addAdvancedFreezerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue)) {
- mValidCount[2]++;
- }
- }
- else {
- mInvalidCount[2]++;
- }
- }
- else {
- mInvalidCount[2]++;
- }
- }
-
- //Redo plasma recipes in Adv. Vac.
- //Meta_GT_Proxy.generatePlasmaRecipesForAdvVacFreezer();
-
-
- String[] machineName = new String[] {"Centrifuge", "Electrolyzer", "Vacuum Freezer"};
- for (int i=0;i<3;i++) {
- Logger.INFO("[Recipe] Generated "+mValidCount[i]+" recipes for the Industrial "+machineName[i]+". The original machine can process "+mOriginalCount[i]+" recipes, meaning "+mInvalidCount[i]+" are invalid for this Multiblock's processing in some way.");
- }*/
+ * //Large Centrifuge generation mOriginalCount[0] =
+ * GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.size(); for (GT_Recipe x :
+ * GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList) { if (x != null) { if
+ * (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) { if
+ * (CORE.RA.addMultiblockCentrifugeRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances,
+ * x.mDuration, x.mEUt, x.mSpecialValue)) { mValidCount[0]++; } else { mInvalidCount[0]++; } } else {
+ * Logger.INFO("[Recipe] Error generating Large Centrifuge recipe.");
+ * Logger.INFO("Inputs: "+ItemUtils.getArrayStackNames(x.mInputs));
+ * Logger.INFO("Fluid Inputs: "+ItemUtils.getArrayStackNames(x.mFluidInputs));
+ * Logger.INFO("Outputs: "+ItemUtils.getArrayStackNames(x.mOutputs));
+ * Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(x.mFluidOutputs)); } } else { mInvalidCount[0]++;
+ * } } if (GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.size() < 1) { for (GT_Recipe
+ * a : GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList) {
+ * GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.add(a); } } //Large Electrolyzer generation
+ * mOriginalCount[1] = GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.size(); for (GT_Recipe x :
+ * GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList) { if (x != null) { if
+ * (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) { if
+ * (CORE.RA.addMultiblockElectrolyzerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances,
+ * x.mDuration, x.mEUt, x.mSpecialValue)) { mValidCount[1]++; } else { mInvalidCount[1]++; } } else {
+ * Logger.INFO("[Recipe] Error generating Large Electrolyzer recipe.");
+ * Logger.INFO("Inputs: "+ItemUtils.getArrayStackNames(x.mInputs));
+ * Logger.INFO("Fluid Inputs: "+ItemUtils.getArrayStackNames(x.mFluidInputs));
+ * Logger.INFO("Outputs: "+ItemUtils.getArrayStackNames(x.mOutputs));
+ * Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(x.mFluidOutputs)); } } else { mInvalidCount[1]++;
+ * } } if (GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mRecipeList.size() < 1) { for
+ * (GT_Recipe a : GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mRecipeList) {
+ * GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.add(a); } } //Advanced Vacuum Freezer
+ * generation mOriginalCount[2] = GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList.size(); for (GT_Recipe x :
+ * GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList) { if (x != null &&
+ * RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) { if (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs))
+ * { if (CORE.RA.addAdvancedFreezerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances,
+ * x.mDuration, x.mEUt, x.mSpecialValue)) { mValidCount[2]++; } } else { mInvalidCount[2]++; } } else {
+ * mInvalidCount[2]++; } } //Redo plasma recipes in Adv. Vac.
+ * //Meta_GT_Proxy.generatePlasmaRecipesForAdvVacFreezer(); String[] machineName = new String[] {"Centrifuge",
+ * "Electrolyzer", "Vacuum Freezer"}; for (int i=0;i<3;i++) {
+ * Logger.INFO("[Recipe] Generated "+mValidCount[i]+" recipes for the Industrial "+machineName[i]
+ * +". The original machine can process "+mOriginalCount[i]+" recipes, meaning "+mInvalidCount[i]
+ * +" are invalid for this Multiblock's processing in some way."); }
+ */
}
protected void dumpGtRecipeMap(final GT_Recipe_Map r) {
@@ -458,22 +408,23 @@ public class GTplusplus implements ActionListener {
sMissingItemMappings.put(
"miscutils:itemCellZirconiumTetrafluoride",
GameRegistry.findItem(CORE.MODID, "ZirconiumTetrafluoride"));
- sMissingItemMappings.put(
- "miscutils:Li2BeF4", GameRegistry.findItem(CORE.MODID, "itemCellLithiumTetrafluoroberyllate"));
+ sMissingItemMappings
+ .put("miscutils:Li2BeF4", GameRegistry.findItem(CORE.MODID, "itemCellLithiumTetrafluoroberyllate"));
// Cryolite
sMissingBlockMappings.put("miscutils:oreCryolite", GameRegistry.findBlock(CORE.MODID, "oreCryoliteF"));
- sMissingItemMappings.put(
- "miscutils:itemDustTinyCryolite", GameRegistry.findItem(CORE.MODID, "itemDustTinyCryoliteF"));
- sMissingItemMappings.put(
- "miscutils:itemDustSmallCryolite", GameRegistry.findItem(CORE.MODID, "itemDustSmallCryoliteF"));
+ sMissingItemMappings
+ .put("miscutils:itemDustTinyCryolite", GameRegistry.findItem(CORE.MODID, "itemDustTinyCryoliteF"));
+ sMissingItemMappings
+ .put("miscutils:itemDustSmallCryolite", GameRegistry.findItem(CORE.MODID, "itemDustSmallCryoliteF"));
sMissingItemMappings.put("miscutils:itemDustCryolite", GameRegistry.findItem(CORE.MODID, "itemDustCryoliteF"));
sMissingItemMappings.put("miscutils:dustPureCryolite", GameRegistry.findItem(CORE.MODID, "dustPureCryoliteF"));
- sMissingItemMappings.put(
- "miscutils:dustImpureCryolite", GameRegistry.findItem(CORE.MODID, "dustImpureCryoliteF"));
+ sMissingItemMappings
+ .put("miscutils:dustImpureCryolite", GameRegistry.findItem(CORE.MODID, "dustImpureCryoliteF"));
sMissingItemMappings.put("miscutils:crushedCryolite", GameRegistry.findItem(CORE.MODID, "crushedCryoliteF"));
sMissingItemMappings.put(
- "miscutils:crushedPurifiedCryolite", GameRegistry.findItem(CORE.MODID, "crushedPurifiedCryoliteF"));
+ "miscutils:crushedPurifiedCryolite",
+ GameRegistry.findItem(CORE.MODID, "crushedPurifiedCryoliteF"));
sMissingItemMappings.put(
"miscutils:crushedCentrifugedCryolite",
GameRegistry.findItem(CORE.MODID, "crushedCentrifugedCryoliteF"));
@@ -481,17 +432,18 @@ public class GTplusplus implements ActionListener {
// Fluorite
sMissingBlockMappings.put("miscutils:oreFluorite", GameRegistry.findBlock(CORE.MODID, "oreFluoriteF"));
- sMissingItemMappings.put(
- "miscutils:itemDustTinyFluorite", GameRegistry.findItem(CORE.MODID, "itemDustTinyFluoriteF"));
- sMissingItemMappings.put(
- "miscutils:itemDustSmallFluorite", GameRegistry.findItem(CORE.MODID, "itemDustSmallFluoriteF"));
+ sMissingItemMappings
+ .put("miscutils:itemDustTinyFluorite", GameRegistry.findItem(CORE.MODID, "itemDustTinyFluoriteF"));
+ sMissingItemMappings
+ .put("miscutils:itemDustSmallFluorite", GameRegistry.findItem(CORE.MODID, "itemDustSmallFluoriteF"));
sMissingItemMappings.put("miscutils:itemDustFluorite", GameRegistry.findItem(CORE.MODID, "itemDustFluoriteF"));
sMissingItemMappings.put("miscutils:dustPureFluorite", GameRegistry.findItem(CORE.MODID, "dustPureFluoriteF"));
- sMissingItemMappings.put(
- "miscutils:dustImpureFluorite", GameRegistry.findItem(CORE.MODID, "dustImpureFluoriteF"));
+ sMissingItemMappings
+ .put("miscutils:dustImpureFluorite", GameRegistry.findItem(CORE.MODID, "dustImpureFluoriteF"));
sMissingItemMappings.put("miscutils:crushedFluorite", GameRegistry.findItem(CORE.MODID, "crushedFluoriteF"));
sMissingItemMappings.put(
- "miscutils:crushedPurifiedFluorite", GameRegistry.findItem(CORE.MODID, "crushedPurifiedFluoriteF"));
+ "miscutils:crushedPurifiedFluorite",
+ GameRegistry.findItem(CORE.MODID, "crushedPurifiedFluoriteF"));
sMissingItemMappings.put(
"miscutils:crushedCentrifugedFluorite",
GameRegistry.findItem(CORE.MODID, "crushedCentrifugedFluoriteF"));
diff --git a/src/main/java/gtPlusPlus/GenerateDictionaries.java b/src/main/java/gtPlusPlus/GenerateDictionaries.java
index 2298975454..0ac2a3241d 100644
--- a/src/main/java/gtPlusPlus/GenerateDictionaries.java
+++ b/src/main/java/gtPlusPlus/GenerateDictionaries.java
@@ -1,6 +1,5 @@
package gtPlusPlus;
-import gtPlusPlus.api.objects.random.XSTR;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -14,6 +13,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Random;
+import gtPlusPlus.api.objects.random.XSTR;
+
public class GenerateDictionaries {
public static void main(String[] args) {
@@ -144,16 +145,15 @@ public class GenerateDictionaries {
return newSize > oldSize;
}
}
- } catch (IOException e) {
- }
+ } catch (IOException e) {}
return false;
}
/**
- * Reads the contents of a file line by line to a List of Strings using the default encoding for the VM.
- * The file is always closed.
+ * Reads the contents of a file line by line to a List of Strings using the default encoding for the VM. The
+ * file is always closed.
*
- * @param file the file to read, must not be {@code null}
+ * @param file the file to read, must not be {@code null}
* @return the list of Strings representing each line in the file, never {@code null}
* @throws IOException in case of an I/O error
* @since 1.3
diff --git a/src/main/java/gtPlusPlus/RoadMap.java b/src/main/java/gtPlusPlus/RoadMap.java
index bd8cee7198..e10c40d1cf 100644
--- a/src/main/java/gtPlusPlus/RoadMap.java
+++ b/src/main/java/gtPlusPlus/RoadMap.java
@@ -17,56 +17,31 @@ public class RoadMap {
// Recreation of GUIs for all Multiblocks
/*
- * Most Multi's use generic or straight out wrong GUI's on the controller.
- * I'd like to go back and recreate all of these.
- *
- * Some could even benefit from a totally new type of UI (Instead of Text issues, just change a 2x2px area between red and green for status lights)
- * These advanced GUIs are probably out of my capability, but if anyone thinks they're a good idea, I'll give them a go.
+ * Most Multi's use generic or straight out wrong GUI's on the controller. I'd like to go back and recreate all of
+ * these. Some could even benefit from a totally new type of UI (Instead of Text issues, just change a 2x2px area
+ * between red and green for status lights) These advanced GUIs are probably out of my capability, but if anyone
+ * thinks they're a good idea, I'll give them a go.
*/
// Better Integration with GTNH
/*
* Refactor things to be more common, refactor things to automatically switch between GTNH and standard variants
- * without having to over-abuse CORE.GTNH switches everywhere.
- * Most of this can be done via expanding CI.java, so that we have automated handlers for everything
- * (IE. getX(5) will get 5x of the correct version of X)
+ * without having to over-abuse CORE.GTNH switches everywhere. Most of this can be done via expanding CI.java, so
+ * that we have automated handlers for everything (IE. getX(5) will get 5x of the correct version of X)
*/
/*
- Thallium - Everglades only. (Mostly useless)
- Technetium - Has some recipes but seem to be dead ends so unobtainable.
- Polonium - Unobtainable. (Radioactive, Mostly Useless)
- Francium - Unobtainable. (Radioactive, Mostly Useless)
- Promethium - Unobtainable.
- Radium - Everglades only. (Do use, Moderately Rare)
- Actinium - Unobtainable. (Radioactive, Do use)
- Proactinium - Unobtainable. (Do use)
- Neptunium - Has some recipes but seem to be dead ends so unobtainable.
- Curium - Fusion only.
- Berkelium - Unobtainable.
- Californium - Fusion only.
- Einsteinium - Unobtainable.
- Fermium - Unobtainable.
- Strontium - Everglades only. (Do use 1)
- Iodine - Everglades only.
- Dysprosium - Everglades only. (Do use 1)
- Rhenium - Weird ABS recipe only.
- Flerovium - Unobtainable.
- Dubnium - Unobtainable.
- Seaborgium - Unobtainable.
- Bohrium - Unobtainable.
- Hassium - Unobtainable.
- Meitnerium - Unobtainable.
- Darmstadtium - Unobtainable.
- Roentgenium - Unobtainable.
- Copernicium - Unobtainable.
- Nihonium - Unobtainable.
- Moscovium - Unobtainable.
- Livermorium - Unobtainable.
- Tennessine - Unobtainable.
- Nobelium - Unobtainable.
- Lawrencium - Unobtainable.
- Astatine - Unobtainable. (Radioactive, Mostly Useless)
+ * Thallium - Everglades only. (Mostly useless) Technetium - Has some recipes but seem to be dead ends so
+ * unobtainable. Polonium - Unobtainable. (Radioactive, Mostly Useless) Francium - Unobtainable. (Radioactive,
+ * Mostly Useless) Promethium - Unobtainable. Radium - Everglades only. (Do use, Moderately Rare) Actinium -
+ * Unobtainable. (Radioactive, Do use) Proactinium - Unobtainable. (Do use) Neptunium - Has some recipes but seem to
+ * be dead ends so unobtainable. Curium - Fusion only. Berkelium - Unobtainable. Californium - Fusion only.
+ * Einsteinium - Unobtainable. Fermium - Unobtainable. Strontium - Everglades only. (Do use 1) Iodine - Everglades
+ * only. Dysprosium - Everglades only. (Do use 1) Rhenium - Weird ABS recipe only. Flerovium - Unobtainable. Dubnium
+ * - Unobtainable. Seaborgium - Unobtainable. Bohrium - Unobtainable. Hassium - Unobtainable. Meitnerium -
+ * Unobtainable. Darmstadtium - Unobtainable. Roentgenium - Unobtainable. Copernicium - Unobtainable. Nihonium -
+ * Unobtainable. Moscovium - Unobtainable. Livermorium - Unobtainable. Tennessine - Unobtainable. Nobelium -
+ * Unobtainable. Lawrencium - Unobtainable. Astatine - Unobtainable. (Radioactive, Mostly Useless)
*/
}
diff --git a/src/main/java/gtPlusPlus/api/damage/DamageTeslaTower.java b/src/main/java/gtPlusPlus/api/damage/DamageTeslaTower.java
index e37a86aaa5..0d9d4d5dc2 100644
--- a/src/main/java/gtPlusPlus/api/damage/DamageTeslaTower.java
+++ b/src/main/java/gtPlusPlus/api/damage/DamageTeslaTower.java
@@ -1,11 +1,12 @@
package gtPlusPlus.api.damage;
-import gtPlusPlus.core.world.damage.BaseCustomDamageSource;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.IChatComponent;
+import gtPlusPlus.core.world.damage.BaseCustomDamageSource;
+
public class DamageTeslaTower extends BaseCustomDamageSource {
public DamageTeslaTower(Entity transmitter) {
diff --git a/src/main/java/gtPlusPlus/api/enums/Quality.java b/src/main/java/gtPlusPlus/api/enums/Quality.java
index d6f0667e20..efcf2a015f 100644
--- a/src/main/java/gtPlusPlus/api/enums/Quality.java
+++ b/src/main/java/gtPlusPlus/api/enums/Quality.java
@@ -1,8 +1,9 @@
package gtPlusPlus.api.enums;
-import gtPlusPlus.core.util.math.MathUtils;
import net.minecraft.util.EnumChatFormatting;
+import gtPlusPlus.core.util.math.MathUtils;
+
public enum Quality {
// Magic Blue
diff --git a/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java b/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java
index 99e14cae01..a85bd42213 100644
--- a/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java
+++ b/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java
@@ -1,5 +1,10 @@
package gtPlusPlus.api.helpers;
+import java.util.HashMap;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.WeightedCollection;
import gtPlusPlus.api.objects.minecraft.multi.SpecialMultiBehaviour;
@@ -7,9 +12,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG;
import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler;
-import java.util.HashMap;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
public class GregtechPlusPlus_API {
@@ -22,25 +24,25 @@ public class GregtechPlusPlus_API {
public static class Multiblock_API {
- private static final HashMap<String, SpecialMultiBehaviour> mSpecialBehaviourItemMap =
- new HashMap<String, SpecialMultiBehaviour>();
+ private static final HashMap<String, SpecialMultiBehaviour> mSpecialBehaviourItemMap = new HashMap<String, SpecialMultiBehaviour>();
/**
* Register a special behaviour for GT++ Multis to listen use.
+ *
* @param aBehaviour - An Object which has extended {@link SpecialMultiBehaviour}'s base implementation.
* @return - Did this behaviour register properly?
*/
public static boolean registerSpecialMultiBehaviour(SpecialMultiBehaviour aBehaviour) {
- if (aBehaviour.getTriggerItem() == null
- || aBehaviour.getTriggerItemTooltip() == null
+ if (aBehaviour.getTriggerItem() == null || aBehaviour.getTriggerItemTooltip() == null
|| aBehaviour.getTriggerItemTooltip().length() <= 0) {
- Logger.INFO("Failed to attach custom multiblock logic to "
- + ItemUtils.getItemName(aBehaviour.getTriggerItem()));
+ Logger.INFO(
+ "Failed to attach custom multiblock logic to "
+ + ItemUtils.getItemName(aBehaviour.getTriggerItem()));
return false;
}
mSpecialBehaviourItemMap.put("UniqueKey_" + aBehaviour.hashCode(), aBehaviour);
- SpecialBehaviourTooltipHandler.addTooltipForItem(
- aBehaviour.getTriggerItem(), aBehaviour.getTriggerItemTooltip());
+ SpecialBehaviourTooltipHandler
+ .addTooltipForItem(aBehaviour.getTriggerItem(), aBehaviour.getTriggerItemTooltip());
Logger.INFO("Attached custom multiblock logic to " + ItemUtils.getItemName(aBehaviour.getTriggerItem()));
return true;
}
@@ -51,7 +53,8 @@ public class GregtechPlusPlus_API {
/**
* Allows RTG Fuel pellets from other mods to be used in the RTG hatch.
- * @param aStack - The Pellet Stack, sanitsed after passing through.
+ *
+ * @param aStack - The Pellet Stack, sanitsed after passing through.
* @param aFuelValue - The Fuel Value of the Pellet to be added to the energy storage.
* @return - Did register?
*/
@@ -71,7 +74,8 @@ public class GregtechPlusPlus_API {
/**
*
* Registers an ore block for a dimension. Uses a default weight of 100.
- * @param aDim - The Dimension ID
+ *
+ * @param aDim - The Dimension ID
* @param aOredictName - The OreDict name of the Ore to be mined.
* @return - If there was a valid Block found in the OreDict for the provided name.
*/
@@ -82,9 +86,10 @@ public class GregtechPlusPlus_API {
/**
*
* Registers an ore block for a dimension. Uses a default weight of 100.
- * @param aDim - The Dimension ID
+ *
+ * @param aDim - The Dimension ID
* @param aOredictName - The OreDict name of the Ore to be mined.
- * @param aWeight - The weight of this ore Block.
+ * @param aWeight - The weight of this ore Block.
* @return - If there was a valid Block found in the OreDict for the provided name.
*/
public static boolean registerOreForVoidMiner(int aDim, String aOredictName, int aWeight) {
@@ -107,7 +112,8 @@ public class GregtechPlusPlus_API {
/**
* Registers an ore block for a dimension. Uses a default weight of 100.
- * @param aDim - The Dimension ID
+ *
+ * @param aDim - The Dimension ID
* @param aOreBlock - The Ore Block to be mined.
*/
public static void registerOreForVoidMiner(int aDim, Block aOreBlock) {
@@ -116,9 +122,10 @@ public class GregtechPlusPlus_API {
/**
* Registers an ore block for a dimension.
- * @param aDim - The Dimension ID
+ *
+ * @param aDim - The Dimension ID
* @param aOreBlock - The Ore Block to be mined.
- * @param aWeight - The weight of this ore Block.
+ * @param aWeight - The weight of this ore Block.
*/
public static void registerOreForVoidMiner(int aDim, Block aOreBlock, int aWeight) {
GregtechPlusPlus_API_Internal.writeBlockToDimensionInCache(aDim, 0, aOreBlock, aWeight);
@@ -126,7 +133,8 @@ public class GregtechPlusPlus_API {
/**
* Registers a surface block for a dimension. Uses a default weight of 100.
- * @param aDim - The Dimension ID
+ *
+ * @param aDim - The Dimension ID
* @param aDirtBlock - The Dirt/Grass Block to be mined.
*/
public static void registerEarthSurfaceForVoidMiner(int aDim, Block aDirtBlock) {
@@ -135,9 +143,10 @@ public class GregtechPlusPlus_API {
/**
* Registers a surface block for a dimension.
- * @param aDim - The Dimension ID
+ *
+ * @param aDim - The Dimension ID
* @param aDirtBlock - The Dirt/Grass Block to be mined.
- * @param aWeight - The weight of this Dirt/Grass Block.
+ * @param aWeight - The weight of this Dirt/Grass Block.
*/
public static void registerEarthSurfaceForVoidMiner(int aDim, Block aDirtBlock, int aWeight) {
GregtechPlusPlus_API_Internal.writeBlockToDimensionInCache(aDim, 0, aDirtBlock, aWeight);
@@ -145,7 +154,8 @@ public class GregtechPlusPlus_API {
/**
* Registers a stone block for a dimension. Uses a default weight of 100.
- * @param aDim - The Dimension ID
+ *
+ * @param aDim - The Dimension ID
* @param aStoneBlock - The Stone Block to be mined.
*/
public static void registerEarthStoneForVoidMiner(int aDim, Block aStoneBlock) {
@@ -154,9 +164,10 @@ public class GregtechPlusPlus_API {
/**
* Registers a stone block for a dimension.
- * @param aDim - The Dimension ID
+ *
+ * @param aDim - The Dimension ID
* @param aStoneBlock - The Stone Block to be mined.
- * @param aWeight - The weight of this Stone Block.
+ * @param aWeight - The weight of this Stone Block.
*/
public static void registerEarthStoneForVoidMiner(int aDim, Block aStoneBlock, int aWeight) {
GregtechPlusPlus_API_Internal.writeBlockToDimensionInCache(aDim, 0, aStoneBlock, aWeight);
@@ -190,8 +201,8 @@ public class GregtechPlusPlus_API {
aMappedBlocks.put(aWeight, aBlock);
}
- private static WeightedCollection<Block> getBlockMap(
- int aType, HashMap<String, WeightedCollection<Block>> aDimMap) {
+ private static WeightedCollection<Block> getBlockMap(int aType,
+ HashMap<String, WeightedCollection<Block>> aDimMap) {
WeightedCollection<Block> aMappedBlocks;
String aTypeName = ((aType == 0) ? "ore" : (aType == 1) ? "dirt" : (aType == 2) ? "stone" : "error");
aMappedBlocks = aDimMap.get(aTypeName);
diff --git a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java
index 3f14a9de03..dccb7371d5 100644
--- a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java
+++ b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java
@@ -1,5 +1,10 @@
package gtPlusPlus.api.helpers;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
@@ -7,9 +12,6 @@ import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import net.minecraft.item.ItemStack;
public class MaterialHelper {
@@ -23,38 +25,25 @@ public class MaterialHelper {
/**
* Generates a 16 Fluid Pipe
+ *
* @see {@code Example: Copper 16x Pipe (Materials.Copper, Materials.Copper.mName, "Copper", ID, 60, 1000, true)}
- * @param aMaterial - Pipe Material
- * @param name - Pipe Internal name
- * @param displayName - Pipe Display Name
- * @param aID - Pipe's Meta ID
+ * @param aMaterial - Pipe Material
+ * @param name - Pipe Internal name
+ * @param displayName - Pipe Display Name
+ * @param aID - Pipe's Meta ID
* @param baseCapacity - Pipes Base Capacity
* @param heatCapacity - Pipe Max Temp
- * @param gasProof - Is Gas Proof?
+ * @param gasProof - Is Gas Proof?
* @return A boolean which corresponds to whether or not the Pipe was registered to the Ore Dictionary.
*/
- public static boolean generateHexadecuplePipe(
- Materials aMaterial,
- String name,
- String displayName,
- int aID,
- int baseCapacity,
- int heatCapacity,
- boolean gasProof) {
+ public static boolean generateHexadecuplePipe(Materials aMaterial, String name, String displayName, int aID,
+ int baseCapacity, int heatCapacity, boolean gasProof) {
if (Utils.getGregtechVersionAsInt() >= 50930) {
try {
Class<GT_MetaPipeEntity_Fluid> aPipeEntity = GT_MetaPipeEntity_Fluid.class;
- Constructor<GT_MetaPipeEntity_Fluid> constructor = aPipeEntity.getConstructor(new Class[] {
- int.class,
- String.class,
- String.class,
- float.class,
- Materials.class,
- int.class,
- int.class,
- boolean.class,
- int.class
- });
+ Constructor<GT_MetaPipeEntity_Fluid> constructor = aPipeEntity.getConstructor(
+ new Class[] { int.class, String.class, String.class, float.class, Materials.class, int.class,
+ int.class, boolean.class, int.class });
if (constructor != null) {
GT_MetaPipeEntity_Fluid aPipe;
aPipe = constructor.newInstance(
@@ -70,13 +59,8 @@ public class MaterialHelper {
return GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L));
}
- } catch (NoSuchMethodException
- | SecurityException
- | InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException e) {
- }
+ } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException e) {}
}
return false;
}
diff --git a/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java b/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java
index ad65c03429..cec4d12716 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java
@@ -1,6 +1,7 @@
package gtPlusPlus.api.interfaces;
import java.util.Set;
+
import net.minecraft.world.ChunkCoordIntPair;
public interface IChunkLoader {
diff --git a/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java b/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java
index 830b34a41d..06727167bf 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java
@@ -2,4 +2,5 @@ package gtPlusPlus.api.interfaces;
import gregtech.api.util.GT_Recipe;
-public interface IComparableRecipe extends Comparable<GT_Recipe> {}
+public interface IComparableRecipe extends Comparable<GT_Recipe> {
+}
diff --git a/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java b/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java
index 9e3ea89606..e3aa00e7a1 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java
@@ -1,10 +1,11 @@
package gtPlusPlus.api.interfaces;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+
public interface IEntityCatcher {
public boolean hasEntity(ItemStack aStack);
diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java b/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java
index 251eaa416c..95cd46e443 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java
@@ -1,9 +1,11 @@
package gtPlusPlus.api.interfaces;
import java.util.Random;
+
import net.minecraft.world.World;
public abstract interface IGeneratorWorld {
+
public abstract boolean generate(World paramWorld, Random paramRandom, int paramInt1, int paramInt2);
public abstract void initiate();
diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java
index b4223fb558..64c2198662 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java
@@ -1,12 +1,13 @@
package gtPlusPlus.api.interfaces;
-import gregtech.api.interfaces.IDescribable;
-import gregtech.api.interfaces.tileentity.*;
import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
+import gregtech.api.interfaces.IDescribable;
+import gregtech.api.interfaces.tileentity.*;
+
public abstract interface IGregtechPower
extends IGearEnergyTileEntity, ITurnable, IGregTechDeviceInformation, IDescribable, IBasicEnergyContainer {
@@ -134,10 +135,9 @@ public abstract interface IGregtechPower
return true;
}
- /* boolean onPreTick(TilePoweredGT tilePoweredGT, long mTickTimer2);
-
- boolean onTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2);
-
- boolean onPostTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2);*/
+ /*
+ * boolean onPreTick(TilePoweredGT tilePoweredGT, long mTickTimer2); boolean onTick(TilePoweredGT
+ * iGregTechTileEntity, long mTickTimer2); boolean onPostTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2);
+ */
}
diff --git a/src/main/java/gtPlusPlus/api/interfaces/IPlugin.java b/src/main/java/gtPlusPlus/api/interfaces/IPlugin.java
index 1f7991540a..d70a19925e 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/IPlugin.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/IPlugin.java
@@ -10,9 +10,8 @@ public interface IPlugin {
public String getPluginName();
/**
- * @return
- * A {@link String} object which returns the {@link IPlugin}'s short name.
- * This String should only contain 4 Characters.
+ * @return A {@link String} object which returns the {@link IPlugin}'s short name. This String should only contain 4
+ * Characters.
*/
public String getPluginAbbreviation();
diff --git a/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java b/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java
index b61528e4b9..ddb4d4d2f1 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java
@@ -1,35 +1,18 @@
/*
- * Copyright 2005, Nick Galbreath -- nickg [at] modp [dot] com
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Neither the name of the modp.com nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This is the standard "new" BSD license:
+ * Copyright 2005, Nick Galbreath -- nickg [at] modp [dot] com All rights reserved. Redistribution and use in source and
+ * binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+ * disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+ * following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of
+ * the modp.com nor the names of its contributors may be used to endorse or promote products derived from this software
+ * without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE. This is the standard "new" BSD license:
* http://www.opensource.org/licenses/bsd-license.php
*/
@@ -47,6 +30,7 @@ public interface IRandomGenerator {
* Returns N random bits
*
* See also java.util.Random#next
+ *
* @param numBits
* @return and int with the LSB being random
*/
diff --git a/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java
index 815c399caf..5f45964ca8 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java
@@ -1,8 +1,9 @@
package gtPlusPlus.api.interfaces;
+import net.minecraft.block.Block;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
-import net.minecraft.block.Block;
public interface ITexturedBlock extends ITexturedTileEntity {
diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java
index 78f8ff101b..9b6591abd2 100644
--- a/src/main/java/gtPlusPlus/api/objects/Logger.java
+++ b/src/main/java/gtPlusPlus/api/objects/Logger.java
@@ -1,11 +1,12 @@
package gtPlusPlus.api.objects;
+import org.apache.logging.log4j.LogManager;
+
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.relauncher.FMLRelaunchLog;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.preloader.asm.AsmConfig;
-import org.apache.logging.log4j.LogManager;
public class Logger {
@@ -88,6 +89,7 @@ public class Logger {
public static void BEES(final String s) {
modLogger.info("[Bees] " + s);
}
+
/**
* Special Logger for Debugging Bee related content
*/
@@ -109,6 +111,7 @@ public class Logger {
}
}
}
+
/**
* Special Logger for Debugging Materials related content
*/
@@ -145,7 +148,7 @@ public class Logger {
public static void RECIPE(String string) {
if (enabled) {
if (
- /*CORE_Preloader.DEV_ENVIRONMENT || */ CORE_Preloader.DEBUG_MODE) {
+ /* CORE_Preloader.DEV_ENVIRONMENT || */ CORE_Preloader.DEBUG_MODE) {
modLogger.info("[Recipe] " + string);
}
}
diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
index f0687fae4f..92ba97e722 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
@@ -34,6 +34,7 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
/**
* Generates an AutoMap from the List.
+ *
* @param aList - Data to be inserted into the AutoMap.
*/
public AutoMap(List<V> aList) {
@@ -45,8 +46,10 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
}
}
}
+
/**
* Generates an AutoMap from a Set.
+ *
* @param aList - Data to be inserted into the AutoMap.
*/
public AutoMap(Set<V> aList) {
@@ -58,8 +61,10 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
}
}
}
+
/**
* Generates an AutoMap from a Collection.
+ *
* @param aList - Data to be inserted into the AutoMap.
*/
public AutoMap(Collection<V> aList) {
@@ -74,6 +79,7 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
/**
* Generates an AutoMap from a Array.
+ *
* @param aArray - Data to be inserted into the AutoMap.
*/
public AutoMap(V[] aArray) {
diff --git a/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java b/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java
index 698e56ae45..8ec21dab59 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java
@@ -1,8 +1,9 @@
package gtPlusPlus.api.objects.data;
-import com.google.common.base.Objects;
import java.io.Serializable;
+import com.google.common.base.Objects;
+
public class FlexiblePair<K, V> implements Serializable {
/**
diff --git a/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java b/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java
index 1f8a4baa2c..eff314f9ae 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java
@@ -6,6 +6,7 @@ import java.util.Arrays;
* Object-2-object map based on IntIntMap4a
*/
public class ObjMap<K, V> {
+
private static final Object FREE_KEY = new Object();
private static final Object REMOVED_KEY = new Object();
@@ -51,7 +52,7 @@ public class ObjMap<K, V> {
if (k == FREE_KEY) return null; // end of chain already
if (k.equals(key)) // we check FREE and REMOVED prior to this call
- return (V) m_data[ptr + 1];
+ return (V) m_data[ptr + 1];
while (true) {
ptr = (ptr + 2) & m_mask2; // that's next index
k = m_data[ptr];
@@ -72,7 +73,7 @@ public class ObjMap<K, V> {
m_data[ptr] = key;
m_data[ptr + 1] = value;
if (m_size >= m_threshold) rehash(m_data.length * 2); // size is set inside
- else ++m_size;
+ else++m_size;
return null;
} else if (k.equals(key)) // we check FREE and REMOVED prior to this call
{
@@ -92,7 +93,7 @@ public class ObjMap<K, V> {
m_data[ptr] = key;
m_data[ptr + 1] = value;
if (m_size >= m_threshold) rehash(m_data.length * 2); // size is set inside
- else ++m_size;
+ else++m_size;
return null;
} else if (k.equals(key)) {
final Object ret = m_data[ptr + 1];
@@ -196,9 +197,11 @@ public class ObjMap<K, V> {
/** Taken from FastUtil implementation */
- /** Return the least power of two greater than or equal to the specified value.
+ /**
+ * Return the least power of two greater than or equal to the specified value.
*
- * <p>Note that this function will return 1 when the argument is 0.
+ * <p>
+ * Note that this function will return 1 when the argument is 0.
*
* @param x a long integer smaller than or equal to 2<sup>62</sup>.
* @return the least power of two greater than or equal to the specified value.
@@ -214,18 +217,19 @@ public class ObjMap<K, V> {
return (x | x >> 32) + 1;
}
- /** Returns the least power of two smaller than or equal to 2<sup>30</sup> and larger than or equal to <code>Math.ceil( expected / f )</code>.
+ /**
+ * Returns the least power of two smaller than or equal to 2<sup>30</sup> and larger than or equal to
+ * <code>Math.ceil( expected / f )</code>.
*
* @param expected the expected number of elements in a hash table.
- * @param f the load factor.
+ * @param f the load factor.
* @return the minimum possible size for a backing array.
* @throws IllegalArgumentException if the necessary size is larger than 2<sup>30</sup>.
*/
public static int arraySize(final int expected, final float f) {
final long s = Math.max(2, nextPowerOfTwo((long) Math.ceil(expected / f)));
- if (s > (1 << 30))
- throw new IllegalArgumentException(
- "Too large (" + expected + " expected elements with load factor " + f + ")");
+ if (s > (1 << 30)) throw new IllegalArgumentException(
+ "Too large (" + expected + " expected elements with load factor " + f + ")");
return (int) s;
}
diff --git a/src/main/java/gtPlusPlus/api/objects/data/Pair.java b/src/main/java/gtPlusPlus/api/objects/data/Pair.java
index 33b2ade368..93bf075c8f 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/Pair.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/Pair.java
@@ -1,8 +1,9 @@
package gtPlusPlus.api.objects.data;
-import com.google.common.base.Objects;
import java.io.Serializable;
+import com.google.common.base.Objects;
+
public class Pair<K, V> implements Serializable {
/**
diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java
index 6acf62aa53..c282ce1eb3 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java
@@ -1,16 +1,16 @@
package gtPlusPlus.api.objects.data;
-import gtPlusPlus.api.objects.Logger;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
+import gtPlusPlus.api.objects.Logger;
+
public class TypeCounter<V> implements Set<V> {
- private Map<String, InternalTypeCounterObject<V>> mInternalMap =
- new LinkedHashMap<String, InternalTypeCounterObject<V>>();
+ private Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<String, InternalTypeCounterObject<V>>();
private String mHighestValueKey;
private int mHighestValue = 0;
private final Class mClass;
@@ -21,6 +21,7 @@ public class TypeCounter<V> implements Set<V> {
}
public static class InternalTypeCounterObject<Z> {
+
private final Z mObject;
private int mCounter = 0;
diff --git a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java
index 20eed5cdc5..46cb8b35d9 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java
@@ -1,6 +1,5 @@
package gtPlusPlus.api.objects.data;
-import gtPlusPlus.api.objects.random.XSTR;
import java.util.Collection;
import java.util.Map;
import java.util.NavigableMap;
@@ -8,6 +7,8 @@ import java.util.Random;
import java.util.Set;
import java.util.TreeMap;
+import gtPlusPlus.api.objects.random.XSTR;
+
public class WeightedCollection<E> implements Map<Integer, E> {
private NavigableMap<Integer, E> map = new TreeMap<Integer, E>();
diff --git a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java
index fcf6131611..c9176c00c5 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java
@@ -1,9 +1,11 @@
package gtPlusPlus.api.objects.data.weakref;
-import gtPlusPlus.api.objects.data.AutoMap;
import java.util.WeakHashMap;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class WeakAutoMap<T> extends AutoMap<T> {
+
private static final long serialVersionUID = 8328345351801363386L;
public WeakAutoMap() {
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java b/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java
index cefc4fce37..e516f12ddd 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java
@@ -1,12 +1,14 @@
package gtPlusPlus.api.objects.minecraft;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
import net.minecraft.entity.Entity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
/**
* Generates an AABB around an entity.
+ *
* @author Alkalus
*
*/
@@ -17,10 +19,11 @@ public class AABB {
/**
* Creates a AxisAlignedBB based around an Entity.
+ *
* @param aEntity - The Entity to work with.
- * @param x - Maximum X from origin.
- * @param y - Maximum Y from origin.
- * @param z - Maximum Z from origin.
+ * @param x - Maximum X from origin.
+ * @param y - Maximum Y from origin.
+ * @param z - Maximum Z from origin.
*/
public AABB(Entity aEntity, int x, int y, int z) {
if (aEntity == null) {
@@ -42,6 +45,7 @@ public class AABB {
/**
* Used to get the AxisAlignedBB from this class.
+ *
* @return
*/
public AxisAlignedBB get() {
@@ -50,6 +54,7 @@ public class AABB {
/**
* Used to determine if this object is valid or not.
+ *
* @return
*/
public boolean valid() {
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 f7d29e1200..56a134716b 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java
@@ -15,6 +15,7 @@ public class BTF_FluidTank extends FluidTank {
/**
* Let's replace the Default handling with GT's own handling code, because it's probably better, right?
+ *
* @author Alkalus/GregoriusT
*/
public FluidStack getFluid() {
@@ -38,13 +39,10 @@ public class BTF_FluidTank extends FluidTank {
return this;
}
- /* public abstract boolean isLiquidInput(byte arg0);
-
- public abstract boolean isLiquidOutput(byte arg0);
-
- public abstract boolean doesFillContainers();
-
- public abstract boolean doesEmptyContainers();*/
+ /*
+ * public abstract boolean isLiquidInput(byte arg0); public abstract boolean isLiquidOutput(byte arg0); public
+ * abstract boolean doesFillContainers(); public abstract boolean doesEmptyContainers();
+ */
public boolean canTankBeFilled() {
return true;
@@ -85,13 +83,11 @@ public class BTF_FluidTank extends FluidTank {
}
public int fill(FluidStack aFluid, boolean doFill) {
- if (aFluid != null
- && aFluid.getFluid().getID() > 0
+ 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() != null && this.getFillableStack().getFluid().getID() > 0) {
if (!this.getFillableStack().isFluidEqual(aFluid)) {
return 0;
} else {
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 d23ea97072..6dac3a7acd 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java
@@ -1,13 +1,15 @@
package gtPlusPlus.api.objects.minecraft;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.tileentities.base.TileEntityBase;
-import gtPlusPlus.core.util.data.ArrayUtils;
import java.util.ArrayList;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.tileentities.base.TileEntityBase;
+import gtPlusPlus.core.util.data.ArrayUtils;
+
public class BTF_Inventory implements ISidedInventory {
public final ItemStack[] mInventory;
@@ -59,7 +61,7 @@ public class BTF_Inventory implements ISidedInventory {
public ItemStack decrStackSize(int aIndex, int aAmount) {
ItemStack tStack = this.getStackInSlot(aIndex);
- ItemStack rStack = GT_Utility.copy(new Object[] {tStack});
+ ItemStack rStack = GT_Utility.copy(new Object[] { tStack });
if (tStack != null) {
if (tStack.stackSize <= aAmount) {
if (this.setStackToZeroInsteadOfNull(aIndex)) {
@@ -81,42 +83,33 @@ public class BTF_Inventory implements ISidedInventory {
public int[] getAccessibleSlotsFromSide(int aSide) {
ArrayList<Integer> tList = new ArrayList<Integer>();
TileEntityBase tTileEntity = this.mTile;
- boolean tSkip = tTileEntity
- .getCoverBehaviorAtSide((byte) aSide)
- .letsItemsIn(
- (byte) aSide,
- tTileEntity.getCoverIDAtSide((byte) aSide),
- tTileEntity.getCoverDataAtSide((byte) aSide),
- -2,
- tTileEntity)
- || tTileEntity
- .getCoverBehaviorAtSide((byte) aSide)
- .letsItemsOut(
- (byte) aSide,
- tTileEntity.getCoverIDAtSide((byte) aSide),
- tTileEntity.getCoverDataAtSide((byte) aSide),
- -2,
- tTileEntity);
+ boolean tSkip = tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsIn(
+ (byte) aSide,
+ tTileEntity.getCoverIDAtSide((byte) aSide),
+ tTileEntity.getCoverDataAtSide((byte) aSide),
+ -2,
+ tTileEntity)
+ || tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsOut(
+ (byte) aSide,
+ tTileEntity.getCoverIDAtSide((byte) aSide),
+ tTileEntity.getCoverDataAtSide((byte) aSide),
+ -2,
+ tTileEntity);
for (int rArray = 0; rArray < this.getSizeInventory(); ++rArray) {
- if (this.isValidSlot(rArray)
- && (tSkip
- || tTileEntity
- .getCoverBehaviorAtSide((byte) aSide)
- .letsItemsOut(
- (byte) aSide,
- tTileEntity.getCoverIDAtSide((byte) aSide),
- tTileEntity.getCoverDataAtSide((byte) aSide),
- rArray,
- tTileEntity)
- || tTileEntity
- .getCoverBehaviorAtSide((byte) aSide)
- .letsItemsIn(
- (byte) aSide,
- tTileEntity.getCoverIDAtSide((byte) aSide),
- tTileEntity.getCoverDataAtSide((byte) aSide),
- rArray,
- tTileEntity))) {
+ if (this.isValidSlot(rArray) && (tSkip
+ || tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsOut(
+ (byte) aSide,
+ tTileEntity.getCoverIDAtSide((byte) aSide),
+ tTileEntity.getCoverDataAtSide((byte) aSide),
+ rArray,
+ tTileEntity)
+ || tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsIn(
+ (byte) aSide,
+ tTileEntity.getCoverIDAtSide((byte) aSide),
+ tTileEntity.getCoverDataAtSide((byte) aSide),
+ rArray,
+ tTileEntity))) {
tList.add(Integer.valueOf(rArray));
}
}
@@ -131,16 +124,14 @@ public class BTF_Inventory implements ISidedInventory {
}
public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) {
- return this.isValidSlot(aIndex)
- && aStack != null
+ 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, (byte) aSide, aStack);
}
public boolean canExtractItem(int aIndex, ItemStack aStack, int aSide) {
- return this.isValidSlot(aIndex)
- && aStack != null
+ return this.isValidSlot(aIndex) && aStack != null
&& aIndex < this.mInventory.length
&& this.allowPullStack(this.mTile, aIndex, (byte) aSide, aStack);
}
@@ -209,10 +200,8 @@ public class BTF_Inventory implements ISidedInventory {
for (int s = 0; s < this.getSizeInventory(); s++) {
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))) {
+ if (slot == null || (slot != null && GT_Utility.areStacksEqual(aInput, 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 451d1aca77..cd6edf5411 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java
@@ -1,15 +1,17 @@
package gtPlusPlus.api.objects.minecraft;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gtPlusPlus.api.objects.data.AutoMap;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
+
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class BlockPos implements Serializable {
private static final long serialVersionUID = -7271947491316682006L;
@@ -89,8 +91,7 @@ public class BlockPos implements Serializable {
return false;
}
BlockPos otherPoint = (BlockPos) other;
- return this.xPos == otherPoint.xPos
- && this.yPos == otherPoint.yPos
+ return this.xPos == otherPoint.xPos && this.yPos == otherPoint.yPos
&& this.zPos == otherPoint.zPos
&& this.dim == otherPoint.dim;
}
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java
index 04b1f2b59b..5799a12822 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java
@@ -1,8 +1,9 @@
package gtPlusPlus.api.objects.minecraft;
-import gtPlusPlus.api.objects.data.AutoMap;
import net.minecraftforge.common.util.ForgeDirection;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class CubicObject<T> {
public final T NORTH;
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java
index 492d0b3aeb..6748b58537 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java
@@ -30,9 +30,7 @@ public class DimChunkPos {
this.dimension = dim;
this.xPos = x;
this.zPos = z;
- Chunk h = Minecraft.getMinecraft()
- .getIntegratedServer()
- .worldServerForDimension(dim)
+ Chunk h = Minecraft.getMinecraft().getIntegratedServer().worldServerForDimension(dim)
.getChunkFromChunkCoords(xPos, zPos);
if (h == null) {
this.mainChunk = null;
@@ -45,9 +43,7 @@ public class DimChunkPos {
if (this.mainChunk != null) {
return this.mainChunk;
}
- Chunk h = Minecraft.getMinecraft()
- .getIntegratedServer()
- .worldServerForDimension(this.dimension)
+ Chunk h = Minecraft.getMinecraft().getIntegratedServer().worldServerForDimension(this.dimension)
.getChunkFromChunkCoords(xPos, zPos);
return h;
}
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
index 40f78763d0..d627d47349 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java
@@ -1,13 +1,15 @@
package gtPlusPlus.api.objects.minecraft;
-import gtPlusPlus.api.objects.data.AutoMap;
import java.util.HashSet;
import java.util.Set;
+
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class FakeBlockPos extends BlockPos {
private static final long serialVersionUID = -6442245826092414593L;
@@ -43,7 +45,13 @@ public class FakeBlockPos extends BlockPos {
}
public String getUniqueIdentifier() {
- String S = "" + this.xPos + "@" + this.yPos + "@" + this.zPos + this.aBlockAtPos.getLocalizedName() + "@"
+ String S = "" + this.xPos
+ + "@"
+ + this.yPos
+ + "@"
+ + this.zPos
+ + this.aBlockAtPos.getLocalizedName()
+ + "@"
+ this.aBlockMetaAtPos;
return S;
}
@@ -222,18 +230,17 @@ public class FakeBlockPos extends BlockPos {
}
/**
- * Called when a plant grows on this block, only implemented for saplings using the WorldGen*Trees classes right now.
- * Modder may implement this for custom plants.
- * This does not use ForgeDirection, because large/huge trees can be located in non-representable direction,
- * so the source location is specified.
- * Currently this just changes the block to dirt if it was grass.
+ * Called when a plant grows on this block, only implemented for saplings using the WorldGen*Trees classes right
+ * now. Modder may implement this for custom plants. This does not use ForgeDirection, because large/huge trees can
+ * be located in non-representable direction, so the source location is specified. Currently this just changes the
+ * block to dirt if it was grass.
*
* Note: This happens DURING the generation, the generation may not be complete when this is called.
*
- * @param world Current world
- * @param x Soil X
- * @param y Soil Y
- * @param z Soil Z
+ * @param world Current world
+ * @param x Soil X
+ * @param y Soil Y
+ * @param z Soil Z
* @param sourceX Plant growth location X
* @param sourceY Plant growth location Y
* @param sourceZ Plant growth location Z
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java
index 2a55282623..d294326ff3 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java
@@ -1,10 +1,7 @@
package gtPlusPlus.api.objects.minecraft;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.HashMap;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
@@ -14,6 +11,11 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.util.ForgeDirection;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class FakeWorld implements IBlockAccess {
public static HashMap<String, FakeBlockPos> mStaticFakeWorldData;
@@ -48,18 +50,13 @@ public class FakeWorld implements IBlockAccess {
public void init() {
- /*if (mStaticFakeWorldData == null) {
- Logger.WARNING("Setting all Blocks in Fake World to Air.");
- mStaticFakeWorldData = new HashMap<String, FakeBlockPos>();
- for (int y=0;y<=aWorldHeight;y++) {
- for (int x=-aDistanceFromOrigin;x<=aDistanceFromOrigin;x++) {
- for (int z=-aDistanceFromOrigin;z<=aDistanceFromOrigin;z++) {
- FakeBlockPos aTempPos = new FakeBlockPos(x, y, z, Blocks.air, 0);
- mStaticFakeWorldData.put(aTempPos.getLocationString(), aTempPos);
- }
- }
- }
- }*/
+ /*
+ * if (mStaticFakeWorldData == null) { Logger.WARNING("Setting all Blocks in Fake World to Air.");
+ * mStaticFakeWorldData = new HashMap<String, FakeBlockPos>(); for (int y=0;y<=aWorldHeight;y++) { for (int
+ * x=-aDistanceFromOrigin;x<=aDistanceFromOrigin;x++) { for (int
+ * z=-aDistanceFromOrigin;z<=aDistanceFromOrigin;z++) { FakeBlockPos aTempPos = new FakeBlockPos(x, y, z,
+ * Blocks.air, 0); mStaticFakeWorldData.put(aTempPos.getLocationString(), aTempPos); } } } }
+ */
// if (mStaticFakeWorldData != null) {
// Logger.WARNING(" Instancing static air world.");
mFakeWorldData = new HashMap<String, FakeBlockPos>();
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java
index 1cc3c2c0aa..a90d72864c 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java
@@ -1,10 +1,12 @@
package gtPlusPlus.api.objects.minecraft;
+import net.minecraftforge.fluids.Fluid;
+
import gregtech.api.GregTech_API;
import gtPlusPlus.core.lib.CORE;
-import net.minecraftforge.fluids.Fluid;
public class FluidGT6 extends Fluid implements Runnable {
+
private final short[] mRGBa;
public final String mTextureName;
@@ -19,8 +21,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)
+ 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]));
}
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java
index 9500d862fa..6fe2f9ddb5 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java
@@ -47,11 +47,11 @@ public abstract class ItemPackage implements RunnableWithInfo<String> {
/**
* Override this to handle GT Recipe map manipulation after they're Baked.
+ *
* @param event - the {@link FMLLoadCompleteEvent}.
* @return - Did we do anything?
*/
public boolean onLoadComplete(FMLLoadCompleteEvent event) {
return false;
- }
- ;
+ };
}
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java
index 7e0e0bb9ea..f5e483b91c 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java
@@ -1,10 +1,11 @@
package gtPlusPlus.api.objects.minecraft;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class ItemStackData {
protected final Item mItem;
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java b/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java
index a8768f7604..e8b4a19031 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java
@@ -1,10 +1,11 @@
package gtPlusPlus.api.objects.minecraft;
+import java.util.Collection;
+import java.util.Iterator;
+
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.api.objects.data.AutoMap;
-import java.util.Collection;
-import java.util.Iterator;
public class NoConflictGTRecipeMap implements Collection<GT_Recipe> {
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
index 0ec01e3825..84f5fe5fba 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java
@@ -1,14 +1,17 @@
package gtPlusPlus.api.objects.minecraft;
+import java.util.HashMap;
+
+import net.minecraft.util.IIcon;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
import gtPlusPlus.core.util.Utils;
-import java.util.HashMap;
-import net.minecraft.util.IIcon;
/**
* A Server Side safe object that can hold {@link IIcon}s.
+ *
* @author Alkalus
*
*/
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
index 98232fb4c4..12916af64b 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
@@ -1,12 +1,13 @@
package gtPlusPlus.api.objects.minecraft;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.ShapedOreRecipe;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.ShapedOreRecipe;
public class ShapedRecipe {
@@ -15,19 +16,10 @@ 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) {
-
- this(new Object[] {aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9}, aOutput);
+ public ShapedRecipe(Object aInput1, Object aInput2, Object aInput3, Object aInput4, Object aInput5, Object aInput6,
+ Object aInput7, Object aInput8, Object aInput9, ItemStack aOutput) {
+
+ this(new Object[] { aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9 }, aOutput);
}
public ShapedRecipe(Object[] aInputs, ItemStack aOutput) {
@@ -75,8 +67,11 @@ public class ShapedRecipe {
Logger.RECIPE("Generating Shaped Crafting Recipe for " + aOutput.getDisplayName());
if (aInputs.length < 9 || aInputs.length > 9) {
- Logger.RECIPE("[Fix] Recipe for " + aOutput.getDisplayName()
- + " has incorrect number of inputs. Size: " + aInputs.length + ".");
+ Logger.RECIPE(
+ "[Fix] Recipe for " + aOutput.getDisplayName()
+ + " has incorrect number of inputs. Size: "
+ + aInputs.length
+ + ".");
// Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(1));
// Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(2));
// Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(3));
@@ -101,8 +96,12 @@ public class ShapedRecipe {
mInfo = ((ItemStack) stack).getDisplayName();
}
aRecipePairs.put(new Pair<Character, Object>(CHARS.charAt(aCharSlot), stack));
- Logger.RECIPE("Storing '" + CHARS.charAt(aCharSlot) + "' with an object of type "
- + stack.getClass().getSimpleName() + " and a value of " + mInfo);
+ Logger.RECIPE(
+ "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;
@@ -160,23 +159,30 @@ public class ShapedRecipe {
mInfo = ((ItemStack) stack).getDisplayName();
}
aRecipePairs.put(new Pair<Character, Object>(CHARS.charAt(aCharSlot), stack));
- Logger.RECIPE("Registering Pair of '" + CHARS.charAt(aCharSlot) + "' and a "
- + stack.getClass().getSimpleName() + " object. Object has a value of " + mInfo);
+ Logger.RECIPE(
+ "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));
+ 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 3, counter is now at 4. Trying to create Varag array with a size of 2
// Register the shaped grid straight to the varags
mVarags2 = new Object[(KEY_COUNTER + (counter - KEY_COUNTER) * 2)];
- /*mVarags2[0] = aGrid[0];
- mVarags2[1] = aGrid[1];
- mVarags2[2] = aGrid[2];*/
+ /*
+ * mVarags2[0] = aGrid[0]; mVarags2[1] = aGrid[1]; mVarags2[2] = aGrid[2];
+ */
mVarags2[0] = aGrid;
// Add Each Char, then Item to the varags, sequentially.
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java
index c5703d12fb..4e4e0e9780 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java
@@ -1,10 +1,12 @@
package gtPlusPlus.api.objects.minecraft;
-import gtPlusPlus.api.objects.data.AutoMap;
import java.util.LinkedHashMap;
import java.util.Set;
+
import net.minecraft.util.IIcon;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class TexturePackage {
private AutoMap<IIcon> mAnimationArray = new AutoMap<IIcon>();
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
index b40696747b..f38a960044 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java
@@ -1,18 +1,20 @@
package gtPlusPlus.api.objects.minecraft;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.GTplusplus.INIT_PHASE;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
-import gtPlusPlus.core.util.Utils;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
+
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.GTplusplus.INIT_PHASE;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
+import gtPlusPlus.core.util.Utils;
+
public class ThreadPooCollector extends Thread {
public boolean canRun = true;
@@ -22,8 +24,7 @@ public class ThreadPooCollector extends Thread {
private static long internalTickCounter = 0;
private static final ThreadPooCollector mThread;
- private static final HashMap<String, Pair<BlockPos, TileEntityPooCollector>> mPooCollectors =
- new LinkedHashMap<String, Pair<BlockPos, TileEntityPooCollector>>();
+ private static final HashMap<String, Pair<BlockPos, TileEntityPooCollector>> mPooCollectors = new LinkedHashMap<String, Pair<BlockPos, TileEntityPooCollector>>();
static {
mThread = new ThreadPooCollector();
@@ -82,12 +83,12 @@ public class ThreadPooCollector extends Thread {
int endX = p.xPos + 3;
int endY = p.yPos + 5;
int endZ = p.zPos + 3;
- AxisAlignedBB box = AxisAlignedBB.getBoundingBox(
- startX, startY, startZ, endX, endY, endZ);
+ AxisAlignedBB box = AxisAlignedBB
+ .getBoundingBox(startX, startY, startZ, endX, endY, endZ);
if (box != null) {
@SuppressWarnings("unchecked")
- List<EntityAnimal> animals =
- w.getEntitiesWithinAABB(EntityAnimal.class, box);
+ List<EntityAnimal> animals = w
+ .getEntitiesWithinAABB(EntityAnimal.class, box);
if (animals != null && !animals.isEmpty()) {
pair.getValue().onPostTick(animals);
}
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java
index 4dea1c22d6..b4ab2c9315 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java
@@ -1,8 +1,9 @@
package gtPlusPlus.api.objects.minecraft.multi;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+
public class NoEUBonusMultiBehaviour extends SpecialMultiBehaviour {
public NoEUBonusMultiBehaviour() {
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java
index d8ddbea5e7..cea7e40a51 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java
@@ -1,8 +1,9 @@
package gtPlusPlus.api.objects.minecraft.multi;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+
public class NoOutputBonusMultiBehaviour extends SpecialMultiBehaviour {
public NoOutputBonusMultiBehaviour() {
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java
index 834c93890d..cfe6afee66 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java
@@ -1,8 +1,9 @@
package gtPlusPlus.api.objects.minecraft.multi;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+
public class NoSpeedBonusMultiBehaviour extends SpecialMultiBehaviour {
public NoSpeedBonusMultiBehaviour() {
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java
index 03f000fcc2..94c87ab71b 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java
@@ -1,12 +1,14 @@
package gtPlusPlus.api.objects.minecraft.multi;
-import gregtech.api.util.GT_Utility;
import net.minecraft.item.ItemStack;
+import gregtech.api.util.GT_Utility;
+
/**
- * Extend this class to implement custom behaviour for multiblocks.
- * The Trigger item when in a special slot or input bus, will cause the multiblock to behave as specified.
- * Not overriding a method here will cause the default values to be used.
+ * Extend this class to implement custom behaviour for multiblocks. The Trigger item when in a special slot or input
+ * bus, will cause the multiblock to behave as specified. Not overriding a method here will cause the default values to
+ * be used.
+ *
* @author Alkalus
*
*/
diff --git a/src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java b/src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java
index 86ea4b4ad6..07c8c3609b 100644
--- a/src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java
+++ b/src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java
@@ -1,84 +1,62 @@
/*
- * Copyright 2005, Nick Galbreath -- nickg [at] modp [dot] com
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Neither the name of the modp.com nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This is the standard "new" BSD license:
+ * Copyright 2005, Nick Galbreath -- nickg [at] modp [dot] com All rights reserved. Redistribution and use in source and
+ * binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+ * disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+ * following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of
+ * the modp.com nor the names of its contributors may be used to endorse or promote products derived from this software
+ * without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE. This is the standard "new" BSD license:
* http://www.opensource.org/licenses/bsd-license.php
*/
package gtPlusPlus.api.objects.random;
-import gtPlusPlus.api.interfaces.IRandomGenerator;
-import gtPlusPlus.core.util.Utils;
import java.math.BigInteger;
import java.security.SecureRandom;
import java.util.Random;
+import gtPlusPlus.api.interfaces.IRandomGenerator;
+import gtPlusPlus.core.util.Utils;
+
/**
* The Blum-Blum-Shub random number generator.
*
* <p>
- * The Blum-Blum-Shub is a "cryptographically secure" random number
- * generator. It has been proven that predicting the ouput
- * is equivalent to factoring <i>n</i>, a large integer generated
- * from two prime numbers.
+ * The Blum-Blum-Shub is a "cryptographically secure" random number generator. It has been proven that predicting the
+ * ouput is equivalent to factoring <i>n</i>, a large integer generated from two prime numbers.
* </p>
*
* <p>
* The Algorithm:
* </p>
* <ol>
- * <li>
- * (setup) generate two secret prime numbers <i>p</i>, <i>q</i> such that
- * <i>p</i> &ne; <i>q</i>, <i>p</i> &equiv; 3 mod 4, <i>q</i> &equiv; 3 mod 4.
- * </li>
- * <li> (setup) compute <i>n</i> = <i>pq</i>. <i>n</i> can be re-used, but
- * <i>p</i>, and <i>q</i> are secret and should be disposed of.</li>
- * <li> Generate a (secure) random seed <i>s</i> in the range [1, <i>n</i> -1]
- * such that gcd(<i>s</i>, <i>n</i>) = 1.
- * <li> Compute <i>x</i> = <i>s</i><sup>2</sup> mod <i>n</i></li>
- * <li> Compute a single random bit with:
- * <ol>
- * <li> <i>x</i> = <i>x</i><sup>2</sup> mod <i>n</i></li>
- * <li> return Least-Significant-Bit(<i>x</i>) (i.e. <i>x</i> & 1)</li>
- * </ol>
- * Repeat as necessary.
- * </li>
+ * <li>(setup) generate two secret prime numbers <i>p</i>, <i>q</i> such that <i>p</i> &ne; <i>q</i>, <i>p</i> &equiv; 3
+ * mod 4, <i>q</i> &equiv; 3 mod 4.</li>
+ * <li>(setup) compute <i>n</i> = <i>pq</i>. <i>n</i> can be re-used, but <i>p</i>, and <i>q</i> are secret and should
+ * be disposed of.</li>
+ * <li>Generate a (secure) random seed <i>s</i> in the range [1, <i>n</i> -1] such that gcd(<i>s</i>, <i>n</i>) = 1.
+ * <li>Compute <i>x</i> = <i>s</i><sup>2</sup> mod <i>n</i></li>
+ * <li>Compute a single random bit with:
+ * <ol>
+ * <li><i>x</i> = <i>x</i><sup>2</sup> mod <i>n</i></li>
+ * <li>return Least-Significant-Bit(<i>x</i>) (i.e. <i>x</i> & 1)</li>
+ * </ol>
+ * Repeat as necessary.</li>
* </ol>
*
* <p>
- * The code originally appeared in <a href="http://modp.com/cida/"><i>Cryptography for
- * Internet and Database Applications </i>, Chapter 4, pages 174-177</a>
+ * The code originally appeared in <a href="http://modp.com/cida/"><i>Cryptography for Internet and Database
+ * Applications </i>, Chapter 4, pages 174-177</a>
* </p>
* <p>
- * More details are in the <a href="http://www.cacr.math.uwaterloo.ca/hac/"><i>Handbook of Applied Cryptography</i></a>,
+ * More details are in the <a href="http://www.cacr.math.uwaterloo.ca/hac/"><i>Handbook of Applied Cryptography</i></a>,
* <a href="http://www.cacr.math.uwaterloo.ca/hac/about/chap5.pdf">Section 5.5.2</a>
* </p>
*
@@ -105,8 +83,7 @@ public class CSPRNG_DO_NOT_USE extends Random implements IRandomGenerator {
/**
* Generate appropriate prime number for use in Blum-Blum-Shub.
*
- * This generates the appropriate primes (p = 3 mod 4) needed to compute the
- * "n-value" for Blum-Blum-Shub.
+ * This generates the appropriate primes (p = 3 mod 4) needed to compute the "n-value" for Blum-Blum-Shub.
*
* @param bits Number of bits in prime
* @param rand A source of randomness
@@ -121,13 +98,11 @@ public class CSPRNG_DO_NOT_USE extends Random implements IRandomGenerator {
}
/**
- * This generates the "n value" -- the multiplication of two equally sized
- * random prime numbers -- for use in the Blum-Blum-Shub algorithm.
+ * This generates the "n value" -- the multiplication of two equally sized random prime numbers -- for use in the
+ * Blum-Blum-Shub algorithm.
*
- * @param bits
- * The number of bits of security
- * @param rand
- * A random instance to aid in generating primes
+ * @param bits The number of bits of security
+ * @param rand A random instance to aid in generating primes
* @return A BigInteger, the <i>n</i>.
*/
public static BigInteger generateN(int bits, Random rand) {
@@ -161,25 +136,20 @@ public class CSPRNG_DO_NOT_USE extends Random implements IRandomGenerator {
}
/**
- * A constructor to specify the "n-value" to the Blum-Blum-Shub algorithm.
- * The inital seed is computed using Java's internal "true" random number
- * generator.
+ * A constructor to specify the "n-value" to the Blum-Blum-Shub algorithm. The inital seed is computed using Java's
+ * internal "true" random number generator.
*
- * @param n
- * The n-value.
+ * @param n The n-value.
*/
public CSPRNG_DO_NOT_USE(BigInteger n) {
this(n, SecureRandom.getSeed(n.bitLength() / 8));
}
/**
- * A constructor to specify both the n-value and the seed to the
- * Blum-Blum-Shub algorithm.
+ * A constructor to specify both the n-value and the seed to the Blum-Blum-Shub algorithm.
*
- * @param n
- * The n-value using a BigInteger
- * @param seed
- * The seed value using a byte[] array.
+ * @param n The n-value using a BigInteger
+ * @param seed The seed value using a byte[] array.
*/
public CSPRNG_DO_NOT_USE(BigInteger n, byte[] seed) {
this.n = n;
@@ -189,8 +159,7 @@ public class CSPRNG_DO_NOT_USE extends Random implements IRandomGenerator {
/**
* Sets or resets the seed value and internal state
*
- * @param seedBytes
- * The new seed.
+ * @param seedBytes The new seed.
*/
public void setSeed(byte[] seedBytes) {
// ADD: use hardwired default for n
@@ -206,7 +175,7 @@ public class CSPRNG_DO_NOT_USE extends Random implements IRandomGenerator {
@Override
public int next(int numBits) {
// TODO: find out how many LSB one can extract per cycle.
- // it is more than one.
+ // it is more than one.
int result = 0;
for (int i = numBits; i != 0; --i) {
state = state.modPow(two, n);
diff --git a/src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java b/src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java
index 8b70955e63..bfed0ce346 100644
--- a/src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java
+++ b/src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java
@@ -7,9 +7,8 @@ import java.util.UUID;
/**
*
- * Implement modified version of Apache's OpenJPA UUID generator.
- * This UUID generator is paired with a Blum-Blum-Shub random number generator
- * which in itself is seeded by custom SecureRandom.
+ * Implement modified version of Apache's OpenJPA UUID generator. This UUID generator is paired with a Blum-Blum-Shub
+ * random number generator which in itself is seeded by custom SecureRandom.
*
* The UUID generator class has been converted from a static factory to an instanced factory.
*
@@ -18,36 +17,24 @@ import java.util.UUID;
// ========================================= APACHE BLOCK =========================================
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
+ * file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ * applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
*/
/**
- * UUID value generator. Type 1 generator is based on the time-based generator
- * in the Apache Commons Id project: http://jakarta.apache.org/commons/sandbox
- * /id/uuid.html The type 4 generator uses the standard Java UUID generator.
+ * UUID value generator. Type 1 generator is based on the time-based generator in the Apache Commons Id project:
+ * http://jakarta.apache.org/commons/sandbox /id/uuid.html The type 4 generator uses the standard Java UUID generator.
*
- * The type 1 code has been vastly simplified and modified to replace the
- * ethernet address of the host machine with the IP, since we do not want to
- * require native libs and Java cannot access the MAC address directly.
+ * The type 1 code has been vastly simplified and modified to replace the ethernet address of the host machine with the
+ * IP, since we do not want to require native libs and Java cannot access the MAC address directly.
*
* In spirit, implements the IETF UUID draft specification, found here:<br />
- * http://www1.ics.uci.edu/~ejw/authoring/uuid-guid/draft-leach-uuids-guids-01
- * .txt
+ * http://www1.ics.uci.edu/~ejw/authoring/uuid-guid/draft-leach-uuids-guids-01 .txt
*
* @author Abe White, Kevin Sutter
* @since 0.3.3
@@ -95,9 +82,9 @@ public class UUIDGenerator {
private static final int MAX_14BIT = 0x3FFF;
private short _seq = 0;
private boolean type1Initialized = false; /*
- * Initializer for type 1 UUIDs. Creates random generator and genenerates
- * the node portion of the UUID using the IP address.
- */
+ * Initializer for type 1 UUIDs. Creates random generator and genenerates
+ * the node portion of the UUID using the IP address.
+ */
private synchronized void initializeForType1() {
if (type1Initialized == true) {
@@ -123,6 +110,7 @@ public class UUIDGenerator {
}
type1Initialized = true;
}
+
/**
* Return a unique UUID value.
*/
@@ -132,6 +120,7 @@ public class UUIDGenerator {
}
return createType1();
}
+
/*
* Creates a type 1 UUID
*/
@@ -142,11 +131,11 @@ public class UUIDGenerator {
// set ip addr
byte[] uuid = new byte[16];
System.arraycopy(IP, 0, uuid, 10, IP.length);
- // Set time info. Have to do this processing within a synchronized
+ // Set time info. Have to do this processing within a synchronized
// block because of the statics...
long now = 0;
synchronized (UUIDGenerator.class) {
- // Get the time to use for this uuid. This method has the side
+ // Get the time to use for this uuid. This method has the side
// effect of modifying the clock sequence, as well.
now = getTime();
// Insert the resulting clock sequence into the uuid
@@ -166,6 +155,7 @@ public class UUIDGenerator {
uuid[IDX_TYPE] |= TYPE_TIME_BASED; // 0001 0000
return uuid;
}
+
/*
* Creates a type 4 UUID
*/
@@ -176,9 +166,9 @@ public class UUIDGenerator {
longToBytes(type4.getLeastSignificantBits(), uuid, 8);
return uuid;
}
+
/*
- * Converts a long to byte values, setting them in a byte array
- * at a given starting position.
+ * Converts a long to byte values, setting them in a byte array at a given starting position.
*/
private void longToBytes(long longVal, byte[] buf, int sPos) {
sPos += 7;
@@ -196,15 +186,16 @@ public class UUIDGenerator {
return new String(bytes);
}
}
+
/**
* Return the next unique uuid value as a 32-character hex string.
*/
public String nextHex(int type) {
return Base16Encoder.encode(next(type));
}
+
/**
- * Get the timestamp to be used for this uuid. Must be called from
- * a synchronized block.
+ * Get the timestamp to be used for this uuid. Must be called from a synchronized block.
*
* @return long timestamp
*/
@@ -219,12 +210,11 @@ public class UUIDGenerator {
_lastMillis = newTime;
return newTime;
}
+
/**
- * Gets the appropriately modified timestamep for the UUID. Must be called
- * from a synchronized block.
+ * Gets the appropriately modified timestamep for the UUID. Must be called from a synchronized block.
*
- * @return long timestamp in 100ns intervals since the Gregorian change
- * offset
+ * @return long timestamp in 100ns intervals since the Gregorian change offset
*/
private long getUUIDTime() {
if (_currentMillis != System.currentTimeMillis()) {
@@ -233,7 +223,7 @@ public class UUIDGenerator {
}
// check to see if we have created too many uuid's for this timestamp
if (_counter + 1 >= MILLI_MULT) {
- // Original algorithm threw exception. Seemed like overkill.
+ // Original algorithm threw exception. Seemed like overkill.
// Let's just increment the timestamp instead and start over...
_currentMillis++;
_counter = 0;
@@ -243,9 +233,9 @@ public class UUIDGenerator {
// return the uuid time plus the artificial tick counter incremented
return currentTime + _counter++;
}
+
/**
- * Increments the clock sequence for this uuid. Must be called from a
- * synchronized block.
+ * Increments the clock sequence for this uuid. Must be called from a synchronized block.
*/
private void incrementSequence() {
// increment, but if it's greater than its 14-bits, reset it
@@ -257,17 +247,22 @@ public class UUIDGenerator {
// Add Dependant classes internally
/**
- * This class came from the Apache Commons Id sandbox project in support
- * of the UUIDGenerator implementation.
+ * This class came from the Apache Commons Id sandbox project in support of the UUIDGenerator implementation.
*
- * <p>Static methods for managing byte arrays (all methods follow Big
- * Endian order where most significant bits are in front).</p>
+ * <p>
+ * Static methods for managing byte arrays (all methods follow Big Endian order where most significant bits are in
+ * front).
+ * </p>
*/
public static final class Bytes {
+
/**
- * <p>Hide constructor in utility class.</p>
+ * <p>
+ * Hide constructor in utility class.
+ * </p>
*/
private Bytes() {}
+
/**
* Appends two bytes array into one.
*
@@ -281,6 +276,7 @@ public class UUIDGenerator {
System.arraycopy(b, 0, z, a.length, b.length);
return z;
}
+
/**
* Returns a 8-byte array built from a long.
*
@@ -290,9 +286,9 @@ public class UUIDGenerator {
public static byte[] toBytes(long n) {
return toBytes(n, new byte[8]);
}
+
/**
- * Build a 8-byte array from a long. No check is performed on the
- * array length.
+ * Build a 8-byte array from a long. No check is performed on the array length.
*
* @param n The number to convert.
* @param b The array to fill.
@@ -317,6 +313,7 @@ public class UUIDGenerator {
return b;
}
+
/**
* Build a long from first 8 bytes of the array.
*
@@ -324,8 +321,7 @@ public class UUIDGenerator {
* @return A long.
*/
public static long toLong(byte[] b) {
- return ((((long) b[7]) & 0xFF)
- + ((((long) b[6]) & 0xFF) << 8)
+ return ((((long) b[7]) & 0xFF) + ((((long) b[6]) & 0xFF) << 8)
+ ((((long) b[5]) & 0xFF) << 16)
+ ((((long) b[4]) & 0xFF) << 24)
+ ((((long) b[3]) & 0xFF) << 32)
@@ -333,6 +329,7 @@ public class UUIDGenerator {
+ ((((long) b[1]) & 0xFF) << 48)
+ ((((long) b[0]) & 0xFF) << 56));
}
+
/**
* Compares two byte arrays for equality.
*
@@ -352,14 +349,15 @@ public class UUIDGenerator {
}
return true;
}
+
/**
- * <p>Compares two byte arrays as specified by <code>Comparable</code>.
+ * <p>
+ * Compares two byte arrays as specified by <code>Comparable</code>.
*
* @param lhs - left hand value in the comparison operation.
* @param rhs - right hand value in the comparison operation.
- * @return a negative integer, zero, or a positive integer as
- * <code>lhs</code> is less than, equal to, or greater than
- * <code>rhs</code>.
+ * @return a negative integer, zero, or a positive integer as <code>lhs</code> is less than, equal to, or
+ * greater than <code>rhs</code>.
*/
public static int compareTo(byte[] lhs, byte[] rhs) {
if (lhs == rhs) {
@@ -383,6 +381,7 @@ public class UUIDGenerator {
}
return 0;
}
+
/**
* Build a short from first 2 bytes of the array.
*
@@ -393,6 +392,7 @@ public class UUIDGenerator {
return (short) ((b[1] & 0xFF) + ((b[0] & 0xFF) << 8));
}
}
+
/**
* Base 16 encoder.
*
@@ -400,10 +400,9 @@ public class UUIDGenerator {
*/
public static final class Base16Encoder {
- private static final char[] HEX = new char[] {
- '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
- };
+ private static final char[] HEX = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
+ 'D', 'E', 'F' };
+
/**
* Convert bytes to a base16 string.
*/
@@ -413,6 +412,7 @@ public class UUIDGenerator {
for (int j = 1; j >= 0; j--) hexBuffer.append(HEX[(byteArray[i] >> (j * 4)) & 0xF]);
return hexBuffer.toString();
}
+
/**
* Convert a base16 string into a byte array.
*/
diff --git a/src/main/java/gtPlusPlus/api/objects/random/XSTR.java b/src/main/java/gtPlusPlus/api/objects/random/XSTR.java
index aaaa7a4d1d..087f9535ce 100644
--- a/src/main/java/gtPlusPlus/api/objects/random/XSTR.java
+++ b/src/main/java/gtPlusPlus/api/objects/random/XSTR.java
@@ -1,36 +1,28 @@
package gtPlusPlus.api.objects.random;
+
/**
- * A subclass of java.util.random that implements the Xorshift random number
- * generator
+ * A subclass of java.util.random that implements the Xorshift random number generator
*
- * - it is 30% faster than the generator from Java's library - it produces
- * random sequences of higher quality than java.util.Random - this class also
- * provides a clone() function
+ * - it is 30% faster than the generator from Java's library - it produces random sequences of higher quality than
+ * java.util.Random - this class also provides a clone() function
*
- * Usage: XSRandom rand = new XSRandom(); //Instantiation x = rand.nextInt();
- * //pull a random number
+ * Usage: XSRandom rand = new XSRandom(); //Instantiation x = rand.nextInt(); //pull a random number
*
- * To use the class in legacy code, you may also instantiate an XSRandom object
- * and assign it to a java.util.Random object: java.util.Random rand = new
- * XSRandom();
+ * To use the class in legacy code, you may also instantiate an XSRandom object and assign it to a java.util.Random
+ * object: java.util.Random rand = new XSRandom();
*
- * for an explanation of the algorithm, see
- * http://demesos.blogspot.com/2011/09/pseudo-random-number-generators.html
+ * for an explanation of the algorithm, see http://demesos.blogspot.com/2011/09/pseudo-random-number-generators.html
*
- * @author Wilfried Elmenreich University of Klagenfurt/Lakeside Labs
- * http://www.elmenreich.tk
+ * @author Wilfried Elmenreich University of Klagenfurt/Lakeside Labs http://www.elmenreich.tk
*
- * This code is released under the GNU Lesser General Public License Version 3
- * http://www.gnu.org/licenses/lgpl-3.0.txt
+ * This code is released under the GNU Lesser General Public License Version 3
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
*/
import java.util.Random;
import java.util.concurrent.atomic.AtomicLong;
/**
- * XSTR - Xorshift ThermiteRandom
- * Modified by Bogdan-G
- * 03.06.2016
- * version 0.0.4
+ * XSTR - Xorshift ThermiteRandom Modified by Bogdan-G 03.06.2016 version 0.0.4
*/
public class XSTR extends Random implements Cloneable {
@@ -40,16 +32,14 @@ public class XSTR extends Random implements Cloneable {
private static final long GAMMA = 0x9e3779b97f4a7c15L;
private static final int PROBE_INCREMENT = 0x9e3779b9;
private static final long SEEDER_INCREMENT = 0xbb67ae8584caa73bL;
- private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53)
+ private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53)
private static final float FLOAT_UNIT = 0x1.0p-24f; // 1.0f / (1 << 24)
/*
- MODIFIED BY: Robotia
- Modification: Implemented Random class seed generator
- */
+ * MODIFIED BY: Robotia Modification: Implemented Random class seed generator
+ */
/**
- * Creates a new pseudo random number generator. The seed is initialized to
- * the current time, as if by
+ * Creates a new pseudo random number generator. The seed is initialized to the current time, as if by
* <code>setSeed(System.currentTimeMillis());</code>.
*/
public XSTR() {
@@ -61,7 +51,7 @@ public class XSTR extends Random implements Cloneable {
private static long seedUniquifier() {
// L'Ecuyer, "Tables of Linear Congruential Generators of
// Different Sizes and Good Lattice Structure", 1999
- for (; ; ) {
+ for (;;) {
final long current = seedUniquifier.get();
final long next = current * 181783497276652981L;
if (seedUniquifier.compareAndSet(current, next)) {
@@ -71,8 +61,8 @@ public class XSTR extends Random implements Cloneable {
}
/**
- * Creates a new pseudo random number generator, starting with the specified
- * seed, using <code>setSeed(seed);</code>.
+ * Creates a new pseudo random number generator, starting with the specified seed, using
+ * <code>setSeed(seed);</code>.
*
* @param seed the initial seed
*/
@@ -89,6 +79,7 @@ public class XSTR extends Random implements Cloneable {
public double nextDouble() {
return (((long) (this.next(26)) << 27) + this.next(27)) * DOUBLE_UNIT;
}
+
/**
* Returns the current state of the seed, can be used to clone the object
*
@@ -99,9 +90,8 @@ public class XSTR extends Random implements Cloneable {
}
/**
- * Sets the seed for this pseudo random number generator. As described
- * above, two instances of the same random class, starting with the same
- * seed, produce the same results, if the same methods are called.
+ * Sets the seed for this pseudo random number generator. As described above, two instances of the same random
+ * class, starting with the same seed, produce the same results, if the same methods are called.
*
* @param seed the new seed
*/
@@ -125,9 +115,8 @@ public class XSTR extends Random implements Cloneable {
}
/**
- * Implementation of George Marsaglia's elegant Xorshift random generator
- * 30% faster and better quality than the built-in java.util.random see also
- * see http://www.javamex.com/tutorials/random_numbers/xorshift.shtml
+ * Implementation of George Marsaglia's elegant Xorshift random generator 30% faster and better quality than the
+ * built-in java.util.random see also see http://www.javamex.com/tutorials/random_numbers/xorshift.shtml
*
* @param nbits
* @return
@@ -164,16 +153,16 @@ public class XSTR extends Random implements Cloneable {
this.haveNextNextGaussian = true;
return v1 * multiplier;
}
+
/**
- * Returns a pseudorandom, uniformly distributed {@code int} value between 0
- * (inclusive) and the specified value (exclusive), drawn from this random
- * number generator's sequence. The general contract of {@code nextInt} is
- * that one {@code int} value in the specified range is pseudorandomly
- * generated and returned. All {@code bound} possible {@code int} values are
- * produced with (approximately) equal probability. The method
- * {@code nextInt(int bound)} is implemented by class {@code Random} as if
- * by:
- * <pre> {@code
+ * Returns a pseudorandom, uniformly distributed {@code int} value between 0 (inclusive) and the specified value
+ * (exclusive), drawn from this random number generator's sequence. The general contract of {@code nextInt} is that
+ * one {@code int} value in the specified range is pseudorandomly generated and returned. All {@code bound} possible
+ * {@code int} values are produced with (approximately) equal probability. The method {@code nextInt(int bound)} is
+ * implemented by class {@code Random} as if by:
+ *
+ * <pre>
+ * {@code
* public int nextInt(int bound) {
* if (bound <= 0)
* throw new IllegalArgumentException("bound must be positive");
@@ -187,35 +176,29 @@ public class XSTR extends Random implements Cloneable {
* val = bits % bound;
* } while (bits - val + (bound-1) < 0);
* return val;
- * }}</pre>
+ * }}
+ * </pre>
*
- * <p>The hedge "approx
- * imately" is used in the foregoing description only because the next
- * method is only approximately an unbiased source of independently chosen
- * bits. If it were a perfect source of randomly chosen bits, then the
- * algorithm shown would choose {@code int} values from the stated range
- * with perfect uniformity.
* <p>
- * The algorithm is slightly tricky. It rejects values that would result in
- * an uneven distribution (due to the fact that 2^31 is not divisible by n).
- * The probability of a value being rejected depends on n. The worst case is
- * n=2^30+1, for which the probability of a reject is 1/2, and the expected
- * number of iterations before the loop terminates is 2.
+ * The hedge "approx imately" is used in the foregoing description only because the next method is only
+ * approximately an unbiased source of independently chosen bits. If it were a perfect source of randomly chosen
+ * bits, then the algorithm shown would choose {@code int} values from the stated range with perfect uniformity.
* <p>
- * The algorithm treats the case where n is a power of two specially: it
- * returns the correct number of high-order bits from the underlying
- * pseudo-random number generator. In the absence of special treatment, the
- * correct number of <i>low-order</i> bits would be returned. Linear
- * congruential pseudo-random number generators such as the one implemented
- * by this class are known to have short periods in the sequence of values
- * of their low-order bits. Thus, this special case greatly increases the
- * length of the sequence of values returned by successive calls to this
- * method if n is a small power of two.
+ * The algorithm is slightly tricky. It rejects values that would result in an uneven distribution (due to the fact
+ * that 2^31 is not divisible by n). The probability of a value being rejected depends on n. The worst case is
+ * n=2^30+1, for which the probability of a reject is 1/2, and the expected number of iterations before the loop
+ * terminates is 2.
+ * <p>
+ * The algorithm treats the case where n is a power of two specially: it returns the correct number of high-order
+ * bits from the underlying pseudo-random number generator. In the absence of special treatment, the correct number
+ * of <i>low-order</i> bits would be returned. Linear congruential pseudo-random number generators such as the one
+ * implemented by this class are known to have short periods in the sequence of values of their low-order bits.
+ * Thus, this special case greatly increases the length of the sequence of values returned by successive calls to
+ * this method if n is a small power of two.
*
* @param bound the upper bound (exclusive). Must be positive.
- * @return the next pseudorandom, uniformly distributed {@code int} value
- * between zero (inclusive) and {@code bound} (exclusive) from this random
- * number generator's sequence
+ * @return the next pseudorandom, uniformly distributed {@code int} value between zero (inclusive) and {@code bound}
+ * (exclusive) from this random number generator's sequence
* @throws IllegalArgumentException if bound is not positive
* @since 1.2
*/
@@ -229,18 +212,10 @@ public class XSTR extends Random implements Cloneable {
newBound = bound;
}
- /*int r = next(31);
- int m = bound - 1;
- if ((bound & m) == 0) // i.e., bound is a power of 2
- {
- r = (int) ((bound * (long) r) >> 31);
- } else {
- for (int u = r;
- u - (r = u % bound) + m < 0;
- u = next(31))
- ;
- }
- return r;*/
+ /*
+ * int r = next(31); int m = bound - 1; if ((bound & m) == 0) // i.e., bound is a power of 2 { r = (int) ((bound
+ * * (long) r) >> 31); } else { for (int u = r; u - (r = u % bound) + m < 0; u = next(31)) ; } return r;
+ */
// speedup, new nextInt ~+40%
this.last = this.seed ^ (this.seed << 21);
this.last ^= (this.last >>> 35);
@@ -268,10 +243,9 @@ public class XSTR extends Random implements Cloneable {
@Override
public void nextBytes(final byte[] bytes_arr) {
- for (int iba = 0, lenba = bytes_arr.length; iba < lenba; ) {
- for (int rndba = this.nextInt(), nba = Math.min(lenba - iba, Integer.SIZE / Byte.SIZE);
- nba-- > 0;
- rndba >>= Byte.SIZE) {
+ for (int iba = 0, lenba = bytes_arr.length; iba < lenba;) {
+ for (int rndba = this.nextInt(), nba = Math.min(lenba - iba, Integer.SIZE / Byte.SIZE); nba--
+ > 0; rndba >>= Byte.SIZE) {
bytes_arr[iba++] = (byte) rndba;
}
}
diff --git a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java
index c495f4856b..fce4ad7c55 100644
--- a/src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java
+++ b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java
@@ -3,5 +3,6 @@ package gtPlusPlus.api.thermal.energy;
import net.minecraftforge.common.util.ForgeDirection;
public interface IThermalConnection {
+
boolean canConnectThermalEnergy(ForgeDirection arg0);
}
diff --git a/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java b/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java
index eb4b42259d..57eb1d2c43 100644
--- a/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java
+++ b/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java
@@ -1,11 +1,13 @@
package gtPlusPlus.api.thermal.sample;
-import gtPlusPlus.api.thermal.energy.IThermalContainerItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
+import gtPlusPlus.api.thermal.energy.IThermalContainerItem;
+
public class ItemThermalContainer extends Item implements IThermalContainerItem {
+
protected int capacity;
protected int maxReceive;
protected int maxExtract;
diff --git a/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java b/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java
index 57f1d64f16..8ee401c474 100644
--- a/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java
+++ b/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java
@@ -1,11 +1,12 @@
package gtPlusPlus.api.thermal.sample;
-import gtPlusPlus.api.thermal.energy.IThermalHandler;
-import gtPlusPlus.api.thermal.energy.ThermalStorage;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
+import gtPlusPlus.api.thermal.energy.IThermalHandler;
+import gtPlusPlus.api.thermal.energy.ThermalStorage;
+
public class TileThermalHandler extends TileEntity implements IThermalHandler {
protected ThermalStorage storage = new ThermalStorage(32000);
diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
index 1a93d35ce2..0ec615ac3c 100644
--- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
@@ -1,5 +1,9 @@
package gtPlusPlus.core.block;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraftforge.fluids.Fluid;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.general.BlockCompressedObsidian;
import gtPlusPlus.core.block.general.BlockNet;
@@ -30,9 +34,6 @@ import gtPlusPlus.core.block.machine.bedrock.Mining_Head_Fake;
import gtPlusPlus.core.block.machine.bedrock.Mining_Pipe_Fake;
import gtPlusPlus.core.fluids.FluidRegistryHandler;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraftforge.fluids.Fluid;
public final class ModBlocks {
@@ -149,8 +150,13 @@ public final class ModBlocks {
blockPlayerDoorIron = new PlayerDoors(Material.iron, "door_iron", true);
blockPlayerDoorCustom_Glass = new PlayerDoors(Material.glass, "door_glass", false);
blockPlayerDoorCustom_Ice = new PlayerDoors(Material.ice, "door_ice", false);
- blockPlayerDoorCustom_Cactus =
- new PlayerDoors(Material.cactus, "door_cactus", false, 0.6f, Block.soundTypeGrass, "Cactus");
+ blockPlayerDoorCustom_Cactus = new PlayerDoors(
+ Material.cactus,
+ "door_cactus",
+ false,
+ 0.6f,
+ Block.soundTypeGrass,
+ "Cactus");
// blockCustomSuperLight = new BlockSuperLight();
blockCustomJukebox = new Machine_SuperJukebox();
diff --git a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java
index 61c7071a3e..b1f4eab4be 100644
--- a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java
+++ b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.block.base;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
@@ -9,18 +8,13 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import gtPlusPlus.core.lib.CORE;
+
public class AdvancedBlock extends Block {
- protected AdvancedBlock(
- final String unlocalizedName,
- final Material material,
- final CreativeTabs x,
- final float blockHardness,
- final float blockResistance,
- final float blockLightLevel,
- final String blockHarvestTool,
- final int blockHarvestLevel,
- final SoundType BlockSound) {
+ protected AdvancedBlock(final String unlocalizedName, final Material material, final CreativeTabs x,
+ final float blockHardness, final float blockResistance, final float blockLightLevel,
+ final String blockHarvestTool, final int blockHarvestLevel, final SoundType BlockSound) {
super(material);
this.setBlockName(unlocalizedName);
this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName);
@@ -33,22 +27,15 @@ public class AdvancedBlock extends Block {
}
@Override
- public boolean onBlockActivated(
- final World p_149727_1_,
- final int p_149727_2_,
- final int p_149727_3_,
- final int p_149727_4_,
- final EntityPlayer p_149727_5_,
- final int p_149727_6_,
- final float p_149727_7_,
- final float p_149727_8_,
- final float p_149727_9_) {
+ public boolean onBlockActivated(final World p_149727_1_, final int p_149727_2_, final int p_149727_3_,
+ final int p_149727_4_, final EntityPlayer p_149727_5_, final int p_149727_6_, final float p_149727_7_,
+ final float p_149727_8_, final float p_149727_9_) {
return false;
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java
index 876f27e5b6..54614d0288 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -1,8 +1,5 @@
package gtPlusPlus.core.block.base;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EnumCreatureType;
@@ -10,6 +7,10 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+
public class BasicBlock extends BlockContainer {
public BasicBlock(final String unlocalizedName, final Material material) {
@@ -37,6 +38,7 @@ public class BasicBlock extends BlockContainer {
}
public static enum BlockTypes {
+
STANDARD("blockBlock", "pickaxe", soundTypeMetal),
FRAME("blockFrameGt", "wrench", soundTypeMetal),
ORE("blockStone", "pickaxe", soundTypeStone);
@@ -70,8 +72,8 @@ public class BasicBlock extends BlockContainer {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
index 05a995cbb5..f332573620 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -1,20 +1,9 @@
package gtPlusPlus.core.block.base;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.minecraft.CubicObject;
-import gtPlusPlus.api.objects.minecraft.SafeTexture;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.InventoryUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -29,6 +18,19 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.CubicObject;
+import gtPlusPlus.api.objects.minecraft.SafeTexture;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public abstract class BasicTileBlockWithTooltip extends BlockContainer implements ITileTooltip {
/**
@@ -45,6 +47,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
/**
* Does this block have any meta at all?
+ *
* @return
*/
public final boolean hasMeta() {
@@ -53,12 +56,14 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
/**
* The amount of meta this block has.
+ *
* @return
*/
public abstract int getMetaCount();
/**
* Does this {@link Block} require special {@link ItemBlock} handling?
+ *
* @return The {@link Class} that will be used for this {@link Block}.
*/
public Class<? extends ItemBlock> getItemBlockClass() {
@@ -67,12 +72,14 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
/**
* A lazy way to declare the unlocal name for the block, makes boilerplating easy.
+ *
* @return The internal name for this block.
*/
public abstract String getUnlocalBlockName();
/**
* Does this Block have {@link ITileTooltip} support?
+ *
* @return {@link boolean} that represents if this block supports {@link ITileTooltip} or not.
*/
public final boolean hasTooltip() {
@@ -81,24 +88,29 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
/**
* Lazy Boilerplating.
+ *
* @return Block Hardness.
*/
protected abstract float initBlockHardness();
/**
* Lazy Boilerplating.
+ *
* @return Block Resistance.
*/
protected abstract float initBlockResistance();
/**
* Lazy Boilerplating.
+ *
* @return The {@link CreativeTab} this Block is shown on.
*/
protected abstract CreativeTabs initCreativeTab();
/**
- * The ID used by the {@link ITileTooltip} handler. Return -1 if you are not providing a custom {@link ItemBlock} in {@link #getItemBlockClass}().
+ * The ID used by the {@link ITileTooltip} handler. Return -1 if you are not providing a custom {@link ItemBlock} in
+ * {@link #getItemBlockClass}().
+ *
* @return
*/
@Override
@@ -122,12 +134,14 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
/**
* The name of the Tile Entity.
+ *
* @return
*/
protected abstract String getTileEntityName();
/**
* The String used for texture pathing.
+ *
* @return Sanitized {@link String}, containing no spaces or illegal characters.
*/
private final String getTileEntityNameForTexturePathing() {
@@ -135,10 +149,10 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
}
/**
- * An array of CubicObjects, one for each meta, else just a single cell array.
- * Expected to be null regularly, as the default texture handling should suffice.
- * Handy if re-using textures or using a non-standard structure for them. FULL texture path must be used,
- * inclusive of the MODID and a colon.
+ * An array of CubicObjects, one for each meta, else just a single cell array. Expected to be null regularly, as the
+ * default texture handling should suffice. Handy if re-using textures or using a non-standard structure for them.
+ * FULL texture path must be used, inclusive of the MODID and a colon.
+ *
* @return
*/
public CubicObject<String>[] getCustomTextureDirectoryObject() {
@@ -171,8 +185,9 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
// Default Path Name, this will make us look inside 'miscutils\textures\blocks'
final String aPrefixTexPath = CORE.MODID + ":";
// Default Path Name, this will make us look in the sub-directory for this Tile Entity.
- final String aTexPathMid =
- "TileEntities" + CORE.SEPERATOR + getTileEntityNameForTexturePathing() + CORE.SEPERATOR;
+ final String aTexPathMid = "TileEntities" + CORE.SEPERATOR
+ + getTileEntityNameForTexturePathing()
+ + CORE.SEPERATOR;
// Construct a full path
String aTexPathBuilt = aPrefixTexPath + aTexPathMid;
// File Name Suffixes, without meta tags
@@ -223,7 +238,12 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
aStringRight = aTexPathBuilt + aStringRight;
// Convenience Blob
CubicObject<String> aMetaBlob = new CubicObject<String>(
- aStringBot, aStringTop, aStringBack, aStringFront, aStringLeft, aStringRight);
+ aStringBot,
+ aStringTop,
+ aStringBack,
+ aStringFront,
+ aStringLeft,
+ aStringRight);
mSidedTexturePathArray.put(aMetaBlob);
Logger.INFO("[TeTexture] Added Texture Path data to map for meta " + i);
}
@@ -243,7 +263,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
SafeTexture aWest = SafeTexture.register(aMetaBlob.WEST);
SafeTexture aEast = SafeTexture.register(aMetaBlob.EAST);
// Store them in an Array
- SafeTexture[] aInjectBlob = new SafeTexture[] {aBottom, aTop, aBack, aFont, aWest, aEast};
+ SafeTexture[] aInjectBlob = new SafeTexture[] { aBottom, aTop, aBack, aFont, aWest, aEast };
// Convenience Blob
CubicObject<SafeTexture> aMetaBlob2 = new CubicObject<SafeTexture>(aInjectBlob);
// Store this Blob into
@@ -263,19 +283,20 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_);
/**
- * Called when {@link #breakBlock}() is called, but before {@link InventoryUtils#dropInventoryItems} and the super call.
+ * Called when {@link #breakBlock}() is called, but before {@link InventoryUtils#dropInventoryItems} and the super
+ * call.
*/
public void onBlockBreak() {}
@Override
- public final void breakBlock(
- final World world, final int x, final int y, final int z, final Block block, final int number) {
+ public final void breakBlock(final World world, final int x, final int y, final int z, final Block block,
+ final int number) {
onBlockBreak();
InventoryUtils.dropInventoryItems(world, x, y, z, block);
super.breakBlock(world, x, y, z, block, number);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public final void getSubBlocks(Item aItem, CreativeTabs p_149666_2_, List aList) {
if (hasMeta()) {
@@ -288,8 +309,8 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
index f48601447a..edb1ba4dcf 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
@@ -1,16 +1,7 @@
package gtPlusPlus.core.block.base;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.client.renderer.particle.EntityDropParticleFX;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import java.util.Random;
+
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EnumCreatureType;
@@ -21,6 +12,17 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.client.renderer.particle.EntityDropParticleFX;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+
public class BlockBaseFluid extends BlockFluidClassic {
private final String name;
@@ -40,8 +42,8 @@ public class BlockBaseFluid extends BlockFluidClassic {
}
public BlockFluidClassic setParticleColor(int arg0) {
- return this.setParticleColor(
- (arg0 >> 16 & 255) / 255.0F, (arg0 >> 8 & 255) / 255.0F, (arg0 >> 0 & 255) / 255.0F);
+ return this
+ .setParticleColor((arg0 >> 16 & 255) / 255.0F, (arg0 >> 8 & 255) / 255.0F, (arg0 >> 0 & 255) / 255.0F);
}
public BlockFluidClassic setParticleColor(float arg0, float arg1, float arg2) {
@@ -93,11 +95,16 @@ public class BlockBaseFluid extends BlockFluidClassic {
arg2 + super.densityDir,
arg3,
super.densityDir == -1 ? ForgeDirection.UP : ForgeDirection.DOWN)
- && !arg0.getBlock(arg1, arg2 + 2 * super.densityDir, arg3)
- .getMaterial()
- .blocksMovement()) {
+ && !arg0.getBlock(arg1, arg2 + 2 * super.densityDir, arg3).getMaterial().blocksMovement()) {
EntityDropParticleFX arg11 = new EntityDropParticleFX(
- arg0, arg5, arg7, arg9, this.particleRed, this.particleGreen, this.particleBlue, super.densityDir);
+ arg0,
+ arg5,
+ arg7,
+ arg9,
+ this.particleRed,
+ this.particleGreen,
+ this.particleBlue,
+ super.densityDir);
FMLClientHandler.instance().getClient().effectRenderer.addEffect(arg11);
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
index 4a9b81a1d9..a034dada97 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -1,5 +1,13 @@
package gtPlusPlus.core.block.base;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.IBlockAccess;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -14,12 +22,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashMap;
-import java.util.Map;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.IBlockAccess;
public class BlockBaseModular extends BasicBlock {
@@ -58,12 +60,8 @@ public class BlockBaseModular extends BasicBlock {
}
}
- protected BlockBaseModular(
- final String unlocalizedName,
- final String blockMaterialString,
- final net.minecraft.block.material.Material vanillaMaterial,
- final BlockTypes blockType,
- final int colour,
+ protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString,
+ final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, final int colour,
final int miningLevel) {
super(blockType, unlocalizedName, vanillaMaterial, miningLevel);
this.setHarvestLevel(blockType.getHarvestTool(), miningLevel);
@@ -74,18 +72,21 @@ public class BlockBaseModular extends BasicBlock {
this.thisBlockType = blockType.name().toUpperCase();
this.setBlockName(this.getUnlocalizedProperName());
int fx = getBlockTypeMeta();
- // ItemBlockGtBlock.sNameCache.put("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase(), GetProperName());
+ // ItemBlockGtBlock.sNameCache.put("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase(),
+ // GetProperName());
GameRegistry.registerBlock(
- this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
+ this,
+ ItemBlockGtBlock.class,
+ Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
if (fx == 0) {
- GT_OreDictUnificator.registerOre(
- "block" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
+ GT_OreDictUnificator
+ .registerOre("block" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
} else if (fx == 1) {
- GT_OreDictUnificator.registerOre(
- "frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
+ GT_OreDictUnificator
+ .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
} else if (fx == 2) {
- GT_OreDictUnificator.registerOre(
- "frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
+ GT_OreDictUnificator
+ .registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this));
}
}
@@ -106,8 +107,8 @@ public class BlockBaseModular extends BasicBlock {
aMap = new HashMap<String, ItemStack>();
}
int fx = getBlockTypeMeta();
- String aKey =
- (fx == 0 ? OrePrefixes.block.name() : (fx == 1 ? OrePrefixes.frameGt.name() : OrePrefixes.ore.name()));
+ String aKey = (fx == 0 ? OrePrefixes.block.name()
+ : (fx == 1 ? OrePrefixes.frameGt.name() : OrePrefixes.ore.name()));
ItemStack x = aMap.get(aKey);
if (x == null) {
aMap.put(aKey, ItemUtils.getSimpleStack(this));
@@ -133,8 +134,7 @@ public class BlockBaseModular extends BasicBlock {
}
/**
- * Returns which pass should this block be rendered on. 0 for solids and 1
- * for alpha
+ * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha
*/
@Override
@SideOnly(Side.CLIENT)
@@ -158,24 +158,19 @@ public class BlockBaseModular extends BasicBlock {
}
public String getUnlocalizedProperName() {
- return getProperName()
- .replace("%s", "%temp")
- .replace("%material", this.thisBlockMaterial)
+ return getProperName().replace("%s", "%temp").replace("%material", this.thisBlockMaterial)
.replace("%temp", "%s");
}
@Override
public String getLocalizedName() {
- return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name")
- .replace("%s", "%temp")
- .replace("%material", this.thisBlockMaterialTranslatedName)
- .replace("%temp", "%s");
+ return GT_LanguageManager.getTranslation("gtplusplus." + getUnlocalizedName() + ".name").replace("%s", "%temp")
+ .replace("%material", this.thisBlockMaterialTranslatedName).replace("%temp", "%s");
}
@Override
public String getUnlocalizedName() {
- return "block." + blockMaterial.getUnlocalizedName() + "."
- + this.thisBlock.name().toLowerCase();
+ return "block." + blockMaterial.getUnlocalizedName() + "." + this.thisBlock.name().toLowerCase();
}
@Override
@@ -190,8 +185,7 @@ public class BlockBaseModular extends BasicBlock {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister iIcon) {
- if (!CORE.ConfigSwitches.useGregtechTextures
- || this.blockMaterial == null
+ if (!CORE.ConfigSwitches.useGregtechTextures || this.blockMaterial == null
|| this.thisBlock == BlockTypes.ORE) {
this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture());
}
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java
index 1697244ff5..a3527059ab 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java
@@ -1,10 +1,5 @@
package gtPlusPlus.core.block.base;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockNBT;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -16,7 +11,14 @@ import net.minecraft.world.Explosion;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockNBT;
+
public abstract class BlockBaseNBT extends BlockContainer {
+
@SideOnly(Side.CLIENT)
private IIcon textureTop;
@@ -41,10 +43,8 @@ public abstract class BlockBaseNBT extends BlockContainer {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
- return p_149691_1_ == 1
- ? this.textureTop
- : (p_149691_1_ == 0
- ? this.textureBottom
+ return p_149691_1_ == 1 ? this.textureTop
+ : (p_149691_1_ == 0 ? this.textureBottom
: ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
}
@@ -52,8 +52,8 @@ public abstract class BlockBaseNBT extends BlockContainer {
public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_);
@Override
- public void breakBlock(
- final World world, final int x, final int y, final int z, final Block block, final int meta) {
+ public void breakBlock(final World world, final int x, final int y, final int z, final Block block,
+ final int meta) {
super.breakBlock(world, x, y, z, block, meta);
}
@@ -63,14 +63,14 @@ public abstract class BlockBaseNBT extends BlockContainer {
}
@Override
- public void onBlockDestroyedByExplosion(
- final World world, final int x, final int y, final int z, final Explosion explosion) {
+ public void onBlockDestroyedByExplosion(final World world, final int x, final int y, final int z,
+ final Explosion explosion) {
super.onBlockDestroyedByExplosion(world, x, y, z, explosion);
}
@Override
- public void onBlockHarvested(
- final World world, final int x, final int y, final int z, final int meta, final EntityPlayer player) {
+ public void onBlockHarvested(final World world, final int x, final int y, final int z, final int meta,
+ final EntityPlayer player) {
super.onBlockHarvested(world, x, y, z, meta, player);
}
@@ -80,8 +80,8 @@ public abstract class BlockBaseNBT extends BlockContainer {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 81f1737f8c..c8c0f4ca08 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -1,5 +1,14 @@
package gtPlusPlus.core.block.base;
+import java.lang.reflect.Field;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.Textures;
@@ -16,13 +25,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.api.objects.GTPP_RenderedTexture;
-import java.lang.reflect.Field;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
@@ -57,8 +59,8 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
@@ -105,7 +107,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
this.blockMaterial.getRGBA());
if (aIconSet != null) {
- return new ITexture[] {new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet};
+ return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
}
}
@@ -126,7 +128,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
}
}
}
- return new ITexture[] {new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] {240, 240, 240, 0})};
+ return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
}
@Override
@@ -134,52 +136,33 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
public static class oldOreBlock extends BlockBaseModular implements ITexturedBlock {
- public oldOreBlock(
- final String unlocalizedName,
- final String blockMaterial,
- final BlockTypes blockType,
+ public oldOreBlock(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType,
final int colour) {
this(unlocalizedName, blockMaterial, net.minecraft.block.material.Material.iron, blockType, colour, 2);
}
- public oldOreBlock(
- final String unlocalizedName,
- final String blockMaterial,
- final net.minecraft.block.material.Material vanillaMaterial,
- final BlockTypes blockType,
- final int colour,
- final int miningLevel) {
+ public oldOreBlock(final String unlocalizedName, final String blockMaterial,
+ final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType,
+ final int colour, final int miningLevel) {
super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel);
}
- /*@Override
- @SideOnly(Side.CLIENT)
- public void registerBlockIcons(final IIconRegister iIcon)
- {
- this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture());
- //this.base = iIcon.registerIcon(CORE.MODID + ":" + "blockStone");
- //this.overlay = iIcon.registerIcon(CORE.MODID + ":" + "blockOre_Overlay");
- }
-
- @Override
- public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){
- if (this.blockColour == 0){
- return MathUtils.generateSingularRandomHexValue();
- }
- return this.blockColour;
- }
-
- @Override
- public int getRenderColor(final int aMeta) {
- if (this.blockColour == 0){
- return MathUtils.generateSingularRandomHexValue();
- }
- return this.blockColour;
- }*/
+ /*
+ * @Override
+ * @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { this.blockIcon =
+ * iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); //this.base =
+ * iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(CORE.MODID + ":" +
+ * "blockOre_Overlay"); }
+ * @Override public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3,
+ * final int par4){ if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } return
+ * this.blockColour; }
+ * @Override public int getRenderColor(final int aMeta) { if (this.blockColour == 0){ return
+ * MathUtils.generateSingularRandomHexValue(); } return this.blockColour; }
+ */
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
@@ -218,7 +201,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
this.blockMaterial.getRGBA());
if (aIconSet != null) {
- return new ITexture[] {new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet};
+ return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
}
}
@@ -239,7 +222,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
}
}
}
- return new ITexture[] {new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] {240, 240, 240, 0})};
+ return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java b/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java
index 68ddd47547..5995fb7d49 100644
--- a/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java
+++ b/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java
@@ -1,6 +1,7 @@
package gtPlusPlus.core.block.base;
import java.util.List;
+
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EnumCreatureType;
@@ -27,8 +28,8 @@ public class MetaBlock extends MultiTextureBlock {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java
index dfacc26b62..575c5ca33b 100644
--- a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java
+++ b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.block.base;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
public class MultiTextureBlock extends Block {
public IIcon[] icons = new IIcon[6];
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
index 3bb09962b5..a3209d0907 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
@@ -1,14 +1,9 @@
package gtPlusPlus.core.block.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
-import gtPlusPlus.core.lib.CORE;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.BlockObsidian;
import net.minecraft.block.material.MapColor;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -18,6 +13,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.lib.CORE;
+
public class BlockCompressedObsidian extends BlockObsidian {
private final IIcon textureArray[] = new IIcon[11];
@@ -86,8 +88,8 @@ public class BlockCompressedObsidian extends BlockObsidian {
}
@Override
- public ArrayList<ItemStack> getDrops(
- final World world, final int x, final int y, final int z, final int metadata, final int fortune) {
+ public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int metadata,
+ final int fortune) {
int m = metadata;
if (m == 5) {
m = 1;
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java
index 53adacac84..6064190fba 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java
@@ -1,15 +1,17 @@
package gtPlusPlus.core.block.general;
+import java.util.Random;
+
+import net.minecraft.block.BlockWeb;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
-import java.util.Random;
-import net.minecraft.block.BlockWeb;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.Item;
public class BlockNet extends BlockWeb {
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
index 5357bd2622..4f8ac3b4e7 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
@@ -1,14 +1,5 @@
package gtPlusPlus.core.block.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.block.Block;
import net.minecraft.block.BlockAir;
import net.minecraft.block.BlockContainer;
@@ -21,6 +12,16 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+
public class BlockSuperLight extends BlockContainer {
@SideOnly(Side.CLIENT)
@@ -52,8 +53,7 @@ public class BlockSuperLight extends BlockContainer {
}
/**
- * Returns a new instance of a block's tile entity class. Called on placing the
- * block.
+ * Returns a new instance of a block's tile entity class. Called on placing the block.
*/
public TileEntity createNewTileEntity(World aWorld, int p_149915_2_) {
return new TileEntitySuperLight();
@@ -117,8 +117,8 @@ public class BlockSuperLight extends BlockContainer {
try {
if (mLastUpdateTick == 0 || (System.currentTimeMillis() - mLastUpdateTick) >= 30000) {
- boolean powered =
- (this.worldObj.isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord));
+ boolean powered = (this.worldObj
+ .isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord));
boolean aLastState = mPowered;
// Logger.INFO("Powered: "+powered);
mPowered = powered;
@@ -126,8 +126,7 @@ public class BlockSuperLight extends BlockContainer {
updateLighting(powered);
}
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
@Override
@@ -153,8 +152,11 @@ public class BlockSuperLight extends BlockContainer {
AutoMap<BlockPos> aBlocksToUpdate = new AutoMap<BlockPos>();
Logger.INFO("Trying to relight area.");
- BlockPos aStartIterationPoint =
- new BlockPos(this.xCoord - 24, this.yCoord - 4, this.zCoord - 24, this.worldObj);
+ BlockPos aStartIterationPoint = new BlockPos(
+ this.xCoord - 24,
+ this.yCoord - 4,
+ this.zCoord - 24,
+ this.worldObj);
for (int x = 0; x < 50; x++) {
for (int y = 0; y < 10; y++) {
for (int z = 0; z < 50; z++) {
@@ -177,7 +179,12 @@ public class BlockSuperLight extends BlockContainer {
if (aBlockGet instanceof BlockAir) {
Logger.INFO("Lit air.");
this.worldObj.setBlock(
- xOff, yOff, zOff, ModBlocks.MatterFabricatorEffectBlock, 0, 3);
+ xOff,
+ yOff,
+ zOff,
+ ModBlocks.MatterFabricatorEffectBlock,
+ 0,
+ 3);
}
// aBlockGet.setLightLevel(15);
aLitCounter++;
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
index 05d83cf133..e0feb70497 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -1,13 +1,7 @@
package gtPlusPlus.core.block.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase;
-import gtPlusPlus.core.lib.CORE;
import java.util.Random;
+
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -18,6 +12,14 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase;
+import gtPlusPlus.core.lib.CORE;
+
public class BlockTankXpConverter extends BlockContainer {
@SideOnly(Side.CLIENT)
@@ -48,10 +50,8 @@ public class BlockTankXpConverter extends BlockContainer {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
- return p_149691_1_ == 1
- ? this.textureTop
- : (p_149691_1_ == 0
- ? this.textureBottom
+ return p_149691_1_ == 1 ? this.textureTop
+ : (p_149691_1_ == 0 ? this.textureBottom
: ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
}
@@ -68,72 +68,28 @@ public class BlockTankXpConverter extends BlockContainer {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
return true;
/*
- if (world.isRemote) {
- return true;
- }
- else {
- boolean mDidScrewDriver = false;
- // Check For Screwdriver
- try {
- final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
- final Item mHandItem = mHandStack.getItem();
- if (((mHandItem instanceof GT_MetaGenerated_Tool_01)
- && ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) {
- final TileEntityXpConverter tile = (TileEntityXpConverter) world.getTileEntity(x, y, z);
- if (tile != null) {
- mDidScrewDriver = true;
- tile.onScrewdriverRightClick((byte) side, player, x, y, z);
- }
-
- }
- }
- catch (final Throwable t) {
- mDidScrewDriver = false;
- }
-
- if (!mDidScrewDriver) {
-
- try {
- final TileEntityXpConverter tile = (TileEntityXpConverter) world.getTileEntity(x, y, z);
- if (tile != null) {
- tile.onRightClick((byte) side, player, x, y, z);
- }
- }
- catch (final Throwable t) {
- }
-
- final TileEntityXpConverter tank = (TileEntityXpConverter) world.getTileEntity(x, y, z);
- if (tank != null) {
- if (tank.tankEssence.getFluid() != null) {
- PlayerUtils.messagePlayer(player, "This tank contains " + tank.tankEssence.getFluidAmount()
- + "L of " + tank.tankEssence.getFluid().getLocalizedName());
- }
- if (tank.tankLiquidXp.getFluid() != null) {
- PlayerUtils.messagePlayer(player, "This tank contains " + tank.tankLiquidXp.getFluidAmount()
- + "L of " + tank.tankLiquidXp.getFluid().getLocalizedName());
- }
- if ((tank.tankEssence.getFluid() != null) && (tank.tankLiquidXp.getFluid() != null)) {
- PlayerUtils.messagePlayer(player, "This is worth "
- + EnchantingUtils.getLevelForLiquid(tank.tankLiquidXp.getFluidAmount()) + " levels.");
- }
- }
- }
- }
- return true;
+ * if (world.isRemote) { return true; } else { boolean mDidScrewDriver = false; // Check For Screwdriver try {
+ * final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName()); final
+ * Item mHandItem = mHandStack.getItem(); if (((mHandItem instanceof GT_MetaGenerated_Tool_01) &&
+ * ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) { final
+ * TileEntityXpConverter tile = (TileEntityXpConverter) world.getTileEntity(x, y, z); if (tile != null) {
+ * mDidScrewDriver = true; tile.onScrewdriverRightClick((byte) side, player, x, y, z); } } } catch (final
+ * Throwable t) { mDidScrewDriver = false; } if (!mDidScrewDriver) { try { final TileEntityXpConverter tile =
+ * (TileEntityXpConverter) world.getTileEntity(x, y, z); if (tile != null) { tile.onRightClick((byte) side,
+ * player, x, y, z); } } catch (final Throwable t) { } final TileEntityXpConverter tank =
+ * (TileEntityXpConverter) world.getTileEntity(x, y, z); if (tank != null) { if (tank.tankEssence.getFluid() !=
+ * null) { PlayerUtils.messagePlayer(player, "This tank contains " + tank.tankEssence.getFluidAmount() + "L of "
+ * + tank.tankEssence.getFluid().getLocalizedName()); } if (tank.tankLiquidXp.getFluid() != null) {
+ * PlayerUtils.messagePlayer(player, "This tank contains " + tank.tankLiquidXp.getFluidAmount() + "L of " +
+ * tank.tankLiquidXp.getFluid().getLocalizedName()); } if ((tank.tankEssence.getFluid() != null) &&
+ * (tank.tankLiquidXp.getFluid() != null)) { PlayerUtils.messagePlayer(player, "This is worth " +
+ * EnchantingUtils.getLevelForLiquid(tank.tankLiquidXp.getFluidAmount()) + " levels."); } } } } return true;
*/ }
@Override
@@ -158,8 +114,8 @@ public class BlockTankXpConverter extends BlockContainer {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
@@ -173,8 +129,8 @@ public class BlockTankXpConverter extends BlockContainer {
}
@Override
- public int colorMultiplier(
- final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_, final int p_149720_4_) {
+ public int colorMultiplier(final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_,
+ final int p_149720_4_) {
return super.colorMultiplier(p_149720_1_, p_149720_2_, p_149720_3_, p_149720_4_);
}
diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java
index 92a22c5d7f..0ac8f240c1 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java
+++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java
@@ -2,15 +2,9 @@ package gtPlusPlus.core.block.general;
import static net.minecraftforge.common.util.ForgeDirection.*;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.block.base.BasicBlock;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.tileentities.general.TileEntityFirepit;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -23,7 +17,16 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.block.base.BasicBlock;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.tileentities.general.TileEntityFirepit;
+
public class FirePit extends BasicBlock {
+
private static IIcon[] TEXTURE;
public static final int META_ANTIBUILDER = 2;
private int meta;
@@ -53,13 +56,11 @@ public class FirePit extends BasicBlock {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister par1IconRegister) {
- TEXTURE = new IIcon[] {
- par1IconRegister.registerIcon(this.getTextureName() + "_layer_0"),
- par1IconRegister.registerIcon(this.getTextureName() + "_layer_1")
- };
+ TEXTURE = new IIcon[] { par1IconRegister.registerIcon(this.getTextureName() + "_layer_0"),
+ par1IconRegister.registerIcon(this.getTextureName() + "_layer_1") };
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) {
par3List.add(new ItemStack(par1, 1, 2));
@@ -72,8 +73,7 @@ public class FirePit extends BasicBlock {
this.meta = par1World.getBlockMetadata(x, y, z);
// If Raining, Put out.
if (par1World.isRaining()
- && (par1World.canLightningStrikeAt(x, y, z)
- || par1World.canLightningStrikeAt(x - 1, y, z)
+ && (par1World.canLightningStrikeAt(x, y, z) || par1World.canLightningStrikeAt(x - 1, y, z)
|| par1World.canLightningStrikeAt(x + 1, y, z)
|| par1World.canLightningStrikeAt(x, y, z - 1)
|| par1World.canLightningStrikeAt(x, y, z + 1))) {
@@ -124,10 +124,10 @@ public class FirePit extends BasicBlock {
return false;
}
- /*@Override
- public AxisAlignedBB getCollisionBoundingBoxFromPool(World aParWorld, int x, int y, int z){
- return null;
- }*/
+ /*
+ * @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World aParWorld, int x, int y, int z){ return
+ * null; }
+ */
@Override
protected boolean canSilkHarvest() {
@@ -136,12 +136,8 @@ public class FirePit extends BasicBlock {
@Override
@SideOnly(Side.CLIENT)
- public void randomDisplayTick(
- final World p_149734_1_,
- final int p_149734_2_,
- final int p_149734_3_,
- final int p_149734_4_,
- final Random p_149734_5_) {
+ public void randomDisplayTick(final World p_149734_1_, final int p_149734_2_, final int p_149734_3_,
+ final int p_149734_4_, final Random p_149734_5_) {
int l;
float f;
float f1;
@@ -226,16 +222,15 @@ public class FirePit extends BasicBlock {
}
private static boolean isNeighborBurning(final World world, final int x, final int y, final int z) {
- return canCatchFire(world, x + 1, y, z, WEST)
- || canCatchFire(world, x - 1, y, z, EAST)
+ return canCatchFire(world, x + 1, y, z, WEST) || canCatchFire(world, x - 1, y, z, EAST)
|| canCatchFire(world, x, y - 1, z, UP)
|| canCatchFire(world, x, y + 1, z, DOWN)
|| canCatchFire(world, x, y, z - 1, SOUTH)
|| canCatchFire(world, x, y, z + 1, NORTH);
}
- public static boolean canCatchFire(
- final World world, final int x, final int y, final int z, final ForgeDirection face) {
+ public static boolean canCatchFire(final World world, final int x, final int y, final int z,
+ final ForgeDirection face) {
return world.getBlock(x, y, z).isFireSource(world, x, y, z, face);
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
index 3f4a057221..6a01dd623b 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
+++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
@@ -1,13 +1,5 @@
package gtPlusPlus.core.block.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,6 +14,15 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fluids.ItemFluidContainer;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class FluidTankInfinite extends BlockContainer {
@SideOnly(Side.CLIENT)
@@ -48,10 +49,8 @@ public class FluidTankInfinite extends BlockContainer {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
- return p_149691_1_ == 1
- ? this.textureTop
- : (p_149691_1_ == 0
- ? this.textureBottom
+ return p_149691_1_ == 1 ? this.textureTop
+ : (p_149691_1_ == 0 ? this.textureBottom
: ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
}
@@ -68,16 +67,8 @@ public class FluidTankInfinite extends BlockContainer {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
} else {
@@ -90,8 +81,7 @@ public class FluidTankInfinite extends BlockContainer {
handItem = null;
}
if (handItem != null
- && (handItem instanceof IFluidContainerItem
- || handItem instanceof ItemFluidContainer
+ && (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer
|| FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) {
if (tank.tank.getFluid() == null) {
try {
@@ -118,7 +108,8 @@ public class FluidTankInfinite extends BlockContainer {
if (tank.tank.getFluid() != null) {
PlayerUtils.messagePlayer(
player,
- "This tank contains " + tank.tank.getFluidAmount() + "L of "
+ "This tank contains " + tank.tank.getFluidAmount()
+ + "L of "
+ tank.tank.getFluid().getLocalizedName());
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java
index f2c9c1a319..4942d9555c 100644
--- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java
+++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java
@@ -2,18 +2,10 @@ package gtPlusPlus.core.block.general;
import static net.minecraftforge.common.util.ForgeDirection.*;
-import com.google.common.collect.Maps;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.math.MathUtils;
import java.util.IdentityHashMap;
import java.util.Map.Entry;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockFire;
import net.minecraft.block.material.MapColor;
@@ -26,7 +18,19 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import com.google.common.collect.Maps;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.random.XSTR;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+
public class HellFire extends BlockFire {
+
@Deprecated
private final int[] field_149849_a = new int[Short.MAX_VALUE];
@@ -98,10 +102,8 @@ public class HellFire extends BlockFire {
world.setBlockToAir(x, y, z);
}
- if (!flag
- && world.isRaining()
- && (world.canLightningStrikeAt(x, y, z)
- || world.canLightningStrikeAt(x - 1, y, z)
+ if (!flag && world.isRaining()
+ && (world.canLightningStrikeAt(x, y, z) || world.canLightningStrikeAt(x - 1, y, z)
|| world.canLightningStrikeAt(x + 1, y, z)
|| world.canLightningStrikeAt(x, y, z - 1)
|| world.canLightningStrikeAt(x, y, z + 1))) {
@@ -122,83 +124,74 @@ public class HellFire extends BlockFire {
if (!World.doesBlockHaveSolidTopSurface(world, x, y - 1, z) || (blockMeta > 3)) {
world.setBlockToAir(x, y, z);
}
- } else if (!flag
- && !this.canCatchFire(world, x, y - 1, z, UP)
+ } else if (!flag && !this.canCatchFire(world, x, y - 1, z, UP)
&& (blockMeta == 15)
&& (random.nextInt(4) == 0)) {
- world.setBlockToAir(x, y, z);
- } else {
- final boolean flag1 = world.isBlockHighHumidity(x, y, z);
- byte b0 = 0;
+ world.setBlockToAir(x, y, z);
+ } else {
+ final boolean flag1 = world.isBlockHighHumidity(x, y, z);
+ byte b0 = 0;
- if (flag1) {
- b0 = -50;
- }
+ if (flag1) {
+ b0 = -50;
+ }
- this.tryCatchFire(world, x + 1, y, z, 300 + b0, random, blockMeta, WEST);
- this.tryCatchFire(world, x - 1, y, z, 300 + b0, random, blockMeta, EAST);
- this.tryCatchFire(world, x, y - 1, z, 250 + b0, random, blockMeta, UP);
- this.tryCatchFire(world, x, y + 1, z, 250 + b0, random, blockMeta, DOWN);
- this.tryCatchFire(world, x, y, z - 1, 300 + b0, random, blockMeta, SOUTH);
- this.tryCatchFire(world, x, y, z + 1, 300 + b0, random, blockMeta, NORTH);
-
- for (int i1 = x - 1; i1 <= (x + 1); ++i1) {
- for (int j1 = z - 1; j1 <= (z + 1); ++j1) {
- for (int k1 = y - 1; k1 <= (y + 4); ++k1) {
- if ((i1 != x) || (k1 != y) || (j1 != z)) {
- int l1 = 100;
-
- if (k1 > (y + 1)) {
- l1 += (k1 - (y + 1)) * 100;
- }
+ this.tryCatchFire(world, x + 1, y, z, 300 + b0, random, blockMeta, WEST);
+ this.tryCatchFire(world, x - 1, y, z, 300 + b0, random, blockMeta, EAST);
+ this.tryCatchFire(world, x, y - 1, z, 250 + b0, random, blockMeta, UP);
+ this.tryCatchFire(world, x, y + 1, z, 250 + b0, random, blockMeta, DOWN);
+ this.tryCatchFire(world, x, y, z - 1, 300 + b0, random, blockMeta, SOUTH);
+ this.tryCatchFire(world, x, y, z + 1, 300 + b0, random, blockMeta, NORTH);
+
+ for (int i1 = x - 1; i1 <= (x + 1); ++i1) {
+ for (int j1 = z - 1; j1 <= (z + 1); ++j1) {
+ for (int k1 = y - 1; k1 <= (y + 4); ++k1) {
+ if ((i1 != x) || (k1 != y) || (j1 != z)) {
+ int l1 = 100;
+
+ if (k1 > (y + 1)) {
+ l1 += (k1 - (y + 1)) * 100;
+ }
- final int neighbourFireChance =
- this.getChanceOfNeighborsEncouragingFire(world, i1, k1, j1);
+ final int neighbourFireChance = this
+ .getChanceOfNeighborsEncouragingFire(world, i1, k1, j1);
- if (neighbourFireChance > 0) {
- int j2 = (neighbourFireChance
- + 40
+ if (neighbourFireChance > 0) {
+ int j2 = (neighbourFireChance + 40
+ (world.difficultySetting.getDifficultyId() * 14))
- / (blockMeta + 30);
-
- if (flag1) {
- j2 /= 2;
- }
-
- if ((j2 > 0)
- && (random.nextInt(l1) <= j2)
- && (!world.isRaining() || !world.canLightningStrikeAt(i1, k1, j1))
- && !world.canLightningStrikeAt(i1 - 1, k1, z)
- && !world.canLightningStrikeAt(i1 + 1, k1, j1)
- && !world.canLightningStrikeAt(i1, k1, j1 - 1)
- && !world.canLightningStrikeAt(i1, k1, j1 + 1)) {
- int k2 = blockMeta + (random.nextInt(5) / 4);
-
- if (k2 > 15) {
- k2 = 15;
+ / (blockMeta + 30);
+
+ if (flag1) {
+ j2 /= 2;
+ }
+
+ if ((j2 > 0) && (random.nextInt(l1) <= j2)
+ && (!world.isRaining()
+ || !world.canLightningStrikeAt(i1, k1, j1))
+ && !world.canLightningStrikeAt(i1 - 1, k1, z)
+ && !world.canLightningStrikeAt(i1 + 1, k1, j1)
+ && !world.canLightningStrikeAt(i1, k1, j1 - 1)
+ && !world.canLightningStrikeAt(i1, k1, j1 + 1)) {
+ int k2 = blockMeta + (random.nextInt(5) / 4);
+
+ if (k2 > 15) {
+ k2 = 15;
+ }
+
+ world.setBlock(i1, k1, j1, this, k2, 3);
+ }
}
-
- world.setBlock(i1, k1, j1, this, k2, 3);
}
}
}
}
}
- }
- }
}
}
}
- private void tryCatchFire(
- final World world,
- final int p_149841_2_,
- final int p_149841_3_,
- final int p_149841_4_,
- final int p_149841_5_,
- final Random p_149841_6_,
- final int p_149841_7_,
- final ForgeDirection face) {
+ private void tryCatchFire(final World world, final int p_149841_2_, final int p_149841_3_, final int p_149841_4_,
+ final int p_149841_5_, final Random p_149841_6_, final int p_149841_7_, final ForgeDirection face) {
final int j1 = world.getBlock(p_149841_2_, p_149841_3_, p_149841_4_)
.getFlammability(world, p_149841_2_, p_149841_3_, p_149841_4_, face);
@@ -228,8 +221,7 @@ public class HellFire extends BlockFire {
* Returns true if at least one block next to this one can burn.
*/
private boolean canNeighborBurn(final World world, final int x, final int y, final int z) {
- return this.canCatchFire(world, x + 1, y, z, WEST)
- || this.canCatchFire(world, x - 1, y, z, EAST)
+ return this.canCatchFire(world, x + 1, y, z, WEST) || this.canCatchFire(world, x - 1, y, z, EAST)
|| this.canCatchFire(world, x, y - 1, z, UP)
|| this.canCatchFire(world, x, y + 1, z, DOWN)
|| this.canCatchFire(world, x, y, z - 1, SOUTH)
@@ -237,8 +229,7 @@ public class HellFire extends BlockFire {
}
/**
- * Gets the highest chance of a neighbor block encouraging this block to
- * catch fire
+ * Gets the highest chance of a neighbor block encouraging this block to catch fire
*/
private int getChanceOfNeighborsEncouragingFire(final World world, final int x, final int y, final int z) {
final byte b0 = 0;
@@ -258,19 +249,17 @@ public class HellFire extends BlockFire {
}
/**
- * Checks the specified block coordinate to see if it can catch fire. Args:
- * blockAccess, x, y, z
+ * Checks the specified block coordinate to see if it can catch fire. Args: blockAccess, x, y, z
*/
@Override
@Deprecated
- public boolean canBlockCatchFire(
- final IBlockAccess p_149844_1_, final int p_149844_2_, final int p_149844_3_, final int p_149844_4_) {
+ public boolean canBlockCatchFire(final IBlockAccess p_149844_1_, final int p_149844_2_, final int p_149844_3_,
+ final int p_149844_4_) {
return this.canCatchFire(p_149844_1_, p_149844_2_, p_149844_3_, p_149844_4_, UP);
}
/**
- * Checks to see if its valid to put this block at the specified
- * coordinates. Args: world, x, y, z
+ * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
*/
@Override
public boolean canPlaceBlockAt(final World worldObj, final int x, final int y, final int z) {
@@ -278,13 +267,12 @@ public class HellFire extends BlockFire {
}
/**
- * Lets the block know when one of its neighbor changes. Doesn't know which
- * neighbor changed (coordinates passed are their own) Args: x, y, z,
- * neighbor Block
+ * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
+ * their own) Args: x, y, z, neighbor Block
*/
@Override
- public void onNeighborBlockChange(
- final World worldObj, final int x, final int y, final int z, final Block blockObj) {
+ public void onNeighborBlockChange(final World worldObj, final int x, final int y, final int z,
+ final Block blockObj) {
if (!World.doesBlockHaveSolidTopSurface(worldObj, x, y - 1, z) && !this.canNeighborBurn(worldObj, x, y, z)) {
worldObj.setBlockToAir(x, y, z);
}
@@ -311,21 +299,20 @@ public class HellFire extends BlockFire {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
// Burn
@Override
- public void onEntityCollidedWithBlock(
- final World world, final int i, final int j, final int k, final Entity entity) {
+ public void onEntityCollidedWithBlock(final World world, final int i, final int j, final int k,
+ final Entity entity) {
entity.setFire(10);
}
/**
- * A randomly called display update to be able to add particles or other
- * items for display
+ * A randomly called display update to be able to add particles or other items for display
*/
@Override
@SideOnly(Side.CLIENT)
@@ -421,9 +408,8 @@ public class HellFire extends BlockFire {
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister IIconRegister) {
this.IIconArray = new IIcon[] {
- IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"),
- IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_1")
- };
+ IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_0"),
+ IIconRegister.registerIcon(CORE.MODID + ":" + "hellfire/" + "blockHellFire" + "_layer_1") };
}
@Override
@@ -447,10 +433,10 @@ public class HellFire extends BlockFire {
}
/*
- * ================================= Forge Start
- * ======================================
+ * ================================= Forge Start ======================================
*/
private static class FireInfo {
+
private int encouragement = 0;
private int flammibility = 0;
}
@@ -473,8 +459,7 @@ public class HellFire extends BlockFire {
final FireInfo info = this.getInfo(block, true);
info.encouragement = encouragement;
info.flammibility = flammibility;
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
private FireInfo getInfo(final Block block, final boolean garentee) {
@@ -521,55 +506,37 @@ public class HellFire extends BlockFire {
/**
* Side sensitive version that calls the block function.
*
- * @param world
- * The current world
- * @param x
- * X Position
- * @param y
- * Y Position
- * @param z
- * Z Position
- * @param face
- * The side the fire is coming from
+ * @param world The current world
+ * @param x X Position
+ * @param y Y Position
+ * @param z Z Position
+ * @param face The side the fire is coming from
* @return True if the face can catch fire.
*/
@Override
- public boolean canCatchFire(
- final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) {
+ public boolean canCatchFire(final IBlockAccess world, final int x, final int y, final int z,
+ final ForgeDirection face) {
return world.getBlock(x, y, z).isFlammable(world, x, y, z, face);
}
/**
* Side sensitive version that calls the block function.
*
- * @param world
- * The current world
- * @param x
- * X Position
- * @param y
- * Y Position
- * @param z
- * Z Position
- * @param oldChance
- * The previous maximum chance.
- * @param face
- * The side the fire is coming from
- * @return The chance of the block catching fire, or oldChance if it is
- * higher
+ * @param world The current world
+ * @param x X Position
+ * @param y Y Position
+ * @param z Z Position
+ * @param oldChance The previous maximum chance.
+ * @param face The side the fire is coming from
+ * @return The chance of the block catching fire, or oldChance if it is higher
*/
@Override
- public int getChanceToEncourageFire(
- final IBlockAccess world,
- final int x,
- final int y,
- final int z,
- final int oldChance,
- final ForgeDirection face) {
+ public int getChanceToEncourageFire(final IBlockAccess world, final int x, final int y, final int z,
+ final int oldChance, final ForgeDirection face) {
final int newChance = world.getBlock(x, y, z).getFireSpreadSpeed(world, x, y, z, face);
return (newChance > oldChance ? newChance : oldChance);
}
/*
- * ================================= Forge Start
- * ======================================
+ * ================================= Forge Start ======================================
*/
}
diff --git a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java
index df2ec518ce..4219666e2f 100644
--- a/src/main/java/gtPlusPlus/core/block/general/LightGlass.java
+++ b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java
@@ -1,19 +1,22 @@
package gtPlusPlus.core.block.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockAir;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
-/*public class LightGlass extends BlockBreakable
-{*/
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
+/*
+ * public class LightGlass extends BlockBreakable {
+ */
public class LightGlass extends BlockAir {
private int state = 0;
@@ -35,9 +38,8 @@ public class LightGlass extends BlockAir {
GameRegistry.registerBlock(this, "blockMFEffect");
/*
- this.setLightOpacity(0);
- this.setTickRandomly(true);
- this.setResistance(1);*/
+ * this.setLightOpacity(0); this.setTickRandomly(true); this.setResistance(1);
+ */
}
/**
@@ -127,8 +129,8 @@ public class LightGlass extends BlockAir {
*/
@Override
@SideOnly(Side.CLIENT)
- public void randomDisplayTick(
- final World world, final int posX, final int posY, final int posZ, final Random random) {
+ public void randomDisplayTick(final World world, final int posX, final int posY, final int posZ,
+ final Random random) {
// Utils.spawnFX(world, posX, posY, posZ, "smoke", "cloud");
}
diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
index 2b71f12f6d..b254caadf3 100644
--- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
+++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
@@ -1,13 +1,7 @@
package gtPlusPlus.core.block.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
-import gtPlusPlus.core.lib.CORE;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockTNT;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -20,7 +14,16 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
+import gtPlusPlus.core.lib.CORE;
+
public class MiningExplosives extends BlockTNT {
+
@SideOnly(Side.CLIENT)
private IIcon textureTop;
@@ -61,8 +64,8 @@ public class MiningExplosives extends BlockTNT {
* their own) Args: x, y, z, neighbor Block
*/
@Override
- public void onNeighborBlockChange(
- final World world, final int x, final int y, final int z, final Block neighbourblock) {
+ public void onNeighborBlockChange(final World world, final int x, final int y, final int z,
+ final Block neighbourblock) {
if (world.isBlockIndirectlyGettingPowered(x, y, z)) {
this.onBlockDestroyedByPlayer(world, x, y, z, 1);
world.setBlockToAir(x, y, z);
@@ -81,19 +84,23 @@ public class MiningExplosives extends BlockTNT {
* Called upon the block being destroyed by an explosion
*/
@Override
- public void onBlockDestroyedByExplosion(
- final World world, final int x, final int y, final int z, final Explosion bang) {
+ public void onBlockDestroyedByExplosion(final World world, final int x, final int y, final int z,
+ final Explosion bang) {
if (!world.isRemote) {
- final EntityPrimedMiningExplosive EntityPrimedMiningExplosive =
- new EntityPrimedMiningExplosive(world, x + 0.5F, y + 0.5F, z + 0.5F, bang.getExplosivePlacedBy());
- EntityPrimedMiningExplosive.fuse =
- world.rand.nextInt(EntityPrimedMiningExplosive.fuse / 4) + (EntityPrimedMiningExplosive.fuse / 8);
+ final EntityPrimedMiningExplosive EntityPrimedMiningExplosive = new EntityPrimedMiningExplosive(
+ world,
+ x + 0.5F,
+ y + 0.5F,
+ z + 0.5F,
+ bang.getExplosivePlacedBy());
+ EntityPrimedMiningExplosive.fuse = world.rand.nextInt(EntityPrimedMiningExplosive.fuse / 4)
+ + (EntityPrimedMiningExplosive.fuse / 8);
world.spawnEntityInWorld(EntityPrimedMiningExplosive);
}
}
/**
- * Called right before the block is destroyed by a player. Args: world, x, y, z, metaData
+ * Called right before the block is destroyed by a player. Args: world, x, y, z, metaData
*/
@Override
public void onBlockDestroyedByPlayer(final World world, final int x, final int y, final int z, final int meta) {
@@ -102,17 +109,16 @@ public class MiningExplosives extends BlockTNT {
// TODO Spawns Primed TNT?
@Override
- public void func_150114_a(
- final World world,
- final int p_150114_2_,
- final int p_150114_3_,
- final int p_150114_4_,
- final int p_150114_5_,
- final EntityLivingBase entityLiving) {
+ public void func_150114_a(final World world, final int p_150114_2_, final int p_150114_3_, final int p_150114_4_,
+ final int p_150114_5_, final EntityLivingBase entityLiving) {
if (!world.isRemote) {
if ((p_150114_5_ & 1) == 1) {
final EntityPrimedMiningExplosive EntityPrimedMiningExplosive = new EntityPrimedMiningExplosive(
- world, p_150114_2_ + 0.5F, p_150114_3_ + 0.5F, p_150114_4_ + 0.5F, entityLiving);
+ world,
+ p_150114_2_ + 0.5F,
+ p_150114_3_ + 0.5F,
+ p_150114_4_ + 0.5F,
+ entityLiving);
world.spawnEntityInWorld(EntityPrimedMiningExplosive);
world.playSoundAtEntity(EntityPrimedMiningExplosive, "game.tnt.primed", 1.0F, 1.0F);
}
@@ -123,15 +129,8 @@ public class MiningExplosives extends BlockTNT {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer clickingPlayer,
- final int p_149727_6_,
- final float p_149727_7_,
- final float p_149727_8_,
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z,
+ final EntityPlayer clickingPlayer, final int p_149727_6_, final float p_149727_7_, final float p_149727_8_,
final float p_149727_9_) {
if ((clickingPlayer.getCurrentEquippedItem() != null)
&& (clickingPlayer.getCurrentEquippedItem().getItem() == Items.flint_and_steel)) {
@@ -141,7 +140,15 @@ public class MiningExplosives extends BlockTNT {
return true;
} else {
return super.onBlockActivated(
- world, x, y, z, clickingPlayer, p_149727_6_, p_149727_7_, p_149727_8_, p_149727_9_);
+ world,
+ x,
+ y,
+ z,
+ clickingPlayer,
+ p_149727_6_,
+ p_149727_7_,
+ p_149727_8_,
+ p_149727_9_);
}
}
@@ -149,8 +156,8 @@ public class MiningExplosives extends BlockTNT {
* Triggered whenever an entity collides with this block (enters into the block). Args: world, x, y, z, entity
*/
@Override
- public void onEntityCollidedWithBlock(
- final World world, final int x, final int y, final int z, final Entity entityTriggering) {
+ public void onEntityCollidedWithBlock(final World world, final int x, final int y, final int z,
+ final Entity entityTriggering) {
if ((entityTriggering instanceof EntityArrow) && !world.isRemote) {
final EntityArrow entityarrow = (EntityArrow) entityTriggering;
@@ -181,9 +188,11 @@ public class MiningExplosives extends BlockTNT {
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister iconRegister) {
//
- /*this.blockIcon = iconRegister.registerIcon(this.getTextureName() + "_side");
- this.textureTop = iconRegister.registerIcon(this.getTextureName() + "_top");
- this.textureBottom = iconRegister.registerIcon(this.getTextureName() + "_bottom");*/
+ /*
+ * this.blockIcon = iconRegister.registerIcon(this.getTextureName() + "_side"); this.textureTop =
+ * iconRegister.registerIcon(this.getTextureName() + "_top"); this.textureBottom =
+ * iconRegister.registerIcon(this.getTextureName() + "_bottom");
+ */
this.blockIcon = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalSheet2");
this.textureTop = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalFunnel");
this.textureBottom = iconRegister.registerIcon(CORE.MODID + ":" + "chrono/" + "MetalPanel");
diff --git a/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java
index 01e63676cc..051a158515 100644
--- a/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java
+++ b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java
@@ -1,14 +1,8 @@
package gtPlusPlus.core.block.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockDoor;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityPlayerDoorBase;
-import gtPlusPlus.core.util.Utils;
import java.util.HashMap;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockDoor;
import net.minecraft.block.ITileEntityProvider;
@@ -25,6 +19,14 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockDoor;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityPlayerDoorBase;
+import gtPlusPlus.core.util.Utils;
+
public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
@SideOnly(Side.CLIENT)
@@ -39,13 +41,8 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
this(aMaterial, aTextureName, vanillaType, 0f, null, null);
}
- public PlayerDoors(
- Material aMaterial,
- String aTextureName,
- boolean vanillaType,
- float aHardness,
- SoundType aStepSound,
- String aBlockExtensionName) {
+ public PlayerDoors(Material aMaterial, String aTextureName, boolean vanillaType, float aHardness,
+ SoundType aStepSound, String aBlockExtensionName) {
super(aMaterial);
this.disableStats();
this.isBlockContainer = true;
@@ -154,8 +151,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
}
/**
- * If this block doesn't render as an ordinary block it will return False
- * (examples: signs, buttons, stairs, etc)
+ * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
*/
public boolean renderAsNormalBlock() {
return false;
@@ -178,8 +174,8 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
}
/**
- * Returns a bounding box from the pool of bounding boxes (this means this box
- * can change after the pool has been cleared to be reused)
+ * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been
+ * cleared to be reused)
*/
public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
this.setBlockBoundsBasedOnState(aWorld, aX, aY, aZ);
@@ -254,16 +250,8 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
/**
* Called upon block activation (right click on the block.)
*/
- public boolean onBlockActivated(
- World aWorld,
- int aX,
- int aY,
- int aZ,
- EntityPlayer aPlayer,
- int p_149727_6_,
- float p_149727_7_,
- float p_149727_8_,
- float p_149727_9_) {
+ public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int p_149727_6_,
+ float p_149727_7_, float p_149727_8_, float p_149727_9_) {
if (this.blockMaterial == Material.iron) {
return false; // Allow items to interact with the door
} else {
@@ -305,9 +293,8 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
}
/**
- * Lets the block know when one of its neighbor changes. Doesn't know which
- * neighbor changed (coordinates passed are their own) Args: x, y, z, neighbor
- * Block
+ * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
+ * their own) Args: x, y, z, neighbor Block
*/
public void onNeighborBlockChange(World aWorld, int aX, int aY, int aZ, Block aNeighbour) {
int l = aWorld.getBlockMetadata(aX, aY, aZ);
@@ -365,18 +352,17 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
}
/**
- * Ray traces through the blocks collision from start vector to end vector
- * returning a ray trace hit. Args: world, x, y, z, startVec, endVec
+ * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world,
+ * x, y, z, startVec, endVec
*/
- public MovingObjectPosition collisionRayTrace(
- World p_149731_1_, int p_149731_2_, int p_149731_3_, int p_149731_4_, Vec3 p_149731_5_, Vec3 p_149731_6_) {
+ public MovingObjectPosition collisionRayTrace(World p_149731_1_, int p_149731_2_, int p_149731_3_, int p_149731_4_,
+ Vec3 p_149731_5_, Vec3 p_149731_6_) {
this.setBlockBoundsBasedOnState(p_149731_1_, p_149731_2_, p_149731_3_, p_149731_4_);
return super.collisionRayTrace(p_149731_1_, p_149731_2_, p_149731_3_, p_149731_4_, p_149731_5_, p_149731_6_);
}
/**
- * Checks to see if its valid to put this block at the specified coordinates.
- * Args: world, x, y, z
+ * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
*/
public boolean canPlaceBlockAt(World aWorld, int aX, int aY, int aZ) {
boolean aHeight = (aY < aWorld.getHeight() - 1);
@@ -393,8 +379,8 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
}
/**
- * Returns the mobility information of the block, 0 = free, 1 = can't push but
- * can move over, 2 = total immobility and stop pistons
+ * Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility
+ * and stop pistons
*/
public int getMobilityFlag() {
return 1;
@@ -435,15 +421,9 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
/**
* Called when the block is attempted to be harvested
*/
- public void onBlockHarvested(
- World p_149681_1_,
- int p_149681_2_,
- int p_149681_3_,
- int p_149681_4_,
- int p_149681_5_,
+ public void onBlockHarvested(World p_149681_1_, int p_149681_2_, int p_149681_3_, int p_149681_4_, int p_149681_5_,
EntityPlayer p_149681_6_) {
- if (p_149681_6_.capabilities.isCreativeMode
- && (p_149681_5_ & 8) != 0
+ if (p_149681_6_.capabilities.isCreativeMode && (p_149681_5_ & 8) != 0
&& p_149681_1_.getBlock(p_149681_2_, p_149681_3_ - 1, p_149681_4_) == this) {
p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_);
}
@@ -458,15 +438,15 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
}
@Override
- public void breakBlock(
- World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) {
+ public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_,
+ int p_149749_6_) {
super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
p_149749_1_.removeTileEntity(p_149749_2_, p_149749_3_, p_149749_4_);
}
@Override
- public boolean onBlockEventReceived(
- World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, int p_149696_5_, int p_149696_6_) {
+ public boolean onBlockEventReceived(World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_,
+ int p_149696_5_, int p_149696_6_) {
super.onBlockEventReceived(p_149696_1_, p_149696_2_, p_149696_3_, p_149696_4_, p_149696_5_, p_149696_6_);
TileEntity tileentity = p_149696_1_.getTileEntity(p_149696_2_, p_149696_3_, p_149696_4_);
return tileentity != null ? tileentity.receiveClientEvent(p_149696_5_, p_149696_6_) : false;
diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
index 4d11a8ac66..7e5600715a 100644
--- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
+++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
@@ -1,11 +1,5 @@
package gtPlusPlus.core.block.general.antigrief;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -20,6 +14,13 @@ import net.minecraft.world.Explosion;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+
public class BlockWitherProof extends Block {
public BlockWitherProof() {
@@ -62,12 +63,8 @@ public class BlockWitherProof extends Block {
}
@Override
- public void onBlockDestroyedByExplosion(
- final World p_149723_1_,
- final int p_149723_2_,
- final int p_149723_3_,
- final int p_149723_4_,
- final Explosion p_149723_5_) {}
+ public void onBlockDestroyedByExplosion(final World p_149723_1_, final int p_149723_2_, final int p_149723_3_,
+ final int p_149723_4_, final Explosion p_149723_5_) {}
@Override
public boolean canDropFromExplosion(final Explosion p_149659_1_) {
@@ -75,13 +72,12 @@ public class BlockWitherProof extends Block {
}
@Override
- public boolean canEntityDestroy(
- final IBlockAccess world, final int x, final int y, final int z, final Entity entity) {
+ public boolean canEntityDestroy(final IBlockAccess world, final int x, final int y, final int z,
+ final Entity entity) {
if ((entity == null) || !entity.isEntityAlive()) {
return false;
}
- if ((entity instanceof EntityWither)
- || (entity instanceof EntityDragon)
+ if ((entity instanceof EntityWither) || (entity instanceof EntityDragon)
|| (entity instanceof IBossDisplayData)) {
return false;
} else {
@@ -103,20 +99,20 @@ public class BlockWitherProof extends Block {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
@Override
- public void breakBlock(
- World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) {
+ public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_,
+ int p_149749_6_) {
super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
}
@Override
- public float getPlayerRelativeBlockHardness(
- EntityPlayer aPlayer, World p_149737_2_, int p_149737_3_, int p_149737_4_, int p_149737_5_) {
+ public float getPlayerRelativeBlockHardness(EntityPlayer aPlayer, World p_149737_2_, int p_149737_3_,
+ int p_149737_4_, int p_149737_5_) {
if (aPlayer != null && aPlayer instanceof EntityPlayerMP) {
return 1f;
}
@@ -129,8 +125,8 @@ public class BlockWitherProof extends Block {
}
@Override
- public void onBlockClicked(
- World p_149699_1_, int p_149699_2_, int p_149699_3_, int p_149699_4_, EntityPlayer p_149699_5_) {
+ public void onBlockClicked(World p_149699_1_, int p_149699_2_, int p_149699_3_, int p_149699_4_,
+ EntityPlayer p_149699_5_) {
super.onBlockClicked(p_149699_1_, p_149699_2_, p_149699_3_, p_149699_4_, p_149699_5_);
}
@@ -139,8 +135,7 @@ public class BlockWitherProof extends Block {
if ((entity == null) || !entity.isEntityAlive()) {
return;
}
- if ((entity instanceof EntityWither)
- || (entity instanceof EntityDragon)
+ if ((entity instanceof EntityWither) || (entity instanceof EntityDragon)
|| (entity instanceof IBossDisplayData)) {
return;
} else {
@@ -149,13 +144,8 @@ public class BlockWitherProof extends Block {
}
@Override
- public void harvestBlock(
- World p_149636_1_,
- EntityPlayer p_149636_2_,
- int p_149636_3_,
- int p_149636_4_,
- int p_149636_5_,
- int p_149636_6_) {
+ public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_,
+ int p_149636_5_, int p_149636_6_) {
super.harvestBlock(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_);
}
@@ -168,15 +158,8 @@ public class BlockWitherProof extends Block {
}
@Override
- public float getExplosionResistance(
- Entity par1Entity,
- World world,
- int x,
- int y,
- int z,
- double explosionX,
- double explosionY,
- double explosionZ) {
+ public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX,
+ double explosionY, double explosionZ) {
return Float.MAX_VALUE;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
index b3bf56e3f5..c72da4cf4a 100644
--- a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
+++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
@@ -2,14 +2,9 @@ package gtPlusPlus.core.block.general.antigrief;
import static gtPlusPlus.core.block.ModBlocks.blockGriefSaver;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityReverter;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,7 +20,15 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityReverter;
+
public class TowerDevice extends Block {
+
private static IIcon TEX_ANTIBUILDER;
public static final int META_ANTIBUILDER = 9;
private boolean bUnbreakable;
@@ -67,30 +70,15 @@ public class TowerDevice extends Block {
}
@Override
- public boolean onBlockActivated(
- final World par1World,
- final int x,
- final int y,
- final int z,
- final EntityPlayer par5EntityPlayer,
- final int par6,
- final float par7,
- final float par8,
- final float par9) {
+ public boolean onBlockActivated(final World par1World, final int x, final int y, final int z,
+ final EntityPlayer par5EntityPlayer, final int par6, final float par7, final float par8, final float par9) {
final int meta = par1World.getBlockMetadata(x, y, z);
return false;
}
@Override
- public float getExplosionResistance(
- final Entity par1Entity,
- final World world,
- final int x,
- final int y,
- final int z,
- final double explosionX,
- final double explosionY,
- final double explosionZ) {
+ public float getExplosionResistance(final Entity par1Entity, final World world, final int x, final int y,
+ final int z, final double explosionX, final double explosionY, final double explosionZ) {
final int meta = world.getBlockMetadata(x, y, z);
return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ);
}
@@ -124,8 +112,8 @@ public class TowerDevice extends Block {
}
}
- private static void changeToBlockMeta(
- final World par1World, final int x, final int y, final int z, final int meta) {
+ private static void changeToBlockMeta(final World par1World, final int x, final int y, final int z,
+ final int meta) {
final Block thereBlockID = par1World.getBlock(x, y, z);
if ((thereBlockID == blockGriefSaver)) {
par1World.setBlock(x, y, z, thereBlockID, meta, 3);
@@ -141,8 +129,8 @@ public class TowerDevice extends Block {
}
@Override
- public void onNeighborBlockChange(
- final World par1World, final int x, final int y, final int z, final Block myBlockID) {
+ public void onNeighborBlockChange(final World par1World, final int x, final int y, final int z,
+ final Block myBlockID) {
final int meta = par1World.getBlockMetadata(x, y, z);
if (!par1World.isRemote) {}
}
@@ -174,8 +162,8 @@ public class TowerDevice extends Block {
@Override
@SideOnly(Side.CLIENT)
- public void randomDisplayTick(
- final World par1World, final int x, final int y, final int z, final Random par5Random) {
+ public void randomDisplayTick(final World par1World, final int x, final int y, final int z,
+ final Random par5Random) {
final int meta = par1World.getBlockMetadata(x, y, z);
if ((meta == 3) || (meta == 1) || (meta == 9)) {
for (int i = 0; i < 1; i++) {
@@ -219,8 +207,8 @@ public class TowerDevice extends Block {
final int thereMeta = world.getBlockMetadata(x, y, z);
}
- public static void changeToActiveVanishBlock(
- final World par1World, final int x, final int y, final int z, final int meta) {
+ public static void changeToActiveVanishBlock(final World par1World, final int x, final int y, final int z,
+ final int meta) {
changeToBlockMeta(par1World, x, y, z, meta);
par1World.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "random.pop", 0.3F, 0.6F);
diff --git a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
index fcce29d164..3200e497b8 100644
--- a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
+++ b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.block.general.fluids;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EnumCreatureType;
@@ -13,6 +9,11 @@ import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
public class BlockFluidSludge extends BlockFluidClassic {
@SideOnly(Side.CLIENT)
@@ -55,8 +56,8 @@ public class BlockFluidSludge extends BlockFluidClassic {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
index 1c1434b741..b18e6bcb29 100644
--- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
+++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
@@ -1,21 +1,10 @@
package gtPlusPlus.core.block.general.redstone;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
-import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
-import gtPlusPlus.core.util.minecraft.InventoryUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -33,6 +22,19 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public abstract class BlockGenericRedstone extends BlockContainer {
@SuppressWarnings("deprecation")
@@ -45,11 +47,12 @@ public abstract class BlockGenericRedstone extends BlockContainer {
LanguageRegistry.addName(this, aDisplayName);
}
- private final HashMap<Integer, HashMap<ForgeDirection, IIcon>> mTextures =
- new HashMap<Integer, HashMap<ForgeDirection, IIcon>>();
+ private final HashMap<Integer, HashMap<ForgeDirection, IIcon>> mTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>();
/**
- * A map of the textures used for this blocks. The key is the meta, then each internal map holds textures tied to each forge direction. Do not use unknown direction.
+ * A map of the textures used for this blocks. The key is the meta, then each internal map holds textures tied to
+ * each forge direction. Do not use unknown direction.
+ *
* @return
*/
public HashMap<Integer, HashMap<ForgeDirection, IIcon>> getTextureArray() {
@@ -69,16 +72,8 @@ public abstract class BlockGenericRedstone extends BlockContainer {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
@@ -99,7 +94,8 @@ public abstract class BlockGenericRedstone extends BlockContainer {
if (ItemUtils.isToolScrewdriver(mHandStack)) {
mDidTool = tile.onScrewdriverRMB();
PlayerUtils.messagePlayer(
- player, "Adjusted Light level by 0.0625f. " + tile.getLightBrightness());
+ player,
+ "Adjusted Light level by 0.0625f. " + tile.getLightBrightness());
}
}
if (tile.isMalletable()) {
@@ -115,8 +111,7 @@ public abstract class BlockGenericRedstone extends BlockContainer {
}
}
}
- } catch (final Throwable t) {
- }
+ } catch (final Throwable t) {}
if (mDidTool) {
return true;
}
@@ -153,8 +148,7 @@ public abstract class BlockGenericRedstone extends BlockContainer {
}
}
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
if (!mDidTool && !aPlayer.capabilities.isCreativeMode) {
super.onBlockClicked(aWorld, aX, aY, aZ, aPlayer);
@@ -167,19 +161,14 @@ public abstract class BlockGenericRedstone extends BlockContainer {
public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_);
@Override
- public void breakBlock(
- final World world, final int x, final int y, final int z, final Block block, final int number) {
+ public void breakBlock(final World world, final int x, final int y, final int z, final Block block,
+ final int number) {
InventoryUtils.dropInventoryItems(world, x, y, z, block);
super.breakBlock(world, x, y, z, block, number);
}
@Override
- public void onBlockPlacedBy(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityLivingBase entity,
+ public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity,
final ItemStack stack) {
if (stack.hasDisplayName()) {
((TileEntityRedstoneHandler) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName());
@@ -187,8 +176,8 @@ public abstract class BlockGenericRedstone extends BlockContainer {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
@@ -198,16 +187,8 @@ public abstract class BlockGenericRedstone extends BlockContainer {
}
@Override
- public int onBlockPlaced(
- World p_149660_1_,
- int p_149660_2_,
- int p_149660_3_,
- int p_149660_4_,
- int p_149660_5_,
- float p_149660_6_,
- float p_149660_7_,
- float p_149660_8_,
- int p_149660_9_) {
+ public int onBlockPlaced(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_,
+ float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_) {
// TODO Auto-generated method stub
return super.onBlockPlaced(
p_149660_1_,
@@ -251,8 +232,8 @@ public abstract class BlockGenericRedstone extends BlockContainer {
}
@Override
- public int getComparatorInputOverride(
- World p_149736_1_, int p_149736_2_, int p_149736_3_, int p_149736_4_, int p_149736_5_) {
+ public int getComparatorInputOverride(World p_149736_1_, int p_149736_2_, int p_149736_3_, int p_149736_4_,
+ int p_149736_5_) {
// TODO Auto-generated method stub
return super.getComparatorInputOverride(p_149736_1_, p_149736_2_, p_149736_3_, p_149736_4_, p_149736_5_);
}
@@ -315,9 +296,8 @@ public abstract class BlockGenericRedstone extends BlockContainer {
}
/**
- * Lets the block know when one of its neighbor changes. Doesn't know which
- * neighbor changed (coordinates passed are their own) Args: x, y, z, neighbor
- * Block
+ * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
+ * their own) Args: x, y, z, neighbor Block
*/
public void onNeighborBlockChange(World aWorld, int aX, int aY, int aZ, Block p_149695_5_) {
@@ -371,16 +351,15 @@ public abstract class BlockGenericRedstone extends BlockContainer {
public abstract Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_);
/**
- * Returns an item stack containing a single instance of the current block type.
- * 'i' is the block's subtype/damage and is ignored for blocks which do not
- * support subtypes. Blocks which cannot be harvested should return null.
+ * Returns an item stack containing a single instance of the current block type. 'i' is the block's subtype/damage
+ * and is ignored for blocks which do not support subtypes. Blocks which cannot be harvested should return null.
*/
@Override
protected abstract ItemStack createStackedBlock(int p_149644_1_);
@Override
- public abstract ArrayList<ItemStack> getDrops(
- final World world, final int x, final int y, final int z, final int metadata, final int fortune);
+ public abstract ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z,
+ final int metadata, final int fortune);
@Override
public abstract Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_);
diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java
index 406b53fb59..21286ba993 100644
--- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java
+++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java
@@ -1,12 +1,10 @@
package gtPlusPlus.core.block.general.redstone;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Random;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
@@ -16,6 +14,10 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class BlockGenericRedstoneDetector extends BlockGenericRedstone {
public BlockGenericRedstoneDetector() {
@@ -29,6 +31,7 @@ public class BlockGenericRedstoneDetector extends BlockGenericRedstone {
}
public class TileEntityRedstoneDetector extends TileEntityRedstoneHandler {
+
public TileEntityRedstoneDetector() {
super(0);
}
@@ -72,8 +75,7 @@ public class BlockGenericRedstoneDetector extends BlockGenericRedstone {
}
public void generateTextureArray(final IIconRegister iicon) {
- HashMap<Integer, HashMap<ForgeDirection, IIcon>> aTextures =
- new HashMap<Integer, HashMap<ForgeDirection, IIcon>>();
+ HashMap<Integer, HashMap<ForgeDirection, IIcon>> aTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>();
// New Block for Each Meta
int aMeta = 0;
@@ -81,15 +83,20 @@ public class BlockGenericRedstoneDetector extends BlockGenericRedstone {
HashMap<ForgeDirection, IIcon> aTempMap = new HashMap<ForgeDirection, IIcon>();
aTempMap.put(ForgeDirection.UP, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTempMap.put(
- ForgeDirection.DOWN, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+ ForgeDirection.DOWN,
+ iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTempMap.put(
- ForgeDirection.NORTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+ ForgeDirection.NORTH,
+ iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTempMap.put(
- ForgeDirection.SOUTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+ ForgeDirection.SOUTH,
+ iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTempMap.put(
- ForgeDirection.EAST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+ ForgeDirection.EAST,
+ iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTempMap.put(
- ForgeDirection.WEST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+ ForgeDirection.WEST,
+ iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTextures.put(aMeta++, aTempMap);
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java
index c732ed216b..fd5b996160 100644
--- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java
+++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java
@@ -1,3 +1,4 @@
package gtPlusPlus.core.block.general.redstone;
-public class BlockGenericRedstoneEmitter {}
+public class BlockGenericRedstoneEmitter {
+}
diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java
index 85c2506359..0d8f66c326 100644
--- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java
+++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java
@@ -1,15 +1,10 @@
package gtPlusPlus.core.block.general.redstone;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.world.explosions.ExplosionHandler;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Random;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
@@ -20,6 +15,13 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.redstone.TileEntityRedstoneHandler;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.world.explosions.ExplosionHandler;
+
public class BlockGenericRedstoneTest extends BlockGenericRedstone {
public BlockGenericRedstoneTest() {
@@ -33,6 +35,7 @@ public class BlockGenericRedstoneTest extends BlockGenericRedstone {
}
public class TileEntityRedstoneTest extends TileEntityRedstoneHandler {
+
public TileEntityRedstoneTest() {
super(2);
}
@@ -141,8 +144,7 @@ public class BlockGenericRedstoneTest extends BlockGenericRedstone {
}
public void generateTextureArray(final IIconRegister iicon) {
- HashMap<Integer, HashMap<ForgeDirection, IIcon>> aTextures =
- new HashMap<Integer, HashMap<ForgeDirection, IIcon>>();
+ HashMap<Integer, HashMap<ForgeDirection, IIcon>> aTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>();
// New Block for Each Meta
int aMeta = 0;
@@ -150,15 +152,20 @@ public class BlockGenericRedstoneTest extends BlockGenericRedstone {
HashMap<ForgeDirection, IIcon> aTempMap = new HashMap<ForgeDirection, IIcon>();
aTempMap.put(ForgeDirection.UP, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTempMap.put(
- ForgeDirection.DOWN, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+ ForgeDirection.DOWN,
+ iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTempMap.put(
- ForgeDirection.NORTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+ ForgeDirection.NORTH,
+ iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTempMap.put(
- ForgeDirection.SOUTH, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+ ForgeDirection.SOUTH,
+ iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTempMap.put(
- ForgeDirection.EAST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+ ForgeDirection.EAST,
+ iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTempMap.put(
- ForgeDirection.WEST, iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
+ ForgeDirection.WEST,
+ iicon.registerIcon(CORE.MODID + ":" + "redstone/redstone_meter/" + "top"));
aTextures.put(aMeta++, aTempMap);
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java
index 289b5e5c1c..83e3edac59 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java
@@ -1,23 +1,20 @@
package gtPlusPlus.core.block.machine;
-import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
-import gtPlusPlus.core.block.base.MetaBlock;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EnumCreatureType;
import net.minecraft.world.IBlockAccess;
+import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
+import gtPlusPlus.core.block.base.MetaBlock;
+import gtPlusPlus.core.lib.CORE;
+
public class BlockGtFrameBox extends MetaBlock {
private int[] colours;
private int totalColours;
- public BlockGtFrameBox(
- final String unlocalizedName,
- final Material material,
- final BlockTypes blockTypeENUM,
- final boolean recolour,
- final int... colour) {
+ public BlockGtFrameBox(final String unlocalizedName, final Material material, final BlockTypes blockTypeENUM,
+ final boolean recolour, final int... colour) {
super(unlocalizedName, material, blockTypeENUM.getBlockSoundType());
this.setBlockTextureName(CORE.MODID + ":" + "blockGtFrame");
this.setHarvestLevel(blockTypeENUM.getHarvestTool(), 2);
@@ -28,16 +25,16 @@ public class BlockGtFrameBox extends MetaBlock {
}
@Override
- public int colorMultiplier(
- final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_, final int p_149720_4_) {
+ public int colorMultiplier(final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_,
+ final int p_149720_4_) {
for (final int i : this.colours) {}
return super.colorMultiplier(p_149720_1_, p_149720_2_, p_149720_3_, p_149720_4_);
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
index 4cc3afec22..b25b24302f 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java
@@ -1,15 +1,5 @@
package gtPlusPlus.core.block.machine;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.objects.minecraft.CubicObject;
-import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
@@ -21,6 +11,17 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.minecraft.CubicObject;
+import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class CircuitProgrammer extends BasicTileBlockWithTooltip {
/**
@@ -43,16 +44,8 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
} else {
@@ -69,8 +62,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z);
}
}
- } catch (final Throwable t) {
- }
+ } catch (final Throwable t) {}
if (!mDidScrewDriver) {
final TileEntity te = world.getTileEntity(x, y, z);
@@ -106,12 +98,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
}
@Override
- public void onBlockPlacedBy(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityLivingBase entity,
+ public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity,
final ItemStack stack) {
if (stack.hasDisplayName()) {
((TileEntityCircuitProgrammer) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName());
@@ -119,8 +106,8 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
@@ -156,15 +143,13 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip {
@Override
public CubicObject<String>[] getCustomTextureDirectoryObject() {
- String[] aTexData = new String[] {
- CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G",
- CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B",
- CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
- CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
- CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
- CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I"
- };
- CubicObject<String>[] aTextureData = new CubicObject[] {new CubicObject<String>(aTexData)};
+ String[] aTexData = new String[] { CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_G",
+ CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_B",
+ CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+ CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+ CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I",
+ CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" };
+ CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) };
return aTextureData;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
index c3c49ff03f..7ca23df3f9 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java
@@ -1,5 +1,18 @@
package gtPlusPlus.core.block.machine;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
@@ -13,20 +26,9 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
import gtPlusPlus.core.util.minecraft.InventoryUtils;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
public class DecayablesChest extends BlockContainer implements ITileTooltip {
+
@SideOnly(Side.CLIENT)
private IIcon textureTop;
@@ -61,7 +63,7 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
}
/**
- * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two
+ * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two
* adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
*/
public boolean isOpaqueCube() {
@@ -93,8 +95,8 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
/**
* Updates the blocks bounds based on its current state. Args: world, x, y, z
*/
- public void setBlockBoundsBasedOnState(
- IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) {
+ public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_,
+ int p_149719_4_) {
if (p_149719_1_.getBlock(p_149719_2_, p_149719_3_, p_149719_4_ - 1) == this) {
this.setBlockBounds(0.0625F, 0.0F, 0.0F, 0.9375F, 0.875F, 0.9375F);
} else if (p_149719_1_.getBlock(p_149719_2_, p_149719_3_, p_149719_4_ + 1) == this) {
@@ -130,16 +132,8 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
}
@@ -168,19 +162,14 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
}
@Override
- public void breakBlock(
- final World world, final int x, final int y, final int z, final Block block, final int number) {
+ public void breakBlock(final World world, final int x, final int y, final int z, final Block block,
+ final int number) {
InventoryUtils.dropInventoryItems(world, x, y, z, block);
super.breakBlock(world, x, y, z, block, number);
}
@Override
- public void onBlockPlacedBy(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityLivingBase entity,
+ public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity,
final ItemStack stack) {
if (stack.hasDisplayName()) {
((TileEntityDecayablesChest) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName());
@@ -188,28 +177,23 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
- /*@Override
- public void breakBlock(World world, BlockPos pos, IBlockState blockstate) {
- TileEntityFishTrap te = (TileEntityFishTrap) world.getTileEntity(pos);
- InventoryHelper.dropInventoryItems(world, pos, te);
- super.breakBlock(world, pos, blockstate);
- }
-
-
- @Override
- public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
- if (stack.hasDisplayName()) {
- ((TileEntityFishTrap) worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName());
- }
- }*/
+ /*
+ * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te =
+ * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te);
+ * super.breakBlock(world, pos, blockstate); }
+ * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer,
+ * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap)
+ * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } }
+ */
/**
* Update Chest Meta - Stub
+ *
* @param aWorld
* @param xPos
* @param yPos
diff --git a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
index 2950eeae98..f4de81cbd4 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java
@@ -1,17 +1,5 @@
package gtPlusPlus.core.block.machine;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityEggBox;
-import gtPlusPlus.core.util.minecraft.InventoryUtils;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -25,7 +13,21 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityEggBox;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+
public class EggBox extends BlockContainer implements ITileTooltip {
+
@SideOnly(Side.CLIENT)
private IIcon textureTop;
@@ -95,16 +97,8 @@ public class EggBox extends BlockContainer implements ITileTooltip {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
}
@@ -133,19 +127,14 @@ public class EggBox extends BlockContainer implements ITileTooltip {
}
@Override
- public void breakBlock(
- final World world, final int x, final int y, final int z, final Block block, final int number) {
+ public void breakBlock(final World world, final int x, final int y, final int z, final Block block,
+ final int number) {
InventoryUtils.dropInventoryItems(world, x, y, z, block);
super.breakBlock(world, x, y, z, block, number);
}
@Override
- public void onBlockPlacedBy(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityLivingBase entity,
+ public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity,
final ItemStack stack) {
if (stack.hasDisplayName()) {
((TileEntityEggBox) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName());
@@ -153,28 +142,23 @@ public class EggBox extends BlockContainer implements ITileTooltip {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
- /*@Override
- public void breakBlock(World world, BlockPos pos, IBlockState blockstate) {
- TileEntityFishTrap te = (TileEntityFishTrap) world.getTileEntity(pos);
- InventoryHelper.dropInventoryItems(world, pos, te);
- super.breakBlock(world, pos, blockstate);
- }
-
-
- @Override
- public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
- if (stack.hasDisplayName()) {
- ((TileEntityFishTrap) worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName());
- }
- }*/
+ /*
+ * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te =
+ * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te);
+ * super.breakBlock(world, pos, blockstate); }
+ * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer,
+ * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap)
+ * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } }
+ */
/**
* Update Chest Meta - Stub
+ *
* @param aWorld
* @param xPos
* @param yPos
diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
index 0975b71ace..5571a4eb41 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java
@@ -1,16 +1,5 @@
package gtPlusPlus.core.block.machine;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
-import gtPlusPlus.core.util.minecraft.InventoryUtils;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -24,7 +13,20 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+
public class FishTrap extends BlockContainer implements ITileTooltip {
+
@SideOnly(Side.CLIENT)
private IIcon textureTop;
@@ -61,10 +63,8 @@ public class FishTrap extends BlockContainer implements ITileTooltip {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
- return p_149691_1_ == 1
- ? this.textureTop
- : (p_149691_1_ == 0
- ? this.textureBottom
+ return p_149691_1_ == 1 ? this.textureTop
+ : (p_149691_1_ == 0 ? this.textureBottom
: ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
}
@@ -81,16 +81,8 @@ public class FishTrap extends BlockContainer implements ITileTooltip {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
}
@@ -124,19 +116,14 @@ public class FishTrap extends BlockContainer implements ITileTooltip {
}
@Override
- public void breakBlock(
- final World world, final int x, final int y, final int z, final Block block, final int number) {
+ public void breakBlock(final World world, final int x, final int y, final int z, final Block block,
+ final int number) {
InventoryUtils.dropInventoryItems(world, x, y, z, block);
super.breakBlock(world, x, y, z, block, number);
}
@Override
- public void onBlockPlacedBy(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityLivingBase entity,
+ public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity,
final ItemStack stack) {
if (stack.hasDisplayName()) {
((TileEntityFishTrap) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName());
@@ -144,24 +131,18 @@ public class FishTrap extends BlockContainer implements ITileTooltip {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
- /*@Override
- public void breakBlock(World world, BlockPos pos, IBlockState blockstate) {
- TileEntityFishTrap te = (TileEntityFishTrap) world.getTileEntity(pos);
- InventoryHelper.dropInventoryItems(world, pos, te);
- super.breakBlock(world, pos, blockstate);
- }
-
-
- @Override
- public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
- if (stack.hasDisplayName()) {
- ((TileEntityFishTrap) worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName());
- }
- }*/
+ /*
+ * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te =
+ * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te);
+ * super.breakBlock(world, pos, blockstate); }
+ * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer,
+ * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap)
+ * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } }
+ */
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
index 4c7668b9e0..8eaa331c12 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java
@@ -1,5 +1,13 @@
package gtPlusPlus.core.block.machine;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
@@ -8,15 +16,9 @@ import gtPlusPlus.GTplusplus;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
public class HeliumGenerator extends BlockContainer {
+
@SideOnly(Side.CLIENT)
private IIcon textureTop;
@@ -41,10 +43,8 @@ public class HeliumGenerator extends BlockContainer {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
- return p_149691_1_ == 1
- ? this.textureTop
- : (p_149691_1_ == 0
- ? this.textureBottom
+ return p_149691_1_ == 1 ? this.textureTop
+ : (p_149691_1_ == 0 ? this.textureBottom
: ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
}
@@ -61,16 +61,8 @@ public class HeliumGenerator extends BlockContainer {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
index 124860cb27..14c54b1040 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java
@@ -1,5 +1,15 @@
package gtPlusPlus.core.block.machine;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
@@ -11,17 +21,9 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
public class Machine_ModularityTable extends BlockContainer implements ITileTooltip {
+
@SideOnly(Side.CLIENT)
private IIcon textureTop;
@@ -56,10 +58,8 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
- return p_149691_1_ == 1
- ? this.textureTop
- : (p_149691_1_ == 0
- ? this.textureBottom
+ return p_149691_1_ == 1 ? this.textureTop
+ : (p_149691_1_ == 0 ? this.textureBottom
: ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
}
@@ -76,16 +76,8 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
}
@@ -104,8 +96,8 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
index 96fe4e20b1..895bc8847f 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
@@ -1,17 +1,5 @@
package gtPlusPlus.core.block.machine;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
-import gtPlusPlus.core.util.minecraft.InventoryUtils;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -25,7 +13,21 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+
public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
+
@SideOnly(Side.CLIENT)
private IIcon textureTop;
@@ -68,28 +70,20 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister p_149651_1_) {
- this.blockIcon =
- p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+ this.blockIcon = p_149651_1_
+ .registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_PESTKILLER_TOP");
this.textureBottom = p_149651_1_.registerIcon("planks_acacia");
- this.textureFront =
- p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+ this.textureFront = p_149651_1_
+ .registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
}
/**
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
}
@@ -123,19 +117,14 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
}
@Override
- public void breakBlock(
- final World world, final int x, final int y, final int z, final Block block, final int number) {
+ public void breakBlock(final World world, final int x, final int y, final int z, final Block block,
+ final int number) {
InventoryUtils.dropInventoryItems(world, x, y, z, block);
super.breakBlock(world, x, y, z, block, number);
}
@Override
- public void onBlockPlacedBy(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityLivingBase entity,
+ public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity,
final ItemStack stack) {
if (stack.hasDisplayName()) {
((TileEntityPestKiller) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName());
@@ -143,8 +132,8 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
index 374694ff48..c7198f7a64 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
@@ -1,18 +1,8 @@
package gtPlusPlus.core.block.machine;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityAdvPooCollector;
-import gtPlusPlus.core.tileentities.machines.TileEntityBaseFluidCollector;
-import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,6 +14,18 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityAdvPooCollector;
+import gtPlusPlus.core.tileentities.machines.TileEntityBaseFluidCollector;
+import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class Machine_PooCollector extends BlockContainer {
@SideOnly(Side.CLIENT)
@@ -75,16 +77,8 @@ public class Machine_PooCollector extends BlockContainer {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
} else {
@@ -98,32 +92,20 @@ public class Machine_PooCollector extends BlockContainer {
}
// Fluid container code
- /*if (handItem != null
- && (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer
- || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) {
- if (tank.tank.getFluid() == null) {
- try {
- if (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())) {
- ItemStack handItemStack = player.getHeldItem();
- IFluidContainerItem container = (IFluidContainerItem) handItem;
- FluidStack containerFluid = container.getFluid(handItemStack);
- container.drain(handItemStack, container.getFluid(handItemStack).amount, true);
- tank.tank.setFluid(containerFluid);
- } else {
- ItemStack handItemStack = player.getHeldItem();
- FluidContainerRegistry.drainFluidContainer(handItemStack);
- FluidStack containerFluid = FluidContainerRegistry.getFluidForFilledItem(handItemStack);
- ItemStack emptyContainer = FluidContainerRegistry.drainFluidContainer(handItemStack);
- player.setItemInUse(emptyContainer, 0);
-
- tank.tank.setFluid(containerFluid);
- }
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-
- }*/
+ /*
+ * if (handItem != null && (handItem instanceof IFluidContainerItem || handItem instanceof
+ * ItemFluidContainer || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) { if
+ * (tank.tank.getFluid() == null) { try { if
+ * (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())) { ItemStack handItemStack =
+ * player.getHeldItem(); IFluidContainerItem container = (IFluidContainerItem) handItem; FluidStack
+ * containerFluid = container.getFluid(handItemStack); container.drain(handItemStack,
+ * container.getFluid(handItemStack).amount, true); tank.tank.setFluid(containerFluid); } else {
+ * ItemStack handItemStack = player.getHeldItem();
+ * FluidContainerRegistry.drainFluidContainer(handItemStack); FluidStack containerFluid =
+ * FluidContainerRegistry.getFluidForFilledItem(handItemStack); ItemStack emptyContainer =
+ * FluidContainerRegistry.drainFluidContainer(handItemStack); player.setItemInUse(emptyContainer, 0);
+ * tank.tank.setFluid(containerFluid); } } catch (Throwable t) { t.printStackTrace(); } } }
+ */
if (!tank.mInventory.isEmpty()) {
PlayerUtils.messagePlayer(player, "Inventory contains:");
@@ -134,7 +116,8 @@ public class Machine_PooCollector extends BlockContainer {
if (tank.tank.getFluid() != null) {
PlayerUtils.messagePlayer(
player,
- "Tank contains " + tank.tank.getFluidAmount() + "L of "
+ "Tank contains " + tank.tank.getFluidAmount()
+ + "L of "
+ tank.tank.getFluid().getLocalizedName());
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
index 1959c20f70..1f0f03f0f0 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
@@ -1,5 +1,16 @@
package gtPlusPlus.core.block.machine;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
@@ -16,19 +27,10 @@ import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import ic2.core.item.tool.ItemToolWrench;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
@Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO")
public class Machine_ProjectTable extends BlockContainer implements ITileTooltip {
+
@SideOnly(Side.CLIENT)
private IIcon textureTop;
@@ -63,10 +65,8 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
- return p_149691_1_ == 1
- ? this.textureTop
- : (p_149691_1_ == 0
- ? this.textureBottom
+ return p_149691_1_ == 1 ? this.textureTop
+ : (p_149691_1_ == 0 ? this.textureBottom
: ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
}
@@ -83,16 +83,8 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
ItemStack heldItem = null;
if (world.isRemote) {
@@ -163,8 +155,8 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
index caf961f91f..ef55f1ece1 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
@@ -1,5 +1,13 @@
package gtPlusPlus.core.block.machine;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.minecraft.CubicObject;
import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
@@ -9,13 +17,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
public class Machine_RoundRobinator extends BasicTileBlockWithTooltip {
@@ -27,16 +28,8 @@ public class Machine_RoundRobinator extends BasicTileBlockWithTooltip {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
} else {
@@ -51,8 +44,7 @@ public class Machine_RoundRobinator extends BasicTileBlockWithTooltip {
mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z);
}
}
- } catch (final Throwable t) {
- }
+ } catch (final Throwable t) {}
if (!mDidScrewDriver) {
final TileEntity te = world.getTileEntity(x, y, z);
@@ -115,22 +107,20 @@ public class Machine_RoundRobinator extends BasicTileBlockWithTooltip {
public CubicObject<String>[] getCustomTextureDirectoryObject() {
AutoMap<String[]> aTemp = new AutoMap<String[]>();
for (int i = 0; i < 5; i++) {
- String[] aTexData = new String[] {
- CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i,
- CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i,
- CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i,
- CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i,
- CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i,
- CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i,
- };
+ String[] aTexData = new String[] { CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i,
+ CORE.MODID + ":" + "TileEntities/RoundRobinator/Top_" + i,
+ CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i,
+ CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i,
+ CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i,
+ CORE.MODID + ":" + "TileEntities/RoundRobinator/Side_" + i, };
aTemp.put(aTexData);
}
AutoMap<CubicObject<String>> aTemp2 = new AutoMap<CubicObject<String>>();
for (String[] y : aTemp) {
aTemp2.put(new CubicObject<String>(y));
}
- CubicObject<String>[] aTextureData =
- new CubicObject[] {aTemp2.get(0), aTemp2.get(1), aTemp2.get(2), aTemp2.get(3), aTemp2.get(4)};
+ CubicObject<String>[] aTextureData = new CubicObject[] { aTemp2.get(0), aTemp2.get(1), aTemp2.get(2),
+ aTemp2.get(3), aTemp2.get(4) };
return aTextureData;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
index cbf8323c07..b79edd3fd9 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
@@ -1,16 +1,5 @@
package gtPlusPlus.core.block.machine;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.inventories.Inventory_SuperJukebox;
-import gtPlusPlus.core.util.math.MathUtils;
import net.minecraft.block.Block;
import net.minecraft.block.BlockJukebox;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -26,7 +15,20 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.inventories.Inventory_SuperJukebox;
+import gtPlusPlus.core.util.math.MathUtils;
+
public class Machine_SuperJukebox extends BlockJukebox {
+
@SideOnly(Side.CLIENT)
private IIcon mIcon;
@@ -53,16 +55,8 @@ public class Machine_SuperJukebox extends BlockJukebox {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
}
@@ -74,15 +68,10 @@ public class Machine_SuperJukebox extends BlockJukebox {
}
return false;
- /* if (aWorld.getBlockMetadata(aX, aY, aZ) == 0)
- {
- return false;
- }
- else
- {
- this.func_149925_e(aWorld, aX, aY, aZ);
- return true;
- }*/
+ /*
+ * if (aWorld.getBlockMetadata(aX, aY, aZ) == 0) { return false; } else { this.func_149925_e(aWorld, aX, aY,
+ * aZ); return true; }
+ */
}
/**
@@ -124,23 +113,22 @@ public class Machine_SuperJukebox extends BlockJukebox {
// aWorld.playRecord((String) null, aX, aY, aZ);
// tileentityjukebox.func_145857_a((ItemStack) null);
// aWorld.setBlockMetadataWithNotify(aX, aY, aZ, 0, 2);
- /*float f = 0.7F;
- double d0 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
- double d1 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.2D + 0.6D;
- double d2 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
- ItemStack itemstack1 = itemstack.copy();
- EntityItem entityitem = new EntityItem(aWorld, (double) aX + d0,
- (double) aY + d1, (double) aZ + d2, itemstack1);
- entityitem.delayBeforeCanPickup = 10;
- aWorld.spawnEntityInWorld(entityitem);*/
+ /*
+ * float f = 0.7F; double d0 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
+ * double d1 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.2D + 0.6D; double d2
+ * = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; ItemStack itemstack1 =
+ * itemstack.copy(); EntityItem entityitem = new EntityItem(aWorld, (double) aX + d0, (double) aY +
+ * d1, (double) aZ + d2, itemstack1); entityitem.delayBeforeCanPickup = 10;
+ * aWorld.spawnEntityInWorld(entityitem);
+ */
}
}
}
}
@Override
- public void breakBlock(
- World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) {
+ public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_,
+ int p_149749_6_) {
this.func_149925_e(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_);
super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
}
@@ -149,17 +137,17 @@ public class Machine_SuperJukebox extends BlockJukebox {
* Drops the block items with a specified chance of dropping the specified items
*/
@Override
- public void dropBlockAsItemWithChance(
- World p_149690_1_,
- int p_149690_2_,
- int p_149690_3_,
- int p_149690_4_,
- int p_149690_5_,
- float p_149690_6_,
- int p_149690_7_) {
+ public void dropBlockAsItemWithChance(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_,
+ int p_149690_5_, float p_149690_6_, int p_149690_7_) {
if (!p_149690_1_.isRemote) {
super.dropBlockAsItemWithChance(
- p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, 0);
+ p_149690_1_,
+ p_149690_2_,
+ p_149690_3_,
+ p_149690_4_,
+ p_149690_5_,
+ p_149690_6_,
+ 0);
}
}
@@ -230,8 +218,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
if (this.getCurrentRecord() != null) {
aNBT.setTag("RecordItem", this.func_145856_a().writeToNBT(new NBTTagCompound()));
- aNBT.setInteger(
- "Record", Item.getIdFromItem(this.func_145856_a().getItem()));
+ aNBT.setInteger("Record", Item.getIdFromItem(this.func_145856_a().getItem()));
}
final NBTTagCompound chestData = new NBTTagCompound();
@@ -254,8 +241,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
}
/**
- * Called to get the internal stack, wraps vanilla function
- * {@link func_145856_a}.
+ * Called to get the internal stack, wraps vanilla function {@link func_145856_a}.
*/
public ItemStack getCurrentRecord() {
return func_145856_a();
@@ -271,8 +257,7 @@ public class Machine_SuperJukebox extends BlockJukebox {
}
/**
- * Called to set the internal stack, wraps vanilla function
- * {@link func_145857_a}.
+ * Called to set the internal stack, wraps vanilla function {@link func_145857_a}.
*/
public void setCurrentRecord(ItemStack aStack) {
func_145857_a(aStack);
@@ -342,7 +327,14 @@ public class Machine_SuperJukebox extends BlockJukebox {
}
GT_Utility.moveStackFromSlotAToSlotB(
- aThisInv, aThisInv, aSlotCounter, 20, (byte) 1, (byte) 1, (byte) 1, (byte) 1);
+ aThisInv,
+ aThisInv,
+ aSlotCounter,
+ 20,
+ (byte) 1,
+ (byte) 1,
+ (byte) 1,
+ (byte) 1);
setCurrentRecord(aThisInv.getStackInSlot(20));
World aWorld = this.worldObj;
@@ -404,7 +396,14 @@ public class Machine_SuperJukebox extends BlockJukebox {
if (g == null && aSlotCounter >= 0) {
IInventory aThisInv = this.getInventory();
GT_Utility.moveStackFromSlotAToSlotB(
- aThisInv, aThisInv, 20, i, (byte) 1, (byte) 1, (byte) 1, (byte) 1);
+ aThisInv,
+ aThisInv,
+ 20,
+ i,
+ (byte) 1,
+ (byte) 1,
+ (byte) 1,
+ (byte) 1);
vanillaStopJukebox();
Logger.INFO("b++");
this.markDirty();
@@ -412,17 +411,12 @@ public class Machine_SuperJukebox extends BlockJukebox {
}
}
- /*for (ItemStack g : this.getInventory().getInventory()) {
- if (g == null && aSlotCounter >= 0) {
- IInventory aThisInv = this.getInventory();
- GT_Utility.moveStackFromSlotAToSlotB(aThisInv, aThisInv, 20, aSlotCounter, (byte) 1, (byte) 1, (byte) 1, (byte) 1);
- vanillaStopJukebox();
- Logger.INFO("b++");
- return true;
-
- }
- aSlotCounter--;
- } */
+ /*
+ * for (ItemStack g : this.getInventory().getInventory()) { if (g == null && aSlotCounter >= 0) { IInventory
+ * aThisInv = this.getInventory(); GT_Utility.moveStackFromSlotAToSlotB(aThisInv, aThisInv, 20,
+ * aSlotCounter, (byte) 1, (byte) 1, (byte) 1, (byte) 1); vanillaStopJukebox(); Logger.INFO("b++"); return
+ * true; } aSlotCounter--; }
+ */
this.markDirty();
return false;
}
@@ -482,8 +476,8 @@ public class Machine_SuperJukebox extends BlockJukebox {
if (!this.worldObj.isRemote) {
this.numPlayersUsing++;
}
- this.worldObj.addBlockEvent(
- this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
+ this.worldObj
+ .addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType());
this.getInventory().openInventory();
@@ -494,8 +488,8 @@ public class Machine_SuperJukebox extends BlockJukebox {
if (!this.worldObj.isRemote) {
this.numPlayersUsing--;
}
- this.worldObj.addBlockEvent(
- this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
+ this.worldObj
+ .addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType());
this.getInventory().closeInventory();
@@ -509,8 +503,8 @@ public class Machine_SuperJukebox extends BlockJukebox {
return this.getInventory().isItemValidForSlot(slot, itemstack);
}
- private static final int[] SIDED_SLOTS =
- new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
+ private static final int[] SIDED_SLOTS = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17 };
@Override
public int[] getAccessibleSlotsFromSide(final int p_94128_1_) {
diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
index 96102017a3..3897c005f9 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
@@ -1,13 +1,5 @@
package gtPlusPlus.core.block.machine;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.base.BlockBaseNBT;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EnumCreatureType;
@@ -17,7 +9,17 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.base.BlockBaseNBT;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
+
public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip {
+
@SideOnly(Side.CLIENT)
private IIcon textureTop;
@@ -54,16 +56,8 @@ public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
}
@@ -85,8 +79,8 @@ public class Machine_TradeTable extends BlockBaseNBT implements ITileTooltip {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
index f4c4d4e17f..a25dd12e83 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java
@@ -1,16 +1,5 @@
package gtPlusPlus.core.block.machine;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.objects.minecraft.CubicObject;
-import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
@@ -23,6 +12,18 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.minecraft.CubicObject;
+import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
/**
@@ -50,16 +51,8 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
* Called upon block activation (right click on the block.)
*/
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer player,
- final int side,
- final float lx,
- final float ly,
- final float lz) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+ final int side, final float lx, final float ly, final float lz) {
if (world.isRemote) {
return true;
} else {
@@ -71,14 +64,13 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
final Item mHandItem = mHandStack.getItem();
if (((mHandItem instanceof GT_MetaGenerated_Tool_01)
&& ((mHandItem.getDamage(mHandStack) == 22) || (mHandItem.getDamage(mHandStack) == 150)))) {
- final TileEntityVolumetricFlaskSetter tile =
- (TileEntityVolumetricFlaskSetter) world.getTileEntity(x, y, z);
+ final TileEntityVolumetricFlaskSetter tile = (TileEntityVolumetricFlaskSetter) world
+ .getTileEntity(x, y, z);
if (tile != null) {
mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z);
}
}
- } catch (final Throwable t) {
- }
+ } catch (final Throwable t) {}
if (!mDidScrewDriver) {
final TileEntity te = world.getTileEntity(x, y, z);
@@ -111,12 +103,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
}
@Override
- public void onBlockPlacedBy(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityLivingBase entity,
+ public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity,
final ItemStack stack) {
if (stack.hasDisplayName()) {
((TileEntityVolumetricFlaskSetter) world.getTileEntity(x, y, z)).setCustomName(stack.getDisplayName());
@@ -124,8 +111,8 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
@@ -161,15 +148,13 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip {
@Override
public CubicObject<String>[] getCustomTextureDirectoryObject() {
- String[] aTexData = new String[] {
- CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_A",
- CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_C",
- CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
- CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
- CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
- CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H"
- };
- CubicObject<String>[] aTextureData = new CubicObject[] {new CubicObject<String>(aTexData)};
+ String[] aTexData = new String[] { CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_A",
+ CORE.MODID + ":" + "metro/" + "TEXTURE_TECH_PANEL_C",
+ CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
+ CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
+ CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H",
+ CORE.MODID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" };
+ CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) };
return aTextureData;
}
}
diff --git a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java
index 00a5b97e2c..6bd84b13f7 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java
@@ -1,15 +1,7 @@
package gtPlusPlus.core.block.machine.bedrock;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -21,6 +13,16 @@ import net.minecraft.world.Explosion;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
public class Mining_Head_Fake extends Block {
public Mining_Head_Fake() {
@@ -63,12 +65,8 @@ public class Mining_Head_Fake extends Block {
}
@Override
- public void onBlockDestroyedByExplosion(
- final World p_149723_1_,
- final int p_149723_2_,
- final int p_149723_3_,
- final int p_149723_4_,
- final Explosion p_149723_5_) {}
+ public void onBlockDestroyedByExplosion(final World p_149723_1_, final int p_149723_2_, final int p_149723_3_,
+ final int p_149723_4_, final Explosion p_149723_5_) {}
@Override
public boolean canDropFromExplosion(final Explosion p_149659_1_) {
@@ -76,8 +74,8 @@ public class Mining_Head_Fake extends Block {
}
@Override
- public boolean canEntityDestroy(
- final IBlockAccess world, final int x, final int y, final int z, final Entity entity) {
+ public boolean canEntityDestroy(final IBlockAccess world, final int x, final int y, final int z,
+ final Entity entity) {
return false;
}
@@ -95,8 +93,8 @@ public class Mining_Head_Fake extends Block {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
@@ -112,8 +110,8 @@ public class Mining_Head_Fake extends Block {
}
@Override
- public void onEntityCollidedWithBlock(
- World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity ent) {
+ public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_,
+ Entity ent) {
EntityUtils.doDamage(ent, DamageSource.outOfWorld, 20);
EntityUtils.setEntityOnFire(ent, 100);
super.onEntityCollidedWithBlock(p_149670_1_, p_149670_2_, p_149670_3_, p_149670_4_, ent);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java
index 0da1650edf..a0ca4978c0 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java
@@ -1,15 +1,7 @@
package gtPlusPlus.core.block.machine.bedrock;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -21,6 +13,16 @@ import net.minecraft.world.Explosion;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
public class Mining_Pipe_Fake extends Block {
public Mining_Pipe_Fake() {
@@ -63,12 +65,8 @@ public class Mining_Pipe_Fake extends Block {
}
@Override
- public void onBlockDestroyedByExplosion(
- final World p_149723_1_,
- final int p_149723_2_,
- final int p_149723_3_,
- final int p_149723_4_,
- final Explosion p_149723_5_) {}
+ public void onBlockDestroyedByExplosion(final World p_149723_1_, final int p_149723_2_, final int p_149723_3_,
+ final int p_149723_4_, final Explosion p_149723_5_) {}
@Override
public boolean canDropFromExplosion(final Explosion p_149659_1_) {
@@ -76,8 +74,8 @@ public class Mining_Pipe_Fake extends Block {
}
@Override
- public boolean canEntityDestroy(
- final IBlockAccess world, final int x, final int y, final int z, final Entity entity) {
+ public boolean canEntityDestroy(final IBlockAccess world, final int x, final int y, final int z,
+ final Entity entity) {
return false;
}
@@ -95,8 +93,8 @@ public class Mining_Pipe_Fake extends Block {
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
@@ -112,8 +110,8 @@ public class Mining_Pipe_Fake extends Block {
}
@Override
- public void onEntityCollidedWithBlock(
- World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity ent) {
+ public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_,
+ Entity ent) {
if (MathUtils.randInt(0, 100) < 5) {
EntityUtils.doDamage(ent, DamageSource.outOfWorld, 1);
}
diff --git a/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java b/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java
index 3322f3924c..1689da6092 100644
--- a/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java
+++ b/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java
@@ -1,11 +1,7 @@
package gtPlusPlus.core.chunkloading;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.ListMultimap;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader;
import java.util.*;
+
import net.minecraft.entity.Entity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.ChunkCoordIntPair;
@@ -14,17 +10,23 @@ import net.minecraftforge.common.ForgeChunkManager;
import net.minecraftforge.common.ForgeChunkManager.Ticket;
import net.minecraftforge.common.MinecraftForge;
+import com.google.common.collect.LinkedListMultimap;
+import com.google.common.collect.ListMultimap;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader;
+
/**
*
- * This class handles re-initializing chunks after a server restart
- * Credits to Repo-Alt for the original implementation.
+ * This class handles re-initializing chunks after a server restart Credits to Repo-Alt for the original implementation.
+ *
* @author Repo-Alt, Alkalus
*
*/
-public class GTPP_ChunkManager
- implements ForgeChunkManager.LoadingCallback,
- ForgeChunkManager.OrderedLoadingCallback,
- ForgeChunkManager.PlayerOrderedLoadingCallback {
+public class GTPP_ChunkManager implements ForgeChunkManager.LoadingCallback, ForgeChunkManager.OrderedLoadingCallback,
+ ForgeChunkManager.PlayerOrderedLoadingCallback {
+
private static GTPP_ChunkManager instance;
public static boolean enableChunkloaders = true;
diff --git a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java
index 687dc65fb1..15574f66ed 100644
--- a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java
+++ b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java
@@ -5,6 +5,7 @@ import gregtech.api.enums.TextureSet;
public class CustomTextureSet extends TextureSet {
public static enum TextureSets {
+
REFINED(),
GEM_A(),
ENRICHED(),
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java b/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java
index 590345e8e6..5baa5a8f49 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java
@@ -1,16 +1,19 @@
package gtPlusPlus.core.client.model;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.entity.monster.EntityBatKing;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.entity.monster.EntityBatKing;
+
@SideOnly(Side.CLIENT)
public class ModelBatKing extends ModelBase {
+
private ModelRenderer batHead;
/** The body box of the bat model. */
private ModelRenderer batBody;
@@ -68,14 +71,8 @@ public class ModelBatKing extends ModelBase {
/**
* Sets the models various rotation angles then renders the model.
*/
- public void render(
- Entity p_78088_1_,
- float p_78088_2_,
- float p_78088_3_,
- float p_78088_4_,
- float p_78088_5_,
- float p_78088_6_,
- float p_78088_7_) {
+ public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_,
+ float p_78088_6_, float p_78088_7_) {
EntityBatKing entitybat = (EntityBatKing) p_78088_1_;
float f6;
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java b/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java
index 98c474a160..ef0943684c 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java
@@ -1,12 +1,14 @@
package gtPlusPlus.core.client.model;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
@SideOnly(Side.CLIENT)
public class ModelDecayChest extends ModelBase {
+
/** The chest lid in the chest's model. */
public ModelRenderer chestLid = (new ModelRenderer(this, 0, 0)).setTextureSize(64, 64);
/** The model of the bottom of the chest. */
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java b/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java
index a12b48c7d2..028e06f7d6 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java
@@ -1,16 +1,16 @@
package gtPlusPlus.core.client.model;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.client.model.tabula.ModelTabulaBase;
import gtPlusPlus.core.client.renderer.tabula.RenderTabulaBase;
import gtPlusPlus.core.tileentities.general.TileEntityEggBox;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
/**
- * ModelEggBox - Alkalus
- * Created using Tabula 4.1.1
+ * ModelEggBox - Alkalus Created using Tabula 4.1.1
*/
public class ModelEggBox extends ModelTabulaBase {
@@ -58,7 +58,9 @@ public class ModelEggBox extends ModelTabulaBase {
public static RenderTabulaBase getRenderer() {
if (mRendererInstance == null) {
mRendererInstance = new RenderTabulaBase(
- new ModelEggBox(), "textures/blocks/TileEntities/EggBox_full.png", TileEntityEggBox.class);
+ new ModelEggBox(),
+ "textures/blocks/TileEntities/EggBox_full.png",
+ TileEntityEggBox.class);
}
return mRendererInstance;
}
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java b/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java
index 586dfec2db..6f4a0e980b 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java
@@ -1,13 +1,15 @@
package gtPlusPlus.core.client.model;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelChicken;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
@SideOnly(Side.CLIENT)
public class ModelGiantChicken extends ModelChicken {
@@ -42,14 +44,8 @@ public class ModelGiantChicken extends ModelChicken {
/**
* Sets the models various rotation angles then renders the model.
*/
- public void render(
- Entity p_78088_1_,
- float p_78088_2_,
- float p_78088_3_,
- float p_78088_4_,
- float p_78088_5_,
- float p_78088_6_,
- float p_78088_7_) {
+ public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_,
+ float p_78088_6_, float p_78088_7_) {
this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
if (this.isChild) {
@@ -96,14 +92,8 @@ public class ModelGiantChicken extends ModelChicken {
* and legs, where par1 represents the time(so that arms and legs swing back and forth) and par2 represents how
* "far" arms and legs can swing at most.
*/
- public void setRotationAngles(
- float p_78087_1_,
- float p_78087_2_,
- float p_78087_3_,
- float p_78087_4_,
- float p_78087_5_,
- float p_78087_6_,
- Entity p_78087_7_) {
+ public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_,
+ float p_78087_5_, float p_78087_6_, Entity p_78087_7_) {
this.head.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI);
this.head.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI);
this.bill.rotateAngleX = this.head.rotateAngleX;
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java
index 7cfb7ec2ea..961f365f69 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java
@@ -1,14 +1,16 @@
package gtPlusPlus.core.client.model;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBlaze;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
@SideOnly(Side.CLIENT)
public class ModelSickBlaze extends ModelBlaze {
+
/** The sticks that fly around the Blaze. */
private ModelRenderer[] blazeSticks = new ModelRenderer[24];
@@ -33,14 +35,8 @@ public class ModelSickBlaze extends ModelBlaze {
* Sets the models various rotation angles then renders the model.
*/
@Override
- public void render(
- Entity p_78088_1_,
- float p_78088_2_,
- float p_78088_3_,
- float p_78088_4_,
- float p_78088_5_,
- float p_78088_6_,
- float p_78088_7_) {
+ public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_,
+ float p_78088_6_, float p_78088_7_) {
this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
this.blazeHead.render(p_78088_7_);
@@ -55,14 +51,8 @@ public class ModelSickBlaze extends ModelBlaze {
* "far" arms and legs can swing at most.
*/
@Override
- public void setRotationAngles(
- float p_78087_1_,
- float p_78087_2_,
- float p_78087_3_,
- float p_78087_4_,
- float p_78087_5_,
- float p_78087_6_,
- Entity p_78087_7_) {
+ public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_,
+ float p_78087_5_, float p_78087_6_, Entity p_78087_7_) {
float f6 = p_78087_3_ * (float) Math.PI * -0.1F;
int i;
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java
index 879e06516a..d93bca90c6 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java
@@ -1,13 +1,14 @@
package gtPlusPlus.core.client.model;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelIronGolem;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntityIronGolem;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
@SideOnly(Side.CLIENT)
public class ModelStaballoyConstruct extends ModelIronGolem {
@@ -49,14 +50,8 @@ public class ModelStaballoyConstruct extends ModelIronGolem {
* Sets the models various rotation angles then renders the model.
*/
@Override
- public void render(
- Entity p_78088_1_,
- float p_78088_2_,
- float p_78088_3_,
- float p_78088_4_,
- float p_78088_5_,
- float p_78088_6_,
- float p_78088_7_) {
+ public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_,
+ float p_78088_6_, float p_78088_7_) {
this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
this.ironGolemHead.render(p_78088_7_);
this.ironGolemBody.render(p_78088_7_);
@@ -72,14 +67,8 @@ public class ModelStaballoyConstruct extends ModelIronGolem {
* "far" arms and legs can swing at most.
*/
@Override
- public void setRotationAngles(
- float p_78087_1_,
- float p_78087_2_,
- float p_78087_3_,
- float p_78087_4_,
- float p_78087_5_,
- float p_78087_6_,
- Entity p_78087_7_) {
+ public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_,
+ float p_78087_5_, float p_78087_6_, Entity p_78087_7_) {
this.ironGolemHead.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI);
this.ironGolemHead.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI);
this.ironGolemLeftLeg.rotateAngleX = -1.5F * this.func_78172_a(p_78087_1_, 13.0F) * p_78087_2_;
@@ -107,8 +96,8 @@ public class ModelStaballoyConstruct extends ModelIronGolem {
this.ironGolemRightArm.rotateAngleX = -0.8F + 0.025F * this.func_78172_a(j, 70.0F);
this.ironGolemLeftArm.rotateAngleX = 0.0F;
} else {
- this.ironGolemRightArm.rotateAngleX =
- (-0.2F + 1.5F * this.func_78172_a(p_78086_2_, 13.0F)) * p_78086_3_;
+ this.ironGolemRightArm.rotateAngleX = (-0.2F + 1.5F * this.func_78172_a(p_78086_2_, 13.0F))
+ * p_78086_3_;
this.ironGolemLeftArm.rotateAngleX = (-0.2F - 1.5F * this.func_78172_a(p_78086_2_, 13.0F)) * p_78086_3_;
}
}
diff --git a/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java b/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java
index 2ec6e4f06d..3c13c83391 100644
--- a/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java
+++ b/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java
@@ -1,13 +1,13 @@
package gtPlusPlus.core.client.model.tabula;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
+
/**
- * ModelEggBox - Alkalus
- * Created using Tabula 4.1.1
+ * ModelEggBox - Alkalus Created using Tabula 4.1.1
*/
public abstract class ModelTabulaBase extends ModelBase {
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java
index b24bc48dbd..88244473e4 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java
@@ -7,11 +7,11 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.IItemRenderer;
+
import org.lwjgl.opengl.GL11;
/**
- * Easy way of rendering an item which should look like a block.
- * Borrowed.
+ * Easy way of rendering an item which should look like a block. Borrowed.
*
* @author King Lemming
*
@@ -42,14 +42,14 @@ public class CustomItemBlockRenderer implements IItemRenderer {
renderItemAsBlock((RenderBlocks) data[0], item, offset, offset, offset);
}
- public static void renderItemAsBlock(
- RenderBlocks renderer, ItemStack item, double translateX, double translateY, double translateZ) {
+ public static void renderItemAsBlock(RenderBlocks renderer, ItemStack item, double translateX, double translateY,
+ double translateZ) {
renderTextureAsBlock(renderer, item.getIconIndex(), translateX, translateY, translateZ);
}
- public static void renderTextureAsBlock(
- RenderBlocks renderer, IIcon texture, double translateX, double translateY, double translateZ) {
+ public static void renderTextureAsBlock(RenderBlocks renderer, IIcon texture, double translateX, double translateY,
+ double translateZ) {
Tessellator tessellator = Tessellator.instance;
Block block = Blocks.stone;
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java
index 793e7093cb..df616a1c14 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java
@@ -1,10 +1,5 @@
package gtPlusPlus.core.client.renderer;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import gregtech.api.interfaces.ITexture;
-import gtPlusPlus.api.interfaces.ITexturedBlock;
-import gtPlusPlus.api.objects.Logger;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;
@@ -12,8 +7,15 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import gregtech.api.interfaces.ITexture;
+import gtPlusPlus.api.interfaces.ITexturedBlock;
+import gtPlusPlus.api.objects.Logger;
+
public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
public static CustomOreBlockRenderer INSTANCE;
@@ -26,24 +28,29 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
Logger.INFO("Registered Custom Ore Block Renderer.");
}
- public boolean renderStandardBlock(
- IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, RenderBlocks aRenderer) {
+ public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
+ RenderBlocks aRenderer) {
Block tTileEntity = aBlock;
if ((tTileEntity instanceof ITexturedBlock)) {
- return renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer, new ITexture[][] {
- ((ITexturedBlock) tTileEntity).getTexture((byte) 0),
- ((ITexturedBlock) tTileEntity).getTexture((byte) 1),
- ((ITexturedBlock) tTileEntity).getTexture((byte) 2),
- ((ITexturedBlock) tTileEntity).getTexture((byte) 3),
- ((ITexturedBlock) tTileEntity).getTexture((byte) 4),
- ((ITexturedBlock) tTileEntity).getTexture((byte) 5)
- });
+ return renderStandardBlock(
+ aWorld,
+ aX,
+ aY,
+ aZ,
+ aBlock,
+ aRenderer,
+ new ITexture[][] { ((ITexturedBlock) tTileEntity).getTexture((byte) 0),
+ ((ITexturedBlock) tTileEntity).getTexture((byte) 1),
+ ((ITexturedBlock) tTileEntity).getTexture((byte) 2),
+ ((ITexturedBlock) tTileEntity).getTexture((byte) 3),
+ ((ITexturedBlock) tTileEntity).getTexture((byte) 4),
+ ((ITexturedBlock) tTileEntity).getTexture((byte) 5) });
}
return false;
}
- public boolean renderStandardBlock(
- IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, RenderBlocks aRenderer, ITexture[][] aTextures) {
+ public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
+ RenderBlocks aRenderer, ITexture[][] aTextures) {
aBlock.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
aRenderer.setRenderBoundsFromBlock(aBlock);
int l = aBlock.colorMultiplier(aWorld, aX, aY, aZ);
@@ -54,10 +61,28 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
if (Minecraft.isAmbientOcclusionEnabled() && aBlock.getLightValue() == 0) {
if (RenderBlocks.getInstance().partialRenderBounds) {
return INSTANCE.renderStandardBlockWithAmbientOcclusionPartial(
- aWorld, aRenderer, aTextures, aBlock, aX, aY, aZ, RED, GREEN, BLUE);
+ aWorld,
+ aRenderer,
+ aTextures,
+ aBlock,
+ aX,
+ aY,
+ aZ,
+ RED,
+ GREEN,
+ BLUE);
} else {
return INSTANCE.renderStandardBlockWithAmbientOcclusion(
- aWorld, aRenderer, aTextures, aBlock, aX, aY, aZ, RED, GREEN, BLUE);
+ aWorld,
+ aRenderer,
+ aTextures,
+ aBlock,
+ aX,
+ aY,
+ aZ,
+ RED,
+ GREEN,
+ BLUE);
}
} else {
renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aTextures[0], true);
@@ -70,51 +95,44 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
return true;
}
- public static void renderFaceYNeg(
- IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, ITexture[][] aIcon) {
+ public static void renderFaceYNeg(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ,
+ ITexture[][] aIcon) {
renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[0], true);
}
- public static void renderFaceYPos(
- IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, ITexture[][] aIcon) {
+ public static void renderFaceYPos(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ,
+ ITexture[][] aIcon) {
renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[1], true);
}
- public static void renderFaceZNeg(
- IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, ITexture[][] aIcon) {
+ public static void renderFaceZNeg(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ,
+ ITexture[][] aIcon) {
renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[2], true);
}
- public static void renderFaceZPos(
- IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, ITexture[][] aIcon) {
+ public static void renderFaceZPos(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ,
+ ITexture[][] aIcon) {
renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[3], true);
}
- public static void renderFaceXNeg(
- IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, ITexture[][] aIcon) {
+ public static void renderFaceXNeg(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ,
+ ITexture[][] aIcon) {
renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[4], true);
}
- public static void renderFaceXPos(
- IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, ITexture[][] aIcon) {
+ public static void renderFaceXPos(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ,
+ ITexture[][] aIcon) {
renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aIcon[5], true);
}
- public static void renderNegativeYFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderNegativeYFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY - 1, aZ, 0))) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ));
}
if (aIcon != null) {
for (int i = 0; i < aIcon.length; i++) {
@@ -126,21 +144,14 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
aRenderer.flipTexture = false;
}
- public static void renderPositiveYFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderPositiveYFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY + 1, aZ, 1))) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ));
}
if (aIcon != null) {
for (int i = 0; i < aIcon.length; i++) {
@@ -152,21 +163,14 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
aRenderer.flipTexture = false;
}
- public static void renderNegativeZFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderNegativeZFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY, aZ - 1, 2))) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ));
}
aRenderer.flipTexture = (!aFullBlock);
if (aIcon != null) {
@@ -179,21 +183,14 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
aRenderer.flipTexture = false;
}
- public static void renderPositiveZFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderPositiveZFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY, aZ + 1, 3))) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ));
}
if (aIcon != null) {
for (int i = 0; i < aIcon.length; i++) {
@@ -205,21 +202,14 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
aRenderer.flipTexture = false;
}
- public static void renderNegativeXFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderNegativeXFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX - 1, aY, aZ, 4))) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ));
}
if (aIcon != null) {
for (int i = 0; i < aIcon.length; i++) {
@@ -231,21 +221,14 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
aRenderer.flipTexture = false;
}
- public static void renderPositiveXFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderPositiveXFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX + 1, aY, aZ, 5))) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ));
}
aRenderer.flipTexture = (!aFullBlock);
if (aIcon != null) {
@@ -292,8 +275,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
- public boolean renderWorldBlock(
- IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) {
+ public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID,
+ RenderBlocks aRenderer) {
blockAccess = aWorld;
return renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer);
}
@@ -306,13 +289,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
return this.mRenderID;
}
- public void setRenderBounds(
- double p_147782_1_,
- double p_147782_3_,
- double p_147782_5_,
- double p_147782_7_,
- double p_147782_9_,
- double p_147782_11_) {
+ public void setRenderBounds(double p_147782_1_, double p_147782_3_, double p_147782_5_, double p_147782_7_,
+ double p_147782_9_, double p_147782_11_) {
if (!this.lockBlockBounds) {
this.renderMinX = p_147782_1_;
this.renderMaxX = p_147782_7_;
@@ -321,8 +299,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.renderMinZ = p_147782_5_;
this.renderMaxZ = p_147782_11_;
this.partialRenderBounds = this.minecraftRB.gameSettings.ambientOcclusion >= 2
- && (this.renderMinX > 0.0D
- || this.renderMaxX < 1.0D
+ && (this.renderMinX > 0.0D || this.renderMaxX < 1.0D
|| this.renderMinY > 0.0D
|| this.renderMaxY < 1.0D
|| this.renderMinZ > 0.0D
@@ -342,8 +319,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.renderMinZ = block.getBlockBoundsMinZ();
this.renderMaxZ = block.getBlockBoundsMaxZ();
this.partialRenderBounds = this.minecraftRB.gameSettings.ambientOcclusion >= 2
- && (this.renderMinX > 0.0D
- || this.renderMaxX < 1.0D
+ && (this.renderMinX > 0.0D || this.renderMaxX < 1.0D
|| this.renderMinY > 0.0D
|| this.renderMaxY < 1.0D
|| this.renderMinZ > 0.0D
@@ -493,6 +469,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
public float colorBlueTopRight;
/** If set to >=0, all block faces will be rendered using this texture index */
public IIcon overrideBlockTexture;
+
/**
* Clear override block texture
*/
@@ -522,9 +499,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
public IIcon getIconSafe(IIcon iicon) {
if (iicon == null) {
- iicon = ((TextureMap)
- Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture))
- .getAtlasSprite("missingno");
+ iicon = ((TextureMap) Minecraft.getMinecraft().getTextureManager()
+ .getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno");
}
return (IIcon) iicon;
@@ -532,17 +508,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
IBlockAccess blockAccess = RenderBlocks.getInstance().blockAccess;
- public boolean renderStandardBlockWithAmbientOcclusion(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- ITexture[][] aTextures,
- Block block,
- int xPos,
- int yPos,
- int zPos,
- float R,
- float G,
- float B) {
+ public boolean renderStandardBlockWithAmbientOcclusion(IBlockAccess aWorld, RenderBlocks aRenderer,
+ ITexture[][] aTextures, Block block, int xPos, int yPos, int zPos, float R, float G, float B) {
this.enableAO = true;
boolean flag = false;
float f3 = 0.0F;
@@ -577,14 +544,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoBrightnessYZNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1);
this.aoBrightnessYZNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1);
this.aoBrightnessXYPN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos);
- this.aoLightValueScratchXYNN =
- blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZNN =
- blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZNP =
- blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXYPN =
- blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYNN = blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZNN = blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZNP = blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYPN = blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
flag2 = blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass();
flag3 = blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass();
flag4 = blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass();
@@ -594,8 +557,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNN = this.aoLightValueScratchXYNN;
this.aoBrightnessXYZNNN = this.aoBrightnessXYNN;
} else {
- this.aoLightValueScratchXYZNNN =
- blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNN = blockAccess.getBlock(xPos - 1, yPos, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos - 1);
}
@@ -603,8 +566,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNP = this.aoLightValueScratchXYNN;
this.aoBrightnessXYZNNP = this.aoBrightnessXYNN;
} else {
- this.aoLightValueScratchXYZNNP =
- blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNP = blockAccess.getBlock(xPos - 1, yPos, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos + 1);
}
@@ -612,8 +575,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNN = this.aoLightValueScratchXYPN;
this.aoBrightnessXYZPNN = this.aoBrightnessXYPN;
} else {
- this.aoLightValueScratchXYZPNN =
- blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNN = blockAccess.getBlock(xPos + 1, yPos, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos - 1);
}
@@ -621,8 +584,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNP = this.aoLightValueScratchXYPN;
this.aoBrightnessXYZPNP = this.aoBrightnessXYPN;
} else {
- this.aoLightValueScratchXYZPNP =
- blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNP = blockAccess.getBlock(xPos + 1, yPos, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos + 1);
}
@@ -632,8 +595,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMinY <= 0.0D
- || !blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) {
+ if (this.renderMinY <= 0.0D || !blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos);
}
@@ -656,19 +618,16 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
.getAoBrightness(this.aoBrightnessXYNN, this.aoBrightnessXYZNNN, this.aoBrightnessYZNN, i1);
if (flag1) {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R * 0.5F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G * 0.5F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B * 0.5F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R
+ * 0.5F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G
+ * 0.5F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B
+ * 0.5F;
} else {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.5F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.5F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.5F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.5F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.5F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.5F;
}
this.colorRedTopLeft *= f3;
@@ -697,14 +656,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoBrightnessXYPP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos);
this.aoBrightnessYZPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1);
this.aoBrightnessYZPP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1);
- this.aoLightValueScratchXYNP =
- blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXYPP =
- blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZPN =
- blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZPP =
- blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYNP = blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYPP = blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZPN = blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZPP = blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
flag2 = blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass();
flag3 = blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass();
flag4 = blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass();
@@ -714,8 +669,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPN = this.aoLightValueScratchXYNP;
this.aoBrightnessXYZNPN = this.aoBrightnessXYNP;
} else {
- this.aoLightValueScratchXYZNPN =
- blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPN = blockAccess.getBlock(xPos - 1, yPos, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos - 1);
}
@@ -723,8 +678,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPN = this.aoLightValueScratchXYPP;
this.aoBrightnessXYZPPN = this.aoBrightnessXYPP;
} else {
- this.aoLightValueScratchXYZPPN =
- blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPN = blockAccess.getBlock(xPos + 1, yPos, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos - 1);
}
@@ -732,8 +687,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPP = this.aoLightValueScratchXYNP;
this.aoBrightnessXYZNPP = this.aoBrightnessXYNP;
} else {
- this.aoLightValueScratchXYZNPP =
- blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPP = blockAccess.getBlock(xPos - 1, yPos, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos + 1);
}
@@ -741,8 +696,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPP = this.aoLightValueScratchXYPP;
this.aoBrightnessXYZPPP = this.aoBrightnessXYPP;
} else {
- this.aoLightValueScratchXYZPPP =
- blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPP = blockAccess.getBlock(xPos + 1, yPos, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos + 1);
}
@@ -752,8 +707,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMaxY >= 1.0D
- || !blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) {
+ if (this.renderMaxY >= 1.0D || !blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos);
}
@@ -775,8 +729,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.brightnessBottomRight = RenderBlocks.getInstance()
.getAoBrightness(this.aoBrightnessXYNP, this.aoBrightnessXYZNPN, this.aoBrightnessYZPN, i1);
this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G;
this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B;
this.colorRedTopLeft *= f3;
this.colorGreenTopLeft *= f3;
@@ -802,14 +755,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
--zPos;
}
- this.aoLightValueScratchXZNN =
- blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZNN =
- blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZPN =
- blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZPN =
- blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZNN = blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZNN = blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZPN = blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZPN = blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
this.aoBrightnessXZNN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos);
this.aoBrightnessYZNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos);
this.aoBrightnessYZPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos);
@@ -823,8 +772,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNN = this.aoLightValueScratchXZNN;
this.aoBrightnessXYZNNN = this.aoBrightnessXZNN;
} else {
- this.aoLightValueScratchXYZNNN =
- blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNN = blockAccess.getBlock(xPos - 1, yPos - 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos - 1, zPos);
}
@@ -832,8 +781,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPN = this.aoLightValueScratchXZNN;
this.aoBrightnessXYZNPN = this.aoBrightnessXZNN;
} else {
- this.aoLightValueScratchXYZNPN =
- blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPN = blockAccess.getBlock(xPos - 1, yPos + 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos + 1, zPos);
}
@@ -841,8 +790,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNN = this.aoLightValueScratchXZPN;
this.aoBrightnessXYZPNN = this.aoBrightnessXZPN;
} else {
- this.aoLightValueScratchXYZPNN =
- blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNN = blockAccess.getBlock(xPos + 1, yPos - 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos - 1, zPos);
}
@@ -850,8 +799,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPN = this.aoLightValueScratchXZPN;
this.aoBrightnessXYZPPN = this.aoBrightnessXZPN;
} else {
- this.aoLightValueScratchXYZPPN =
- blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPN = blockAccess.getBlock(xPos + 1, yPos + 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos + 1, zPos);
}
@@ -861,8 +810,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMinZ <= 0.0D
- || !blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) {
+ if (this.renderMinZ <= 0.0D || !blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1);
}
@@ -885,19 +833,16 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
.getAoBrightness(this.aoBrightnessXYZNNN, this.aoBrightnessXZNN, this.aoBrightnessYZNN, i1);
if (flag1) {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R * 0.8F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G * 0.8F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B * 0.8F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R
+ * 0.8F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G
+ * 0.8F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B
+ * 0.8F;
} else {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.8F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.8F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.8F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.8F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.8F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.8F;
}
this.colorRedTopLeft *= f3;
@@ -916,8 +861,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
CustomOreBlockRenderer.renderFaceZNeg(aWorld, aRenderer, block, xPos, yPos, zPos, aTextures);
RenderBlocks.getInstance();
- if (RenderBlocks.fancyGrass
- && iicon.getIconName().equals("grass_side")
+ if (RenderBlocks.fancyGrass && iicon.getIconName().equals("grass_side")
&& !this.hasOverrideBlockTexture()) {
this.colorRedTopLeft *= R;
this.colorRedBottomLeft *= R;
@@ -943,14 +887,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
++zPos;
}
- this.aoLightValueScratchXZNP =
- blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZPP =
- blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZNP =
- blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZPP =
- blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZNP = blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZPP = blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZNP = blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZPP = blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
this.aoBrightnessXZNP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos);
this.aoBrightnessXZPP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos);
this.aoBrightnessYZNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos);
@@ -964,8 +904,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNP = this.aoLightValueScratchXZNP;
this.aoBrightnessXYZNNP = this.aoBrightnessXZNP;
} else {
- this.aoLightValueScratchXYZNNP =
- blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNP = blockAccess.getBlock(xPos - 1, yPos - 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos - 1, zPos);
}
@@ -973,8 +913,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPP = this.aoLightValueScratchXZNP;
this.aoBrightnessXYZNPP = this.aoBrightnessXZNP;
} else {
- this.aoLightValueScratchXYZNPP =
- blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPP = blockAccess.getBlock(xPos - 1, yPos + 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos + 1, zPos);
}
@@ -982,8 +922,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNP = this.aoLightValueScratchXZPP;
this.aoBrightnessXYZPNP = this.aoBrightnessXZPP;
} else {
- this.aoLightValueScratchXYZPNP =
- blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNP = blockAccess.getBlock(xPos + 1, yPos - 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos - 1, zPos);
}
@@ -991,8 +931,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPP = this.aoLightValueScratchXZPP;
this.aoBrightnessXYZPPP = this.aoBrightnessXZPP;
} else {
- this.aoLightValueScratchXYZPPP =
- blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPP = blockAccess.getBlock(xPos + 1, yPos + 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos + 1, zPos);
}
@@ -1002,8 +942,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMaxZ >= 1.0D
- || !blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) {
+ if (this.renderMaxZ >= 1.0D || !blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1);
}
@@ -1026,19 +965,16 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
.getAoBrightness(this.aoBrightnessXYZNNP, this.aoBrightnessXZNP, this.aoBrightnessYZNP, i1);
if (flag1) {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R * 0.8F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G * 0.8F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B * 0.8F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R
+ * 0.8F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G
+ * 0.8F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B
+ * 0.8F;
} else {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.8F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.8F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.8F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.8F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.8F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.8F;
}
this.colorRedTopLeft *= f3;
@@ -1057,8 +993,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
CustomOreBlockRenderer.renderFaceZPos(aWorld, aRenderer, block, xPos, yPos, zPos, aTextures);
RenderBlocks.getInstance();
- if (RenderBlocks.fancyGrass
- && iicon.getIconName().equals("grass_side")
+ if (RenderBlocks.fancyGrass && iicon.getIconName().equals("grass_side")
&& !this.hasOverrideBlockTexture()) {
this.colorRedTopLeft *= R;
this.colorRedBottomLeft *= R;
@@ -1084,14 +1019,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
--xPos;
}
- this.aoLightValueScratchXYNN =
- blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZNN =
- blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZNP =
- blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXYNP =
- blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYNN = blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZNN = blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZNP = blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYNP = blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
this.aoBrightnessXYNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos);
this.aoBrightnessXZNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1);
this.aoBrightnessXZNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1);
@@ -1105,8 +1036,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNN = this.aoLightValueScratchXZNN;
this.aoBrightnessXYZNNN = this.aoBrightnessXZNN;
} else {
- this.aoLightValueScratchXYZNNN =
- blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNN = blockAccess.getBlock(xPos, yPos - 1, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos - 1);
}
@@ -1114,8 +1045,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNP = this.aoLightValueScratchXZNP;
this.aoBrightnessXYZNNP = this.aoBrightnessXZNP;
} else {
- this.aoLightValueScratchXYZNNP =
- blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNP = blockAccess.getBlock(xPos, yPos - 1, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos + 1);
}
@@ -1123,8 +1054,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPN = this.aoLightValueScratchXZNN;
this.aoBrightnessXYZNPN = this.aoBrightnessXZNN;
} else {
- this.aoLightValueScratchXYZNPN =
- blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPN = blockAccess.getBlock(xPos, yPos + 1, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos - 1);
}
@@ -1132,8 +1063,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPP = this.aoLightValueScratchXZNP;
this.aoBrightnessXYZNPP = this.aoBrightnessXZNP;
} else {
- this.aoLightValueScratchXYZNPP =
- blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPP = blockAccess.getBlock(xPos, yPos + 1, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos + 1);
}
@@ -1143,8 +1074,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMinX <= 0.0D
- || !blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) {
+ if (this.renderMinX <= 0.0D || !blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos);
}
@@ -1167,19 +1097,16 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
.getAoBrightness(this.aoBrightnessXYZNNN, this.aoBrightnessXYNN, this.aoBrightnessXZNN, i1);
if (flag1) {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R * 0.6F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G * 0.6F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B * 0.6F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R
+ * 0.6F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G
+ * 0.6F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B
+ * 0.6F;
} else {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.6F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.6F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.6F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.6F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.6F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.6F;
}
this.colorRedTopLeft *= f3;
@@ -1198,8 +1125,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
CustomOreBlockRenderer.renderFaceXNeg(aWorld, aRenderer, block, xPos, yPos, zPos, aTextures);
RenderBlocks.getInstance();
- if (RenderBlocks.fancyGrass
- && iicon.getIconName().equals("grass_side")
+ if (RenderBlocks.fancyGrass && iicon.getIconName().equals("grass_side")
&& !this.hasOverrideBlockTexture()) {
this.colorRedTopLeft *= R;
this.colorRedBottomLeft *= R;
@@ -1225,14 +1151,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
++xPos;
}
- this.aoLightValueScratchXYPN =
- blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZPN =
- blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZPP =
- blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXYPP =
- blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYPN = blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZPN = blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZPP = blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYPP = blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
this.aoBrightnessXYPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos);
this.aoBrightnessXZPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1);
this.aoBrightnessXZPP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1);
@@ -1246,8 +1168,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNN = this.aoLightValueScratchXZPN;
this.aoBrightnessXYZPNN = this.aoBrightnessXZPN;
} else {
- this.aoLightValueScratchXYZPNN =
- blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNN = blockAccess.getBlock(xPos, yPos - 1, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos - 1);
}
@@ -1255,8 +1177,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNP = this.aoLightValueScratchXZPP;
this.aoBrightnessXYZPNP = this.aoBrightnessXZPP;
} else {
- this.aoLightValueScratchXYZPNP =
- blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNP = blockAccess.getBlock(xPos, yPos - 1, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos + 1);
}
@@ -1264,8 +1186,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPN = this.aoLightValueScratchXZPN;
this.aoBrightnessXYZPPN = this.aoBrightnessXZPN;
} else {
- this.aoLightValueScratchXYZPPN =
- blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPN = blockAccess.getBlock(xPos, yPos + 1, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos - 1);
}
@@ -1273,8 +1195,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPP = this.aoLightValueScratchXZPP;
this.aoBrightnessXYZPPP = this.aoBrightnessXZPP;
} else {
- this.aoLightValueScratchXYZPPP =
- blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPP = blockAccess.getBlock(xPos, yPos + 1, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos + 1);
}
@@ -1284,8 +1206,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMaxX >= 1.0D
- || !blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) {
+ if (this.renderMaxX >= 1.0D || !blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos);
}
@@ -1308,19 +1229,16 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
.getAoBrightness(this.aoBrightnessXYZPNN, this.aoBrightnessXYPN, this.aoBrightnessXZPN, i1);
if (flag1) {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R * 0.6F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G * 0.6F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B * 0.6F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R
+ * 0.6F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G
+ * 0.6F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B
+ * 0.6F;
} else {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.6F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.6F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.6F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.6F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.6F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.6F;
}
this.colorRedTopLeft *= f3;
@@ -1339,8 +1257,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
CustomOreBlockRenderer.renderFaceXPos(aWorld, aRenderer, block, xPos, yPos, zPos, aTextures);
RenderBlocks.getInstance();
- if (RenderBlocks.fancyGrass
- && iicon.getIconName().equals("grass_side")
+ if (RenderBlocks.fancyGrass && iicon.getIconName().equals("grass_side")
&& !this.hasOverrideBlockTexture()) {
this.colorRedTopLeft *= R;
this.colorRedBottomLeft *= R;
@@ -1365,19 +1282,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
}
/**
- * Renders non-full-cube block with ambient occusion. Args: block, x, y, z, red, green, blue (lighting)
+ * Renders non-full-cube block with ambient occusion. Args: block, x, y, z, red, green, blue (lighting)
*/
- public boolean renderStandardBlockWithAmbientOcclusionPartial(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- ITexture[][] aTextures,
- Block block,
- int xPos,
- int yPos,
- int zPos,
- float R,
- float G,
- float B) {
+ public boolean renderStandardBlockWithAmbientOcclusionPartial(IBlockAccess aWorld, RenderBlocks aRenderer,
+ ITexture[][] aTextures, Block block, int xPos, int yPos, int zPos, float R, float G, float B) {
this.enableAO = true;
boolean flag = false;
float f3 = 0.0F;
@@ -1412,14 +1320,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoBrightnessYZNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1);
this.aoBrightnessYZNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1);
this.aoBrightnessXYPN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos);
- this.aoLightValueScratchXYNN =
- blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZNN =
- blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZNP =
- blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXYPN =
- blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYNN = blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZNN = blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZNP = blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYPN = blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
flag2 = blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass();
flag3 = blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass();
flag4 = blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass();
@@ -1429,8 +1333,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNN = this.aoLightValueScratchXYNN;
this.aoBrightnessXYZNNN = this.aoBrightnessXYNN;
} else {
- this.aoLightValueScratchXYZNNN =
- blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNN = blockAccess.getBlock(xPos - 1, yPos, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos - 1);
}
@@ -1438,8 +1342,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNP = this.aoLightValueScratchXYNN;
this.aoBrightnessXYZNNP = this.aoBrightnessXYNN;
} else {
- this.aoLightValueScratchXYZNNP =
- blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNP = blockAccess.getBlock(xPos - 1, yPos, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos + 1);
}
@@ -1447,8 +1351,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNN = this.aoLightValueScratchXYPN;
this.aoBrightnessXYZPNN = this.aoBrightnessXYPN;
} else {
- this.aoLightValueScratchXYZPNN =
- blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNN = blockAccess.getBlock(xPos + 1, yPos, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos - 1);
}
@@ -1456,8 +1360,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNP = this.aoLightValueScratchXYPN;
this.aoBrightnessXYZPNP = this.aoBrightnessXYPN;
} else {
- this.aoLightValueScratchXYZPNP =
- blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNP = blockAccess.getBlock(xPos + 1, yPos, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos + 1);
}
@@ -1467,8 +1371,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMinY <= 0.0D
- || !blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) {
+ if (this.renderMinY <= 0.0D || !blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos);
}
@@ -1491,19 +1394,16 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
.getAoBrightness(this.aoBrightnessXYNN, this.aoBrightnessXYZNNN, this.aoBrightnessYZNN, i1);
if (flag1) {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R * 0.5F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G * 0.5F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B * 0.5F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R
+ * 0.5F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G
+ * 0.5F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B
+ * 0.5F;
} else {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.5F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.5F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.5F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.5F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.5F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.5F;
}
this.colorRedTopLeft *= f3;
@@ -1532,14 +1432,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoBrightnessXYPP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos);
this.aoBrightnessYZPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1);
this.aoBrightnessYZPP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1);
- this.aoLightValueScratchXYNP =
- blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXYPP =
- blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZPN =
- blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZPP =
- blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYNP = blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYPP = blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZPN = blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZPP = blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
flag2 = blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass();
flag3 = blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass();
flag4 = blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass();
@@ -1549,8 +1445,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPN = this.aoLightValueScratchXYNP;
this.aoBrightnessXYZNPN = this.aoBrightnessXYNP;
} else {
- this.aoLightValueScratchXYZNPN =
- blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPN = blockAccess.getBlock(xPos - 1, yPos, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos - 1);
}
@@ -1558,8 +1454,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPN = this.aoLightValueScratchXYPP;
this.aoBrightnessXYZPPN = this.aoBrightnessXYPP;
} else {
- this.aoLightValueScratchXYZPPN =
- blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPN = blockAccess.getBlock(xPos + 1, yPos, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos - 1);
}
@@ -1567,8 +1463,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPP = this.aoLightValueScratchXYNP;
this.aoBrightnessXYZNPP = this.aoBrightnessXYNP;
} else {
- this.aoLightValueScratchXYZNPP =
- blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPP = blockAccess.getBlock(xPos - 1, yPos, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos + 1);
}
@@ -1576,8 +1472,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPP = this.aoLightValueScratchXYPP;
this.aoBrightnessXYZPPP = this.aoBrightnessXYPP;
} else {
- this.aoLightValueScratchXYZPPP =
- blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPP = blockAccess.getBlock(xPos + 1, yPos, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos + 1);
}
@@ -1587,8 +1483,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMaxY >= 1.0D
- || !blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) {
+ if (this.renderMaxY >= 1.0D || !blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos);
}
@@ -1610,8 +1505,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.brightnessBottomRight = RenderBlocks.getInstance()
.getAoBrightness(this.aoBrightnessXYNP, this.aoBrightnessXYZNPN, this.aoBrightnessYZPN, i1);
this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G;
this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B;
this.colorRedTopLeft *= f3;
this.colorGreenTopLeft *= f3;
@@ -1645,14 +1539,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
--zPos;
}
- this.aoLightValueScratchXZNN =
- blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZNN =
- blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZPN =
- blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZPN =
- blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZNN = blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZNN = blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZPN = blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZPN = blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
this.aoBrightnessXZNN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos);
this.aoBrightnessYZNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos);
this.aoBrightnessYZPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos);
@@ -1666,8 +1556,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNN = this.aoLightValueScratchXZNN;
this.aoBrightnessXYZNNN = this.aoBrightnessXZNN;
} else {
- this.aoLightValueScratchXYZNNN =
- blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNN = blockAccess.getBlock(xPos - 1, yPos - 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos - 1, zPos);
}
@@ -1675,8 +1565,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPN = this.aoLightValueScratchXZNN;
this.aoBrightnessXYZNPN = this.aoBrightnessXZNN;
} else {
- this.aoLightValueScratchXYZNPN =
- blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPN = blockAccess.getBlock(xPos - 1, yPos + 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos + 1, zPos);
}
@@ -1684,8 +1574,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNN = this.aoLightValueScratchXZPN;
this.aoBrightnessXYZPNN = this.aoBrightnessXZPN;
} else {
- this.aoLightValueScratchXYZPNN =
- blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNN = blockAccess.getBlock(xPos + 1, yPos - 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos - 1, zPos);
}
@@ -1693,8 +1583,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPN = this.aoLightValueScratchXZPN;
this.aoBrightnessXYZPPN = this.aoBrightnessXZPN;
} else {
- this.aoLightValueScratchXYZPPN =
- blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPN = blockAccess.getBlock(xPos + 1, yPos + 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos + 1, zPos);
}
@@ -1704,8 +1594,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMinZ <= 0.0D
- || !blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) {
+ if (this.renderMinZ <= 0.0D || !blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1);
}
@@ -1742,61 +1631,54 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
.getAoBrightness(this.aoBrightnessYZNN, this.aoBrightnessXYZPNN, this.aoBrightnessXZPN, i1);
i2 = RenderBlocks.getInstance()
.getAoBrightness(this.aoBrightnessXYZNNN, this.aoBrightnessXZNN, this.aoBrightnessYZNN, i1);
- this.brightnessTopLeft = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- k1,
- l1,
- i2,
- this.renderMaxY * (1.0D - this.renderMinX),
- this.renderMaxY * this.renderMinX,
- (1.0D - this.renderMaxY) * this.renderMinX,
- (1.0D - this.renderMaxY) * (1.0D - this.renderMinX));
- this.brightnessBottomLeft = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- k1,
- l1,
- i2,
- this.renderMaxY * (1.0D - this.renderMaxX),
- this.renderMaxY * this.renderMaxX,
- (1.0D - this.renderMaxY) * this.renderMaxX,
- (1.0D - this.renderMaxY) * (1.0D - this.renderMaxX));
- this.brightnessBottomRight = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- k1,
- l1,
- i2,
- this.renderMinY * (1.0D - this.renderMaxX),
- this.renderMinY * this.renderMaxX,
- (1.0D - this.renderMinY) * this.renderMaxX,
- (1.0D - this.renderMinY) * (1.0D - this.renderMaxX));
- this.brightnessTopRight = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- k1,
- l1,
- i2,
- this.renderMinY * (1.0D - this.renderMinX),
- this.renderMinY * this.renderMinX,
- (1.0D - this.renderMinY) * this.renderMinX,
- (1.0D - this.renderMinY) * (1.0D - this.renderMinX));
+ this.brightnessTopLeft = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ k1,
+ l1,
+ i2,
+ this.renderMaxY * (1.0D - this.renderMinX),
+ this.renderMaxY * this.renderMinX,
+ (1.0D - this.renderMaxY) * this.renderMinX,
+ (1.0D - this.renderMaxY) * (1.0D - this.renderMinX));
+ this.brightnessBottomLeft = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ k1,
+ l1,
+ i2,
+ this.renderMaxY * (1.0D - this.renderMaxX),
+ this.renderMaxY * this.renderMaxX,
+ (1.0D - this.renderMaxY) * this.renderMaxX,
+ (1.0D - this.renderMaxY) * (1.0D - this.renderMaxX));
+ this.brightnessBottomRight = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ k1,
+ l1,
+ i2,
+ this.renderMinY * (1.0D - this.renderMaxX),
+ this.renderMinY * this.renderMaxX,
+ (1.0D - this.renderMinY) * this.renderMaxX,
+ (1.0D - this.renderMinY) * (1.0D - this.renderMaxX));
+ this.brightnessTopRight = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ k1,
+ l1,
+ i2,
+ this.renderMinY * (1.0D - this.renderMinX),
+ this.renderMinY * this.renderMinX,
+ (1.0D - this.renderMinY) * this.renderMinX,
+ (1.0D - this.renderMinY) * (1.0D - this.renderMinX));
if (flag1) {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R * 0.8F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G * 0.8F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B * 0.8F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R
+ * 0.8F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G
+ * 0.8F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B
+ * 0.8F;
} else {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.8F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.8F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.8F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.8F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.8F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.8F;
}
this.colorRedTopLeft *= f3;
@@ -1815,8 +1697,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
CustomOreBlockRenderer.renderFaceZNeg(aWorld, aRenderer, block, xPos, yPos, zPos, aTextures);
RenderBlocks.getInstance();
- if (RenderBlocks.fancyGrass
- && iicon.getIconName().equals("grass_side")
+ if (RenderBlocks.fancyGrass && iicon.getIconName().equals("grass_side")
&& !this.hasOverrideBlockTexture()) {
this.colorRedTopLeft *= R;
this.colorRedBottomLeft *= R;
@@ -1842,14 +1723,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
++zPos;
}
- this.aoLightValueScratchXZNP =
- blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZPP =
- blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZNP =
- blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchYZPP =
- blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZNP = blockAccess.getBlock(xPos - 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZPP = blockAccess.getBlock(xPos + 1, yPos, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZNP = blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchYZPP = blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
this.aoBrightnessXZNP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos);
this.aoBrightnessXZPP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos);
this.aoBrightnessYZNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos);
@@ -1863,8 +1740,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNP = this.aoLightValueScratchXZNP;
this.aoBrightnessXYZNNP = this.aoBrightnessXZNP;
} else {
- this.aoLightValueScratchXYZNNP =
- blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNP = blockAccess.getBlock(xPos - 1, yPos - 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos - 1, zPos);
}
@@ -1872,8 +1749,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPP = this.aoLightValueScratchXZNP;
this.aoBrightnessXYZNPP = this.aoBrightnessXZNP;
} else {
- this.aoLightValueScratchXYZNPP =
- blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPP = blockAccess.getBlock(xPos - 1, yPos + 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos + 1, zPos);
}
@@ -1881,8 +1758,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNP = this.aoLightValueScratchXZPP;
this.aoBrightnessXYZPNP = this.aoBrightnessXZPP;
} else {
- this.aoLightValueScratchXYZPNP =
- blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNP = blockAccess.getBlock(xPos + 1, yPos - 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos - 1, zPos);
}
@@ -1890,8 +1767,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPP = this.aoLightValueScratchXZPP;
this.aoBrightnessXYZPPP = this.aoBrightnessXZPP;
} else {
- this.aoLightValueScratchXYZPPP =
- blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPP = blockAccess.getBlock(xPos + 1, yPos + 1, zPos)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos + 1, zPos);
}
@@ -1901,8 +1778,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMaxZ >= 1.0D
- || !blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) {
+ if (this.renderMaxZ >= 1.0D || !blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1);
}
@@ -1939,61 +1815,54 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
.getAoBrightness(this.aoBrightnessYZNP, this.aoBrightnessXYZPNP, this.aoBrightnessXZPP, i1);
i2 = RenderBlocks.getInstance()
.getAoBrightness(this.aoBrightnessXYZNNP, this.aoBrightnessXZNP, this.aoBrightnessYZNP, i1);
- this.brightnessTopLeft = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- i2,
- l1,
- k1,
- this.renderMaxY * (1.0D - this.renderMinX),
- (1.0D - this.renderMaxY) * (1.0D - this.renderMinX),
- (1.0D - this.renderMaxY) * this.renderMinX,
- this.renderMaxY * this.renderMinX);
- this.brightnessBottomLeft = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- i2,
- l1,
- k1,
- this.renderMinY * (1.0D - this.renderMinX),
- (1.0D - this.renderMinY) * (1.0D - this.renderMinX),
- (1.0D - this.renderMinY) * this.renderMinX,
- this.renderMinY * this.renderMinX);
- this.brightnessBottomRight = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- i2,
- l1,
- k1,
- this.renderMinY * (1.0D - this.renderMaxX),
- (1.0D - this.renderMinY) * (1.0D - this.renderMaxX),
- (1.0D - this.renderMinY) * this.renderMaxX,
- this.renderMinY * this.renderMaxX);
- this.brightnessTopRight = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- i2,
- l1,
- k1,
- this.renderMaxY * (1.0D - this.renderMaxX),
- (1.0D - this.renderMaxY) * (1.0D - this.renderMaxX),
- (1.0D - this.renderMaxY) * this.renderMaxX,
- this.renderMaxY * this.renderMaxX);
+ this.brightnessTopLeft = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ i2,
+ l1,
+ k1,
+ this.renderMaxY * (1.0D - this.renderMinX),
+ (1.0D - this.renderMaxY) * (1.0D - this.renderMinX),
+ (1.0D - this.renderMaxY) * this.renderMinX,
+ this.renderMaxY * this.renderMinX);
+ this.brightnessBottomLeft = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ i2,
+ l1,
+ k1,
+ this.renderMinY * (1.0D - this.renderMinX),
+ (1.0D - this.renderMinY) * (1.0D - this.renderMinX),
+ (1.0D - this.renderMinY) * this.renderMinX,
+ this.renderMinY * this.renderMinX);
+ this.brightnessBottomRight = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ i2,
+ l1,
+ k1,
+ this.renderMinY * (1.0D - this.renderMaxX),
+ (1.0D - this.renderMinY) * (1.0D - this.renderMaxX),
+ (1.0D - this.renderMinY) * this.renderMaxX,
+ this.renderMinY * this.renderMaxX);
+ this.brightnessTopRight = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ i2,
+ l1,
+ k1,
+ this.renderMaxY * (1.0D - this.renderMaxX),
+ (1.0D - this.renderMaxY) * (1.0D - this.renderMaxX),
+ (1.0D - this.renderMaxY) * this.renderMaxX,
+ this.renderMaxY * this.renderMaxX);
if (flag1) {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R * 0.8F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G * 0.8F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B * 0.8F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R
+ * 0.8F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G
+ * 0.8F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B
+ * 0.8F;
} else {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.8F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.8F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.8F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.8F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.8F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.8F;
}
this.colorRedTopLeft *= f3;
@@ -2012,8 +1881,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
CustomOreBlockRenderer.renderFaceZPos(aWorld, aRenderer, block, xPos, yPos, zPos, aTextures);
RenderBlocks.getInstance();
- if (RenderBlocks.fancyGrass
- && iicon.getIconName().equals("grass_side")
+ if (RenderBlocks.fancyGrass && iicon.getIconName().equals("grass_side")
&& !this.hasOverrideBlockTexture()) {
this.colorRedTopLeft *= R;
this.colorRedBottomLeft *= R;
@@ -2039,14 +1907,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
--xPos;
}
- this.aoLightValueScratchXYNN =
- blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZNN =
- blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZNP =
- blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXYNP =
- blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYNN = blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZNN = blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZNP = blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYNP = blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
this.aoBrightnessXYNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos);
this.aoBrightnessXZNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1);
this.aoBrightnessXZNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1);
@@ -2060,8 +1924,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNN = this.aoLightValueScratchXZNN;
this.aoBrightnessXYZNNN = this.aoBrightnessXZNN;
} else {
- this.aoLightValueScratchXYZNNN =
- blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNN = blockAccess.getBlock(xPos, yPos - 1, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos - 1);
}
@@ -2069,8 +1933,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNNP = this.aoLightValueScratchXZNP;
this.aoBrightnessXYZNNP = this.aoBrightnessXZNP;
} else {
- this.aoLightValueScratchXYZNNP =
- blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNNP = blockAccess.getBlock(xPos, yPos - 1, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos + 1);
}
@@ -2078,8 +1942,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPN = this.aoLightValueScratchXZNN;
this.aoBrightnessXYZNPN = this.aoBrightnessXZNN;
} else {
- this.aoLightValueScratchXYZNPN =
- blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPN = blockAccess.getBlock(xPos, yPos + 1, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos - 1);
}
@@ -2087,8 +1951,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZNPP = this.aoLightValueScratchXZNP;
this.aoBrightnessXYZNPP = this.aoBrightnessXZNP;
} else {
- this.aoLightValueScratchXYZNPP =
- blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZNPP = blockAccess.getBlock(xPos, yPos + 1, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos + 1);
}
@@ -2098,8 +1962,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMinX <= 0.0D
- || !blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) {
+ if (this.renderMinX <= 0.0D || !blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos - 1, yPos, zPos);
}
@@ -2136,61 +1999,54 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
.getAoBrightness(this.aoBrightnessXZNN, this.aoBrightnessXYZNPN, this.aoBrightnessXYNP, i1);
i2 = RenderBlocks.getInstance()
.getAoBrightness(this.aoBrightnessXYZNNN, this.aoBrightnessXYNN, this.aoBrightnessXZNN, i1);
- this.brightnessTopLeft = RenderBlocks.getInstance()
- .mixAoBrightness(
- k1,
- l1,
- i2,
- j1,
- this.renderMaxY * this.renderMaxZ,
- this.renderMaxY * (1.0D - this.renderMaxZ),
- (1.0D - this.renderMaxY) * (1.0D - this.renderMaxZ),
- (1.0D - this.renderMaxY) * this.renderMaxZ);
- this.brightnessBottomLeft = RenderBlocks.getInstance()
- .mixAoBrightness(
- k1,
- l1,
- i2,
- j1,
- this.renderMaxY * this.renderMinZ,
- this.renderMaxY * (1.0D - this.renderMinZ),
- (1.0D - this.renderMaxY) * (1.0D - this.renderMinZ),
- (1.0D - this.renderMaxY) * this.renderMinZ);
- this.brightnessBottomRight = RenderBlocks.getInstance()
- .mixAoBrightness(
- k1,
- l1,
- i2,
- j1,
- this.renderMinY * this.renderMinZ,
- this.renderMinY * (1.0D - this.renderMinZ),
- (1.0D - this.renderMinY) * (1.0D - this.renderMinZ),
- (1.0D - this.renderMinY) * this.renderMinZ);
- this.brightnessTopRight = RenderBlocks.getInstance()
- .mixAoBrightness(
- k1,
- l1,
- i2,
- j1,
- this.renderMinY * this.renderMaxZ,
- this.renderMinY * (1.0D - this.renderMaxZ),
- (1.0D - this.renderMinY) * (1.0D - this.renderMaxZ),
- (1.0D - this.renderMinY) * this.renderMaxZ);
+ this.brightnessTopLeft = RenderBlocks.getInstance().mixAoBrightness(
+ k1,
+ l1,
+ i2,
+ j1,
+ this.renderMaxY * this.renderMaxZ,
+ this.renderMaxY * (1.0D - this.renderMaxZ),
+ (1.0D - this.renderMaxY) * (1.0D - this.renderMaxZ),
+ (1.0D - this.renderMaxY) * this.renderMaxZ);
+ this.brightnessBottomLeft = RenderBlocks.getInstance().mixAoBrightness(
+ k1,
+ l1,
+ i2,
+ j1,
+ this.renderMaxY * this.renderMinZ,
+ this.renderMaxY * (1.0D - this.renderMinZ),
+ (1.0D - this.renderMaxY) * (1.0D - this.renderMinZ),
+ (1.0D - this.renderMaxY) * this.renderMinZ);
+ this.brightnessBottomRight = RenderBlocks.getInstance().mixAoBrightness(
+ k1,
+ l1,
+ i2,
+ j1,
+ this.renderMinY * this.renderMinZ,
+ this.renderMinY * (1.0D - this.renderMinZ),
+ (1.0D - this.renderMinY) * (1.0D - this.renderMinZ),
+ (1.0D - this.renderMinY) * this.renderMinZ);
+ this.brightnessTopRight = RenderBlocks.getInstance().mixAoBrightness(
+ k1,
+ l1,
+ i2,
+ j1,
+ this.renderMinY * this.renderMaxZ,
+ this.renderMinY * (1.0D - this.renderMaxZ),
+ (1.0D - this.renderMinY) * (1.0D - this.renderMaxZ),
+ (1.0D - this.renderMinY) * this.renderMaxZ);
if (flag1) {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R * 0.6F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G * 0.6F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B * 0.6F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R
+ * 0.6F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G
+ * 0.6F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B
+ * 0.6F;
} else {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.6F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.6F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.6F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.6F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.6F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.6F;
}
this.colorRedTopLeft *= f3;
@@ -2209,8 +2065,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
CustomOreBlockRenderer.renderFaceXNeg(aWorld, aRenderer, block, xPos, yPos, zPos, aTextures);
RenderBlocks.getInstance();
- if (RenderBlocks.fancyGrass
- && iicon.getIconName().equals("grass_side")
+ if (RenderBlocks.fancyGrass && iicon.getIconName().equals("grass_side")
&& !this.hasOverrideBlockTexture()) {
this.colorRedTopLeft *= R;
this.colorRedBottomLeft *= R;
@@ -2236,14 +2091,10 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
++xPos;
}
- this.aoLightValueScratchXYPN =
- blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZPN =
- blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXZPP =
- blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
- this.aoLightValueScratchXYPP =
- blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYPN = blockAccess.getBlock(xPos, yPos - 1, zPos).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZPN = blockAccess.getBlock(xPos, yPos, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXZPP = blockAccess.getBlock(xPos, yPos, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYPP = blockAccess.getBlock(xPos, yPos + 1, zPos).getAmbientOcclusionLightValue();
this.aoBrightnessXYPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos);
this.aoBrightnessXZPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos - 1);
this.aoBrightnessXZPP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos, zPos + 1);
@@ -2257,8 +2108,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNN = this.aoLightValueScratchXZPN;
this.aoBrightnessXYZPNN = this.aoBrightnessXZPN;
} else {
- this.aoLightValueScratchXYZPNN =
- blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNN = blockAccess.getBlock(xPos, yPos - 1, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos - 1);
}
@@ -2266,8 +2117,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPNP = this.aoLightValueScratchXZPP;
this.aoBrightnessXYZPNP = this.aoBrightnessXZPP;
} else {
- this.aoLightValueScratchXYZPNP =
- blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPNP = blockAccess.getBlock(xPos, yPos - 1, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos - 1, zPos + 1);
}
@@ -2275,8 +2126,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPN = this.aoLightValueScratchXZPN;
this.aoBrightnessXYZPPN = this.aoBrightnessXZPN;
} else {
- this.aoLightValueScratchXYZPPN =
- blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPN = blockAccess.getBlock(xPos, yPos + 1, zPos - 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos - 1);
}
@@ -2284,8 +2135,8 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
this.aoLightValueScratchXYZPPP = this.aoLightValueScratchXZPP;
this.aoBrightnessXYZPPP = this.aoBrightnessXZPP;
} else {
- this.aoLightValueScratchXYZPPP =
- blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getAmbientOcclusionLightValue();
+ this.aoLightValueScratchXYZPPP = blockAccess.getBlock(xPos, yPos + 1, zPos + 1)
+ .getAmbientOcclusionLightValue();
this.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(blockAccess, xPos, yPos + 1, zPos + 1);
}
@@ -2295,8 +2146,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
i1 = l;
- if (this.renderMaxX >= 1.0D
- || !blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) {
+ if (this.renderMaxX >= 1.0D || !blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) {
i1 = block.getMixedBrightnessForBlock(blockAccess, xPos + 1, yPos, zPos);
}
@@ -2333,61 +2183,54 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
.getAoBrightness(this.aoBrightnessXZPN, this.aoBrightnessXYZPPN, this.aoBrightnessXYPP, i1);
i2 = RenderBlocks.getInstance()
.getAoBrightness(this.aoBrightnessXYZPNN, this.aoBrightnessXYPN, this.aoBrightnessXZPN, i1);
- this.brightnessTopLeft = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- i2,
- l1,
- k1,
- (1.0D - this.renderMinY) * this.renderMaxZ,
- (1.0D - this.renderMinY) * (1.0D - this.renderMaxZ),
- this.renderMinY * (1.0D - this.renderMaxZ),
- this.renderMinY * this.renderMaxZ);
- this.brightnessBottomLeft = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- i2,
- l1,
- k1,
- (1.0D - this.renderMinY) * this.renderMinZ,
- (1.0D - this.renderMinY) * (1.0D - this.renderMinZ),
- this.renderMinY * (1.0D - this.renderMinZ),
- this.renderMinY * this.renderMinZ);
- this.brightnessBottomRight = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- i2,
- l1,
- k1,
- (1.0D - this.renderMaxY) * this.renderMinZ,
- (1.0D - this.renderMaxY) * (1.0D - this.renderMinZ),
- this.renderMaxY * (1.0D - this.renderMinZ),
- this.renderMaxY * this.renderMinZ);
- this.brightnessTopRight = RenderBlocks.getInstance()
- .mixAoBrightness(
- j1,
- i2,
- l1,
- k1,
- (1.0D - this.renderMaxY) * this.renderMaxZ,
- (1.0D - this.renderMaxY) * (1.0D - this.renderMaxZ),
- this.renderMaxY * (1.0D - this.renderMaxZ),
- this.renderMaxY * this.renderMaxZ);
+ this.brightnessTopLeft = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ i2,
+ l1,
+ k1,
+ (1.0D - this.renderMinY) * this.renderMaxZ,
+ (1.0D - this.renderMinY) * (1.0D - this.renderMaxZ),
+ this.renderMinY * (1.0D - this.renderMaxZ),
+ this.renderMinY * this.renderMaxZ);
+ this.brightnessBottomLeft = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ i2,
+ l1,
+ k1,
+ (1.0D - this.renderMinY) * this.renderMinZ,
+ (1.0D - this.renderMinY) * (1.0D - this.renderMinZ),
+ this.renderMinY * (1.0D - this.renderMinZ),
+ this.renderMinY * this.renderMinZ);
+ this.brightnessBottomRight = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ i2,
+ l1,
+ k1,
+ (1.0D - this.renderMaxY) * this.renderMinZ,
+ (1.0D - this.renderMaxY) * (1.0D - this.renderMinZ),
+ this.renderMaxY * (1.0D - this.renderMinZ),
+ this.renderMaxY * this.renderMinZ);
+ this.brightnessTopRight = RenderBlocks.getInstance().mixAoBrightness(
+ j1,
+ i2,
+ l1,
+ k1,
+ (1.0D - this.renderMaxY) * this.renderMaxZ,
+ (1.0D - this.renderMaxY) * (1.0D - this.renderMaxZ),
+ this.renderMaxY * (1.0D - this.renderMaxZ),
+ this.renderMaxY * this.renderMaxZ);
if (flag1) {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R * 0.6F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G * 0.6F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B * 0.6F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = R
+ * 0.6F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = G
+ * 0.6F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = B
+ * 0.6F;
} else {
- this.colorRedTopLeft =
- this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.6F;
- this.colorGreenTopLeft =
- this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.6F;
- this.colorBlueTopLeft =
- this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.6F;
+ this.colorRedTopLeft = this.colorRedBottomLeft = this.colorRedBottomRight = this.colorRedTopRight = 0.6F;
+ this.colorGreenTopLeft = this.colorGreenBottomLeft = this.colorGreenBottomRight = this.colorGreenTopRight = 0.6F;
+ this.colorBlueTopLeft = this.colorBlueBottomLeft = this.colorBlueBottomRight = this.colorBlueTopRight = 0.6F;
}
this.colorRedTopLeft *= f3;
@@ -2406,8 +2249,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
CustomOreBlockRenderer.renderFaceXPos(aWorld, aRenderer, block, xPos, yPos, zPos, aTextures);
RenderBlocks.getInstance();
- if (RenderBlocks.fancyGrass
- && iicon.getIconName().equals("grass_side")
+ if (RenderBlocks.fancyGrass && iicon.getIconName().equals("grass_side")
&& !this.hasOverrideBlockTexture()) {
this.colorRedTopLeft *= R;
this.colorRedBottomLeft *= R;
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java
index 6654ff5c8d..e3fccaf2df 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java
@@ -1,27 +1,29 @@
package gtPlusPlus.core.client.renderer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.client.model.ModelBatKing;
-import gtPlusPlus.core.entity.monster.EntityBatKing;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.client.model.ModelBatKing;
+import gtPlusPlus.core.entity.monster.EntityBatKing;
+import gtPlusPlus.core.lib.CORE;
+
@SideOnly(Side.CLIENT)
public class RenderBatKing extends RenderLiving {
- private static final ResourceLocation batTextures =
- new ResourceLocation(CORE.MODID + ":" + "textures/entity/batKing.png");
+ private static final ResourceLocation batTextures = new ResourceLocation(
+ CORE.MODID + ":" + "textures/entity/batKing.png");
/**
- * not actually sure this is size, is not used as of now, but the model would be
- * recreated if the value changed and it seems a good match for a bats size
+ * not actually sure this is size, is not used as of now, but the model would be recreated if the value changed and
+ * it seems a good match for a bats size
*/
private int renderedBatSize;
@@ -31,20 +33,13 @@ public class RenderBatKing extends RenderLiving {
}
/**
- * Actually renders the given argument. This is a synthetic bridge method,
- * always casting down its argument and then handing it off to a worker function
- * which does the actual work. In all probabilty, the class Render is generic
- * (Render<T extends Entity) and this method has signature public void
- * func_76986_a(T entity, double d, double d1, double d2, float f, float f1).
- * But JAD is pre 1.5 so doesn't do that.
+ * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+ * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+ * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
- public void doRender(
- EntityBatKing p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntityBatKing p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
int i = ((ModelBatKing) this.mainModel).getBatSize();
if (i != this.renderedBatSize) {
@@ -56,16 +51,15 @@ public class RenderBatKing extends RenderLiving {
}
/**
- * Returns the location of an entity's texture. Doesn't seem to be called unless
- * you call Render.bindEntityTexture.
+ * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(EntityBatKing p_110775_1_) {
return batTextures;
}
/**
- * Allows the render to do any OpenGL state modifications necessary before the
- * model is rendered. Args: entityLiving, partialTickTime
+ * Allows the render to do any OpenGL state modifications necessary before the model is rendered. Args:
+ * entityLiving, partialTickTime
*/
protected void preRenderCallback(EntityBatKing p_77041_1_, float p_77041_2_) {
GL11.glScalef(0.35F, 0.35F, 0.35F);
@@ -89,26 +83,19 @@ public class RenderBatKing extends RenderLiving {
}
/**
- * Actually renders the given argument. This is a synthetic bridge method,
- * always casting down its argument and then handing it off to a worker function
- * which does the actual work. In all probabilty, the class Render is generic
- * (Render<T extends Entity) and this method has signature public void
- * func_76986_a(T entity, double d, double d1, double d2, float f, float f1).
- * But JAD is pre 1.5 so doesn't do that.
+ * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+ * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+ * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
- public void doRender(
- EntityLiving p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
this.doRender((EntityBatKing) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
/**
- * Allows the render to do any OpenGL state modifications necessary before the
- * model is rendered. Args: entityLiving, partialTickTime
+ * Allows the render to do any OpenGL state modifications necessary before the model is rendered. Args:
+ * entityLiving, partialTickTime
*/
protected void preRenderCallback(EntityLivingBase p_77041_1_, float p_77041_2_) {
this.preRenderCallback((EntityBatKing) p_77041_1_, p_77041_2_);
@@ -121,51 +108,36 @@ public class RenderBatKing extends RenderLiving {
/**
* Sets a simple glTranslate on a LivingEntity.
*/
- protected void renderLivingAt(
- EntityLivingBase p_77039_1_, double p_77039_2_, double p_77039_4_, double p_77039_6_) {
+ protected void renderLivingAt(EntityLivingBase p_77039_1_, double p_77039_2_, double p_77039_4_,
+ double p_77039_6_) {
this.renderLivingAt((EntityBatKing) p_77039_1_, p_77039_2_, p_77039_4_, p_77039_6_);
}
/**
- * Actually renders the given argument. This is a synthetic bridge method,
- * always casting down its argument and then handing it off to a worker function
- * which does the actual work. In all probabilty, the class Render is generic
- * (Render<T extends Entity) and this method has signature public void
- * func_76986_a(T entity, double d, double d1, double d2, float f, float f1).
- * But JAD is pre 1.5 so doesn't do that.
+ * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+ * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+ * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
- public void doRender(
- EntityLivingBase p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
this.doRender((EntityBatKing) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
/**
- * Returns the location of an entity's texture. Doesn't seem to be called unless
- * you call Render.bindEntityTexture.
+ * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
return this.getEntityTexture((EntityBatKing) p_110775_1_);
}
/**
- * Actually renders the given argument. This is a synthetic bridge method,
- * always casting down its argument and then handing it off to a worker function
- * which does the actual work. In all probabilty, the class Render is generic
- * (Render<T extends Entity) and this method has signature public void
- * func_76986_a(T entity, double d, double d1, double d2, float f, float f1).
- * But JAD is pre 1.5 so doesn't do that.
+ * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+ * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+ * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
- public void doRender(
- Entity p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
+ public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
float p_76986_9_) {
this.doRender((EntityBatKing) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java
index 0629db3a3c..47564edd84 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java
@@ -1,5 +1,12 @@
package gtPlusPlus.core.client.renderer;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -7,17 +14,13 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.client.model.ModelDecayChest;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
@SideOnly(Side.CLIENT)
public class RenderDecayChest extends TileEntitySpecialRenderer {
- private static final ResourceLocation mChestTexture =
- new ResourceLocation(CORE.MODID, "textures/blocks/TileEntities/DecayablesChest_full.png");
+ private static final ResourceLocation mChestTexture = new ResourceLocation(
+ CORE.MODID,
+ "textures/blocks/TileEntities/DecayablesChest_full.png");
private ModelDecayChest mChestModel = new ModelDecayChest();
public static RenderDecayChest INSTANCE;
@@ -29,12 +32,8 @@ public class RenderDecayChest extends TileEntitySpecialRenderer {
Logger.INFO("Registered Lead Lined Chest Renderer.");
}
- public void renderTileEntityAt(
- TileEntityDecayablesChest p_147500_1_,
- double p_147500_2_,
- double p_147500_4_,
- double p_147500_6_,
- float p_147500_8_) {
+ public void renderTileEntityAt(TileEntityDecayablesChest p_147500_1_, double p_147500_2_, double p_147500_4_,
+ double p_147500_6_, float p_147500_8_) {
int i = 0;
@@ -78,9 +77,13 @@ public class RenderDecayChest extends TileEntitySpecialRenderer {
}
}
- public void renderTileEntityAt(
- TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) {
+ public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_,
+ float p_147500_8_) {
this.renderTileEntityAt(
- (TileEntityDecayablesChest) p_147500_1_, p_147500_2_, p_147500_4_, p_147500_6_, p_147500_8_);
+ (TileEntityDecayablesChest) p_147500_1_,
+ p_147500_2_,
+ p_147500_4_,
+ p_147500_6_,
+ p_147500_8_);
}
}
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java
index ecc2675b1d..7a326de3c8 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java
@@ -1,10 +1,11 @@
package gtPlusPlus.core.client.renderer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.entity.RenderChicken;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
@SideOnly(Side.CLIENT)
public class RenderGiantChicken extends RenderChicken {
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java
index 11c01b8c41..d9e2cc7ec6 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java
@@ -1,19 +1,22 @@
package gtPlusPlus.core.client.renderer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.entity.RenderTNTPrimed;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
+
@SideOnly(Side.CLIENT)
public class RenderMiningExplosivesPrimed extends RenderTNTPrimed {
+
private final RenderBlocks blockRenderer = new RenderBlocks();
public RenderMiningExplosivesPrimed() {
@@ -27,13 +30,8 @@ public class RenderMiningExplosivesPrimed extends RenderTNTPrimed {
* (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
- public void doRender(
- final EntityPrimedMiningExplosive entity,
- final double p_76986_2_,
- final double p_76986_4_,
- final double p_76986_6_,
- final float p_76986_8_,
- final float p_76986_9_) {
+ public void doRender(final EntityPrimedMiningExplosive entity, final double p_76986_2_, final double p_76986_4_,
+ final double p_76986_6_, final float p_76986_8_, final float p_76986_9_) {
Logger.WARNING("Rendering Mining Explosion. 2");
GL11.glPushMatrix();
GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_);
@@ -99,15 +97,15 @@ public class RenderMiningExplosivesPrimed extends RenderTNTPrimed {
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
@Override
- public void doRender(
- final Entity p_76986_1_,
- final double p_76986_2_,
- final double p_76986_4_,
- final double p_76986_6_,
- final float p_76986_8_,
- final float p_76986_9_) {
+ public void doRender(final Entity p_76986_1_, final double p_76986_2_, final double p_76986_4_,
+ final double p_76986_6_, final float p_76986_8_, final float p_76986_9_) {
Logger.WARNING("Rendering Mining Explosion. 3");
this.doRender(
- (EntityPrimedMiningExplosive) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ (EntityPrimedMiningExplosive) p_76986_1_,
+ p_76986_2_,
+ p_76986_4_,
+ p_76986_6_,
+ p_76986_8_,
+ p_76986_9_);
}
}
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
index 61c1052859..acc78e3b57 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
@@ -1,17 +1,20 @@
package gtPlusPlus.core.client.renderer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.core.entity.EntityTeslaTowerLightning;
import java.util.Random;
+
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.random.XSTR;
+import gtPlusPlus.core.entity.EntityTeslaTowerLightning;
+
@SideOnly(Side.CLIENT)
public class RenderPlasmaBolt extends Render {
@@ -20,20 +23,13 @@ public class RenderPlasmaBolt extends Render {
}
/**
- * Actually renders the given argument. This is a synthetic bridge method,
- * always casting down its argument and then handing it off to a worker
- * function which does the actual work. In all probabilty, the class Render
- * is generic (Render<T extends Entity) and this method has signature public
- * void func_76986_a(T entity, double d, double d1, double d2, float f,
- * float f1). But JAD is pre 1.5 so doesn't do that.
+ * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+ * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+ * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
- public void doRender(
- EntityTeslaTowerLightning p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntityTeslaTowerLightning p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
Logger.INFO("Render Plasma. 1");
Tessellator tessellator = Tessellator.instance;
GL11.glDisable(GL11.GL_TEXTURE_2D);
@@ -135,16 +131,14 @@ public class RenderPlasmaBolt extends Render {
}
/**
- * Returns the location of an entity's texture. Doesn't seem to be called
- * unless you call Render.bindEntityTexture.
+ * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(EntityTeslaTowerLightning p_110775_1_) {
return null;
}
/**
- * Returns the location of an entity's texture. Doesn't seem to be called
- * unless you call Render.bindEntityTexture.
+ * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
Logger.INFO("Render Plasma. 5");
@@ -152,22 +146,20 @@ public class RenderPlasmaBolt extends Render {
}
/**
- * Actually renders the given argument. This is a synthetic bridge method,
- * always casting down its argument and then handing it off to a worker
- * function which does the actual work. In all probabilty, the class Render
- * is generic (Render<T extends Entity) and this method has signature public
- * void func_76986_a(T entity, double d, double d1, double d2, float f,
- * float f1). But JAD is pre 1.5 so doesn't do that.
+ * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+ * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+ * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
- public void doRender(
- Entity p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
+ public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
float p_76986_9_) {
Logger.INFO("Render Plasma. 2");
this.doRender(
- (EntityTeslaTowerLightning) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ (EntityTeslaTowerLightning) p_76986_1_,
+ p_76986_2_,
+ p_76986_4_,
+ p_76986_6_,
+ p_76986_8_,
+ p_76986_9_);
}
}
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java
index e0b62b4a33..0f962df641 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java
@@ -1,7 +1,5 @@
package gtPlusPlus.core.client.renderer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -12,11 +10,16 @@ import net.minecraft.item.ItemPotion;
import net.minecraft.potion.PotionHelper;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
@SideOnly(Side.CLIENT)
public class RenderPotionthrow extends Render {
+
private Item mRenderItem;
private int mDamage;
@@ -36,12 +39,7 @@ public class RenderPotionthrow extends Render {
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
@Override
- public void doRender(
- Entity p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
+ public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
float p_76986_9_) {
IIcon iicon = this.mRenderItem.getIconFromDamage(this.mDamage);
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java
index 960451514d..10d155f1cd 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java
@@ -1,20 +1,22 @@
package gtPlusPlus.core.client.renderer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.client.model.ModelSickBlaze;
-import gtPlusPlus.core.entity.monster.EntitySickBlaze;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ResourceLocation;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.client.model.ModelSickBlaze;
+import gtPlusPlus.core.entity.monster.EntitySickBlaze;
+import gtPlusPlus.core.lib.CORE;
+
@SideOnly(Side.CLIENT)
public class RenderSickBlaze extends RenderLiving {
- private static final ResourceLocation blazeTextures =
- new ResourceLocation(CORE.MODID + ":" + "textures/entity/sickBlaze.png");
+
+ private static final ResourceLocation blazeTextures = new ResourceLocation(
+ CORE.MODID + ":" + "textures/entity/sickBlaze.png");
private int field_77068_a;
public RenderSickBlaze() {
@@ -28,13 +30,8 @@ public class RenderSickBlaze extends RenderLiving {
* (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
- public void doRender(
- EntitySickBlaze p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntitySickBlaze p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
int i = ((ModelSickBlaze) this.mainModel).func_78104_a();
if (i != this.field_77068_a) {
@@ -59,13 +56,8 @@ public class RenderSickBlaze extends RenderLiving {
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
@Override
- public void doRender(
- EntityLiving p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
this.doRender((EntitySickBlaze) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
@@ -76,13 +68,8 @@ public class RenderSickBlaze extends RenderLiving {
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
@Override
- public void doRender(
- EntityLivingBase p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
this.doRender((EntitySickBlaze) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
@@ -101,12 +88,7 @@ public class RenderSickBlaze extends RenderLiving {
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
@Override
- public void doRender(
- Entity p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
+ public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
float p_76986_9_) {
this.doRender((EntitySickBlaze) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java
index da2f33a4c4..f97be33e4f 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java
@@ -1,10 +1,5 @@
package gtPlusPlus.core.client.renderer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.client.model.ModelStaballoyConstruct;
-import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -13,13 +8,21 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.Blocks;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.client.model.ModelStaballoyConstruct;
+import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
+import gtPlusPlus.core.lib.CORE;
+
@SideOnly(Side.CLIENT)
public class RenderStaballoyConstruct extends RenderLiving {
- private static final ResourceLocation staballoyGolemTextures =
- new ResourceLocation(CORE.MODID + ":" + "textures/entity/golemStaballoy.png");
+
+ private static final ResourceLocation staballoyGolemTextures = new ResourceLocation(
+ CORE.MODID + ":" + "textures/entity/golemStaballoy.png");
/** Staballoy Golem's Model. */
private final ModelStaballoyConstruct staballoyGolemModel;
@@ -29,33 +32,25 @@ public class RenderStaballoyConstruct extends RenderLiving {
}
/**
- * Actually renders the given argument. This is a synthetic bridge method,
- * always casting down its argument and then handing it off to a worker
- * function which does the actual work. In all probabilty, the class Render
- * is generic (Render<T extends Entity) and this method has signature public
- * void func_76986_a(T entity, double d, double d1, double d2, float f,
- * float f1). But JAD is pre 1.5 so doesn't do that.
+ * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+ * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+ * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
- public void doRender(
- EntityStaballoyConstruct p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntityStaballoyConstruct p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
/**
- * Returns the location of an entity's texture. Doesn't seem to be called
- * unless you call Render.bindEntityTexture.
+ * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
protected ResourceLocation getEntityTexture(EntityStaballoyConstruct p_110775_1_) {
return staballoyGolemTextures;
}
- protected void rotateCorpse(
- EntityStaballoyConstruct p_77043_1_, float p_77043_2_, float p_77043_3_, float p_77043_4_) {
+ protected void rotateCorpse(EntityStaballoyConstruct p_77043_1_, float p_77043_2_, float p_77043_3_,
+ float p_77043_4_) {
super.rotateCorpse(p_77043_1_, p_77043_2_, p_77043_3_, p_77043_4_);
if (p_77043_1_.limbSwingAmount >= 0.01D) {
@@ -94,23 +89,21 @@ public class RenderStaballoyConstruct extends RenderLiving {
}
/**
- * Actually renders the given argument. This is a synthetic bridge method,
- * always casting down its argument and then handing it off to a worker
- * function which does the actual work. In all probabilty, the class Render
- * is generic (Render<T extends Entity) and this method has signature public
- * void func_76986_a(T entity, double d, double d1, double d2, float f,
- * float f1). But JAD is pre 1.5 so doesn't do that.
+ * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+ * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+ * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
@Override
- public void doRender(
- EntityLiving p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
this.doRender(
- (EntityStaballoyConstruct) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ (EntityStaballoyConstruct) p_76986_1_,
+ p_76986_2_,
+ p_76986_4_,
+ p_76986_6_,
+ p_76986_8_,
+ p_76986_9_);
}
@Override
@@ -124,28 +117,25 @@ public class RenderStaballoyConstruct extends RenderLiving {
}
/**
- * Actually renders the given argument. This is a synthetic bridge method,
- * always casting down its argument and then handing it off to a worker
- * function which does the actual work. In all probabilty, the class Render
- * is generic (Render<T extends Entity) and this method has signature public
- * void func_76986_a(T entity, double d, double d1, double d2, float f,
- * float f1). But JAD is pre 1.5 so doesn't do that.
+ * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+ * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+ * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
@Override
- public void doRender(
- EntityLivingBase p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
this.doRender(
- (EntityStaballoyConstruct) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ (EntityStaballoyConstruct) p_76986_1_,
+ p_76986_2_,
+ p_76986_4_,
+ p_76986_6_,
+ p_76986_8_,
+ p_76986_9_);
}
/**
- * Returns the location of an entity's texture. Doesn't seem to be called
- * unless you call Render.bindEntityTexture.
+ * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
@Override
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
@@ -153,22 +143,20 @@ public class RenderStaballoyConstruct extends RenderLiving {
}
/**
- * Actually renders the given argument. This is a synthetic bridge method,
- * always casting down its argument and then handing it off to a worker
- * function which does the actual work. In all probabilty, the class Render
- * is generic (Render<T extends Entity) and this method has signature public
- * void func_76986_a(T entity, double d, double d1, double d2, float f,
- * float f1). But JAD is pre 1.5 so doesn't do that.
+ * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+ * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+ * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+ * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
@Override
- public void doRender(
- Entity p_76986_1_,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
+ public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
float p_76986_9_) {
this.doRender(
- (EntityStaballoyConstruct) p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ (EntityStaballoyConstruct) p_76986_1_,
+ p_76986_2_,
+ p_76986_4_,
+ p_76986_6_,
+ p_76986_8_,
+ p_76986_9_);
}
}
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java
index f06f15980c..7d1b448cdc 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java
@@ -1,8 +1,5 @@
package gtPlusPlus.core.client.renderer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.entity.projectile.EntityToxinball;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -10,11 +7,17 @@ import net.minecraft.entity.Entity;
import net.minecraft.init.Items;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.entity.projectile.EntityToxinball;
+
@SideOnly(Side.CLIENT)
public class RenderToxinball extends Render {
+
private float mSize;
public RenderToxinball(float scale) {
@@ -27,13 +30,8 @@ public class RenderToxinball extends Render {
* (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
- public void doRender(
- EntityToxinball entity,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
- float p_76986_9_) {
+ public void doRender(EntityToxinball entity, double p_76986_2_, double p_76986_4_, double p_76986_6_,
+ float p_76986_8_, float p_76986_9_) {
GL11.glPushMatrix();
this.bindEntityTexture(entity);
GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_);
@@ -84,12 +82,7 @@ public class RenderToxinball extends Render {
* double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
*/
@Override
- public void doRender(
- Entity entity,
- double p_76986_2_,
- double p_76986_4_,
- double p_76986_6_,
- float p_76986_8_,
+ public void doRender(Entity entity, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
float p_76986_9_) {
this.doRender((EntityToxinball) entity, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java b/src/main/java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java
index 9610fa1c18..f24b339483 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java
@@ -1,33 +1,27 @@
package gtPlusPlus.core.client.renderer.particle;
-import cofh.lib.util.helpers.MathHelper;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockLiquid;
import net.minecraft.block.material.Material;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.world.World;
+import cofh.lib.util.helpers.MathHelper;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
@SideOnly(Side.CLIENT)
public class EntityDropParticleFX extends EntityFX {
private int bobTimer;
- public EntityDropParticleFX(
- World world, double x, double y, double z, float particleRed, float particleGreen, float particleBlue) {
+ public EntityDropParticleFX(World world, double x, double y, double z, float particleRed, float particleGreen,
+ float particleBlue) {
this(world, x, y, z, particleRed, particleGreen, particleBlue, -1);
}
- public EntityDropParticleFX(
- World world,
- double x,
- double y,
- double z,
- float particleRed,
- float particleGreen,
- float particleBlue,
- int gravityMod) {
+ public EntityDropParticleFX(World world, double x, double y, double z, float particleRed, float particleGreen,
+ float particleBlue, int gravityMod) {
super(world, x, y, z, 0.0D, 0.0D, 0.0D);
this.motionX = this.motionY = this.motionZ = 0.0D;
@@ -80,10 +74,12 @@ public class EntityDropParticleFX extends EntityFX {
.getMaterial();
if (material.isLiquid() || material.isSolid()) {
- double d0 = MathHelper.floor(this.posY)
- + 1
- - BlockLiquid.getLiquidHeightPercent(this.worldObj.getBlockMetadata(
- MathHelper.floor(this.posX), MathHelper.floor(this.posY), MathHelper.floor(this.posZ)));
+ double d0 = MathHelper.floor(this.posY) + 1
+ - BlockLiquid.getLiquidHeightPercent(
+ this.worldObj.getBlockMetadata(
+ MathHelper.floor(this.posX),
+ MathHelper.floor(this.posY),
+ MathHelper.floor(this.posZ)));
if (this.posY < d0) {
this.setDead();
}
@@ -94,10 +90,12 @@ public class EntityDropParticleFX extends EntityFX {
.getMaterial();
if (material.isLiquid() || material.isSolid()) {
- double d0 = MathHelper.ceil(this.posY)
- + 1
- - BlockLiquid.getLiquidHeightPercent(this.worldObj.getBlockMetadata(
- MathHelper.ceil(this.posX), MathHelper.ceil(this.posY), MathHelper.ceil(this.posZ)));
+ double d0 = MathHelper.ceil(this.posY) + 1
+ - BlockLiquid.getLiquidHeightPercent(
+ this.worldObj.getBlockMetadata(
+ MathHelper.ceil(this.posX),
+ MathHelper.ceil(this.posY),
+ MathHelper.ceil(this.posZ)));
if (this.posY > d0) {
this.setDead();
}
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java b/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java
index ad2d90f482..9a110adccd 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java
@@ -1,13 +1,14 @@
package gtPlusPlus.core.client.renderer.tabula;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
+
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.client.model.tabula.ModelTabulaBase;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
@SideOnly(Side.CLIENT)
public class RenderTabulaBase extends TileEntitySpecialRenderer {
@@ -27,8 +28,8 @@ public class RenderTabulaBase extends TileEntitySpecialRenderer {
mInstance = this;
}
- public void renderTileEntityAt(
- Object aTile, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) {
+ public void renderTileEntityAt(Object aTile, double p_147500_2_, double p_147500_4_, double p_147500_6_,
+ float p_147500_8_) {
if (mTileClass.isInstance(aTile)) {
// Logger.INFO("Rendering EggBox");
this.bindTexture(mTexture);
@@ -36,8 +37,8 @@ public class RenderTabulaBase extends TileEntitySpecialRenderer {
}
}
- public void renderTileEntityAt(
- TileEntity aTile, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) {
+ public void renderTileEntityAt(TileEntity aTile, double p_147500_2_, double p_147500_4_, double p_147500_6_,
+ float p_147500_8_) {
if (mTileClass != null && aTile != null) {
if (mTileClass.isInstance(aTile)) {
this.renderTileEntityAt((Object) aTile, p_147500_2_, p_147500_4_, p_147500_6_, p_147500_8_);
diff --git a/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java b/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java
index f86476b91a..8bd51e1459 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java
@@ -1,21 +1,24 @@
package gtPlusPlus.core.commands;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.preloader.ChunkDebugger;
-import gtPlusPlus.preloader.asm.AsmConfig;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.preloader.ChunkDebugger;
+import gtPlusPlus.preloader.asm.AsmConfig;
+
public class CommandDebugChunks implements ICommand {
+
private final List<String> aliases;
protected String fullEntityName;
diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index 43b9de8c58..102cff2232 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -1,19 +1,9 @@
package gtPlusPlus.core.commands;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.NBTUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.preloader.asm.AsmConfig;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
@@ -25,7 +15,20 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.NBTUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.asm.AsmConfig;
+
public class CommandEnableDebugWhileRunning implements ICommand {
+
private final List<String> aliases;
public CommandEnableDebugWhileRunning() {
@@ -79,7 +82,8 @@ public class CommandEnableDebugWhileRunning implements ICommand {
PlayerUtils.messagePlayer(P, "hand - Lists information about held item.");
PlayerUtils.messagePlayer(P, "fuid xxx - Tries to find the fluid in the FluidRegistry.");
PlayerUtils.messagePlayer(
- P, "debug - Toggles GT++ Debug Mode. Only use when advised, may break everything. (OP)");
+ P,
+ "debug - Toggles GT++ Debug Mode. Only use when advised, may break everything. (OP)");
} else if (argString[0].toLowerCase().equals("debug")) {
Logger.INFO("Toggling Debug Mode.");
final EntityPlayer P = CommandUtils.getPlayer(S);
@@ -93,13 +97,11 @@ public class CommandEnableDebugWhileRunning implements ICommand {
AsmConfig.disableAllLogging = Utils.invertBoolean(AsmConfig.disableAllLogging);
PlayerUtils.messagePlayer(P, "Toggled GT++ Logging - Enabled: " + (!AsmConfig.disableAllLogging));
}
- /* else if (argString[0].toLowerCase().equals("test")) {
- ItemStack mSemiFluidgen = ItemUtils.simpleMetaStack("IC2:blockGenerator", 7, 1);
- final EntityPlayer P = CommandUtils.getPlayer(S);
- if(mSemiFluidgen != null) {
- PlayerUtils.messagePlayer(P, ItemUtils.getItemName(mSemiFluidgen));
- }
- }*/
+ /*
+ * else if (argString[0].toLowerCase().equals("test")) { ItemStack mSemiFluidgen =
+ * ItemUtils.simpleMetaStack("IC2:blockGenerator", 7, 1); final EntityPlayer P = CommandUtils.getPlayer(S);
+ * if(mSemiFluidgen != null) { PlayerUtils.messagePlayer(P, ItemUtils.getItemName(mSemiFluidgen)); } }
+ */
else if (argString[0].toLowerCase().equals("inv")) {
final EntityPlayer P = CommandUtils.getPlayer(S);
@@ -109,8 +111,13 @@ public class CommandEnableDebugWhileRunning implements ICommand {
if (aItem != null) {
String aModID = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).modId;
String aRegistryName = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).name;
- Logger.INFO(aModID + ":" + aRegistryName + ":" + aItem.getItemDamage() + " | "
- + aItem.getDisplayName());
+ Logger.INFO(
+ aModID + ":"
+ + aRegistryName
+ + ":"
+ + aItem.getItemDamage()
+ + " | "
+ + aItem.getDisplayName());
}
}
PlayerUtils.messagePlayer(P, "Dumped Inventory.");
@@ -128,8 +135,7 @@ public class CommandEnableDebugWhileRunning implements ICommand {
int[] aOreIDs = OreDictionary.getOreIDs(aHeldItem);
for (int id : aOreIDs) {
String aOreNameFromID = OreDictionary.getOreName(id);
- if (aOreNameFromID != null
- && aOreNameFromID.length() > 0
+ if (aOreNameFromID != null && aOreNameFromID.length() > 0
&& !aOreNameFromID.equals("Unknown")) {
aOreDictNames.add(aOreNameFromID);
}
@@ -150,12 +156,10 @@ public class CommandEnableDebugWhileRunning implements ICommand {
if (aHeldItemFluid != null) {
aFluidContainerData.put("FluidStack Unlocal Name: " + aHeldItemFluid.getUnlocalizedName());
aFluidContainerData.put("FluidStack Local Name: " + aHeldItemFluid.getLocalizedName());
- aFluidContainerData.put("Fluid Unlocal Name: "
- + aHeldItemFluid.getFluid().getUnlocalizedName());
- aFluidContainerData.put(
- "Fluid Local Name: " + aHeldItemFluid.getFluid().getLocalizedName());
- aFluidContainerData.put(
- "Fluid Name: " + aHeldItemFluid.getFluid().getName());
+ aFluidContainerData
+ .put("Fluid Unlocal Name: " + aHeldItemFluid.getFluid().getUnlocalizedName());
+ aFluidContainerData.put("Fluid Local Name: " + aHeldItemFluid.getFluid().getLocalizedName());
+ aFluidContainerData.put("Fluid Name: " + aHeldItemFluid.getFluid().getName());
}
PlayerUtils.messagePlayer(P, "[" + aItemUnlocalName + "]" + "[" + aItemDisplayName + "] ");
@@ -255,8 +259,7 @@ public class CommandEnableDebugWhileRunning implements ICommand {
}
}
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return "";
}
}
diff --git a/src/main/java/gtPlusPlus/core/commands/CommandMath.java b/src/main/java/gtPlusPlus/core/commands/CommandMath.java
index b26f93c56a..8659c00246 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandMath.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandMath.java
@@ -1,17 +1,20 @@
package gtPlusPlus.core.commands;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.MiningUtils;
import java.util.ArrayList;
import java.util.List;
+
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.MiningUtils;
+
public class CommandMath implements ICommand {
+
private final List<String> aliases;
protected String fullEntityName;
diff --git a/src/main/java/gtPlusPlus/core/common/BasePlayer.java b/src/main/java/gtPlusPlus/core/common/BasePlayer.java
index 69cd46178a..d119ca2015 100644
--- a/src/main/java/gtPlusPlus/core/common/BasePlayer.java
+++ b/src/main/java/gtPlusPlus/core/common/BasePlayer.java
@@ -1,16 +1,18 @@
package gtPlusPlus.core.common;
-import api.player.client.ClientPlayerAPI;
-import api.player.client.ClientPlayerBase;
-import gtPlusPlus.core.handler.events.CustomMovementHandler;
-import gtPlusPlus.core.handler.events.SneakManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.util.MovementInputFromOptions;
+import api.player.client.ClientPlayerAPI;
+import api.player.client.ClientPlayerBase;
+import gtPlusPlus.core.handler.events.CustomMovementHandler;
+import gtPlusPlus.core.handler.events.SneakManager;
+
public class BasePlayer extends ClientPlayerBase {
+
private final Minecraft mc = Minecraft.getMinecraft();
private final CustomMovementHandler customMovementInput = new CustomMovementHandler();
private final GameSettings settings = this.mc.gameSettings;
@@ -20,7 +22,7 @@ public class BasePlayer extends ClientPlayerBase {
}
/*
- * EntityPlayerSP.onLivingUpdate() - Adapted to PlayerAPI
+ * EntityPlayerSP.onLivingUpdate() - Adapted to PlayerAPI
*/
@Override
public void onLivingUpdate() {
@@ -61,7 +63,7 @@ public class BasePlayer extends ClientPlayerBase {
this.customMovementInput.update(this.mc, (MovementInputFromOptions) this.player.movementInput, this.player);
/*
- * Begin ToggleSneak Changes - ToggleSprint
+ * Begin ToggleSneak Changes - ToggleSprint
*/
SneakManager aSneak = SneakManager.get(this.player);
@@ -79,8 +81,7 @@ public class BasePlayer extends ClientPlayerBase {
// as a whole
if (isSprintDisabled) {
// Utils.LOG_INFO("Sprint pressed");
- if (aSneak.optionDoubleTap
- && this.player.onGround
+ if (aSneak.optionDoubleTap && this.player.onGround
&& !isMovingForward
&& (this.player.movementInput.moveForward >= minSpeed)
&& !this.player.isSprinting()
@@ -100,8 +101,7 @@ public class BasePlayer extends ClientPlayerBase {
}
}
- if (!this.player.isSprinting()
- && (this.player.movementInput.moveForward >= minSpeed)
+ if (!this.player.isSprinting() && (this.player.movementInput.moveForward >= minSpeed)
&& !this.player.isUsingItem()
&& !this.player.isPotionActive(Potion.blindness)
&& this.settings.keyBindSprint.getIsKeyPressed()) {
@@ -123,8 +123,7 @@ public class BasePlayer extends ClientPlayerBase {
// if(this.player.onGround && enoughHunger && !this.player.isUsingItem() &&
// !this.player.isPotionActive(Potion.blindness) && !this.customMovementInput.sprintHeldAndReleased)
- if (!this.player.isUsingItem()
- && !this.player.isPotionActive(Potion.blindness)
+ if (!this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness)
&& !this.customMovementInput.sprintHeldAndReleased) {
if ((canDoubleTap && !this.player.isSprinting()) || !canDoubleTap) {
if (aSneak.Sprinting()) {
@@ -135,8 +134,7 @@ public class BasePlayer extends ClientPlayerBase {
}
}
- if (canDoubleTap
- && !state
+ if (canDoubleTap && !state
&& this.player.onGround
&& !isMovingForward
&& (this.player.movementInput.moveForward >= minSpeed)
@@ -162,8 +160,7 @@ public class BasePlayer extends ClientPlayerBase {
this.player.setSprinting(false);
// Undo toggle if we resumed vanilla operation due to Hold&Release, DoubleTap, Fly, Ride
- if ((this.customMovementInput.sprintHeldAndReleased == true)
- || isSprintDisabled
+ if ((this.customMovementInput.sprintHeldAndReleased == true) || isSprintDisabled
|| this.customMovementInput.sprintDoubleTapped
|| this.player.capabilities.isFlying
|| this.player.isRiding()) {
@@ -172,42 +169,42 @@ public class BasePlayer extends ClientPlayerBase {
}
/*
- * End ToggleSneak Changes - ToggleSprint
+ * End ToggleSneak Changes - ToggleSprint
*/
- // //
- // // Debug Framework - Added 5/7/2014
- // //
- // if (this.showDebug && this.settings.keyBindPickBlock.getIsKeyPressed() && !this.handledDebugPress)
- // {
- // this.player.addChatMessage(new ChatComponentText("+--------------------------------------+"));
- // this.player.addChatMessage(new ChatComponentText("| ToggleSneak Debug Info |"));
- // this.player.addChatMessage(new ChatComponentText("+--------------------------------------+"));
- // this.player.addChatMessage(new ChatComponentText(" "));
- // this.player.addChatMessage(new ChatComponentText("isFlying - " +
+ // //
+ // // Debug Framework - Added 5/7/2014
+ // //
+ // if (this.showDebug && this.settings.keyBindPickBlock.getIsKeyPressed() && !this.handledDebugPress)
+ // {
+ // this.player.addChatMessage(new ChatComponentText("+--------------------------------------+"));
+ // this.player.addChatMessage(new ChatComponentText("| ToggleSneak Debug Info |"));
+ // this.player.addChatMessage(new ChatComponentText("+--------------------------------------+"));
+ // this.player.addChatMessage(new ChatComponentText(" "));
+ // this.player.addChatMessage(new ChatComponentText("isFlying - " +
// (this.player.capabilities.isFlying == true ? "True" : "False")));
- // this.player.addChatMessage(new ChatComponentText("isCreative - " +
+ // this.player.addChatMessage(new ChatComponentText("isCreative - " +
// (this.player.capabilities.isCreativeMode == true ? "True" : "False")));
- // this.player.addChatMessage(new ChatComponentText("enableFlyBoost - " +
+ // this.player.addChatMessage(new ChatComponentText("enableFlyBoost - " +
// (SneakManager.optionEnableFlyBoost == true ? "True" : "False")));
- // this.player.addChatMessage(new ChatComponentText("flyBoostAmount - " +
+ // this.player.addChatMessage(new ChatComponentText("flyBoostAmount - " +
// SneakManager.optionFlyBoostAmount));
- // this.player.addChatMessage(new ChatComponentText(" "));
- // this.player.addChatMessage(new ChatComponentText("keybindSprint - " +
+ // this.player.addChatMessage(new ChatComponentText(" "));
+ // this.player.addChatMessage(new ChatComponentText("keybindSprint - " +
// (this.settings.keyBindSprint.getIsKeyPressed() == true ? "True" : "False")));
- // this.player.addChatMessage(new ChatComponentText("keybindSneak - " +
+ // this.player.addChatMessage(new ChatComponentText("keybindSneak - " +
// (this.settings.keyBindSneak.getIsKeyPressed() == true ? "True" : "False")));
- // this.player.addChatMessage(new ChatComponentText("keybindJump - " +
+ // this.player.addChatMessage(new ChatComponentText("keybindJump - " +
// (this.settings.keyBindJump.getIsKeyPressed() == true ? "True" : "False")));
- // this.player.addChatMessage(new ChatComponentText(" "));
- // this.player.addChatMessage(new ChatComponentText(" "));
+ // this.player.addChatMessage(new ChatComponentText(" "));
+ // this.player.addChatMessage(new ChatComponentText(" "));
//
- // this.handledDebugPress = true;
- // }
- // else if (this.showDebug && !this.settings.keyBindPickBlock.getIsKeyPressed() && this.handledDebugPress)
- // {
- // this.handledDebugPress = false;
- // }
+ // this.handledDebugPress = true;
+ // }
+ // else if (this.showDebug && !this.settings.keyBindPickBlock.getIsKeyPressed() && this.handledDebugPress)
+ // {
+ // this.handledDebugPress = false;
+ // }
}
}
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index 421dd05b8f..26bf349b93 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -1,5 +1,15 @@
package gtPlusPlus.core.common;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.client.IItemRenderer;
+
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -34,15 +44,6 @@ import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO;
import gtPlusPlus.xmod.galacticraft.handler.HandlerTooltip_GC;
import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.monster.EntityBlaze;
-import net.minecraft.entity.monster.EntityZombie;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.client.IItemRenderer;
public class CommonProxy {
@@ -223,8 +224,8 @@ public class CommonProxy {
// Zombie
EntityUtils.registerDropsForMob(EntityZombie.class, ItemUtils.getSimpleStack(ModItems.itemRope), 3, 100);
EntityUtils.registerDropsForMob(EntityZombie.class, ItemUtils.getSimpleStack(ModItems.itemFiber), 5, 250);
- EntityUtils.registerDropsForMob(
- EntityZombie.class, ItemUtils.getSimpleStack(ModItems.itemSandstoneHammer), 1, 10);
+ EntityUtils
+ .registerDropsForMob(EntityZombie.class, ItemUtils.getSimpleStack(ModItems.itemSandstoneHammer), 1, 10);
EntityUtils.registerDropsForMob(EntityZombie.class, ItemUtils.getSimpleStack(ModItems.itemBomb), 2, 10);
EntityUtils.registerDropsForMob(EntityZombie.class, ALLOY.TUMBAGA.getTinyDust(1), 1, 10);
EntityUtils.registerDropsForMob(EntityZombie.class, ALLOY.POTIN.getTinyDust(1), 1, 10);
@@ -232,9 +233,15 @@ public class CommonProxy {
// Blazes
if (ItemUtils.doesOreDictHaveEntryFor("dustPyrotheum")) {
EntityUtils.registerDropsForMob(
- EntityBlaze.class, ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1), 1, 10);
+ EntityBlaze.class,
+ ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1),
+ 1,
+ 10);
EntityUtils.registerDropsForMob(
- EntityBlaze.class, ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1), 1, 10);
+ EntityBlaze.class,
+ ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1),
+ 1,
+ 10);
}
// Special mobs Support
@@ -247,20 +254,26 @@ public class CommonProxy {
EntityUtils.registerDropsForMob(aBrutishZombie, aFortune2, 1, 50);
EntityUtils.registerDropsForMob(aBrutishZombie, aFortune3, 1, 1);
EntityUtils.registerDropsForMob(
- aBrutishZombie, ItemUtils.getItemStackOfAmountFromOreDict("ingotRedAlloy", 1), 3, 200);
+ aBrutishZombie,
+ ItemUtils.getItemStackOfAmountFromOreDict("ingotRedAlloy", 1),
+ 3,
+ 200);
}
// GalaxySpace Support
if (ReflectionUtils.doesClassExist("galaxyspace.SolarSystem.moons.europa.entities.EntityEvolvedColdBlaze")) {
- Class<?> aColdBlaze =
- ReflectionUtils.getClass("galaxyspace.SolarSystem.moons.europa.entities.EntityEvolvedColdBlaze");
+ Class<?> aColdBlaze = ReflectionUtils
+ .getClass("galaxyspace.SolarSystem.moons.europa.entities.EntityEvolvedColdBlaze");
ItemStack aSmallBlizz, aTinyBlizz, aSmallCryo, aTinyCryo;
aSmallBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallBlizz", 1);
aTinyBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBlizz", 1);
aSmallCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallCryotheum", 1);
aTinyCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCryotheum", 1);
EntityUtils.registerDropsForMob(
- aColdBlaze, ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1), 2, 500);
+ aColdBlaze,
+ ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1),
+ 2,
+ 500);
if (aSmallBlizz != null) {
EntityUtils.registerDropsForMob(aColdBlaze, aSmallBlizz, 2, 750);
}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
index 4af788a9df..53b4911faa 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
@@ -1,14 +1,5 @@
package gtPlusPlus.core.common.compat;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
-import gtPlusPlus.core.item.bauble.FireProtectionBauble;
-import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble;
-import gtPlusPlus.core.item.general.ItemCloakingDevice;
-import gtPlusPlus.core.item.general.ItemHealingDevice;
-import gtPlusPlus.core.item.general.ItemSlowBuildingRing;
-import gtPlusPlus.core.lib.LoadedMods;
import net.minecraft.entity.monster.EntityBlaze;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityEnderman;
@@ -19,6 +10,16 @@ import net.minecraft.entity.monster.EntitySkeleton;
import net.minecraft.entity.monster.EntitySpider;
import net.minecraft.entity.monster.EntityZombie;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
+import gtPlusPlus.core.item.bauble.FireProtectionBauble;
+import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble;
+import gtPlusPlus.core.item.general.ItemCloakingDevice;
+import gtPlusPlus.core.item.general.ItemHealingDevice;
+import gtPlusPlus.core.item.general.ItemSlowBuildingRing;
+import gtPlusPlus.core.lib.LoadedMods;
+
public class COMPAT_Baubles {
public static void run() {
@@ -50,18 +51,28 @@ public class COMPAT_Baubles {
t.printStackTrace();
}
- ModItems.itemAmuletMonsterKiller_Zombie =
- new MonsterKillerBaseBauble(new Class[] {EntityZombie.class}, "Zombie", 3);
- ModItems.itemAmuletMonsterKiller_Skeleton =
- new MonsterKillerBaseBauble(new Class[] {EntitySkeleton.class}, "Skeleton", 3);
- ModItems.itemAmuletMonsterKiller_Spider =
- new MonsterKillerBaseBauble(new Class[] {EntitySpider.class}, "Spider", 3);
- ModItems.itemAmuletMonsterKiller_Creeper =
- new MonsterKillerBaseBauble(new Class[] {EntityCreeper.class}, "Creeper", 4);
- ModItems.itemAmuletMonsterKiller_Enderman =
- new MonsterKillerBaseBauble(new Class[] {EntityEnderman.class}, "Enderman", 4);
+ ModItems.itemAmuletMonsterKiller_Zombie = new MonsterKillerBaseBauble(
+ new Class[] { EntityZombie.class },
+ "Zombie",
+ 3);
+ ModItems.itemAmuletMonsterKiller_Skeleton = new MonsterKillerBaseBauble(
+ new Class[] { EntitySkeleton.class },
+ "Skeleton",
+ 3);
+ ModItems.itemAmuletMonsterKiller_Spider = new MonsterKillerBaseBauble(
+ new Class[] { EntitySpider.class },
+ "Spider",
+ 3);
+ ModItems.itemAmuletMonsterKiller_Creeper = new MonsterKillerBaseBauble(
+ new Class[] { EntityCreeper.class },
+ "Creeper",
+ 4);
+ ModItems.itemAmuletMonsterKiller_Enderman = new MonsterKillerBaseBauble(
+ new Class[] { EntityEnderman.class },
+ "Enderman",
+ 4);
ModItems.itemAmuletMonsterKiller_Nether = new MonsterKillerBaseBauble(
- new Class[] {EntityPigZombie.class, EntityGhast.class, EntityMagmaCube.class, EntityBlaze.class},
+ new Class[] { EntityPigZombie.class, EntityGhast.class, EntityMagmaCube.class, EntityBlaze.class },
"Hellish",
6);
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
index fcaf76e81c..c2bbacd5d8 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.common.compat;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.item.ModItems;
-import net.minecraft.item.ItemStack;
public class COMPAT_BigReactors {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
index 3f097eed4a..159cfe2b78 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
@@ -2,9 +2,10 @@ package gtPlusPlus.core.common.compat;
import static gtPlusPlus.core.handler.COMPAT_HANDLER.*;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.recipe.ShapedRecipeObject;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
public class COMPAT_CompactWindmills {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
index 31c2943f24..041aa1fd18 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
@@ -1,9 +1,10 @@
package gtPlusPlus.core.common.compat;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
public class COMPAT_EnderIO {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
index 70c342453c..e17bccb60a 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
@@ -1,10 +1,11 @@
package gtPlusPlus.core.common.compat;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.lib.CORE.ConfigSwitches;
import gtPlusPlus.core.recipe.RECIPES_Tools;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import net.minecraft.item.ItemStack;
public class COMPAT_ExtraUtils {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index 1169473d85..666c0177ee 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -2,11 +2,12 @@ package gtPlusPlus.core.common.compat;
import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.lib.CORE.ConfigSwitches;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.ShapedRecipeObject;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
public class COMPAT_IC2 {
@@ -38,8 +39,10 @@ public class COMPAT_IC2 {
public static void OreDict() {
// Get ItemStacks for results
- /*itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1);
- itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1); */
+ /*
+ * itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1); itemSolarHelmet =
+ * UtilsItems.getItemStack("IC2:itemSolarHelmet", 1);
+ */
run();
}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
index 3e9c6da4ec..8e665b366e 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
@@ -20,10 +20,16 @@ public class COMPAT_MorePlanets {
ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotFronisium", "Fronisium Ingot", 1);
ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "ingotSulfur", "Sulfur Ingot", 3);
ItemUtils.getItemForOreDict(
- "MorePlanet:koentus_item", "ingotKoentusMeteoricIron", "Koentus Meteoric Iron Ingot", 4);
+ "MorePlanet:koentus_item",
+ "ingotKoentusMeteoricIron",
+ "Koentus Meteoric Iron Ingot",
+ 4);
ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMetallic", "Metallic Ingot", 2);
ItemUtils.getItemForOreDict(
- "MorePlanet:polongnius_item", "ingotPolongiusMeteoricIron", "Polongius Meteoric Iron Ingot", 4);
+ "MorePlanet:polongnius_item",
+ "ingotPolongiusMeteoricIron",
+ "Polongius Meteoric Iron Ingot",
+ 4);
ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMeteoricSteel", "Meteoric Steel Ingot", 3);
ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "dustSulfur", "Sulfur Dust", 2);
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java
index cade4c4418..94b3d27c7e 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java
@@ -1,10 +1,11 @@
package gtPlusPlus.core.common.compat;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class COMPAT_OpenBlocks {
public static void OreDict() {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java
index 762ffe79a1..286de43fcb 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java
@@ -6,6 +6,7 @@ import gtPlusPlus.core.common.BasePlayer;
public class COMPAT_PlayerAPI {
public static class commonProxy {
+
public static void initPre() {}
public static void Init() {}
@@ -14,6 +15,7 @@ public class COMPAT_PlayerAPI {
}
public static class clientProxy {
+
public static void initPre() {
// Utils.registerEvent(SneakManager.instance);
}
@@ -26,6 +28,7 @@ public class COMPAT_PlayerAPI {
}
public static class serverProxy {
+
public static void initPre() {}
public static void Init() {}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
index 5b29345b9d..51ea1a3587 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.common.compat;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.item.ModItems;
-import net.minecraft.item.ItemStack;
public class COMPAT_PneumaticCraft {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
index 05e32b21fd..b05e42ba45 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.common.compat;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.item.ModItems;
-import net.minecraft.item.ItemStack;
public class COMPAT_RFTools {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
index c93d522c40..0e745ba0b0 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.common.compat;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.item.ModItems;
-import net.minecraft.item.ItemStack;
public class COMPAT_SimplyJetpacks {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
index 75e7707a01..73dad8602f 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
@@ -19,11 +19,11 @@ public class COMPAT_Thaumcraft {
for (int i = 0; i <= 6; i++) {
// Utils.LOG_INFO(""+i);
ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i);
- GT_OreDictUnificator.registerOre(
- "shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
+ GT_OreDictUnificator
+ .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard " + i, i);
- GT_OreDictUnificator.registerOre(
- "gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
+ GT_OreDictUnificator
+ .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
// System.out.println("TC Shard registration count is: "+i);
}
@@ -31,19 +31,21 @@ public class COMPAT_Thaumcraft {
for (int i = 0; i <= 6; i++) {
// Utils.LOG_INFO(""+i);
ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard " + i, i);
- GT_OreDictUnificator.registerOre(
- "shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1));
+ GT_OreDictUnificator
+ .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1));
ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard " + i, i);
GT_OreDictUnificator.registerOre(
- "gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1));
+ "gemInfusedAnything",
+ ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1));
// System.out.println("TC Shard registration count is: "+i);
}
ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0);
- GT_OreDictUnificator.registerOre(
- "shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1));
+ GT_OreDictUnificator
+ .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1));
ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0);
GT_OreDictUnificator.registerOre(
- "gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1));
+ "gemInfusedAnything",
+ ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1));
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java
index 9af582e0de..e0470fe02a 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java
@@ -2,9 +2,10 @@ package gtPlusPlus.core.common.compat;
import static gtPlusPlus.core.lib.LoadedMods.Witchery;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
public class COMPAT_Witchery {
@@ -14,12 +15,12 @@ public class COMPAT_Witchery {
private static final void run() {
// Koboldite
- ItemStack aKobolditeDust =
- ItemUtils.getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Dust", 148, 1);
- ItemStack aKobolditeNugget =
- ItemUtils.getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Nugget", 149, 1);
- ItemStack aKobolditeIngot =
- ItemUtils.getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Ingot", 150, 1);
+ ItemStack aKobolditeDust = ItemUtils
+ .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Dust", 148, 1);
+ ItemStack aKobolditeNugget = ItemUtils
+ .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Nugget", 149, 1);
+ ItemStack aKobolditeIngot = ItemUtils
+ .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Ingot", 150, 1);
if (aKobolditeDust != null) GT_OreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust);
if (aKobolditeNugget != null) GT_OreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget);
if (aKobolditeIngot != null) GT_OreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot);
diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
index 9158233bea..96ffaebbba 100644
--- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
@@ -5,31 +5,38 @@ import static gtPlusPlus.core.lib.CORE.*;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*;
import static gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import java.io.File;
+
import net.minecraftforge.common.config.Configuration;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+
public class ConfigHandler {
public static void handleConfigFile(final FMLPreInitializationEvent event) {
- final Configuration config =
- new Configuration(new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
+ final Configuration config = new Configuration(
+ new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
config.load();
// Debug
- /* DEBUG = config.getBoolean("debugMode", "debug", false,
- "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)");*/
- disableEnderIOIntegration =
- config.getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration.");
+ /*
+ * DEBUG = config.getBoolean("debugMode", "debug", false,
+ * "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)");
+ */
+ disableEnderIOIntegration = config
+ .getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration.");
disableEnderIOIngotTooltips = config.getBoolean(
"disableEnderIOIngotTooltips",
"debug",
false,
"Disables EnderIO Ingot Tooltips. These apparently may cause issues for a very small number of users.");
MACHINE_INFO = config.getBoolean(
- "enableMachineInfoLogging", "debug", false, "Makes many machines display lots of debug logging.");
- showHiddenNEIItems =
- config.getBoolean("showHiddenNEIItems", "debug", false, "Makes all items hidden from NEI display.");
+ "enableMachineInfoLogging",
+ "debug",
+ false,
+ "Makes many machines display lots of debug logging.");
+ showHiddenNEIItems = config
+ .getBoolean("showHiddenNEIItems", "debug", false, "Makes all items hidden from NEI display.");
dumpItemAndBlockData = config.getBoolean(
"dumpItemAndBlockData",
"debug",
@@ -52,8 +59,8 @@ public class ConfigHandler {
"machines",
false,
"Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks.");
- enableAlternativeDivisionSigilRecipe = config.getBoolean(
- "enableAlternativeDivisionSigilRecipe", "machines", false, "Utilizes Neutronium instead.");
+ enableAlternativeDivisionSigilRecipe = config
+ .getBoolean("enableAlternativeDivisionSigilRecipe", "machines", false, "Utilizes Neutronium instead.");
boilerSteamPerSecond = config.getInt(
"boilerSteamPerSecond",
"machines",
@@ -90,8 +97,8 @@ public class ConfigHandler {
"Adds Custom GT Shovels and Pickaxes which mine in a 3x3 style. One of each whill be generated for each Gregtech Material which has Dense Plates and Long Rods available.");
// GT-Fixes
- enableNitroFix =
- config.getBoolean("enableNitroFix", "gregtech", false, "Restores the old Nitro-Diesel recipes.");
+ enableNitroFix = config
+ .getBoolean("enableNitroFix", "gregtech", false, "Restores the old Nitro-Diesel recipes.");
enableSulfuricAcidFix = config.getBoolean(
"enableSulfuricAcidFix",
"gregtech",
@@ -133,17 +140,20 @@ public class ConfigHandler {
// Single machines
enableMachine_SolarGenerators = config.getBoolean(
- "enableSolarGenerators", "gregtech", false, "These may be overpowered, Consult a local electrician.");
- enableMachine_ComponentAssemblers =
- config.getBoolean("enableComponentAssemblers", "gregtech", true, "These construct machine components.");
- enableMachine_Safes =
- config.getBoolean("enableMachineSafes", "gregtech", true, "These protect your goodies/rare stuff.");
- enableMachine_Dehydrators =
- config.getBoolean("enableMachineDehydrators", "gregtech", true, "These dehydrate stuff.");
- enableMachine_SteamConverter = config.getBoolean(
- "enableMachineSteamConverter", "gregtech", true, "Converts IC2 steam -> Railcraft steam.");
- enableMachine_FluidTanks =
- config.getBoolean("enableMachineFluidTanks", "gregtech", true, "Portable fluid tanks.");
+ "enableSolarGenerators",
+ "gregtech",
+ false,
+ "These may be overpowered, Consult a local electrician.");
+ enableMachine_ComponentAssemblers = config
+ .getBoolean("enableComponentAssemblers", "gregtech", true, "These construct machine components.");
+ enableMachine_Safes = config
+ .getBoolean("enableMachineSafes", "gregtech", true, "These protect your goodies/rare stuff.");
+ enableMachine_Dehydrators = config
+ .getBoolean("enableMachineDehydrators", "gregtech", true, "These dehydrate stuff.");
+ enableMachine_SteamConverter = config
+ .getBoolean("enableMachineSteamConverter", "gregtech", true, "Converts IC2 steam -> Railcraft steam.");
+ enableMachine_FluidTanks = config
+ .getBoolean("enableMachineFluidTanks", "gregtech", true, "Portable fluid tanks.");
enableMachine_RocketEngines = config.getBoolean(
"enableMachineRocketEngines",
"gregtech",
@@ -160,11 +170,17 @@ public class ConfigHandler {
true,
"These allow boosting Block/TileEntity Tick times [OP].");
enableMachine_Tesseracts = config.getBoolean(
- "enableMachineTesseracts", "gregtech", true, "Tesseracts for wireless item/fluid movement.");
+ "enableMachineTesseracts",
+ "gregtech",
+ true,
+ "Tesseracts for wireless item/fluid movement.");
enableMachine_SimpleWasher = config.getBoolean(
- "enableMachineSimpleWasher", "gregtech", true, "Very basic automated cauldron for dust washing.");
- enableMachine_Pollution =
- config.getBoolean("enableMachinePollution", "gregtech", true, "Pollution Detector & Scrubbers.");
+ "enableMachineSimpleWasher",
+ "gregtech",
+ true,
+ "Very basic automated cauldron for dust washing.");
+ enableMachine_Pollution = config
+ .getBoolean("enableMachinePollution", "gregtech", true, "Pollution Detector & Scrubbers.");
enableMachine_RF_Convetor = config.getBoolean(
"enableMachineRFConvetor",
"gregtech",
@@ -177,8 +193,8 @@ public class ConfigHandler {
"gregtech",
true,
"Required to smelt most high tier materials from GT++. Also smelts everything else to molten metal.");
- enableMultiblock_IndustrialCentrifuge =
- config.getBoolean("enableMultiblockIndustrialCentrifuge", "gregtech", true, "Spin, Spin, Spiiiin.");
+ enableMultiblock_IndustrialCentrifuge = config
+ .getBoolean("enableMultiblockIndustrialCentrifuge", "gregtech", true, "Spin, Spin, Spiiiin.");
enableMultiblock_IndustrialCokeOven = config.getBoolean(
"enableMultiblockIndustrialCokeOven",
"gregtech",
@@ -195,35 +211,53 @@ public class ConfigHandler {
true,
"A hyper efficient maceration tower, nets more bonus outputs.");
enableMultiblock_IndustrialPlatePress = config.getBoolean(
- "enableMultiblockIndustrialPlatePress", "gregtech", true, "Industrial bendering machine thingo.");
+ "enableMultiblockIndustrialPlatePress",
+ "gregtech",
+ true,
+ "Industrial bendering machine thingo.");
enableMultiblock_IndustrialWireMill = config.getBoolean(
- "enableMultiblockIndustrialWireMill", "gregtech", true, "Produces fine wire and exotic cables.");
- enableMultiblock_IronBlastFurnace = config.getBoolean(
- "enableMultiblockIronBlastFurnace", "gregtech", true, "Skip the Bronze age, very slowly.");
- enableMultiblock_MatterFabricator =
- config.getBoolean("enableMultiblockMatterFabricator", "gregtech", true, "?FAB?RIC?ATE MA?TT?ER.");
+ "enableMultiblockIndustrialWireMill",
+ "gregtech",
+ true,
+ "Produces fine wire and exotic cables.");
+ enableMultiblock_IronBlastFurnace = config
+ .getBoolean("enableMultiblockIronBlastFurnace", "gregtech", true, "Skip the Bronze age, very slowly.");
+ enableMultiblock_MatterFabricator = config
+ .getBoolean("enableMultiblockMatterFabricator", "gregtech", true, "?FAB?RIC?ATE MA?TT?ER.");
enableMultiblock_MultiTank = config.getBoolean(
- "enableMultiblockMultiTank", "gregtech", true, "Tall tanks, each layer adds extra fluid storage.");
- enableMultiblock_PowerSubstation = config.getBoolean(
- "enableMultiblockPowerSubstation", "gregtech", true, "For managing large power grids.");
+ "enableMultiblockMultiTank",
+ "gregtech",
+ true,
+ "Tall tanks, each layer adds extra fluid storage.");
+ enableMultiblock_PowerSubstation = config
+ .getBoolean("enableMultiblockPowerSubstation", "gregtech", true, "For managing large power grids.");
enableMultiblock_LiquidFluorideThoriumReactor = config.getBoolean(
- "enableMultiblockLiquidFluorideThoriumReactor", "gregtech", true, "For supplying large power grids.");
+ "enableMultiblockLiquidFluorideThoriumReactor",
+ "gregtech",
+ true,
+ "For supplying large power grids.");
enableMultiblock_NuclearFuelRefinery = config.getBoolean(
"enableMultiblock_NuclearFuelRefinery",
"gregtech",
true,
"Refines molten chemicals into nuclear fuels.");
- enableMultiblock_IndustrialSifter =
- config.getBoolean("enableMultiblock_IndustrialSifter", "gregtech", true, "Large scale sifting.");
+ enableMultiblock_IndustrialSifter = config
+ .getBoolean("enableMultiblock_IndustrialSifter", "gregtech", true, "Large scale sifting.");
enableMultiblock_LargeAutoCrafter = config.getBoolean(
"enableMultiblock_LargeAutoCrafter",
"gregtech",
true,
"Can Assemble, Disassemble and Craft Project data from Data Sticks.");
enableMultiblock_IndustrialThermalCentrifuge = config.getBoolean(
- "enableMultiblock_IndustrialThermalCentrifuge", "gregtech", true, "Your warm spin for the ore thing.");
+ "enableMultiblock_IndustrialThermalCentrifuge",
+ "gregtech",
+ true,
+ "Your warm spin for the ore thing.");
enableMultiblock_IndustrialWashPlant = config.getBoolean(
- "enableMultiblock_IndustrialWashPlant", "gregtech", true, "Used to wash the dirt, riiiiight offff..");
+ "enableMultiblock_IndustrialWashPlant",
+ "gregtech",
+ true,
+ "Used to wash the dirt, riiiiight offff..");
enableMultiblock_ThermalBoiler = config.getBoolean(
"enableMachineThermalBoiler",
"gregtech",
@@ -235,7 +269,10 @@ public class ConfigHandler {
true,
"Very fast and efficient Cutting Machine.");
enableMultiblock_IndustrialFishingPort = config.getBoolean(
- "enableMultiblock_IndustrialFishingPort", "gregtech", true, "Fish the seas, except on land.");
+ "enableMultiblock_IndustrialFishingPort",
+ "gregtech",
+ true,
+ "Fish the seas, except on land.");
enableMultiblock_IndustrialExtrudingMachine = config.getBoolean(
"enableMultiblock_IndustrialExtrudingMachine",
"gregtech",
@@ -246,8 +283,8 @@ public class ConfigHandler {
"gregtech",
true,
"Can run recipes for 9 different types of machines.");
- enableMultiblock_Cyclotron =
- config.getBoolean("enableMultiblock_Cyclotron", "gregtech", true, "COMET - Scientific Cyclotron.");
+ enableMultiblock_Cyclotron = config
+ .getBoolean("enableMultiblock_Cyclotron", "gregtech", true, "COMET - Scientific Cyclotron.");
// Options
rfPerEU = config.getInt(
@@ -261,7 +298,10 @@ public class ConfigHandler {
// Features
enableCustomCapes = config.getBoolean("enableSupporterCape", "features", true, "Enables Custom GT++ Cape.");
disableZombieReinforcement = config.getBoolean(
- "disableZombieReinforcement", "features", false, "Disables Zombie Reinforcement on hard difficutly.");
+ "disableZombieReinforcement",
+ "features",
+ false,
+ "Disables Zombie Reinforcement on hard difficutly.");
enableWatchdogBGM = config.getInt(
"enableWatchdogBGM",
"features",
@@ -269,17 +309,17 @@ public class ConfigHandler {
0,
Short.MAX_VALUE,
"Set to a value greater than 0 to reduce the ticks taken to delay between BGM tracks. Acceptable Values are 1-32767, where 0 is disabled. Vanilla Uses 12,000 & 24,000. 200 is 10s.");
- hideUniversalCells = config.getBoolean(
- "hideUniversalCells", "features", true, "Hides every filled IC2 Universal Cell from NEI.");
+ hideUniversalCells = config
+ .getBoolean("hideUniversalCells", "features", true, "Hides every filled IC2 Universal Cell from NEI.");
// Biomes
EVERGLADES_ID = config.getInt("darkworld_ID", "worldgen", 227, 1, 254, "The ID of the Dark Dimension.");
- EVERGLADESBIOME_ID =
- config.getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension.");
+ EVERGLADESBIOME_ID = config
+ .getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension.");
// Blacklisted Accelerator TileEntities
- BlacklistedTileEntiyClassNames =
- new String[] {"com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry"};
+ BlacklistedTileEntiyClassNames = new String[] {
+ "com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry" };
BlacklistedTileEntiyClassNames = config.getStringList(
"BlacklistedTileEntiyClassNames",
"gregtech",
@@ -287,318 +327,358 @@ public class ConfigHandler {
"The Canonical Class-Names of TileEntities that should be ignored by the WorldAccelerator");
// Pollution
- pollutionPerSecondMultiPackager = config.get(
+ pollutionPerSecondMultiPackager = config
+ .get(
"pollution",
"pollutionPerSecondMultiPackager",
pollutionPerSecondMultiPackager,
"pollution rate in gibbl/s for the Amazon warehousing depot")
.getInt(pollutionPerSecondMultiPackager);
- pollutionPerSecondMultiIndustrialAlloySmelter = config.get(
+ pollutionPerSecondMultiIndustrialAlloySmelter = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialAlloySmelter",
pollutionPerSecondMultiIndustrialAlloySmelter,
"pollution rate in gibbl/s for the Alloy blast smelter")
.getInt(pollutionPerSecondMultiIndustrialAlloySmelter);
- pollutionPerSecondMultiIndustrialArcFurnace = config.get(
+ pollutionPerSecondMultiIndustrialArcFurnace = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialArcFurnace",
pollutionPerSecondMultiIndustrialArcFurnace,
"pollution rate in gibbl/s for the High current arc furnace")
.getInt(pollutionPerSecondMultiIndustrialArcFurnace);
- pollutionPerSecondMultiIndustrialCentrifuge = config.get(
+ pollutionPerSecondMultiIndustrialCentrifuge = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialCentrifuge",
pollutionPerSecondMultiIndustrialCentrifuge,
"pollution rate in gibbl/s for the Industrial centrifuge")
.getInt(pollutionPerSecondMultiIndustrialCentrifuge);
- pollutionPerSecondMultiIndustrialCokeOven = config.get(
+ pollutionPerSecondMultiIndustrialCokeOven = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialCokeOven",
pollutionPerSecondMultiIndustrialCokeOven,
"pollution rate in gibbl/s for the Industrial coke oven")
.getInt(pollutionPerSecondMultiIndustrialCokeOven);
- pollutionPerSecondMultiIndustrialCuttingMachine = config.get(
+ pollutionPerSecondMultiIndustrialCuttingMachine = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialCuttingMachine",
pollutionPerSecondMultiIndustrialCuttingMachine,
"pollution rate in gibbl/s for the Cutting factory")
.getInt(pollutionPerSecondMultiIndustrialCuttingMachine);
- pollutionPerSecondMultiIndustrialDehydrator = config.get(
+ pollutionPerSecondMultiIndustrialDehydrator = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialDehydrator",
pollutionPerSecondMultiIndustrialDehydrator,
"pollution rate in gibbl/s for the Utupu-Tanuri")
.getInt(pollutionPerSecondMultiIndustrialDehydrator);
- pollutionPerSecondMultiIndustrialElectrolyzer = config.get(
+ pollutionPerSecondMultiIndustrialElectrolyzer = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialElectrolyzer",
pollutionPerSecondMultiIndustrialElectrolyzer,
"pollution rate in gibbl/s for the Industrial electrolyzer")
.getInt(pollutionPerSecondMultiIndustrialElectrolyzer);
- pollutionPerSecondMultiIndustrialExtruder = config.get(
+ pollutionPerSecondMultiIndustrialExtruder = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialExtruder",
pollutionPerSecondMultiIndustrialExtruder,
"pollution rate in gibbl/s for the Industrial extrusion machine")
.getInt(pollutionPerSecondMultiIndustrialExtruder);
- pollutionPerSecondMultiIndustrialMacerator = config.get(
+ pollutionPerSecondMultiIndustrialMacerator = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialMacerator",
pollutionPerSecondMultiIndustrialMacerator,
"pollution rate in gibbl/s for the Maceration stack")
.getInt(pollutionPerSecondMultiIndustrialMacerator);
- pollutionPerSecondMultiIndustrialMixer = config.get(
+ pollutionPerSecondMultiIndustrialMixer = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialMixer",
pollutionPerSecondMultiIndustrialMixer,
"pollution rate in gibbl/s for the Industrial mixing machine")
.getInt(pollutionPerSecondMultiIndustrialMixer);
- pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal = config.get(
+ pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal",
pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal,
"pollution rate in gibbl/s for the Large processing factory in metal mode")
.getInt(pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal);
- pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid = config.get(
+ pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid",
pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid,
"pollution rate in gibbl/s for the Large processing factory in fluid mode")
.getInt(pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid);
- pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc = config.get(
+ pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc",
pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc,
"pollution rate in gibbl/s for the Large processing factory in misc mode")
.getInt(pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc);
- pollutionPerSecondMultiIndustrialPlatePress_ModeForming = config.get(
+ pollutionPerSecondMultiIndustrialPlatePress_ModeForming = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialPlatePress_ModeForming",
pollutionPerSecondMultiIndustrialPlatePress_ModeForming,
"pollution rate in gibbl/s for the Industrial material press in forming mode")
.getInt(pollutionPerSecondMultiIndustrialPlatePress_ModeForming);
- pollutionPerSecondMultiIndustrialPlatePress_ModeBending = config.get(
+ pollutionPerSecondMultiIndustrialPlatePress_ModeBending = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialPlatePress_ModeBending",
pollutionPerSecondMultiIndustrialPlatePress_ModeBending,
"pollution rate in gibbl/s for the Industrial material press in bending mode")
.getInt(pollutionPerSecondMultiIndustrialPlatePress_ModeBending);
- pollutionPerSecondMultiIndustrialForgeHammer = config.get(
+ pollutionPerSecondMultiIndustrialForgeHammer = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialForgeHammer",
pollutionPerSecondMultiIndustrialForgeHammer,
"pollution rate in gibbl/s for the Industrial Forge Hammer")
.getInt(pollutionPerSecondMultiIndustrialForgeHammer);
- pollutionPerSecondMultiIndustrialSifter = config.get(
+ pollutionPerSecondMultiIndustrialSifter = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialSifter",
pollutionPerSecondMultiIndustrialSifter,
"pollution rate in gibbl/s for the Large Sifter")
.getInt(pollutionPerSecondMultiIndustrialSifter);
- pollutionPerSecondMultiIndustrialThermalCentrifuge = config.get(
+ pollutionPerSecondMultiIndustrialThermalCentrifuge = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialThermalCentrifuge",
pollutionPerSecondMultiIndustrialThermalCentrifuge,
"pollution rate in gibbl/s for the Large thermal refinery")
.getInt(pollutionPerSecondMultiIndustrialThermalCentrifuge);
- pollutionPerSecondMultiIndustrialVacuumFreezer = config.get(
+ pollutionPerSecondMultiIndustrialVacuumFreezer = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialVacuumFreezer",
pollutionPerSecondMultiIndustrialVacuumFreezer,
"pollution rate in gibbl/s for the Cryogenic freezer")
.getInt(pollutionPerSecondMultiIndustrialVacuumFreezer);
- pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath = config.get(
+ pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath",
pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath,
"pollution rate in gibbl/s for the Ore washing plant in chemical bath mode")
.getInt(pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath);
- pollutionPerSecondMultiIndustrialWashPlant_ModeWasher = config.get(
+ pollutionPerSecondMultiIndustrialWashPlant_ModeWasher = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialWashPlant_ModeWasher",
pollutionPerSecondMultiIndustrialWashPlant_ModeWasher,
"pollution rate in gibbl/s for the Ore washing plant in ore washer mode")
.getInt(pollutionPerSecondMultiIndustrialWashPlant_ModeWasher);
- pollutionPerSecondMultiIndustrialWireMill = config.get(
+ pollutionPerSecondMultiIndustrialWireMill = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialWireMill",
pollutionPerSecondMultiIndustrialWireMill,
"pollution rate in gibbl/s for the Wire factory")
.getInt(pollutionPerSecondMultiIndustrialWireMill);
- pollutionPerSecondMultiIsaMill = config.get(
+ pollutionPerSecondMultiIsaMill = config
+ .get(
"pollution",
"pollutionPerSecondMultiIsaMill",
pollutionPerSecondMultiIsaMill,
"pollution rate in gibbl/s for the IsaMill grinding machine")
.getInt(pollutionPerSecondMultiIsaMill);
- pollutionPerSecondMultiAdvDistillationTower_ModeDistillery = config.get(
+ pollutionPerSecondMultiAdvDistillationTower_ModeDistillery = config
+ .get(
"pollution",
"pollutionPerSecondMultiAdvDistillationTower_ModeDistillery",
pollutionPerSecondMultiAdvDistillationTower_ModeDistillery,
"pollution rate in gibbl/s for the Dangote distillus in distillery mode")
.getInt(pollutionPerSecondMultiAdvDistillationTower_ModeDistillery);
- pollutionPerSecondMultiAdvDistillationTower_ModeDT = config.get(
+ pollutionPerSecondMultiAdvDistillationTower_ModeDT = config
+ .get(
"pollution",
"pollutionPerSecondMultiAdvDistillationTower_ModeDT",
pollutionPerSecondMultiAdvDistillationTower_ModeDT,
"pollution rate in gibbl/s for the Dangote distillus in distillation tower mode")
.getInt(pollutionPerSecondMultiAdvDistillationTower_ModeDT);
pollutionPerSecondMultiAdvEBF = config.get(
- "pollution",
- "pollutionPerSecondMultiAdvEBF",
- pollutionPerSecondMultiAdvEBF,
- "pollution rate in gibbl/s for the Volcanus")
- .getInt(pollutionPerSecondMultiAdvEBF);
+ "pollution",
+ "pollutionPerSecondMultiAdvEBF",
+ pollutionPerSecondMultiAdvEBF,
+ "pollution rate in gibbl/s for the Volcanus").getInt(pollutionPerSecondMultiAdvEBF);
pollutionPerSecondMultiAdvImplosion = config.get(
- "pollution",
- "pollutionPerSecondMultiAdvImplosion",
- pollutionPerSecondMultiAdvImplosion,
- "pollution rate in gibbl/s for the Density^2")
- .getInt(pollutionPerSecondMultiAdvImplosion);
+ "pollution",
+ "pollutionPerSecondMultiAdvImplosion",
+ pollutionPerSecondMultiAdvImplosion,
+ "pollution rate in gibbl/s for the Density^2").getInt(pollutionPerSecondMultiAdvImplosion);
pollutionPerSecondMultiABS = config.get(
- "pollution",
- "pollutionPerSecondMultiABS",
- pollutionPerSecondMultiABS,
- "pollution rate in gibbl/s for the Alloy blast furnace")
- .getInt(pollutionPerSecondMultiABS);
+ "pollution",
+ "pollutionPerSecondMultiABS",
+ pollutionPerSecondMultiABS,
+ "pollution rate in gibbl/s for the Alloy blast furnace").getInt(pollutionPerSecondMultiABS);
pollutionPerSecondMultiCyclotron = config.get(
- "pollution",
- "pollutionPerSecondMultiCyclotron",
- pollutionPerSecondMultiCyclotron,
- "pollution rate in gibbl/s for the Cyclotron")
- .getInt(pollutionPerSecondMultiCyclotron);
- pollutionPerSecondMultiIndustrialFishingPond = config.get(
+ "pollution",
+ "pollutionPerSecondMultiCyclotron",
+ pollutionPerSecondMultiCyclotron,
+ "pollution rate in gibbl/s for the Cyclotron").getInt(pollutionPerSecondMultiCyclotron);
+ pollutionPerSecondMultiIndustrialFishingPond = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialFishingPond",
pollutionPerSecondMultiIndustrialFishingPond,
"pollution rate in gibbl/s for the Zuhai - fishing port")
.getInt(pollutionPerSecondMultiIndustrialFishingPond);
// pollutionPerSecondMultiLargeRocketEngine;
- pollutionPerSecondMultiLargeSemiFluidGenerator = config.get(
+ pollutionPerSecondMultiLargeSemiFluidGenerator = config
+ .get(
"pollution",
"pollutionPerSecondMultiLargeSemiFluidGenerator",
pollutionPerSecondMultiLargeSemiFluidGenerator,
"pollution rate in gibbl/s for the Large semifluid burner")
.getInt(pollutionPerSecondMultiLargeSemiFluidGenerator);
- pollutionPerSecondMultiMassFabricator = config.get(
+ pollutionPerSecondMultiMassFabricator = config
+ .get(
"pollution",
"pollutionPerSecondMultiMassFabricator",
pollutionPerSecondMultiMassFabricator,
"pollution rate in gibbl/s for the Matter fabrication CPU")
.getInt(pollutionPerSecondMultiMassFabricator);
- pollutionPerSecondMultiRefinery = config.get(
+ pollutionPerSecondMultiRefinery = config
+ .get(
"pollution",
"pollutionPerSecondMultiRefinery",
pollutionPerSecondMultiRefinery,
"pollution rate in gibbl/s for the Reactor fuel processing plant")
.getInt(pollutionPerSecondMultiRefinery);
// pollutionPerSecondMultiGeneratorArray;
- pollutionPerSecondMultiIndustrialRockBreaker = config.get(
+ pollutionPerSecondMultiIndustrialRockBreaker = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialRockBreaker",
pollutionPerSecondMultiIndustrialRockBreaker,
"pollution rate in gibbl/s for the Industrial Rock Breaker")
.getInt(pollutionPerSecondMultiIndustrialRockBreaker);
- pollutionPerSecondMultiIndustrialChisel = config.get(
+ pollutionPerSecondMultiIndustrialChisel = config
+ .get(
"pollution",
"pollutionPerSecondMultiIndustrialChisel",
pollutionPerSecondMultiIndustrialChisel,
"pollution rate in gibbl/s for the Industrial Chisel")
.getInt(pollutionPerSecondMultiIndustrialChisel);
- pollutionPerSecondMultiTreeFarm = config.get(
+ pollutionPerSecondMultiTreeFarm = config
+ .get(
"pollution",
"pollutionPerSecondMultiTreeFarm",
pollutionPerSecondMultiTreeFarm,
"pollution rate in gibbl/s for the Tree growth simulator")
.getInt(pollutionPerSecondMultiTreeFarm);
- pollutionPerSecondMultiFrothFlotationCell = config.get(
+ pollutionPerSecondMultiFrothFlotationCell = config
+ .get(
"pollution",
"pollutionPerSecondMultiFrothFlotationCell",
pollutionPerSecondMultiFrothFlotationCell,
"pollution rate in gibbl/s for the Flotation cell regulator")
.getInt(pollutionPerSecondMultiFrothFlotationCell);
- pollutionPerSecondMultiAutoCrafter = config.get(
+ pollutionPerSecondMultiAutoCrafter = config
+ .get(
"pollution",
"pollutionPerSecondMultiAutoCrafter",
pollutionPerSecondMultiAutoCrafter,
"pollution rate in gibbl/s for the Large-Scale auto assembler v1.01")
.getInt(pollutionPerSecondMultiAutoCrafter);
- pollutionPerSecondMultiMolecularTransformer = config.get(
+ pollutionPerSecondMultiMolecularTransformer = config
+ .get(
"pollution",
"pollutionPerSecondMultiMolecularTransformer",
pollutionPerSecondMultiMolecularTransformer,
"pollution rate in gibbl/s for the Multiblock Molecular Transformer")
.getInt(pollutionPerSecondMultiMolecularTransformer);
- pollutionPerSecondMultiThermalBoiler = config.get(
+ pollutionPerSecondMultiThermalBoiler = config
+ .get(
"pollution",
"pollutionPerSecondMultiThermalBoiler",
pollutionPerSecondMultiThermalBoiler,
"pollution rate in gibbl/s for the Thermal boiler")
.getInt(pollutionPerSecondMultiThermalBoiler);
pollutionPerSecondMultiAlgaePond = config.get(
- "pollution",
- "pollutionPerSecondMultiAlgaePond",
- pollutionPerSecondMultiAlgaePond,
- "pollution rate in gibbl/s for the Algae farm")
- .getInt(pollutionPerSecondMultiAlgaePond);
- basePollutionPerSecondSemiFluidGenerator = config.get(
+ "pollution",
+ "pollutionPerSecondMultiAlgaePond",
+ pollutionPerSecondMultiAlgaePond,
+ "pollution rate in gibbl/s for the Algae farm").getInt(pollutionPerSecondMultiAlgaePond);
+ basePollutionPerSecondSemiFluidGenerator = config
+ .get(
"pollution",
"basePollutionPerSecondSemiFluidGenerator",
basePollutionPerSecondSemiFluidGenerator,
"base pollution rate in gibbl/s for the single block semi fluid generators")
.getInt(basePollutionPerSecondSemiFluidGenerator);
pollutionReleasedByTierSemiFluidGenerator = config.get(
- "pollution",
- "pollutionReleasedByTierSemiFluidGenerator",
- pollutionReleasedByTierSemiFluidGenerator,
- "coefficient applied to the base rate of the single block semi fluid generators based on its tier (first is tier 0 aka ULV)")
+ "pollution",
+ "pollutionReleasedByTierSemiFluidGenerator",
+ pollutionReleasedByTierSemiFluidGenerator,
+ "coefficient applied to the base rate of the single block semi fluid generators based on its tier (first is tier 0 aka ULV)")
.getDoubleList();
- basePollutionPerSecondBoiler = config.get(
+ basePollutionPerSecondBoiler = config
+ .get(
"pollution",
"basePollutionPerSecondBoiler",
basePollutionPerSecondBoiler,
"base pollution rate in gibbl/s for the single block boilers")
.getInt(basePollutionPerSecondBoiler);
pollutionReleasedByTierBoiler = config.get(
- "pollution",
- "pollutionReleasedByTierBoiler",
- pollutionReleasedByTierBoiler,
- "coefficient applied to the base rate of the single block semi fluid generators based on its tier (first is tier 0 aka ULV)")
+ "pollution",
+ "pollutionReleasedByTierBoiler",
+ pollutionReleasedByTierBoiler,
+ "coefficient applied to the base rate of the single block semi fluid generators based on its tier (first is tier 0 aka ULV)")
.getDoubleList();
- baseMinPollutionPerSecondRocketFuelGenerator = config.get(
+ baseMinPollutionPerSecondRocketFuelGenerator = config
+ .get(
"pollution",
"baseMinPollutionPerSecondRocketFuelGenerator",
baseMinPollutionPerSecondRocketFuelGenerator,
"minimum base pollution rate in gibbl/s for the single block rocket engines")
.getInt(baseMinPollutionPerSecondRocketFuelGenerator);
- baseMaxPollutionPerSecondRocketFuelGenerator = config.get(
+ baseMaxPollutionPerSecondRocketFuelGenerator = config
+ .get(
"pollution",
"baseMaxPollutionPerSecondRocketFuelGenerator",
baseMaxPollutionPerSecondRocketFuelGenerator,
"maximum base pollution rate in gibbl/s for the single block rocket engines")
.getInt(baseMaxPollutionPerSecondRocketFuelGenerator);
pollutionReleasedByTierRocketFuelGenerator = config.get(
- "pollution",
- "pollutionReleasedByTierRocketFuelGenerator",
- pollutionReleasedByTierRocketFuelGenerator,
- "coefficient applied to the base rate of the single block rocket engines based on its tier (first is tier 0 aka ULV)")
+ "pollution",
+ "pollutionReleasedByTierRocketFuelGenerator",
+ pollutionReleasedByTierRocketFuelGenerator,
+ "coefficient applied to the base rate of the single block rocket engines based on its tier (first is tier 0 aka ULV)")
.getDoubleList();
- basePollutionPerSecondGeothermalGenerator = config.get(
+ basePollutionPerSecondGeothermalGenerator = config
+ .get(
"pollution",
"basePollutionPerSecondGeothermalGenerator",
basePollutionPerSecondGeothermalGenerator,
"base pollution rate in gibbl/s for the geothermal engines")
.getInt(basePollutionPerSecondGeothermalGenerator);
pollutionReleasedByTierGeothermalGenerator = config.get(
- "pollution",
- "pollutionReleasedByTierGeothermalGenerator",
- pollutionReleasedByTierGeothermalGenerator,
- "coefficient applied to the base rate of the single block geothermal engines based on its tier (first is tier 0 aka ULV)")
+ "pollution",
+ "pollutionReleasedByTierGeothermalGenerator",
+ pollutionReleasedByTierGeothermalGenerator,
+ "coefficient applied to the base rate of the single block geothermal engines based on its tier (first is tier 0 aka ULV)")
.getDoubleList();
// Visual
enableAnimatedTextures = config.getBoolean(
- "enableAnimatedTextures", "visual", true, "Enables Animated GT++ Textures, Requires Restart");
+ "enableAnimatedTextures",
+ "visual",
+ true,
+ "Enables Animated GT++ Textures, Requires Restart");
config.save();
}
}
diff --git a/src/main/java/gtPlusPlus/core/container/Container_BackpackBase.java b/src/main/java/gtPlusPlus/core/container/Container_BackpackBase.java
index e3ed090b0c..5016a93280 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_BackpackBase.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_BackpackBase.java
@@ -1,34 +1,33 @@
package gtPlusPlus.core.container;
-import gtPlusPlus.core.inventories.BaseInventoryBackpack;
-import gtPlusPlus.core.slots.SlotItemBackpackInv;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.inventories.BaseInventoryBackpack;
+import gtPlusPlus.core.slots.SlotItemBackpackInv;
+
public class Container_BackpackBase extends Container {
+
/** The Item Inventory for this Container, only needed if you want to reference isUseableByPlayer */
public final BaseInventoryBackpack inventory;
- /** Using these will make transferStackInSlot easier to understand and implement
- * INV_START is the index of the first slot in the Player's Inventory, so our
- * BaseInventoryBackpack's number of slots (e.g. 5 slots is array indices 0-4, so start at 5)
- * Notice how we don't have to remember how many slots we made? We can just use
- * BaseInventoryBackpack.INV_SIZE and if we ever change it, the Container updates automatically. */
- private static final int INV_START = BaseInventoryBackpack.INV_SIZE,
- INV_END = INV_START + 26,
- HOTBAR_START = INV_END + 1,
- HOTBAR_END = HOTBAR_START + 8;
+ /**
+ * Using these will make transferStackInSlot easier to understand and implement INV_START is the index of the first
+ * slot in the Player's Inventory, so our BaseInventoryBackpack's number of slots (e.g. 5 slots is array indices
+ * 0-4, so start at 5) Notice how we don't have to remember how many slots we made? We can just use
+ * BaseInventoryBackpack.INV_SIZE and if we ever change it, the Container updates automatically.
+ */
+ private static final int INV_START = BaseInventoryBackpack.INV_SIZE, INV_END = INV_START + 26,
+ HOTBAR_START = INV_END + 1, HOTBAR_END = HOTBAR_START + 8;
// If you're planning to add armor slots, put those first like this:
// ARMOR_START = BaseInventoryBackpack.INV_SIZE, ARMOR_END = ARMOR_START+3,
// INV_START = ARMOR_END+1, and then carry on like above.
- public Container_BackpackBase(
- final EntityPlayer par1Player,
- final InventoryPlayer inventoryPlayer,
+ public Container_BackpackBase(final EntityPlayer par1Player, final InventoryPlayer inventoryPlayer,
final BaseInventoryBackpack inventoryItem) {
this.inventory = inventoryItem;
@@ -50,11 +49,9 @@ public class Container_BackpackBase extends Container {
// If you want, you can add ARMOR SLOTS here as well, but you need to
// make a public version of SlotArmor. I won't be doing that in this tutorial.
/*
- for (i = 0; i < 4; ++i)
- {
- // These are the standard positions for survival inventory layout
- this.addSlotToContainer(new SlotArmor(this.player, inventoryPlayer, inventoryPlayer.getSizeInventory() - 1 - i, 8, 8 + i * 18, i));
- }
+ * for (i = 0; i < 4; ++i) { // These are the standard positions for survival inventory layout
+ * this.addSlotToContainer(new SlotArmor(this.player, inventoryPlayer, inventoryPlayer.getSizeInventory() - 1 -
+ * i, 8, 8 + i * 18, i)); }
*/
// PLAYER INVENTORY - uses default locations for standard inventory texture file
@@ -101,35 +98,17 @@ public class Container_BackpackBase extends Container {
// Item is in inventory / hotbar, try to place in custom inventory or armor slots
else {
/*
- If your inventory only stores certain instances of Items,
- you can implement shift-clicking to your inventory like this:
-
- // Check that the item is the right type
- if (itemstack1.getItem() instanceof ItemCustom)
- {
- // Try to merge into your custom inventory slots
- // We use 'BaseInventoryBackpack.INV_SIZE' instead of INV_START just in case
- // you also add armor or other custom slots
- if (!this.mergeItemStack(itemstack1, 0, BaseInventoryBackpack.INV_SIZE, false))
- {
- return null;
- }
- }
- // If you added armor slots, check them here as well:
- // Item being shift-clicked is armor - try to put in armor slot
- if (itemstack1.getItem() instanceof ItemArmor)
- {
- int type = ((ItemArmor) itemstack1.getItem()).armorType;
- if (!this.mergeItemStack(itemstack1, ARMOR_START + type, ARMOR_START + type + 1, false))
- {
- return null;
- }
- }
- Otherwise, you have basically 2 choices:
- 1. shift-clicking between player inventory and custom inventory
- 2. shift-clicking between action bar and inventory
-
- Be sure to choose only ONE of the following implementations!!!
+ * If your inventory only stores certain instances of Items, you can implement shift-clicking to your
+ * inventory like this: // Check that the item is the right type if (itemstack1.getItem() instanceof
+ * ItemCustom) { // Try to merge into your custom inventory slots // We use
+ * 'BaseInventoryBackpack.INV_SIZE' instead of INV_START just in case // you also add armor or other
+ * custom slots if (!this.mergeItemStack(itemstack1, 0, BaseInventoryBackpack.INV_SIZE, false)) { return
+ * null; } } // If you added armor slots, check them here as well: // Item being shift-clicked is armor
+ * - try to put in armor slot if (itemstack1.getItem() instanceof ItemArmor) { int type = ((ItemArmor)
+ * itemstack1.getItem()).armorType; if (!this.mergeItemStack(itemstack1, ARMOR_START + type, ARMOR_START
+ * + type + 1, false)) { return null; } } Otherwise, you have basically 2 choices: 1. shift-clicking
+ * between player inventory and custom inventory 2. shift-clicking between action bar and inventory Be
+ * sure to choose only ONE of the following implementations!!!
*/
/**
* Implementation number 1: Shift-click into your custom inventory
@@ -176,9 +155,8 @@ public class Container_BackpackBase extends Container {
}
/**
- * You should override this method to prevent the player from moving the stack that
- * opened the inventory, otherwise if the player moves it, the inventory will not
- * be able to save properly
+ * You should override this method to prevent the player from moving the stack that opened the inventory, otherwise
+ * if the player moves it, the inventory will not be able to save properly
*/
@Override
public ItemStack slotClick(final int slot, final int button, final int flag, final EntityPlayer player) {
diff --git a/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java
index 73f7eefe8d..5eebcf5654 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java
@@ -1,11 +1,5 @@
package gtPlusPlus.core.container;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.InventoryCircuitProgrammer;
-import gtPlusPlus.core.slots.SlotIntegratedCircuit;
-import gtPlusPlus.core.slots.SlotNoInput;
-import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -13,6 +7,13 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.InventoryCircuitProgrammer;
+import gtPlusPlus.core.slots.SlotIntegratedCircuit;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
+
public class Container_CircuitProgrammer extends Container {
protected TileEntityCircuitProgrammer tile_entity;
@@ -46,12 +47,10 @@ public class Container_CircuitProgrammer extends Container {
int o = 0;
// Storage Side
- /*for (var6 = 0; var6 < 3; var6++) {
- for (var7 = 0; var7 < 5; var7++) {
- this.addSlotToContainer(new SlotIntegratedCircuit(o, this.inventoryChest, o, 44 + (var7 * 18), 15 + (var6 * 18)));
- o++;
- }
- }*/
+ /*
+ * for (var6 = 0; var6 < 3; var6++) { for (var7 = 0; var7 < 5; var7++) { this.addSlotToContainer(new
+ * SlotIntegratedCircuit(o, this.inventoryChest, o, 44 + (var7 * 18), 15 + (var6 * 18))); o++; } }
+ */
int xStart = 8;
int yStart = 5;
@@ -106,13 +105,12 @@ public class Container_CircuitProgrammer extends Container {
}
Logger.INFO("4");
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
@Override
- public ItemStack slotClick(
- final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
if (!aPlayer.worldObj.isRemote) {
if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
@@ -146,18 +144,12 @@ public class Container_CircuitProgrammer extends Container {
var3 = var5.copy();
/*
- * if (par2 == 0) { if (!this.mergeItemStack(var5,
- * InOutputSlotNumber, FullSlotNumber, true)) { return null; }
- *
- * var4.onSlotChange(var5, var3); } else if (par2 >=
- * InOutputSlotNumber && par2 < InventoryOutSlotNumber) { if
- * (!this.mergeItemStack(var5, InventoryOutSlotNumber,
- * FullSlotNumber, false)) { return null; } } else if (par2 >=
- * InventoryOutSlotNumber && par2 < FullSlotNumber) { if
- * (!this.mergeItemStack(var5, InOutputSlotNumber,
- * InventoryOutSlotNumber, false)) { return null; } } else if
- * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber,
- * false)) { return null; }
+ * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+ * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+ * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+ * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
*/
if (var5.stackSize == 0) {
diff --git a/src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java b/src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java
index ac755d71aa..55227e6ab0 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java
@@ -1,8 +1,5 @@
package gtPlusPlus.core.container;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.Inventory_DecayablesChest;
-import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -10,6 +7,10 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.Inventory_DecayablesChest;
+import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
+
public class Container_DecayablesChest extends Container {
protected TileEntityDecayablesChest tile_entity;
@@ -64,8 +65,8 @@ public class Container_DecayablesChest extends Container {
}
@Override
- public ItemStack slotClick(
- final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
if (!aPlayer.worldObj.isRemote) {
if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
@@ -100,18 +101,12 @@ public class Container_DecayablesChest extends Container {
var3 = var5.copy();
/*
- * if (par2 == 0) { if (!this.mergeItemStack(var5,
- * InOutputSlotNumber, FullSlotNumber, true)) { return null; }
- *
- * var4.onSlotChange(var5, var3); } else if (par2 >=
- * InOutputSlotNumber && par2 < InventoryOutSlotNumber) { if
- * (!this.mergeItemStack(var5, InventoryOutSlotNumber,
- * FullSlotNumber, false)) { return null; } } else if (par2 >=
- * InventoryOutSlotNumber && par2 < FullSlotNumber) { if
- * (!this.mergeItemStack(var5, InOutputSlotNumber,
- * InventoryOutSlotNumber, false)) { return null; } } else if
- * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber,
- * false)) { return null; }
+ * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+ * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+ * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+ * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
*/
if (var5.stackSize == 0) {
diff --git a/src/main/java/gtPlusPlus/core/container/Container_EggBox.java b/src/main/java/gtPlusPlus/core/container/Container_EggBox.java
index 26815d2b7b..17a72135ec 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_EggBox.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_EggBox.java
@@ -1,8 +1,5 @@
package gtPlusPlus.core.container;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.Inventory_EggBox;
-import gtPlusPlus.core.tileentities.general.TileEntityEggBox;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -10,6 +7,10 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.Inventory_EggBox;
+import gtPlusPlus.core.tileentities.general.TileEntityEggBox;
+
public class Container_EggBox extends Container {
protected TileEntityEggBox tile_entity;
@@ -64,8 +65,8 @@ public class Container_EggBox extends Container {
}
@Override
- public ItemStack slotClick(
- final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
if (!aPlayer.worldObj.isRemote) {
if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
@@ -100,18 +101,12 @@ public class Container_EggBox extends Container {
var3 = var5.copy();
/*
- * if (par2 == 0) { if (!this.mergeItemStack(var5,
- * InOutputSlotNumber, FullSlotNumber, true)) { return null; }
- *
- * var4.onSlotChange(var5, var3); } else if (par2 >=
- * InOutputSlotNumber && par2 < InventoryOutSlotNumber) { if
- * (!this.mergeItemStack(var5, InventoryOutSlotNumber,
- * FullSlotNumber, false)) { return null; } } else if (par2 >=
- * InventoryOutSlotNumber && par2 < FullSlotNumber) { if
- * (!this.mergeItemStack(var5, InOutputSlotNumber,
- * InventoryOutSlotNumber, false)) { return null; } } else if
- * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber,
- * false)) { return null; }
+ * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+ * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+ * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+ * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
*/
if (var5.stackSize == 0) {
diff --git a/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java b/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java
index 44079d21e5..3dd73a1aaf 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.container;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.InventoryFishTrap;
-import gtPlusPlus.core.slots.SlotNoInput;
-import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -11,6 +7,11 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.InventoryFishTrap;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
+
public class Container_FishTrap extends Container {
protected TileEntityFishTrap tile_entity;
@@ -65,8 +66,8 @@ public class Container_FishTrap extends Container {
}
@Override
- public ItemStack slotClick(
- final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
if (!aPlayer.worldObj.isRemote) {
if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
@@ -101,18 +102,12 @@ public class Container_FishTrap extends Container {
var3 = var5.copy();
/*
- * if (par2 == 0) { if (!this.mergeItemStack(var5,
- * InOutputSlotNumber, FullSlotNumber, true)) { return null; }
- *
- * var4.onSlotChange(var5, var3); } else if (par2 >=
- * InOutputSlotNumber && par2 < InventoryOutSlotNumber) { if
- * (!this.mergeItemStack(var5, InventoryOutSlotNumber,
- * FullSlotNumber, false)) { return null; } } else if (par2 >=
- * InventoryOutSlotNumber && par2 < FullSlotNumber) { if
- * (!this.mergeItemStack(var5, InOutputSlotNumber,
- * InventoryOutSlotNumber, false)) { return null; } } else if
- * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber,
- * false)) { return null; }
+ * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+ * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+ * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+ * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
*/
if (var5.stackSize == 0) {
diff --git a/src/main/java/gtPlusPlus/core/container/Container_Grindle.java b/src/main/java/gtPlusPlus/core/container/Container_Grindle.java
index f0580abb24..f49d840819 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_Grindle.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_Grindle.java
@@ -1,36 +1,31 @@
package gtPlusPlus.core.container;
-import gtPlusPlus.core.inventories.BaseInventoryGrindle;
-import gtPlusPlus.core.slots.SlotDataStick;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.inventories.BaseInventoryGrindle;
+import gtPlusPlus.core.slots.SlotDataStick;
+
public class Container_Grindle extends Container {
+
/**
- * The Item Inventory for this Container, only needed if you want to reference
- * isUseableByPlayer
+ * The Item Inventory for this Container, only needed if you want to reference isUseableByPlayer
*/
public final BaseInventoryGrindle inventory;
/**
- * Using these will make transferStackInSlot easier to understand and implement
- * INV_START is the index of the first slot in the Player's Inventory, so our
- * BaseInventoryBackpack's number of slots (e.g. 5 slots is array indices 0-4,
- * so start at 5) Notice how we don't have to remember how many slots we made?
- * We can just use BaseInventoryBackpack.INV_SIZE and if we ever change it, the
- * Container updates automatically.
+ * Using these will make transferStackInSlot easier to understand and implement INV_START is the index of the first
+ * slot in the Player's Inventory, so our BaseInventoryBackpack's number of slots (e.g. 5 slots is array indices
+ * 0-4, so start at 5) Notice how we don't have to remember how many slots we made? We can just use
+ * BaseInventoryBackpack.INV_SIZE and if we ever change it, the Container updates automatically.
*/
- private static final int INV_START = BaseInventoryGrindle.INV_SIZE,
- INV_END = INV_START + 0,
- HOTBAR_START = INV_END,
+ private static final int INV_START = BaseInventoryGrindle.INV_SIZE, INV_END = INV_START + 0, HOTBAR_START = INV_END,
HOTBAR_END = HOTBAR_START + 8;
- public Container_Grindle(
- final EntityPlayer par1Player,
- final InventoryPlayer inventoryPlayer,
+ public Container_Grindle(final EntityPlayer par1Player, final InventoryPlayer inventoryPlayer,
final BaseInventoryGrindle inventoryItem) {
this.inventory = inventoryItem;
@@ -56,8 +51,7 @@ public class Container_Grindle extends Container {
}
/**
- * Called when a player shift-clicks on a slot. You must override this or you
- * will crash when someone does that.
+ * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that.
*/
@Override
public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int index) {
@@ -81,56 +75,35 @@ public class Container_Grindle extends Container {
// slots
else {
/*
-
- * If your inventory only stores certain instances of Items, you can implement
- * shift-clicking to your inventory like this:
- *
- * // Check that the item is the right type if (itemstack1.getItem() instanceof
+ * If your inventory only stores certain instances of Items, you can implement shift-clicking to your
+ * inventory like this: // Check that the item is the right type if (itemstack1.getItem() instanceof
* ItemCustom) { // Try to merge into your custom inventory slots // We use
- * 'BaseInventoryBackpack.INV_SIZE' instead of INV_START just in case // you
- * also add armor or other custom slots if (!this.mergeItemStack(itemstack1, 0,
- * BaseInventoryBackpack.INV_SIZE, false)) { return null; } } // If you added
- * armor slots, check them here as well: // Item being shift-clicked is armor -
- * try to put in armor slot if (itemstack1.getItem() instanceof ItemArmor) { int
- * type = ((ItemArmor) itemstack1.getItem()).armorType; if
- * (!this.mergeItemStack(itemstack1, ARMOR_START + type, ARMOR_START + type + 1,
- * false)) { return null; } } Otherwise, you have basically 2 choices: 1.
- * shift-clicking between player inventory and custom inventory 2.
- * shift-clicking between action bar and inventory
- *
- * Be sure to choose only ONE of the following implementations!!!
-
- */
+ * 'BaseInventoryBackpack.INV_SIZE' instead of INV_START just in case // you also add armor or other
+ * custom slots if (!this.mergeItemStack(itemstack1, 0, BaseInventoryBackpack.INV_SIZE, false)) { return
+ * null; } } // If you added armor slots, check them here as well: // Item being shift-clicked is armor
+ * - try to put in armor slot if (itemstack1.getItem() instanceof ItemArmor) { int type = ((ItemArmor)
+ * itemstack1.getItem()).armorType; if (!this.mergeItemStack(itemstack1, ARMOR_START + type, ARMOR_START
+ * + type + 1, false)) { return null; } } Otherwise, you have basically 2 choices: 1. shift-clicking
+ * between player inventory and custom inventory 2. shift-clicking between action bar and inventory Be
+ * sure to choose only ONE of the following implementations!!!
+ */
/**
* Implementation number 1: Shift-click into your custom inventory
*/
/*
- if (index >= INV_START) {
- // place in custom inventory
- if (!this.mergeItemStack(itemstack1, 0, INV_START, false)) {
- return null;
- }
- }
-
- */
+ * if (index >= INV_START) { // place in custom inventory if (!this.mergeItemStack(itemstack1, 0,
+ * INV_START, false)) { return null; } }
+ */
/**
* Implementation number 2: Shift-click items between action bar and inventory
*/
/*
- // item is in player's inventory, but not in action bar
- if ((index >= INV_START) && (index < HOTBAR_START)) {
- // place in action bar
- if (!this.mergeItemStack(itemstack1, HOTBAR_START, HOTBAR_END + 1, false)) {
- return null;
- }
- }
- // item in action bar - place in player inventory
- else if ((index >= HOTBAR_START) && (index < (HOTBAR_END + 1))) {
- if (!this.mergeItemStack(itemstack1, INV_START, INV_END + 1, false)) {
- return null;
- }
- }
- */ }
+ * // item is in player's inventory, but not in action bar if ((index >= INV_START) && (index <
+ * HOTBAR_START)) { // place in action bar if (!this.mergeItemStack(itemstack1, HOTBAR_START, HOTBAR_END
+ * + 1, false)) { return null; } } // item in action bar - place in player inventory else if ((index >=
+ * HOTBAR_START) && (index < (HOTBAR_END + 1))) { if (!this.mergeItemStack(itemstack1, INV_START,
+ * INV_END + 1, false)) { return null; } }
+ */ }
if (itemstack1.stackSize == 0) {
slot.putStack((ItemStack) null);
@@ -149,9 +122,8 @@ public class Container_Grindle extends Container {
}
/**
- * You should override this method to prevent the player from moving the stack
- * that opened the inventory, otherwise if the player moves it, the inventory
- * will not be able to save properly
+ * You should override this method to prevent the player from moving the stack that opened the inventory, otherwise
+ * if the player moves it, the inventory will not be able to save properly
*/
@Override
public ItemStack slotClick(final int slot, final int button, final int flag, final EntityPlayer player) {
diff --git a/src/main/java/gtPlusPlus/core/container/Container_HeliumGenerator.java b/src/main/java/gtPlusPlus/core/container/Container_HeliumGenerator.java
index 3bda62a403..1ab23ed315 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_HeliumGenerator.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_HeliumGenerator.java
@@ -1,11 +1,5 @@
package gtPlusPlus.core.container;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.InventoryHeliumGenerator;
-import gtPlusPlus.core.slots.SlotFuelRod;
-import gtPlusPlus.core.slots.SlotNoInput;
-import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -13,6 +7,13 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.InventoryHeliumGenerator;
+import gtPlusPlus.core.slots.SlotFuelRod;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator;
+
public class Container_HeliumGenerator extends Container {
protected TileEntityHeliumGenerator tile_entity;
@@ -84,8 +85,8 @@ public class Container_HeliumGenerator extends Container {
}
@Override
- public ItemStack slotClick(
- final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
if (!aPlayer.worldObj.isRemote) {
if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
@@ -118,33 +119,14 @@ public class Container_HeliumGenerator extends Container {
final ItemStack var5 = var4.getStack();
var3 = var5.copy();
- /*if (par2 == 0)
- {
- if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true))
- {
- return null;
- }
-
- var4.onSlotChange(var5, var3);
- }
- else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
- {
- if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false))
- {
- return null;
- }
- }
- else if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber)
- {
- if (!this.mergeItemStack(var5, InOutputSlotNumber, InventoryOutSlotNumber, false))
- {
- return null;
- }
- }
- else if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false))
- {
- return null;
- }*/
+ /*
+ * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+ * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+ * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+ * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
+ */
if (var5.stackSize == 0) {
var4.putStack((ItemStack) null);
diff --git a/src/main/java/gtPlusPlus/core/container/Container_ModularityTable.java b/src/main/java/gtPlusPlus/core/container/Container_ModularityTable.java
index 602de2447b..3a615675b5 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_ModularityTable.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_ModularityTable.java
@@ -1,5 +1,12 @@
package gtPlusPlus.core.container;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.inventories.modulartable.InventoryModularMain;
@@ -8,12 +15,6 @@ import gtPlusPlus.core.slots.SlotModularBauble;
import gtPlusPlus.core.slots.SlotModularBaubleUpgrades;
import gtPlusPlus.core.slots.SlotNoInput;
import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class Container_ModularityTable extends Container {
@@ -61,8 +62,12 @@ public class Container_ModularityTable extends Container {
for (var7 = 0; var7 < 3; ++var7) {
// Utils.LOG_WARNING("Adding slots at var:"+(var7 + var6 * 4)+" x:"+(8 + var7 * 18)+" y:"+(7 + var6 *
// 18));
- this.addSlotToContainer(new SlotModularBaubleUpgrades(
- this.inventoryGrid, nextFreeSlot, 8 + 18 + (var7 * 18), 17 + (var6 * 18)));
+ this.addSlotToContainer(
+ new SlotModularBaubleUpgrades(
+ this.inventoryGrid,
+ nextFreeSlot,
+ 8 + 18 + (var7 * 18),
+ 17 + (var6 * 18)));
this.slotGrid[o] = nextFreeSlot;
nextFreeSlot++;
o++;
@@ -88,10 +93,10 @@ public class Container_ModularityTable extends Container {
/**
* Callback for when the crafting matrix is changed.
*/
- /* public void onCraftMatrixChanged(IInventory p_75130_1_)
- {
- this.craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj));
- }*/
+ /*
+ * public void onCraftMatrixChanged(IInventory p_75130_1_) { this.craftResult.setInventorySlotContents(0,
+ * CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj)); }
+ */
/**
* Called when the container is closed.
@@ -100,12 +105,10 @@ public class Container_ModularityTable extends Container {
public void onContainerClosed(EntityPlayer p_75134_1_) {
super.onContainerClosed(p_75134_1_);
if (!this.worldObj.isRemote) {
- /* for (int i = 0; i < 9; ++i){
- ItemStack itemstack = this.craftMatrix.getStackInSlotOnClosing(i);
- if (itemstack != null){
- p_75134_1_.dropPlayerItemWithRandomChoice(itemstack, false);
- }
- }*/
+ /*
+ * for (int i = 0; i < 9; ++i){ ItemStack itemstack = this.craftMatrix.getStackInSlotOnClosing(i); if
+ * (itemstack != null){ p_75134_1_.dropPlayerItemWithRandomChoice(itemstack, false); } }
+ */
}
}
@@ -117,8 +120,8 @@ public class Container_ModularityTable extends Container {
}
@Override
- public ItemStack slotClick(
- final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
if (!aPlayer.worldObj.isRemote) {
if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
@@ -160,82 +163,31 @@ public class Container_ModularityTable extends Container {
return null;
- /*ItemStack var3 = null;
- final Slot var4 = (Slot)this.inventorySlots.get(par2);
-
- if ((var4 != null) && var4.getHasStack())
- {
- final ItemStack var5 = var4.getStack();
- var3 = var5.copy();
-
- if (par2 == 0)
- {
- if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true))
- {
- return null;
- }
-
- var4.onSlotChange(var5, var3);
- }
- else if ((par2 >= InOutputSlotNumber) && (par2 < InventoryOutSlotNumber))
- {
- if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false))
- {
- return null;
- }
- }
- else if ((par2 >= InventoryOutSlotNumber) && (par2 < FullSlotNumber))
- {
- if (!this.mergeItemStack(var5, InOutputSlotNumber, InventoryOutSlotNumber, false))
- {
- return null;
- }
- }
- else if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false))
- {
- return null;
- }
-
- if (var5.stackSize == 0)
- {
- var4.putStack((ItemStack)null);
- }
- else
- {
- var4.onSlotChanged();
- }
-
- if (var5.stackSize == var3.stackSize)
- {
- return null;
- }
-
- var4.onPickupFromSlot(par1EntityPlayer, var5);
- }
-
- return var3;*/
+ /*
+ * ItemStack var3 = null; final Slot var4 = (Slot)this.inventorySlots.get(par2); if ((var4 != null) &&
+ * var4.getHasStack()) { final ItemStack var5 = var4.getStack(); var3 = var5.copy(); if (par2 == 0) { if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null; }
+ * var4.onSlotChange(var5, var3); } else if ((par2 >= InOutputSlotNumber) && (par2 < InventoryOutSlotNumber)) {
+ * if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else if
+ * ((par2 >= InventoryOutSlotNumber) && (par2 < FullSlotNumber)) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, FullSlotNumber, false)) { return null; } if (var5.stackSize == 0) {
+ * var4.putStack((ItemStack)null); } else { var4.onSlotChanged(); } if (var5.stackSize == var3.stackSize) {
+ * return null; } var4.onPickupFromSlot(par1EntityPlayer, var5); } return var3;
+ */
}
// Can merge Slot
- /*public boolean func_94530_a(ItemStack p_94530_1_, Slot p_94530_2_){
- return p_94530_2_.inventory != this.craftResult && super.func_94530_a(p_94530_1_, p_94530_2_);
- }*/
-
- /*public ItemStack getOutputContent(){
- ItemStack output = this.craftResult.getStackInSlot(0);
- if (output != null){
- return output;
- }
- return null;
- }
+ /*
+ * public boolean func_94530_a(ItemStack p_94530_1_, Slot p_94530_2_){ return p_94530_2_.inventory !=
+ * this.craftResult && super.func_94530_a(p_94530_1_, p_94530_2_); }
+ */
- public ItemStack[] getInputComponents(){
- ItemStack inputs[] = new ItemStack[9];
- for (int r=0;r<this.craftMatrix.getSizeInventory();r++){
- ItemStack temp = this.craftMatrix.getStackInSlot(r);
- inputs[r] = temp;
- }
- return inputs;
- }*/
+ /*
+ * public ItemStack getOutputContent(){ ItemStack output = this.craftResult.getStackInSlot(0); if (output != null){
+ * return output; } return null; } public ItemStack[] getInputComponents(){ ItemStack inputs[] = new ItemStack[9];
+ * for (int r=0;r<this.craftMatrix.getSizeInventory();r++){ ItemStack temp = this.craftMatrix.getStackInSlot(r);
+ * inputs[r] = temp; } return inputs; }
+ */
}
diff --git a/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java b/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java
index d33d30f731..f3d4c361a1 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java
@@ -1,11 +1,5 @@
package gtPlusPlus.core.container;
-import gregtech.api.gui.GT_Slot_Render;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.InventoryPestKiller;
-import gtPlusPlus.core.slots.SlotGeneric;
-import gtPlusPlus.core.slots.SlotNoInput;
-import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -14,6 +8,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.gui.GT_Slot_Render;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.InventoryPestKiller;
+import gtPlusPlus.core.slots.SlotGeneric;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
+
public class Container_PestKiller extends Container {
public TileEntityPestKiller tile_entity;
@@ -76,8 +77,8 @@ public class Container_PestKiller extends Container {
}
@Override
- public ItemStack slotClick(
- final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
boolean fluid = false;
if (aSlotIndex == 2) {
fluid = true;
@@ -113,18 +114,12 @@ public class Container_PestKiller extends Container {
var3 = var5.copy();
/*
- * if (par2 == 0) { if (!this.mergeItemStack(var5,
- * InOutputSlotNumber, FullSlotNumber, true)) { return null; }
- *
- * var4.onSlotChange(var5, var3); } else if (par2 >=
- * InOutputSlotNumber && par2 < InventoryOutSlotNumber) { if
- * (!this.mergeItemStack(var5, InventoryOutSlotNumber,
- * FullSlotNumber, false)) { return null; } } else if (par2 >=
- * InventoryOutSlotNumber && par2 < FullSlotNumber) { if
- * (!this.mergeItemStack(var5, InOutputSlotNumber,
- * InventoryOutSlotNumber, false)) { return null; } } else if
- * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber,
- * false)) { return null; }
+ * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+ * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+ * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+ * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
*/
if (var5.stackSize == 0) {
diff --git a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java b/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java
index 63eeb3fcae..0401908ccf 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java
@@ -1,5 +1,12 @@
package gtPlusPlus.core.container;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.*;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.world.World;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.inventories.projecttable.InventoryProjectMain;
@@ -8,12 +15,6 @@ import gtPlusPlus.core.slots.SlotCraftingNoCollect;
import gtPlusPlus.core.slots.SlotDataStick;
import gtPlusPlus.core.slots.SlotNoInput;
import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.*;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.world.World;
public class Container_ProjectTable extends Container {
@@ -91,7 +92,8 @@ public class Container_ProjectTable extends Container {
@Override
public void onCraftMatrixChanged(IInventory p_75130_1_) {
this.craftResult.setInventorySlotContents(
- 0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj));
+ 0,
+ CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj));
}
/**
@@ -111,8 +113,8 @@ public class Container_ProjectTable extends Container {
}
@Override
- public ItemStack slotClick(
- final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
if (!aPlayer.worldObj.isRemote) {
if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
@@ -152,60 +154,18 @@ public class Container_ProjectTable extends Container {
return null;
- /*ItemStack var3 = null;
- final Slot var4 = (Slot)this.inventorySlots.get(par2);
-
- if ((var4 != null) && var4.getHasStack())
- {
- final ItemStack var5 = var4.getStack();
- var3 = var5.copy();
-
- if (par2 == 0)
- {
- if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true))
- {
- return null;
- }
-
- var4.onSlotChange(var5, var3);
- }
- else if ((par2 >= InOutputSlotNumber) && (par2 < InventoryOutSlotNumber))
- {
- if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false))
- {
- return null;
- }
- }
- else if ((par2 >= InventoryOutSlotNumber) && (par2 < FullSlotNumber))
- {
- if (!this.mergeItemStack(var5, InOutputSlotNumber, InventoryOutSlotNumber, false))
- {
- return null;
- }
- }
- else if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false))
- {
- return null;
- }
-
- if (var5.stackSize == 0)
- {
- var4.putStack((ItemStack)null);
- }
- else
- {
- var4.onSlotChanged();
- }
-
- if (var5.stackSize == var3.stackSize)
- {
- return null;
- }
-
- var4.onPickupFromSlot(par1EntityPlayer, var5);
- }
-
- return var3;*/
+ /*
+ * ItemStack var3 = null; final Slot var4 = (Slot)this.inventorySlots.get(par2); if ((var4 != null) &&
+ * var4.getHasStack()) { final ItemStack var5 = var4.getStack(); var3 = var5.copy(); if (par2 == 0) { if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null; }
+ * var4.onSlotChange(var5, var3); } else if ((par2 >= InOutputSlotNumber) && (par2 < InventoryOutSlotNumber)) {
+ * if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else if
+ * ((par2 >= InventoryOutSlotNumber) && (par2 < FullSlotNumber)) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, FullSlotNumber, false)) { return null; } if (var5.stackSize == 0) {
+ * var4.putStack((ItemStack)null); } else { var4.onSlotChanged(); } if (var5.stackSize == var3.stackSize) {
+ * return null; } var4.onPickupFromSlot(par1EntityPlayer, var5); } return var3;
+ */
}
// Can merge Slot
diff --git a/src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java b/src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java
index 3baaeac983..7befab8aeb 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java
@@ -1,13 +1,7 @@
package gtPlusPlus.core.container;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.Inventory_RoundRobinator;
-import gtPlusPlus.core.slots.SlotNoInput;
-import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
import java.util.Iterator;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -16,6 +10,14 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.Inventory_RoundRobinator;
+import gtPlusPlus.core.slots.SlotNoInput;
+import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
+
public class Container_RoundRobinator extends Container {
public TileEntityRoundRobinator tile_entity;
@@ -26,7 +28,7 @@ public class Container_RoundRobinator extends Container {
private final int posY;
private final int posZ;
- private final boolean[] mActiveData = new boolean[] {false, false, false, false};
+ private final boolean[] mActiveData = new boolean[] { false, false, false, false };
public static int mStorageSlotNumber = 4; // Number of slots in storage area
public static int mInventorySlotNumber = 36; // Inventory Slots (Inventory
@@ -80,8 +82,8 @@ public class Container_RoundRobinator extends Container {
}
@Override
- public ItemStack slotClick(
- final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
if (!aPlayer.worldObj.isRemote) {
if (aSlotIndex < 4) {
diff --git a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java b/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java
index d1b8d1ee6d..f9b4a43641 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java
@@ -1,14 +1,7 @@
package gtPlusPlus.core.container;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
-import gtPlusPlus.core.inventories.Inventory_SuperJukebox;
-import gtPlusPlus.core.slots.SlotJukebox;
-import gtPlusPlus.core.slots.SlotNoInput;
import java.util.Iterator;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -17,6 +10,15 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
+import gtPlusPlus.core.inventories.Inventory_SuperJukebox;
+import gtPlusPlus.core.slots.SlotJukebox;
+import gtPlusPlus.core.slots.SlotNoInput;
+
public class Container_SuperJukebox extends Container {
protected TileEntitySuperJukebox tile_entity;
@@ -52,12 +54,10 @@ public class Container_SuperJukebox extends Container {
int o = 0;
// Storage Side
- /*for (var6 = 0; var6 < 3; var6++) {
- for (var7 = 0; var7 < 5; var7++) {
- this.addSlotToContainer(new SlotIntegratedCircuit(o, this.inventoryChest, o, 44 + (var7 * 18), 15 + (var6 * 18)));
- o++;
- }
- }*/
+ /*
+ * for (var6 = 0; var6 < 3; var6++) { for (var7 = 0; var7 < 5; var7++) { this.addSlotToContainer(new
+ * SlotIntegratedCircuit(o, this.inventoryChest, o, 44 + (var7 * 18), 15 + (var6 * 18))); o++; } }
+ */
int xStart = 9;
int yStart = 20;
@@ -143,18 +143,12 @@ public class Container_SuperJukebox extends Container {
var3 = var5.copy();
/*
- * if (par2 == 0) { if (!this.mergeItemStack(var5,
- * InOutputSlotNumber, FullSlotNumber, true)) { return null; }
- *
- * var4.onSlotChange(var5, var3); } else if (par2 >=
- * InOutputSlotNumber && par2 < InventoryOutSlotNumber) { if
- * (!this.mergeItemStack(var5, InventoryOutSlotNumber,
- * FullSlotNumber, false)) { return null; } } else if (par2 >=
- * InventoryOutSlotNumber && par2 < FullSlotNumber) { if
- * (!this.mergeItemStack(var5, InOutputSlotNumber,
- * InventoryOutSlotNumber, false)) { return null; } } else if
- * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber,
- * false)) { return null; }
+ * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+ * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+ * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+ * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
*/
if (var5.stackSize == 0) {
diff --git a/src/main/java/gtPlusPlus/core/container/Container_TradeTable.java b/src/main/java/gtPlusPlus/core/container/Container_TradeTable.java
index 14515c25f3..ff19730c20 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_TradeTable.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_TradeTable.java
@@ -1,5 +1,12 @@
package gtPlusPlus.core.container;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.inventories.tradetable.InventoryTradeMain;
@@ -7,12 +14,6 @@ import gtPlusPlus.core.inventories.tradetable.InventoryTradeOutput;
import gtPlusPlus.core.slots.SlotGeneric;
import gtPlusPlus.core.slots.SlotNoInput;
import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class Container_TradeTable extends Container {
@@ -99,8 +100,8 @@ public class Container_TradeTable extends Container {
}
@Override
- public ItemStack slotClick(
- final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+ public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold,
+ final EntityPlayer aPlayer) {
if (!aPlayer.worldObj.isRemote) {
if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
@@ -140,60 +141,18 @@ public class Container_TradeTable extends Container {
return null;
- /*ItemStack var3 = null;
- final Slot var4 = (Slot)this.inventorySlots.get(par2);
-
- if ((var4 != null) && var4.getHasStack())
- {
- final ItemStack var5 = var4.getStack();
- var3 = var5.copy();
-
- if (par2 == 0)
- {
- if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true))
- {
- return null;
- }
-
- var4.onSlotChange(var5, var3);
- }
- else if ((par2 >= InOutputSlotNumber) && (par2 < InventoryOutSlotNumber))
- {
- if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false))
- {
- return null;
- }
- }
- else if ((par2 >= InventoryOutSlotNumber) && (par2 < FullSlotNumber))
- {
- if (!this.mergeItemStack(var5, InOutputSlotNumber, InventoryOutSlotNumber, false))
- {
- return null;
- }
- }
- else if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false))
- {
- return null;
- }
-
- if (var5.stackSize == 0)
- {
- var4.putStack((ItemStack)null);
- }
- else
- {
- var4.onSlotChanged();
- }
-
- if (var5.stackSize == var3.stackSize)
- {
- return null;
- }
-
- var4.onPickupFromSlot(par1EntityPlayer, var5);
- }
-
- return var3;*/
+ /*
+ * ItemStack var3 = null; final Slot var4 = (Slot)this.inventorySlots.get(par2); if ((var4 != null) &&
+ * var4.getHasStack()) { final ItemStack var5 = var4.getStack(); var3 = var5.copy(); if (par2 == 0) { if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null; }
+ * var4.onSlotChange(var5, var3); } else if ((par2 >= InOutputSlotNumber) && (par2 < InventoryOutSlotNumber)) {
+ * if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else if
+ * ((par2 >= InventoryOutSlotNumber) && (par2 < FullSlotNumber)) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, FullSlotNumber, false)) { return null; } if (var5.stackSize == 0) {
+ * var4.putStack((ItemStack)null); } else { var4.onSlotChanged(); } if (var5.stackSize == var3.stackSize) {
+ * return null; } var4.onPickupFromSlot(par1EntityPlayer, var5); } return var3;
+ */
}
public ItemStack getOutputContent() {
diff --git a/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java
index 740048f88d..5af33d3684 100644
--- a/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java
@@ -1,5 +1,15 @@
package gtPlusPlus.core.container;
+import java.util.Iterator;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.api.objects.Logger;
@@ -9,14 +19,6 @@ import gtPlusPlus.core.slots.SlotNoInput;
import gtPlusPlus.core.slots.SlotVolumetricFlask;
import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
import gtPlusPlus.core.util.Utils;
-import java.util.Iterator;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class Container_VolumetricFlaskSetter extends Container {
@@ -55,12 +57,10 @@ public class Container_VolumetricFlaskSetter extends Container {
int o = 0;
// Storage Side
- /*for (var6 = 0; var6 < 3; var6++) {
- for (var7 = 0; var7 < 5; var7++) {
- this.addSlotToContainer(new SlotIntegratedCircuit(o, this.inventoryChest, o, 44 + (var7 * 18), 15 + (var6 * 18)));
- o++;
- }
- }*/
+ /*
+ * for (var6 = 0; var6 < 3; var6++) { for (var7 = 0; var7 < 5; var7++) { this.addSlotToContainer(new
+ * SlotIntegratedCircuit(o, this.inventoryChest, o, 44 + (var7 * 18), 15 + (var6 * 18))); o++; } }
+ */
int xStart = 26;
int yStart = 12;
@@ -92,8 +92,7 @@ public class Container_VolumetricFlaskSetter extends Container {
this.addSlotToContainer(new Slot(inventory, var6, 8 + (var6 * 18), 142));
}
detectAndSendChanges();
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
@Override
@@ -114,18 +113,12 @@ public class Container_VolumetricFlaskSetter extends Container {
var3 = var5.copy();
/*
- * if (par2 == 0) { if (!this.mergeItemStack(var5,
- * InOutputSlotNumber, FullSlotNumber, true)) { return null; }
- *
- * var4.onSlotChange(var5, var3); } else if (par2 >=
- * InOutputSlotNumber && par2 < InventoryOutSlotNumber) { if
- * (!this.mergeItemStack(var5, InventoryOutSlotNumber,
- * FullSlotNumber, false)) { return null; } } else if (par2 >=
- * InventoryOutSlotNumber && par2 < FullSlotNumber) { if
- * (!this.mergeItemStack(var5, InOutputSlotNumber,
- * InventoryOutSlotNumber, false)) { return null; } } else if
- * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber,
- * false)) { return null; }
+ * if (par2 == 0) { if (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, true)) { return null;
+ * } var4.onSlotChange(var5, var3); } else if (par2 >= InOutputSlotNumber && par2 < InventoryOutSlotNumber)
+ * { if (!this.mergeItemStack(var5, InventoryOutSlotNumber, FullSlotNumber, false)) { return null; } } else
+ * if (par2 >= InventoryOutSlotNumber && par2 < FullSlotNumber) { if (!this.mergeItemStack(var5,
+ * InOutputSlotNumber, InventoryOutSlotNumber, false)) { return null; } } else if
+ * (!this.mergeItemStack(var5, InOutputSlotNumber, FullSlotNumber, false)) { return null; }
*/
if (var5.stackSize == 0) {
diff --git a/src/main/java/gtPlusPlus/core/container/box/LunchBoxContainer.java b/src/main/java/gtPlusPlus/core/container/box/LunchBoxContainer.java
index 51bc85a6ae..9bd740a5a2 100644
--- a/src/main/java/gtPlusPlus/core/container/box/LunchBoxContainer.java
+++ b/src/main/java/gtPlusPlus/core/container/box/LunchBoxContainer.java
@@ -1,14 +1,16 @@
package gtPlusPlus.core.container.box;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+
import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
import gtPlusPlus.core.slots.SlotLunchBox;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
public class LunchBoxContainer extends ContainerBoxBase {
- public LunchBoxContainer(
- EntityPlayer par1Player, InventoryPlayer inventoryPlayer, CustomBoxInventory CustomBoxInventory) {
+
+ public LunchBoxContainer(EntityPlayer par1Player, InventoryPlayer inventoryPlayer,
+ CustomBoxInventory CustomBoxInventory) {
super(
par1Player,
inventoryPlayer,
diff --git a/src/main/java/gtPlusPlus/core/container/box/MagicBagContainer.java b/src/main/java/gtPlusPlus/core/container/box/MagicBagContainer.java
index 294836ded4..3158631610 100644
--- a/src/main/java/gtPlusPlus/core/container/box/MagicBagContainer.java
+++ b/src/main/java/gtPlusPlus/core/container/box/MagicBagContainer.java
@@ -1,14 +1,16 @@
package gtPlusPlus.core.container.box;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+
import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
import gtPlusPlus.core.slots.SlotMagicToolBag;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
public class MagicBagContainer extends ContainerBoxBase {
- public MagicBagContainer(
- EntityPlayer par1Player, InventoryPlayer inventoryPlayer, CustomBoxInventory CustomBoxInventory) {
+
+ public MagicBagContainer(EntityPlayer par1Player, InventoryPlayer inventoryPlayer,
+ CustomBoxInventory CustomBoxInventory) {
super(
par1Player,
inventoryPlayer,
diff --git a/src/main/java/gtPlusPlus/core/container/box/ToolBoxContainer.java b/src/main/java/gtPlusPlus/core/container/box/ToolBoxContainer.java
index e2c8841266..6af27082fa 100644
--- a/src/main/java/gtPlusPlus/core/container/box/ToolBoxContainer.java
+++ b/src/main/java/gtPlusPlus/core/container/box/ToolBoxContainer.java
@@ -1,15 +1,17 @@
package gtPlusPlus.core.container.box;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+
import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
import gtPlusPlus.core.item.tool.misc.box.UniversalToolBox;
import gtPlusPlus.core.slots.SlotToolBox;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
public class ToolBoxContainer extends ContainerBoxBase {
- public ToolBoxContainer(
- EntityPlayer par1Player, InventoryPlayer inventoryPlayer, CustomBoxInventory CustomBoxInventory) {
+
+ public ToolBoxContainer(EntityPlayer par1Player, InventoryPlayer inventoryPlayer,
+ CustomBoxInventory CustomBoxInventory) {
super(par1Player, inventoryPlayer, CustomBoxInventory, SlotToolBox.class, UniversalToolBox.SLOTS);
}
}
diff --git a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java
index f0fb71112b..f5f6cd6cbf 100644
--- a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java
+++ b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.creative;
+import net.minecraft.creativetab.CreativeTabs;
+
import gregtech.api.util.GT_CreativeTab;
import gtPlusPlus.core.creative.tabs.*;
-import net.minecraft.creativetab.CreativeTabs;
public class AddToCreativeTab {
@@ -16,12 +17,12 @@ public class AddToCreativeTab {
public static void initialiseTabs() {
// GT_CreativeTab
- /*tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab");
- tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab");
- tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab");
- tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab");
- tabOther = new MiscUtilCreativeTabOther("MiscUtilOtherTab");
- tabBOP = new MiscUtilsBOPTab("MiscUtilBOP");*/
+ /*
+ * tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); tabMisc = new
+ * MiscUtilCreativeTabMisc("MiscUtilMiscTab"); tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab");
+ * tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); tabOther = new
+ * MiscUtilCreativeTabOther("MiscUtilOtherTab"); tabBOP = new MiscUtilsBOPTab("MiscUtilBOP");
+ */
tabBlock = new GT_CreativeTab("GTPP_BLOCKS", "GT++ Blocks");
tabMisc = new GT_CreativeTab("GTPP_MISC", "GT++ Misc");
diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
index 7cb10f1092..f7b2477398 100644
--- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
+++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.creative.tabs;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class MiscUtilCreativeTabBlock extends CreativeTabs {
public MiscUtilCreativeTabBlock(final String lable) {
diff --git a/src/main/java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java b/src/main/java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java
index 63d94fafee..ec189bf6ae 100644
--- a/src/main/java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java
+++ b/src/main/java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java
@@ -1,13 +1,15 @@
package gtPlusPlus.core.entity;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.world.explosions.ExplosionHandler;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.world.explosions.ExplosionHandler;
+
public class EntityPrimedMiningExplosive extends EntityTNTPrimed {
+
/** How long the fuse is */
private EntityLivingBase tntPlacedBy;
@@ -19,8 +21,8 @@ public class EntityPrimedMiningExplosive extends EntityTNTPrimed {
this.yOffset = this.height / 2.0F;
}
- public EntityPrimedMiningExplosive(
- final World world, final double x, final double y, final double z, final EntityLivingBase placingEntity) {
+ public EntityPrimedMiningExplosive(final World world, final double x, final double y, final double z,
+ final EntityLivingBase placingEntity) {
this(world);
this.setPosition(x, y, z);
final float f = (float) (Math.random() * Math.PI * 2.0D);
@@ -364,11 +366,17 @@ public class EntityPrimedMiningExplosive extends EntityTNTPrimed {
ExplosionHandler explode = new ExplosionHandler();
explode.createExplosion(this.worldObj, this, this.posX, this.posY, this.posZ, f, false, true);
- /*this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, f, true);
- this.worldObj.createExplosion(this, this.posX+MathUtils.randDouble(-10, 10), this.posY, this.posZ+MathUtils.randDouble(-10, 10), f+MathUtils.randFloat(-5F, 5F), true);
- this.worldObj.createExplosion(this, this.posX+MathUtils.randDouble(-10, 10), this.posY, this.posZ+MathUtils.randDouble(-10, 10), f+MathUtils.randFloat(-5F, 5F), true);
- this.worldObj.createExplosion(this, this.posX+MathUtils.randDouble(-10, 10), this.posY, this.posZ+MathUtils.randDouble(-10, 10), f+MathUtils.randFloat(-5F, 5F), true);
- this.worldObj.createExplosion(this, this.posX+MathUtils.randDouble(-10, 10), this.posY, this.posZ+MathUtils.randDouble(-10, 10), f+MathUtils.randFloat(-5F, 5F), true);*/
+ /*
+ * this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, f, true);
+ * this.worldObj.createExplosion(this, this.posX+MathUtils.randDouble(-10, 10), this.posY,
+ * this.posZ+MathUtils.randDouble(-10, 10), f+MathUtils.randFloat(-5F, 5F), true);
+ * this.worldObj.createExplosion(this, this.posX+MathUtils.randDouble(-10, 10), this.posY,
+ * this.posZ+MathUtils.randDouble(-10, 10), f+MathUtils.randFloat(-5F, 5F), true);
+ * this.worldObj.createExplosion(this, this.posX+MathUtils.randDouble(-10, 10), this.posY,
+ * this.posZ+MathUtils.randDouble(-10, 10), f+MathUtils.randFloat(-5F, 5F), true);
+ * this.worldObj.createExplosion(this, this.posX+MathUtils.randDouble(-10, 10), this.posY,
+ * this.posZ+MathUtils.randDouble(-10, 10), f+MathUtils.randFloat(-5F, 5F), true);
+ */
}
/**
diff --git a/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java b/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java
index ca4229bec3..d010624b8c 100644
--- a/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java
+++ b/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java
@@ -1,7 +1,5 @@
package gtPlusPlus.core.entity;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Items;
@@ -10,7 +8,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class EntityTeleportFX extends Entity {
+
/** 'x' location the eye should float towards. */
private double targetX;
/** 'y' location the eye should float towards. */
@@ -20,7 +22,6 @@ public class EntityTeleportFX extends Entity {
private int despawnTimer;
private boolean shatterOrDrop;
- private static final String __OBFID = "CL_00001716";
public EntityTeleportFX(final World p_i1757_1_) {
super(p_i1757_1_);
@@ -42,8 +43,8 @@ public class EntityTeleportFX extends Entity {
return p_70112_1_ < (d1 * d1);
}
- public EntityTeleportFX(
- final World p_i1758_1_, final double p_i1758_2_, final double p_i1758_4_, final double p_i1758_6_) {
+ public EntityTeleportFX(final World p_i1758_1_, final double p_i1758_2_, final double p_i1758_4_,
+ final double p_i1758_6_) {
super(p_i1758_1_);
this.despawnTimer = 0;
this.setSize(0.25F, 0.25F);
@@ -106,9 +107,8 @@ public class EntityTeleportFX extends Entity {
final float f = MathHelper.sqrt_double((this.motionX * this.motionX) + (this.motionZ * this.motionZ));
this.rotationYaw = (float) ((Math.atan2(this.motionX, this.motionZ) * 180.0D) / Math.PI);
- for (this.rotationPitch = (float) ((Math.atan2(this.motionY, f) * 180.0D) / Math.PI);
- (this.rotationPitch - this.prevRotationPitch) < -180.0F;
- this.prevRotationPitch -= 360.0F) {
+ for (this.rotationPitch = (float) ((Math.atan2(this.motionY, f) * 180.0D) / Math.PI); (this.rotationPitch
+ - this.prevRotationPitch) < -180.0F; this.prevRotationPitch -= 360.0F) {
;
}
@@ -181,8 +181,13 @@ public class EntityTeleportFX extends Entity {
this.setDead();
if (this.shatterOrDrop) {
- this.worldObj.spawnEntityInWorld(new EntityItem(
- this.worldObj, this.posX, this.posY, this.posZ, new ItemStack(Items.ender_eye)));
+ this.worldObj.spawnEntityInWorld(
+ new EntityItem(
+ this.worldObj,
+ this.posX,
+ this.posY,
+ this.posZ,
+ new ItemStack(Items.ender_eye)));
} else {
this.worldObj.playAuxSFX(
2003,
diff --git a/src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java b/src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java
index 7d471bff4a..15563ef508 100644
--- a/src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java
+++ b/src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java
@@ -1,12 +1,9 @@
package gtPlusPlus.core.entity;
-import gtPlusPlus.api.damage.DamageTeslaTower;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
import java.util.List;
import java.util.Random;
import java.util.UUID;
+
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.effect.EntityWeatherEffect;
@@ -17,12 +14,20 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World;
+import gtPlusPlus.api.damage.DamageTeslaTower;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.random.XSTR;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
public class EntityTeslaTowerLightning extends EntityWeatherEffect {
+
/** Declares which state the lightning bolt is in. Whether it's in the air, hit the ground, etc. */
private int lightningState;
/** A random long that is used to change the vertex of the lightning rendered in RenderLightningBolt */
public long boltVertex;
- /** Determines the time before the EntityLightningBolt is destroyed. It is a random integer decremented over time. */
+ /**
+ * Determines the time before the EntityLightningBolt is destroyed. It is a random integer decremented over time.
+ */
private int boltLivingTime;
private final UUID boltID;
@@ -30,8 +35,8 @@ public class EntityTeslaTowerLightning extends EntityWeatherEffect {
private final Entity boltValidDamageTarget;
- public EntityTeslaTowerLightning(
- World p_i1703_1_, double p_i1703_2_, double p_i1703_4_, double p_i1703_6_, Entity valid, UUID owner) {
+ public EntityTeslaTowerLightning(World p_i1703_1_, double p_i1703_2_, double p_i1703_4_, double p_i1703_6_,
+ Entity valid, UUID owner) {
super(p_i1703_1_);
Logger.INFO("Plasma Bolt - Created.");
Random rand = new XSTR(p_i1703_1_.getSeed());
@@ -44,8 +49,7 @@ public class EntityTeslaTowerLightning extends EntityWeatherEffect {
this.boltOwnerID = owner;
// Puts fires out
- if (!p_i1703_1_.isRemote
- && p_i1703_1_.getGameRules().getGameRuleBooleanValue("doFireTick")
+ if (!p_i1703_1_.isRemote && p_i1703_1_.getGameRules().getGameRuleBooleanValue("doFireTick")
&& (p_i1703_1_.difficultySetting == EnumDifficulty.NORMAL
|| p_i1703_1_.difficultySetting == EnumDifficulty.HARD)
&& p_i1703_1_.doChunksNearChunkExist(
@@ -139,8 +143,7 @@ public class EntityTeslaTowerLightning extends EntityWeatherEffect {
this.lightningState = 1;
this.boltVertex = rand.nextLong();
// Puts fires out.
- if (!this.worldObj.isRemote
- && this.worldObj.getGameRules().getGameRuleBooleanValue("doFireTick")
+ if (!this.worldObj.isRemote && this.worldObj.getGameRules().getGameRuleBooleanValue("doFireTick")
&& this.worldObj.doChunksNearChunkExist(
MathHelper.floor_double(this.posX),
MathHelper.floor_double(this.posY),
diff --git a/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java b/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java
index 39ee41f45a..e4f82ea80e 100644
--- a/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java
+++ b/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java
@@ -25,7 +25,13 @@ public class InternalEntityRegistry {
// EntityRegistry.registerGlobalEntityID(EntityPrimedMiningExplosive.class, "MiningCharge",
// EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(0, 0, 0), Utils.rgbtoHexValue(125, 125, 125));
EntityRegistry.registerModEntity(
- EntityPrimedMiningExplosive.class, "MiningCharge", mEntityID++, GTplusplus.instance, 64, 20, true);
+ EntityPrimedMiningExplosive.class,
+ "MiningCharge",
+ mEntityID++,
+ GTplusplus.instance,
+ 64,
+ 20,
+ true);
// EntityRegistry.registerGlobalEntityID(EntitySulfuricAcidPotion.class, "throwablePotionSulfuric",
// EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(200, 0, 200), Utils.rgbtoHexValue(125, 125,
@@ -53,44 +59,92 @@ public class InternalEntityRegistry {
// EntityRegistry.registerGlobalEntityID(EntityToxinballSmall.class, "toxinBall",
// EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(0, 25, 0), Utils.rgbtoHexValue(0, 125, 0));
EntityRegistry.registerModEntity(
- EntityToxinballSmall.class, "toxinBall", mEntityID++, GTplusplus.instance, 64, 20, true);
+ EntityToxinballSmall.class,
+ "toxinBall",
+ mEntityID++,
+ GTplusplus.instance,
+ 64,
+ 20,
+ true);
// EntityRegistry.registerGlobalEntityID(EntityStaballoyConstruct.class, "constructStaballoy",
// EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(0, 75, 0), Utils.rgbtoHexValue(50, 220, 50));
EntityRegistry.registerModEntity(
- EntityStaballoyConstruct.class, "constructStaballoy", mEntityID++, GTplusplus.instance, 64, 20, true);
+ EntityStaballoyConstruct.class,
+ "constructStaballoy",
+ mEntityID++,
+ GTplusplus.instance,
+ 64,
+ 20,
+ true);
ItemCustomSpawnEgg.registerEntityForSpawnEgg(
- 0, "constructStaballoy", Utils.rgbtoHexValue(20, 200, 20), Utils.rgbtoHexValue(20, 20, 20));
+ 0,
+ "constructStaballoy",
+ Utils.rgbtoHexValue(20, 200, 20),
+ Utils.rgbtoHexValue(20, 20, 20));
// EntityRegistry.registerGlobalEntityID(EntitySickBlaze.class, "sickBlaze",
// EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(0, 75, 0), Utils.rgbtoHexValue(75, 175, 75));
- EntityRegistry.registerModEntity(
- EntitySickBlaze.class, "sickBlaze", mEntityID++, GTplusplus.instance, 64, 20, true);
+ EntityRegistry
+ .registerModEntity(EntitySickBlaze.class, "sickBlaze", mEntityID++, GTplusplus.instance, 64, 20, true);
ItemCustomSpawnEgg.registerEntityForSpawnEgg(
- 1, "sickBlaze", Utils.rgbtoHexValue(40, 180, 40), Utils.rgbtoHexValue(75, 75, 75));
+ 1,
+ "sickBlaze",
+ Utils.rgbtoHexValue(40, 180, 40),
+ Utils.rgbtoHexValue(75, 75, 75));
// EntityRegistry.registerGlobalEntityID(EntityTeslaTowerLightning.class, "plasmaBolt",
// EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(255, 0, 0), Utils.rgbtoHexValue(125, 125,
// 125));
EntityRegistry.registerModEntity(
- EntityTeslaTowerLightning.class, "plasmaBolt", mEntityID++, GTplusplus.instance, 64, 5, true);
+ EntityTeslaTowerLightning.class,
+ "plasmaBolt",
+ mEntityID++,
+ GTplusplus.instance,
+ 64,
+ 5,
+ true);
EntityRegistry.registerModEntity(
- EntityThrowableBomb.class, "EntityThrowableBomb", mEntityID++, GTplusplus.instance, 64, 10, true);
+ EntityThrowableBomb.class,
+ "EntityThrowableBomb",
+ mEntityID++,
+ GTplusplus.instance,
+ 64,
+ 10,
+ true);
EntityRegistry.registerModEntity(
- EntityLightningAttack.class, "EntityLightningAttack", mEntityID++, GTplusplus.instance, 64, 20, true);
+ EntityLightningAttack.class,
+ "EntityLightningAttack",
+ mEntityID++,
+ GTplusplus.instance,
+ 64,
+ 20,
+ true);
/**
* Globals, which generate spawn eggs. (Currently required for Giant chicken spawning)
*/
EntityRegistry.registerModEntity(
- EntityGiantChickenBase.class, "bigChickenFriendly", mEntityID++, GTplusplus.instance, 64, 20, true);
+ EntityGiantChickenBase.class,
+ "bigChickenFriendly",
+ mEntityID++,
+ GTplusplus.instance,
+ 64,
+ 20,
+ true);
ItemCustomSpawnEgg.registerEntityForSpawnEgg(
- 2, "bigChickenFriendly", Utils.rgbtoHexValue(255, 0, 0), Utils.rgbtoHexValue(175, 175, 175));
- EntityRegistry.registerModEntity(
- EntityBatKing.class, "batKing", mEntityID++, GTplusplus.instance, 64, 20, true);
+ 2,
+ "bigChickenFriendly",
+ Utils.rgbtoHexValue(255, 0, 0),
+ Utils.rgbtoHexValue(175, 175, 175));
+ EntityRegistry
+ .registerModEntity(EntityBatKing.class, "batKing", mEntityID++, GTplusplus.instance, 64, 20, true);
ItemCustomSpawnEgg.registerEntityForSpawnEgg(
- 3, "batKing", Utils.rgbtoHexValue(175, 175, 0), Utils.rgbtoHexValue(0, 175, 175));
+ 3,
+ "batKing",
+ Utils.rgbtoHexValue(175, 175, 0),
+ Utils.rgbtoHexValue(0, 175, 175));
}
}
diff --git a/src/main/java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java b/src/main/java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java
index 810c3eadff..1cfb2154b1 100644
--- a/src/main/java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java
+++ b/src/main/java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.entity.ai.batking;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.entity.monster.EntityBatKing;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IRangedAttackMob;
import net.minecraft.entity.ai.EntityAIBase;
@@ -11,31 +7,30 @@ import net.minecraft.pathfinding.PathEntity;
import net.minecraft.pathfinding.PathPoint;
import net.minecraft.util.MathHelper;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.entity.monster.EntityBatKing;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
public class EntityAIBatKingAttack extends EntityAIBase {
private final Ranged mRangedAI;
private final Melee mMeleeAI;
private boolean mIsMelee = false;
- /** The Bat King in control of this AI. */
+ /** The Bat King in control of this AI. */
private final EntityBatKing mAttackingEntity;
/** The PathEntity of our entity. */
private PathEntity mEntityPathEntity;
- /** The current target of Bat King in control of this AI. */
+ /** The current target of Bat King in control of this AI. */
private EntityLivingBase mEntityTarget;
private final Class mClassTarget;
- public EntityAIBatKingAttack(
- EntityBatKing aAttacker,
- Class aClassTarget,
- double aMovementSpeed,
- int someInt,
- int aMaxRangedAttackTime,
- float someFloat,
- boolean aLongMemory) {
+ public EntityAIBatKingAttack(EntityBatKing aAttacker, Class aClassTarget, double aMovementSpeed, int someInt,
+ int aMaxRangedAttackTime, float someFloat, boolean aLongMemory) {
mRangedAI = new Ranged(this, aMovementSpeed, someInt, 5, someFloat);
mMeleeAI = new Melee(this, aClassTarget, aMovementSpeed, aLongMemory);
mAttackingEntity = aAttacker;
@@ -138,8 +133,10 @@ public class EntityAIBatKingAttack extends EntityAIBase {
this.mIsMelee = false;
}
if (aisMeleeNow != this.mIsMelee) {
- Logger.INFO("Bat King changed combat style from " + (aisMeleeNow ? "Melee" : "Ranged") + " to "
- + (this.mIsMelee ? "Melee" : "Ranged"));
+ Logger.INFO(
+ "Bat King changed combat style from " + (aisMeleeNow ? "Melee" : "Ranged")
+ + " to "
+ + (this.mIsMelee ? "Melee" : "Ranged"));
}
}
@@ -148,8 +145,8 @@ public class EntityAIBatKingAttack extends EntityAIBase {
private final EntityAIBatKingAttack parentAI;
/**
- * A decrementing tick that spawns a ranged attack once this value reaches 0. It
- * is then set back to the maxRangedAttackTime.
+ * A decrementing tick that spawns a ranged attack once this value reaches 0. It is then set back to the
+ * maxRangedAttackTime.
*/
private int rangedAttackTime;
@@ -164,11 +161,7 @@ public class EntityAIBatKingAttack extends EntityAIBase {
private float field_96562_i;
private float field_82642_h; // Max range
- public Ranged(
- EntityAIBatKingAttack aParent,
- double aMovementSpeed,
- int someInt,
- int aMaxRangedAttackTime,
+ public Ranged(EntityAIBatKingAttack aParent, double aMovementSpeed, int someInt, int aMaxRangedAttackTime,
float someFloat) {
this.rangedAttackTime = -1;
this.parentAI = aParent;
@@ -191,8 +184,7 @@ public class EntityAIBatKingAttack extends EntityAIBase {
* Returns whether an in-progress EntityAIBase should continue executing
*/
public boolean continueExecuting() {
- return parentAI.shouldExecute()
- || !parentAI.getBatKing().getNavigator().noPath();
+ return parentAI.shouldExecute() || !parentAI.getBatKing().getNavigator().noPath();
}
/**
@@ -213,11 +205,10 @@ public class EntityAIBatKingAttack extends EntityAIBase {
maxRangedAttackTime = MathUtils.balance(maxRangedAttackTime, 20, 40);
}
- double d0 = parentAI.getBatKing()
- .getDistanceSq(
- parentAI.mEntityTarget.posX,
- parentAI.mEntityTarget.boundingBox.minY,
- parentAI.mEntityTarget.posZ);
+ double d0 = parentAI.getBatKing().getDistanceSq(
+ parentAI.mEntityTarget.posX,
+ parentAI.mEntityTarget.boundingBox.minY,
+ parentAI.mEntityTarget.posZ);
boolean flag = parentAI.getBatKing().getEntitySenses().canSee(parentAI.mEntityTarget);
if (flag) {
@@ -229,8 +220,7 @@ public class EntityAIBatKingAttack extends EntityAIBase {
if (d0 <= (double) this.field_82642_h && this.mCooldownTime >= 20) {
parentAI.getBatKing().getNavigator().clearPathEntity();
} else {
- if (parentAI.getBatKing()
- .getNavigator()
+ if (parentAI.getBatKing().getNavigator()
.tryMoveToEntityLiving(parentAI.mEntityTarget, this.entityMoveSpeed)) {
Logger.INFO("Doing Ranged Ai Task.");
} else {
@@ -244,8 +234,14 @@ public class EntityAIBatKingAttack extends EntityAIBase {
if (--this.rangedAttackTime == 0) {
if (d0 > (double) this.field_82642_h || !flag) {
- Logger.INFO("Stopping ranged attack. " + flag + "|" + (d0 > (double) this.field_82642_h) + "|" + d0
- + "|" + (double) this.field_82642_h);
+ Logger.INFO(
+ "Stopping ranged attack. " + flag
+ + "|"
+ + (d0 > (double) this.field_82642_h)
+ + "|"
+ + d0
+ + "|"
+ + (double) this.field_82642_h);
return;
}
@@ -276,15 +272,13 @@ public class EntityAIBatKingAttack extends EntityAIBase {
private final EntityAIBatKingAttack parentAI;
/**
- * An amount of decrementing ticks that allows the entity to attack once the
- * tick reaches 0.
+ * An amount of decrementing ticks that allows the entity to attack once the tick reaches 0.
*/
int attackTick;
/** The speed with which the mob will approach the target */
double speedTowardsTarget;
/**
- * When true, the mob will continue chasing its target, even if it can't find a
- * path to them right now.
+ * When true, the mob will continue chasing its target, even if it can't find a path to them right now.
*/
boolean longMemory;
@@ -296,8 +290,8 @@ public class EntityAIBatKingAttack extends EntityAIBase {
private int failedPathFindingPenalty;
- public Melee(
- EntityAIBatKingAttack aParent, Class aClassTarget, double aMoveToTargetSpeed, boolean aLongMemory) {
+ public Melee(EntityAIBatKingAttack aParent, Class aClassTarget, double aMoveToTargetSpeed,
+ boolean aLongMemory) {
this.parentAI = aParent;
this.classTarget = aClassTarget;
this.speedTowardsTarget = aMoveToTargetSpeed;
@@ -322,8 +316,8 @@ public class EntityAIBatKingAttack extends EntityAIBase {
return false;
} else {
if (--this.field_75445_i <= 0) {
- parentAI.mEntityPathEntity =
- parentAI.mAttackingEntity.getNavigator().getPathToEntityLiving(entitylivingbase);
+ parentAI.mEntityPathEntity = parentAI.mAttackingEntity.getNavigator()
+ .getPathToEntityLiving(entitylivingbase);
this.field_75445_i = 4 + parentAI.mAttackingEntity.getRNG().nextInt(7);
return parentAI.mEntityPathEntity != null;
} else {
@@ -337,12 +331,9 @@ public class EntityAIBatKingAttack extends EntityAIBase {
*/
public boolean continueExecuting() {
EntityLivingBase entitylivingbase = parentAI.mAttackingEntity.getAttackTarget();
- return entitylivingbase == null
- ? false
- : (!entitylivingbase.isEntityAlive()
- ? false
- : (!this.longMemory
- ? !parentAI.mAttackingEntity.getNavigator().noPath()
+ return entitylivingbase == null ? false
+ : (!entitylivingbase.isEntityAlive() ? false
+ : (!this.longMemory ? !parentAI.mAttackingEntity.getNavigator().noPath()
: parentAI.mAttackingEntity.isWithinHomeDistance(
MathHelper.floor_double(entitylivingbase.posX),
MathHelper.floor_double(entitylivingbase.posY),
@@ -370,8 +361,8 @@ public class EntityAIBatKingAttack extends EntityAIBase {
public void updateTask() {
EntityLivingBase entitylivingbase = parentAI.mAttackingEntity.getAttackTarget();
parentAI.mAttackingEntity.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F);
- double d0 = parentAI.mAttackingEntity.getDistanceSq(
- entitylivingbase.posX, entitylivingbase.boundingBox.minY, entitylivingbase.posZ);
+ double d0 = parentAI.mAttackingEntity
+ .getDistanceSq(entitylivingbase.posX, entitylivingbase.boundingBox.minY, entitylivingbase.posZ);
double d1 = (double) (parentAI.mAttackingEntity.width * 2.0F * parentAI.mAttackingEntity.width * 2.0F
+ entitylivingbase.width);
--this.field_75445_i;
@@ -379,24 +370,19 @@ public class EntityAIBatKingAttack extends EntityAIBase {
if ((this.longMemory || parentAI.mAttackingEntity.getEntitySenses().canSee(entitylivingbase))
&& this.field_75445_i <= 0
&& (this.field_151497_i == 0.0D && this.field_151495_j == 0.0D && this.field_151496_k == 0.0D
- || entitylivingbase.getDistanceSq(
- this.field_151497_i, this.field_151495_j, this.field_151496_k)
+ || entitylivingbase
+ .getDistanceSq(this.field_151497_i, this.field_151495_j, this.field_151496_k)
>= 1.0D
|| parentAI.mAttackingEntity.getRNG().nextFloat() < 0.05F)) {
this.field_151497_i = entitylivingbase.posX;
this.field_151495_j = entitylivingbase.boundingBox.minY;
this.field_151496_k = entitylivingbase.posZ;
- this.field_75445_i = failedPathFindingPenalty
- + 4
- + parentAI.mAttackingEntity.getRNG().nextInt(7);
+ this.field_75445_i = failedPathFindingPenalty + 4 + parentAI.mAttackingEntity.getRNG().nextInt(7);
if (parentAI.mAttackingEntity.getNavigator().getPath() != null) {
- PathPoint finalPathPoint =
- parentAI.mAttackingEntity.getNavigator().getPath().getFinalPathPoint();
- if (finalPathPoint != null
- && entitylivingbase.getDistanceSq(
- finalPathPoint.xCoord, finalPathPoint.yCoord, finalPathPoint.zCoord)
- < 1) {
+ PathPoint finalPathPoint = parentAI.mAttackingEntity.getNavigator().getPath().getFinalPathPoint();
+ if (finalPathPoint != null && entitylivingbase
+ .getDistanceSq(finalPathPoint.xCoord, finalPathPoint.yCoord, finalPathPoint.zCoord) < 1) {
failedPathFindingPenalty = 0;
} else {
failedPathFindingPenalty += 10;
@@ -411,8 +397,7 @@ public class EntityAIBatKingAttack extends EntityAIBase {
this.field_75445_i += 5;
}
- if (!parentAI.mAttackingEntity
- .getNavigator()
+ if (!parentAI.mAttackingEntity.getNavigator()
.tryMoveToEntityLiving(entitylivingbase, this.speedTowardsTarget)) {
this.field_75445_i += 15;
}
diff --git a/src/main/java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java b/src/main/java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java
index 95693d24c9..d100d3571b 100644
--- a/src/main/java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java
+++ b/src/main/java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java
@@ -1,20 +1,21 @@
package gtPlusPlus.core.entity.item;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.entity.monster.EntityGiantChickenBase;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.NBTUtils;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
public class ItemEntityGiantEgg extends EntityItem {
/**
- * The maximum age of this Chicken Egg. The item will try hatch once this is reached.
+ * The maximum age of this Chicken Egg. The item will try hatch once this is reached.
*/
public int mEggAge = 10000;
@@ -98,14 +99,13 @@ public class ItemEntityGiantEgg extends EntityItem {
if (this.age >= 1000) {
// Cache the value for efficiency
- if (mEggSize == -1)
- mEggSize = (this.getEntityItem() != null
- ? (this.getEntityItem().hasTagCompound()
- ? (this.getEntityItem().getTagCompound().hasKey("size")
- ? this.getEntityItem().getTagCompound().getInteger("size")
- : 1)
- : 1)
- : 1);
+ if (mEggSize == -1) mEggSize = (this.getEntityItem() != null
+ ? (this.getEntityItem().hasTagCompound()
+ ? (this.getEntityItem().getTagCompound().hasKey("size")
+ ? this.getEntityItem().getTagCompound().getInteger("size")
+ : 1)
+ : 1)
+ : 1);
if (MathUtils.randInt(100 * mEggSize, 1000) >= MathUtils.randInt(950, 1000)) {
// Spawn Chicken
if (spawnGiantChicken()) {
diff --git a/src/main/java/gtPlusPlus/core/entity/monster/EntityBatKing.java b/src/main/java/gtPlusPlus/core/entity/monster/EntityBatKing.java
index 0a35d550a4..049d47cc21 100644
--- a/src/main/java/gtPlusPlus/core/entity/monster/EntityBatKing.java
+++ b/src/main/java/gtPlusPlus/core/entity/monster/EntityBatKing.java
@@ -1,13 +1,7 @@
package gtPlusPlus.core.entity.monster;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.entity.ai.batking.EntityAIBatKingAttack;
-import gtPlusPlus.core.entity.projectile.EntityThrowableBomb;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Field;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.EnumCreatureAttribute;
@@ -33,6 +27,14 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.entity.ai.batking.EntityAIBatKingAttack;
+import gtPlusPlus.core.entity.projectile.EntityThrowableBomb;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class EntityBatKing extends EntityMob implements IRangedAttackMob {
public int courseChangeCooldown;
@@ -46,8 +48,11 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
private int explosionStrength = 1;
private EntityAIBatKingAttack aiAttack = new EntityAIBatKingAttack(this, null, 1.0D, 20, 60, 15.0F, true);
- private EntityAIAttackOnCollide aiAttackOnCollide =
- new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.2D, false);
+ private EntityAIAttackOnCollide aiAttackOnCollide = new EntityAIAttackOnCollide(
+ this,
+ EntityPlayer.class,
+ 1.2D,
+ false);
public EntityBatKing(World p_i1680_1_) {
super(p_i1680_1_);
@@ -118,8 +123,7 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
}
/**
- * Returns true if this entity should push and be pushed by other entities when
- * colliding.
+ * Returns true if this entity should push and be pushed by other entities when colliding.
*/
public boolean canBePushed() {
return true;
@@ -294,8 +298,8 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
}
/**
- * returns if this entity triggers Block.onEntityWalking on the blocks they walk
- * on. used for spiders and wolves to prevent them from trampling crops
+ * returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to
+ * prevent them from trampling crops
*/
protected boolean canTriggerWalking() {
return false;
@@ -359,8 +363,7 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
if (this.targetedEntity != null && this.targetedEntity.getDistanceSqToEntity(this) < d4 * d4 * 8) {
Logger.INFO("Trying to do ranged attack 2");
double d5 = this.targetedEntity.posX - this.posX;
- double d6 = this.targetedEntity.boundingBox.minY
- + (double) (this.targetedEntity.height / 2.0F)
+ double d6 = this.targetedEntity.boundingBox.minY + (double) (this.targetedEntity.height / 2.0F)
- (this.posY + (double) (this.height / 2.0F));
double d7 = this.targetedEntity.posZ - this.posZ;
this.renderYawOffset = this.rotationYaw = -((float) Math.atan2(d5, d7)) * 180.0F / (float) Math.PI;
@@ -374,11 +377,17 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
Logger.INFO("Trying to do ranged attack 3a1");
this.worldObj.playAuxSFXAtEntity(
- (EntityPlayer) null, 1008, (int) this.posX, (int) this.posY, (int) this.posZ, 0);
+ (EntityPlayer) null,
+ 1008,
+ (int) this.posX,
+ (int) this.posY,
+ (int) this.posZ,
+ 0);
setIsBatHanging(true);
- EntityThrowableBomb entitylargefireball =
- new EntityThrowableBomb(this.worldObj, this /*d5, d6, d7*/);
+ EntityThrowableBomb entitylargefireball = new EntityThrowableBomb(
+ this.worldObj,
+ this /* d5, d6, d7 */);
// entitylargefireball.field_92057_e = this.explosionStrength;
// entitylargefireball.accelerationX *= 2;
// entitylargefireball.accelerationY *= 2;
@@ -395,14 +404,18 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
Logger.INFO("Trying to do ranged attack 5a");
--this.attackCounter;
EntityArrow entityarrow = new EntityArrow(
- this.worldObj, this, p_82196_1_, MathUtils.randFloat(1f, 3f), (float)
- (14 - this.worldObj.difficultySetting.getDifficultyId() * 4));
+ this.worldObj,
+ this,
+ p_82196_1_,
+ MathUtils.randFloat(1f, 3f),
+ (float) (14 - this.worldObj.difficultySetting.getDifficultyId() * 4));
int i = MathUtils.randInt(0, 4);
int j = MathUtils.randInt(0, 3);
int k = MathUtils.randInt(0, 3);
- entityarrow.setDamage((double) (p_82196_2_ * 2.0F)
- + this.rand.nextGaussian() * 0.25D
- + (double) ((float) this.worldObj.difficultySetting.getDifficultyId() * 0.11F));
+ entityarrow.setDamage(
+ (double) (p_82196_2_ * 2.0F) + this.rand.nextGaussian() * 0.25D
+ + (double) ((float) this.worldObj.difficultySetting.getDifficultyId()
+ * 0.11F));
boolean boostAttack = MathUtils.randInt(0, 100) <= 21;
if (boostAttack) {
@@ -418,10 +431,7 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
}
}
- this.playSound(
- "mob.skeleton.say",
- 1.0F,
- 1.0F / (this.getRNG().nextFloat() * 0.4F + 0.8F));
+ this.playSound("mob.skeleton.say", 1.0F, 1.0F / (this.getRNG().nextFloat() * 0.4F + 0.8F));
this.worldObj.spawnEntityInWorld(entityarrow);
Logger.INFO("Trying to do ranged attack 5a done");
}
@@ -435,20 +445,24 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
}
} else {
Logger.INFO("Trying to do ranged attack 4a");
- this.renderYawOffset =
- this.rotationYaw = -((float) Math.atan2(this.motionX, this.motionZ)) * 180.0F / (float) Math.PI;
+ this.renderYawOffset = this.rotationYaw = -((float) Math.atan2(this.motionX, this.motionZ)) * 180.0F
+ / (float) Math.PI;
if (this.attackCounter > 0) {
Logger.INFO("Trying to do ranged attack 5a");
--this.attackCounter;
- EntityArrow entityarrow = new EntityArrow(this.worldObj, this, p_82196_1_, 1.6F, (float)
- (14 - this.worldObj.difficultySetting.getDifficultyId() * 4));
+ EntityArrow entityarrow = new EntityArrow(
+ this.worldObj,
+ this,
+ p_82196_1_,
+ 1.6F,
+ (float) (14 - this.worldObj.difficultySetting.getDifficultyId() * 4));
int i = MathUtils.randInt(0, 4);
int j = MathUtils.randInt(0, 3);
int k = MathUtils.randInt(0, 3);
- entityarrow.setDamage((double) (p_82196_2_ * 2.0F)
- + this.rand.nextGaussian() * 0.25D
- + (double) ((float) this.worldObj.difficultySetting.getDifficultyId() * 0.11F));
+ entityarrow.setDamage(
+ (double) (p_82196_2_ * 2.0F) + this.rand.nextGaussian() * 0.25D
+ + (double) ((float) this.worldObj.difficultySetting.getDifficultyId() * 0.11F));
boolean boostAttack = MathUtils.randInt(0, 100) <= 21;
if (boostAttack) {
@@ -479,8 +493,7 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
}
/**
- * Checks if the entity's current position is a valid location to spawn this
- * entity.
+ * Checks if the entity's current position is a valid location to spawn this entity.
*/
public boolean getCanSpawnHere() {
return super.getCanSpawnHere() && this.worldObj.difficultySetting != EnumDifficulty.PEACEFUL;
@@ -498,9 +511,8 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
}
/**
- * Drop 0-2 items of this living's type. @param par1 - Whether this entity has
- * recently been hit by a player. @param par2 - Level of Looting used to kill
- * this mob.
+ * Drop 0-2 items of this living's type. @param par1 - Whether this entity has recently been hit by a player. @param
+ * par2 - Level of Looting used to kill this mob.
*/
protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) {
int j = this.rand.nextInt(2) + this.rand.nextInt(1 + p_70628_2_);
@@ -567,8 +579,7 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
if (this.targetedEntity != null && this.targetedEntity.getDistanceSqToEntity(this) < d4 * d4) {
double d5 = this.targetedEntity.posX - this.posX;
- double d6 = this.targetedEntity.boundingBox.minY
- + (double) (this.targetedEntity.height / 2.0F)
+ double d6 = this.targetedEntity.boundingBox.minY + (double) (this.targetedEntity.height / 2.0F)
- (this.posY + (double) (this.height / 2.0F));
double d7 = this.targetedEntity.posZ - this.posZ;
this.renderYawOffset = this.rotationYaw = -((float) Math.atan2(d5, d7)) * 180.0F / (float) Math.PI;
@@ -576,14 +587,24 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
if (this.canEntityBeSeen(this.targetedEntity)) {
if (this.attackCounter == 10) {
this.worldObj.playAuxSFXAtEntity(
- (EntityPlayer) null, 1007, (int) this.posX, (int) this.posY, (int) this.posZ, 0);
+ (EntityPlayer) null,
+ 1007,
+ (int) this.posX,
+ (int) this.posY,
+ (int) this.posZ,
+ 0);
}
++this.attackCounter;
if (this.attackCounter == 20) {
this.worldObj.playAuxSFXAtEntity(
- (EntityPlayer) null, 1008, (int) this.posX, (int) this.posY, (int) this.posZ, 0);
+ (EntityPlayer) null,
+ 1008,
+ (int) this.posX,
+ (int) this.posY,
+ (int) this.posZ,
+ 0);
EntityLargeFireball entitylargefireball = new EntityLargeFireball(this.worldObj, this, d5, d6, d7);
entitylargefireball.field_92057_e = this.explosionStrength;
double d8 = 4.0D;
@@ -598,8 +619,8 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
--this.attackCounter;
}
} else {
- this.renderYawOffset =
- this.rotationYaw = -((float) Math.atan2(this.motionX, this.motionZ)) * 180.0F / (float) Math.PI;
+ this.renderYawOffset = this.rotationYaw = -((float) Math.atan2(this.motionX, this.motionZ)) * 180.0F
+ / (float) Math.PI;
if (this.attackCounter > 0) {
--this.attackCounter;
@@ -629,8 +650,7 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
axisalignedbb.offset(d4, d5, d6);
/*
- * if (!this.worldObj.getCollidingBoundingBoxes(this, axisalignedbb).isEmpty())
- * { return false; }
+ * if (!this.worldObj.getCollidingBoundingBoxes(this, axisalignedbb).isEmpty()) { return false; }
*/
}
@@ -643,9 +663,8 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
protected void fall(float p_70069_1_) {}
/**
- * Takes in the distance the entity has fallen this tick and whether its on the
- * ground to update the fall distance and deal fall damage if landing on the
- * ground. Args: distanceFallenThisTick, onGround
+ * Takes in the distance the entity has fallen this tick and whether its on the ground to update the fall distance
+ * and deal fall damage if landing on the ground. Args: distanceFallenThisTick, onGround
*/
protected void updateFallState(double p_70064_1_, boolean p_70064_3_) {}
@@ -670,11 +689,9 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
if (this.onGround) {
f2 = this.worldObj.getBlock(
- MathHelper.floor_double(this.posX),
- MathHelper.floor_double(this.boundingBox.minY) - 1,
- MathHelper.floor_double(this.posZ))
- .slipperiness
- * 0.91F;
+ MathHelper.floor_double(this.posX),
+ MathHelper.floor_double(this.boundingBox.minY) - 1,
+ MathHelper.floor_double(this.posZ)).slipperiness * 0.91F;
}
float f3 = 0.16277136F / (f2 * f2 * f2);
@@ -683,11 +700,9 @@ public class EntityBatKing extends EntityMob implements IRangedAttackMob {
if (this.onGround) {
f2 = this.worldObj.getBlock(
- MathHelper.floor_double(this.posX),
- MathHelper.floor_double(this.boundingBox.minY) - 1,
- MathHelper.floor_double(this.posZ))
- .slipperiness
- * 0.91F;
+ MathHelper.floor_double(this.posX),
+ MathHelper.floor_double(this.boundingBox.minY) - 1,
+ MathHelper.floor_double(this.posZ)).slipperiness * 0.91F;
}
this.moveEntity(this.motionX, this.motionY, this.motionZ);
diff --git a/src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java b/src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java
index e75a7664bc..e0c704b67b 100644
--- a/src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java
+++ b/src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java
@@ -1,8 +1,5 @@
package gtPlusPlus.core.entity.monster;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.item.general.ItemGemShards;
-import gtPlusPlus.core.util.math.MathUtils;
import net.minecraft.entity.*;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.effect.EntityLightningBolt;
@@ -18,6 +15,10 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.general.ItemGemShards;
+import gtPlusPlus.core.util.math.MathUtils;
+
public class EntityGiantChickenBase extends EntityChicken {
/** The time until the next egg is spawned. */
@@ -120,14 +121,13 @@ public class EntityGiantChickenBase extends EntityChicken {
for (int k = 0; k < j * 2; ++k) {
this.dropItem(
ModItems.itemBigEgg,
- MathUtils.getRandomFromArray(new int[] {1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2}));
+ MathUtils.getRandomFromArray(new int[] { 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2 }));
}
// Chicken Corpses Dropped
- int mBodies = MathUtils.getRandomFromArray(new int[] {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5,
- 6
- });
+ int mBodies = MathUtils.getRandomFromArray(
+ new int[] { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4,
+ 4, 4, 4, 5, 5, 6 });
if (this.isBurning()) {
this.dropItem(Items.cooked_chicken, mBodies);
} else {
@@ -254,8 +254,7 @@ public class EntityGiantChickenBase extends EntityChicken {
this.motionY = 0.68999998688697815D;
this.motionY += 0.068999998688697815D;
if (this.isPotionActive(Potion.jump)) {
- this.motionY +=
- (double) ((float) (this.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.5F);
+ this.motionY += (double) ((float) (this.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.5F);
}
if (this.isSprinting()) {
diff --git a/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java b/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
index 2abc2bd6a1..933109730c 100644
--- a/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
+++ b/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
@@ -1,8 +1,5 @@
package gtPlusPlus.core.entity.monster;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.entity.projectile.EntityToxinballSmall;
import net.minecraft.entity.Entity;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.monster.EntityMob;
@@ -13,7 +10,12 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.entity.projectile.EntityToxinballSmall;
+
public class EntitySickBlaze extends EntityMob {
+
/** Random offset used in floating behaviour */
private float heightOffset = 0.5F;
/** ticks until heightOffset is randomized */
@@ -81,9 +83,8 @@ public class EntitySickBlaze extends EntityMob {
}
/**
- * Called frequently so the entity can update its state every tick as
- * required. For example, zombies and skeletons use this to react to
- * sunlight and start to burn.
+ * Called frequently so the entity can update its state every tick as required. For example, zombies and skeletons
+ * use this to react to sunlight and start to burn.
*/
@Override
public void onLivingUpdate() {
@@ -107,8 +108,10 @@ public class EntitySickBlaze extends EntityMob {
}
if (this.rand.nextInt(24) == 0) {
- /*this.worldObj.playSoundEffect(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, "fire.fire",
- 1.0F + this.rand.nextFloat(), this.rand.nextFloat() * 0.7F + 0.3F);*/
+ /*
+ * this.worldObj.playSoundEffect(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, "fire.fire", 1.0F +
+ * this.rand.nextFloat(), this.rand.nextFloat() * 0.7F + 0.3F);
+ */
}
if (!this.onGround && this.motionY < 0.0D) {
@@ -130,13 +133,11 @@ public class EntitySickBlaze extends EntityMob {
}
/**
- * Basic mob attack. Default to touch of death in EntityCreature. Overridden
- * by each mob to define their attack.
+ * Basic mob attack. Default to touch of death in EntityCreature. Overridden by each mob to define their attack.
*/
@Override
protected void attackEntity(Entity entity, float p_70785_2_) {
- if (this.attackTime <= 0
- && p_70785_2_ < 2.0F
+ if (this.attackTime <= 0 && p_70785_2_ < 2.0F
&& entity.boundingBox.maxY > this.boundingBox.minY
&& entity.boundingBox.minY < this.boundingBox.maxY) {
this.attackTime = 20;
@@ -161,7 +162,12 @@ public class EntitySickBlaze extends EntityMob {
if (this.field_70846_g > 1) {
float f1 = MathHelper.sqrt_float(p_70785_2_) * 0.5F;
this.worldObj.playAuxSFXAtEntity(
- (EntityPlayer) null, 1009, (int) this.posX, (int) this.posY, (int) this.posZ, 0);
+ (EntityPlayer) null,
+ 1009,
+ (int) this.posX,
+ (int) this.posY,
+ (int) this.posZ,
+ 0);
for (int i = 0; i < 1; ++i) {
EntityToxinballSmall entitysmalltoxinball = new EntityToxinballSmall(
@@ -193,8 +199,7 @@ public class EntitySickBlaze extends EntityMob {
}
/**
- * Returns true if the entity is on fire. Used by render to add the fire
- * effect on rendering.
+ * Returns true if the entity is on fire. Used by render to add the fire effect on rendering.
*/
@Override
public boolean isBurning() {
@@ -202,9 +207,8 @@ public class EntitySickBlaze extends EntityMob {
}
/**
- * Drop 0-2 items of this living's type. @param par1 - Whether this entity
- * has recently been hit by a player. @param par2 - Level of Looting used to
- * kill this mob.
+ * Drop 0-2 items of this living's type. @param par1 - Whether this entity has recently been hit by a player. @param
+ * par2 - Level of Looting used to kill this mob.
*/
@Override
protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) {
diff --git a/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
index b0cbbe2e8d..c5391468d6 100644
--- a/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
+++ b/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
@@ -1,12 +1,7 @@
package gtPlusPlus.core.entity.monster;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.core.world.explosions.ExplosionHandler;
import java.lang.reflect.Field;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.*;
@@ -21,6 +16,13 @@ import net.minecraft.util.MathHelper;
import net.minecraft.village.Village;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.core.world.explosions.ExplosionHandler;
+
public class EntityStaballoyConstruct extends EntityIronGolem {
/*
@@ -49,7 +51,8 @@ public class EntityStaballoyConstruct extends EntityIronGolem {
this.tasks.addTask(6, new EntityAILookIdle(this));
this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, false));
this.targetTasks.addTask(
- 2, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, false, true, IMob.mobSelector));
+ 2,
+ new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, false, true, IMob.mobSelector));
}
/**
@@ -121,9 +124,8 @@ public class EntityStaballoyConstruct extends EntityIronGolem {
}
/**
- * Called frequently so the entity can update its state every tick as
- * required. For example, zombies and skeletons use this to react to
- * sunlight and start to burn.
+ * Called frequently so the entity can update its state every tick as required. For example, zombies and skeletons
+ * use this to react to sunlight and start to burn.
*/
@Override
public void onLivingUpdate() {
@@ -219,9 +221,8 @@ public class EntityStaballoyConstruct extends EntityIronGolem {
}
/**
- * Drop 0-2 items of this living's type. @param par1 - Whether this entity
- * has recently been hit by a player. @param par2 - Level of Looting used to
- * kill this mob.
+ * Drop 0-2 items of this living's type. @param par1 - Whether this entity has recently been hit by a player. @param
+ * par2 - Level of Looting used to kill this mob.
*/
@Override
protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) {
@@ -402,8 +403,7 @@ public class EntityStaballoyConstruct extends EntityIronGolem {
if (mFirstUpdateField != null && mReflectFirstUpdate == true) {
try {
this.mReflectFirstUpdate = (boolean) mFirstUpdateField.get(this);
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
}
}
super.onEntityUpdate();
@@ -471,8 +471,8 @@ public class EntityStaballoyConstruct extends EntityIronGolem {
fluid,
this)) {
if (!this.inFluid && !this.mReflectFirstUpdate) {
- float f = MathHelper.sqrt_double(this.motionX * this.motionX * 0.20000000298023224D
- + this.motionY * this.motionY
+ float f = MathHelper.sqrt_double(
+ this.motionX * this.motionX * 0.20000000298023224D + this.motionY * this.motionY
+ this.motionZ * this.motionZ * 0.20000000298023224D)
* 0.2F;
@@ -533,8 +533,9 @@ public class EntityStaballoyConstruct extends EntityIronGolem {
}
private void explode() {
- /* float f = 12.0F;
- this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, f, true);*/
+ /*
+ * float f = 12.0F; this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, f, true);
+ */
if (!this.worldObj.isRemote) {
final float f = 6.5F;
diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java
index 0e8174339e..da848575a3 100644
--- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java
+++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.entity.projectile;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -15,6 +11,11 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
public class EntityHydrofluoricAcidPotion extends EntityThrowable {
public EntityHydrofluoricAcidPotion(World world) {
@@ -121,15 +122,15 @@ public class EntityHydrofluoricAcidPotion extends EntityThrowable {
if (worldObj.getBlock(i, j - 1, h) == Blocks.grass) {
worldObj.setBlock(i, j - 1, h, Blocks.dirt);
}
- } else if (mBlockhit == Blocks.carrots
- || mBlockhit == Blocks.melon_block
+ } else if (mBlockhit == Blocks.carrots || mBlockhit == Blocks.melon_block
|| mBlockhit == Blocks.pumpkin
|| mBlockhit == Blocks.potatoes) {
- worldObj.setBlock(i, j + 1, h, Blocks.fire);
- worldObj.setBlock(i, j, h, Blocks.dirt);
- } else if (mBlockhit == Blocks.air) {
- worldObj.setBlock(i, j, h, Blocks.fire);
- }
+ worldObj.setBlock(i, j + 1, h, Blocks.fire);
+ worldObj.setBlock(i, j, h, Blocks.dirt);
+ } else
+ if (mBlockhit == Blocks.air) {
+ worldObj.setBlock(i, j, h, Blocks.fire);
+ }
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java
index c1778309e3..595eb53968 100644
--- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java
+++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java
@@ -1,7 +1,5 @@
package gtPlusPlus.core.entity.projectile;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.projectile.EntityWitherSkull;
import net.minecraft.potion.Potion;
@@ -11,6 +9,9 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class EntityLightningAttack extends EntityWitherSkull {
public EntityLightningAttack(World p_i1793_1_) {
@@ -18,21 +19,15 @@ public class EntityLightningAttack extends EntityWitherSkull {
this.setSize(0.3125F, 0.3125F);
}
- public EntityLightningAttack(
- World p_i1794_1_, EntityLivingBase p_i1794_2_, double p_i1794_3_, double p_i1794_5_, double p_i1794_7_) {
+ public EntityLightningAttack(World p_i1794_1_, EntityLivingBase p_i1794_2_, double p_i1794_3_, double p_i1794_5_,
+ double p_i1794_7_) {
super(p_i1794_1_, p_i1794_2_, p_i1794_3_, p_i1794_5_, p_i1794_7_);
this.setSize(0.3125F, 0.3125F);
}
@SideOnly(Side.CLIENT)
- public EntityLightningAttack(
- World p_i1795_1_,
- double p_i1795_2_,
- double p_i1795_4_,
- double p_i1795_6_,
- double p_i1795_8_,
- double p_i1795_10_,
- double p_i1795_12_) {
+ public EntityLightningAttack(World p_i1795_1_, double p_i1795_2_, double p_i1795_4_, double p_i1795_6_,
+ double p_i1795_8_, double p_i1795_10_, double p_i1795_12_) {
super(p_i1795_1_, p_i1795_2_, p_i1795_4_, p_i1795_6_, p_i1795_8_, p_i1795_10_, p_i1795_12_);
this.setSize(0.3125F, 0.3125F);
}
diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java
index c153232b60..3c865de497 100644
--- a/src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java
+++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.entity.projectile;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.projectile.EntityThrowable;
@@ -12,6 +8,11 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
public class EntitySulfuricAcidPotion extends EntityThrowable {
public EntitySulfuricAcidPotion(World world) {
@@ -110,15 +111,15 @@ public class EntitySulfuricAcidPotion extends EntityThrowable {
if (worldObj.getBlock(i, j - 1, h) == Blocks.grass) {
worldObj.setBlock(i, j - 1, h, Blocks.dirt);
}
- } else if (mBlockhit == Blocks.carrots
- || mBlockhit == Blocks.melon_block
+ } else if (mBlockhit == Blocks.carrots || mBlockhit == Blocks.melon_block
|| mBlockhit == Blocks.pumpkin
|| mBlockhit == Blocks.potatoes) {
- worldObj.setBlock(i, j + 1, h, Blocks.fire);
- worldObj.setBlock(i, j, h, Blocks.dirt);
- } else if (mBlockhit == Blocks.air) {
- worldObj.setBlock(i, j, h, Blocks.fire);
- }
+ worldObj.setBlock(i, j + 1, h, Blocks.fire);
+ worldObj.setBlock(i, j, h, Blocks.dirt);
+ } else
+ if (mBlockhit == Blocks.air) {
+ worldObj.setBlock(i, j, h, Blocks.fire);
+ }
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java
index c7003d1f0c..99ae5ae97c 100644
--- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java
+++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java
@@ -1,10 +1,5 @@
package gtPlusPlus.core.entity.projectile;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.projectile.EntityThrowable;
@@ -13,6 +8,12 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
+
public class EntityThrowableBomb extends EntityThrowable {
public EntityThrowableBomb(World world) {
@@ -281,8 +282,8 @@ public class EntityThrowableBomb extends EntityThrowable {
0.0D,
0.0D);
- PollutionUtils.addPollution(
- worldObj.getChunkFromBlockCoords(blockpos.xPos, blockpos.zPos), 500);
+ PollutionUtils
+ .addPollution(worldObj.getChunkFromBlockCoords(blockpos.xPos, blockpos.zPos), 500);
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 0.01f, true);
if (mBlockhit == Blocks.grass || mBlockhit == Blocks.mycelium) {
worldObj.setBlock(i, j + 1, h, Blocks.fire);
@@ -294,15 +295,15 @@ public class EntityThrowableBomb extends EntityThrowable {
if (worldObj.getBlock(i, j - 1, h) == Blocks.grass) {
worldObj.setBlock(i, j - 1, h, Blocks.dirt);
}
- } else if (mBlockhit == Blocks.carrots
- || mBlockhit == Blocks.melon_block
+ } else if (mBlockhit == Blocks.carrots || mBlockhit == Blocks.melon_block
|| mBlockhit == Blocks.pumpkin
|| mBlockhit == Blocks.potatoes) {
- worldObj.setBlock(i, j + 1, h, Blocks.fire);
- worldObj.setBlock(i, j, h, Blocks.dirt);
- } else if (mBlockhit == Blocks.air) {
- worldObj.setBlock(i, j, h, Blocks.fire);
- }
+ worldObj.setBlock(i, j + 1, h, Blocks.fire);
+ worldObj.setBlock(i, j, h, Blocks.dirt);
+ } else
+ if (mBlockhit == Blocks.air) {
+ worldObj.setBlock(i, j, h, Blocks.fire);
+ }
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java
index 7d137738be..30f11bf2c5 100644
--- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java
+++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java
@@ -1,8 +1,7 @@
package gtPlusPlus.core.entity.projectile;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -12,7 +11,11 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.*;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public abstract class EntityToxinball extends EntityFireball {
+
protected int entityX = -1;
protected int entityY = -1;
protected int entityZ = -1;
@@ -30,9 +33,8 @@ public abstract class EntityToxinball extends EntityFireball {
protected void entityInit() {}
/**
- * Checks if the entity is in range to render by using the past in distance
- * and comparing it to its average edge length * 64 * renderDistanceWeight
- * Args: distance
+ * Checks if the entity is in range to render by using the past in distance and comparing it to its average edge
+ * length * 64 * renderDistanceWeight Args: distance
*/
@Override
@SideOnly(Side.CLIENT)
@@ -75,9 +77,8 @@ public abstract class EntityToxinball extends EntityFireball {
*/
@Override
public void onUpdate() {
- if (!this.worldObj.isRemote
- && (this.shootingEntity != null && this.shootingEntity.isDead
- || !this.worldObj.blockExists(this.entityX, this.entityY, this.entityZ))) {
+ if (!this.worldObj.isRemote && (this.shootingEntity != null && this.shootingEntity.isDead
+ || !this.worldObj.blockExists(this.entityX, this.entityY, this.entityZ))) {
this.setDead();
} else {
super.onUpdate();
@@ -106,11 +107,15 @@ public abstract class EntityToxinball extends EntityFireball {
Vec3 vec3 = Vec3.createVectorHelper(this.entityX, this.entityY, this.entityZ);
Vec3 vec31 = Vec3.createVectorHelper(
- this.entityX + this.motionX, this.entityY + this.motionY, this.entityZ + this.motionZ);
+ this.entityX + this.motionX,
+ this.entityY + this.motionY,
+ this.entityZ + this.motionZ);
MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31);
vec3 = Vec3.createVectorHelper(this.entityX, this.entityY, this.entityZ);
vec31 = Vec3.createVectorHelper(
- this.entityX + this.motionX, this.entityY + this.motionY, this.entityZ + this.motionZ);
+ this.entityX + this.motionX,
+ this.entityY + this.motionY,
+ this.entityZ + this.motionZ);
if (movingobjectposition != null) {
vec31 = Vec3.createVectorHelper(
@@ -122,9 +127,7 @@ public abstract class EntityToxinball extends EntityFireball {
Entity entity = null;
List<?> list = this.worldObj.getEntitiesWithinAABBExcludingEntity(
this,
- this.boundingBox
- .addCoord(this.motionX, this.motionY, this.motionZ)
- .expand(1.0D, 1.0D, 1.0D));
+ this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D));
double d0 = 0.0D;
for (int i = 0; i < list.size(); ++i) {
@@ -161,9 +164,8 @@ public abstract class EntityToxinball extends EntityFireball {
float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (Math.atan2(this.motionZ, this.motionX) * 180.0D / Math.PI) + 90.0F;
- for (this.rotationPitch = (float) (Math.atan2(f1, this.motionY) * 180.0D / Math.PI) - 90.0F;
- this.rotationPitch - this.prevRotationPitch < -180.0F;
- this.prevRotationPitch -= 360.0F) {
+ for (this.rotationPitch = (float) (Math.atan2(f1, this.motionY) * 180.0D / Math.PI)
+ - 90.0F; this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {
;
}
@@ -211,8 +213,7 @@ public abstract class EntityToxinball extends EntityFireball {
}
/**
- * Return the motion factor for this projectile. The factor is multiplied by
- * the original motion.
+ * Return the motion factor for this projectile. The factor is multiplied by the original motion.
*/
@Override
protected float getMotionFactor() {
@@ -235,7 +236,7 @@ public abstract class EntityToxinball extends EntityFireball {
aTag.setShort("zTile", (short) this.entityZ);
aTag.setByte("inTile", (byte) Block.getIdFromBlock(this.block));
aTag.setByte("inGround", (byte) (this.inGround ? 1 : 0));
- aTag.setTag("direction", this.newDoubleNBTList(new double[] {this.motionX, this.motionY, this.motionZ}));
+ aTag.setTag("direction", this.newDoubleNBTList(new double[] { this.motionX, this.motionY, this.motionZ }));
}
/**
@@ -260,8 +261,7 @@ public abstract class EntityToxinball extends EntityFireball {
}
/**
- * Returns true if other Entities should be prevented from moving through
- * this Entity.
+ * Returns true if other Entities should be prevented from moving through this Entity.
*/
@Override
public boolean canBeCollidedWith() {
diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java
index 2321411a2b..d2d7836f3d 100644
--- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java
+++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java
@@ -18,14 +18,8 @@ public class EntityToxinballSmall extends EntityToxinball {
this.setSize(0.3125F, 0.3125F);
}
- public EntityToxinballSmall(
- World p_i1772_1_,
- double p_i1772_2_,
- double p_i1772_4_,
- double p_i1772_6_,
- double p_i1772_8_,
- double p_i1772_10_,
- double p_i1772_12_) {
+ public EntityToxinballSmall(World p_i1772_1_, double p_i1772_2_, double p_i1772_4_, double p_i1772_6_,
+ double p_i1772_8_, double p_i1772_10_, double p_i1772_12_) {
super(p_i1772_1_, p_i1772_2_, p_i1772_4_, p_i1772_6_, p_i1772_8_, p_i1772_10_, p_i1772_12_);
this.setSize(0.3125F, 0.3125F);
}
@@ -37,9 +31,8 @@ public class EntityToxinballSmall extends EntityToxinball {
protected void onImpact(MovingObjectPosition MoP) {
if (!this.worldObj.isRemote) {
if (MoP.entityHit != null) {
- if (!MoP.entityHit.isImmuneToFire()
- && MoP.entityHit.attackEntityFrom(
- DamageSource.causeFireballDamage(this, this.shootingEntity), 5.0F)) {
+ if (!MoP.entityHit.isImmuneToFire() && MoP.entityHit
+ .attackEntityFrom(DamageSource.causeFireballDamage(this, this.shootingEntity), 5.0F)) {
MoP.entityHit.setFire(5);
}
} else {
@@ -77,8 +70,7 @@ public class EntityToxinballSmall extends EntityToxinball {
}
/**
- * Returns true if other Entities should be prevented from moving through
- * this Entity.
+ * Returns true if other Entities should be prevented from moving through this Entity.
*/
@Override
public boolean canBeCollidedWith() {
diff --git a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java
index d8672dec2b..9bcc6ecf07 100644
--- a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java
+++ b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.fluids;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
@@ -15,6 +11,11 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+
public class BlockFluidBase extends BlockFluidClassic {
@SideOnly(Side.CLIENT)
@@ -42,9 +43,10 @@ public class BlockFluidBase extends BlockFluidClassic {
if (!(ent instanceof EntityLivingBase)) {
return;
}
- /*EntityLivingBase player = (EntityLivingBase) ent;
- int pot = world.rand.nextInt(Potion.potionTypes.length);
- Potion.potionTypes[pot].performEffect(player, 40);*/
+ /*
+ * EntityLivingBase player = (EntityLivingBase) ent; int pot = world.rand.nextInt(Potion.potionTypes.length);
+ * Potion.potionTypes[pot].performEffect(player, 40);
+ */
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java
index 59d0fd8839..54ed1f3a9e 100644
--- a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java
+++ b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.fluids;
-import gregtech.api.GregTech_API;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.block.Block;
import net.minecraft.item.EnumRarity;
import net.minecraftforge.fluids.Fluid;
+import gregtech.api.GregTech_API;
+import gtPlusPlus.core.lib.CORE;
+
public class FactoryFluid extends Fluid implements Runnable {
private final String mTextureName;
@@ -37,16 +38,8 @@ public class FactoryFluid extends Fluid implements Runnable {
aRGBa);
}
- public FactoryFluid(
- String fluidName,
- Block aBlock,
- int luminosity,
- int density,
- int temp,
- int viscosity,
- boolean gas,
- EnumRarity aRarity,
- final short[] aRGBa) {
+ public FactoryFluid(String fluidName, Block aBlock, int luminosity, int density, int temp, int viscosity,
+ boolean gas, EnumRarity aRarity, final short[] aRGBa) {
super(fluidName);
this.mRGBa = aRGBa;
this.setBlock(aBlock);
@@ -62,8 +55,7 @@ public class FactoryFluid 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)
+ 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]));
}
diff --git a/src/main/java/gtPlusPlus/core/fluids/FluidFactory.java b/src/main/java/gtPlusPlus/core/fluids/FluidFactory.java
index af7a806d31..121c217130 100644
--- a/src/main/java/gtPlusPlus/core/fluids/FluidFactory.java
+++ b/src/main/java/gtPlusPlus/core/fluids/FluidFactory.java
@@ -1,19 +1,8 @@
package gtPlusPlus.core.fluids;
-import cpw.mods.fml.common.eventhandler.Event.Result;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.GTplusplus.INIT_PHASE;
-import gtPlusPlus.api.objects.GregtechException;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.item.base.itemblock.FluidItemBlock;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.LinkedHashMap;
import java.util.Map;
+
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -26,6 +15,19 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
+import cpw.mods.fml.common.eventhandler.Event.Result;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.GTplusplus.INIT_PHASE;
+import gtPlusPlus.api.objects.GregtechException;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.item.base.itemblock.FluidItemBlock;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class FluidFactory {
public static final Map<String, Fluid> mNameToFluidMap = new LinkedHashMap<String, Fluid>();
@@ -79,9 +81,10 @@ public class FluidFactory {
/**
* Generates a 'Water' type fluid.
- * @param aID - The Fluid ID (Must be unique)
+ *
+ * @param aID - The Fluid ID (Must be unique)
* @param aUnlocalName - Unlocalized Fluid Name
- * @param aRGB - a {@link Short[]} containing the RGB of the FluidPackage.
+ * @param aRGB - a {@link Short[]} containing the RGB of the FluidPackage.
* @return - A fully constructed & registered {@linkplain FluidPackage}
*/
public static FluidPackage generate(int aID, String aUnlocalName, short[] aRGB) {
@@ -89,24 +92,26 @@ public class FluidFactory {
}
/**
- * Generate a {@link FluidPackage} from the data provided. This FluidPackage is automatically registered and handled internally.
- * Pass in {@link Short}.MIN_VALUE for any of the Fluid Fields (Besides ID, Name or RGB) and it will default to water values.
- * @param aID - The Fluid ID (Must be unique)
+ * Generate a {@link FluidPackage} from the data provided. This FluidPackage is automatically registered and handled
+ * internally. Pass in {@link Short}.MIN_VALUE for any of the Fluid Fields (Besides ID, Name or RGB) and it will
+ * default to water values.
+ *
+ * @param aID - The Fluid ID (Must be unique)
* @param aUnlocalName - Unlocalized Fluid Name
- * @param luminosity - How bright is the fluid.
- * @param density - completely arbitrary; negative density indicates that the fluid is
- * lighter than air. Default value is approximately the real-life density of water in kg/m^3.
- * @param temp - completely arbitrary; higher temperature indicates that the fluid is
- * hotter than air. Default value is approximately the real-life room temperature of water in degrees Kelvin
- * @param viscosity - completely arbitrary; negative values are not
- * permissible. Default value is approximately the real-life density of water in m/s^2 (x10^-3). *
- * Higher viscosity means that a fluid flows more slowly, like molasses.
- * Lower viscosity means that a fluid flows more quickly, like helium.
- * @param aRGB - a {@link Short[]} containing the RGB of the FluidPackage.
+ * @param luminosity - How bright is the fluid.
+ * @param density - completely arbitrary; negative density indicates that the fluid is lighter than air.
+ * Default value is approximately the real-life density of water in kg/m^3.
+ * @param temp - completely arbitrary; higher temperature indicates that the fluid is hotter than air.
+ * Default value is approximately the real-life room temperature of water in degrees Kelvin
+ * @param viscosity - completely arbitrary; negative values are not permissible. Default value is approximately
+ * the real-life density of water in m/s^2 (x10^-3). * Higher viscosity means that a fluid flows
+ * more slowly, like molasses. Lower viscosity means that a fluid flows more quickly, like
+ * helium.
+ * @param aRGB - a {@link Short[]} containing the RGB of the FluidPackage.
* @return - A fully constructed & registered {@linkplain FluidPackage}
*/
- public static FluidPackage generate(
- int aID, String aUnlocalName, int luminosity, int density, int temp, int viscosity, short[] aRGB) {
+ public static FluidPackage generate(int aID, String aUnlocalName, int luminosity, int density, int temp,
+ int viscosity, short[] aRGB) {
FluidPackage aFluidToGenerate = null;
@@ -145,8 +150,8 @@ public class FluidFactory {
return aFluidToGenerate;
}
- private static Fluid fluid(
- String aUnlocalName, int luminosity, int density, int temp, int viscosity, short[] aRGB) {
+ private static Fluid fluid(String aUnlocalName, int luminosity, int density, int temp, int viscosity,
+ short[] aRGB) {
return new FactoryFluid(aUnlocalName, luminosity, density, temp, viscosity, aRGB);
}
@@ -163,13 +168,11 @@ public class FluidFactory {
}
/**
- * Copyright © SpaceToad, 2011 http://www.mod-buildcraft.com BuildCraft is
- * distributed under the terms of the Minecraft Mod Public License 1.0, or MMPL.
- * Please check the contents of the license located in
+ * Copyright © SpaceToad, 2011 http://www.mod-buildcraft.com BuildCraft is distributed under the terms of the
+ * Minecraft Mod Public License 1.0, or MMPL. Please check the contents of the license located in
* http://www.mod-buildcraft.com/MMPL-1.0.txt
*
- * Modified version of the BC BucketHandler, except using ItemStacks > Items
- * (Why?)
+ * Modified version of the BC BucketHandler, except using ItemStacks > Items (Why?)
*
* @author Alkalus
*/
diff --git a/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java b/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
index 3a0f56c2a5..dd510957fc 100644
--- a/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
+++ b/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
@@ -2,27 +2,25 @@ package gtPlusPlus.core.fluids;
import static gtPlusPlus.core.block.ModBlocks.*;
+import net.minecraft.block.material.Material;
+import net.minecraftforge.fluids.FluidRegistry;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gtPlusPlus.core.block.general.fluids.BlockFluidSludge;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.block.material.Material;
-import net.minecraftforge.fluids.FluidRegistry;
public class FluidRegistryHandler {
// Fluids
/**
*
- * Luminosity .setLuminosity(luminosity)
- * How much light does the fluid emit. Default: 0, Lava uses 15
- * Density .setDensity(density)
- * How dense is the fluid, the only effect is whether or not a fluid replaces another fluid when they flow into each other. Default: 1000, the density of water at 4 degrees Celsius in kg/m³
- * Temperature .setTemperature(temp)
- * How hot, or cold is the fluid. Has currently no effect. Default: 295, the "normal" room temperature in degrees Kelvin, this is approximately 72°F or 22°C.
- * Viscosity .setViscosity(viscosity)
- * How thick the fluid is. Determines how fast it flows. Default: 1000 for water, lava uses 6000
- * Is Gaseous .setGaseous(boolean)
- * Indicates if the fluid is gaseous. Used for rendering. Default: false
+ * Luminosity .setLuminosity(luminosity) How much light does the fluid emit. Default: 0, Lava uses 15 Density
+ * .setDensity(density) How dense is the fluid, the only effect is whether or not a fluid replaces another fluid
+ * when they flow into each other. Default: 1000, the density of water at 4 degrees Celsius in kg/m³ Temperature
+ * .setTemperature(temp) How hot, or cold is the fluid. Has currently no effect. Default: 295, the "normal" room
+ * temperature in degrees Kelvin, this is approximately 72°F or 22°C. Viscosity .setViscosity(viscosity) How thick
+ * the fluid is. Determines how fast it flows. Default: 1000 for water, lava uses 6000 Is Gaseous
+ * .setGaseous(boolean) Indicates if the fluid is gaseous. Used for rendering. Default: false
*
*/
public static void registerFluids() {
@@ -43,9 +41,8 @@ public class FluidRegistryHandler {
fluidSludge.setUnlocalizedName("fluid.sludge");
FluidRegistry.registerFluid(fluidSludge);
blockFluidSludge = new BlockFluidSludge(fluidSludge, Material.cactus).setBlockName("fluidBlockSludge");
- GameRegistry.registerBlock(
- blockFluidSludge,
- CORE.MODID + "_" + blockFluidSludge.getUnlocalizedName().substring(5));
+ GameRegistry
+ .registerBlock(blockFluidSludge, CORE.MODID + "_" + blockFluidSludge.getUnlocalizedName().substring(5));
fluidSludge.setUnlocalizedName(blockFluidSludge.getUnlocalizedName());
}
}
diff --git a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
index ed1cc112c3..668076eb68 100644
--- a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
+++ b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
@@ -1,13 +1,9 @@
package gtPlusPlus.core.fluids;
-import cpw.mods.fml.common.eventhandler.Event;
-import gtPlusPlus.api.objects.GregtechException;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,6 +20,12 @@ import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.FillBucketEvent;
+import cpw.mods.fml.common.eventhandler.Event;
+import gtPlusPlus.api.objects.GregtechException;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class ItemGenericFluidBucket extends ItemBucket {
private static IIcon mBaseBucketTexture;
@@ -41,12 +43,16 @@ public class ItemGenericFluidBucket extends ItemBucket {
if (FluidFactory.mMetaToBucketMap.containsKey(aID)) {
try {
- throw new GregtechException("" + aID + " is already registered! Unable to register fluid: "
- + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName());
+ throw new GregtechException(
+ "" + aID
+ + " is already registered! Unable to register fluid: "
+ + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName());
} catch (GregtechException e) {
e.printStackTrace();
- CORE.crash("" + aID + " is already registered! Unable to register fluid: "
- + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName());
+ CORE.crash(
+ "" + aID
+ + " is already registered! Unable to register fluid: "
+ + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName());
}
}
mInternalFluidCache.put(FluidFactory.mMetaToBlockMap.get(aID));
@@ -56,8 +62,7 @@ public class ItemGenericFluidBucket extends ItemBucket {
Map<Integer, IIcon> mIconCache = new LinkedHashMap<Integer, IIcon>();
/**
- * Called whenever this item is equipped and the right mouse button is pressed.
- * Args: itemStack, world, entityPlayer
+ * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/
public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
@@ -255,8 +260,10 @@ public class ItemGenericFluidBucket extends ItemBucket {
} else {
return mBaseBucketTexture;
}
- /*IIcon aTemp = mIconCache.get(stack.getItemDamage());
- return aTemp != null ? aTemp : super.getIcon(stack, renderPass, player, usingItem, useRemaining);*/
+ /*
+ * IIcon aTemp = mIconCache.get(stack.getItemDamage()); return aTemp != null ? aTemp : super.getIcon(stack,
+ * renderPass, player, usingItem, useRemaining);
+ */
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
index d36de4bf28..601f91b3e9 100644
--- a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
+++ b/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java
@@ -1,13 +1,14 @@
package gtPlusPlus.core.gui.beta;
-import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
+
public class Gui_ID_Registry {
- private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap =
- new HashMap<Class<? extends IGuiManagerMiscUtils>, MU_GuiId>();
+
+ private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap<Class<? extends IGuiManagerMiscUtils>, MU_GuiId>();
private static final Map<Integer, MU_GuiId> idMap = new HashMap<Integer, MU_GuiId>();
private static int nextId = 0;
@@ -21,8 +22,8 @@ public class Gui_ID_Registry {
// EntityMinecartBeehouse.class }));
}
- private static void registerGuiHandlers(
- final Gui_Types MU_GuiType, final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) {
+ private static void registerGuiHandlers(final Gui_Types MU_GuiType,
+ final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) {
for (final Class<? extends IGuiManagerMiscUtils> tileGuiHandlerClass : guiHandlerClasses) {
final MU_GuiId guiId = new MU_GuiId(nextId++, MU_GuiType, tileGuiHandlerClass);
classMap.put(tileGuiHandlerClass, guiId);
@@ -34,8 +35,8 @@ public class Gui_ID_Registry {
final Class<? extends IGuiManagerMiscUtils> guiHandlerClass = guiHandler.getClass();
MU_GuiId guiId = classMap.get(guiHandlerClass);
if (guiId == null) {
- for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classGuiIdEntry :
- classMap.entrySet()) {
+ for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classGuiIdEntry : classMap
+ .entrySet()) {
if (((Class<?>) classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) {
guiId = classGuiIdEntry.getValue();
break;
diff --git a/src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java b/src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java
index bb095e74c0..f0bf946b23 100644
--- a/src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java
+++ b/src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java
@@ -1,6 +1,7 @@
package gtPlusPlus.core.gui.beta;
public enum Gui_Types {
+
Item,
Tile,
Entity;
diff --git a/src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java b/src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java
index faf823fdcf..8b15f5b937 100644
--- a/src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java
+++ b/src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.gui.beta;
import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils;
public class MU_GuiId {
+
private final int id;
private final Gui_Types MU_GuiType;
private final Class<? extends IGuiManagerMiscUtils> guiHandlerClass;
diff --git a/src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java
index ebd26d1f26..fa7ade3b97 100644
--- a/src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java
+++ b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java
@@ -1,8 +1,5 @@
package gtPlusPlus.core.gui.item;
-import gtPlusPlus.core.container.Container_BackpackBase;
-import gtPlusPlus.core.inventories.BaseInventoryBackpack;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.OpenGlHelper;
@@ -10,12 +7,20 @@ import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
+import gtPlusPlus.core.container.Container_BackpackBase;
+import gtPlusPlus.core.inventories.BaseInventoryBackpack;
+import gtPlusPlus.core.lib.CORE;
+
public class GuiBaseBackpack extends GuiContainer {
- /** x and y size of the inventory window in pixels. Defined as float, passed as int
- * These are used for drawing the player model. */
+
+ /**
+ * x and y size of the inventory window in pixels. Defined as float, passed as int These are used for drawing the
+ * player model.
+ */
private float xSize_lo;
private float ySize_lo;
@@ -23,14 +28,15 @@ public class GuiBaseBackpack extends GuiContainer {
/** The FontRenderer used by GuiScreen */
protected FontRenderer fontRenderer;
- /** ResourceLocation takes 2 parameters: ModId, path to texture at the location:
- * "src/minecraft/assets/modid/"
+ /**
+ * ResourceLocation takes 2 parameters: ModId, path to texture at the location: "src/minecraft/assets/modid/"
*
- * I have provided a sample texture file that works with this tutorial. Download it
- * from Forge_Tutorials/textures/gui/
+ * I have provided a sample texture file that works with this tutorial. Download it from
+ * Forge_Tutorials/textures/gui/
*/
- private static final ResourceLocation iconLocation =
- new ResourceLocation(CORE.MODID, "textures/gui/itemBackpack.png");
+ private static final ResourceLocation iconLocation = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/itemBackpack.png");
/** The inventory to render on screen */
private final BaseInventoryBackpack inventory;
@@ -55,8 +61,7 @@ public class GuiBaseBackpack extends GuiContainer {
*/
@Override
protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
- final String s = this.inventory.hasCustomInventoryName()
- ? this.inventory.getInventoryName()
+ final String s = this.inventory.hasCustomInventoryName() ? this.inventory.getInventoryName()
: this.inventory.getInventoryName();
// this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 0, 4210752);
// this.fontRenderer.drawString(I18n.translate("container.inventory"), 26, this.ySize - 96 + 4, 4210752);
@@ -80,12 +85,7 @@ public class GuiBaseBackpack extends GuiContainer {
* This renders the player model in standard inventory position (in later versions of Minecraft / Forge, you can
* simply call GuiInventory.drawEntityOnScreen directly instead of copying this code)
*/
- public static void drawPlayerModel(
- final int x,
- final int y,
- final int scale,
- final float yaw,
- final float pitch,
+ public static void drawPlayerModel(final int x, final int y, final int scale, final float yaw, final float pitch,
final EntityLivingBase entity) {
GL11.glEnable(GL11.GL_COLOR_MATERIAL);
GL11.glPushMatrix();
diff --git a/src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
index fd8a8ed7b1..3bb4d1f5e6 100644
--- a/src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
+++ b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
@@ -1,19 +1,8 @@
package gtPlusPlus.core.gui.item;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.container.Container_Grindle;
-import gtPlusPlus.core.inventories.BaseInventoryGrindle;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.util.LinkedHashSet;
import java.util.Set;
+
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiButton;
@@ -23,10 +12,24 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.container.Container_Grindle;
+import gtPlusPlus.core.inventories.BaseInventoryGrindle;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class GuiBaseGrindle extends GuiContainer {
/** The FontRenderer used by GuiScreen */
@@ -37,8 +40,9 @@ public class GuiBaseGrindle extends GuiContainer {
private String[][] mPageDataArray;
private short mCurrentPage = 0;
- private static final ResourceLocation iconLocation =
- new ResourceLocation(CORE.MODID, "textures/gui/itemGrindle.png");
+ private static final ResourceLocation iconLocation = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/itemGrindle.png");
/** The inventory to render on screen */
private final BaseInventoryGrindle inventory;
@@ -58,8 +62,7 @@ public class GuiBaseGrindle extends GuiContainer {
}
/**
- * Draw the foreground layer for the GuiContainer (everything in front of the
- * items)
+ * Draw the foreground layer for the GuiContainer (everything in front of the items)
*/
@Override
protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
@@ -83,8 +86,8 @@ public class GuiBaseGrindle extends GuiContainer {
// Debug NBT Information
// NBTUtils.tryIterateNBTData(aStack);
- this.fontRendererObj.drawString(
- I18n.format(aDataCurrent.mTitle), 10, 8, Utils.rgbtoHexValue(125, 255, 125));
+ this.fontRendererObj
+ .drawString(I18n.format(aDataCurrent.mTitle), 10, 8, Utils.rgbtoHexValue(125, 255, 125));
int tTier = aDataCurrent.mExtraInformation;
if (tTier >= 0) {
@@ -118,8 +121,8 @@ public class GuiBaseGrindle extends GuiContainer {
int posOuter = 0;
int posInner = 0;
- mPageDataArray = new String
- [MathUtils.roundToClosestInt(Math.ceil(aDataCurrent.mListData.size() / 9.00))][9];
+ mPageDataArray = new String[MathUtils
+ .roundToClosestInt(Math.ceil(aDataCurrent.mListData.size() / 9.00))][9];
for (String e : aDataCurrent.mListData) {
if (e != null) {
mPageDataArray[posInner][posOuter] = e;
@@ -189,12 +192,11 @@ public class GuiBaseGrindle extends GuiContainer {
35,
Utils.rgbtoHexValue(125, 125, 255));
int aLastYUsed = 41;
- /*for (int i=0;i<aDataCurrent.mListData.size();i++) {
- if ((aLastYUsed + 9) <= (68 + 56)) {
- this.fontRendererObj.drawString(I18n.format(aDataCurrent.mListData.get(i), new Object[0]), 10, aLastYUsed, Utils.rgbtoHexValue(125, 255, 125));
- aLastYUsed = aLastYUsed + 9;
- }
- } */
+ /*
+ * for (int i=0;i<aDataCurrent.mListData.size();i++) { if ((aLastYUsed + 9) <= (68 + 56)) {
+ * this.fontRendererObj.drawString(I18n.format(aDataCurrent.mListData.get(i), new Object[0]),
+ * 10, aLastYUsed, Utils.rgbtoHexValue(125, 255, 125)); aLastYUsed = aLastYUsed + 9; } }
+ */
}
} else {
this.fontRendererObj.drawStringWithShadow(
@@ -210,13 +212,16 @@ public class GuiBaseGrindle extends GuiContainer {
10,
8,
Utils.rgbtoHexValue(255, 125, 125));
- this.mPageDataArray = new String[][] {{}};
+ this.mPageDataArray = new String[][] { {} };
this.mCurrentPage = 0;
}
// Inventory Label
this.fontRendererObj.drawStringWithShadow(
- I18n.format("container.inventory", new Object[0]), 8, 131, Utils.rgbtoHexValue(255, 255, 255));
+ I18n.format("container.inventory", new Object[0]),
+ 8,
+ 131,
+ Utils.rgbtoHexValue(255, 255, 255));
} catch (Throwable t) {
Logger.INFO("GUI CRASH - " + t);
@@ -310,37 +315,23 @@ public class GuiBaseGrindle extends GuiContainer {
super.handleMouseInput();
int i = Mouse.getEventDWheel();
/*
- * if (i != 0) {
- *
- *
- * this.currentScroll = (float) ((double) this.currentScroll - (double) i /
- * (double) j);
- *
- * if (this.currentScroll < 0.0F) { this.currentScroll = 0.0F; }
- *
- * if (this.currentScroll > 1.0F) { this.currentScroll = 1.0F; }
- *
- * this.scrollTo(this.currentScroll); }
+ * if (i != 0) { this.currentScroll = (float) ((double) this.currentScroll - (double) i / (double) j); if
+ * (this.currentScroll < 0.0F) { this.currentScroll = 0.0F; } if (this.currentScroll > 1.0F) {
+ * this.currentScroll = 1.0F; } this.scrollTo(this.currentScroll); }
*/
}
/**
- * Called when the mouse is moved or a mouse button is released. Signature:
- * (mouseX, mouseY, which) which==-1 is mouseMove, which==0 or which==1 is
- * mouseUp
+ * Called when the mouse is moved or a mouse button is released. Signature: (mouseX, mouseY, which) which==-1 is
+ * mouseMove, which==0 or which==1 is mouseUp
*/
@Override
protected void mouseMovedOrUp(int p_146286_1_, int p_146286_2_, int p_146286_3_) {
/*
- * if (p_146286_3_ == 0) { int l = p_146286_1_ - this.guiLeft; int i1 =
- * p_146286_2_ - this.guiTop; CreativeTabs[] acreativetabs =
- * CreativeTabs.creativeTabArray; int j1 = acreativetabs.length;
- *
- * for (int k1 = 0; k1 < j1; ++k1) { CreativeTabs creativetabs =
- * acreativetabs[k1];
- *
- * if (creativetabs != null && this.func_147049_a(creativetabs, l, i1)) {
- * this.setCurrentCreativeTab(creativetabs); return; } } }
+ * if (p_146286_3_ == 0) { int l = p_146286_1_ - this.guiLeft; int i1 = p_146286_2_ - this.guiTop;
+ * CreativeTabs[] acreativetabs = CreativeTabs.creativeTabArray; int j1 = acreativetabs.length; for (int k1 = 0;
+ * k1 < j1; ++k1) { CreativeTabs creativetabs = acreativetabs[k1]; if (creativetabs != null &&
+ * this.func_147049_a(creativetabs, l, i1)) { this.setCurrentCreativeTab(creativetabs); return; } } }
*/
super.mouseMovedOrUp(p_146286_1_, p_146286_2_, p_146286_3_);
@@ -365,8 +356,7 @@ public class GuiBaseGrindle extends GuiContainer {
static {
ResourceLocation r;
try {
- r = (ResourceLocation) ReflectionUtils.getField(GuiScreenBook.class, "bookGuiTextures")
- .get(null);
+ r = (ResourceLocation) ReflectionUtils.getField(GuiScreenBook.class, "bookGuiTextures").get(null);
} catch (IllegalArgumentException | IllegalAccessException e) {
r = new ResourceLocation("textures/gui/book.png");
@@ -390,8 +380,7 @@ public class GuiBaseGrindle extends GuiContainer {
*/
public void drawButton(Minecraft aGame, int aX, int aY) {
if (this.visible) {
- boolean flag = aX >= this.xPosition
- && aY >= this.yPosition
+ boolean flag = aX >= this.xPosition && aY >= this.yPosition
&& aX < this.xPosition + this.width
&& aY < this.yPosition + this.height;
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -415,8 +404,10 @@ public class GuiBaseGrindle extends GuiContainer {
public static class GrindleData {
public static enum GrindleMode {
+
PROSPECTING(0),
ELEMENT(1);
+
private final int aModeID;
private GrindleMode(final int aMode) {
@@ -465,8 +456,7 @@ public class GuiBaseGrindle extends GuiContainer {
tNBT = new NBTTagCompound();
}
- mTitle = tNBT.hasKey("title")
- ? tNBT.getString("title")
+ mTitle = tNBT.hasKey("title") ? tNBT.getString("title")
: (aType == 0 ? "Empty Data Stick" : (aType == 1 ? "Empty Data Orb" : "Unknown Item"));
if (mTitle.toLowerCase().contains("raw prospection data")) {
isProspecting = true;
diff --git a/src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java b/src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java
index f9b0e8c161..de218fe880 100644
--- a/src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java
+++ b/src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java
@@ -1,15 +1,5 @@
package gtPlusPlus.core.gui.item;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_Grindle;
-import gtPlusPlus.core.inventories.BaseInventoryGrindle;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.NBTUtils;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
@@ -25,13 +15,26 @@ import net.minecraft.network.play.client.C17PacketCustomPayload;
import net.minecraft.util.ChatAllowedCharacters;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.ResourceLocation;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.container.Container_Grindle;
+import gtPlusPlus.core.inventories.BaseInventoryGrindle;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.NBTUtils;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
@SideOnly(Side.CLIENT)
public class GuiScreenGrindle extends GuiContainer {
+
private static final Logger logger = LogManager.getLogger();
private static final ResourceLocation bookGuiTextures = new ResourceLocation("textures/gui/book.png");
/** The player editing the book */
@@ -62,8 +65,9 @@ public class GuiScreenGrindle extends GuiContainer {
private GuiButton buttonCancel;
// Texture
- private static final ResourceLocation iconLocation =
- new ResourceLocation(CORE.MODID, "textures/gui/itemGrindle.png");
+ private static final ResourceLocation iconLocation = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/itemGrindle.png");
/** The inventory to render on screen */
private final BaseInventoryGrindle inventory;
@@ -168,8 +172,7 @@ public class GuiScreenGrindle extends GuiContainer {
}
/**
- * Called when the screen is unloaded. Used to disable keyboard repeat
- * events
+ * Called when the screen is unloaded. Used to disable keyboard repeat events
*/
@Override
public void onGuiClosed() {
@@ -177,8 +180,8 @@ public class GuiScreenGrindle extends GuiContainer {
}
private void updateButtons() {
- this.buttonNextPage.visible =
- !this.field_146480_s && ((this.currPage < (this.bookTotalPages - 1)) || this.bookIsUnsigned);
+ this.buttonNextPage.visible = !this.field_146480_s
+ && ((this.currPage < (this.bookTotalPages - 1)) || this.bookIsUnsigned);
this.buttonPreviousPage.visible = !this.field_146480_s && (this.currPage > 0);
this.buttonDone.visible = !this.bookIsUnsigned || !this.field_146480_s;
@@ -277,8 +280,7 @@ public class GuiScreenGrindle extends GuiContainer {
}
/**
- * Fired when a key is typed. This is the equivalent of
- * KeyListener.keyTyped(KeyEvent e).
+ * Fired when a key is typed. This is the equivalent of KeyListener.keyTyped(KeyEvent e).
*/
@Override
protected void keyTyped(final char p_73869_1_, final int p_73869_2_) {
@@ -388,7 +390,7 @@ public class GuiScreenGrindle extends GuiContainer {
// this.mc.getTextureManager().bindTexture(iconLocation);
// final int k = (this.width - this.bookImageWidth) / 2;
// this.drawTexturedModalRect(k, b0, 0, 0, this.bookImageWidth,
- // this.bookImageHeight);
+ // this.bookImageHeight);
String s;
String s1;
@@ -419,16 +421,16 @@ public class GuiScreenGrindle extends GuiContainer {
this.fontRendererObj.drawString(s1, k + 36 + ((116 - l) / 2), b0 + 16 + 16, 0);
final int i1 = this.fontRendererObj.getStringWidth(s);
this.fontRendererObj.drawString(s, k + 36 + ((116 - i1) / 2), b0 + 48, 0);
- final String s2 = I18n.format("book.byAuthor", new Object[] {this.editingPlayer.getCommandSenderName()});
+ final String s2 = I18n.format("book.byAuthor", new Object[] { this.editingPlayer.getCommandSenderName() });
final int j1 = this.fontRendererObj.getStringWidth(s2);
- this.fontRendererObj.drawString(
- EnumChatFormatting.DARK_GRAY + s2, k + 36 + ((116 - j1) / 2), b0 + 48 + 10, 0);
+ this.fontRendererObj
+ .drawString(EnumChatFormatting.DARK_GRAY + s2, k + 36 + ((116 - j1) / 2), b0 + 48 + 10, 0);
final String s3 = I18n.format("book.finalizeWarning", new Object[0]);
this.fontRendererObj.drawSplitString(s3, k + 36, b0 + 80, 116, 0);
} else {
s = I18n.format(
"book.pageIndicator",
- new Object[] {Integer.valueOf(this.currPage + 1), Integer.valueOf(this.bookTotalPages)});
+ new Object[] { Integer.valueOf(this.currPage + 1), Integer.valueOf(this.bookTotalPages) });
s1 = "";
if ((this.bookPages != null) && (this.currPage >= 0) && (this.currPage < this.bookPages.tagCount())) {
@@ -457,10 +459,11 @@ public class GuiScreenGrindle extends GuiContainer {
@SideOnly(Side.CLIENT)
static class NextPageButton extends GuiButton {
+
private final boolean field_146151_o;
- public NextPageButton(
- final int p_i1079_1_, final int p_i1079_2_, final int p_i1079_3_, final boolean p_i1079_4_) {
+ public NextPageButton(final int p_i1079_1_, final int p_i1079_2_, final int p_i1079_3_,
+ final boolean p_i1079_4_) {
super(p_i1079_1_, p_i1079_2_, p_i1079_3_, 23, 13, "");
this.field_146151_o = p_i1079_4_;
}
@@ -471,8 +474,7 @@ public class GuiScreenGrindle extends GuiContainer {
@Override
public void drawButton(final Minecraft p_146112_1_, final int p_146112_2_, final int p_146112_3_) {
if (this.visible) {
- final boolean flag = (p_146112_2_ >= this.xPosition)
- && (p_146112_3_ >= this.yPosition)
+ final boolean flag = (p_146112_2_ >= this.xPosition) && (p_146112_3_ >= this.yPosition)
&& (p_146112_2_ < (this.xPosition + this.width))
&& (p_146112_3_ < (this.yPosition + this.height));
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -494,8 +496,7 @@ public class GuiScreenGrindle extends GuiContainer {
}
/**
- * Draw the background layer for the GuiContainer (everything behind the
- * items)
+ * Draw the background layer for the GuiContainer (everything behind the items)
*/
@Override
protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java b/src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java
index 575419857d..a3319d48b7 100644
--- a/src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java
+++ b/src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java
@@ -1,7 +1,5 @@
package gtPlusPlus.core.gui.item.box;
-import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
-import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.RenderHelper;
@@ -9,24 +7,28 @@ import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
+import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
+import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
+
public class GuiBaseBox extends GuiContainer {
+
/**
- * x and y size of the inventory window in pixels. Defined as float, passed as
- * int These are used for drawing the player model.
+ * x and y size of the inventory window in pixels. Defined as float, passed as int These are used for drawing the
+ * player model.
*/
private float xSize_lo;
private float ySize_lo;
/**
- * ResourceLocation takes 2 parameters: ModId, path to texture at the location:
- * "src/minecraft/assets/modid/"
+ * ResourceLocation takes 2 parameters: ModId, path to texture at the location: "src/minecraft/assets/modid/"
*
- * I have provided a sample texture file that works with this tutorial. Download
- * it from Forge_Tutorials/textures/gui/
+ * I have provided a sample texture file that works with this tutorial. Download it from
+ * Forge_Tutorials/textures/gui/
*/
private final ResourceLocation iconLocation;
@@ -49,12 +51,10 @@ public class GuiBaseBox extends GuiContainer {
}
/**
- * Draw the foreground layer for the GuiContainer (everything in front of the
- * items)
+ * Draw the foreground layer for the GuiContainer (everything in front of the items)
*/
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
- String s = this.inventory.hasCustomInventoryName()
- ? this.inventory.getInventoryName()
+ String s = this.inventory.hasCustomInventoryName() ? this.inventory.getInventoryName()
: I18n.format(this.inventory.getInventoryName());
this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 0, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory"), 26, this.ySize - 96 + 4, 4210752);
@@ -80,9 +80,8 @@ public class GuiBaseBox extends GuiContainer {
}
/**
- * This renders the player model in standard inventory position (in later
- * versions of Minecraft / Forge, you can simply call
- * GuiInventory.drawEntityOnScreen directly instead of copying this code)
+ * This renders the player model in standard inventory position (in later versions of Minecraft / Forge, you can
+ * simply call GuiInventory.drawEntityOnScreen directly instead of copying this code)
*/
public static void drawPlayerModel(int x, int y, int scale, float yaw, float pitch, EntityLivingBase entity) {
GL11.glEnable(GL11.GL_COLOR_MATERIAL);
diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java
index 0b8d76a6b4..328276fe6f 100644
--- a/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java
+++ b/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java
@@ -1,10 +1,12 @@
package gtPlusPlus.core.gui.item.box;
+import net.minecraft.util.ResourceLocation;
+
import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.util.ResourceLocation;
public class LunchBoxGui extends GuiBaseBox {
+
public LunchBoxGui(ContainerBoxBase containerItem) {
super(containerItem, new ResourceLocation(CORE.MODID, "textures/gui/schematic_rocket_GS1.png"));
}
diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java
index c2665d2bf0..ff3b59b4e6 100644
--- a/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java
+++ b/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java
@@ -1,10 +1,12 @@
package gtPlusPlus.core.gui.item.box;
+import net.minecraft.util.ResourceLocation;
+
import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.util.ResourceLocation;
public class MagicBagGui extends GuiBaseBox {
+
public MagicBagGui(ContainerBoxBase containerItem) {
super(containerItem, new ResourceLocation(CORE.MODID, "textures/gui/schematic_rocket_GS1.png"));
}
diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java
index 01e3a38b4d..6d4d43ad65 100644
--- a/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java
+++ b/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java
@@ -1,10 +1,12 @@
package gtPlusPlus.core.gui.item.box;
+import net.minecraft.util.ResourceLocation;
+
import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.util.ResourceLocation;
public class ToolBoxGui extends GuiBaseBox {
+
public ToolBoxGui(ContainerBoxBase containerItem) {
super(containerItem, new ResourceLocation(CORE.MODID, "textures/gui/schematic_rocket_GS1.png"));
}
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java
index 94e7aab248..be838a979b 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java
@@ -1,20 +1,23 @@
package gtPlusPlus.core.gui.machine;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.container.Container_CircuitProgrammer;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GUI_CircuitProgrammer extends GuiContainer {
- private static final ResourceLocation craftingTableGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/CircuitProgrammer.png");
+ private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/CircuitProgrammer.png");
public GUI_CircuitProgrammer(final InventoryPlayer player_inventory, final TileEntityCircuitProgrammer te) {
super(new Container_CircuitProgrammer(player_inventory, te));
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java
index 76c718511a..5c488bfb6d 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java
@@ -1,20 +1,23 @@
package gtPlusPlus.core.gui.machine;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.container.Container_DecayablesChest;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GUI_DecayablesChest extends GuiContainer {
- private static final ResourceLocation craftingTableGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/FishTrap.png");
+ private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/FishTrap.png");
public GUI_DecayablesChest(final InventoryPlayer player_inventory, final TileEntityDecayablesChest te) {
super(new Container_DecayablesChest(player_inventory, te));
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java
index a931fc93c5..013db179e1 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java
@@ -1,21 +1,24 @@
package gtPlusPlus.core.gui.machine;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_EggBox;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityEggBox;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.container.Container_EggBox;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityEggBox;
+
@SideOnly(Side.CLIENT)
public class GUI_EggBox extends GuiContainer {
- private static final ResourceLocation craftingTableGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/FishTrap.png");
+ private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/FishTrap.png");
public GUI_EggBox(final InventoryPlayer player_inventory, final TileEntityEggBox te) {
super(new Container_EggBox(player_inventory, te));
@@ -24,8 +27,8 @@ public class GUI_EggBox extends GuiContainer {
@Override
protected void drawGuiContainerForegroundLayer(final int i, final int j) {
// this.fontRendererObj.drawString(I18n.format("Workbench", new Object[0]), 28, 6, 4210752);
- this.fontRendererObj.drawString(
- I18n.format("container.EggBox", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
+ this.fontRendererObj
+ .drawString(I18n.format("container.EggBox", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java
index e751f6eeee..285bdf866d 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java
@@ -1,20 +1,23 @@
package gtPlusPlus.core.gui.machine;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.container.Container_FishTrap;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GUI_FishTrap extends GuiContainer {
- private static final ResourceLocation craftingTableGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/FishTrap.png");
+ private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/FishTrap.png");
public GUI_FishTrap(final InventoryPlayer player_inventory, final TileEntityFishTrap te) {
super(new Container_FishTrap(player_inventory, te));
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java
index 6aafc46a08..0add8ad63f 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java
@@ -1,20 +1,23 @@
package gtPlusPlus.core.gui.machine;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.container.Container_HeliumGenerator;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.general.TileEntityHeliumGenerator;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GUI_HeliumGenerator extends GuiContainer {
- private static final ResourceLocation guiTexture =
- new ResourceLocation(CORE.MODID, "textures/gui/helium_collector_gui.png");
+ private static final ResourceLocation guiTexture = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/helium_collector_gui.png");
public GUI_HeliumGenerator(final InventoryPlayer player_inventory, final TileEntityHeliumGenerator te) {
super(new Container_HeliumGenerator(player_inventory, te));
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java
index 14e37a7f87..6f128c7005 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java
@@ -1,22 +1,25 @@
package gtPlusPlus.core.gui.machine;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_ModularityTable;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.container.Container_ModularityTable;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
+
@SideOnly(Side.CLIENT)
public class GUI_ModularityTable extends GuiContainer {
- private static final ResourceLocation craftingTableGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/ModularityTable.png");
+ private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/ModularityTable.png");
private Container_ModularityTable mThisContainer;
private TileEntityModularityTable mThisTile;
private int mRecipeTime = -1;
@@ -40,11 +43,11 @@ public class GUI_ModularityTable extends GuiContainer {
if (mRecipeTime > -1) {
this.fontRendererObj.drawString(I18n.format("Time", new Object[0]), 84, 42, 4210752);
this.fontRendererObj.drawString(I18n.format("Remaining", new Object[0]), 84, 50, 4210752);
- this.fontRendererObj.drawString(
- I18n.format("" + this.mRecipeTime + " Ticks", new Object[0]), 84, 58, 4210752);
+ this.fontRendererObj
+ .drawString(I18n.format("" + this.mRecipeTime + " Ticks", new Object[0]), 84, 58, 4210752);
}
- this.fontRendererObj.drawString(
- I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
+ this.fontRendererObj
+ .drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java
index 45a1bb6049..feaa95000c 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java
@@ -1,13 +1,7 @@
package gtPlusPlus.core.gui.machine;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_PestKiller;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.MISC_MATERIALS;
-import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
-import gtPlusPlus.core.util.math.MathUtils;
import java.awt.Color;
+
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.InventoryPlayer;
@@ -15,13 +9,23 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.IFluidTank;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.container.Container_PestKiller;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
+import gtPlusPlus.core.util.math.MathUtils;
+
@SideOnly(Side.CLIENT)
public class GUI_PestKiller extends GuiContainer {
- private static final ResourceLocation craftingTableGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/PestKiller.png");
+ private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/PestKiller.png");
private final TileEntityPestKiller mTileKiller;
public GUI_PestKiller(final InventoryPlayer player_inventory, final TileEntityPestKiller te) {
@@ -93,8 +97,7 @@ public class GUI_PestKiller extends GuiContainer {
this.fontRendererObj.drawString("Tier: 1", 4, 18, 4210752);
this.fontRendererObj.drawString("Range: 5x5", 4, 30, 4210752);
this.fontRendererObj.drawString("Poison: ", 4, 42, 4210752);
- this.fontRendererObj.drawString(
- "" + aTile.getTank().getFluid().getLocalizedName(), 4, 54, 4210752);
+ this.fontRendererObj.drawString("" + aTile.getTank().getFluid().getLocalizedName(), 4, 54, 4210752);
this.fontRendererObj.drawString("Amount: " + aTile.getTank().getFluidAmount(), 4, 64, 4210752);
didRender = true;
} else if (aTier == 2) {
@@ -111,8 +114,7 @@ public class GUI_PestKiller extends GuiContainer {
this.fontRendererObj.drawString("Tier: 2", 4, 18, 4210752);
this.fontRendererObj.drawString("Range: 9x9", 4, 30, 4210752);
this.fontRendererObj.drawString("Poison: ", 4, 42, 4210752);
- this.fontRendererObj.drawString(
- "" + aTile.getTank().getFluid().getLocalizedName(), 4, 54, 4210752);
+ this.fontRendererObj.drawString("" + aTile.getTank().getFluid().getLocalizedName(), 4, 54, 4210752);
this.fontRendererObj.drawString("Amount: " + aTile.getTank().getFluidAmount(), 4, 64, 4210752);
didRender = true;
}
@@ -126,13 +128,11 @@ public class GUI_PestKiller extends GuiContainer {
}
/*
- * FluidStack fluid = tank.getFluid(); TextureManager manager =
- * mc.getTextureManager(); if (fluid != null) {
- * manager.bindTexture(manager.getResourceLocation(0)); float amount =
- * fluid.amount; float capacity = tank.getCapacity(); float scale = amount /
- * capacity; int fluidTankHeight = 60; int fluidAmount = (int) (scale *
- * fluidTankHeight); drawFluid(x, y + fluidTankHeight - fluidAmount,
- * fluid.getFluid().getIcon(fluid), 16, fluidAmount); }
+ * FluidStack fluid = tank.getFluid(); TextureManager manager = mc.getTextureManager(); if (fluid != null) {
+ * manager.bindTexture(manager.getResourceLocation(0)); float amount = fluid.amount; float capacity =
+ * tank.getCapacity(); float scale = amount / capacity; int fluidTankHeight = 60; int fluidAmount = (int) (scale
+ * * fluidTankHeight); drawFluid(x, y + fluidTankHeight - fluidAmount, fluid.getFluid().getIcon(fluid), 16,
+ * fluidAmount); }
*/
}
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java
index 37258584af..69ecee7f1f 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java
@@ -1,21 +1,24 @@
package gtPlusPlus.core.gui.machine;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_ProjectTable;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.container.Container_ProjectTable;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
+
@SideOnly(Side.CLIENT)
public class GUI_ProjectTable extends GuiContainer {
- private static final ResourceLocation craftingTableGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/ProjectTable.png");
+ private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/ProjectTable.png");
public GUI_ProjectTable(final InventoryPlayer player_inventory, final TileEntityProjectTable tile) {
super(new Container_ProjectTable(player_inventory, tile));
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
index fc1f0c7bed..ef95e920cd 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
@@ -1,34 +1,40 @@
package gtPlusPlus.core.gui.machine;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.container.Container_RoundRobinator;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Method;
+
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.container.Container_RoundRobinator;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
@SideOnly(Side.CLIENT)
public class GUI_RoundRobinator extends GuiContainer {
- private static final ResourceLocation craftingTableGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/RoundRobinator.png");
+ private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/RoundRobinator.png");
private TileEntityRoundRobinator mTile;
private Container_RoundRobinator mContainer;
private static final Method mDrawItemStack;
static {
mDrawItemStack = ReflectionUtils.getMethod(
- GuiContainer.class, "drawItemStack", new Class[] {ItemStack.class, int.class, int.class, String.class});
+ GuiContainer.class,
+ "drawItemStack",
+ new Class[] { ItemStack.class, int.class, int.class, String.class });
}
public GUI_RoundRobinator(final InventoryPlayer player_inventory, final TileEntityRoundRobinator te) {
@@ -56,21 +62,18 @@ public class GUI_RoundRobinator extends GuiContainer {
fontRendererObj.drawString("Tier: " + tier, 85, 12, Utils.rgbtoHexValue(50, 150, 50));
fontRendererObj.drawString("Rate: 1 Item/" + aTickRate + "t", 85, 20, Utils.rgbtoHexValue(50, 150, 50));
- boolean[] aStates = new boolean[] {
- mContainer.mSide_1 == 0 ? false : true,
- mContainer.mSide_2 == 0 ? false : true,
- mContainer.mSide_3 == 0 ? false : true,
- mContainer.mSide_4 == 0 ? false : true
- };
-
- fontRendererObj.drawString(
- "West: " + (aStates[0] ? "Active" : "Disabled"), 5, 5, Utils.rgbtoHexValue(50, 50, 50));
- fontRendererObj.drawString(
- "North: " + (aStates[1] ? "Active" : "Disabled"), 5, 15, Utils.rgbtoHexValue(50, 50, 50));
- fontRendererObj.drawString(
- "South: " + (aStates[2] ? "Active" : "Disabled"), 5, 25, Utils.rgbtoHexValue(50, 50, 50));
- fontRendererObj.drawString(
- "East: " + (aStates[3] ? "Active" : "Disabled"), 5, 35, Utils.rgbtoHexValue(50, 50, 50));
+ boolean[] aStates = new boolean[] { mContainer.mSide_1 == 0 ? false : true,
+ mContainer.mSide_2 == 0 ? false : true, mContainer.mSide_3 == 0 ? false : true,
+ mContainer.mSide_4 == 0 ? false : true };
+
+ fontRendererObj
+ .drawString("West: " + (aStates[0] ? "Active" : "Disabled"), 5, 5, Utils.rgbtoHexValue(50, 50, 50));
+ fontRendererObj
+ .drawString("North: " + (aStates[1] ? "Active" : "Disabled"), 5, 15, Utils.rgbtoHexValue(50, 50, 50));
+ fontRendererObj
+ .drawString("South: " + (aStates[2] ? "Active" : "Disabled"), 5, 25, Utils.rgbtoHexValue(50, 50, 50));
+ fontRendererObj
+ .drawString("East: " + (aStates[3] ? "Active" : "Disabled"), 5, 35, Utils.rgbtoHexValue(50, 50, 50));
fontRendererObj.drawString("Toggling South will visually", 5, 65, Utils.rgbtoHexValue(150, 50, 50));
fontRendererObj.drawString("toggle East, This is a visual bug.", 5, 74, Utils.rgbtoHexValue(150, 50, 50));
drawStatus(aStates[0], xStart, yStart);
@@ -103,9 +106,9 @@ public class GUI_RoundRobinator extends GuiContainer {
if (mDrawItemStack != null) {
try {
if (aStateActive) {
- mDrawItemStack.invoke(this, new Object[] {aGreenGlass, x, y, ""});
+ mDrawItemStack.invoke(this, new Object[] { aGreenGlass, x, y, "" });
} else {
- mDrawItemStack.invoke(this, new Object[] {aRedGlass, x, y, ""});
+ mDrawItemStack.invoke(this, new Object[] { aRedGlass, x, y, "" });
}
} catch (Throwable t) {
t.printStackTrace();
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java
index d54f6b9364..8a31d4ae98 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.gui.machine;
-import com.google.common.collect.Lists;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -11,6 +7,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiOptionButton;
import net.minecraft.client.gui.GuiResourcePackAvailable;
@@ -22,19 +19,26 @@ import net.minecraft.client.resources.ResourcePackListEntryFound;
import net.minecraft.client.resources.ResourcePackRepository;
import net.minecraft.client.resources.ResourcePackRepository.Entry;
import net.minecraft.util.Util;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.lwjgl.Sys;
+import com.google.common.collect.Lists;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
@SideOnly(Side.CLIENT)
public class GUI_ScrollTest extends GuiScreen {
+
private static final Logger logger = LogManager.getLogger();
private GuiScreen aThisGUIScreen;
private List<?> field_146966_g;
private List<?> field_146969_h;
private GuiResourcePackAvailable MapOfFreeResourcePacks;
private GuiResourcePackSelected MapOfActiveResourcePacks;
- private static final String __OBFID = "CL_00000820";
public GUI_ScrollTest(GuiScreen p_i45050_1_) {
this.aThisGUIScreen = p_i45050_1_;
@@ -45,8 +49,12 @@ public class GUI_ScrollTest extends GuiScreen {
*/
@SuppressWarnings("unchecked")
public void initGui() {
- this.buttonList.add(new GuiOptionButton(
- 2, this.width / 2 - 154, this.height - 48, I18n.format("resourcePack.openFolder", new Object[0])));
+ this.buttonList.add(
+ new GuiOptionButton(
+ 2,
+ this.width / 2 - 154,
+ this.height - 48,
+ I18n.format("resourcePack.openFolder", new Object[0])));
this.buttonList.add(
new GuiOptionButton(1, this.width / 2 + 4, this.height - 48, I18n.format("gui.done", new Object[0])));
this.field_146966_g = new ArrayList<Object>();
@@ -104,13 +112,13 @@ public class GUI_ScrollTest extends GuiScreen {
if (Util.getOSType() == Util.EnumOS.OSX) {
try {
logger.info(s);
- Runtime.getRuntime().exec(new String[] {"/usr/bin/open", s});
+ Runtime.getRuntime().exec(new String[] { "/usr/bin/open", s });
return;
} catch (IOException ioexception1) {
logger.error("Couldn\'t open file", ioexception1);
}
} else if (Util.getOSType() == Util.EnumOS.WINDOWS) {
- String s1 = String.format("cmd.exe /C start \"Open file\" \"%s\"", new Object[] {s});
+ String s1 = String.format("cmd.exe /C start \"Open file\" \"%s\"", new Object[] { s });
try {
Runtime.getRuntime().exec(s1);
@@ -126,8 +134,8 @@ public class GUI_ScrollTest extends GuiScreen {
Class<?> oclass = ReflectionUtils.getClass("java.awt.Desktop");
Object object = ReflectionUtils.getMethod(oclass, "getDesktop", new Class[0])
.invoke((Object) null, new Object[0]);
- ReflectionUtils.getMethod(oclass, "browse", new Class[] {URI.class})
- .invoke(object, new Object[] {file1.toURI()});
+ ReflectionUtils.getMethod(oclass, "browse", new Class[] { URI.class })
+ .invoke(object, new Object[] { file1.toURI() });
} catch (Throwable throwable) {
logger.error("Couldn\'t open link", throwable);
flag = true;
@@ -176,7 +184,7 @@ public class GUI_ScrollTest extends GuiScreen {
}
/**
- * Called when the mouse is moved or a mouse button is released. Signature: (mouseX, mouseY, which) which==-1 is
+ * Called when the mouse is moved or a mouse button is released. Signature: (mouseX, mouseY, which) which==-1 is
* mouseMove, which==0 or which==1 is mouseUp
*/
protected void mouseMovedOrUp(int p_146286_1_, int p_146286_2_, int p_146286_3_) {
@@ -191,7 +199,11 @@ public class GUI_ScrollTest extends GuiScreen {
this.MapOfFreeResourcePacks.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
this.MapOfActiveResourcePacks.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
this.drawCenteredString(
- this.fontRendererObj, I18n.format("resourcePack.title", new Object[0]), this.width / 2, 16, 16777215);
+ this.fontRendererObj,
+ I18n.format("resourcePack.title", new Object[0]),
+ this.width / 2,
+ 16,
+ 16777215);
this.drawCenteredString(
this.fontRendererObj,
I18n.format("resourcePack.folderInfo", new Object[0]),
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java
index 2349e0024d..c166127c13 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java
@@ -1,22 +1,26 @@
package gtPlusPlus.core.gui.machine;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.block.machine.Machine_SuperJukebox.TileEntitySuperJukebox;
import gtPlusPlus.core.container.Container_SuperJukebox;
import gtPlusPlus.core.gui.GUI_Base_Tile_Entity;
import gtPlusPlus.core.lib.CORE;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GUI_SuperJukebox extends GUI_Base_Tile_Entity {
- private static final ResourceLocation craftingTableGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/SuperJukebox.png");
+ private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/SuperJukebox.png");
private final Container_SuperJukebox mThisContainer;
public GUI_SuperJukebox(final InventoryPlayer player_inventory, final TileEntitySuperJukebox te) {
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java
index dd59baf697..5d1700e05d 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java
@@ -1,16 +1,18 @@
package gtPlusPlus.core.gui.machine;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.container.Container_TradeTable;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GUI_TradeTable extends GuiContainer {
@@ -18,11 +20,12 @@ public class GUI_TradeTable extends GuiContainer {
TileEntityTradeTable mThisTable;
String mOwnerName;
- private static final ResourceLocation craftingTableGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/ProjectTable.png");
+ private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/ProjectTable.png");
- public GUI_TradeTable(
- final InventoryPlayer player_inventory, final TileEntityTradeTable te, final String mOwnerName) {
+ public GUI_TradeTable(final InventoryPlayer player_inventory, final TileEntityTradeTable te,
+ final String mOwnerName) {
super(new Container_TradeTable(player_inventory, te));
if (te.isServerSide()) {
mThisTable = te;
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java
index 1405d0229d..091e9948ab 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java
@@ -1,5 +1,12 @@
package gtPlusPlus.core.gui.machine;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.api.objects.Logger;
@@ -9,17 +16,13 @@ import gtPlusPlus.core.handler.PacketHandler;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui;
import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GUI_VolumetricFlaskSetter extends GuiContainer {
- private static final ResourceLocation mGuiTextures =
- new ResourceLocation(CORE.MODID, "textures/gui/VolumetricFlaskSetter.png");
+ private static final ResourceLocation mGuiTextures = new ResourceLocation(
+ CORE.MODID,
+ "textures/gui/VolumetricFlaskSetter.png");
private Container_VolumetricFlaskSetter mContainer;
private boolean mIsOpen = false;
private GuiValueField mText;
@@ -70,7 +73,14 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer {
// Keyboard.enableRepeatEvents(true);
mIsOpen = true;
this.mText = new GuiValueField(
- this.fontRendererObj, 26, 31, this.width / 2 - 62, this.height / 2 - 52, 106, 14, this);
+ this.fontRendererObj,
+ 26,
+ 31,
+ this.width / 2 - 62,
+ this.height / 2 - 52,
+ 106,
+ 14,
+ this);
mText.setMaxStringLength(5);
mText.setEnableBackgroundDrawing(true);
mText.setText("0");
diff --git a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
index 97ccf0b248..ebd33600d3 100644
--- a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
+++ b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
@@ -1,12 +1,14 @@
package gtPlusPlus.core.gui.widget;
-import gtPlusPlus.core.gui.machine.GUI_VolumetricFlaskSetter;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.DevHelper;
import java.lang.reflect.Field;
+
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiTextField;
+import gtPlusPlus.core.gui.machine.GUI_VolumetricFlaskSetter;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.DevHelper;
+
public class GuiValueField extends GuiTextField {
private final FontRenderer mFontRenderer;
@@ -14,15 +16,8 @@ public class GuiValueField extends GuiTextField {
private final int mScreenLocationY;
private final GUI_VolumetricFlaskSetter mGUI;
- public GuiValueField(
- FontRenderer aFontRenderer,
- int aX,
- int aY,
- int aScreenLocationX,
- int aScreenLocationY,
- int aWidth,
- int aHeight,
- GUI_VolumetricFlaskSetter aGUI) {
+ public GuiValueField(FontRenderer aFontRenderer, int aX, int aY, int aScreenLocationX, int aScreenLocationY,
+ int aWidth, int aHeight, GUI_VolumetricFlaskSetter aGUI) {
super(aFontRenderer, aX, aY, aWidth, aHeight);
mFontRenderer = aFontRenderer;
mScreenLocationX = aScreenLocationX;
@@ -31,8 +26,8 @@ public class GuiValueField extends GuiTextField {
}
public boolean canLoseFocus() {
- Field canLoseFocus = ReflectionUtils.getField(
- GuiTextField.class, DevHelper.isObfuscatedEnvironment() ? "field_146212_n" : "canLoseFocus");
+ Field canLoseFocus = ReflectionUtils
+ .getField(GuiTextField.class, DevHelper.isObfuscatedEnvironment() ? "field_146212_n" : "canLoseFocus");
if (canLoseFocus != null) {
return (boolean) ReflectionUtils.getFieldValue(canLoseFocus, this);
}
@@ -46,7 +41,8 @@ public class GuiValueField extends GuiTextField {
public boolean isBackgroundDrawingEnabled() {
Field enableBackgroundDrawing = ReflectionUtils.getField(
- GuiTextField.class, DevHelper.isObfuscatedEnvironment() ? "field_146215_m" : "enableBackgroundDrawing");
+ GuiTextField.class,
+ DevHelper.isObfuscatedEnvironment() ? "field_146215_m" : "enableBackgroundDrawing");
if (enableBackgroundDrawing != null) {
return (boolean) ReflectionUtils.getFieldValue(enableBackgroundDrawing, this);
}
@@ -55,7 +51,8 @@ public class GuiValueField extends GuiTextField {
public int getLineScrollOffset() {
Field lineScrollOffset = ReflectionUtils.getField(
- GuiTextField.class, DevHelper.isObfuscatedEnvironment() ? "field_146225_q" : "lineScrollOffset");
+ GuiTextField.class,
+ DevHelper.isObfuscatedEnvironment() ? "field_146225_q" : "lineScrollOffset");
if (lineScrollOffset != null) {
return (int) ReflectionUtils.getFieldValue(lineScrollOffset, this);
}
@@ -64,8 +61,7 @@ public class GuiValueField extends GuiTextField {
public boolean didClickInTextField(int aX, int aY) {
mGUI.log("Clicked at X:" + aX + ", Y:" + aY);
- boolean aDidClick = aX >= this.mScreenLocationX
- && aX < this.mScreenLocationX + this.width
+ boolean aDidClick = aX >= this.mScreenLocationX && aX < this.mScreenLocationX + this.width
&& aY >= this.mScreenLocationY
&& aY < this.mScreenLocationY + this.height;
mGUI.log("Did click in textbox? " + aDidClick);
@@ -92,18 +88,16 @@ public class GuiValueField extends GuiTextField {
}
if (aButton == 0) {
mGUI.log("Left clicked in text box.");
- String s = this.mFontRenderer.trimStringToWidth(
- this.getText().substring(getLineScrollOffset()), this.getWidth());
- this.setCursorPosition(
- this.mFontRenderer.trimStringToWidth(s, l).length() + getLineScrollOffset());
+ String s = this.mFontRenderer
+ .trimStringToWidth(this.getText().substring(getLineScrollOffset()), this.getWidth());
+ this.setCursorPosition(this.mFontRenderer.trimStringToWidth(s, l).length() + getLineScrollOffset());
} else if (aButton == 1) {
mGUI.log("Right clicked in text box.");
mGUI.setText(0);
mGUI.sendUpdateToServer();
- String s = this.mFontRenderer.trimStringToWidth(
- this.getText().substring(getLineScrollOffset()), this.getWidth());
- this.setCursorPosition(
- this.mFontRenderer.trimStringToWidth(s, l).length() + getLineScrollOffset());
+ String s = this.mFontRenderer
+ .trimStringToWidth(this.getText().substring(getLineScrollOffset()), this.getWidth());
+ this.setCursorPosition(this.mFontRenderer.trimStringToWidth(s, l).length() + getLineScrollOffset());
}
} else {
mGUI.log("Clicked, but no focus.");
diff --git a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java
index 8fe7c355d5..ee1dfe984e 100644
--- a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java
@@ -1,5 +1,15 @@
package gtPlusPlus.core.handler;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.Achievement;
+import net.minecraft.stats.StatBase;
+import net.minecraftforge.common.AchievementPage;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
+
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
@@ -17,14 +27,6 @@ import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import java.util.concurrent.ConcurrentHashMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.stats.Achievement;
-import net.minecraft.stats.StatBase;
-import net.minecraftforge.common.AchievementPage;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
public class AchievementHandler {
@@ -47,7 +49,11 @@ public class AchievementHandler {
0,
0,
MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
- MetaGeneratedGregtechTools.ANGLE_GRINDER, 1, Materials.Osmium, Materials.Osmium, null),
+ MetaGeneratedGregtechTools.ANGLE_GRINDER,
+ 1,
+ Materials.Osmium,
+ Materials.Osmium,
+ null),
"",
true);
@@ -55,7 +61,12 @@ public class AchievementHandler {
boolean cores = CORE.ConfigSwitches.requireControlCores;
if (cores || GregtechMeta_MultiBlockBase.DEBUG_DISABLE_CORES_TEMPORARILY) {
this.registerAchievement(
- "hatch.control", -2, -2, GregtechItemList.Hatch_Control_Core.get(1), aBaseAchievementName, false);
+ "hatch.control",
+ -2,
+ -2,
+ GregtechItemList.Hatch_Control_Core.get(1),
+ aBaseAchievementName,
+ false);
}
this.registerAchievement(
"hatch.dynamo.buffered",
@@ -82,20 +93,50 @@ public class AchievementHandler {
// Blocks
this.registerAchievement(
- "block.fishtrap", -2, 2, ItemUtils.getSimpleStack(ModBlocks.blockFishTrap), "dust.potin", false);
+ "block.fishtrap",
+ -2,
+ 2,
+ ItemUtils.getSimpleStack(ModBlocks.blockFishTrap),
+ "dust.potin",
+ false);
this.registerAchievement(
- "block.withercage", -2, 4, ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard), "dust.eglin", false);
+ "block.withercage",
+ -2,
+ 4,
+ ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard),
+ "dust.eglin",
+ false);
// Machines (-10/-8/-6)
this.registerAchievement("rtg", -16, -10, GregtechItemList.RTG.get(1), aBaseAchievementName, false);
this.registerAchievement(
- "dehydrate", -15, -10, GregtechItemList.GT_Dehydrator_HV.get(1), aBaseAchievementName, false);
+ "dehydrate",
+ -15,
+ -10,
+ GregtechItemList.GT_Dehydrator_HV.get(1),
+ aBaseAchievementName,
+ false);
this.registerAchievement(
- "semifluid", -14, -10, GregtechItemList.Generator_SemiFluid_HV.get(1), aBaseAchievementName, false);
+ "semifluid",
+ -14,
+ -10,
+ GregtechItemList.Generator_SemiFluid_HV.get(1),
+ aBaseAchievementName,
+ false);
this.registerAchievement(
- "earlywasher", -13, -10, GregtechItemList.SimpleDustWasher_ULV.get(1), aBaseAchievementName, false);
+ "earlywasher",
+ -13,
+ -10,
+ GregtechItemList.SimpleDustWasher_ULV.get(1),
+ aBaseAchievementName,
+ false);
this.registerAchievement(
- "advancedsteam", -12, -10, GregtechItemList.Boiler_Advanced_MV.get(1), aBaseAchievementName, false);
+ "advancedsteam",
+ -12,
+ -10,
+ GregtechItemList.Boiler_Advanced_MV.get(1),
+ aBaseAchievementName,
+ false);
if (PollutionUtils.isPollutionEnabled()) {
this.registerAchievement(
"pollutionremoval",
@@ -106,24 +147,54 @@ public class AchievementHandler {
false);
}
this.registerAchievement(
- "hiampxform", -10, -10, GregtechItemList.Transformer_HA_HV_MV.get(1), aBaseAchievementName, false);
+ "hiampxform",
+ -10,
+ -10,
+ GregtechItemList.Transformer_HA_HV_MV.get(1),
+ aBaseAchievementName,
+ false);
// Multis (-4/-2/0)
this.registerAchievement("multi.pss", -16, -7, GregtechItemList.PowerSubStation.get(1), "multi.abs", false);
this.registerAchievement("multi.cyclo", -15, -7, GregtechItemList.COMET_Cyclotron.get(1), "multi.abs", false);
this.registerAchievement(
- "multi.sifter", -14, -7, GregtechItemList.Industrial_Sifter.get(1), "dust.eglin", false);
+ "multi.sifter",
+ -14,
+ -7,
+ GregtechItemList.Industrial_Sifter.get(1),
+ "dust.eglin",
+ false);
this.registerAchievement(
- "multi.cokeoven", -13, -7, GregtechItemList.Industrial_CokeOven.get(1), "multi.abs", false);
+ "multi.cokeoven",
+ -13,
+ -7,
+ GregtechItemList.Industrial_CokeOven.get(1),
+ "multi.abs",
+ false);
this.registerAchievement(
- "multi.boiler.thermal", -12, -7, GregtechItemList.GT4_Thermal_Boiler.get(1), "multi.abs", false);
+ "multi.boiler.thermal",
+ -12,
+ -7,
+ GregtechItemList.GT4_Thermal_Boiler.get(1),
+ "multi.abs",
+ false);
this.registerAchievement(
- "multi.zhuhai", -11, -7, GregtechItemList.Industrial_FishingPond.get(1), aBaseAchievementName, false);
+ "multi.zhuhai",
+ -11,
+ -7,
+ GregtechItemList.Industrial_FishingPond.get(1),
+ aBaseAchievementName,
+ false);
// this.registerAchievement("rtg", -4, -4, GregtechItemList.RTG.get(1), aBaseAchievementName, false);
// Casings
this.registerAchievement(
- "casing.abs", 2, -10, GregtechItemList.Casing_Coil_BlastSmelter.get(1), aBaseAchievementName, false);
+ "casing.abs",
+ 2,
+ -10,
+ GregtechItemList.Casing_Coil_BlastSmelter.get(1),
+ aBaseAchievementName,
+ false);
this.registerAchievement(
"casing.cyclotron.coil",
3,
@@ -132,17 +203,42 @@ public class AchievementHandler {
aBaseAchievementName,
false);
this.registerAchievement(
- "casing.multiuse", 4, -10, GregtechItemList.Casing_Multi_Use.get(1), aBaseAchievementName, false);
+ "casing.multiuse",
+ 4,
+ -10,
+ GregtechItemList.Casing_Multi_Use.get(1),
+ aBaseAchievementName,
+ false);
this.registerAchievement(
- "casing.containment", 5, -10, GregtechItemList.Casing_Containment.get(1), aBaseAchievementName, false);
+ "casing.containment",
+ 5,
+ -10,
+ GregtechItemList.Casing_Containment.get(1),
+ aBaseAchievementName,
+ false);
// Radioactive
this.registerAchievement(
- "decay.neptunium238", 11, 8, ItemUtils.getSimpleStack(ModItems.dustNeptunium238), "multi.cyclo", false);
+ "decay.neptunium238",
+ 11,
+ 8,
+ ItemUtils.getSimpleStack(ModItems.dustNeptunium238),
+ "multi.cyclo",
+ false);
this.registerAchievement(
- "decay.radium226", 12, 8, ItemUtils.getSimpleStack(ModItems.dustRadium226), "multi.cyclo", false);
+ "decay.radium226",
+ 12,
+ 8,
+ ItemUtils.getSimpleStack(ModItems.dustRadium226),
+ "multi.cyclo",
+ false);
this.registerAchievement(
- "decay.molybdenum99", 13, 8, ItemUtils.getSimpleStack(ModItems.dustMolybdenum99), "multi.cyclo", false);
+ "decay.molybdenum99",
+ 13,
+ 8,
+ ItemUtils.getSimpleStack(ModItems.dustMolybdenum99),
+ "multi.cyclo",
+ false);
this.registerAchievement(
"decay.technetium99m",
14,
@@ -151,16 +247,24 @@ public class AchievementHandler {
"multi.cyclo",
false);
this.registerAchievement(
- "decay.technetium99", 15, 8, ItemUtils.getSimpleStack(ModItems.dustTechnetium99), "multi.cyclo", false);
+ "decay.technetium99",
+ 15,
+ 8,
+ ItemUtils.getSimpleStack(ModItems.dustTechnetium99),
+ "multi.cyclo",
+ false);
- AchievementPage.registerAchievementPage(new AchievementPage("GT++", (Achievement[])
- ((Achievement[]) this.achievementList.values().toArray(new Achievement[this.achievementList.size()]))));
+ AchievementPage.registerAchievementPage(
+ new AchievementPage(
+ "GT++",
+ (Achievement[]) ((Achievement[]) this.achievementList.values()
+ .toArray(new Achievement[this.achievementList.size()]))));
MinecraftForge.EVENT_BUS.register(this);
FMLCommonHandler.instance().bus().register(this);
}
- public Achievement registerAchievement(
- String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) {
+ public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement,
+ boolean special) {
Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon, requirement);
if (special) {
achievement.setSpecial();
@@ -176,10 +280,15 @@ public class AchievementHandler {
return achievement;
}
- public Achievement registerAchievement(
- String textId, int x, int y, ItemStack icon, String requirement, boolean special) {
- Achievement achievement =
- new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon, this.getAchievement(requirement));
+ public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, String requirement,
+ boolean special) {
+ Achievement achievement = new Achievement(
+ textId,
+ textId,
+ this.adjX + x,
+ this.adjY + y,
+ icon,
+ this.getAchievement(requirement));
if (special) {
achievement.setSpecial();
}
@@ -205,9 +314,10 @@ public class AchievementHandler {
}
/**
- * A generic handler that will give an achievement for an item.
- * Useful to only write this once, then call it from all handlers.
- * @param aStack - The Itemstack to check for achievements.
+ * A generic handler that will give an achievement for an item. Useful to only write this once, then call it from
+ * all handlers.
+ *
+ * @param aStack - The Itemstack to check for achievements.
* @param aPlayer - The player to unlock for.
*/
private void handleAchivement(ItemStack aStack, EntityPlayer aPlayer) {
@@ -228,9 +338,8 @@ public class AchievementHandler {
return;
}
- if (aModID != null
- && (ItemUtils.getModId(aStack).equals(CORE.MODID)
- || ItemUtils.getModId(aStack).equalsIgnoreCase("gregtech"))) {
+ if (aModID != null && (ItemUtils.getModId(aStack).equals(CORE.MODID)
+ || ItemUtils.getModId(aStack).equalsIgnoreCase("gregtech"))) {
isValid = true;
}
if (!isValid) {
diff --git a/src/main/java/gtPlusPlus/core/handler/BookHandler.java b/src/main/java/gtPlusPlus/core/handler/BookHandler.java
index 48cd19756c..b9831d3105 100644
--- a/src/main/java/gtPlusPlus/core/handler/BookHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/BookHandler.java
@@ -3,6 +3,12 @@ package gtPlusPlus.core.handler;
import static gtPlusPlus.core.util.Utils.addBookPagesLocalization;
import static gtPlusPlus.core.util.Utils.addBookTitleLocalization;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.api.objects.Logger;
@@ -10,10 +16,6 @@ import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import java.util.HashMap;
-import java.util.Map;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
public class BookHandler {
@@ -33,284 +35,431 @@ public class BookHandler {
Logger.INFO("Writing books.");
// Thermal Boiler
- book_ThermalBoiler =
- writeBookTemplate("Manual_Thermal_Boiler", "Thermal Boiler Manual", "GregoriusT", new String[] {
- "This Book explains how to set up and run your Thermal Boiler. We are not responsible for any Damage done by this Book itself nor its content.",
- "First you need to craft the following things for a Thermal Boiler to Function: The Main Boiler Block, 20 Thermal Containment Casings, two Input Hatches, two Output Hatches, a bunch of different Tools and a Maintenance Hatch.",
- "To begin the building, lay out the first 3x3 layer of Machine Casings on the ground (with a Hatch in the Middle), then place the Boiler Block facing outward in the middle of one of the 3m wide Sides.",
- "Now grab 3 other Hatches and place them on the remaining three 3m wide Sides also facing outwards. And now the four corners of the Machine need also a Machine Casing. There should only be a Hole left in the middle of the Cube.",
- "So, now place a 3x3 of Machine Casings on top, at the 3rd Layer with the last Hatch in the middle facing outwards as well.",
- "When accessing the Boiler Block, it should now stop telling you, that the structure is incomplete (bottom Line of that Screen). Now go with a bunch of different Tools (Metal Hammer, Rubber Hammer, Screwdriver, Wrench, Soldering Iron and Crowbar)",
- "to the Maintenance Hatch and access it. After that you grab the 6 Tools and rightclick the Slot with each of them in your Hand in the Maintenance GUI. Note that you need Soldering Tin/Lead in your Inventory to use the Soldering Iron.",
- "The Main Block should now tell you that you need to use the Rubber Hammer on it to (re)activate the Machine. The Rubber Hammer can enable and disable Machines. The Machine disables itself after something important broke.",
- "If you want to use Lava with this Device, then you should add a Lava Filter to extract additional Resources from the Lava. If the Filter breaks, the Machine won't explode like a Turbine would. If you use molten Salt, then you won't need a Filter.",
- "You will get Obsidian when processing Lava, however if a Filter is used, you will get sometimes an Ingot instead of a Block of Obsidian. When using molten Salt, you will get the Salt back.",
- "So, now for the Maintenance. After a few Hours of running nonstop, your Boiler will get small Problems, which don't prevent it from running, these Problems just decrease Efficiency. Every Problem listed on the Screen does -10% Efficiency.",
- "To fix these Problems, just go to the Maintenance Hatch and click with the problem corresponding Tool on the Slot to repair. If all six possible runtime Problems happen, the Machine will auto-shutdown no matter what. No Explosion, it's just stopping.",
- "The Thermal Boiler will produce 800 Liters of Steam per tick for about 5 or 6 Liters of Water per tick at reaching 100% Efficiency. In case of Lava it consumes 1666 Liters every Second.",
- "A Thermal Boiler is worth about 33 small Thermal Generators, and as the Boilers get much less Efficient, when not having enough Fuel, you should consider making a large Nether Pump for Lava, or a good Nuclear Reactor for molten Salt.",
- "Input and Output Slots are fully optional, you can place multiple ones of them or even none on the Machine. A Machine without Input couldn't process any Recipes, while a Machine without Output just voids all outputted Items and Liquids.",
- "It might be useful to use the Screwdriver on the Output Hatches to determine what is outputted where."
- });
+ book_ThermalBoiler = writeBookTemplate(
+ "Manual_Thermal_Boiler",
+ "Thermal Boiler Manual",
+ "GregoriusT",
+ new String[] {
+ "This Book explains how to set up and run your Thermal Boiler. We are not responsible for any Damage done by this Book itself nor its content.",
+ "First you need to craft the following things for a Thermal Boiler to Function: The Main Boiler Block, 20 Thermal Containment Casings, two Input Hatches, two Output Hatches, a bunch of different Tools and a Maintenance Hatch.",
+ "To begin the building, lay out the first 3x3 layer of Machine Casings on the ground (with a Hatch in the Middle), then place the Boiler Block facing outward in the middle of one of the 3m wide Sides.",
+ "Now grab 3 other Hatches and place them on the remaining three 3m wide Sides also facing outwards. And now the four corners of the Machine need also a Machine Casing. There should only be a Hole left in the middle of the Cube.",
+ "So, now place a 3x3 of Machine Casings on top, at the 3rd Layer with the last Hatch in the middle facing outwards as well.",
+ "When accessing the Boiler Block, it should now stop telling you, that the structure is incomplete (bottom Line of that Screen). Now go with a bunch of different Tools (Metal Hammer, Rubber Hammer, Screwdriver, Wrench, Soldering Iron and Crowbar)",
+ "to the Maintenance Hatch and access it. After that you grab the 6 Tools and rightclick the Slot with each of them in your Hand in the Maintenance GUI. Note that you need Soldering Tin/Lead in your Inventory to use the Soldering Iron.",
+ "The Main Block should now tell you that you need to use the Rubber Hammer on it to (re)activate the Machine. The Rubber Hammer can enable and disable Machines. The Machine disables itself after something important broke.",
+ "If you want to use Lava with this Device, then you should add a Lava Filter to extract additional Resources from the Lava. If the Filter breaks, the Machine won't explode like a Turbine would. If you use molten Salt, then you won't need a Filter.",
+ "You will get Obsidian when processing Lava, however if a Filter is used, you will get sometimes an Ingot instead of a Block of Obsidian. When using molten Salt, you will get the Salt back.",
+ "So, now for the Maintenance. After a few Hours of running nonstop, your Boiler will get small Problems, which don't prevent it from running, these Problems just decrease Efficiency. Every Problem listed on the Screen does -10% Efficiency.",
+ "To fix these Problems, just go to the Maintenance Hatch and click with the problem corresponding Tool on the Slot to repair. If all six possible runtime Problems happen, the Machine will auto-shutdown no matter what. No Explosion, it's just stopping.",
+ "The Thermal Boiler will produce 800 Liters of Steam per tick for about 5 or 6 Liters of Water per tick at reaching 100% Efficiency. In case of Lava it consumes 1666 Liters every Second.",
+ "A Thermal Boiler is worth about 33 small Thermal Generators, and as the Boilers get much less Efficient, when not having enough Fuel, you should consider making a large Nether Pump for Lava, or a good Nuclear Reactor for molten Salt.",
+ "Input and Output Slots are fully optional, you can place multiple ones of them or even none on the Machine. A Machine without Input couldn't process any Recipes, while a Machine without Output just voids all outputted Items and Liquids.",
+ "It might be useful to use the Screwdriver on the Output Hatches to determine what is outputted where." });
// Test Novel
book_MultiPowerStation = writeBookTemplate(
- "Manual_Multi_PowerStation", "Power Storage & You [Version 0.64]", "Alkalus", new String[] {
- // Page 1
- "So, when it comes to power storage you really have three separate options:\n" + " \n"
- + "Battery Buffers,\n"
- + "Energy Buffers,\n"
- + "The Power Sub-Station\n",
- // Page 2
- "Battery Buffer\n" + " \n"
- + "Is rather portable. Allowing you to throw set one up and insert batteries where ever you may need."
- + "\n" + "They output 1A for each battery stored inside, up to a maximum of 16A.",
- // Page 3
- "Energy Buffer\n" + " \n"
- + "Is a more optimal choice for storage in your base. Once placed down, they cannot be moved without losing all stored power."
- + "\n" + "Energy Buffers can output 4A from the output side, however accept 16A as input.",
- // Page 4
- "The Power Sub-Station" + " \n"
- + "Is used for storing Insane amounts of power later game."
- + "\n" + "Consumes 2% of the average voltage of all energy type hatches every tick."
- + "\n",
- // Page 5
- "Allows Insertion/Removal of power from the rear face of the controller, swap with a screwdriver."
- + "\n"
- + "Variable Height Structure, between 4-16Y. Inserted Redox Cells dictate max energy tier of structure."
- + "\n",
- // Page 6
- "Redox Cells cannot be placed into the Top or Bottom layer and only take up 3xhx3 internally."
- + "\n" + "Different Tier cells CANNOT be mixed together." + "\n",
- // Page 7
- "All Hatches Must be HV at a Minimum, this minimum tier is in place to stop people abusing ULV/LV hatches to lower the avg/t."
- + "\n"
- + "Currently the GUI will NOT display anything at all until the structure forms, this is a known bug."
- + "\n",
- // Page 8
- "Valid Hatches:\n" + "Energy Hatch,\n"
- + "Dynamo Hatch,\n"
- + "Charging Bus,\n"
- + "Discharging Bus,\n"
- + "Dynamo Buffer,\n"
- + "Multi-Amp Dynamo Hatch.\n\n\n"
- + "Structure MUST contain at least one energy input and one energy output hatch."
- });
+ "Manual_Multi_PowerStation",
+ "Power Storage & You [Version 0.64]",
+ "Alkalus",
+ new String[] {
+ // Page 1
+ "So, when it comes to power storage you really have three separate options:\n" + " \n"
+ + "Battery Buffers,\n"
+ + "Energy Buffers,\n"
+ + "The Power Sub-Station\n",
+ // Page 2
+ "Battery Buffer\n" + " \n"
+ + "Is rather portable. Allowing you to throw set one up and insert batteries where ever you may need."
+ + "\n"
+ + "They output 1A for each battery stored inside, up to a maximum of 16A.",
+ // Page 3
+ "Energy Buffer\n" + " \n"
+ + "Is a more optimal choice for storage in your base. Once placed down, they cannot be moved without losing all stored power."
+ + "\n"
+ + "Energy Buffers can output 4A from the output side, however accept 16A as input.",
+ // Page 4
+ "The Power Sub-Station" + " \n"
+ + "Is used for storing Insane amounts of power later game."
+ + "\n"
+ + "Consumes 2% of the average voltage of all energy type hatches every tick."
+ + "\n",
+ // Page 5
+ "Allows Insertion/Removal of power from the rear face of the controller, swap with a screwdriver."
+ + "\n"
+ + "Variable Height Structure, between 4-16Y. Inserted Redox Cells dictate max energy tier of structure."
+ + "\n",
+ // Page 6
+ "Redox Cells cannot be placed into the Top or Bottom layer and only take up 3xhx3 internally."
+ + "\n"
+ + "Different Tier cells CANNOT be mixed together."
+ + "\n",
+ // Page 7
+ "All Hatches Must be HV at a Minimum, this minimum tier is in place to stop people abusing ULV/LV hatches to lower the avg/t."
+ + "\n"
+ + "Currently the GUI will NOT display anything at all until the structure forms, this is a known bug."
+ + "\n",
+ // Page 8
+ "Valid Hatches:\n" + "Energy Hatch,\n"
+ + "Dynamo Hatch,\n"
+ + "Charging Bus,\n"
+ + "Discharging Bus,\n"
+ + "Dynamo Buffer,\n"
+ + "Multi-Amp Dynamo Hatch.\n\n\n"
+ + "Structure MUST contain at least one energy input and one energy output hatch." });
// Test Novel
- book_ModularBauble =
- writeBookTemplate("Manual_Modular_Bauble", "How to: Modular Baubles", "Alkalus", new String[] {
- "Concept: This idea came from wanting flexibility. \n"
- + "First step, Build a Modularity table to begin customisation of your Bauble. \n"
- + " After this has been constructed, you can now combine the upgrades listed within this book to improve the baubles level/100.",
- "Defence:\n"
- + "Can be upgraded by combining metal plates with the bauble. \n"
- + " | +1 | Aluminium \n"
- + " | +2 | Stainless Steel \n"
- + " | +3 | Tungsten \n"
- + " | +4 | Tungsten Steel \n"
- + " | +5 | Naquadah \n",
- "There was once a sad and lonely oak tree. \n",
- "There was once a sad and lonely oak tree. \n",
- "There was once a sad and lonely oak tree. \n"
- });
+ book_ModularBauble = writeBookTemplate(
+ "Manual_Modular_Bauble",
+ "How to: Modular Baubles",
+ "Alkalus",
+ new String[] { "Concept: This idea came from wanting flexibility. \n"
+ + "First step, Build a Modularity table to begin customisation of your Bauble. \n"
+ + " After this has been constructed, you can now combine the upgrades listed within this book to improve the baubles level/100.",
+ "Defence:\n" + "Can be upgraded by combining metal plates with the bauble. \n"
+ + " | +1 | Aluminium \n"
+ + " | +2 | Stainless Steel \n"
+ + " | +3 | Tungsten \n"
+ + " | +4 | Tungsten Steel \n"
+ + " | +5 | Naquadah \n",
+ "There was once a sad and lonely oak tree. \n", "There was once a sad and lonely oak tree. \n",
+ "There was once a sad and lonely oak tree. \n" });
// Test Novel
// 20/21/22
- book_MultiMachineManual =
- writeBookTemplate("Manual_Multi_Machine", "Multi-Machine Manual", "Alkalus", new String[] {
- "This Multiblock, depending upon the mode used, can function as a variety of different machines. The idea behind this, was that most of these machines are rather niche compared to any others, as such, not used often.",
- "To build, you need to construct a hollow 3x3x3 structure made from Multi-Use casings, With a minimum of 6. Any Casing position can be substituted out with an Input Hatch/Bus, an Output Hatch/Bus, Muffler, Maint. Hatch or Energy Injector Hatch.",
- "The Mode can be set by using a Screwdriver on the controller block. Each mode allows the use of Numbered Circuits, to allow a different machine 'type' for each input bus.",
- "[Metal Work] Mode A - Allows the multiblock to function as a Compressor, a Lathe or an Electro-Magnet. To allow a hatch to run in Compressor mode, insert a No. 20 circuit. For Lathe, use No. 21 and for Electro-Magnet use No. 22.",
- "[Fluid Work] Mode B - Allows the multiblock to function as a Fermenter, a Fluid Extractor or an Extractor. To allow a hatch to run in Fermenter mode, insert a No. 20 circuit. For Fluid Extractor, use No. 21 and for Extractor use No. 22.",
- "[Misc. Work] Mode C - Allows the multiblock to function as a Laser Engraver, an Autoclave or a Fluid Solidifier. To allow a hatch to run in Laser Engraver mode, insert a No. 20 circuit. For Autoclave, use No. 21 and for Solidifier use No. 22.",
- });
-
- book_NuclearManual =
- writeBookTemplate("Manual_NuclearStuff_1", "Nuclear Chemistry [FFPP]", "Alkalus", new String[] {
- // Page 1
- "Fission Fuel Processing Plant\n"
- + "Size: 3x9x3 [LxHxW]\n"
- + "Controller: Center, Bottom\n"
- + "4x Input Hatch\n"
- + "2x Output Hatch\n"
- + "1x Output Bus\n"
- + "1x ZPM+ Muffler\n"
- + "1x Maintenance Hatch\n"
- + "1x Energy Hatch\n",
- // Page 2
- "[1] 7x Hastelloy-X or I/O\n"
- + "[2] 5x Incoloy-DS Fluid Containment\n"
- + "[3] 4x Zeron-100 Shielding\n"
- + "[4] 17x Hastelloy-N Sealant Case"
- + "\n"
- + "Multiblock Construction\n"
- + "Convention is [LxHxW]\n"
- + "\n",
- // Page 3
- "Layer 1/2:\n"
- + "[1][1][1]\n"
- + "[1][1][1]\n"
- + "[1][1][1]\n"
- + "\n"
- + "Layer 3/5/6\n"
- + "[ ][4][ ]\n"
- + "[4][2][4]\n"
- + "[ ][4][ ]\n"
- + "\n",
- // Page 4
- "Layer 4\n"
- + "[ ][3][ ]\n"
- + "[3][2][3]\n"
- + "[ ][3][ ]\n"
- + "\n"
- + "Layer 7/8/9\n"
- + "[ ][ ][ ]\n"
- + "[ ][3][ ]\n"
- + "[ ][ ][ ]\n",
- // Page 5
- "Fission Fuel\n" + "Processing Plant"
- + "----------------------\n"
- + "This structure is used to produce the Molten Salts required to run a Liquid Fluorine Thorium Reactor [LFTR]."
- });
-
- book_MultiChemicalPlant =
- writeBookTemplate("book_Multi_ChemicalPlant", "Chemical Plant Manual", "Alkalus", new String[] {
-
- // Intro
- "This book will explain how the Chemical Plant is constructed, which blocks are valid to upgrade it and also how the upgrades work.",
-
- // Info
- "Solid Casings = Plant tier" + "\n" + "Machine Casings = Hatch tier"
- + "\n" + "Higher tier coils More Speed"
- + "\n" + "T1 50% , T2 100% , T3 150%, etc"
- + "\n",
- "Higher tier pipe casings boost parallel" + "\n" + "and reduce catalyst consumption."
- + "\n" + "+2 parallel per tier, 20% extra chance of"
- + "\n" + "not damaging catalyst per tier.",
- "Awakened Draconium Coil (or above) with" + "\n" + "Tungstensteel Pipe Casing" + "\n"
- + "does not damage catalyst at all.",
-
- // Machine Casings
- "Valid Solid Machine Casings:" + "\n" + "0 - Strong Bronze"
- + "\n" + "1 - Solid Steel"
- + "\n" + "2 - Sturdy Aluminium"
- + "\n" + "3 - Clean Stainless Steel"
- + "\n" + "4 - Stable Titanium"
- + "\n" + "5 - Robust Tungstensteel"
- + "\n" + "6 - Vigorous Laurenium"
- + "\n" + "7 - Rugged Botmium",
-
- // Machine Casings
- "Valid Tiered Machine Casings:" + "\n" + "\n" + "1 - "
- + GT_Values.VN[0] + "\n" + "2 - "
- + GT_Values.VN[1] + "\n" + "3 - "
- + GT_Values.VN[2] + "\n" + "4 - "
- + GT_Values.VN[3] + "\n" + "5 - "
- + GT_Values.VN[4] + "\n" + "6 - "
- + GT_Values.VN[5] + "\n" + "7 - "
- + GT_Values.VN[6] + "\n" + "8 - "
- + GT_Values.VN[7] + "\n" + "9 - "
- + GT_Values.VN[8] + "\n" + "10 - "
- + GT_Values.VN[9],
-
- // Pipe Casings
- "Valid Pipe Casings:" + "\n" + "\n" + "1 - Bronze"
- + "\n" + "2 - Steel"
- + "\n" + "3 - Titanium"
- + "\n" + "4 - Tungstensteel",
-
- // Coils
- "Valid Coils:" + "\n" + "\n" + "1 - Cupronickel"
- + "\n" + "2 - Kanthal"
- + "\n" + "3 - Nichrome"
- + "\n" + "4 - TPV-Alloy"
- + "\n" + "5 - HSS-G"
- + "\n" + "6 - HSS-S"
- + "\n" + "7 - Naquadah"
- + "\n" + "8 - Naquadah Alloy"
- + "\n" + "9 - Trinium"
- + "\n" + "10 - Fluxed Electrum",
- "11 - Awakened Draconium" + "\n" + "12 - Infinity" + "\n" + "13 - Hypogen" + "\n" + "14 - Eternal",
-
- // Requirements
- "Multiblock Requirements:" + "\n" + "\n" + "27x Coils"
- + "\n" + "18x Pipe Casings"
- + "\n" + "57x Tiered Machine Casings"
- + "\n" + "70+ Solid Casings"
- + "\n" + "1x Catalyst Housing (Catalysts cannot go inside an Input Bus)",
-
- // Construction Guide
- "Construction Guide Pt1:" + "\n" + "\n"
- + "Controller is placed on a middle casing in the bottom layer"
- + "\n" + "Hatches can only be placed on the bottom layer edges",
- "Construction Guide Pt2:" + "\n" + "\n" + "7x7x7 Hollow frame of solid casings"
- + "\n" + "5x1x5 layer of solid casings (fills in top layer)"
- + "\n" + "5x1x5 layer of machine casings (fills in bottom layer)",
- "Construction Guide Pt3:" + "\n" + "In the central 3x5x3:"
- + "\n" + "3x1x3 layer of Coils, surrounded by ring of Machine Casings"
- + "\n" + "3x1x3 layer of Pipe Casings"
- + "\n" + "3x1x3 layer of Coils"
- + "\n" + "3x1x3 layer of Pipe Casings"
- + "\n" + "3x1x3 layer of Coils, surrounded by ring of Machine Casings",
-
- // Construction Guide Info
- "Information:" + "\n" + "\n" + "A = Air"
- + "\n" + "X = Solid Casing"
- + "\n" + "M = Machine Casing"
- + "\n" + "P = Pipe Casing"
- + "\n" + "C = Coil Casing",
- "Layer 1:" + "\n" + "\n" + "XXXXXXX"
- + "\n" + "XMMMMMX"
- + "\n" + "XMMMMMX"
- + "\n" + "XMMMMMX"
- + "\n" + "XMMMMMX"
- + "\n" + "XMMMMMX"
- + "\n" + "XXXXXXX",
- "Layer 2:" + "\n" + "\n" + "XAAAAAX"
- + "\n" + "AMMMMMA"
- + "\n" + "AMCCCMA"
- + "\n" + "AMCCCMA"
- + "\n" + "AMCCCMA"
- + "\n" + "AMMMMMA"
- + "\n" + "XAAAAAX",
- "Layer 3:" + "\n" + "\n" + "XAAAAAX"
- + "\n" + "AAAAAAA"
- + "\n" + "AAPPPAA"
- + "\n" + "AAPPPAA"
- + "\n" + "AAPPPAA"
- + "\n" + "AAAAAAA"
- + "\n" + "XAAAAAX",
- "Layer 4:" + "\n" + "\n" + "XAAAAAX"
- + "\n" + "AAAAAAA"
- + "\n" + "AACCCAA"
- + "\n" + "AACCCAA"
- + "\n" + "AACCCAA"
- + "\n" + "AAAAAAA"
- + "\n" + "XAAAAAX",
- "Layer 5:" + "\n" + "\n" + "XAAAAAX"
- + "\n" + "AAAAAAA"
- + "\n" + "AAPPPAA"
- + "\n" + "AAPPPAA"
- + "\n" + "AAPPPAA"
- + "\n" + "AAAAAAA"
- + "\n" + "XAAAAAX",
- "Layer 6:" + "\n" + "\n" + "XAAAAAX"
- + "\n" + "AMMMMMA"
- + "\n" + "AMCCCMA"
- + "\n" + "AMCCCMA"
- + "\n" + "AMCCCMA"
- + "\n" + "AMMMMMA"
- + "\n" + "XAAAAAX",
- "Layer 7:" + "\n" + "\n" + "XXXXXXX"
- + "\n" + "XXXXXXX"
- + "\n" + "XXXXXXX"
- + "\n" + "XXXXXXX"
- + "\n" + "XXXXXXX"
- + "\n" + "XXXXXXX"
- + "\n" + "XXXXXXX",
- });
+ book_MultiMachineManual = writeBookTemplate(
+ "Manual_Multi_Machine",
+ "Multi-Machine Manual",
+ "Alkalus",
+ new String[] {
+ "This Multiblock, depending upon the mode used, can function as a variety of different machines. The idea behind this, was that most of these machines are rather niche compared to any others, as such, not used often.",
+ "To build, you need to construct a hollow 3x3x3 structure made from Multi-Use casings, With a minimum of 6. Any Casing position can be substituted out with an Input Hatch/Bus, an Output Hatch/Bus, Muffler, Maint. Hatch or Energy Injector Hatch.",
+ "The Mode can be set by using a Screwdriver on the controller block. Each mode allows the use of Numbered Circuits, to allow a different machine 'type' for each input bus.",
+ "[Metal Work] Mode A - Allows the multiblock to function as a Compressor, a Lathe or an Electro-Magnet. To allow a hatch to run in Compressor mode, insert a No. 20 circuit. For Lathe, use No. 21 and for Electro-Magnet use No. 22.",
+ "[Fluid Work] Mode B - Allows the multiblock to function as a Fermenter, a Fluid Extractor or an Extractor. To allow a hatch to run in Fermenter mode, insert a No. 20 circuit. For Fluid Extractor, use No. 21 and for Extractor use No. 22.",
+ "[Misc. Work] Mode C - Allows the multiblock to function as a Laser Engraver, an Autoclave or a Fluid Solidifier. To allow a hatch to run in Laser Engraver mode, insert a No. 20 circuit. For Autoclave, use No. 21 and for Solidifier use No. 22.", });
+
+ book_NuclearManual = writeBookTemplate(
+ "Manual_NuclearStuff_1",
+ "Nuclear Chemistry [FFPP]",
+ "Alkalus",
+ new String[] {
+ // Page 1
+ "Fission Fuel Processing Plant\n" + "Size: 3x9x3 [LxHxW]\n"
+ + "Controller: Center, Bottom\n"
+ + "4x Input Hatch\n"
+ + "2x Output Hatch\n"
+ + "1x Output Bus\n"
+ + "1x ZPM+ Muffler\n"
+ + "1x Maintenance Hatch\n"
+ + "1x Energy Hatch\n",
+ // Page 2
+ "[1] 7x Hastelloy-X or I/O\n" + "[2] 5x Incoloy-DS Fluid Containment\n"
+ + "[3] 4x Zeron-100 Shielding\n"
+ + "[4] 17x Hastelloy-N Sealant Case"
+ + "\n"
+ + "Multiblock Construction\n"
+ + "Convention is [LxHxW]\n"
+ + "\n",
+ // Page 3
+ "Layer 1/2:\n" + "[1][1][1]\n"
+ + "[1][1][1]\n"
+ + "[1][1][1]\n"
+ + "\n"
+ + "Layer 3/5/6\n"
+ + "[ ][4][ ]\n"
+ + "[4][2][4]\n"
+ + "[ ][4][ ]\n"
+ + "\n",
+ // Page 4
+ "Layer 4\n" + "[ ][3][ ]\n"
+ + "[3][2][3]\n"
+ + "[ ][3][ ]\n"
+ + "\n"
+ + "Layer 7/8/9\n"
+ + "[ ][ ][ ]\n"
+ + "[ ][3][ ]\n"
+ + "[ ][ ][ ]\n",
+ // Page 5
+ "Fission Fuel\n" + "Processing Plant"
+ + "----------------------\n"
+ + "This structure is used to produce the Molten Salts required to run a Liquid Fluorine Thorium Reactor [LFTR]." });
+
+ book_MultiChemicalPlant = writeBookTemplate(
+ "book_Multi_ChemicalPlant",
+ "Chemical Plant Manual",
+ "Alkalus",
+ new String[] {
+
+ // Intro
+ "This book will explain how the Chemical Plant is constructed, which blocks are valid to upgrade it and also how the upgrades work.",
+
+ // Info
+ "Solid Casings = Plant tier" + "\n"
+ + "Machine Casings = Hatch tier"
+ + "\n"
+ + "Higher tier coils More Speed"
+ + "\n"
+ + "T1 50% , T2 100% , T3 150%, etc"
+ + "\n",
+ "Higher tier pipe casings boost parallel" + "\n"
+ + "and reduce catalyst consumption."
+ + "\n"
+ + "+2 parallel per tier, 20% extra chance of"
+ + "\n"
+ + "not damaging catalyst per tier.",
+ "Awakened Draconium Coil (or above) with" + "\n"
+ + "Tungstensteel Pipe Casing"
+ + "\n"
+ + "does not damage catalyst at all.",
+
+ // Machine Casings
+ "Valid Solid Machine Casings:" + "\n"
+ + "0 - Strong Bronze"
+ + "\n"
+ + "1 - Solid Steel"
+ + "\n"
+ + "2 - Sturdy Aluminium"
+ + "\n"
+ + "3 - Clean Stainless Steel"
+ + "\n"
+ + "4 - Stable Titanium"
+ + "\n"
+ + "5 - Robust Tungstensteel"
+ + "\n"
+ + "6 - Vigorous Laurenium"
+ + "\n"
+ + "7 - Rugged Botmium",
+
+ // Machine Casings
+ "Valid Tiered Machine Casings:" + "\n"
+ + "\n"
+ + "1 - "
+ + GT_Values.VN[0]
+ + "\n"
+ + "2 - "
+ + GT_Values.VN[1]
+ + "\n"
+ + "3 - "
+ + GT_Values.VN[2]
+ + "\n"
+ + "4 - "
+ + GT_Values.VN[3]
+ + "\n"
+ + "5 - "
+ + GT_Values.VN[4]
+ + "\n"
+ + "6 - "
+ + GT_Values.VN[5]
+ + "\n"
+ + "7 - "
+ + GT_Values.VN[6]
+ + "\n"
+ + "8 - "
+ + GT_Values.VN[7]
+ + "\n"
+ + "9 - "
+ + GT_Values.VN[8]
+ + "\n"
+ + "10 - "
+ + GT_Values.VN[9],
+
+ // Pipe Casings
+ "Valid Pipe Casings:" + "\n"
+ + "\n"
+ + "1 - Bronze"
+ + "\n"
+ + "2 - Steel"
+ + "\n"
+ + "3 - Titanium"
+ + "\n"
+ + "4 - Tungstensteel",
+
+ // Coils
+ "Valid Coils:" + "\n"
+ + "\n"
+ + "1 - Cupronickel"
+ + "\n"
+ + "2 - Kanthal"
+ + "\n"
+ + "3 - Nichrome"
+ + "\n"
+ + "4 - TPV-Alloy"
+ + "\n"
+ + "5 - HSS-G"
+ + "\n"
+ + "6 - HSS-S"
+ + "\n"
+ + "7 - Naquadah"
+ + "\n"
+ + "8 - Naquadah Alloy"
+ + "\n"
+ + "9 - Trinium"
+ + "\n"
+ + "10 - Fluxed Electrum",
+ "11 - Awakened Draconium" + "\n"
+ + "12 - Infinity"
+ + "\n"
+ + "13 - Hypogen"
+ + "\n"
+ + "14 - Eternal",
+
+ // Requirements
+ "Multiblock Requirements:" + "\n"
+ + "\n"
+ + "27x Coils"
+ + "\n"
+ + "18x Pipe Casings"
+ + "\n"
+ + "57x Tiered Machine Casings"
+ + "\n"
+ + "70+ Solid Casings"
+ + "\n"
+ + "1x Catalyst Housing (Catalysts cannot go inside an Input Bus)",
+
+ // Construction Guide
+ "Construction Guide Pt1:" + "\n"
+ + "\n"
+ + "Controller is placed on a middle casing in the bottom layer"
+ + "\n"
+ + "Hatches can only be placed on the bottom layer edges",
+ "Construction Guide Pt2:" + "\n"
+ + "\n"
+ + "7x7x7 Hollow frame of solid casings"
+ + "\n"
+ + "5x1x5 layer of solid casings (fills in top layer)"
+ + "\n"
+ + "5x1x5 layer of machine casings (fills in bottom layer)",
+ "Construction Guide Pt3:" + "\n"
+ + "In the central 3x5x3:"
+ + "\n"
+ + "3x1x3 layer of Coils, surrounded by ring of Machine Casings"
+ + "\n"
+ + "3x1x3 layer of Pipe Casings"
+ + "\n"
+ + "3x1x3 layer of Coils"
+ + "\n"
+ + "3x1x3 layer of Pipe Casings"
+ + "\n"
+ + "3x1x3 layer of Coils, surrounded by ring of Machine Casings",
+
+ // Construction Guide Info
+ "Information:" + "\n"
+ + "\n"
+ + "A = Air"
+ + "\n"
+ + "X = Solid Casing"
+ + "\n"
+ + "M = Machine Casing"
+ + "\n"
+ + "P = Pipe Casing"
+ + "\n"
+ + "C = Coil Casing",
+ "Layer 1:" + "\n"
+ + "\n"
+ + "XXXXXXX"
+ + "\n"
+ + "XMMMMMX"
+ + "\n"
+ + "XMMMMMX"
+ + "\n"
+ + "XMMMMMX"
+ + "\n"
+ + "XMMMMMX"
+ + "\n"
+ + "XMMMMMX"
+ + "\n"
+ + "XXXXXXX",
+ "Layer 2:" + "\n"
+ + "\n"
+ + "XAAAAAX"
+ + "\n"
+ + "AMMMMMA"
+ + "\n"
+ + "AMCCCMA"
+ + "\n"
+ + "AMCCCMA"
+ + "\n"
+ + "AMCCCMA"
+ + "\n"
+ + "AMMMMMA"
+ + "\n"
+ + "XAAAAAX",
+ "Layer 3:" + "\n"
+ + "\n"
+ + "XAAAAAX"
+ + "\n"
+ + "AAAAAAA"
+ + "\n"
+ + "AAPPPAA"
+ + "\n"
+ + "AAPPPAA"
+ + "\n"
+ + "AAPPPAA"
+ + "\n"
+ + "AAAAAAA"
+ + "\n"
+ + "XAAAAAX",
+ "Layer 4:" + "\n"
+ + "\n"
+ + "XAAAAAX"
+ + "\n"
+ + "AAAAAAA"
+ + "\n"
+ + "AACCCAA"
+ + "\n"
+ + "AACCCAA"
+ + "\n"
+ + "AACCCAA"
+ + "\n"
+ + "AAAAAAA"
+ + "\n"
+ + "XAAAAAX",
+ "Layer 5:" + "\n"
+ + "\n"
+ + "XAAAAAX"
+ + "\n"
+ + "AAAAAAA"
+ + "\n"
+ + "AAPPPAA"
+ + "\n"
+ + "AAPPPAA"
+ + "\n"
+ + "AAPPPAA"
+ + "\n"
+ + "AAAAAAA"
+ + "\n"
+ + "XAAAAAX",
+ "Layer 6:" + "\n"
+ + "\n"
+ + "XAAAAAX"
+ + "\n"
+ + "AMMMMMA"
+ + "\n"
+ + "AMCCCMA"
+ + "\n"
+ + "AMCCCMA"
+ + "\n"
+ + "AMCCCMA"
+ + "\n"
+ + "AMMMMMA"
+ + "\n"
+ + "XAAAAAX",
+ "Layer 7:" + "\n"
+ + "\n"
+ + "XXXXXXX"
+ + "\n"
+ + "XXXXXXX"
+ + "\n"
+ + "XXXXXXX"
+ + "\n"
+ + "XXXXXXX"
+ + "\n"
+ + "XXXXXXX"
+ + "\n"
+ + "XXXXXXX"
+ + "\n"
+ + "XXXXXXX", });
}
public static ItemStack ItemBookWritten_ThermalBoiler;
@@ -330,33 +479,24 @@ public class BookHandler {
// Multiblock Manuals
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(Items.writable_book), ItemUtils.getSimpleStack(Items.lava_bucket)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(Items.writable_book),
+ ItemUtils.getSimpleStack(Items.lava_bucket) },
ItemBookWritten_ThermalBoiler);
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(Items.writable_book),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.craftingToolWrench, 1)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(Items.writable_book),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.craftingToolWrench, 1) },
ItemBookWritten_MultiMachineManual);
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(Items.writable_book),
- ItemUtils.getItemStackOfAmountFromOreDict("wireGt01Tin", 1)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(Items.writable_book),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireGt01Tin", 1) },
ItemBookWritten_MultiPowerStorage);
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(Items.writable_book),
- ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(Items.writable_book),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1) },
ItemBookWritten_NuclearManual);
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(Items.writable_book),
- ItemUtils.getItemStackOfAmountFromOreDict("wireGt01Copper", 1)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(Items.writable_book),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireGt01Copper", 1) },
ItemBookWritten_MultiChemicalPlant);
for (int i = 0; i < mBookKeeperCount; i++) {
@@ -379,6 +519,7 @@ public class BookHandler {
}
public static class BookTemplate {
+
public final int mMeta;
public final String mMapping;
public final String mTitle;
diff --git a/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java b/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java
index b0006b5f9c..edd85ba3d1 100644
--- a/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.handler;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.IFuelHandler;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
public class BurnableFuelHandler implements IFuelHandler {
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 3cce9c4788..27816d2a42 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -2,6 +2,12 @@ package gtPlusPlus.core.handler;
import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_OreDictUnificator;
@@ -44,10 +50,6 @@ import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH;
import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GlueLine;
import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear;
import gtPlusPlus.xmod.gregtech.registration.gregtech.*;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
public class COMPAT_HANDLER {
@@ -74,22 +76,15 @@ public class COMPAT_HANDLER {
if (Gregtech) {
// Debug
- GregtechItemList.Garbage_Collector_Debug_Machine.set(new GregtechMetaGarbageCollector(
+ GregtechItemList.Garbage_Collector_Debug_Machine.set(
+ new GregtechMetaGarbageCollector(
"garbagecollector.01.tier.single",
"JVM Garbage Collector",
- "Useful for debugging or smoother performance on local servers")
- .getStackForm(1L));
+ "Useful for debugging or smoother performance on local servers").getStackForm(1L));
// Free IDs
/*
- ---
- 859
- to
- 868
- ---
- 911
- to
- 940
+ * --- 859 to 868 --- 911 to 940
*/
new RECIPES_LaserEngraver();
@@ -265,11 +260,9 @@ public class COMPAT_HANDLER {
}
public static final AutoMap<RunnableWithInfo<String>> mRecipesToGenerate = new AutoMap<RunnableWithInfo<String>>();
- public static final AutoMap<RunnableWithInfo<String>> mGtRecipesToGenerate =
- new AutoMap<RunnableWithInfo<String>>();
+ public static final AutoMap<RunnableWithInfo<String>> mGtRecipesToGenerate = new AutoMap<RunnableWithInfo<String>>();
- public static final AutoMap<RunnableWithInfo<String>> mObjectsToRunInPostInit =
- new AutoMap<RunnableWithInfo<String>>();
+ public static final AutoMap<RunnableWithInfo<String>> mObjectsToRunInPostInit = new AutoMap<RunnableWithInfo<String>>();
public static final AutoMap<ItemPackage> mObjectsToRunInOnLoadComplete = new AutoMap<ItemPackage>();
public static void runQueuedRecipes() {
diff --git a/src/main/java/gtPlusPlus/core/handler/GuiHandler.java b/src/main/java/gtPlusPlus/core/handler/GuiHandler.java
index 9e81f42a2f..04ad22178b 100644
--- a/src/main/java/gtPlusPlus/core/handler/GuiHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/GuiHandler.java
@@ -1,5 +1,10 @@
package gtPlusPlus.core.handler;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import gtPlusPlus.GTplusplus;
@@ -56,10 +61,6 @@ import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable;
import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator;
import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
public class GuiHandler implements IGuiHandler {
@@ -92,8 +93,8 @@ public class GuiHandler implements IGuiHandler {
}
@Override // ContainerModTileEntity
- public Object getServerGuiElement(
- final int ID, final EntityPlayer player, final World world, final int x, final int y, final int z) {
+ public Object getServerGuiElement(final int ID, final EntityPlayer player, final World world, final int x,
+ final int y, final int z) {
final TileEntity te = world.getTileEntity(x, y, z);
if (te != null) {
@@ -107,7 +108,9 @@ public class GuiHandler implements IGuiHandler {
if (ID == GUI3) {
// Use the player's held item to create the inventory
return new Container_BackpackBase(
- player, player.inventory, new BaseInventoryBackpack(player.getHeldItem()));
+ player,
+ player.inventory,
+ new BaseInventoryBackpack(player.getHeldItem()));
}
if (te != null) {
@@ -155,10 +158,19 @@ public class GuiHandler implements IGuiHandler {
}
@Override // GuiModTileEntity
- public Object getClientGuiElement(
- final int ID, final EntityPlayer player, final World world, final int x, final int y, final int z) {
- Logger.WARNING("getClientGuiElement Called by: " + player + ", in world: " + player.dimension + " at x:" + x
- + ", y:" + y + ", z:" + z + ".");
+ public Object getClientGuiElement(final int ID, final EntityPlayer player, final World world, final int x,
+ final int y, final int z) {
+ Logger.WARNING(
+ "getClientGuiElement Called by: " + player
+ + ", in world: "
+ + player.dimension
+ + " at x:"
+ + x
+ + ", y:"
+ + y
+ + ", z:"
+ + z
+ + ".");
final TileEntity te = world.getTileEntity(x, y, z);
if (te != null) {
if (ID == GUI1) {
@@ -171,8 +183,11 @@ public class GuiHandler implements IGuiHandler {
if (ID == GUI3) {
// We have to cast the new container as our custom class
// and pass in currently held item for the inventory
- return new GuiBaseBackpack(new Container_BackpackBase(
- player, player.inventory, new BaseInventoryBackpack(player.getHeldItem())));
+ return new GuiBaseBackpack(
+ new Container_BackpackBase(
+ player,
+ player.inventory,
+ new BaseInventoryBackpack(player.getHeldItem())));
}
if (te != null) {
@@ -185,7 +200,9 @@ public class GuiHandler implements IGuiHandler {
return new GUI_FishTrap(player.inventory, (TileEntityFishTrap) te);
} else if (ID == GUI7) {
return new GUI_TradeTable(
- player.inventory, (TileEntityTradeTable) te, ((TileEntityBase) te).getOwner());
+ player.inventory,
+ (TileEntityTradeTable) te,
+ ((TileEntityBase) te).getOwner());
} else if (ID == GUI8) {
return new GUI_CircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te);
} else if (ID == GUI13) {
diff --git a/src/main/java/gtPlusPlus/core/handler/MobMentality.java b/src/main/java/gtPlusPlus/core/handler/MobMentality.java
index 40a4f73d94..9f7ba19175 100644
--- a/src/main/java/gtPlusPlus/core/handler/MobMentality.java
+++ b/src/main/java/gtPlusPlus/core/handler/MobMentality.java
@@ -1,15 +1,17 @@
package gtPlusPlus.core.handler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import java.util.*;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.entity.living.LivingHurtEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class MobMentality {
public static HashSet<Class<EntityLivingBase>> sIgnoredTypes = new HashSet<Class<EntityLivingBase>>();
@@ -26,7 +28,7 @@ public class MobMentality {
final EntityLivingBase entity = target;
final Entity attacker = event.source.getSourceOfDamage();
if (
- /*this.configuration.shouldIgnoreNeutralMobs() && */ !(entity instanceof IMob)) {
+ /* this.configuration.shouldIgnoreNeutralMobs() && */ !(entity instanceof IMob)) {
return;
}
if (attacker == null) {
diff --git a/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java b/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java
index 231ae98093..4881479be3 100644
--- a/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java
@@ -2,6 +2,11 @@ package gtPlusPlus.core.handler;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableOldGTcircuits;
+import java.lang.reflect.Field;
+import java.util.HashSet;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.util.EmptyRecipeMap;
import gregtech.api.util.GT_Recipe;
@@ -11,9 +16,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.recipe.RECIPES_Old_Circuits;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
-import java.lang.reflect.Field;
-import java.util.HashSet;
-import org.apache.commons.lang3.reflect.FieldUtils;
public class OldCircuitHandler {
diff --git a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
index d77d958373..3ff6a0a990 100644
--- a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
@@ -1,5 +1,8 @@
package gtPlusPlus.core.handler;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
@@ -11,8 +14,6 @@ import gtPlusPlus.core.network.packet.AbstractPacket;
import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui;
import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui2;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
public class PacketHandler {
@@ -37,7 +38,8 @@ public class PacketHandler {
INSTANCE.registerMessage(handlerClass, messageClass, packetId++, side);
if (AbstractPacket.class.isInstance(messageClass.getClass())) {
AbstractPacket aPacket = ReflectionUtils.createNewInstanceFromConstructor(
- ReflectionUtils.getConstructor(messageClass, new Class[] {}), new Object[] {});
+ ReflectionUtils.getConstructor(messageClass, new Class[] {}),
+ new Object[] {});
if (aPacket != null) {
Logger.INFO("Registered Packet: " + aPacket.getPacketName());
}
@@ -45,16 +47,15 @@ public class PacketHandler {
}
/**
- * Send this message to the specified player.
- * See {@link SimpleNetworkWrapper#sendTo(IMessage, EntityPlayerMP)}
+ * Send this message to the specified player. See {@link SimpleNetworkWrapper#sendTo(IMessage, EntityPlayerMP)}
*/
public static final void sendTo(IMessage message, EntityPlayerMP player) {
INSTANCE.sendTo(message, player);
}
/**
- * Send this message to everyone within a certain range of a point.
- * See {@link SimpleNetworkWrapper#sendToDimension(IMessage, NetworkRegistry.TargetPoint)}
+ * Send this message to everyone within a certain range of a point. See
+ * {@link SimpleNetworkWrapper#sendToDimension(IMessage, NetworkRegistry.TargetPoint)}
*/
public static final void sendToAllAround(IMessage message, NetworkRegistry.TargetPoint point) {
INSTANCE.sendToAllAround(message, point);
@@ -63,8 +64,8 @@ public class PacketHandler {
/**
* Sends a message to everyone within a certain range of the coordinates in the same dimension.
*/
- public static final void sendToAllAround(
- IMessage message, int dimension, double x, double y, double z, double range) {
+ public static final void sendToAllAround(IMessage message, int dimension, double x, double y, double z,
+ double range) {
sendToAllAround(message, new NetworkRegistry.TargetPoint(dimension, x, y, z, range));
}
@@ -76,16 +77,15 @@ public class PacketHandler {
}
/**
- * Send this message to everyone within the supplied dimension.
- * See {@link SimpleNetworkWrapper#sendToDimension(IMessage, int)}
+ * Send this message to everyone within the supplied dimension. See
+ * {@link SimpleNetworkWrapper#sendToDimension(IMessage, int)}
*/
public static final void sendToDimension(IMessage message, int dimensionId) {
INSTANCE.sendToDimension(message, dimensionId);
}
/**
- * Send this message to the server.
- * See {@link SimpleNetworkWrapper#sendToServer(IMessage)}
+ * Send this message to the server. See {@link SimpleNetworkWrapper#sendToServer(IMessage)}
*/
public static final void sendToServer(IMessage message) {
INSTANCE.sendToServer(message);
diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
index d8e069b5fa..371c8f21e4 100644
--- a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
+++ b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
@@ -1,9 +1,10 @@
package gtPlusPlus.core.handler.Recipes;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
public class DecayableRecipe {
@@ -24,8 +25,7 @@ public class DecayableRecipe {
public boolean equals(Object o) {
if (o instanceof DecayableRecipe) {
DecayableRecipe i = (DecayableRecipe) o;
- if (i.mTime == this.mTime
- && GT_Utility.areStacksEqual(mInput, i.mInput)
+ if (i.mTime == this.mTime && GT_Utility.areStacksEqual(mInput, i.mInput)
&& GT_Utility.areStacksEqual(mOutput, i.mOutput)) {
return true;
}
diff --git a/src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java b/src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
index 50364f43a3..ed2f29f45e 100644
--- a/src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
+++ b/src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
@@ -1,19 +1,22 @@
package gtPlusPlus.core.handler;
+import java.lang.reflect.Field;
+
+import net.minecraft.stats.AchievementList;
+import net.minecraftforge.event.entity.player.AchievementEvent;
+
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.Field;
-import net.minecraft.stats.AchievementList;
-import net.minecraftforge.event.entity.player.AchievementEvent;
public class StopAnnoyingFuckingAchievements {
/**
* Stops me getting fireworks every fucking time I open my inventory upon first loading a dev client.
+ *
* @param event
*/
@SubscribeEvent(priority = EventPriority.HIGHEST)
diff --git a/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index c3eee57118..73789038b5 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -3,15 +3,8 @@ package gtPlusPlus.core.handler.events;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropDrainedShard;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropFluoriteOre;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import java.util.ArrayList;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -21,7 +14,17 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.oredict.OreDictionary;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.nuclear.FLUORIDES;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class BlockEventHandler {
+
public static ArrayList<ItemStack> oreLimestone;
public static ArrayList<ItemStack> blockLimestone;
public static ItemStack fluoriteOre;
@@ -37,43 +40,31 @@ public class BlockEventHandler {
@SubscribeEvent
public void onBlockLeftClicked(final PlayerInteractEvent event) {
/*
- * if (event.action != PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) return;
- *
- * ItemStack heldItem = event.entityPlayer.getHeldItem(); Block block =
- * event.world.getBlock(event.x, event.y, event.z);
- *
- * // If the block clicked was Stone, the player was holding an Iron Pickaxe and
- * a random integer from 0 (inclusive) to 2 (exclusive) is 0 (50% chance) if
- * (block == Blocks.stone && heldItem != null && heldItem.getItem() ==
+ * if (event.action != PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) return; ItemStack heldItem =
+ * event.entityPlayer.getHeldItem(); Block block = event.world.getBlock(event.x, event.y, event.z); // If the
+ * block clicked was Stone, the player was holding an Iron Pickaxe and a random integer from 0 (inclusive) to 2
+ * (exclusive) is 0 (50% chance) if (block == Blocks.stone && heldItem != null && heldItem.getItem() ==
* Items.iron_pickaxe && random.nextInt(2) == 0) { ForgeDirection direction =
- * ForgeDirection.getOrientation(event.face); // Convert the numeric face to a
- * ForgeDirection int fireX = event.x + direction.offsetX, fireY = event.y +
- * direction.offsetY, fireZ = event.z + direction.offsetZ; // Offset the block's
- * coordinates according to the direction
- *
- * if (event.world.isAirBlock(fireX, fireY, fireZ)) { // If the block at the new
- * coordinates is Air event.world.setBlock(fireX, fireY, fireZ, Blocks.fire); //
- * Replace it with Fire event.useBlock = Event.Result.DENY; // Prevent the Fire
- * from being extinguished (also prevents Block#onBlockClicked from being
- * called) } }
+ * ForgeDirection.getOrientation(event.face); // Convert the numeric face to a ForgeDirection int fireX =
+ * event.x + direction.offsetX, fireY = event.y + direction.offsetY, fireZ = event.z + direction.offsetZ; //
+ * Offset the block's coordinates according to the direction if (event.world.isAirBlock(fireX, fireY, fireZ)) {
+ * // If the block at the new coordinates is Air event.world.setBlock(fireX, fireY, fireZ, Blocks.fire); //
+ * Replace it with Fire event.useBlock = Event.Result.DENY; // Prevent the Fire from being extinguished (also
+ * prevents Block#onBlockClicked from being called) } }
*/
}
@SubscribeEvent
public void onEntityDrop(final LivingDropsEvent event) {
/*
- * if (event.entityLiving instanceof EntityPig && event.source instanceof
- * EntityDamageSource) { // getEntity will return the Entity that caused the
- * damage,even for indirect damage sources like arrows/fireballs // (where it
- * will return the Entity that shot the projectile rather than the projectile
- * itself) Entity sourceEntity = event.source.getEntity(); ItemStack heldItem =
- * sourceEntity instanceof EntityLiving ? ((EntityLiving)
- * sourceEntity).getHeldItem() : sourceEntity instanceof EntityPlayer ?
- * ((EntityPlayer) sourceEntity).getHeldItem() : null;
- *
- * if (heldItem != null && heldItem.getItem() == Items.iron_pickaxe) {
- * System.out.println("EntityPig drops event"); event.drops.clear();
- * event.entityLiving.dropItem(Items.diamond, 64); } }
+ * if (event.entityLiving instanceof EntityPig && event.source instanceof EntityDamageSource) { // getEntity
+ * will return the Entity that caused the damage,even for indirect damage sources like arrows/fireballs //
+ * (where it will return the Entity that shot the projectile rather than the projectile itself) Entity
+ * sourceEntity = event.source.getEntity(); ItemStack heldItem = sourceEntity instanceof EntityLiving ?
+ * ((EntityLiving) sourceEntity).getHeldItem() : sourceEntity instanceof EntityPlayer ? ((EntityPlayer)
+ * sourceEntity).getHeldItem() : null; if (heldItem != null && heldItem.getItem() == Items.iron_pickaxe) {
+ * System.out.println("EntityPig drops event"); event.drops.clear(); event.entityLiving.dropItem(Items.diamond,
+ * 64); } }
*/
}
@@ -99,13 +90,11 @@ public class BlockEventHandler {
if (!oreLimestone.isEmpty()) {
for (int i = 0; i < oreLimestone.size(); i++) {
if (ItemUtils.getModId(oreLimestone.get(i)) != null
- && !ItemUtils.getModId(oreLimestone.get(i))
- .toLowerCase()
+ && !ItemUtils.getModId(oreLimestone.get(i)).toLowerCase()
.contains("biomesoplenty")) {
- if (!mBlockTypes.contains(Block.getBlockFromItem(
- oreLimestone.get(i).getItem()))) {
- mBlockTypes.add(Block.getBlockFromItem(
- oreLimestone.get(i).getItem()));
+ if (!mBlockTypes
+ .contains(Block.getBlockFromItem(oreLimestone.get(i).getItem()))) {
+ mBlockTypes.add(Block.getBlockFromItem(oreLimestone.get(i).getItem()));
}
}
}
@@ -113,13 +102,12 @@ public class BlockEventHandler {
if (!blockLimestone.isEmpty()) {
for (int i = 0; i < blockLimestone.size(); i++) {
if (ItemUtils.getModId(blockLimestone.get(i)) != null
- && !ItemUtils.getModId(blockLimestone.get(i))
- .toLowerCase()
+ && !ItemUtils.getModId(blockLimestone.get(i)).toLowerCase()
.contains("biomesoplenty")) {
- if (!mBlockTypes.contains(Block.getBlockFromItem(
- blockLimestone.get(i).getItem()))) {
- mBlockTypes.add(Block.getBlockFromItem(
- blockLimestone.get(i).getItem()));
+ if (!mBlockTypes.contains(
+ Block.getBlockFromItem(blockLimestone.get(i).getItem()))) {
+ mBlockTypes
+ .add(Block.getBlockFromItem(blockLimestone.get(i).getItem()));
}
}
}
@@ -164,12 +152,10 @@ public class BlockEventHandler {
// Spawn Dull Shards (Can spawn from Tree Logs, Grass or Stone. Stone going to
// be the most common source.)
- if (((event.block == Blocks.stone)
- || (event.block == Blocks.sandstone)
- || (event.block == Blocks.log)
- || (event.block == Blocks.log2)
- || (event.block == Blocks.grass))
- && !LoadedMods.Thaumcraft
+ if (((event.block == Blocks.stone) || (event.block == Blocks.sandstone)
+ || (event.block == Blocks.log)
+ || (event.block == Blocks.log2)
+ || (event.block == Blocks.grass)) && !LoadedMods.Thaumcraft
&& (chanceToDropDrainedShard != 0)) {
// small chance for one to spawn per stone mined. 1 per 3 stacks~
if (MathUtils.randInt(1, chanceToDropDrainedShard) == 1) {
@@ -211,19 +197,14 @@ public class BlockEventHandler {
/*
* if (event.block instanceof BlockLog) { //
* http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/
- * modification-development/2444501-harvestdropevent-changing-drops-of-vanilla-
- * blocks
- *
- * // Utils.sendServerMessage("Logs! Harvester: %s Drops: %s", event.harvester
- * != null ? event.harvester.getCommandSenderName() : "<none>",
- * event.drops.stream().map(ItemStack.toString()).collect(Collectors.
- * joining(", "))); if (event.harvester != null) { ItemStack heldItem =
- * event.harvester.getHeldItem(); if (heldItem == null ||
- * heldItem.getItem().getHarvestLevel(heldItem, "axe") < 1) {
- * event.drops.clear();
+ * modification-development/2444501-harvestdropevent-changing-drops-of-vanilla- blocks //
+ * Utils.sendServerMessage("Logs! Harvester: %s Drops: %s", event.harvester != null ?
+ * event.harvester.getCommandSenderName() : "<none>",
+ * event.drops.stream().map(ItemStack.toString()).collect(Collectors. joining(", "))); if (event.harvester !=
+ * null) { ItemStack heldItem = event.harvester.getHeldItem(); if (heldItem == null ||
+ * heldItem.getItem().getHarvestLevel(heldItem, "axe") < 1) { event.drops.clear();
* Utils.sendServerMessage("Harvester had wrong tool, clearing drops"); } else {
- * Utils.sendServerMessage("Harvester had correct tool, not clearing drops"); }
- * } else { event.drops.clear();
+ * Utils.sendServerMessage("Harvester had correct tool, not clearing drops"); } } else { event.drops.clear();
* Utils.sendServerMessage("No harvester, clearing drops"); } }
*/
}
diff --git a/src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java b/src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java
index 523b926882..3546d47f65 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java
@@ -6,7 +6,7 @@ import net.minecraft.client.settings.GameSettings;
import net.minecraft.util.MovementInputFromOptions;
/*
- * Replacement for MovementInputFromOptions - Built from the source of ToggleSneak 3.0.3
+ * Replacement for MovementInputFromOptions - Built from the source of ToggleSneak 3.0.3
*/
public class CustomMovementHandler {
@@ -25,7 +25,7 @@ public class CustomMovementHandler {
private boolean wasRiding;
/*
- * MovementInputFromOptions.updatePlayerMoveState()
+ * MovementInputFromOptions.updatePlayerMoveState()
*/
public void update(final Minecraft mc, final MovementInputFromOptions options, final EntityPlayerSP thisPlayer) {
options.moveStrafe = 0.0F;
@@ -98,14 +98,15 @@ public class CustomMovementHandler {
}
//
- // Sprint Toggle - Updated 6/18/2014
+ // Sprint Toggle - Updated 6/18/2014
//
// Establish conditions where we don't want to start a sprint - sneaking, riding, flying, hungry
- final boolean enoughHunger =
- (thisPlayer.getFoodStats().getFoodLevel() > 6.0F) || thisPlayer.capabilities.isFlying;
- final boolean canSprint =
- !options.sneak && !thisPlayer.isRiding() && !thisPlayer.capabilities.isFlying && enoughHunger;
+ final boolean enoughHunger = (thisPlayer.getFoodStats().getFoodLevel() > 6.0F)
+ || thisPlayer.capabilities.isFlying;
+ final boolean canSprint = !options.sneak && !thisPlayer.isRiding()
+ && !thisPlayer.capabilities.isFlying
+ && enoughHunger;
this.isDisabled = !SneakManager.get(thisPlayer).Sprinting();
this.canDoubleTap = SneakManager.get(thisPlayer).optionDoubleTap;
@@ -122,7 +123,7 @@ public class CustomMovementHandler {
// Key Released
if ((canSprint || this.isDisabled) && !settings.keyBindSprint.getIsKeyPressed() && this.handledSprintPress) {
- // Was key held for longer than 300ms? If so, mark it so we can resume vanilla behavior
+ // Was key held for longer than 300ms? If so, mark it so we can resume vanilla behavior
if ((System.currentTimeMillis() - this.lastSprintPressed) > 300L) {
this.sprintHeldAndReleased = true;
}
diff --git a/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
index fd88d735e8..00806d748f 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.handler.events;
+import net.minecraft.entity.boss.EntityDragon;
+import net.minecraftforge.event.entity.living.LivingDropsEvent;
+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import net.minecraft.entity.boss.EntityDragon;
-import net.minecraftforge.event.entity.living.LivingDropsEvent;
public class EnderDragonDeathHandler {
@@ -14,8 +15,7 @@ public class EnderDragonDeathHandler {
private static final boolean mHEE;
private static final Class mHardcoreDragonClass;
- private static final String mChaosDragonClassName =
- "com.brandon3055.draconicevolution.common.entity.EntityCustomDragon";
+ private static final String mChaosDragonClassName = "com.brandon3055.draconicevolution.common.entity.EntityCustomDragon";
private static final boolean mDE;
private static final Class mChaoseDragonClass;
@@ -34,28 +34,28 @@ public class EnderDragonDeathHandler {
if (mHEE && mHardcoreDragonClass != null && mHardcoreDragonClass.isInstance(event.entityLiving)) {
for (int y = 0; y < MathUtils.randInt(100, 250); y++) {
int aAmount = MathUtils.randInt(5, 25);
- event.entityLiving.entityDropItem(
- ELEMENT.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1));
+ event.entityLiving
+ .entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1));
aCountTotal = +aAmount;
}
} else if (mDE && mChaoseDragonClass != null && mChaoseDragonClass.isInstance(event.entityLiving)) {
for (int y = 0; y < MathUtils.randInt(100, 200); y++) {
int aAmount = MathUtils.randInt(1, 5);
- event.entityLiving.entityDropItem(
- ELEMENT.STANDALONE.DRAGON_METAL.getIngot(aAmount), MathUtils.randFloat(0, 1));
+ event.entityLiving
+ .entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getIngot(aAmount), MathUtils.randFloat(0, 1));
aCountTotal = +aAmount;
}
} else if (event.entityLiving instanceof EntityDragon) {
for (int y = 0; y < MathUtils.randInt(25, 50); y++) {
int aAmount = MathUtils.randInt(1, 10);
- event.entityLiving.entityDropItem(
- ELEMENT.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1));
+ event.entityLiving
+ .entityDropItem(ELEMENT.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1));
aCountTotal = +aAmount;
}
}
if (aCountTotal > 0) {
- PlayerUtils.messageAllPlayers(
- aCountTotal + " Shards of Dragons Blood have crystalized into a metallic form.");
+ PlayerUtils
+ .messageAllPlayers(aCountTotal + " Shards of Dragons Blood have crystalized into a metallic form.");
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java
index 9548d80f62..d464f953a3 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java
@@ -1,5 +1,13 @@
package gtPlusPlus.core.handler.events;
+import java.util.HashMap;
+import java.util.HashSet;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.event.entity.living.LivingDropsEvent;
+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
@@ -8,29 +16,25 @@ import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import java.util.HashMap;
-import java.util.HashSet;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.event.entity.living.LivingDropsEvent;
public class EntityDeathHandler {
- private static final HashMap<Class, AutoMap<Triplet<ItemStack, Integer, Integer>>> mMobDropMap =
- new HashMap<Class, AutoMap<Triplet<ItemStack, Integer, Integer>>>();
+ private static final HashMap<Class, AutoMap<Triplet<ItemStack, Integer, Integer>>> mMobDropMap = new HashMap<Class, AutoMap<Triplet<ItemStack, Integer, Integer>>>();
private static final HashSet<Class> mInternalClassKeyCache = new HashSet<Class>();
/**
* Provides the ability to provide custom drops upon the death of EntityLivingBase objects.
- * @param aMobClass - The Base Class you want to drop this item.
- * @param aStack - The ItemStack, stack size is not respected.
+ *
+ * @param aMobClass - The Base Class you want to drop this item.
+ * @param aStack - The ItemStack, stack size is not respected.
* @param aMaxAmount - The maximum size of the ItemStack which drops.
- * @param aChance - Chance out of 10000, where 100 is 1%. (1 = 0.01% - this is ok)
+ * @param aChance - Chance out of 10000, where 100 is 1%. (1 = 0.01% - this is ok)
*/
public static void registerDropsForMob(Class aMobClass, ItemStack aStack, int aMaxAmount, int aChance) {
- Triplet<ItemStack, Integer, Integer> aData =
- new Triplet<ItemStack, Integer, Integer>(aStack, aMaxAmount, aChance);
+ Triplet<ItemStack, Integer, Integer> aData = new Triplet<ItemStack, Integer, Integer>(
+ aStack,
+ aMaxAmount,
+ aChance);
AutoMap<Triplet<ItemStack, Integer, Integer>> aDataMap = mMobDropMap.get(aMobClass);
if (aDataMap == null) {
aDataMap = new AutoMap<Triplet<ItemStack, Integer, Integer>>();
@@ -38,8 +42,12 @@ public class EntityDeathHandler {
aDataMap.put(aData);
mMobDropMap.put(aMobClass, aDataMap);
- Logger.INFO("[Loot] Registered " + aStack.getDisplayName() + " (1-" + aMaxAmount + ") as a valid drop for "
- + aMobClass.getCanonicalName());
+ Logger.INFO(
+ "[Loot] Registered " + aStack.getDisplayName()
+ + " (1-"
+ + aMaxAmount
+ + ") as a valid drop for "
+ + aMobClass.getCanonicalName());
if (!mInternalClassKeyCache.contains(aMobClass)) {
mInternalClassKeyCache.add(aMobClass);
@@ -83,23 +91,27 @@ public class EntityDeathHandler {
// always drop some meat.
int aBigMeatStackSize1 = MathUtils.randInt(4, 8);
aPlayer.entityDropItem(
- ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize1), MathUtils.randInt(0, 1));
+ ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize1),
+ MathUtils.randInt(0, 1));
// additional chances for more meat.
if (MathUtils.randInt(0, 10) < 7) {
int aBigMeatStackSize2 = MathUtils.randInt(4, 8);
aPlayer.entityDropItem(
- ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize2), MathUtils.randInt(0, 1));
+ ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize2),
+ MathUtils.randInt(0, 1));
}
if (MathUtils.randInt(0, 10) < 4) {
int aBigMeatStackSize3 = MathUtils.randInt(4, 8);
aPlayer.entityDropItem(
- ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize3), MathUtils.randInt(0, 1));
+ ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize3),
+ MathUtils.randInt(0, 1));
}
if (MathUtils.randInt(0, 10) < 2) {
int aBigMeatStackSize4 = MathUtils.randInt(4, 8);
aPlayer.entityDropItem(
- ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize4), MathUtils.randInt(0, 1));
+ ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize4),
+ MathUtils.randInt(0, 1));
}
}
diff --git a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
index d917dfae83..363ad472f2 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
@@ -1,5 +1,11 @@
package gtPlusPlus.core.handler.events;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+
import advsolar.common.AdvancedSolarPanel;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -11,11 +17,6 @@ import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
public class GeneralTooltipEventHandler {
@@ -36,9 +37,8 @@ public class GeneralTooltipEventHandler {
if (CORE.ConfigSwitches.chanceToDropFluoriteOre > 0) {
if (BlockEventHandler.blockLimestone != null && !BlockEventHandler.blockLimestone.isEmpty()) {
for (ItemStack h : BlockEventHandler.blockLimestone) {
- if (h != null
- && Block.getBlockFromItem(h.getItem())
- == Block.getBlockFromItem(event.itemStack.getItem())) {
+ if (h != null && Block.getBlockFromItem(h.getItem())
+ == Block.getBlockFromItem(event.itemStack.getItem())) {
if (ItemUtils.getModId(h) != null
&& !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
event.toolTip.add("May contain Fluorite Ore");
@@ -48,9 +48,8 @@ public class GeneralTooltipEventHandler {
}
if (BlockEventHandler.oreLimestone != null && !BlockEventHandler.oreLimestone.isEmpty()) {
for (ItemStack h : BlockEventHandler.oreLimestone) {
- if (h != null
- && Block.getBlockFromItem(h.getItem())
- == Block.getBlockFromItem(event.itemStack.getItem())) {
+ if (h != null && Block.getBlockFromItem(h.getItem())
+ == Block.getBlockFromItem(event.itemStack.getItem())) {
if (ItemUtils.getModId(h) != null
&& !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
event.toolTip.add("May contain Fluorite Ore");
diff --git a/src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java
index c03fbd7ff6..fec88a5d74 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java
@@ -1,16 +1,18 @@
package gtPlusPlus.core.handler.events;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.UUID;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.proxy.ClientProxy;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.player.PlayerCache;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.UUID;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
public class LoginEventHandler {
@@ -45,44 +47,25 @@ public class LoginEventHandler {
PlayerCache.appendParamChanges(this.localPlayersName, this.localPlayersUUID.toString());
}
- /*if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009") || localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){
- Utils.LOG_INFO("Spawning a new Santa Thread.");
- Thread t = new Thread() {
- UUID threadHandlerIDthing = localPlayersUUID;
- @Override
- public void run() {
- while(true && Minecraft.getMinecraft().getIntegratedServer() != null) {
- try {
- if(localPlayerRef == null){
- localPlayerRef = Utils.getPlayerOnServerFromUUID(threadHandlerIDthing);
- }
-
-
- //ImQ009 is a legend.
- if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009")){
- Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread.");
- localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, MathUtils.randInt(1, 5)));
- }
-
-
- if (localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){
- Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread.");
- localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, MathUtils.randInt(1, 5)));
- }
- Thread.sleep(1000*60*MathUtils.randInt(15, 90));
- } catch (InterruptedException ie) {
- Utils.LOG_INFO("Santa Mode Disabled.");
- }
- }
-
- Utils.LOG_INFO("Thread Stopped. Handler Closed.");
-
- }
- };
- //t.start();
-
-
- }*/
+ /*
+ * if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009") ||
+ * localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){
+ * Utils.LOG_INFO("Spawning a new Santa Thread."); Thread t = new Thread() { UUID threadHandlerIDthing =
+ * localPlayersUUID;
+ * @Override public void run() { while(true && Minecraft.getMinecraft().getIntegratedServer() != null) {
+ * try { if(localPlayerRef == null){ localPlayerRef =
+ * Utils.getPlayerOnServerFromUUID(threadHandlerIDthing); } //ImQ009 is a legend. if
+ * (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009")){
+ * Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread.");
+ * localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.
+ * itemIngotRaisinBread, MathUtils.randInt(1, 5))); } if
+ * (localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){
+ * Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread.");
+ * localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.
+ * itemIngotRaisinBread, MathUtils.randInt(1, 5))); } Thread.sleep(1000*60*MathUtils.randInt(15, 90)); }
+ * catch (InterruptedException ie) { Utils.LOG_INFO("Santa Mode Disabled."); } }
+ * Utils.LOG_INFO("Thread Stopped. Handler Closed."); } }; //t.start(); }
+ */
}
} catch (final Throwable errr) {
@@ -100,6 +83,7 @@ public class LoginEventHandler {
// Timer Task for notifying the player.
class NotifyPlayer extends TimerTask {
+
final EntityPlayer toMessage;
public NotifyPlayer(EntityPlayer localPlayer) {
@@ -111,7 +95,8 @@ public class LoginEventHandler {
if (toMessage != null) {
if (toMessage instanceof EntityPlayerMP) {
PlayerUtils.messagePlayer(
- toMessage, "You're not using the latest recommended version of GT++, consider updating.");
+ toMessage,
+ "You're not using the latest recommended version of GT++, consider updating.");
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java b/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java
index e4535cb6e1..762a2400f7 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java
@@ -2,13 +2,15 @@ package gtPlusPlus.core.handler.events;
import static gtPlusPlus.core.item.base.dusts.BaseItemDustEx.mCachedPileLinkages;
+import net.minecraft.item.ItemStack;
+
+import org.apache.commons.lang3.StringUtils;
+
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.item.ItemStack;
-import org.apache.commons.lang3.StringUtils;
public class MissingMappingsEvent {
@@ -21,7 +23,7 @@ public class MissingMappingsEvent {
// Example
// if(mapping.name.equals("PneumaticCraft:etchingAcid")) {
- // mapping.remap(Fluids.etchingAcid.getBlock());
+ // mapping.remap(Fluids.etchingAcid.getBlock());
// }
}
@@ -31,7 +33,7 @@ public class MissingMappingsEvent {
// Example
// if(mapping.name.equals("PneumaticCraft:etchingAcidBucket")) {
- // mapping.remap(Fluids.getBucket(Fluids.etchingAcid));
+ // mapping.remap(Fluids.getBucket(Fluids.etchingAcid));
// }
if (mapping.name.contains("miscutils:itemDustTiny")) {
diff --git a/src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
index 0c8470fa3b..dbcd3be01b 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
@@ -1,12 +1,8 @@
package gtPlusPlus.core.handler.events;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
import java.util.List;
import java.util.UUID;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.ChunkPosition;
@@ -14,7 +10,14 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.world.BlockEvent.BreakEvent;
import net.minecraftforge.event.world.ExplosionEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
+
public class PickaxeBlockBreakEventHandler {
+
@SubscribeEvent
public void onBreakBlock(final BreakEvent event) {
try {
@@ -29,10 +32,12 @@ public class PickaxeBlockBreakEventHandler {
if (((GregtechMetaSafeBlockBase) X).bUnbreakable) {
if (accessorUUID == ownerUUID) {
PlayerUtils.messagePlayer(
- playerInternal, "Since you own this block, it has been destroyed.");
+ playerInternal,
+ "Since you own this block, it has been destroyed.");
} else {
PlayerUtils.messagePlayer(
- playerInternal, "Since you do not own this block, it has not been destroyed.");
+ playerInternal,
+ "Since you do not own this block, it has not been destroyed.");
event.setCanceled(true);
}
}
@@ -51,8 +56,8 @@ public class PickaxeBlockBreakEventHandler {
List<ChunkPosition> pos = event.explosion.affectedBlockPositions;
for (int i = 0; i < pos.size(); i++) {
ChunkPosition blockpos = (ChunkPosition) pos.get(i);
- TileEntity entity =
- event.world.getTileEntity(blockpos.chunkPosX, blockpos.chunkPosY, blockpos.chunkPosZ);
+ TileEntity entity = event.world
+ .getTileEntity(blockpos.chunkPosX, blockpos.chunkPosY, blockpos.chunkPosZ);
if (entity != null) {
if (entity instanceof BaseMetaTileEntity) {
final IMetaTileEntity X = ((BaseMetaTileEntity) entity).getMetaTileEntity();
@@ -69,8 +74,7 @@ public class PickaxeBlockBreakEventHandler {
@SubscribeEvent
public void onPlayerInteraction(final PlayerInteractEvent aEvent) {
- if ((aEvent.entityPlayer != null)
- && (aEvent.entityPlayer.worldObj != null)
+ if ((aEvent.entityPlayer != null) && (aEvent.entityPlayer.worldObj != null)
&& (aEvent.action != null)
&& (aEvent.world.provider != null)
&& !aEvent.entityPlayer.worldObj.isRemote
diff --git a/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java
index 6a3e3bb71f..5fa5739940 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java
@@ -1,16 +1,9 @@
package gtPlusPlus.core.handler.events;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.potion.GtPotionEffect;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.DevHelper;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collection;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
@@ -18,10 +11,19 @@ import net.minecraft.util.ChatComponentTranslation;
import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
import net.minecraftforge.event.entity.player.PlayerWakeUpEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.potion.GtPotionEffect;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.DevHelper;
+
public class PlayerSleepEventHandler {
- private static Field sEffectDuration = ReflectionUtils.getField(
- PotionEffect.class, DevHelper.isObfuscatedEnvironment() ? "field_76460_b" : "duration");
+ private static Field sEffectDuration = ReflectionUtils
+ .getField(PotionEffect.class, DevHelper.isObfuscatedEnvironment() ? "field_76460_b" : "duration");
private static ArrayList<Potion> sPositiveEffects = new ArrayList<Potion>();
private static ArrayList<Potion> sNegativeEffects = new ArrayList<Potion>();
@@ -91,8 +93,11 @@ public class PlayerSleepEventHandler {
int aRandomBuff = MathUtils.randInt(0, sPositiveEffects.size() - 1);
Potion aPotionToApply = sPositiveEffects.get(aRandomBuff);
if (aPotionToApply != null) {
- aPlayer.addPotionEffect(new GtPotionEffect(
- aPotionToApply.id, MathUtils.randInt(60, 180), MathUtils.randInt(0, 2)));
+ aPlayer.addPotionEffect(
+ new GtPotionEffect(
+ aPotionToApply.id,
+ MathUtils.randInt(60, 180),
+ MathUtils.randInt(0, 2)));
messagePlayer(aPlayer, "sleep.event.wellrested");
}
}
diff --git a/src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java
index fb64fc93cf..14d791bf54 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.handler.events;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.entity.player.EntityPlayer;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+
public class PlayerTickHandler {
@SubscribeEvent
diff --git a/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java b/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java
index 177f04e977..14e9af20ec 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java
@@ -1,9 +1,11 @@
package gtPlusPlus.core.handler.events;
-import gtPlusPlus.api.objects.Logger;
import java.util.concurrent.ConcurrentHashMap;
+
import net.minecraft.entity.player.EntityPlayer;
+import gtPlusPlus.api.objects.Logger;
+
public class SneakManager {
// We make this a singleton for clientside data storage.
@@ -110,6 +112,7 @@ public class SneakManager {
}
public static enum State {
+
ON(true),
OFF(false);
diff --git a/src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java b/src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java
index ddd8f78a23..a5cf61b066 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java
@@ -1,14 +1,15 @@
package gtPlusPlus.core.handler.events;
+import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.metatileentity.BaseMetaPipeEntity;
import gregtech.api.metatileentity.BaseMetaTileEntity;
import gregtech.api.metatileentity.BaseTileEntity;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock;
-import net.minecraft.block.Block;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
public class UnbreakableBlockManager {
@@ -18,11 +19,11 @@ public class UnbreakableBlockManager {
return mTileEntity;
}
- public final void setmTileEntity(final BaseMetaTileEntity mTileEntity /*, EntityPlayer aPlayer*/) {
+ public final void setmTileEntity(final BaseMetaTileEntity mTileEntity /* , EntityPlayer aPlayer */) {
UnbreakableBlockManager.mTileEntity = mTileEntity;
if (!hasRun) {
hasRun = true;
- this.makeIndestructible(/*aPlayer*/ );
+ this.makeIndestructible(/* aPlayer */ );
} else {
Logger.WARNING("Why do you run twice?");
}
@@ -32,7 +33,7 @@ public class UnbreakableBlockManager {
// GregtechMetaSafeBlock
private static BaseMetaTileEntity mTileEntity = null;
- private void makeIndestructible(/*EntityPlayer aPlayer*/ ) {
+ private void makeIndestructible(/* EntityPlayer aPlayer */ ) {
Logger.WARNING("Initializing the code to set this TE to -1 hardness and make it indestructible.");
final int X = mTileEntity.xCoord; // (GregtechMetaSafeBlock) this.mTileEntity.getXCoord();
@@ -41,27 +42,23 @@ public class UnbreakableBlockManager {
Logger.WARNING("Grabbing TileEntity @ [x,y,z] |" + X + "|" + Y + "|" + Z + "|");
try {
- final GregtechMetaSafeBlock MetaSafeBlock =
- ((GregtechMetaSafeBlock) UnbreakableBlockManager.mTileEntity.getMetaTileEntity());
+ final GregtechMetaSafeBlock MetaSafeBlock = ((GregtechMetaSafeBlock) UnbreakableBlockManager.mTileEntity
+ .getMetaTileEntity());
final TileEntity BaseMetaTileEntity = mTileEntity.getTileEntity(X, Y, Z);
// MetaSafeBlockBase.
final World TE_WORLD = MetaSafeBlock.getBaseMetaTileEntity().getWorld();
Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable);
final TileEntity entity = BaseMetaTileEntity;
- innerInvincible(MetaSafeBlock, entity, TE_WORLD, /*aPlayer,*/ X, Y, Z);
+ innerInvincible(MetaSafeBlock, entity, TE_WORLD, /* aPlayer, */ X, Y, Z);
} catch (final NullPointerException e) {
System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: ");
e.printStackTrace();
}
}
- private static void innerInvincible(
- final GregtechMetaSafeBlock MetaSafeBlock,
- final TileEntity entity,
- final World TE_WORLD, /*EntityPlayer aPlayer,*/
- final int X,
- final int Y,
- final int Z) {
+ private static void innerInvincible(final GregtechMetaSafeBlock MetaSafeBlock, final TileEntity entity,
+ final World TE_WORLD, /* EntityPlayer aPlayer, */
+ final int X, final int Y, final int Z) {
if (entity != null) {
Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable);
Logger.WARNING("Grabbed TE: " + entity.toString());
@@ -83,8 +80,9 @@ public class UnbreakableBlockManager {
// ThisBlock.setResistance(18000000.0F);
ThisBlock.setResistance(-1);
ThisBlock.setBlockUnbreakable();
- Logger.WARNING("Changing State of Flag. Old Value=" + MetaSafeBlock.bUnbreakable
- + " Expected Value=true");
+ Logger.WARNING(
+ "Changing State of Flag. Old Value=" + MetaSafeBlock.bUnbreakable
+ + " Expected Value=true");
MetaSafeBlock.bUnbreakable = true;
// entity.markDirty();
Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable);
@@ -93,8 +91,9 @@ public class UnbreakableBlockManager {
} else {
ThisBlock.setHardness(1);
ThisBlock.setResistance(1.0F);
- Logger.WARNING("Changing State of Flag. Old Value=" + MetaSafeBlock.bUnbreakable
- + " Expected Value=false");
+ Logger.WARNING(
+ "Changing State of Flag. Old Value=" + MetaSafeBlock.bUnbreakable
+ + " Expected Value=false");
MetaSafeBlock.bUnbreakable = false;
// entity.markDirty();
Logger.WARNING("Checking new State of Flag[nUnbreakable]. Value=" + MetaSafeBlock.bUnbreakable);
diff --git a/src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java
index 9a6a840216..cbbb1df2ee 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java
@@ -1,19 +1,22 @@
package gtPlusPlus.core.handler.events;
+import java.lang.reflect.Field;
+
+import net.minecraftforge.event.entity.living.ZombieEvent;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import gtPlusPlus.api.objects.Logger;
-import java.lang.reflect.Field;
-import net.minecraftforge.event.entity.living.ZombieEvent;
-import org.apache.commons.lang3.reflect.FieldUtils;
public class ZombieBackupSpawnEventHandler {
/**
*
- * Do we really need this pathetic mechanic to exist when it doesn't work properly at all?
- * Or , well, maybe you enjoy Zombies spawning IN YOUR FUCKING FACE?!
+ * Do we really need this pathetic mechanic to exist when it doesn't work properly at all? Or , well, maybe you
+ * enjoy Zombies spawning IN YOUR FUCKING FACE?!
*
*/
@SubscribeEvent(priority = EventPriority.HIGHEST)
@@ -23,15 +26,13 @@ public class ZombieBackupSpawnEventHandler {
Field mChance = FieldUtils.getDeclaredField(this.getClass(), "summonChance", true);
FieldUtils.removeFinalModifier(mChance, true);
mChance.set(this, 0);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
if (event.attacker != null) {
// SegmentHelper.getInstance().trackUser(event.attacker.getUniqueID().toString(), "Zombie Backup");
}
Logger.WARNING("[Zombie] ZombieEvent.SummonAidEvent.");
event.setResult(Result.DENY);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
@SubscribeEvent(priority = EventPriority.HIGHEST)
diff --git a/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java b/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java
index caf352d0de..3fd0e6b984 100644
--- a/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java
@@ -1,10 +1,7 @@
package gtPlusPlus.core.handler.render;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
import java.util.Collection;
+
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.entity.RenderManager;
@@ -13,14 +10,19 @@ import net.minecraft.potion.Potion;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderPlayerEvent;
+
import org.lwjgl.opengl.GL11;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
+
public class CapeHandler extends RenderPlayer {
- private final ResourceLocation[] mCapes = {
- new ResourceLocation(CORE.MODID + ":textures/TesterCape.png"),
- new ResourceLocation(CORE.MODID + ":textures/Draknyte1.png"),
- new ResourceLocation("gregtech:textures/GregoriusCape.png")
- };
+
+ private final ResourceLocation[] mCapes = { new ResourceLocation(CORE.MODID + ":textures/TesterCape.png"),
+ new ResourceLocation(CORE.MODID + ":textures/Draknyte1.png"),
+ new ResourceLocation("gregtech:textures/GregoriusCape.png") };
private final Collection<String> mCapeList;
public CapeHandler(final Collection<String> aCapeList) {
@@ -38,8 +40,7 @@ public class CapeHandler extends RenderPlayer {
if (aPlayer.isInvisible()) {
return;
}
- if (GT_Utility.getPotion(
- aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) {
+ if (GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) {
return;
}
try {
@@ -60,15 +61,15 @@ public class CapeHandler extends RenderPlayer {
this.bindTexture(tResource);
GL11.glPushMatrix();
GL11.glTranslatef(0.0F, 0.0F, 0.125F);
- final double d0 =
- (aPlayer.field_71091_bM + ((aPlayer.field_71094_bP - aPlayer.field_71091_bM) * aPartialTicks))
- - (aPlayer.prevPosX + ((aPlayer.posX - aPlayer.prevPosX) * aPartialTicks));
- final double d1 =
- (aPlayer.field_71096_bN + ((aPlayer.field_71095_bQ - aPlayer.field_71096_bN) * aPartialTicks))
- - (aPlayer.prevPosY + ((aPlayer.posY - aPlayer.prevPosY) * aPartialTicks));
- final double d2 =
- (aPlayer.field_71097_bO + ((aPlayer.field_71085_bR - aPlayer.field_71097_bO) * aPartialTicks))
- - (aPlayer.prevPosZ + ((aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks));
+ final double d0 = (aPlayer.field_71091_bM
+ + ((aPlayer.field_71094_bP - aPlayer.field_71091_bM) * aPartialTicks))
+ - (aPlayer.prevPosX + ((aPlayer.posX - aPlayer.prevPosX) * aPartialTicks));
+ final double d1 = (aPlayer.field_71096_bN
+ + ((aPlayer.field_71095_bQ - aPlayer.field_71096_bN) * aPartialTicks))
+ - (aPlayer.prevPosY + ((aPlayer.posY - aPlayer.prevPosY) * aPartialTicks));
+ final double d2 = (aPlayer.field_71097_bO
+ + ((aPlayer.field_71085_bR - aPlayer.field_71097_bO) * aPartialTicks))
+ - (aPlayer.prevPosZ + ((aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks));
final float f6 = aPlayer.prevRenderYawOffset
+ ((aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks);
final double d3 = MathHelper.sin((f6 * CORE.PI) / 180.0F);
@@ -86,9 +87,10 @@ public class CapeHandler extends RenderPlayer {
f8 = 0.0F;
}
final float f10 = aPlayer.prevCameraYaw + ((aPlayer.cameraYaw - aPlayer.prevCameraYaw) * aPartialTicks);
- f7 += MathHelper.sin((aPlayer.prevDistanceWalkedModified
- + ((aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified)
- * aPartialTicks))
+ f7 += MathHelper.sin(
+ (aPlayer.prevDistanceWalkedModified
+ + ((aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified)
+ * aPartialTicks))
* 6.0F)
* 32.0F
* f10;
diff --git a/src/main/java/gtPlusPlus/core/handler/render/FirepitModel.java b/src/main/java/gtPlusPlus/core/handler/render/FirepitModel.java
index 82033394f7..e53ce25e3c 100644
--- a/src/main/java/gtPlusPlus/core/handler/render/FirepitModel.java
+++ b/src/main/java/gtPlusPlus/core/handler/render/FirepitModel.java
@@ -6,12 +6,14 @@
package gtPlusPlus.core.handler.render;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
+import gtPlusPlus.core.lib.CORE;
+
public class FirepitModel extends ModelBase {
+
// fields
ModelRenderer Side_A;
ModelRenderer Side_B;
@@ -88,14 +90,8 @@ public class FirepitModel extends ModelBase {
}
@Override
- public void render(
- final Entity entity,
- final float f,
- final float f1,
- final float f2,
- final float f3,
- final float f4,
- final float f5) {
+ public void render(final Entity entity, final float f, final float f1, final float f2, final float f3,
+ final float f4, final float f5) {
super.render(entity, f, f1, f2, f3, f4, f5);
this.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
this.Side_A.render(f5);
@@ -115,14 +111,8 @@ public class FirepitModel extends ModelBase {
}
@Override
- public void setRotationAngles(
- final float f,
- final float f1,
- final float f2,
- final float f3,
- final float f4,
- final float f5,
- final Entity entity) {
+ public void setRotationAngles(final float f, final float f1, final float f2, final float f3, final float f4,
+ final float f5, final Entity entity) {
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
}
}
diff --git a/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java b/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java
index 616822ada4..c1099585ce 100644
--- a/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java
+++ b/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java
@@ -8,9 +8,11 @@ import net.minecraft.entity.Entity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
+
import org.lwjgl.opengl.GL11;
public class FirepitRender extends TileEntitySpecialRenderer {
+
ResourceLocation texture = new ResourceLocation("miscutils" + ":" + "textures/blocks/FirePit/mossyFirepit.png");
private final FirepitModel model;
@@ -27,8 +29,8 @@ public class FirepitRender extends TileEntitySpecialRenderer {
}
@Override
- public void renderTileEntityAt(
- final TileEntity entity, final double x, final double y, final double z, final float i) {
+ public void renderTileEntityAt(final TileEntity entity, final double x, final double y, final double z,
+ final float i) {
GL11.glPushMatrix();
GL11.glTranslatef((float) x + 0.1F, (float) y + 1.0F, (float) z + 0.5F);
GL11.glRotatef(180, 0F, 0F, 1F);
diff --git a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java
index d68d07c5eb..e9e2609e1e 100644
--- a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.handler.workbench;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -28,10 +29,10 @@ public class Workbench_CraftingHandler {
// just a example recipe so you know how to add them
this.addRecipe(
new ItemStack(Blocks.iron_block),
- new Object[] {"###", "###", "###", Character.valueOf('#'), Items.iron_ingot});
+ new Object[] { "###", "###", "###", Character.valueOf('#'), Items.iron_ingot });
// another example Recipe, but shapeless
- this.addShapelessRecipe(new ItemStack(Items.cake), new Object[] {Items.stick});
+ this.addShapelessRecipe(new ItemStack(Items.cake), new Object[] { Items.stick });
}
void addRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[]) {
@@ -135,21 +136,13 @@ public class Workbench_CraftingHandler {
}
// TODO - Update from itemIDs
- /*if (i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isDamageable())
- {
- Item item = Item.itemsList[itemstack.itemID];
- int l = item.getMaxDamage() - itemstack.getItemDamageForDisplay();
- int i1 = item.getMaxDamage() - itemstack1.getItemDamageForDisplay();
- int j1 = l + i1 + (item.getMaxDamage() * 10) / 100;
- int k1 = item.getMaxDamage() - j1;
-
- if (k1 < 0)
- {
- k1 = 0;
- }
-
- return new ItemStack(itemstack.itemID, 1, k1);
- }*/
+ /*
+ * if (i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1
+ * && Item.itemsList[itemstack.itemID].isDamageable()) { Item item = Item.itemsList[itemstack.itemID]; int l =
+ * item.getMaxDamage() - itemstack.getItemDamageForDisplay(); int i1 = item.getMaxDamage() -
+ * itemstack1.getItemDamageForDisplay(); int j1 = l + i1 + (item.getMaxDamage() * 10) / 100; int k1 =
+ * item.getMaxDamage() - j1; if (k1 < 0) { k1 = 0; } return new ItemStack(itemstack.itemID, 1, k1); }
+ */
for (int k = 0; k < this.recipes.size(); k++) {
final IRecipe irecipe = this.recipes.get(k);
diff --git a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java
index d8b25c4746..964aaf2bf7 100644
--- a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java
+++ b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java
@@ -1,11 +1,13 @@
package gtPlusPlus.core.handler.workbench;
import java.util.Comparator;
+
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraft.item.crafting.ShapelessRecipes;
public class Workbench_RecipeSorter implements Comparator<Object> {
+
final Workbench_CraftingHandler CraftingManagerCrafter;
Workbench_RecipeSorter(final Workbench_CraftingHandler par1CraftingManager) {
diff --git a/src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java b/src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java
index f5f10162f9..f7f1194b9a 100644
--- a/src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java
+++ b/src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java
@@ -1,3 +1,4 @@
package gtPlusPlus.core.interfaces;
-public abstract interface IGuiManagerMiscUtils {}
+public abstract interface IGuiManagerMiscUtils {
+}
diff --git a/src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java b/src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java
index 2c320b5830..b0fa752f3f 100644
--- a/src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java
+++ b/src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java
@@ -12,6 +12,7 @@ public interface IItemBlueprint {
/**
* Meta Compatible function to allow meta items to be blueprints
+ *
* @param stack yourMetaItem
* @return true if it is a Blueprint
*/
@@ -19,6 +20,7 @@ public interface IItemBlueprint {
/**
* Sets the blueprint for this itemstack.
+ *
* @param stack yourMetaItem
* @return true if blueprint is set successfully
*/
@@ -26,6 +28,7 @@ public interface IItemBlueprint {
/**
* Sets the name of the recipe/blueprint
+ *
* @param String Blueprint Name
* @return N/A
*/
@@ -33,6 +36,7 @@ public interface IItemBlueprint {
/**
* Does this itemstack hold a blueprint?
+ *
* @param stack yourMetaItem
* @return true if is holding a Blueprint
*/
@@ -40,6 +44,7 @@ public interface IItemBlueprint {
/**
* Gets the recipe held by the item
+ *
* @param stack yourMetaItem
* @return the blueprints contents
*/
diff --git a/src/main/java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java b/src/main/java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java
index 3dce83535b..3f48ded92c 100644
--- a/src/main/java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java
+++ b/src/main/java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java
@@ -1,7 +1,7 @@
package gtPlusPlus.core.inventories;
-import gtPlusPlus.core.item.base.BaseItemBackpack;
import java.util.UUID;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -9,6 +9,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.util.Constants;
+import gtPlusPlus.core.item.base.BaseItemBackpack;
+
public class BaseInventoryBackpack implements IInventory {
private final String name = "Inventory Item";
@@ -115,9 +117,9 @@ public class BaseInventoryBackpack implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -146,9 +148,8 @@ public class BaseInventoryBackpack implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java b/src/main/java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java
index b402dcea20..5692612d5f 100644
--- a/src/main/java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java
+++ b/src/main/java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java
@@ -1,7 +1,7 @@
package gtPlusPlus.core.inventories;
-import gtPlusPlus.core.item.base.BaseItemBackpack;
import java.util.UUID;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -9,6 +9,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.util.Constants;
+import gtPlusPlus.core.item.base.BaseItemBackpack;
+
public class BaseInventoryGrindle implements IInventory {
private final String name = "Inventory Item";
@@ -20,8 +22,7 @@ public class BaseInventoryGrindle implements IInventory {
public static final int INV_SIZE = 6;
/**
- * Inventory's size must be same as number of slots you add to the Container
- * class
+ * Inventory's size must be same as number of slots you add to the Container class
*/
private final ItemStack[] inventory = new ItemStack[INV_SIZE];
@@ -29,8 +30,7 @@ public class BaseInventoryGrindle implements IInventory {
protected String uniqueID;
/**
- * @param itemstack
- * - the ItemStack to which this inventory belongs
+ * @param itemstack - the ItemStack to which this inventory belongs
*/
public BaseInventoryGrindle(final ItemStack stack) {
this.invItem = stack;
@@ -119,9 +119,8 @@ public class BaseInventoryGrindle implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is
- * called (or should be called!) anytime the inventory changes. Perfect. Much
- * better than using onUpdate in an Item, as this will also let you change
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
* things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@@ -151,8 +150,8 @@ public class BaseInventoryGrindle implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as items can still be
- * left-clicked and placed in the inventory even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java
index 0512dd4b15..180df60e81 100644
--- a/src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.inventories;
-import gtPlusPlus.core.slots.SlotIntegratedCircuit;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
+import gtPlusPlus.core.slots.SlotIntegratedCircuit;
+
public class InventoryCircuitProgrammer implements IInventory {
private final String name = "Circuit Programmer";
@@ -112,9 +113,9 @@ public class InventoryCircuitProgrammer implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -145,9 +146,8 @@ public class InventoryCircuitProgrammer implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java b/src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java
index 2bf1a390b1..e4797d67bc 100644
--- a/src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java
@@ -111,9 +111,9 @@ public class InventoryFishTrap implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -144,9 +144,8 @@ public class InventoryFishTrap implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java b/src/main/java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java
index 8ea78647ab..fb9b481f88 100644
--- a/src/main/java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java
@@ -111,9 +111,9 @@ public class InventoryHeliumGenerator implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -144,9 +144,8 @@ public class InventoryHeliumGenerator implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java b/src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java
index b1852480c4..b508de1d6d 100644
--- a/src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java
@@ -111,9 +111,9 @@ public class InventoryPestKiller implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -144,9 +144,8 @@ public class InventoryPestKiller implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java
index dbcf75603a..08e238241c 100644
--- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java
@@ -114,9 +114,9 @@ public class InventoryWorkbenchChest implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -147,9 +147,8 @@ public class InventoryWorkbenchChest implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java
index 82cd532e92..2dd44c9ea7 100644
--- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java
@@ -136,9 +136,9 @@ public class InventoryWorkbenchCrafting implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -164,9 +164,8 @@ public class InventoryWorkbenchCrafting implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java
index 724c0fab99..0c1a9bf5f0 100644
--- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java
@@ -19,37 +19,15 @@ public class InventoryWorkbenchHoloCrafting implements IInventory {
*/
public InventoryWorkbenchHoloCrafting() {}
- /*public void readFromNBT(NBTTagCompound nbt)
- {
- NBTTagList list = nbt.getTagList("Items", 10);
- inventory = new ItemStack[INV_SIZE];
- for(int i = 0;i<list.tagCount();i++)
- {
- NBTTagCompound data = list.getCompoundTagAt(i);
- int slot = data.getInteger("Slot");
- if(slot >= 0 && slot < INV_SIZE)
- {
- inventory[slot] = ItemStack.loadItemStackFromNBT(data);
- }
- }
- }
-
- public void writeToNBT(NBTTagCompound nbt)
- {
- NBTTagList list = new NBTTagList();
- for(int i = 0;i<INV_SIZE;i++)
- {
- ItemStack stack = inventory[i];
- if(stack != null)
- {
- NBTTagCompound data = new NBTTagCompound();
- stack.writeToNBT(data);
- data.setInteger("Slot", i);
- list.appendTag(data);
- }
- }
- nbt.setTag("Items", list);
- }*/
+ /*
+ * public void readFromNBT(NBTTagCompound nbt) { NBTTagList list = nbt.getTagList("Items", 10); inventory = new
+ * ItemStack[INV_SIZE]; for(int i = 0;i<list.tagCount();i++) { NBTTagCompound data = list.getCompoundTagAt(i); int
+ * slot = data.getInteger("Slot"); if(slot >= 0 && slot < INV_SIZE) { inventory[slot] =
+ * ItemStack.loadItemStackFromNBT(data); } } } public void writeToNBT(NBTTagCompound nbt) { NBTTagList list = new
+ * NBTTagList(); for(int i = 0;i<INV_SIZE;i++) { ItemStack stack = inventory[i]; if(stack != null) { NBTTagCompound
+ * data = new NBTTagCompound(); stack.writeToNBT(data); data.setInteger("Slot", i); list.appendTag(data); } }
+ * nbt.setTag("Items", list); }
+ */
@Override
public int getSizeInventory() {
diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java
index d038a3d9c1..36ad85052f 100644
--- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.inventories;
-import gtPlusPlus.api.objects.Logger;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCraftResult;
@@ -8,6 +7,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
+import gtPlusPlus.api.objects.Logger;
+
public class InventoryWorkbenchHoloSlots implements IInventory {
private final String name = "Inventory Holo";
@@ -96,9 +97,9 @@ public class InventoryWorkbenchHoloSlots implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -124,9 +125,8 @@ public class InventoryWorkbenchHoloSlots implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
@@ -140,32 +140,13 @@ public class InventoryWorkbenchHoloSlots implements IInventory {
* Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a
* new stack.
*/
- /*@Override
- public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_)
- {
- ItemStack stack = getStackInSlot(0);
- if (this.stackResult[0] != null)
- {
- ItemStack itemstack = this.stackResult[0];
- this.stackResult[0] = null;
- return itemstack;
- }
- if(stack != null)
- {
- if(stack.stackSize > p_70298_2_)
- {
- stack = stack.splitStack(p_70298_2_);
- // Don't forget this line or your inventory will not be saved!
- markDirty();
- }
- else
- {
- // this method also calls markDirty, so we don't need to call it again
- setInventorySlotContents(p_70298_1_, null);
- }
- }
- return stack;
- }*/
+ /*
+ * @Override public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { ItemStack stack = getStackInSlot(0);
+ * if (this.stackResult[0] != null) { ItemStack itemstack = this.stackResult[0]; this.stackResult[0] = null; return
+ * itemstack; } if(stack != null) { if(stack.stackSize > p_70298_2_) { stack = stack.splitStack(p_70298_2_); //
+ * Don't forget this line or your inventory will not be saved! markDirty(); } else { // this method also calls
+ * markDirty, so we don't need to call it again setInventorySlotContents(p_70298_1_, null); } } return stack; }
+ */
@Override
public ItemStack decrStackSize(final int p_70298_1_, final int p_70298_2_) {
if (this.getStackInSlot(0) != null) {
@@ -175,9 +156,7 @@ public class InventoryWorkbenchHoloSlots implements IInventory {
this.stackResult[0] = this.getStackInSlot(0);
} else if (this.stackResult[0] != null) {
Logger.INFO("this.stackResult[0] != null");
- if (this.stackResult[0]
- .getDisplayName()
- .toLowerCase()
+ if (this.stackResult[0].getDisplayName().toLowerCase()
.equals(this.getStackInSlot(0).getDisplayName().toLowerCase())) {
Logger.INFO("Items are the same?");
} else {
@@ -187,8 +166,9 @@ public class InventoryWorkbenchHoloSlots implements IInventory {
}
if (this.stackResult[0] != null) {
- Logger.INFO("this.stackResult[0] != null - Really never should be though. - Returning "
- + this.stackResult[0].getDisplayName());
+ Logger.INFO(
+ "this.stackResult[0] != null - Really never should be though. - Returning "
+ + this.stackResult[0].getDisplayName());
final ItemStack itemstack = this.stackResult[0];
this.stackResult[0] = null;
return itemstack;
@@ -212,31 +192,15 @@ public class InventoryWorkbenchHoloSlots implements IInventory {
}
// Default Behaviour
-/*@Override
-public ItemStack decrStackSize(int slot, int amount)
-{
- if(stack != null)
- {
- if(stack.stackSize > amount)
- {
- stack = stack.splitStack(amount);
- // Don't forget this line or your inventory will not be saved!
- markDirty();
- }
- else
- {
- // this method also calls markDirty, so we don't need to call it again
- setInventorySlotContents(slot, null);
- }
- }
- return stack;
-}*/
+/*
+ * @Override public ItemStack decrStackSize(int slot, int amount) { if(stack != null) { if(stack.stackSize > amount) {
+ * stack = stack.splitStack(amount); // Don't forget this line or your inventory will not be saved! markDirty(); } else
+ * { // this method also calls markDirty, so we don't need to call it again setInventorySlotContents(slot, null); } }
+ * return stack; }
+ */
// Default Behaviour
-/*@Override
-public ItemStack getStackInSlotOnClosing(int slot)
-{
- ItemStack stack = getStackInSlot(slot);
- setInventorySlotContents(slot, null);
- return stack;
-}*/
+/*
+ * @Override public ItemStack getStackInSlotOnClosing(int slot) { ItemStack stack = getStackInSlot(slot);
+ * setInventorySlotContents(slot, null); return stack; }
+ */
diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java
index 406f2fd703..a15527f935 100644
--- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.inventories;
-import gregtech.api.items.GT_MetaGenerated_Tool;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+
public class InventoryWorkbenchTools implements IInventory {
private final String name = "Inventory Tools";
@@ -115,9 +116,9 @@ public class InventoryWorkbenchTools implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -143,9 +144,8 @@ public class InventoryWorkbenchTools implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java
index facf5fee3a..91965f4826 100644
--- a/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java
+++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java
@@ -1,8 +1,5 @@
package gtPlusPlus.core.inventories;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gtPlusPlus.core.slots.SlotGtToolElectric;
-import ic2.api.item.IElectricItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
@@ -10,6 +7,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gtPlusPlus.core.slots.SlotGtToolElectric;
+import ic2.api.item.IElectricItem;
+
public class InventoryWorkbenchToolsElectric implements IInventory {
private final String name = "Inventory Tools";
@@ -120,9 +121,9 @@ public class InventoryWorkbenchToolsElectric implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -148,9 +149,8 @@ public class InventoryWorkbenchToolsElectric implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java
index 03a547898d..83b3631fe9 100644
--- a/src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java
@@ -111,9 +111,9 @@ public class Inventory_DecayablesChest implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -144,9 +144,8 @@ public class Inventory_DecayablesChest implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java
index 46e0ffd9b4..04a95a4f9a 100644
--- a/src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java
+++ b/src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java
@@ -111,9 +111,9 @@ public class Inventory_EggBox implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -144,9 +144,8 @@ public class Inventory_EggBox implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java
index 58ca8eff3b..bb051daecd 100644
--- a/src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java
+++ b/src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java
@@ -111,9 +111,9 @@ public class Inventory_RoundRobinator implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -144,9 +144,8 @@ public class Inventory_RoundRobinator implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java
index 8bccfaed2d..bd44e89776 100644
--- a/src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java
@@ -111,9 +111,9 @@ public class Inventory_SuperJukebox implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -144,9 +144,8 @@ public class Inventory_SuperJukebox implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java
index b703e1bfaa..25a03aa212 100644
--- a/src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.inventories;
-import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
+import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
+
public class Inventory_VolumetricFlaskSetter implements IInventory {
private final String name = "Volumetric Flask Setter";
@@ -112,9 +113,9 @@ public class Inventory_VolumetricFlaskSetter implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -145,9 +146,8 @@ public class Inventory_VolumetricFlaskSetter implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java b/src/main/java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java
index e5cbf352a1..0593bdd237 100644
--- a/src/main/java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java
+++ b/src/main/java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java
@@ -1,10 +1,12 @@
package gtPlusPlus.core.inventories.box;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
import gtPlusPlus.core.slots.SlotLunchBox;
-import net.minecraft.item.ItemStack;
public class LunchBoxInventory extends CustomBoxInventory {
+
public LunchBoxInventory(ItemStack stack) {
super(stack, "Lunch Box", gtPlusPlus.core.item.tool.misc.box.AutoLunchBox.SLOTS);
}
diff --git a/src/main/java/gtPlusPlus/core/inventories/box/MagicBagInventory.java b/src/main/java/gtPlusPlus/core/inventories/box/MagicBagInventory.java
index 8e0f8c4c54..6e47fb0d3c 100644
--- a/src/main/java/gtPlusPlus/core/inventories/box/MagicBagInventory.java
+++ b/src/main/java/gtPlusPlus/core/inventories/box/MagicBagInventory.java
@@ -1,10 +1,12 @@
package gtPlusPlus.core.inventories.box;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
import gtPlusPlus.core.slots.SlotMagicToolBag;
-import net.minecraft.item.ItemStack;
public class MagicBagInventory extends CustomBoxInventory {
+
public MagicBagInventory(ItemStack stack) {
super(stack, "Mystic Bag", gtPlusPlus.core.item.tool.misc.box.MagicToolBag.SLOTS);
}
diff --git a/src/main/java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java b/src/main/java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java
index 48c5e9af47..0c0d381c4c 100644
--- a/src/main/java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java
+++ b/src/main/java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java
@@ -1,11 +1,13 @@
package gtPlusPlus.core.inventories.box;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory;
import gtPlusPlus.core.item.tool.misc.box.UniversalToolBox;
import gtPlusPlus.core.slots.SlotToolBox;
-import net.minecraft.item.ItemStack;
public class ToolBoxInventory extends CustomBoxInventory {
+
public ToolBoxInventory(ItemStack stack) {
super(stack, "Tool Box", UniversalToolBox.SLOTS);
}
diff --git a/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java b/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java
index 7ae022d967..0168a5cfdf 100644
--- a/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java
+++ b/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.inventories.modulartable;
-import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
+import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
+
public class InventoryModularMain implements IInventory {
private final String name = "Inventory Grid";
@@ -128,9 +129,9 @@ public class InventoryModularMain implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -161,9 +162,8 @@ public class InventoryModularMain implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java b/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java
index ebbf7f8d80..a1dddd09bd 100644
--- a/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java
+++ b/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.inventories.modulartable;
-import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
+import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
+
public class InventoryModularOutput implements IInventory {
private final String name = "Inventory Output";
@@ -17,14 +18,12 @@ public class InventoryModularOutput implements IInventory {
private int mRecpeTime = -1;
/**
- * Inventory's size must be same as number of slots you add to the Container
- * class
+ * Inventory's size must be same as number of slots you add to the Container class
*/
private ItemStack[] inventory = new ItemStack[INV_SIZE];
/**
- * @param itemstack
- * - the ItemStack to which this inventory belongs
+ * @param itemstack - the ItemStack to which this inventory belongs
*/
public InventoryModularOutput() {}
@@ -136,10 +135,9 @@ public class InventoryModularOutput implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it
- * is called (or should be called!) anytime the inventory changes. Perfect.
- * Much better than using onUpdate in an Item, as this will also let you
- * change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -171,8 +169,8 @@ public class InventoryModularOutput implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as items can still
- * be left-clicked and placed in the inventory even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java
index 2855800e12..40e848dc3c 100644
--- a/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java
+++ b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java
@@ -127,9 +127,9 @@ public class InventoryProjectMain implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -160,9 +160,8 @@ public class InventoryProjectMain implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java
index 6547e4524c..77bcbd1e35 100644
--- a/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java
+++ b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java
@@ -114,9 +114,9 @@ public class InventoryProjectOutput implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -147,9 +147,8 @@ public class InventoryProjectOutput implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java
index a5ce516f09..24dd053e31 100644
--- a/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java
+++ b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java
@@ -127,9 +127,9 @@ public class InventoryTradeMain implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -160,9 +160,8 @@ public class InventoryTradeMain implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java
index db22c99503..edfbe7602e 100644
--- a/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java
+++ b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java
@@ -114,9 +114,9 @@ public class InventoryTradeOutput implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -147,9 +147,8 @@ public class InventoryTradeOutput implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) {
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index 9d0f7a8554..9c843943a4 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -3,6 +3,12 @@ package gtPlusPlus.core.item;
import static gtPlusPlus.core.creative.AddToCreativeTab.*;
import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
+import net.minecraft.item.*;
+import net.minecraft.item.Item.ToolMaterial;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.common.util.EnumHelper;
+import net.minecraftforge.fluids.*;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.*;
import gregtech.api.util.GT_OreDictUnificator;
@@ -56,11 +62,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
-import net.minecraft.item.*;
-import net.minecraft.item.Item.ToolMaterial;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.common.util.EnumHelper;
-import net.minecraftforge.fluids.*;
public final class ModItems {
@@ -348,8 +349,11 @@ public final class ModItems {
Logger.INFO("Items!");
// Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is
// called upon.
- AAA_Broken =
- new BaseItemIngot_OLD("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0);
+ AAA_Broken = new BaseItemIngot_OLD(
+ "AAA_Broken",
+ "Errors - Tell Alkalus",
+ Utils.rgbtoHexValue(128, 128, 128),
+ 0);
ZZZ_Empty = new ItemEmpty();
}
@@ -384,13 +388,11 @@ public final class ModItems {
MetaGeneratedGregtechItems.INSTANCE.generateMetaItems();
// Some Simple forms of materials
- itemStickyRubber = new Item()
- .setUnlocalizedName("itemStickyRubber")
- .setCreativeTab(tabMachines)
+ itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines)
.setTextureName(CORE.MODID + ":itemStickyRubber");
GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
- GT_OreDictUnificator.registerOre(
- "ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemStickyRubber", 1));
+ GT_OreDictUnificator
+ .registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemStickyRubber", 1));
// Register Hydrogen Blobs first, so we can replace old helium blobs.
itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc)
@@ -439,36 +441,34 @@ public final class ModItems {
itemBlueprintBase = new ItemBlueprint("itemBlueprint");
itemGemShards = new ItemGemShards(
- "itemGemShards",
- "Gem Shards",
- AddToCreativeTab.tabMisc,
- 32,
- 0,
- "They glitter in the light",
- EnumRarity.rare,
- EnumChatFormatting.GRAY,
- false,
- Utils.rgbtoHexValue(182, 114, 18))
- .setTextureName(CORE.MODID + ":itemHeliumBlob");
+ "itemGemShards",
+ "Gem Shards",
+ AddToCreativeTab.tabMisc,
+ 32,
+ 0,
+ "They glitter in the light",
+ EnumRarity.rare,
+ EnumChatFormatting.GRAY,
+ false,
+ Utils.rgbtoHexValue(182, 114, 18)).setTextureName(CORE.MODID + ":itemHeliumBlob");
itemHalfCompleteCasings = new ItemHalfCompleteCasings(
- "itemHalfCompleteCasings",
- AddToCreativeTab.tabMisc,
- 32,
- 0,
- "This isn't quite finished yet.",
- EnumRarity.common,
- EnumChatFormatting.GRAY,
- false,
- Utils.rgbtoHexValue(255, 255, 255))
- .setTextureName("gregtech" + ":" + "gt.metaitem.01/" + "761");
+ "itemHalfCompleteCasings",
+ AddToCreativeTab.tabMisc,
+ 32,
+ 0,
+ "This isn't quite finished yet.",
+ EnumRarity.common,
+ EnumChatFormatting.GRAY,
+ false,
+ Utils.rgbtoHexValue(255, 255, 255)).setTextureName("gregtech" + ":" + "gt.metaitem.01/" + "761");
itemSulfuricPotion = new ItemSulfuricAcidPotion(
- "itemSulfuricPotion", "Throwable Vial of Sulfuric Acid", "Burn your foes alive!")
- .setTextureName(CORE.MODID + ":itemSulfuricAcidPotion");
+ "itemSulfuricPotion",
+ "Throwable Vial of Sulfuric Acid",
+ "Burn your foes alive!").setTextureName(CORE.MODID + ":itemSulfuricAcidPotion");
itemHydrofluoricPotion = new ItemHydrofluoricAcidPotion(
- "itemHydrofluoricPotion",
- "Throwable Vial of Hydrofluoric Acid",
- "They won't see this coming, nor anything after!")
- .setTextureName(CORE.MODID + ":itemPotion");
+ "itemHydrofluoricPotion",
+ "Throwable Vial of Hydrofluoric Acid",
+ "They won't see this coming, nor anything after!").setTextureName(CORE.MODID + ":itemPotion");
// Start meta Item Generation
ItemsFoods.load();
@@ -734,15 +734,12 @@ public final class ModItems {
} else {
shardAer = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Air Shard", 0, 1)
.getItem();
- shardIgnis = ItemUtils.getItemStackWithMeta(
- LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Fire Shard", 1, 1)
- .getItem();
- shardAqua = ItemUtils.getItemStackWithMeta(
- LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Warer Shard", 2, 1)
- .getItem();
- shardTerra = ItemUtils.getItemStackWithMeta(
- LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Earth Shard", 3, 1)
- .getItem();
+ shardIgnis = ItemUtils
+ .getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Fire Shard", 1, 1).getItem();
+ shardAqua = ItemUtils
+ .getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Warer Shard", 2, 1).getItem();
+ shardTerra = ItemUtils
+ .getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Earth Shard", 3, 1).getItem();
}
// Generates a set of four special dusts to be used in my recipes.
dustAer = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AER, true)[0];
@@ -751,50 +748,65 @@ public final class ModItems {
dustAqua = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AQUA, true)[0];
ItemUtils.generateSpecialUseDusts(MISC_MATERIALS.WOODS_GLASS, false);
- cellHydrogenChlorideMix =
- MISC_MATERIALS.HYDROGEN_CHLORIDE_MIX.getCell(1).getItem();
+ cellHydrogenChlorideMix = MISC_MATERIALS.HYDROGEN_CHLORIDE_MIX.getCell(1).getItem();
// Nuclear Fuel Dusts
dustLithiumCarbonate = ItemUtils.generateSpecialUseDusts(
- "LithiumCarbonate", "Lithium Carbonate", "Li2CO3", Utils.rgbtoHexValue(240, 240, 240))[
- 0]; // https://en.wikipedia.org/wiki/Lithium_carbonate
+ "LithiumCarbonate",
+ "Lithium Carbonate",
+ "Li2CO3",
+ Utils.rgbtoHexValue(240, 240, 240))[0]; // https://en.wikipedia.org/wiki/Lithium_carbonate
dustLithiumPeroxide = ItemUtils.generateSpecialUseDusts(
- "LithiumPeroxide", "Lithium Peroxide", "Li2O2", Utils.rgbtoHexValue(250, 250, 250))[
- 0]; // https://en.wikipedia.org/wiki/Lithium_peroxide
+ "LithiumPeroxide",
+ "Lithium Peroxide",
+ "Li2O2",
+ Utils.rgbtoHexValue(250, 250, 250))[0]; // https://en.wikipedia.org/wiki/Lithium_peroxide
dustLithiumHydroxide = ItemUtils.generateSpecialUseDusts(
- "LithiumHydroxide", "Lithium Hydroxide", "LiOH", Utils.rgbtoHexValue(250, 250, 250))[
- 0]; // https://en.wikipedia.org/wiki/Lithium_hydroxide
+ "LithiumHydroxide",
+ "Lithium Hydroxide",
+ "LiOH",
+ Utils.rgbtoHexValue(250, 250, 250))[0]; // https://en.wikipedia.org/wiki/Lithium_hydroxide
if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))
&& !LoadedMods.IHL) {
- dustQuicklime = ItemUtils.generateSpecialUseDusts(
- "Quicklime", "Quicklime", "CaO", Utils.rgbtoHexValue(255, 255, 175))[
- 0]; // https://en.wikipedia.org/wiki/Calcium_oxide
+ dustQuicklime = ItemUtils
+ .generateSpecialUseDusts("Quicklime", "Quicklime", "CaO", Utils.rgbtoHexValue(255, 255, 175))[0]; // https://en.wikipedia.org/wiki/Calcium_oxide
}
dustCalciumHydroxide = ItemUtils.generateSpecialUseDusts(
- "CalciumHydroxide", "Hydrated Lime", "Ca(OH)2", Utils.rgbtoHexValue(255, 255, 255))[
- 0]; // https://en.wikipedia.org/wiki/Calcium_hydroxide
+ "CalciumHydroxide",
+ "Hydrated Lime",
+ "Ca(OH)2",
+ Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_hydroxide
dustCalciumCarbonate = ItemUtils.generateSpecialUseDusts(
- "CalciumCarbonate", "Calcium Carbonate", "CaCO3", Utils.rgbtoHexValue(255, 255, 255))[
- 0]; // https://en.wikipedia.org/wiki/Calcium_carbonate
+ "CalciumCarbonate",
+ "Calcium Carbonate",
+ "CaCO3",
+ Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_carbonate
if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1) == null)
|| (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustCalciumSulfate", 1) == null)) {
dustCalciumSulfate = ItemUtils.generateSpecialUseDusts(
- "Gypsum", "Calcium Sulfate (Gypsum)", "CaSO4", Utils.rgbtoHexValue(255, 255, 255))[
- 0]; // https://en.wikipedia.org/wiki/Calcium_sulfate
+ "Gypsum",
+ "Calcium Sulfate (Gypsum)",
+ "CaSO4",
+ Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_sulfate
GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getSimpleStack(dustCalciumSulfate));
} else {
GT_OreDictUnificator.registerOre(
- "dustCalciumSulfate", ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1));
+ "dustCalciumSulfate",
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1));
}
dustLi2CO3CaOH2 = ItemUtils.generateSpecialUseDusts(
- "Li2CO3CaOH2", "Li2CO3 + Ca(OH)2 Compound", "Li2CO3CaOH2", Utils.rgbtoHexValue(255, 255, 255))[
- 0]; // https://en.wikipedia.org/wiki/Calcium_carbonate
+ "Li2CO3CaOH2",
+ "Li2CO3 + Ca(OH)2 Compound",
+ "Li2CO3CaOH2",
+ Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/Calcium_carbonate
MaterialUtils.generateSpecialDustAndAssignToAMaterial(FLUORIDES.SODIUM_FLUORIDE, false);
// FLiBe Fuel Compounds
dustLi2BeF4 = ItemUtils.generateSpecialUseDusts(
- "Li2BeF4", "Lithium Tetrafluoroberyllate Fuel Compound", "Li2BeF4", Utils.rgbtoHexValue(255, 255, 255))[
- 0]; // https://en.wikipedia.org/wiki/FLiBe
+ "Li2BeF4",
+ "Lithium Tetrafluoroberyllate Fuel Compound",
+ "Li2BeF4",
+ Utils.rgbtoHexValue(255, 255, 255))[0]; // https://en.wikipedia.org/wiki/FLiBe
Material.registerComponentForMaterial(NUCLIDE.Li2BeF4, OrePrefixes.dust, ItemUtils.getSimpleStack(dustLi2BeF4));
// fluidFLiBeSalt = ("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}, 0);
// fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Lithium Tetrafluoroberyllate", new short[]{255,
@@ -821,7 +833,7 @@ public final class ModItems {
fluidNuclearWaste = FluidUtils.addGTFluidNoPrefix(
"nuclear.waste",
"Nuclear Waste",
- new short[] {10, 250, 10, 100},
+ new short[] { 10, 250, 10, 100 },
0,
1000,
null,
@@ -836,7 +848,7 @@ public final class ModItems {
AddToCreativeTab.tabMisc,
1,
0,
- new String[] {"Keeps Multiblocks Stable"},
+ new String[] { "Keeps Multiblocks Stable" },
EnumRarity.epic,
EnumChatFormatting.DARK_GREEN,
false,
@@ -849,26 +861,31 @@ public final class ModItems {
// Zirconium
// Cinter Pellet.
itemZirconiumChlorideCinterPellet = new CoreItem(
- "itemZirconiumPellet", "Zirconium Pellet [" + StringUtils.subscript("ZrCl4") + "]", tabMisc)
- .setTextureName(CORE.MODID + ":itemShard");
+ "itemZirconiumPellet",
+ "Zirconium Pellet [" + StringUtils.subscript("ZrCl4") + "]",
+ tabMisc).setTextureName(CORE.MODID + ":itemShard");
GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet));
// Zirconium Chloride
- dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[
- 0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
- dustCookedZrCl4 = ItemUtils.generateSpecialUseDusts(
- "CookedZrCl4", "Cooked ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[
- 0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
+ dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
+ dustCookedZrCl4 = ItemUtils
+ .generateSpecialUseDusts("CookedZrCl4", "Cooked ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
// Zirconium Tetrafluoride
- /*GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
- GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));*/
+ /*
+ * GT_OreDictUnificator.registerOre("cellZrF4",
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
+ * GT_OreDictUnificator.registerOre("dustZrF4",
+ * ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));
+ */
// GT_OreDictUnificator.registerOre("cellZrF4",
// ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
// GT_OreDictUnificator.registerOre("dustZrF4",
// ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));
fluidZrF4 = FluidUtils.generateFluidNoPrefix(
- "ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[] {170, 170, 140, 100
- }); // https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
+ "ZirconiumTetrafluoride",
+ "Zirconium Tetrafluoride",
+ 500,
+ new short[] { 170, 170, 140, 100 }); // https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4);
// Coolant Salt
@@ -878,10 +895,10 @@ public final class ModItems {
// Load Tree Farmer
if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { // https://en.wikipedia.org/wiki/UAN
- dustFertUN18 = ItemUtils.generateSpecialUseDusts(
- "UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0];
- dustFertUN32 = ItemUtils.generateSpecialUseDusts(
- "UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0];
+ dustFertUN18 = ItemUtils
+ .generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0];
+ dustFertUN32 = ItemUtils
+ .generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0];
ItemStack temp1 = null;
ItemStack temp2 = null;
@@ -894,24 +911,35 @@ public final class ModItems {
}
if (temp1 != null) {
fluidFertBasic = FluidUtils.generateFluidNonMolten(
- "Fertiliser", "Fertiliser", 32, new short[] {45, 170, 45, 100}, temp1, null, true);
+ "Fertiliser",
+ "Fertiliser",
+ 32,
+ new short[] { 45, 170, 45, 100 },
+ temp1,
+ null,
+ true);
GT_Values.RA.addFluidExtractionRecipe(temp2, null, new FluidStack(fluidFertBasic, 36), 10000, 5, 16);
}
fluidFertUN32 = FluidUtils.generateFluidNonMolten(
- "UN32Fertiliser", "UN-32 Fertiliser", 24, new short[] {55, 190, 55, 100}, null, null, true);
+ "UN32Fertiliser",
+ "UN-32 Fertiliser",
+ 24,
+ new short[] { 55, 190, 55, 100 },
+ null,
+ null,
+ true);
fluidFertUN18 = FluidUtils.generateFluidNonMolten(
- "UN18Fertiliser", "UN-18 Fertiliser", 22, new short[] {60, 155, 60, 100}, null, null, true);
-
- /*GT_Values.RA.addMixerRecipe(
- arg0, //Item In
- arg1,
- arg2,
- arg3,
- arg4, //Fluid in
- arg5, //Fluid Out
- arg6, //Item out
- arg7, //Eu
- arg8); //Time
+ "UN18Fertiliser",
+ "UN-18 Fertiliser",
+ 22,
+ new short[] { 60, 155, 60, 100 },
+ null,
+ null,
+ true);
+
+ /*
+ * GT_Values.RA.addMixerRecipe( arg0, //Item In arg1, arg2, arg3, arg4, //Fluid in arg5, //Fluid Out arg6,
+ * //Item out arg7, //Eu arg8); //Time
*/
}
@@ -921,7 +949,7 @@ public final class ModItems {
"RaisinJuice",
"Raisin Juice",
2,
- new short[] {51, 0, 51, 100},
+ new short[] { 51, 0, 51, 100 },
ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1),
ItemUtils.getItemStackOfAmountFromOreDictNoBroken("fruitRaisins", 1),
50,
@@ -963,15 +991,17 @@ public final class ModItems {
// Xp Fluids - Dev
if (!FluidRegistry.isFluidRegistered("mobessence")) {
- FluidUtils.generateFluidNoPrefix("mobessence", "mobessence", 0, new short[] {125, 175, 125, 100});
+ FluidUtils.generateFluidNoPrefix("mobessence", "mobessence", 0, new short[] { 125, 175, 125, 100 });
}
if (!FluidRegistry.isFluidRegistered("xpjuice")) {
- FluidUtils.generateFluidNoPrefix("xpjuice", "xpjuice", 0, new short[] {50, 150, 50, 100});
+ FluidUtils.generateFluidNoPrefix("xpjuice", "xpjuice", 0, new short[] { 50, 150, 50, 100 });
}
// Industrial Diamonds
- itemExquisiteIndustrialDiamond =
- new CoreItem("IndustrialDiamondExquisite", "High Quality Industrial Diamond", tabMisc);
+ itemExquisiteIndustrialDiamond = new CoreItem(
+ "IndustrialDiamondExquisite",
+ "High Quality Industrial Diamond",
+ tabMisc);
ItemStack tempStack = itemExquisiteIndustrialDiamond.getStack();
ItemUtils.addItemToOreDictionary(tempStack, "gemDiamond");
ItemUtils.addItemToOreDictionary(tempStack, "craftingIndustrialDiamond");
@@ -986,10 +1016,8 @@ public final class ModItems {
"dustNeptunium238",
Utils.rgbtoHexValue(175, 240, 75),
50640,
- new String[] {
- "" + StringUtils.superscript("238Np"),
- "Result: Plutonium 238 (" + StringUtils.superscript("238Pu") + ")"
- },
+ new String[] { "" + StringUtils.superscript("238Np"),
+ "Result: Plutonium 238 (" + StringUtils.superscript("238Pu") + ")" },
ELEMENT.getInstance().PLUTONIUM238.getDust(1).getItem(),
5);
dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts(
@@ -1001,49 +1029,40 @@ public final class ModItems {
"dustRadium226",
ELEMENT.getInstance().RADIUM.getRgbAsHex(),
90000,
- new String[] {
- "" + StringUtils.superscript("226Ra"), "Result: Radon (" + StringUtils.superscript("222Rn") + ")"
- },
+ new String[] { "" + StringUtils.superscript("226Ra"),
+ "Result: Radon (" + StringUtils.superscript("222Rn") + ")" },
ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(),
5);
dustProtactinium233 = new DustDecayable(
"dustProtactinium233",
ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(),
32000,
- new String[] {
- "" + StringUtils.superscript("233Pa"),
- "Result: Uranium 233(" + StringUtils.superscript("233U") + ")"
- },
+ new String[] { "" + StringUtils.superscript("233Pa"),
+ "Result: Uranium 233(" + StringUtils.superscript("233U") + ")" },
ELEMENT.getInstance().URANIUM233.getDust(1).getItem(),
6);
dustTechnetium99 = new DustDecayable(
"dustTechnetium99",
ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(),
164500,
- new String[] {
- "" + StringUtils.superscript("99Mo"),
- "Result: Ruthenium 99(" + StringUtils.superscript("99Ru") + ")"
- },
+ new String[] { "" + StringUtils.superscript("99Mo"),
+ "Result: Ruthenium 99(" + StringUtils.superscript("99Ru") + ")" },
ELEMENT.getInstance().RUTHENIUM.getDust(1).getItem(),
4);
dustTechnetium99M = new DustDecayable(
"dustTechnetium99M",
ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(),
8570,
- new String[] {
- "" + StringUtils.superscript("99ᵐTc"),
- "Result: Technicium 99 (" + StringUtils.superscript("99Tc") + ")"
- },
+ new String[] { "" + StringUtils.superscript("99ᵐTc"),
+ "Result: Technicium 99 (" + StringUtils.superscript("99Tc") + ")" },
dustTechnetium99,
4);
dustMolybdenum99 = new DustDecayable(
"dustMolybdenum99",
ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(),
16450,
- new String[] {
- "" + StringUtils.superscript("99Mo"),
- "Result: Technicium 99ᵐ (" + StringUtils.superscript("99ᵐTc") + ")"
- },
+ new String[] { "" + StringUtils.superscript("99Mo"),
+ "Result: Technicium 99ᵐ (" + StringUtils.superscript("99ᵐTc") + ")" },
dustTechnetium99M,
4);
@@ -1051,10 +1070,10 @@ public final class ModItems {
itemStandarParticleBase = new StandardBaseParticles();
if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
- Item a8kFlask =
- VolumetricFlaskHelper.generateNewFlask("Volumetric_Flask_8k", "Large Volumetric Flask", 8000);
- Item a64kFlask =
- VolumetricFlaskHelper.generateNewFlask("Volumetric_Flask_32k", "Gigantic Volumetric Flask", 32000);
+ Item a8kFlask = VolumetricFlaskHelper
+ .generateNewFlask("Volumetric_Flask_8k", "Large Volumetric Flask", 8000);
+ Item a64kFlask = VolumetricFlaskHelper
+ .generateNewFlask("Volumetric_Flask_32k", "Gigantic Volumetric Flask", 32000);
GregtechItemList.VOLUMETRIC_FLASK_8k.set(a8kFlask);
GregtechItemList.VOLUMETRIC_FLASK_32k.set(a64kFlask);
}
@@ -1099,20 +1118,27 @@ public final class ModItems {
itemBomb = new ItemThrowableBomb();
// Only used for debugging.
- /*if (CORE.DEVENV) {
- new ConnectedBlockFinder();
- }*/
+ /*
+ * if (CORE.DEVENV) { new ConnectedBlockFinder(); }
+ */
// Misc Items
@SuppressWarnings("unused")
Item tI;
- tI = new BaseItemMisc("Chilly", new short[] {0, 64, 196}, 32, MiscTypes.POTION, new String[] {"It's Blue"});
+ tI = new BaseItemMisc("Chilly", new short[] { 0, 64, 196 }, 32, MiscTypes.POTION, new String[] { "It's Blue" });
+ tI = new BaseItemMisc(
+ "4000DC's",
+ new short[] { 180, 100, 30 },
+ 1,
+ MiscTypes.BIGKEY,
+ new String[] { "It opens things." });
+ tI = new BaseItemMisc("Dull", new short[] { 64, 64, 64 }, 64, MiscTypes.GEM, null);
tI = new BaseItemMisc(
- "4000DC's", new short[] {180, 100, 30}, 1, MiscTypes.BIGKEY, new String[] {"It opens things."});
- tI = new BaseItemMisc("Dull", new short[] {64, 64, 64}, 64, MiscTypes.GEM, null);
- tI = new BaseItemMisc("Forest", new short[] {130, 164, 96}, 64, MiscTypes.MUSHROOM, new String[] {
- "You Found this on the ground.", "Definitely not sure if it's worth eating."
- });
+ "Forest",
+ new short[] { 130, 164, 96 },
+ 64,
+ MiscTypes.MUSHROOM,
+ new String[] { "You Found this on the ground.", "Definitely not sure if it's worth eating." });
// Baubles
if (LoadedMods.Baubles) {
@@ -1209,29 +1235,31 @@ public final class ModItems {
GT_OreDictUnificator.registerOre("platePhasedGold", ItemUtils.getSimpleStack(itemPlateVibrantAlloy));
GT_OreDictUnificator.registerOre("dustPhasedIron", ItemUtils.getSimpleStack(itemDustPulsatingIron));
GT_OreDictUnificator.registerOre("platePhasedIron", ItemUtils.getSimpleStack(itemPlatePulsatingIron));
- GT_OreDictUnificator.registerOre(
- "blockVibrantAlloy", ItemUtils.getItemStackOfAmountFromOreDict("blockPhasedGold", 1));
+ GT_OreDictUnificator
+ .registerOre("blockVibrantAlloy", ItemUtils.getItemStackOfAmountFromOreDict("blockPhasedGold", 1));
} else {
- /*Logger.WARNING("EnderIO not Found - Generating our own Resources.");
- MaterialGenerator.generate(MaterialEIO.CONDUCTIVE_IRON);
- MaterialGenerator.generate(MaterialEIO.PULSATING_IRON);
- MaterialGenerator.generate(MaterialEIO.REDSTONE_ALLOY);
- MaterialGenerator.generate(MaterialEIO.SOULARIUM);
- MaterialGenerator.generate(MaterialEIO.ELECTRICAL_STEEL);
- MaterialGenerator.generate(MaterialEIO.ENERGETIC_ALLOY);
- MaterialGenerator.generate(MaterialEIO.VIBRANT_ALLOY); */
+ /*
+ * Logger.WARNING("EnderIO not Found - Generating our own Resources.");
+ * MaterialGenerator.generate(MaterialEIO.CONDUCTIVE_IRON);
+ * MaterialGenerator.generate(MaterialEIO.PULSATING_IRON);
+ * MaterialGenerator.generate(MaterialEIO.REDSTONE_ALLOY);
+ * MaterialGenerator.generate(MaterialEIO.SOULARIUM);
+ * MaterialGenerator.generate(MaterialEIO.ELECTRICAL_STEEL);
+ * MaterialGenerator.generate(MaterialEIO.ENERGETIC_ALLOY);
+ * MaterialGenerator.generate(MaterialEIO.VIBRANT_ALLOY);
+ */
}
// Big Reactors
if (LoadedMods.Big_Reactors || LOAD_ALL_CONTENT) {
Logger.INFO("BigReactors Found - Loading Resources.");
// Item Init
- itemPlateBlutonium =
- ItemUtils.generateSpecialUsePlate("Blutonium", "Blutonium", new short[] {0, 0, 255}, 0);
- itemPlateCyanite = ItemUtils.generateSpecialUsePlate("Cyanite", "Cyanite", new short[] {0, 191, 255}, 0);
- itemPlateLudicrite =
- ItemUtils.generateSpecialUsePlate("Ludicrite", "Ludicrite", new short[] {167, 5, 179}, 0);
+ itemPlateBlutonium = ItemUtils
+ .generateSpecialUsePlate("Blutonium", "Blutonium", new short[] { 0, 0, 255 }, 0);
+ itemPlateCyanite = ItemUtils.generateSpecialUsePlate("Cyanite", "Cyanite", new short[] { 0, 191, 255 }, 0);
+ itemPlateLudicrite = ItemUtils
+ .generateSpecialUsePlate("Ludicrite", "Ludicrite", new short[] { 167, 5, 179 }, 0);
} else {
Logger.WARNING("BigReactors not Found - Skipping Resources.");
}
@@ -1242,10 +1270,9 @@ public final class ModItems {
// Item Init
try {
ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16);
- itemPlateVoidMetal = ItemUtils.generateSpecialUsePlate("Void", "Void", new short[] {82, 17, 82}, 0);
+ itemPlateVoidMetal = ItemUtils.generateSpecialUsePlate("Void", "Void", new short[] { 82, 17, 82 }, 0);
GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal));
- } catch (final NullPointerException e) {
- }
+ } catch (final NullPointerException e) {}
} else {
Logger.WARNING("Thaumcraft not Found - Skipping Resources.");
@@ -1255,8 +1282,8 @@ public final class ModItems {
if (LoadedMods.PneumaticCraft || LOAD_ALL_CONTENT) {
Logger.INFO("PneumaticCraft Found - Loading Resources.");
// Item Init
- itemPlateCompressedIron = ItemUtils.generateSpecialUsePlate(
- "CompressedIron", "Compressed Iron", new short[] {128, 128, 128}, 0);
+ itemPlateCompressedIron = ItemUtils
+ .generateSpecialUsePlate("CompressedIron", "Compressed Iron", new short[] { 128, 128, 128 }, 0);
} else {
Logger.WARNING("PneumaticCraft not Found - Skipping Resources.");
}
@@ -1265,10 +1292,8 @@ public final class ModItems {
if (LoadedMods.Simply_Jetpacks || LOAD_ALL_CONTENT) {
Logger.INFO("SimplyJetpacks Found - Loading Resources.");
// Item Init
- itemPlateEnrichedSoularium = new RarityUncommon()
- .setUnlocalizedName("itemPlateEnrichedSoularium")
- .setCreativeTab(AddToCreativeTab.tabMisc)
- .setTextureName(CORE.MODID + ":itemPlateSoularium");
+ itemPlateEnrichedSoularium = new RarityUncommon().setUnlocalizedName("itemPlateEnrichedSoularium")
+ .setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateSoularium");
// Registry
GameRegistry.registerItem(itemPlateEnrichedSoularium, "itemPlateEnrichedSoularium");
} else {
@@ -1279,8 +1304,8 @@ public final class ModItems {
if (LoadedMods.RFTools || LOAD_ALL_CONTENT) {
Logger.INFO("rfTools Found - Loading Resources.");
// Item Init
- itemPlateDimensionShard = ItemUtils.generateSpecialUsePlate(
- "DimensionShard", "Dimensional Shard", new short[] {170, 230, 230}, 0);
+ itemPlateDimensionShard = ItemUtils
+ .generateSpecialUsePlate("DimensionShard", "Dimensional Shard", new short[] { 170, 230, 230 }, 0);
} else {
Logger.WARNING("rfTools not Found - Skipping Resources.");
}
@@ -1308,8 +1333,8 @@ public final class ModItems {
if (ConfigSwitches.enableAlternativeBatteryAlloy) {
// ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", new
// short[]{35, 228, 141}, 0); TODO
- ModItems.itemPlateBatteryAlloy =
- ItemUtils.generateSpecialUsePlate("BatteryAlloy", "Battery Alloy", new short[] {35, 228, 141}, 0);
+ ModItems.itemPlateBatteryAlloy = ItemUtils
+ .generateSpecialUsePlate("BatteryAlloy", "Battery Alloy", new short[] { 35, 228, 141 }, 0);
}
// UtilsItems.generateSpawnEgg("ic2", "boatcarbon", Utils.generateSingularRandomHexValue(),
@@ -1322,8 +1347,8 @@ public final class ModItems {
*/
// Staballoy Equipment
- itemStaballoyPickaxe =
- new StaballoyPickaxe("itemStaballoyPickaxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools);
+ itemStaballoyPickaxe = new StaballoyPickaxe("itemStaballoyPickaxe", STABALLOY)
+ .setCreativeTab(AddToCreativeTab.tabTools);
GameRegistry.registerItem(itemStaballoyPickaxe, itemStaballoyPickaxe.getUnlocalizedName());
itemStaballoyAxe = new StaballoyAxe("itemStaballoyAxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools);
GameRegistry.registerItem(itemStaballoyAxe, itemStaballoyAxe.getUnlocalizedName());
@@ -1341,8 +1366,7 @@ public final class ModItems {
// System.out.println("Buffer Core registration count is: "+i);
}
- itemPLACEHOLDER_Circuit = new Item()
- .setUnlocalizedName("itemPLACEHOLDER_Circuit")
+ itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit")
.setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit");
GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit");
@@ -1369,7 +1393,10 @@ public final class ModItems {
*/
if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1))) {
ItemUtils.generateSpecialUseDusts(
- "Gadolinium", "Gadolinium", Materials.Gadolinium.mElement.name(), Utils.rgbtoHexValue(226, 172, 9));
+ "Gadolinium",
+ "Gadolinium",
+ Materials.Gadolinium.mElement.name(),
+ Utils.rgbtoHexValue(226, 172, 9));
}
if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustYtterbium", 1))) {
ItemUtils.generateSpecialUseDusts(
@@ -1383,11 +1410,17 @@ public final class ModItems {
}
if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSamarium", 1))) {
ItemUtils.generateSpecialUseDusts(
- "Samarium", "Samarium", Materials.Samarium.mElement.name(), Utils.rgbtoHexValue(161, 168, 114));
+ "Samarium",
+ "Samarium",
+ Materials.Samarium.mElement.name(),
+ Utils.rgbtoHexValue(161, 168, 114));
}
if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLanthanum", 1))) {
ItemUtils.generateSpecialUseDusts(
- "Lanthanum", "Lanthanum", Materials.Lanthanum.mElement.name(), Utils.rgbtoHexValue(106, 127, 163));
+ "Lanthanum",
+ "Lanthanum",
+ Materials.Lanthanum.mElement.name(),
+ Utils.rgbtoHexValue(106, 127, 163));
}
if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGermanium", 1))) {
ItemUtils.generateSpecialUseDusts(
@@ -1416,8 +1449,8 @@ public final class ModItems {
}
// Krypton Processing
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1) == null) {
- itemHotTitaniumIngot = ItemUtils.getSimpleStack(
- new BaseItemIngot(ELEMENT.getInstance().TITANIUM, ComponentTypes.HOTINGOT));
+ itemHotTitaniumIngot = ItemUtils
+ .getSimpleStack(new BaseItemIngot(ELEMENT.getInstance().TITANIUM, ComponentTypes.HOTINGOT));
} else {
itemHotTitaniumIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1);
}
@@ -1428,8 +1461,8 @@ public final class ModItems {
}
// Springs
- MaterialUtils.generateComponentAndAssignToAMaterial(
- ComponentTypes.SPRING, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
+ MaterialUtils
+ .generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ELEMENT.STANDALONE.WHITE_METAL);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.NITINOL_60);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.SPRING, ALLOY.AQUATIC_STEEL);
@@ -1485,12 +1518,13 @@ public final class ModItems {
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.TALONITE);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.HYPOGEN);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.RHUGNOR);
+ MaterialUtils
+ .generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.ADVANCED_NITINOL);
+ MaterialUtils
+ .generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.ASTRAL_TITANIUM);
MaterialUtils.generateComponentAndAssignToAMaterial(
- ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.ADVANCED_NITINOL);
- MaterialUtils.generateComponentAndAssignToAMaterial(
- ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.ASTRAL_TITANIUM);
- MaterialUtils.generateComponentAndAssignToAMaterial(
- ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
+ ComponentTypes.PLATEHEAVY,
+ ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.WHITE_METAL);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.BLACK_METAL);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.GRANITE);
@@ -1536,7 +1570,7 @@ public final class ModItems {
}
// Tumbaga Mix (For Simple Crafting)
- dustTumbagaMix = ItemUtils.generateSpecialUseDusts(
- "MixTumbaga", "Tumbaga Mix", "Au2Cu", Utils.rgbtoHexValue(255, 150, 80))[0];
+ dustTumbagaMix = ItemUtils
+ .generateSpecialUseDusts("MixTumbaga", "Tumbaga Mix", "Au2Cu", Utils.rgbtoHexValue(255, 150, 80))[0];
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java
index a1bd29aa65..154c1652ce 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java
@@ -2,6 +2,20 @@ package gtPlusPlus.core.item.base;
import static gregtech.api.enums.GT_Values.*;
+import java.util.*;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -17,18 +31,6 @@ import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import ic2.api.item.*;
-import java.util.*;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricItemManager {
@@ -54,10 +56,7 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
this("MU-metaitem.02", AddToCreativeTab.tabOther, (short) 1000, (short) 31766);
}
- public BaseEuItem(
- final String unlocalizedName,
- final CreativeTabs creativeTab,
- final short aOffset,
+ public BaseEuItem(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset,
final short aItemAmount) {
this.mEnabledItems = new BitSet(aItemAmount);
this.mVisibleItems = new BitSet(aItemAmount);
@@ -72,8 +71,8 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
GameRegistry.registerItem(this, unlocalizedName);
}
- public void registerItem(
- final int id, final String localizedName, final long euStorage, final int tier, final String description) {
+ public void registerItem(final int id, final String localizedName, final long euStorage, final int tier,
+ final String description) {
this.registerItem(
id,
localizedName,
@@ -85,13 +84,8 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
false);
}
- public void registerItem(
- final int id,
- final String localizedName,
- final long euStorage,
- final int tier,
- final String description,
- final int burnTime) {
+ public void registerItem(final int id, final String localizedName, final long euStorage, final int tier,
+ final String description, final int burnTime) {
this.registerItem(
id,
localizedName,
@@ -104,14 +98,8 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
this.setBurnValue(id, burnTime);
}
- public void registerItem(
- final int id,
- final String localizedName,
- final long euStorage,
- final short tier,
- final String description,
- final EnumRarity regRarity,
- final EnumChatFormatting colour,
+ public void registerItem(final int id, final String localizedName, final long euStorage, final short tier,
+ final String description, final EnumRarity regRarity, final EnumChatFormatting colour,
final boolean Effect) {
this.addItem(id, localizedName, EnumChatFormatting.YELLOW + "Electric", new Object[] {});
this.setElectricStats(this.mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true);
@@ -134,23 +122,20 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
@Override
public boolean hasEffect(final ItemStack par1ItemStack) {
if (this.hasEffect.get(par1ItemStack.getItemDamage() - this.mOffset) != null) {
- return this.hasEffect
- .get(par1ItemStack.getItemDamage() - this.mOffset)
- .getValue();
+ return this.hasEffect.get(par1ItemStack.getItemDamage() - this.mOffset).getValue();
}
return false;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) {
// aList.add("Meta: "+(aStack.getItemDamage()-mOffset));
if ((this.descColour.get(aStack.getItemDamage() - this.mOffset) != null)
&& (this.itemDescription.get(aStack.getItemDamage() - this.mOffset) != null)) {
- aList.add(this.descColour.get(aStack.getItemDamage() - this.mOffset).getValue()
- + this.itemDescription
- .get(aStack.getItemDamage() - this.mOffset)
- .getValue());
+ aList.add(
+ this.descColour.get(aStack.getItemDamage() - this.mOffset).getValue()
+ + this.itemDescription.get(aStack.getItemDamage() - this.mOffset).getValue());
}
final String tKey = this.getUnlocalizedName(aStack) + ".tooltip",
tString = GT_LanguageManager.getTranslation(tKey);
@@ -160,18 +145,27 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
final Long[] tStats = this.getElectricStats(aStack);
if (tStats != null) {
if (tStats[3] > 0) {
- aList.add(EnumChatFormatting.AQUA + "Contains " + GT_Utility.formatNumbers(tStats[3]) + " EU Tier: "
- + (tStats[2] >= 0 ? tStats[2] : 0) + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.AQUA + "Contains "
+ + GT_Utility.formatNumbers(tStats[3])
+ + " EU Tier: "
+ + (tStats[2] >= 0 ? tStats[2] : 0)
+ + EnumChatFormatting.GRAY);
} else {
final long tCharge = this.getRealCharge(aStack);
if ((tStats[3] == -2) && (tCharge <= 0)) {
- aList.add(EnumChatFormatting.AQUA + "Empty. You should recycle it properly."
- + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.AQUA + "Empty. You should recycle it properly."
+ + EnumChatFormatting.GRAY);
} else {
- aList.add(EnumChatFormatting.AQUA + "" + GT_Utility.formatNumbers(tCharge) + " / "
- + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: "
- + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]
- + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.AQUA + ""
+ + GT_Utility.formatNumbers(tCharge)
+ + " / "
+ + GT_Utility.formatNumbers(Math.abs(tStats[0]))
+ + " EU - Voltage: "
+ + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]
+ + EnumChatFormatting.GRAY);
}
}
}
@@ -218,29 +212,19 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
}
@Override
- public final double charge(
- final ItemStack aStack,
- final double aCharge,
- final int aTier,
- final boolean aIgnoreTransferLimit,
- final boolean aSimulate) {
+ public final double charge(final ItemStack aStack, final double aCharge, final int aTier,
+ final boolean aIgnoreTransferLimit, final boolean aSimulate) {
final Long[] tStats = this.getElectricStats(aStack);
- if ((tStats == null)
- || (tStats[2] > aTier)
+ if ((tStats == null) || (tStats[2] > aTier)
|| !((tStats[3] == -1) || (tStats[3] == -3) || ((tStats[3] < 0) && (aCharge == Integer.MAX_VALUE)))
|| (aStack.stackSize != 1)) {
return 0;
}
- final long tChargeBefore = this.getRealCharge(aStack),
- tNewCharge =
- aCharge == Integer.MAX_VALUE
- ? Long.MAX_VALUE
- : Math.min(
- Math.abs(tStats[0]),
- tChargeBefore
- + (aIgnoreTransferLimit
- ? (long) aCharge
- : Math.min(tStats[1], (long) aCharge)));
+ final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = aCharge == Integer.MAX_VALUE
+ ? Long.MAX_VALUE
+ : Math.min(
+ Math.abs(tStats[0]),
+ tChargeBefore + (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
if (!aSimulate) {
this.setCharge(aStack, tNewCharge);
}
@@ -248,13 +232,8 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
}
@Override
- public final double discharge(
- final ItemStack aStack,
- final double aCharge,
- final int aTier,
- final boolean aIgnoreTransferLimit,
- final boolean aBatteryAlike,
- final boolean aSimulate) {
+ public final double discharge(final ItemStack aStack, final double aCharge, final int aTier,
+ final boolean aIgnoreTransferLimit, final boolean aBatteryAlike, final boolean aSimulate) {
final Long[] tStats = this.getElectricStats(aStack);
if ((tStats == null) || (tStats[2] > aTier)) {
return 0;
@@ -271,14 +250,8 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
}
return tStats[3];
}
- final long tChargeBefore = this.getRealCharge(aStack),
- tNewCharge =
- Math.max(
- 0,
- tChargeBefore
- - (aIgnoreTransferLimit
- ? (long) aCharge
- : Math.min(tStats[1], (long) aCharge)));
+ final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = Math
+ .max(0, tChargeBefore - (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
if (!aSimulate) {
this.setCharge(aStack, tNewCharge);
}
@@ -444,19 +417,14 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
* @param aMaxCharge Maximum Charge. (if this is == 0 it will remove the Electric Behavior)
* @param aTransferLimit Transfer Limit.
* @param aTier The electric Tier.
- * @param aSpecialData If this Item has a Fixed Charge, like a SingleUse Battery (if > 0).
- * Use -1 if you want to make this Battery chargeable (the use and canUse Functions will still discharge if you just use this)
- * Use -2 if you want to make this Battery dischargeable.
- * Use -3 if you want to make this Battery charge/discharge-able.
+ * @param aSpecialData If this Item has a Fixed Charge, like a SingleUse Battery (if > 0). Use -1 if you want to
+ * make this Battery chargeable (the use and canUse Functions will still discharge if you just
+ * use this) Use -2 if you want to make this Battery dischargeable. Use -3 if you want to make
+ * this Battery charge/discharge-able.
* @return the Item itself for convenience in constructing.
*/
- public final BaseEuItem setElectricStats(
- final int aMetaValue,
- final long aMaxCharge,
- final long aTransferLimit,
- final long aTier,
- final long aSpecialData,
- final boolean aUseAnimations) {
+ public final BaseEuItem setElectricStats(final int aMetaValue, final long aMaxCharge, final long aTransferLimit,
+ final long aTier, final long aSpecialData, final boolean aUseAnimations) {
if (aMetaValue < 0) {
return this;
}
@@ -465,12 +433,12 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
} else {
this.mElectricStats.put(
(short) aMetaValue,
- new Long[] {aMaxCharge, Math.max(0, aTransferLimit), Math.max(-1, aTier), aSpecialData});
+ new Long[] { aMaxCharge, Math.max(0, aTransferLimit), Math.max(-1, aTier), aSpecialData });
}
return this;
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item var1, final CreativeTabs aCreativeTab, final List aList) {
@@ -498,11 +466,11 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI
for (short i = 0, j = (short) this.mEnabledItems.length(); i < j; i++) {
if (this.mEnabledItems.get(i)) {
for (byte k = 1; k < this.mIconList[i].length; k++) {
- this.mIconList[i][k] = aIconRegister.registerIcon(
- CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i + "/" + k));
+ this.mIconList[i][k] = aIconRegister
+ .registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i + "/" + k));
}
- this.mIconList[i][0] =
- aIconRegister.registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i));
+ this.mIconList[i][0] = aIconRegister
+ .registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i));
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java
index 6e1d2e97e9..27f7d51bbd 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java
@@ -1,5 +1,11 @@
package gtPlusPlus.core.item.base;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -10,11 +16,6 @@ import gtPlusPlus.core.handler.GuiHandler;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class BaseItemBackpack extends Item {
@@ -48,8 +49,8 @@ public class BaseItemBackpack extends Item {
// Otherwise, stealthily place some diamonds in there for a nice surprise next time you open it up :)
else {
- // Utils.LOG_INFO("Player is Sneaking, giving them sneaky diamonds.");
- // new BaseInventoryBackpack(player.getHeldItem()).setInventorySlotContents(0, new
+ // Utils.LOG_INFO("Player is Sneaking, giving them sneaky diamonds.");
+ // new BaseInventoryBackpack(player.getHeldItem()).setInventorySlotContents(0, new
// ItemStack(Items.diamond,4));
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java
index fcb11ec31a..cdf98b9547 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java
@@ -1,8 +1,7 @@
package gtPlusPlus.core.item.base;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -10,22 +9,20 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
-/*
-*
-*
- Key Point: You can access the NBT compound data from the Item class (in those methods that pass an ItemStack), but the NBT compound can only be set on an ItemStack.
-
-The steps to add NBT data to an ItemStack:
- Create or otherwise get an ItemStack of the desired item
- Create an NBTTagCompound and fill it with the appropriate data
- Call ItemStack#setTagCompound() method to set it.
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
-*
-*/
+/*
+ * Key Point: You can access the NBT compound data from the Item class (in those methods that pass an ItemStack), but
+ * the NBT compound can only be set on an ItemStack. The steps to add NBT data to an ItemStack: Create or otherwise get
+ * an ItemStack of the desired item Create an NBTTagCompound and fill it with the appropriate data Call
+ * ItemStack#setTagCompound() method to set it.
+ */
public class BaseItemBrain extends Item {
+
// This is an array of all the types I am going to be adding.
- String[] brainTypes = {"dead", "preserved", "fresh", "tasty"};
+ String[] brainTypes = { "dead", "preserved", "fresh", "tasty" };
// This method allows us to have different language translation keys for
// each item we add.
@@ -51,12 +48,12 @@ public class BaseItemBrain extends Item {
// This is a fun method which allows us to run some code when our item is
// shown in a creative tab. I am going to use it to add all the brain
// types.
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item item, final CreativeTabs tab, final List itemList) {
// This creates a loop with a counter. It will go through once for
- // every listing in brainTypes, and gives us a number associated
+ // every listing in brainTypes, and gives us a number associated
// with each listing.
for (int pos = 0; pos < this.brainTypes.length; pos++) {
// This creates a new ItemStack instance. The item parameter
@@ -76,18 +73,19 @@ public class BaseItemBrain extends Item {
}
// This code will allow us to tell the items apart in game. You can change
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
// texture based on nbt data, but I won't be covering that.
@Override
@SideOnly(Side.CLIENT)
- public void addInformation(
- final ItemStack stack, final EntityPlayer player, final List tooltip, final boolean isAdvanced) {
+ public void addInformation(final ItemStack stack, final EntityPlayer player, final List tooltip,
+ final boolean isAdvanced) {
if (stack.hasTagCompound() && stack.getTagCompound().hasKey("brainType")) {
// StatCollector is a class which allows us to handle string
// language translation. This requires that you fill out the
// translation in you language class.
- tooltip.add(StatCollector.translateToLocal(
- "tooltip.yourmod." + stack.getTagCompound().getString("brainType") + ".desc"));
+ tooltip.add(
+ StatCollector.translateToLocal(
+ "tooltip.yourmod." + stack.getTagCompound().getString("brainType") + ".desc"));
} else // If the brain does not have valid tag data, a default message
{
tooltip.add(StatCollector.translateToLocal("tooltip.yourmod.nullbrain.desc"));
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java
index 9b24aa32d9..a0f7c9b34f 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java
@@ -1,25 +1,18 @@
package gtPlusPlus.core.item.base;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
public class BaseItemBurnable extends CoreItem {
protected final int meta;
- public BaseItemBurnable(
- String unlocalizedName,
- String displayName,
- CreativeTabs creativeTab,
- int stackSize,
- int maxDmg,
- String description,
- String oredictName,
- int burnTime,
- int meta) {
+ public BaseItemBurnable(String unlocalizedName, String displayName, CreativeTabs creativeTab, int stackSize,
+ int maxDmg, String description, String oredictName, int burnTime, int meta) {
super(unlocalizedName, creativeTab, stackSize, maxDmg, description);
this.itemName = displayName;
this.meta = meta;
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
index 94c231be9b..9e5a995a80 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java
@@ -1,10 +1,7 @@
package gtPlusPlus.core.item.base;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
@@ -12,6 +9,11 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.lib.CORE;
+
public class BaseItemColourable extends Item {
private final EnumRarity rarity;
@@ -30,16 +32,9 @@ public class BaseItemColourable extends Item {
/*
* Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect
*/
- public BaseItemColourable(
- final String unlocalizedName,
- final CreativeTabs creativeTab,
- final int stackSize,
- final int maxDmg,
- final String description,
- final EnumRarity regRarity,
- final EnumChatFormatting colour,
- final boolean Effect,
- int rgb) {
+ public BaseItemColourable(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize,
+ final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour,
+ final boolean Effect, int rgb) {
this.setUnlocalizedName(unlocalizedName);
this.setTextureName(CORE.MODID + ":" + unlocalizedName);
this.setCreativeTab(creativeTab);
@@ -58,17 +53,9 @@ public class BaseItemColourable extends Item {
/*
* Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect
*/
- public BaseItemColourable(
- final String unlocalizedName,
- final String displayName,
- final CreativeTabs creativeTab,
- final int stackSize,
- final int maxDmg,
- final String description,
- final EnumRarity regRarity,
- final EnumChatFormatting colour,
- final boolean Effect,
- int rgb) {
+ public BaseItemColourable(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab,
+ final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity,
+ final EnumChatFormatting colour, final boolean Effect, int rgb) {
this.setUnlocalizedName(unlocalizedName);
this.itemName = displayName;
this.setTextureName(CORE.MODID + ":" + unlocalizedName);
@@ -83,7 +70,7 @@ public class BaseItemColourable extends Item {
GameRegistry.registerItem(this, unlocalizedName);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add(this.descColour + this.itemDescription);
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 1f59ecf2b1..414a280f3d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -1,5 +1,17 @@
package gtPlusPlus.core.item.base;
+import java.awt.Color;
+import java.util.*;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -20,16 +32,6 @@ import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.EntityUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.sys.KeyboardUtils;
-import java.awt.Color;
-import java.util.*;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
public class BaseItemComponent extends Item {
@@ -66,7 +68,8 @@ public class BaseItemComponent extends Item {
// if (componentType != ComponentTypes.DUST)
GT_OreDictUnificator.registerOre(
- componentType.getOreDictName() + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
+ componentType.getOreDictName() + material.getUnlocalizedName(),
+ ItemUtils.getSimpleStack(this));
if (componentType == ComponentTypes.GEAR) {
GT_OreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
}
@@ -108,8 +111,7 @@ public class BaseItemComponent extends Item {
this.componentMaterial = aTempMaterial;
this.unlocalName = "itemCell" + aFormattedNameForFluids;
this.materialName = localName;
- this.translatedMaterialName =
- getFluidName("fluid." + this.materialName.toLowerCase().replace(" ", ""));
+ this.translatedMaterialName = getFluidName("fluid." + this.materialName.toLowerCase().replace(" ", ""));
this.componentType = ComponentTypes.CELL;
this.setCreativeTab(AddToCreativeTab.tabMisc);
this.setUnlocalizedName(aFormattedNameForFluids);
@@ -150,20 +152,27 @@ public class BaseItemComponent extends Item {
ItemStack x = aMap.get(aKey);
if (x == null) {
aMap.put(aKey, ItemUtils.getSimpleStack(this));
- Logger.MATERIALS("Registering a material component. Item: [" + componentMaterial.getUnlocalizedName()
- + "] Map: [" + aKey + "]");
+ Logger.MATERIALS(
+ "Registering a material component. Item: [" + componentMaterial.getUnlocalizedName()
+ + "] Map: ["
+ + aKey
+ + "]");
Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap);
if (componentType == ComponentTypes.PLATE) {
GregTech_API.registerCover(
componentMaterial.getPlate(1),
new GT_RenderedTexture(
- componentMaterial.getTextureSet().mTextures[71], componentMaterial.getRGBA(), false),
+ componentMaterial.getTextureSet().mTextures[71],
+ componentMaterial.getRGBA(),
+ false),
null);
} else if (componentType == ComponentTypes.PLATEDOUBLE) {
GregTech_API.registerCover(
componentMaterial.getPlateDouble(1),
new GT_RenderedTexture(
- componentMaterial.getTextureSet().mTextures[72], componentMaterial.getRGBA(), false),
+ componentMaterial.getTextureSet().mTextures[72],
+ componentMaterial.getRGBA(),
+ false),
null);
}
return true;
@@ -191,18 +200,12 @@ public class BaseItemComponent extends Item {
// return "gregtech" + ":" + "materialicons/"+metType+"/" + this.componentType.COMPONENT_NAME.toLowerCase();
}
- /*@Override
- public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-
- if (this.componentType == ComponentTypes.SMALLGEAR){
- return "Small " + this.materialName+" Gear";
- }
-
- if (this.componentMaterial != null) {
- return (this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME);
- }
- return this.materialName+" Cell";
- }*/
+ /*
+ * @Override public String getItemStackDisplayName(final ItemStack p_77653_1_) { if (this.componentType ==
+ * ComponentTypes.SMALLGEAR){ return "Small " + this.materialName+" Gear"; } if (this.componentMaterial != null) {
+ * return (this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME); } return
+ * this.materialName+" Cell"; }
+ */
public final String getMaterialName() {
return this.materialName;
@@ -216,21 +219,20 @@ public class BaseItemComponent extends Item {
trans = GT_LanguageManager.getTranslation(aKey);
if (!trans.equals(aKey)) return trans;
return GT_LanguageManager.addStringLocalization(
- "gtplusplus.fluid." + this.materialName.toLowerCase().replace(" ", ""), this.materialName);
+ "gtplusplus.fluid." + this.materialName.toLowerCase().replace(" ", ""),
+ this.materialName);
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
- return GT_LanguageManager.getTranslation("gtplusplus.item." + unlocalName + ".name")
- .replace("%s", "%temp")
- .replace("%material", translatedMaterialName)
- .replace("%temp", "%s");
+ return GT_LanguageManager.getTranslation("gtplusplus.item." + unlocalName + ".name").replace("%s", "%temp")
+ .replace("%material", translatedMaterialName).replace("%temp", "%s");
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public final void addInformation(
- final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+ public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list,
+ final boolean bool) {
try {
@@ -240,8 +242,7 @@ public class BaseItemComponent extends Item {
}
}
- if ((this.materialName != null)
- && (this.materialName != "")
+ if ((this.materialName != null) && (this.materialName != "")
&& !this.materialName.equals("")
&& (this.componentMaterial != null)) {
@@ -265,12 +266,15 @@ public class BaseItemComponent extends Item {
}
if (this.componentType == ComponentTypes.INGOT || this.componentType == ComponentTypes.HOTINGOT) {
- if ((this.materialName != null)
- && (this.materialName != "")
+ if ((this.materialName != null) && (this.materialName != "")
&& !this.materialName.equals("")
&& this.unlocalName.toLowerCase().contains("hot")) {
- list.add(EnumChatFormatting.GRAY + "Warning: " + EnumChatFormatting.RED + "Very hot! "
- + EnumChatFormatting.GRAY + " Avoid direct handling..");
+ list.add(
+ EnumChatFormatting.GRAY + "Warning: "
+ + EnumChatFormatting.RED
+ + "Very hot! "
+ + EnumChatFormatting.GRAY
+ + " Avoid direct handling..");
}
}
} else {
@@ -286,34 +290,36 @@ public class BaseItemComponent extends Item {
String type = this.componentMaterial.getTextureSet().mSetName;
String output = type.substring(0, 1).toUpperCase() + type.substring(1);
list.add(EnumChatFormatting.GRAY + "Material Type: " + output + ".");
- list.add(EnumChatFormatting.GRAY + "Material State: "
- + this.componentMaterial.getState().name() + ".");
- list.add(EnumChatFormatting.GRAY + "Radioactivity Level: "
- + this.componentMaterial.vRadiationLevel + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Material State: "
+ + this.componentMaterial.getState().name()
+ + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Radioactivity Level: "
+ + this.componentMaterial.vRadiationLevel
+ + ".");
}
} else {
list.add(EnumChatFormatting.DARK_GRAY + "Hold Ctrl to show additional info.");
}
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
super.addInformation(stack, aPlayer, list, bool);
}
@SuppressWarnings("unchecked")
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (this.componentMaterial != null) {
if (entityHolding instanceof EntityPlayer) {
if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) {
EntityUtils.applyRadiationDamageToEntity(
- iStack.stackSize, this.componentMaterial.vRadiationLevel, world, entityHolding);
+ iStack.stackSize,
+ this.componentMaterial.vRadiationLevel,
+ world,
+ entityHolding);
}
}
}
@@ -362,8 +368,7 @@ public class BaseItemComponent extends Item {
if (this.componentMaterial.getRGBA()[3] == 2) {
// 4 sec cycle, 200 control point. 20ms interval.
int currentFrame = (int) ((System.nanoTime() % 4_000_000_000L) / 20_000_000L);
- int value = currentFrame < 50
- ? currentFrame + 1
+ int value = currentFrame < 50 ? currentFrame + 1
: currentFrame < 100 ? 50 : currentFrame < 150 ? 149 - currentFrame : 0;
return Utils.rgbtoHexValue(
Math.min(255, Math.max(componentMaterial.getRGBA()[0] + value, 0)),
@@ -407,6 +412,7 @@ public class BaseItemComponent extends Item {
}
public static enum ComponentTypes {
+
DUST("Dust", " Dust", "dust", OrePrefixes.dust),
DUSTSMALL("DustSmall", "Small Pile of@Dust", "dustSmall", OrePrefixes.dustSmall),
DUSTTINY("DustTiny", "Tiny Pile of@Dust", "dustTiny", OrePrefixes.dustTiny),
@@ -430,16 +436,15 @@ public class BaseItemComponent extends Item {
SPRING("Spring", " Spring", "spring", OrePrefixes.spring),
SMALLSPRING("SmallSpring", "Small@Spring", "springSmall", OrePrefixes.springSmall),
FINEWIRE("FineWire", "Fine@Wire", "wireFine", OrePrefixes.wireFine),
- PLATEDENSE("PlateDense", "Dense@Plate", "plateDense", OrePrefixes.plateDense),
- ;
+ PLATEDENSE("PlateDense", "Dense@Plate", "plateDense", OrePrefixes.plateDense),;
private String COMPONENT_NAME;
private String DISPLAY_NAME;
private String OREDICT_NAME;
private OrePrefixes a_GT_EQUAL;
- private ComponentTypes(
- final String LocalName, final String DisplayName, final String OreDictName, final OrePrefixes aPrefix) {
+ private ComponentTypes(final String LocalName, final String DisplayName, final String OreDictName,
+ final OrePrefixes aPrefix) {
this.COMPONENT_NAME = LocalName;
this.DISPLAY_NAME = DisplayName;
this.OREDICT_NAME = OreDictName;
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java
index d244d28967..3ea7c93102 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java
@@ -1,11 +1,7 @@
package gtPlusPlus.core.item.base;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
@@ -14,6 +10,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+
public class BaseItemDamageable extends Item {
private final EnumRarity rarity;
@@ -21,16 +23,9 @@ public class BaseItemDamageable extends Item {
protected String itemName;
private final boolean hasEffect;
- public BaseItemDamageable(
- final String unlocalizedName,
- final CreativeTabs creativeTab,
- final int stackSize,
- final int maxDmg,
- final String description,
- final EnumRarity regRarity,
- final EnumChatFormatting colour,
- final boolean Effect,
- final ItemStack OverrideItem) {
+ public BaseItemDamageable(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize,
+ final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour,
+ final boolean Effect, final ItemStack OverrideItem) {
this.setUnlocalizedName(unlocalizedName);
this.setTextureName(CORE.MODID + ":" + unlocalizedName);
this.setCreativeTab(creativeTab);
@@ -47,7 +42,7 @@ public class BaseItemDamageable extends Item {
return this.itemDescription;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
int dmg = (int) getItemDamage(stack);
@@ -55,12 +50,17 @@ public class BaseItemDamageable extends Item {
list.add(EnumChatFormatting.GRAY + this.itemDescription);
}
if (dmg > 3 && dmg <= 25) {
- list.add(EnumChatFormatting.GRAY
- + "You have discovered that smashing this against valuable stones has some function..");
+ list.add(
+ EnumChatFormatting.GRAY
+ + "You have discovered that smashing this against valuable stones has some function..");
} else if (dmg > 0) {
int maxDamage = 250;
- list.add(EnumChatFormatting.GRAY + "" + (maxDamage - getItemDamage(stack)) + "/" + maxDamage
- + " gems remaining.");
+ list.add(
+ EnumChatFormatting.GRAY + ""
+ + (maxDamage - getItemDamage(stack))
+ + "/"
+ + maxDamage
+ + " gems remaining.");
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java
index 65ed54f520..e7afbab4fb 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java
@@ -1,13 +1,16 @@
package gtPlusPlus.core.item.base;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.lib.CORE;
+
public class BaseItemGeneric extends Item {
+
public BaseItemGeneric(final String unlocalizedName, final CreativeTabs c, final int stackSize, final int maxDmg) {
this.setUnlocalizedName(CORE.MODID + "_" + unlocalizedName);
this.setTextureName(CORE.MODID + ":" + unlocalizedName);
@@ -16,7 +19,7 @@ public class BaseItemGeneric extends Item {
this.setMaxDamage(maxDmg);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
super.addInformation(stack, aPlayer, list, bool);
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java
index 23783d69f7..939f3c8e2a 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java
@@ -1,17 +1,19 @@
package gtPlusPlus.core.item.base;
-import gregtech.api.enums.Materials;
-import gtPlusPlus.api.enums.Quality;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gregtech.api.enums.Materials;
+import gtPlusPlus.api.enums.Quality;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class BaseItemLoot extends Item {
private final String materialName;
@@ -44,14 +46,14 @@ public class BaseItemLoot extends Item {
return this.materialName;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add(this.lootQuality.getQuality());
- /*if (componentMaterial.isRadioactive){
- list.add(CORE.GT_Tooltip_Radioactive);
- }*/
+ /*
+ * if (componentMaterial.isRadioactive){ list.add(CORE.GT_Tooltip_Radioactive); }
+ */
super.addInformation(stack, aPlayer, list, bool);
}
@@ -63,22 +65,20 @@ public class BaseItemLoot extends Item {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
// EntityUtils.applyRadiationDamageToEntity(lootQuality.vRadioationLevel, world, entityHolding);
}
public static enum LootTypes {
+
Sword("Sword", " Longsword", "sword"),
Shortsword("Sword", " Short Blade", "blade"),
Helmet("Helmet", " Medium Helm", "helmet"),
Chestplate("Platebody", " Chestplate", "platebody"),
Leggings("Platelegs", " Platelegs", "platelegs"),
Boots("Boots", " Boots", "boots");
+
private String LOOT_TYPE;
private String DISPLAY_SUFFIX;
private String OREDICT_NAME;
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java
index 1022061db5..1e4a104b65 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java
@@ -1,12 +1,7 @@
package gtPlusPlus.core.item.base;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -14,6 +9,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class BaseItemTCShard extends Item {
public final String unlocalName;
@@ -30,8 +32,8 @@ public class BaseItemTCShard extends Item {
this(DisplayName, colour, "", Description);
}
- public BaseItemTCShard(
- final String DisplayName, final int colour, final String Description, final String Description2) {
+ public BaseItemTCShard(final String DisplayName, final int colour, final String Description,
+ final String Description2) {
this.unlocalName = "item" + Utils.sanitizeString(DisplayName);
this.displayName = DisplayName;
this.itemColour = colour;
@@ -51,7 +53,7 @@ public class BaseItemTCShard extends Item {
return (this.displayName + " Shard");
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
if ((this.descriptionString != "") || !this.descriptionString.equals("")) {
@@ -68,10 +70,6 @@ public class BaseItemTCShard extends Item {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {}
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java
index 03c580a9c3..6e1b86eec0 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java
@@ -1,12 +1,7 @@
package gtPlusPlus.core.item.base;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -17,6 +12,13 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+
public class BaseItemTickable extends CoreItem {
public final String[] descriptionString;
@@ -31,18 +33,13 @@ public class BaseItemTickable extends CoreItem {
this(false, twoPass, unlocalName, colour, maxTicks, new String[] {});
}
- public BaseItemTickable(
- boolean containerTick, boolean twoPass, final String unlocalName, final int colour, final int maxTicks) {
+ public BaseItemTickable(boolean containerTick, boolean twoPass, final String unlocalName, final int colour,
+ final int maxTicks) {
this(containerTick, twoPass, unlocalName, colour, maxTicks, new String[] {});
}
- public BaseItemTickable(
- boolean containerTick,
- boolean twoPass,
- final String unlocalName,
- final int colour,
- final int maxTicks,
- final String[] Description) {
+ public BaseItemTickable(boolean containerTick, boolean twoPass, final String unlocalName, final int colour,
+ final int maxTicks, final String[] Description) {
super(
unlocalName,
AddToCreativeTab.tabMisc,
@@ -63,11 +60,7 @@ public class BaseItemTickable extends CoreItem {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (world == null || iStack == null) {
return;
@@ -82,10 +75,10 @@ public class BaseItemTickable extends CoreItem {
}
}
- /*private final boolean setGregtechItemList() {
- ItemList.Component_LavaFilter.set(this);
- return ItemList.Component_LavaFilter.get(1) != null ? true : false;
- }*/
+ /*
+ * private final boolean setGregtechItemList() { ItemList.Component_LavaFilter.set(this); return
+ * ItemList.Component_LavaFilter.get(1) != null ? true : false; }
+ */
/**
*
@@ -297,8 +290,8 @@ public class BaseItemTickable extends CoreItem {
@SuppressWarnings("unchecked")
@Override
- public void addInformation(
- ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List list, boolean bool) {
+ public void addInformation(ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List list,
+ boolean bool) {
World world = player.getEntityWorld();
if (this.descriptionString.length > 0) {
list.add(EnumChatFormatting.GRAY + this.descriptionString[0]);
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java
index 5c9bf62455..f42b13924d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java
@@ -1,8 +1,7 @@
package gtPlusPlus.core.item.base;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -11,13 +10,16 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
public class BaseItemWithCharge extends Item {
public int int_Charge = 0;
public int int_Max_Charge = 0;
- public BaseItemWithCharge(
- final String unlocalizedName, final int constructor_Charge, final int constructor_Max_Charge) {
+ public BaseItemWithCharge(final String unlocalizedName, final int constructor_Charge,
+ final int constructor_Max_Charge) {
this.setUnlocalizedName(unlocalizedName);
this.setTextureName(CORE.MODID + ":" + unlocalizedName);
this.setMaxStackSize(1);
@@ -26,7 +28,7 @@ public class BaseItemWithCharge extends Item {
this.int_Max_Charge = constructor_Max_Charge;
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
int NBT_Charge = this.int_Charge;
@@ -44,25 +46,16 @@ public class BaseItemWithCharge extends Item {
}
// Ticking and NBT Handling
- /* Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and
- * update it's contents.
- *
- * public int fuelRemaining = 0;
- public int maximumFuel = 0;
- public String fuelType = "";
- public float heat = 0;
- public float maxHeat = 5000;
- *
+ /*
+ * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and
+ * update it's contents. public int fuelRemaining = 0; public int maximumFuel = 0; public String fuelType = "";
+ * public float heat = 0; public float maxHeat = 5000;
*/
@Override
public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) {}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World par2World,
- final Entity par3Entity,
- final int par4,
+ public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4,
final boolean par5) {}
@Override
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java
index 383fdefaee..a5b71e5958 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java
@@ -1,12 +1,15 @@
package gtPlusPlus.core.item.base;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.lib.CORE;
+
public class BaseItemWithDamageValue extends Item {
+
public BaseItemWithDamageValue(final String unlocalizedName) {
this.setUnlocalizedName(unlocalizedName);
this.setTextureName(CORE.MODID + ":" + unlocalizedName);
@@ -19,7 +22,7 @@ public class BaseItemWithDamageValue extends Item {
super.setDamage(stack, damage);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
super.addInformation(stack, aPlayer, list, bool);
diff --git a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
index 5e8b7964b8..e6acd5dd63 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java
@@ -1,10 +1,7 @@
package gtPlusPlus.core.item.base;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.creative.AddToCreativeTab;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -17,7 +14,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.*;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+
public class BasicSpawnEgg extends ItemMonsterPlacer {
+
@SideOnly(Side.CLIENT)
private IIcon theIcon;
@@ -32,10 +35,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer {
super();
}
- public BasicSpawnEgg(
- final String MODID,
- final String parEntityToSpawnName,
- final int parPrimaryColor,
+ public BasicSpawnEgg(final String MODID, final String parEntityToSpawnName, final int parPrimaryColor,
final int parSecondaryColor) {
this.setHasSubtypes(false);
this.maxStackSize = 64;
@@ -52,21 +52,11 @@ public class BasicSpawnEgg extends ItemMonsterPlacer {
/**
* Callback for item usage. If the item does something special on right clicking,
*
- * he will have one of those. Return
- * True if something happen and false if it don't. This is for ITEMS, not BLOCKS
+ * he will have one of those. Return True if something happen and false if it don't. This is for ITEMS, not BLOCKS
*/
@Override
- public boolean onItemUse(
- final ItemStack par1ItemStack,
- final EntityPlayer par2EntityPlayer,
- final World par3World,
- int par4,
- int par5,
- int par6,
- final int par7,
- final float par8,
- final float par9,
- final float par10) {
+ public boolean onItemUse(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final World par3World,
+ int par4, int par5, int par6, final int par7, final float par8, final float par9, final float par10) {
if (par3World.isRemote) {
return true;
}
@@ -98,16 +88,16 @@ public class BasicSpawnEgg extends ItemMonsterPlacer {
/**
* Called whenever this item is equipped and the right mouse button is pressed.
*
- *Args: itemStack, world, entityPlayer
+ * Args: itemStack, world, entityPlayer
*/
@Override
- public ItemStack onItemRightClick(
- final ItemStack par1ItemStack, final World par2World, final EntityPlayer par3EntityPlayer) {
+ public ItemStack onItemRightClick(final ItemStack par1ItemStack, final World par2World,
+ final EntityPlayer par3EntityPlayer) {
if (par2World.isRemote) {
return par1ItemStack;
}
- final MovingObjectPosition movingobjectposition =
- this.getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true);
+ final MovingObjectPosition movingobjectposition = this
+ .getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true);
if (movingobjectposition == null) {
return par1ItemStack;
@@ -147,8 +137,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer {
/**
* Spawns the creature specified by the egg's type in the location specified by
*
- * the last three parameters.
- * Parameters: world, entityID, x, y, z.
+ * the last three parameters. Parameters: world, entityID, x, y, z.
*/
public Entity spawnEntity(final World parWorld, final double parX, final double parY, final double parZ) {
@@ -159,7 +148,11 @@ public class BasicSpawnEgg extends ItemMonsterPlacer {
this.entityToSpawn = (EntityLiving) EntityList.createEntityByName(this.entityToSpawnNameFull, parWorld);
this.entityToSpawn.setLocationAndAngles(
- parX, parY, parZ, MathHelper.wrapAngleTo180_float(parWorld.rand.nextFloat() * 360.0F), 0.0F);
+ parX,
+ parY,
+ parZ,
+ MathHelper.wrapAngleTo180_float(parWorld.rand.nextFloat() * 360.0F),
+ 0.0F);
parWorld.spawnEntityInWorld(this.entityToSpawn);
this.entityToSpawn.onSpawnWithEgg((IEntityLivingData) null);
@@ -176,7 +169,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer {
/**
* returns a list of items with the same ID, but different meta (eg: dye returns 16 items)
*/
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item parItem, final CreativeTabs parTab, final List parList) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
index 790b086ab3..2cf0e4510d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java
@@ -1,12 +1,7 @@
package gtPlusPlus.core.item.base;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -16,6 +11,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class CoreItem extends Item {
private final EnumRarity rarity;
@@ -55,21 +57,18 @@ public class CoreItem extends Item {
64,
0,
new String[] {
- "This item will be replaced by another when held by a player, it is old and should not be used in recipes."
- },
+ "This item will be replaced by another when held by a player, it is old and should not be used in recipes." },
EnumRarity.uncommon,
EnumChatFormatting.UNDERLINE,
false,
OverrideItem); // Calls 5
}
+
// 0.1
/*
* Name, Tab - 64 Stack, 0 Dmg
*/
- public CoreItem(
- final String unlocalizedName,
- final String displayName,
- final CreativeTabs creativeTab,
+ public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab,
final ItemStack OverrideItem) {
this(
unlocalizedName,
@@ -77,8 +76,7 @@ public class CoreItem extends Item {
64,
0,
new String[] {
- "This item will be replaced by another when held by a player, it is old and should not be used in recipes."
- },
+ "This item will be replaced by another when held by a player, it is old and should not be used in recipes." },
EnumRarity.uncommon,
EnumChatFormatting.UNDERLINE,
false,
@@ -93,42 +91,38 @@ public class CoreItem extends Item {
public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize) {
this(unlocalizedName, creativeTab, stackSize, 0); // Calls 3
}
+
// 2
/*
* Name, Tab, Stack, Description - 0 Dmg
*/
- public CoreItem(
- final String unlocalizedName,
- final CreativeTabs creativeTab,
- final int stackSize,
+ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize,
final String[] description) {
this(unlocalizedName, creativeTab, stackSize, 0, description); // Calls 4
}
+
// 3
/*
* Name, Tab, Stack, Dmg - Description
*/
public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, String string) {
- this(unlocalizedName, creativeTab, stackSize, new String[] {string});
+ this(unlocalizedName, creativeTab, stackSize, new String[] { string });
}
- public CoreItem(
- final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg) {
+ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize,
+ final int maxDmg) {
this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] {}); // Calls 4
}
+
// 4 //Not Rare + basic tooltip
/*
* Name, Tab, Stack, Dmg, Description
*/
public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String string) {
- this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] {string});
+ this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] { string });
}
- public CoreItem(
- final String unlocalizedName,
- final CreativeTabs creativeTab,
- final int stackSize,
- final int maxDmg,
+ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg,
final String[] description) {
this(
unlocalizedName,
@@ -141,50 +135,28 @@ public class CoreItem extends Item {
false,
null); // Calls 4.5
}
+
// 4.5
/*
* Name, Tab, Stack, Dmg, Description, Text Colour - Common
*/
- public CoreItem(
- final String unlocalizedName,
- final CreativeTabs creativeTab,
- final int stackSize,
- final int maxDmg,
- final String[] description,
- final EnumChatFormatting colour) {
- this(
- unlocalizedName,
- creativeTab,
- stackSize,
- maxDmg,
- description,
- EnumRarity.common,
- colour,
- false,
- null); // Calls 5
+ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg,
+ final String[] description, final EnumChatFormatting colour) {
+ this(unlocalizedName, creativeTab, stackSize, maxDmg, description, EnumRarity.common, colour, false, null); // Calls
+ // 5
}
// 4.75
/*
* Name, Tab, Stack, Dmg, Description, Rarity - Gray text
*/
- public CoreItem(
- String unlocalizedName,
- CreativeTabs creativeTab,
- int stackSize,
- int maxDmg,
- String string,
+ public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String string,
EnumRarity uncommon) {
- this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] {string}, uncommon);
+ this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] { string }, uncommon);
}
- public CoreItem(
- final String unlocalizedName,
- final CreativeTabs creativeTab,
- final int stackSize,
- final int maxDmg,
- final String[] description,
- final EnumRarity rarity) {
+ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg,
+ final String[] description, final EnumRarity rarity) {
this(
unlocalizedName,
creativeTab,
@@ -201,16 +173,9 @@ public class CoreItem extends Item {
/*
* Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect
*/
- public CoreItem(
- final String unlocalizedName,
- final CreativeTabs creativeTab,
- final int stackSize,
- final int maxDmg,
- final String[] description,
- final EnumRarity regRarity,
- final EnumChatFormatting colour,
- final boolean Effect,
- final ItemStack OverrideItem) {
+ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg,
+ final String[] description, final EnumRarity regRarity, final EnumChatFormatting colour,
+ final boolean Effect, final ItemStack OverrideItem) {
this.setUnlocalizedName(unlocalizedName);
this.setTextureName(CORE.MODID + ":" + unlocalizedName);
this.setCreativeTab(creativeTab);
@@ -228,17 +193,9 @@ public class CoreItem extends Item {
/*
* Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect
*/
- public CoreItem(
- final String unlocalizedName,
- final String displayName,
- final CreativeTabs creativeTab,
- final int stackSize,
- final int maxDmg,
- final String[] description,
- final EnumRarity regRarity,
- final EnumChatFormatting colour,
- final boolean Effect,
- final ItemStack OverrideItem) {
+ public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab,
+ final int stackSize, final int maxDmg, final String[] description, final EnumRarity regRarity,
+ final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) {
this.setUnlocalizedName(unlocalizedName);
this.itemName = displayName;
this.setTextureName(CORE.MODID + ":" + unlocalizedName);
@@ -253,7 +210,7 @@ public class CoreItem extends Item {
GameRegistry.registerItem(this, unlocalizedName);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
if (this.itemDescription.length > 0) {
@@ -277,11 +234,7 @@ public class CoreItem extends Item {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (this.turnsInto != null) {
if (entityHolding instanceof EntityPlayer) {
@@ -318,11 +271,8 @@ public class CoreItem extends Item {
return ItemUtils.getSimpleStack(this);
}
- /* @Override
- public String getItemStackDisplayName(final ItemStack tItem) {
- if ((this.itemName == null) || this.itemName.equals("")) {
- return super.getItemStackDisplayName(tItem);
- }
- return this.itemName;
- }*/
+ /*
+ * @Override public String getItemStackDisplayName(final ItemStack tItem) { if ((this.itemName == null) ||
+ * this.itemName.equals("")) { return super.getItemStackDisplayName(tItem); } return this.itemName; }
+ */
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
index ae601a1fc7..a260323da6 100644
--- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
+++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
@@ -1,5 +1,11 @@
package gtPlusPlus.core.item.base.cell;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
@@ -7,11 +13,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import ic2.core.Ic2Items;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
public class BaseItemCell extends BaseItemComponent {
@@ -37,7 +38,9 @@ public class BaseItemCell extends BaseItemComponent {
super(unlocalName, localName, RGBa);
this.fluidColour = RGBa;
FluidContainerRegistry.registerFluidContainer(
- FluidUtils.getFluidStack(cellFluid, 1000), ItemUtils.getSimpleStack(this), Ic2Items.cell.copy());
+ FluidUtils.getFluidStack(cellFluid, 1000),
+ ItemUtils.getSimpleStack(this),
+ Ic2Items.cell.copy());
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java
index 877c243c45..655d8c431f 100644
--- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java
+++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java
@@ -1,11 +1,5 @@
package gtPlusPlus.core.item.base.cell;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.item.base.BaseItemComponent;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
@@ -13,6 +7,13 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.base.BaseItemComponent;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.Utils;
+
public class BaseItemPlasmaCell extends BaseItemComponent {
private IIcon base;
@@ -62,11 +63,7 @@ public class BaseItemPlasmaCell extends BaseItemComponent {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (this.componentMaterial != null) {
if (!world.isRemote) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index f392d0e6af..435a055ede 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -29,18 +29,13 @@ public class BaseItemDust extends BaseItemComponent {
}
}
- private BaseItemDust(
- String unlocalizedName,
- String materialName,
- Material matInfo,
- int colour,
- String pileSize,
- int tier,
- boolean addRecipes) {
+ private BaseItemDust(String unlocalizedName, String materialName, Material matInfo, int colour, String pileSize,
+ int tier, boolean addRecipes) {
super(matInfo, ComponentTypes.DUST);
}
public static class DustState {
+
static final int NORMAL = (1);
static final int SMALL = (10);
static final int TINY = (100);
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java
index beca8dc873..af5fc9abfd 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java
@@ -1,20 +1,22 @@
package gtPlusPlus.core.item.base.dusts;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+
public abstract class BaseItemDustAbstract extends Item {
protected int colour = 0;
protected String materialName;
protected String pileType;
- public BaseItemDustAbstract(
- final String unlocalizedName, final String materialName, final int colour, final String pileSize) {
+ public BaseItemDustAbstract(final String unlocalizedName, final String materialName, final int colour,
+ final String pileSize) {
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(64);
if (pileSize.equalsIgnoreCase("dust")) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java
index c6d9cfdc71..b3be8fb9c3 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java
@@ -1,27 +1,30 @@
package gtPlusPlus.core.item.base.dusts;
-import gregtech.api.enums.TextureSet;
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.item.base.BaseItemComponent;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.*;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+
import org.apache.commons.lang3.StringUtils;
+import gregtech.api.enums.TextureSet;
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.base.BaseItemComponent;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class BaseItemDustEx extends BaseItemComponent {
public static Map<String, String> mCachedPileLinkages = new HashMap<String, String>();
protected IIcon[] baseAr = new IIcon[3];
protected IIcon[] overlayAr = new IIcon[3];
- public static final ComponentTypes[] componentTypeAr =
- new ComponentTypes[] {ComponentTypes.DUST, ComponentTypes.DUSTSMALL, ComponentTypes.DUSTTINY};
+ public static final ComponentTypes[] componentTypeAr = new ComponentTypes[] { ComponentTypes.DUST,
+ ComponentTypes.DUSTSMALL, ComponentTypes.DUSTTINY };
public BaseItemDustEx(final Material material) {
super(material, componentTypeAr[0]);
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index 8554844e50..8d90228bca 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -2,6 +2,14 @@ package gtPlusPlus.core.item.base.dusts;
import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_OreDictUnificator;
@@ -11,12 +19,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.data.StringUtils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
public class BaseItemDustUnique extends Item {
@@ -26,17 +28,13 @@ public class BaseItemDustUnique extends Item {
protected final String name;
protected final String chemicalNotation;
- public BaseItemDustUnique(
- final String unlocalizedName, final String materialName, final int colour, final String pileSize) {
+ public BaseItemDustUnique(final String unlocalizedName, final String materialName, final int colour,
+ final String pileSize) {
this(unlocalizedName, materialName, "NullFormula", colour, pileSize);
}
- public BaseItemDustUnique(
- final String unlocalizedName,
- final String materialName,
- final String mChemicalFormula,
- final int colour,
- final String pileSize) {
+ public BaseItemDustUnique(final String unlocalizedName, final String materialName, final String mChemicalFormula,
+ final int colour, final String pileSize) {
this.setUnlocalizedName(unlocalizedName);
this.setMaxStackSize(64);
this.setTextureName(this.getCorrectTexture(pileSize));
@@ -128,14 +126,13 @@ public class BaseItemDustUnique extends Item {
return "gregtech" + ":" + "materialicons/SHINY/dust";
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
if (this.sRadiation > 0) {
list.add(CORE.GT_Tooltip_Radioactive);
}
- if (this.chemicalNotation.length() > 0
- && !chemicalNotation.equals("")
+ if (this.chemicalNotation.length() > 0 && !chemicalNotation.equals("")
&& !chemicalNotation.equals("NullFormula")) {
list.add(this.chemicalNotation);
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java
index d84519d792..1a2e58f7f6 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java
@@ -1,15 +1,17 @@
package gtPlusPlus.core.item.base.dusts.decimal;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
import java.util.List;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+
public class BaseItemCentidust extends Item {
final Material dustMaterial;
@@ -34,7 +36,7 @@ public class BaseItemCentidust extends Item {
return (this.materialName + " Centidust");
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("")) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java
index b49e9d3288..826d6d13c9 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java
@@ -1,15 +1,17 @@
package gtPlusPlus.core.item.base.dusts.decimal;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
import java.util.List;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+
public class BaseItemDecidust extends Item {
final Material dustMaterial;
@@ -34,7 +36,7 @@ public class BaseItemDecidust extends Item {
return (this.materialName + " Decidust");
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("")) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java
index d96e3c8565..b9d5011f94 100644
--- a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java
+++ b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java
@@ -1,26 +1,22 @@
package gtPlusPlus.core.item.base.foods;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
public class BaseItemFood extends ItemFood {
private final PotionEffect[] effects;
protected String localName;
- public BaseItemFood(
- final String unlocalizedName,
- final String localizedName,
- final int healAmount,
- final float saturationModifier,
- final boolean wolvesFavorite,
- final PotionEffect... effects) {
+ public BaseItemFood(final String unlocalizedName, final String localizedName, final int healAmount,
+ final float saturationModifier, final boolean wolvesFavorite, final PotionEffect... effects) {
super(healAmount, saturationModifier, wolvesFavorite);
this.setUnlocalizedName(unlocalizedName);
this.setTextureName(CORE.MODID + ":" + unlocalizedName.replace("Hot", ""));
@@ -36,11 +32,12 @@ public class BaseItemFood extends ItemFood {
for (int i = 0; i < this.effects.length; i++) {
if (!world.isRemote && (this.effects[i] != null) && (this.effects[i].getPotionID() > 0)) {
- player.addPotionEffect(new PotionEffect(
- this.effects[i].getPotionID(),
- this.effects[i].getDuration(),
- this.effects[i].getAmplifier(),
- this.effects[i].getIsAmbient()));
+ player.addPotionEffect(
+ new PotionEffect(
+ this.effects[i].getPotionID(),
+ this.effects[i].getDuration(),
+ this.effects[i].getAmplifier(),
+ this.effects[i].getIsAmbient()));
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
index 4fef548705..ab00cb483b 100644
--- a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
+++ b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java
@@ -1,10 +1,7 @@
package gtPlusPlus.core.item.base.foods;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -13,6 +10,11 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class BaseItemHotFood extends BaseItemFood {
protected String materialName;
@@ -20,13 +22,8 @@ public class BaseItemHotFood extends BaseItemFood {
protected int cooldownTime;
protected Item output;
- public BaseItemHotFood(
- final String unlocalizedName,
- final int healAmount,
- final float healSaturation,
- final String foodName,
- final int timeToCoolInSeconds,
- final Item cooledFood) {
+ public BaseItemHotFood(final String unlocalizedName, final int healAmount, final float healSaturation,
+ final String foodName, final int timeToCoolInSeconds, final Item cooledFood) {
super(unlocalizedName, "Hot " + foodName, healAmount, healSaturation, false);
this.unlocalName = unlocalizedName;
this.cooldownTime = timeToCoolInSeconds * 20;
@@ -41,19 +38,15 @@ public class BaseItemHotFood extends BaseItemFood {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
// Utils.LOG_INFO("Item Damage: "+iStack.getItemDamage()+" Max Damage: "+iStack.getMaxDamage());
if (!world.isRemote) {
if (iStack.getItemDamage() == this.cooldownTime) {
if (entityHolding instanceof EntityPlayer) {
Logger.INFO("Foods Done.");
- ((EntityPlayer) entityHolding)
- .inventory.addItemStackToInventory(ItemUtils.getSimpleStack(this.output));
+ ((EntityPlayer) entityHolding).inventory
+ .addItemStackToInventory(ItemUtils.getSimpleStack(this.output));
((EntityPlayer) entityHolding).inventory.consumeInventoryItem(this);
}
} else if (iStack.getItemDamage() < this.cooldownTime) {
@@ -66,14 +59,20 @@ public class BaseItemHotFood extends BaseItemFood {
super.onUpdate(iStack, world, entityHolding, p_77663_4_, p_77663_5_);
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("")) {
- list.add(EnumChatFormatting.GRAY + "Warning: " + EnumChatFormatting.RED + "Very hot!"
- + EnumChatFormatting.GRAY + " Avoid direct handling..");
- list.add(EnumChatFormatting.GRAY + "This food has " + ((this.cooldownTime - stack.getItemDamage()) / 20)
- + " seconds left, until it is cool.");
+ list.add(
+ EnumChatFormatting.GRAY + "Warning: "
+ + EnumChatFormatting.RED
+ + "Very hot!"
+ + EnumChatFormatting.GRAY
+ + " Avoid direct handling..");
+ list.add(
+ EnumChatFormatting.GRAY + "This food has "
+ + ((this.cooldownTime - stack.getItemDamage()) / 20)
+ + " seconds left, until it is cool.");
}
super.addInformation(stack, aPlayer, list, bool);
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index ad1e682e3e..84d00ec66d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -1,5 +1,12 @@
package gtPlusPlus.core.item.base.ingots;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.api.objects.Logger;
@@ -9,12 +16,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.EntityUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
public class BaseItemIngotHot extends BaseItemIngot {
@@ -55,11 +56,7 @@ public class BaseItemIngotHot extends BaseItemIngot {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (this.componentMaterial != null) {
if (entityHolding != null && entityHolding instanceof EntityPlayer) {
@@ -88,8 +85,8 @@ public class BaseItemIngotHot extends BaseItemIngot {
this.base = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot");
this.overlay = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY");
} else {
- this.base = i.registerIcon(
- CORE.MODID + ":" + "item" + BaseItemComponent.ComponentTypes.HOTINGOT.getComponent());
+ this.base = i
+ .registerIcon(CORE.MODID + ":" + "item" + BaseItemComponent.ComponentTypes.HOTINGOT.getComponent());
// this.overlay = i.registerIcon(CORE.MODID + ":" +
// "item"+BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()+"_Overlay");
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
index eb6b4f03b2..c9cc305a3d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
@@ -1,5 +1,10 @@
package gtPlusPlus.core.item.base.ingots;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
@@ -9,10 +14,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.EntityUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class BaseItemIngot_OLD extends Item {
@@ -20,8 +21,8 @@ public class BaseItemIngot_OLD extends Item {
protected String materialName;
protected String unlocalName;
- public BaseItemIngot_OLD(
- final String unlocalizedName, final String materialName, final int colour, final int sRadioactivity) {
+ public BaseItemIngot_OLD(final String unlocalizedName, final String materialName, final int colour,
+ final int sRadioactivity) {
this.setUnlocalizedName(unlocalizedName);
this.setCreativeTab(AddToCreativeTab.tabMisc);
this.unlocalName = unlocalizedName;
@@ -87,11 +88,7 @@ public class BaseItemIngot_OLD extends Item {
protected final int sRadiation;
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.sRadiation, world, entityHolding);
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
index d053fde9a8..db36c48f56 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
@@ -1,13 +1,15 @@
package gtPlusPlus.core.item.base.itemblock;
-import gtPlusPlus.core.fluids.BlockFluidBase;
-import gtPlusPlus.core.util.math.MathUtils;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.fluids.BlockFluidBase;
+import gtPlusPlus.core.util.math.MathUtils;
+
public class FluidItemBlock extends ItemBlock {
protected final int blockColour;
@@ -18,13 +20,8 @@ public class FluidItemBlock extends ItemBlock {
super(block);
this.baseBlock = (BlockFluidBase) block;
this.blockColour = this.baseBlock.getRenderColor(1);
- this.name = this.baseBlock
- .getLocalizedName()
- .replace("tile", "")
- .replace("fluid", "")
- .replace("name", "")
- .replace("block", "")
- .replace(".", "");
+ this.name = this.baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "")
+ .replace("block", "").replace(".", "");
// GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.",
// "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox",
// ""), UtilsItems.getSimpleStack(this));
@@ -36,18 +33,11 @@ public class FluidItemBlock extends ItemBlock {
@Override
public String getItemStackDisplayName(final ItemStack iStack) {
- /*if (this.thisFluid != null){
- this.name = "Molten "+this.thisFluid.getLocalizedName();
- return this.name;
- }*/
- this.name = "Molten "
- + this.baseBlock
- .getLocalizedName()
- .replace("tile", "")
- .replace("fluid", "")
- .replace("name", "")
- .replace("block", "")
- .replace(".", "");
+ /*
+ * if (this.thisFluid != null){ this.name = "Molten "+this.thisFluid.getLocalizedName(); return this.name; }
+ */
+ this.name = "Molten " + this.baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "")
+ .replace("name", "").replace("block", "").replace(".", "");
return this.name;
}
@@ -61,10 +51,10 @@ public class FluidItemBlock extends ItemBlock {
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
- /*list.add("Temperature: "+MathUtils.celsiusToKelvin(this.thisFluid.getMeltingPointC())+"K");
- if (this.sRadiation > 0){
- list.add(CORE.GT_Tooltip_Radioactive);
- }*/
+ /*
+ * list.add("Temperature: "+MathUtils.celsiusToKelvin(this.thisFluid.getMeltingPointC())+"K"); if
+ * (this.sRadiation > 0){ list.add(CORE.GT_Tooltip_Radioactive); }
+ */
super.addInformation(stack, aPlayer, list, bool);
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
index ab54fce01c..be73e92aee 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
@@ -1,12 +1,14 @@
package gtPlusPlus.core.item.base.itemblock;
-import gtPlusPlus.api.interfaces.ITileTooltip;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+
public class ItemBlockBasicTile extends ItemBlock {
private final int mID;
@@ -16,7 +18,7 @@ public class ItemBlockBasicTile extends ItemBlock {
this.mID = ((ITileTooltip) block).getTooltipID();
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
if (this.mID == 0) { // Fish trap
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java
index 5afe1585ea..54c8b89704 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java
@@ -1,8 +1,7 @@
package gtPlusPlus.core.item.base.itemblock;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
@@ -11,7 +10,11 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class ItemBlockDoor extends ItemBlock {
+
@SideOnly(Side.CLIENT)
private IIcon field_150938_b;
@@ -20,22 +23,12 @@ public class ItemBlockDoor extends ItemBlock {
}
/**
- * Callback for item usage. If the item does something special on right
- * clicking, he will have one of those. Return True if something happen and
- * false if it don't. This is for ITEMS, not BLOCKS
+ * Callback for item usage. If the item does something special on right clicking, he will have one of those. Return
+ * True if something happen and false if it don't. This is for ITEMS, not BLOCKS
*/
@Override
- public boolean onItemUse(
- ItemStack par1ItemStack,
- EntityPlayer par2EntityPlayer,
- World par3World,
- int par4,
- int par5,
- int par6,
- int par7,
- float par8,
- float par9,
- float par10) {
+ public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4,
+ int par5, int par6, int par7, float par8, float par9, float par10) {
if (par7 != 1) {
return false;
} else {
@@ -50,8 +43,7 @@ public class ItemBlockDoor extends ItemBlock {
return false;
} else {
int i1 = MathHelper.floor_double(
- (double) ((par2EntityPlayer.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D)
- & 3;
+ (double) ((par2EntityPlayer.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3;
byte b0 = 0;
byte b1 = 0;
@@ -72,17 +64,9 @@ public class ItemBlockDoor extends ItemBlock {
}
int i2 = (par3World.getBlock(par4 - b0, par5, par6 - b1).isNormalCube() ? 1 : 0)
- + (par3World
- .getBlock(par4 - b0, par5 + 1, par6 - b1)
- .isNormalCube()
- ? 1
- : 0);
+ + (par3World.getBlock(par4 - b0, par5 + 1, par6 - b1).isNormalCube() ? 1 : 0);
int j1 = (par3World.getBlock(par4 + b0, par5, par6 + b1).isNormalCube() ? 1 : 0)
- + (par3World
- .getBlock(par4 + b0, par5 + 1, par6 + b1)
- .isNormalCube()
- ? 1
- : 0);
+ + (par3World.getBlock(par4 + b0, par5 + 1, par6 + b1).isNormalCube() ? 1 : 0);
boolean flag = par3World.getBlock(par4 - b0, par5, par6 - b1) == block
|| par3World.getBlock(par4 - b0, par5 + 1, par6 - b1) == block;
boolean flag1 = par3World.getBlock(par4 + b0, par5, par6 + b1) == block
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java
index 5c307a6900..c730deb436 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java
@@ -1,14 +1,16 @@
package gtPlusPlus.core.item.base.itemblock;
-import gtPlusPlus.core.block.general.BlockTankXpConverter;
-import gtPlusPlus.core.creative.AddToCreativeTab;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import gtPlusPlus.core.block.general.BlockTankXpConverter;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+
public class ItemBlockEntityBase extends ItemBlock {
public ItemBlockEntityBase(final Block block) {
@@ -23,14 +25,16 @@ public class ItemBlockEntityBase extends ItemBlock {
return super.getColorFromItemStack(p_82790_1_, p_82790_2_);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public final void addInformation(
- final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+ public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list,
+ final boolean bool) {
if (Block.getBlockFromItem(stack.getItem()) instanceof BlockTankXpConverter) {
- /*list.add(EnumChatFormatting.GRAY+"Can convert Liquid Xp to Mob Essence and back.");
- list.add(EnumChatFormatting.GRAY+"Right click with a Screwdriver to change mode.");
- list.add(EnumChatFormatting.GRAY+"Shift+Right click to view tank information.");*/
+ /*
+ * list.add(EnumChatFormatting.GRAY+"Can convert Liquid Xp to Mob Essence and back.");
+ * list.add(EnumChatFormatting.GRAY+"Right click with a Screwdriver to change mode.");
+ * list.add(EnumChatFormatting.GRAY+"Shift+Right click to view tank information.");
+ */
list.add(EnumChatFormatting.GRAY + "Currently disabled, Use a GT Brewery instead. (New Recipes Added!)");
}
super.addInformation(stack, aPlayer, list, bool);
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index aa4f26b473..4798434492 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -1,15 +1,8 @@
package gtPlusPlus.core.item.base.itemblock;
-import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
-import gtPlusPlus.core.block.base.BlockBaseModular;
-import gtPlusPlus.core.block.base.BlockBaseOre;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialStack;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-import gtPlusPlus.core.util.sys.KeyboardUtils;
import java.util.HashMap;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -18,6 +11,15 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
+import gtPlusPlus.core.block.base.BlockBaseModular;
+import gtPlusPlus.core.block.base.BlockBaseOre;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
+
public class ItemBlockGtBlock extends ItemBlock {
public static HashMap<String, String> sNameCache = new HashMap<String, String>();
@@ -71,8 +73,7 @@ public class ItemBlockGtBlock extends ItemBlock {
}
public String getUnlocalizedBlockName() {
- return "block." + mMaterial.getUnlocalizedName() + "."
- + this.thisBlockType.name().toLowerCase();
+ return "block." + mMaterial.getUnlocalizedName() + "." + this.thisBlockType.name().toLowerCase();
}
public String GetProperName() {
@@ -89,7 +90,8 @@ public class ItemBlockGtBlock extends ItemBlock {
// Logger.INFO("Unlocal Name: "+this.getUnlocalizedName());
// String aFormattedLangName = GetProperName();
// return
- // GT_LanguageManager.addStringLocalization("block."+mMaterial.getUnlocalizedName()+"."+this.thisBlockType.name().toLowerCase()+".name", aFormattedLangName);
+ // GT_LanguageManager.addStringLocalization("block."+mMaterial.getUnlocalizedName()+"."+this.thisBlockType.name().toLowerCase()+".name",
+ // aFormattedLangName);
}
public int getRenderColor(final int aMeta) {
@@ -128,8 +130,10 @@ public class ItemBlockGtBlock extends ItemBlock {
list.add("- " + mMaterial.getLocalizedName());
} else {
for (MaterialStack m : mMaterial.getComposites()) {
- list.add("- " + m.getStackMaterial().getLocalizedName() + " x"
- + m.getPartsPerOneHundred());
+ list.add(
+ "- " + m.getStackMaterial().getLocalizedName()
+ + " x"
+ + m.getPartsPerOneHundred());
}
}
}
@@ -156,11 +160,7 @@ public class ItemBlockGtBlock extends ItemBlock {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (!isModular && !isOre) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
index 81bc47daa3..2c1dc932ff 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
@@ -1,12 +1,7 @@
package gtPlusPlus.core.item.base.itemblock;
-import gtPlusPlus.core.block.base.BlockBaseModular;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialStack;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-import gtPlusPlus.core.util.sys.KeyboardUtils;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -15,6 +10,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gtPlusPlus.core.block.base.BlockBaseModular;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
+
public class ItemBlockGtFrameBox extends ItemBlock {
protected int blockColour;
@@ -79,11 +81,7 @@ public class ItemBlockGtFrameBox extends ItemBlock {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (this.sRadiation > 0) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
index dd2307d834..f0f14c264d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
@@ -1,19 +1,22 @@
package gtPlusPlus.core.item.base.itemblock;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.api.objects.data.AutoMap;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlockWithMetadata;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class ItemBlockMeta extends ItemBlockWithMetadata {
+
private final Block mBlock;
private HashMap<Integer, AutoMap<String>> aTooltips = new LinkedHashMap<Integer, AutoMap<String>>();
@@ -28,7 +31,7 @@ public class ItemBlockMeta extends ItemBlockWithMetadata {
}
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
Block aThis = Block.getBlockFromItem(stack.getItem());
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java
index fbaa9be8a3..abbdd61ff1 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java
@@ -1,11 +1,7 @@
package gtPlusPlus.core.item.base.itemblock;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.tileentities.base.TileEntityBase;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -15,6 +11,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.tileentities.base.TileEntityBase;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class ItemBlockNBT extends ItemBlock {
protected final int mID;
@@ -71,18 +73,8 @@ public class ItemBlockNBT extends ItemBlock {
}
@Override
- public boolean placeBlockAt(
- ItemStack aStack,
- EntityPlayer aPlayer,
- World aWorld,
- int aX,
- int aY,
- int aZ,
- int side,
- float hitX,
- float hitY,
- float hitZ,
- int aMeta) {
+ public boolean placeBlockAt(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int side,
+ float hitX, float hitY, float hitZ, int aMeta) {
if (!(aWorld.setBlock(aX, aY, aZ, this.field_150939_a, 0, 3))) {
return false;
}
@@ -95,8 +87,8 @@ public class ItemBlockNBT extends ItemBlock {
if (tTileEntity.isServerSide()) {
Logger.INFO("Setting Tile Entity information");
NBTTagCompound aNBT = GT_Utility.ItemNBT.getNBT(aStack);
- tTileEntity.setOwnerInformation(
- aNBT.getString("mOwner"), aNBT.getString("mUUID"), aNBT.getBoolean("mOP"));
+ tTileEntity
+ .setOwnerInformation(aNBT.getString("mOwner"), aNBT.getString("mUUID"), aNBT.getBoolean("mOP"));
}
}
return true;
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
index cc5bcf1222..51efe4cfd4 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
@@ -1,18 +1,9 @@
package gtPlusPlus.core.item.base.itemblock;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.block.base.BlockBaseOre;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialStack;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-import gtPlusPlus.core.util.sys.KeyboardUtils;
-import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -21,6 +12,17 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.block.base.BlockBaseOre;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.material.nuclear.FLUORIDES;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
+import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer;
+
public class ItemBlockOre extends ItemBlock {
private final BlockBaseOre mThisOre;
@@ -47,8 +49,7 @@ public class ItemBlockOre extends ItemBlock {
return this.mThisColour;
}
- private static Map<String, AutoMap<String>> mMapOreBlockItemToDimName =
- new LinkedHashMap<String, AutoMap<String>>();
+ private static Map<String, AutoMap<String>> mMapOreBlockItemToDimName = new LinkedHashMap<String, AutoMap<String>>();
private static boolean mInitOres_Everglades = false;
private AutoMap<String> mDimsForThisOre = new AutoMap<String>();
@@ -57,10 +58,9 @@ public class ItemBlockOre extends ItemBlock {
if (!mInitOres_Everglades) {
for (WorldGen_GT_Ore_Layer f : gtPlusPlus.everglades.gen.gt.WorldGen_Ores.validOreveins.values()) {
- Material[] m2 = new Material[] {f.mPrimary, f.mSecondary, f.mBetween, f.mSporadic};
+ Material[] m2 = new Material[] { f.mPrimary, f.mSecondary, f.mBetween, f.mSporadic };
for (Material m1 : m2) {
- AutoMap<String> aMap = mMapOreBlockItemToDimName.get(
- m1.getUnlocalizedName().toLowerCase());
+ AutoMap<String> aMap = mMapOreBlockItemToDimName.get(m1.getUnlocalizedName().toLowerCase());
if (aMap == null) {
aMap = new AutoMap<String>();
}
@@ -87,8 +87,11 @@ public class ItemBlockOre extends ItemBlock {
* Tooltip Handler for Ores
*/
if (this.mThisMaterial == FLUORIDES.FLUORITE) {
- list.add("Mined from Sandstone with a 1/" + (CORE.ConfigSwitches.chanceToDropFluoriteOre * 20)
- + " chance, or Limestone with a 1/" + (CORE.ConfigSwitches.chanceToDropFluoriteOre) + " chance.");
+ list.add(
+ "Mined from Sandstone with a 1/" + (CORE.ConfigSwitches.chanceToDropFluoriteOre * 20)
+ + " chance, or Limestone with a 1/"
+ + (CORE.ConfigSwitches.chanceToDropFluoriteOre)
+ + " chance.");
}
if (this.mThisMaterial != null) {
@@ -114,8 +117,8 @@ public class ItemBlockOre extends ItemBlock {
}
if (mDimsForThisOre.isEmpty()) {
- AutoMap<String> A = mMapOreBlockItemToDimName.get(
- this.mThisMaterial.getUnlocalizedName().toLowerCase());
+ AutoMap<String> A = mMapOreBlockItemToDimName
+ .get(this.mThisMaterial.getUnlocalizedName().toLowerCase());
if (A != null) {
mDimsForThisOre = A;
}
@@ -138,18 +141,17 @@ public class ItemBlockOre extends ItemBlock {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (this.mThisMaterial != null) {
if (this.mThisRadiation > 0) {
if (entityHolding instanceof EntityPlayer) {
if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) {
EntityUtils.applyRadiationDamageToEntity(
- iStack.stackSize, this.mThisMaterial.vRadiationLevel, world, entityHolding);
+ iStack.stackSize,
+ this.mThisMaterial.vRadiationLevel,
+ world,
+ entityHolding);
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
index 4818a3cff6..414fd8c13b 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
@@ -1,15 +1,18 @@
package gtPlusPlus.core.item.base.itemblock;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlockWithMetadata;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class ItemBlockRoundRobinator extends ItemBlockWithMetadata {
+
private final Block mBlock;
public ItemBlockRoundRobinator(final Block aBlock) {
@@ -17,7 +20,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata {
this.mBlock = aBlock;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add("Attempts to output items evenly on all four horizontal planes");
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java
index 6313bf8373..b4c2d1c244 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java
@@ -1,14 +1,16 @@
package gtPlusPlus.core.item.base.itemblock;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.common.registry.EntityRegistry;
+import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
+import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
+
public class ItemBlockSpawner extends ItemBlockMeta {
private final Block mBlock;
@@ -24,13 +26,12 @@ public class ItemBlockSpawner extends ItemBlockMeta {
int x = this.getMetadata(aStack.getItemDamage());
if (x >= 0) {
try {
- EntityRegistration x1 =
- EntityRegistry.instance().lookupModSpawn(TileEntityGenericSpawner.mSpawners.get(x), false);
+ EntityRegistration x1 = EntityRegistry.instance()
+ .lookupModSpawn(TileEntityGenericSpawner.mSpawners.get(x), false);
if (x1 != null) {
aList.add(EnumChatFormatting.RED + x1.getEntityName());
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
}
super.addInformation(aStack, aPlayer, aList, aBool);
diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
index a96df2212c..80cda709cc 100644
--- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
+++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
@@ -1,15 +1,7 @@
package gtPlusPlus.core.item.base.misc;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -19,6 +11,16 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class BaseItemMisc extends Item {
public final String displayName;
@@ -27,11 +29,7 @@ public class BaseItemMisc extends Item {
public final Object componentColour;
public final String[] description;
- public BaseItemMisc(
- final String displayName,
- final short[] RGB,
- final int maxStackSize,
- final MiscTypes miscType,
+ public BaseItemMisc(final String displayName, final short[] RGB, final int maxStackSize, final MiscTypes miscType,
String[] description) {
// Set-up the Misc Generic Item
@@ -92,10 +90,10 @@ public class BaseItemMisc extends Item {
return (pass == 0) ? itemIcon : secondIcon;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public final void addInformation(
- final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+ public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list,
+ final boolean bool) {
if (this.description != null) { // Incase I don't add one
if (this.description.length > 0) { // Incase I somehow add a blank one
for (int x = 0; x < this.description.length; x++) {
@@ -117,16 +115,13 @@ public class BaseItemMisc extends Item {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
// Nothing Fancy here yet.
}
public static enum MiscTypes {
+
POTION("Potion", " Potion", "potion"),
KEY("Key", " Key", "key"),
BIGKEY("KeyBig", " Big Key", "bosskey"),
diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java
index 2b26bf0db8..fdcb8a8b7f 100644
--- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java
+++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java
@@ -1,17 +1,19 @@
package gtPlusPlus.core.item.base.misc;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.CoreItem;
-import gtPlusPlus.core.lib.CORE;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+
public abstract class BaseItemParticle extends CoreItem {
protected static final Map<Integer, Integer> aColourMap = new LinkedHashMap<Integer, Integer>();
@@ -43,7 +45,7 @@ public abstract class BaseItemParticle extends CoreItem {
return super.getColorFromItemStack(stack, aaa);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (int i = 0; i < aMaxCount; i++) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
index 5d395aacb1..90235a18b3 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
@@ -1,10 +1,11 @@
package gtPlusPlus.core.item.base.ore;
+import net.minecraft.item.Item;
+
import gregtech.api.enums.Materials;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import net.minecraft.item.Item;
public class BaseItemMilledOre extends BaseOreComponent {
diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 48d8498380..fb2101b84d 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -1,5 +1,17 @@
package gtPlusPlus.core.item.base.ore;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -14,16 +26,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.EntityUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
public class BaseOreComponent extends Item {
@@ -52,7 +54,8 @@ public class BaseOreComponent extends Item {
GameRegistry.registerItem(this, this.unlocalName);
registerComponent();
GT_OreDictUnificator.registerOre(
- componentType.getComponent() + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
+ componentType.getComponent() + material.getUnlocalizedName(),
+ ItemUtils.getSimpleStack(this));
if (LoadedMods.Thaumcraft) {
// ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this),
// TC_Aspect_Wrapper.generate(TC_Aspects.METALLUM.mAspect), 1);
@@ -94,8 +97,11 @@ public class BaseOreComponent extends Item {
ItemStack x = aMap.get(aKey);
if (x == null) {
aMap.put(aKey, ItemUtils.getSimpleStack(this));
- Logger.MATERIALS("Registering a material component. Item: [" + componentMaterial.getUnlocalizedName()
- + "] Map: [" + aKey + "]");
+ Logger.MATERIALS(
+ "Registering a material component. Item: [" + componentMaterial.getUnlocalizedName()
+ + "] Map: ["
+ + aKey
+ + "]");
Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap);
return true;
} else {
@@ -105,19 +111,19 @@ public class BaseOreComponent extends Item {
}
}
- /*@Override
- public String getItemStackDisplayName(final ItemStack p_77653_1_) {
- return (this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME);
- }*/
+ /*
+ * @Override public String getItemStackDisplayName(final ItemStack p_77653_1_) { return
+ * (this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME); }
+ */
public final String getMaterialName() {
return this.materialName;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public final void addInformation(
- final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+ public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list,
+ final boolean bool) {
if (this.materialName != null && !this.materialName.equals("")) {
if (this.componentMaterial != null) {
if (!this.componentMaterial.vChemicalFormula.contains("?")) {
@@ -147,17 +153,16 @@ public class BaseOreComponent extends Item {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (this.componentMaterial != null) {
if (entityHolding instanceof EntityPlayer) {
if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) {
EntityUtils.applyRadiationDamageToEntity(
- iStack.stackSize, this.componentMaterial.vRadiationLevel, world, entityHolding);
+ iStack.stackSize,
+ this.componentMaterial.vRadiationLevel,
+ world,
+ entityHolding);
}
}
}
@@ -165,6 +170,7 @@ public class BaseOreComponent extends Item {
/**
* Rendering Related
+ *
* @author Alkalus
*
*/
@@ -186,19 +192,23 @@ public class BaseOreComponent extends Item {
this.overlay = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/milled_OVERLAY");
}
} else if (CORE.ConfigSwitches.useGregtechTextures) {
- // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" is using `"+"gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the layer 0 texture path.");
- this.base = par1IconRegister.registerIcon(
- "gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME);
+ // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+"
+ // is using `"+"gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the
+ // layer 0 texture path.");
+ this.base = par1IconRegister
+ .registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME);
if (this.componentType.hasOverlay()) {
- // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" is using `"+"gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"_OVERLAY"+"' as the layer 1 texture path.");
+ // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+"
+ // is using `"+"gregtech" + ":" + "materialicons/METALLIC/" +
+ // this.componentType.COMPONENT_NAME+"_OVERLAY"+"' as the layer 1 texture path.");
this.overlay = par1IconRegister.registerIcon(
"gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME + "_OVERLAY");
}
} else {
this.base = par1IconRegister.registerIcon(CORE.MODID + ":" + "item" + this.componentType.getComponent());
if (this.componentType.hasOverlay()) {
- this.overlay = par1IconRegister.registerIcon(
- CORE.MODID + ":" + "item" + this.componentType.getComponent() + "_Overlay");
+ this.overlay = par1IconRegister
+ .registerIcon(CORE.MODID + ":" + "item" + this.componentType.getComponent() + "_Overlay");
}
}
}
@@ -230,6 +240,7 @@ public class BaseOreComponent extends Item {
}
public static enum ComponentTypes {
+
DUST("dust", "", " Dust", true),
DUSTIMPURE("dustImpure", "Impure ", " Dust", true),
DUSTPURE("dustPure", "Purified ", " Dust", true),
@@ -243,8 +254,8 @@ public class BaseOreComponent extends Item {
private String DISPLAY_NAME;
private boolean HAS_OVERLAY;
- private ComponentTypes(
- final String LocalName, final String prefix, final String DisplayName, final boolean overlay) {
+ private ComponentTypes(final String LocalName, final String prefix, final String DisplayName,
+ final boolean overlay) {
this.COMPONENT_NAME = LocalName;
this.PREFIX = prefix;
this.DISPLAY_NAME = DisplayName;
diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
index 7737409209..fbfa859a17 100644
--- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
+++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
@@ -11,14 +11,13 @@ public class BaseItemPlate extends BaseItemComponent {
super(material, BaseItemComponent.ComponentTypes.PLATE);
}
- public BaseItemPlate(
- final String unlocalizedName,
- final String materialName,
- final MaterialState state,
- final short[] colour,
- final int tier,
- final int sRadioactivity) {
- this(MaterialUtils.generateQuickMaterial(
- materialName, state, new short[] {colour[0], colour[1], colour[2], 0}, sRadioactivity));
+ public BaseItemPlate(final String unlocalizedName, final String materialName, final MaterialState state,
+ final short[] colour, final int tier, final int sRadioactivity) {
+ this(
+ MaterialUtils.generateQuickMaterial(
+ materialName,
+ state,
+ new short[] { colour[0], colour[1], colour[2], 0 },
+ sRadioactivity));
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java
index 79e898cc6a..dcb133782a 100644
--- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java
+++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.item.base.plates;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
public class BaseItemPlateHeavy extends BaseItemComponent {
diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
index 87fb769525..2edf3b4612 100644
--- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
+++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java
@@ -1,5 +1,13 @@
package gtPlusPlus.core.item.base.plates;
+import java.util.List;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -8,12 +16,6 @@ import gtPlusPlus.core.util.data.StringUtils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.EntityUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.List;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class BaseItemPlate_OLD extends Item {
@@ -23,17 +25,13 @@ public class BaseItemPlate_OLD extends Item {
protected final String unlocalName;
protected final String chemicalNotation;
- public BaseItemPlate_OLD(
- final String unlocalizedName, final String materialName, final int colour, final int sRadioactivity) {
+ public BaseItemPlate_OLD(final String unlocalizedName, final String materialName, final int colour,
+ final int sRadioactivity) {
this(unlocalizedName, materialName, "NullFormula", colour, sRadioactivity);
}
- public BaseItemPlate_OLD(
- final String unlocalizedName,
- final String materialName,
- final String mChemicalFormula,
- final int colour,
- final int sRadioactivity) {
+ public BaseItemPlate_OLD(final String unlocalizedName, final String materialName, final String mChemicalFormula,
+ final int colour, final int sRadioactivity) {
this.setUnlocalizedName("itemPlate" + unlocalizedName);
this.setCreativeTab(AddToCreativeTab.tabMisc);
this.unlocalName = "itemPlate" + unlocalizedName;
@@ -77,16 +75,12 @@ public class BaseItemPlate_OLD extends Item {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.sRadiation, world, entityHolding);
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
if (this.sRadiation > 0) {
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
index 842b012e07..126c4dbe54 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java
@@ -1,11 +1,26 @@
package gtPlusPlus.core.item.bauble;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
+import net.minecraftforge.event.entity.living.LivingAttackEvent;
+
import baubles.api.BaubleType;
import baubles.api.IBauble;
import baubles.common.container.InventoryBaubles;
import baubles.common.lib.PlayerHandler;
+
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
+
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -13,23 +28,10 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT;
import gtPlusPlus.core.util.minecraft.NBTUtils;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.attributes.AttributeModifier;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.DamageSource;
-import net.minecraft.world.World;
-import net.minecraftforge.event.entity.living.LivingAttackEvent;
@Optional.InterfaceList(
- value = {
- @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
- @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")
- })
+ value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
+ @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") })
public class BaseBauble extends Item implements IBauble {
/**
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
index c682c4a237..bc2757a24a 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
@@ -1,17 +1,7 @@
package gtPlusPlus.core.item.bauble;
-import baubles.api.BaubleType;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
-import ic2.api.item.ElectricItem;
-import ic2.api.item.IElectricItem;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -23,6 +13,18 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
+import baubles.api.BaubleType;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
+import ic2.api.item.ElectricItem;
+import ic2.api.item.IElectricItem;
+
public class BatteryPackBaseBauble extends ElectricBaseBauble {
public BatteryPackBaseBauble(int tier) {
@@ -52,11 +54,7 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World worldObj,
- final Entity player,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
final boolean p_77663_5_) {
super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_);
}
@@ -96,8 +94,14 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
String aEUT = aEU + "/t";
list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY);
- list.add(EnumChatFormatting.GREEN + aString2 + " " + (int) getTransferLimit(stack) + aEUT + " " + aString3
- + EnumChatFormatting.GRAY);
+ list.add(
+ EnumChatFormatting.GREEN + aString2
+ + " "
+ + (int) getTransferLimit(stack)
+ + aEUT
+ + " "
+ + aString3
+ + EnumChatFormatting.GRAY);
list.add(EnumChatFormatting.GREEN + aString4 + EnumChatFormatting.GRAY);
super.addInformation(stack, aPlayer, list, bool);
}
@@ -151,14 +155,27 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
if (ElectricItem.manager.getCharge(aInvStack)
<= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
double d = ElectricItem.manager.charge(
- aInvStack, aTransferRate * 16, mTier, false, true);
+ aInvStack,
+ aTransferRate * 16,
+ mTier,
+ false,
+ true);
if (d > 0) {
d = ElectricItem.manager.charge(
- aInvStack, aTransferRate * 16, mTier, false, false);
+ aInvStack,
+ aTransferRate * 16,
+ mTier,
+ false,
+ false);
ElectricItem.manager.discharge(
- aBaubleStack, d, mTier, false, true, false);
+ aBaubleStack,
+ d,
+ mTier,
+ false,
+ true,
+ false);
// Logger.INFO("Charging " + aInvStack.getDisplayName() + "
- // | " + d + " | "+electricItem.getMaxCharge(aInvStack));
+ // | " + d + " | "+electricItem.getMaxCharge(aInvStack));
}
} else {
// Logger.INFO("5");
@@ -205,15 +222,24 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
if (ElectricItem.manager.getCharge(aBaubleStack) >= aTransferRate) {
if (ElectricItem.manager.getCharge(aInvStack)
<= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
- double d = ElectricItem.manager.charge(
- aInvStack, aTransferRate, mTier, false, true);
+ double d = ElectricItem.manager
+ .charge(aInvStack, aTransferRate, mTier, false, true);
if (d > 0) {
d = ElectricItem.manager.charge(
- aInvStack, aTransferRate, mTier, false, false);
+ aInvStack,
+ aTransferRate,
+ mTier,
+ false,
+ false);
ElectricItem.manager.discharge(
- aBaubleStack, d, mTier, false, true, false);
+ aBaubleStack,
+ d,
+ mTier,
+ false,
+ true,
+ false);
// Logger.INFO("Charging " + aInvStack.getDisplayName() + "
- // | " + d + " | "+electricItem.getMaxCharge(aInvStack));
+ // | " + d + " | "+electricItem.getMaxCharge(aInvStack));
}
} else {
// Logger.INFO("5");
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
index 321b3515aa..14b38d3f7e 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
@@ -1,5 +1,17 @@
package gtPlusPlus.core.item.bauble;
+import java.util.List;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
import baubles.api.BaubleType;
import baubles.api.IBauble;
import cpw.mods.fml.common.Optional;
@@ -13,22 +25,10 @@ import gtPlusPlus.core.util.math.MathUtils;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import ic2.api.item.IElectricItemManager;
-import java.util.List;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
@Optional.InterfaceList(
- value = {
- @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
- @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")
- })
+ value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
+ @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") })
public abstract class ElectricBaseBauble extends BaseBauble implements IElectricItem, IElectricItemManager, IBauble {
public final int mTier;
@@ -72,11 +72,7 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World worldObj,
- final Entity player,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
final boolean p_77663_5_) {
super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_);
}
@@ -138,42 +134,52 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric
String aEUT = aEU + "/t";
list.add(EnumChatFormatting.GOLD + aEuInfo + EnumChatFormatting.GRAY);
- list.add(EnumChatFormatting.GRAY + aTier + ": [" + EnumChatFormatting.YELLOW + this.getTier(stack)
- + EnumChatFormatting.GRAY + "] " + aInputLimit + ": [" + EnumChatFormatting.YELLOW
- + this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT + "]");
- list.add(EnumChatFormatting.GRAY + aCurrentPower + ": [" + EnumChatFormatting.YELLOW
- + (long) this.getCharge(stack)
- + EnumChatFormatting.GRAY + aEU + "] [" + EnumChatFormatting.YELLOW
- + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY
- + "%]");
+ list.add(
+ EnumChatFormatting.GRAY + aTier
+ + ": ["
+ + EnumChatFormatting.YELLOW
+ + this.getTier(stack)
+ + EnumChatFormatting.GRAY
+ + "] "
+ + aInputLimit
+ + ": ["
+ + EnumChatFormatting.YELLOW
+ + this.getTransferLimit(stack)
+ + EnumChatFormatting.GRAY
+ + aEUT
+ + "]");
+ list.add(
+ EnumChatFormatting.GRAY + aCurrentPower
+ + ": ["
+ + EnumChatFormatting.YELLOW
+ + (long) this.getCharge(stack)
+ + EnumChatFormatting.GRAY
+ + aEU
+ + "] ["
+ + EnumChatFormatting.YELLOW
+ + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))
+ + EnumChatFormatting.GRAY
+ + "%]");
super.addInformation(stack, aPlayer, list, bool);
}
@Override
- public final double charge(
- final ItemStack stack,
- final double amount,
- final int tier,
- final boolean ignoreTransferLimit,
- final boolean simulate) {
- /*if (!simulate) {
- ElectricItem.manager.charge(stack, amount, tier, true, simulate);
- }*/
+ public final double charge(final ItemStack stack, final double amount, final int tier,
+ final boolean ignoreTransferLimit, final boolean simulate) {
+ /*
+ * if (!simulate) { ElectricItem.manager.charge(stack, amount, tier, true, simulate); }
+ */
return ElectricItem.manager.charge(stack, amount, tier, true, simulate);
}
@Override
- public final double discharge(
- final ItemStack stack,
- final double amount,
- final int tier,
- final boolean ignoreTransferLimit,
- final boolean externally,
- final boolean simulate) {
- /*if (!simulate) {
- ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
- }*/
+ public final double discharge(final ItemStack stack, final double amount, final int tier,
+ final boolean ignoreTransferLimit, final boolean externally, final boolean simulate) {
+ /*
+ * if (!simulate) { ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally,
+ * simulate); }
+ */
return ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
}
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
index e0f8cc6e27..5886717522 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
@@ -1,16 +1,11 @@
package gtPlusPlus.core.item.bauble;
-import baubles.api.BaubleType;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.DevHelper;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.UUID;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -20,6 +15,13 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import baubles.api.BaubleType;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.DevHelper;
+
public class FireProtectionBauble extends BaseBauble {
public static HashMap<UUID, Boolean> mDataMap = new HashMap<UUID, Boolean>();
@@ -28,8 +30,8 @@ public class FireProtectionBauble extends BaseBauble {
private static Field isImmuneToFire;
static {
- isImmuneToFire = ReflectionUtils.getField(
- Entity.class, DevHelper.isObfuscatedEnvironment() ? "func_70045_F" : "isImmuneToFire");
+ isImmuneToFire = ReflectionUtils
+ .getField(Entity.class, DevHelper.isObfuscatedEnvironment() ? "func_70045_F" : "isImmuneToFire");
}
public static boolean fireImmune(Entity aEntity) {
@@ -39,8 +41,7 @@ public class FireProtectionBauble extends BaseBauble {
public static boolean setEntityImmuneToFire(Entity aEntity, boolean aImmune) {
try {
return ReflectionUtils.setField(aEntity, isImmuneToFire, aImmune);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return false;
}
@@ -59,11 +60,7 @@ public class FireProtectionBauble extends BaseBauble {
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World worldObj,
- final Entity player,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
final boolean p_77663_5_) {
super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_);
}
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java
index 8e4769860c..e38c1084d5 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java
@@ -1,9 +1,7 @@
package gtPlusPlus.core.item.bauble;
-import baubles.api.BaubleType;
-import com.google.common.collect.Multimap;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
@@ -11,6 +9,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumChatFormatting;
+import baubles.api.BaubleType;
+
+import com.google.common.collect.Multimap;
+import gtPlusPlus.core.lib.CORE;
+
public class HealthBoostBauble extends BaseBauble {
public HealthBoostBauble() {
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java
index bbedb9feb4..630cbeff95 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java
@@ -1,16 +1,7 @@
package gtPlusPlus.core.item.bauble;
-import baubles.api.BaubleType;
-import com.google.common.collect.Multimap;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.minecraft.ModularArmourUtils;
-import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT;
-import gtPlusPlus.core.util.minecraft.ModularArmourUtils.Modifiers;
-import gtPlusPlus.core.util.minecraft.NBTUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
@@ -22,8 +13,22 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
+
import org.lwjgl.input.Keyboard;
+import baubles.api.BaubleType;
+
+import com.google.common.collect.Multimap;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.minecraft.ModularArmourUtils;
+import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT;
+import gtPlusPlus.core.util.minecraft.ModularArmourUtils.Modifiers;
+import gtPlusPlus.core.util.minecraft.NBTUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class ModularBauble extends BaseBauble {
@SideOnly(Side.CLIENT)
@@ -130,97 +135,179 @@ public class ModularBauble extends BaseBauble {
if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_HOLY)) > 0) {}
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
// Bauble Type
if (ModularArmourUtils.getBaubleType(stack) == BaubleType.AMULET) {
- list.add(EnumChatFormatting.GRAY + "Current Form: " + EnumChatFormatting.RED + "Amulet"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Current Form: "
+ + EnumChatFormatting.RED
+ + "Amulet"
+ + EnumChatFormatting.GRAY
+ + ".");
list.add(EnumChatFormatting.GRAY + "You can change this into a Ring or a Belt.");
} else if (ModularArmourUtils.getBaubleType(stack) == BaubleType.RING) {
- list.add(EnumChatFormatting.GRAY + "Current Form: " + EnumChatFormatting.RED + "Ring"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Current Form: "
+ + EnumChatFormatting.RED
+ + "Ring"
+ + EnumChatFormatting.GRAY
+ + ".");
list.add(EnumChatFormatting.GRAY + "You can change this into an Amulet or a Belt.");
} else if (ModularArmourUtils.getBaubleType(stack) == BaubleType.BELT) {
- list.add(EnumChatFormatting.GRAY + "Current Form: " + EnumChatFormatting.RED + "Belt"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Current Form: "
+ + EnumChatFormatting.RED
+ + "Belt"
+ + EnumChatFormatting.GRAY
+ + ".");
list.add(EnumChatFormatting.GRAY + "You can change this into a Ring or an Amulet.");
}
// Get Stats
int mStatlevel = 0;
if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_DAMAGE)) > 0) {
- list.add(EnumChatFormatting.GRAY + "Damage Boost: " + EnumChatFormatting.DARK_RED + mStatlevel
- + EnumChatFormatting.GRAY + "/100.");
+ list.add(
+ EnumChatFormatting.GRAY + "Damage Boost: "
+ + EnumChatFormatting.DARK_RED
+ + mStatlevel
+ + EnumChatFormatting.GRAY
+ + "/100.");
}
if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_HP)) > 0) {
- list.add(EnumChatFormatting.GRAY + "Health Boost: " + EnumChatFormatting.RED + mStatlevel
- + EnumChatFormatting.GRAY + "/100. Bonus " + (mStatlevel / 5) + " hearts.");
+ list.add(
+ EnumChatFormatting.GRAY + "Health Boost: "
+ + EnumChatFormatting.RED
+ + mStatlevel
+ + EnumChatFormatting.GRAY
+ + "/100. Bonus "
+ + (mStatlevel / 5)
+ + " hearts.");
}
if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_SPEED)) > 0) {
- list.add(EnumChatFormatting.GRAY + "Speed Boost: " + EnumChatFormatting.WHITE + mStatlevel
- + EnumChatFormatting.GRAY + "/100.");
+ list.add(
+ EnumChatFormatting.GRAY + "Speed Boost: "
+ + EnumChatFormatting.WHITE
+ + mStatlevel
+ + EnumChatFormatting.GRAY
+ + "/100.");
}
if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_MINING)) > 0) {
- list.add(EnumChatFormatting.GRAY + "Mining Boost: " + EnumChatFormatting.DARK_GRAY + mStatlevel
- + EnumChatFormatting.GRAY + "/100.");
+ list.add(
+ EnumChatFormatting.GRAY + "Mining Boost: "
+ + EnumChatFormatting.DARK_GRAY
+ + mStatlevel
+ + EnumChatFormatting.GRAY
+ + "/100.");
}
if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_HOLY)) > 0) {
- list.add(EnumChatFormatting.GRAY + "Holy Boost: " + EnumChatFormatting.GOLD + mStatlevel
- + EnumChatFormatting.GRAY + "/100.");
+ list.add(
+ EnumChatFormatting.GRAY + "Holy Boost: "
+ + EnumChatFormatting.GOLD
+ + mStatlevel
+ + EnumChatFormatting.GRAY
+ + "/100.");
}
// Defence Boost
if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_DEF)) > 0) {
- list.add(EnumChatFormatting.GRAY + "Defence Boost: " + EnumChatFormatting.BLUE + mStatlevel
- + EnumChatFormatting.GRAY + "/100.");
+ list.add(
+ EnumChatFormatting.GRAY + "Defence Boost: "
+ + EnumChatFormatting.BLUE
+ + mStatlevel
+ + EnumChatFormatting.GRAY
+ + "/100.");
if ((Keyboard.isKeyDown(42)) || (Keyboard.isKeyDown(54))) {
if (mStatlevel >= 1) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Cactus"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Cactus"
+ + EnumChatFormatting.GRAY
+ + ".");
}
if (mStatlevel >= 10) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Falling Blocks"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Falling Blocks"
+ + EnumChatFormatting.GRAY
+ + ".");
}
if (mStatlevel >= 20) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Wall Suffocation"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Wall Suffocation"
+ + EnumChatFormatting.GRAY
+ + ".");
}
if (mStatlevel >= 35) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Drowning"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Drowning"
+ + EnumChatFormatting.GRAY
+ + ".");
}
if (mStatlevel >= 50) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Starvation"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Starvation"
+ + EnumChatFormatting.GRAY
+ + ".");
}
if (mStatlevel >= 60) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Falling"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Falling"
+ + EnumChatFormatting.GRAY
+ + ".");
}
if (mStatlevel >= 75) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Lava"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Lava"
+ + EnumChatFormatting.GRAY
+ + ".");
}
if (mStatlevel >= 80) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Magic"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Magic"
+ + EnumChatFormatting.GRAY
+ + ".");
}
if (mStatlevel >= 95) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Wither"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Wither"
+ + EnumChatFormatting.GRAY
+ + ".");
}
if (mStatlevel >= 100) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Fire"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Fire"
+ + EnumChatFormatting.GRAY
+ + ".");
}
if (mStatlevel >= 100) {
- list.add(EnumChatFormatting.GRAY + "Protected From: " + EnumChatFormatting.BLUE + "Void"
- + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Protected From: "
+ + EnumChatFormatting.BLUE
+ + "Void"
+ + EnumChatFormatting.GRAY
+ + ".");
}
} else {
@@ -230,8 +317,12 @@ public class ModularBauble extends BaseBauble {
if (NBTUtils.getBotanicaSoulboundOwner(stack) != null) {
if (!NBTUtils.getBotanicaSoulboundOwner(stack).equals("")) {
- list.add(EnumChatFormatting.GRAY + "Owner: " + EnumChatFormatting.GREEN
- + NBTUtils.getBotanicaSoulboundOwner(stack) + EnumChatFormatting.GRAY + ".");
+ list.add(
+ EnumChatFormatting.GRAY + "Owner: "
+ + EnumChatFormatting.GREEN
+ + NBTUtils.getBotanicaSoulboundOwner(stack)
+ + EnumChatFormatting.GRAY
+ + ".");
}
}
super.addInformation(stack, player, list, bool);
@@ -299,8 +390,7 @@ public class ModularBauble extends BaseBauble {
}
String mOwner;
- if (NBTUtils.getBotanicaSoulboundOwner(arg0) == null
- || NBTUtils.getBotanicaSoulboundOwner(arg0).equals("")) {
+ if (NBTUtils.getBotanicaSoulboundOwner(arg0) == null || NBTUtils.getBotanicaSoulboundOwner(arg0).equals("")) {
return true;
} else if ((mOwner = NBTUtils.getBotanicaSoulboundOwner(arg0)) != null) {
String mPlayerName = arg1.getCommandSenderName();
@@ -330,28 +420,14 @@ public class ModularBauble extends BaseBauble {
super.onEquipped(stack, entity);
}
- /*@Override
- @SideOnly(Side.CLIENT)
- public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
- if (usingItem == null) {
- return mfallback;
- }
- try {
- if (stack.getItemDamage() == 0) {
- return mfallback = mTextureAmulet;
- }
- else if (stack.getItemDamage() == 1) {
- return mfallback = mTextureRing;
- }
- else if (stack.getItemDamage() == 2) {
- return mfallback = mTextureBelt;
- } else {
- return mfallback = mTextureRing;
- }
- } catch (Throwable t) {
- return mfallback = mTextureRing;
- }
- }*/
+ /*
+ * @Override
+ * @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack
+ * usingItem, int useRemaining) { if (usingItem == null) { return mfallback; } try { if (stack.getItemDamage() == 0)
+ * { return mfallback = mTextureAmulet; } else if (stack.getItemDamage() == 1) { return mfallback = mTextureRing; }
+ * else if (stack.getItemDamage() == 2) { return mfallback = mTextureBelt; } else { return mfallback = mTextureRing;
+ * } } catch (Throwable t) { return mfallback = mTextureRing; } }
+ */
@Override
@SideOnly(Side.CLIENT)
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
index 5164ab5c19..f7740f73cc 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
@@ -1,16 +1,7 @@
package gtPlusPlus.core.item.bauble;
-import baubles.api.BaubleType;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.minecraft.AABB;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import ic2.api.item.ElectricItem;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
@@ -22,6 +13,17 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
+import baubles.api.BaubleType;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.AABB;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import ic2.api.item.ElectricItem;
+
public class MonsterKillerBaseBauble extends ElectricBaseBauble {
private final Class[] mTargets;
@@ -53,11 +55,7 @@ public class MonsterKillerBaseBauble extends ElectricBaseBauble {
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World worldObj,
- final Entity player,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
final boolean p_77663_5_) {
super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_);
}
@@ -90,13 +88,21 @@ public class MonsterKillerBaseBauble extends ElectricBaseBauble {
String aEUT = aEU + "/t";
list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY);
- list.add(EnumChatFormatting.GREEN + aString2 + " " + (int) getTransferLimit(stack) + aEUT + " " + aString3
- + EnumChatFormatting.GRAY);
+ list.add(
+ EnumChatFormatting.GREEN + aString2
+ + " "
+ + (int) getTransferLimit(stack)
+ + aEUT
+ + " "
+ + aString3
+ + EnumChatFormatting.GRAY);
list.add("");
list.add("" + EnumChatFormatting.GREEN + aString4 + " " + EnumChatFormatting.GRAY);
for (Class cz : mTargets) {
- list.add("- " + EnumChatFormatting.DARK_GREEN + cz.getSimpleName().replace("Entity", "")
- + EnumChatFormatting.GRAY);
+ list.add(
+ "- " + EnumChatFormatting.DARK_GREEN
+ + cz.getSimpleName().replace("Entity", "")
+ + EnumChatFormatting.GRAY);
}
super.addInformation(stack, aPlayer, list, bool);
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 017b23d02f..f60b1af543 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -1,5 +1,16 @@
package gtPlusPlus.core.item.chemistry;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gtPlusPlus.api.helpers.MaterialHelper;
@@ -19,15 +30,6 @@ import gtPlusPlus.plugin.agrichem.BioRecipes;
import gtPlusPlus.plugin.agrichem.item.algae.ItemAgrichemBase;
import gtPlusPlus.plugin.agrichem.item.algae.ItemAlgaeBase;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
public class AgriculturalChem extends ItemPackage {
@@ -83,31 +85,11 @@ public class AgriculturalChem extends ItemPackage {
public static Item mAgrichemItem1;
/*
- * 0 - Algae Biomass
- * 1 - Green Algae Biomass
- * 2 - Brown Algae Biomass
- * 3 - Golden-Brown Algae Biomass
- * 4 - Red Algae Biomass
- * 5 - Cellulose Fiber
- * 6 - Golden-Brown Cellulose Fiber
- * 7 - Red Cellulose Fiber
- * 8 - Compost
- * 9 - Wood Pellet
- * 10 - Wood Brick
- * 11 - Cellulose Pulp
- * 12 - Raw Bio Resin
- * 13 - Catalyst Carrier
- * 14 - Green Metal Catalyst
- * 15 - Alginic Acid
- * 16 - Alumina
- * 17 - Aluminium Pellet
- * 18 - Sodium Aluminate
- * 19 - Sodium Hydroxide // Exists in Newer GT
- * 20 - Sodium Carbonate
- * 21 - Lithium Chloride
- * 22 - Pellet Mold
- * 23 - Clean Aluminium Mix
- * 24 - Pinecone
+ * 0 - Algae Biomass 1 - Green Algae Biomass 2 - Brown Algae Biomass 3 - Golden-Brown Algae Biomass 4 - Red Algae
+ * Biomass 5 - Cellulose Fiber 6 - Golden-Brown Cellulose Fiber 7 - Red Cellulose Fiber 8 - Compost 9 - Wood Pellet
+ * 10 - Wood Brick 11 - Cellulose Pulp 12 - Raw Bio Resin 13 - Catalyst Carrier 14 - Green Metal Catalyst 15 -
+ * Alginic Acid 16 - Alumina 17 - Aluminium Pellet 18 - Sodium Aluminate 19 - Sodium Hydroxide // Exists in Newer GT
+ * 20 - Sodium Carbonate 21 - Lithium Chloride 22 - Pellet Mold 23 - Clean Aluminium Mix 24 - Pinecone
*/
public static ItemStack mAlgaeBiosmass;
@@ -141,11 +123,17 @@ public class AgriculturalChem extends ItemPackage {
public void items() {
// Nitrogen, Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
dustManureByproducts = ItemUtils.generateSpecialUseDusts(
- "ManureByproducts", "Manure Byproduct", "(N2H4O3)N2P2Ca3CuC8", Utils.rgbtoHexValue(110, 75, 25))[0];
+ "ManureByproducts",
+ "Manure Byproduct",
+ "(N2H4O3)N2P2Ca3CuC8",
+ Utils.rgbtoHexValue(110, 75, 25))[0];
// Basically Guano
dustOrganicFertilizer = ItemUtils.generateSpecialUseDusts(
- "OrganicFertilizer", "Organic Fertilizer", "Ca5(PO4)3(OH)", Utils.rgbtoHexValue(240, 240, 240))[0];
+ "OrganicFertilizer",
+ "Organic Fertilizer",
+ "Ca5(PO4)3(OH)",
+ Utils.rgbtoHexValue(240, 240, 240))[0];
// Dirt Dust :)
dustDirt = ItemUtils.generateSpecialUseDusts("Dirt", "Dried Earth", Utils.rgbtoHexValue(65, 50, 15))[0];
@@ -251,25 +239,43 @@ public class AgriculturalChem extends ItemPackage {
public void fluids() {
// Sewage
PoopJuice = FluidUtils.generateFluidNonMolten(
- "raw.waste", "Raw Animal Waste", 32 + 175, new short[] {100, 70, 30, 100}, null, null, 0, true);
+ "raw.waste",
+ "Raw Animal Waste",
+ 32 + 175,
+ new short[] { 100, 70, 30, 100 },
+ null,
+ null,
+ 0,
+ true);
// Sewage
ManureSlurry = FluidUtils.generateFluidNonMolten(
- "manure.slurry", "Manure Slurry", 39 + 175, new short[] {75, 45, 15, 100}, null, null, 0, true);
+ "manure.slurry",
+ "Manure Slurry",
+ 39 + 175,
+ new short[] { 75, 45, 15, 100 },
+ null,
+ null,
+ 0,
+ true);
// Sewage
FertileManureSlurry = FluidUtils.generateFluidNonMolten(
"fertile.manure.slurry",
"Fertile Manure Slurry",
45 + 175,
- new short[] {65, 50, 15, 100},
+ new short[] { 65, 50, 15, 100 },
null,
null,
0,
true);
RedMud = FluidUtils.generateFluidNoPrefix(
- "mud.red.slurry", "Red Mud Slurry", 32 + 175, new short[] {180, 35, 25, 100}, true);
+ "mud.red.slurry",
+ "Red Mud Slurry",
+ 32 + 175,
+ new short[] { 180, 35, 25, 100 },
+ true);
}
public AgriculturalChem() {
@@ -309,8 +315,8 @@ public class AgriculturalChem extends ItemPackage {
} else {
aTempBlood = FluidUtils.getWildcardFluidStack("hell_blood", 100);
if (aTempBlood == null) {
- CustomBlood = FluidUtils.generateFluidNoPrefix(
- "blood", "Blood", 32 + 175, new short[] {175, 25, 25, 100}, true);
+ CustomBlood = FluidUtils
+ .generateFluidNoPrefix("blood", "Blood", 32 + 175, new short[] { 175, 25, 25, 100 }, true);
} else {
CustomBlood = aTempBlood.getFluid();
}
@@ -416,7 +422,7 @@ public class AgriculturalChem extends ItemPackage {
aManureByprod1,
aManureByprod1,
aManureByprod1,
- new int[] {2000, 2000, 500, 500, 250, 250}, // Chances
+ new int[] { 2000, 2000, 500, 500, 250, 250 }, // Chances
10 * 20, // Time
30); // EU
@@ -433,7 +439,7 @@ public class AgriculturalChem extends ItemPackage {
aManureByprod1,
aManureByprod2,
aManureByprod2,
- new int[] {4000, 3000, 1250, 1250, 675, 675}, // Chances
+ new int[] { 4000, 3000, 1250, 1250, 675, 675 }, // Chances
20 * 20, // Time
60); // EU
}
@@ -463,7 +469,7 @@ public class AgriculturalChem extends ItemPackage {
aEmptyCells, // Output Item
20 * 8, // Time?
60 // Eu?
- );
+ );
}
}
}
@@ -522,8 +528,8 @@ public class AgriculturalChem extends ItemPackage {
* Forestry Support
*/
if (LoadedMods.Forestry) {
- Field aItemField =
- ReflectionUtils.getField(ReflectionUtils.getClass("forestry.plugins.PluginCore"), "items");
+ Field aItemField = ReflectionUtils
+ .getField(ReflectionUtils.getClass("forestry.plugins.PluginCore"), "items");
try {
Object aItemRegInstance = aItemField != null ? aItemField.get(aItemField) : null;
if (aItemRegInstance != null) {
@@ -533,15 +539,13 @@ public class AgriculturalChem extends ItemPackage {
aFertForestry = ItemUtils.getSimpleStack((Item) aItemInstance);
Item aForestryFert = (Item) aItemInstance;
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4)
- },
+ new ItemStack[] { CI.getNumberedCircuit(11),
+ ItemUtils.getSimpleStack(aDustOrganicFert, 4) },
null,
null,
- new ItemStack[] {
- ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod
- },
- new int[] {10000, 2000, 2000},
+ new ItemStack[] { ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod,
+ aManureByprod },
+ new int[] { 10000, 2000, 2000 },
20 * 20,
240);
}
@@ -557,20 +561,22 @@ public class AgriculturalChem extends ItemPackage {
if (LoadedMods.IndustrialCraft2) {
aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1);
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4)},
+ new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) },
null,
null,
- new ItemStack[] {
- ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod, aManureByprod
- },
- new int[] {10000, 2000, 2000},
+ new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod,
+ aManureByprod },
+ new int[] { 10000, 2000, 2000 },
20 * 20,
240);
}
// Dirt Production
CORE.RA.addCompressorRecipe(
- ItemUtils.getSimpleStack(dustDirt, 9), ItemUtils.getSimpleStack(Blocks.dirt), 20 * 2, 8);
+ ItemUtils.getSimpleStack(dustDirt, 9),
+ ItemUtils.getSimpleStack(Blocks.dirt),
+ 20 * 2,
+ 8);
// Centrifuge Byproducts
@@ -586,7 +592,7 @@ public class AgriculturalChem extends ItemPackage {
MaterialHelper.getDust(Materials.Carbon, 1),
ItemUtils.getSimpleStack(dustDirt, 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAmmoniumNitrate", 1),
- new int[] {2500, 2500, 750, 1000, 5000, 250}, // Chances
+ new int[] { 2500, 2500, 750, 1000, 5000, 250 }, // Chances
20 * 20, // Time
60); // EU
@@ -607,7 +613,7 @@ public class AgriculturalChem extends ItemPackage {
ELEMENT.getInstance().SULFUR.getSmallDust(1),
ELEMENT.getInstance().NICKEL.getTinyDust(1),
ELEMENT.getInstance().LEAD.getTinyDust(1),
- new int[] {3000, 3000, 2000, 2000, 1000, 1000},
+ new int[] { 3000, 3000, 2000, 2000, 1000, 1000 },
30 * 20,
30);
}
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
index a99386340d..dd27ca4e00 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -1,5 +1,9 @@
package gtPlusPlus.core.item.chemistry;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -11,9 +15,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public class CoalTar extends ItemPackage {
@@ -56,26 +57,24 @@ public class CoalTar extends ItemPackage {
// C2H6O = C2H4 + H2O
if (bioEth1 != null) {
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1)
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(17),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) },
bioEth1,
FluidUtils.getWater(1000),
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1)},
- new int[] {10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1) },
+ new int[] { 10000 },
120 * 20,
80);
}
if (bioEth2 != null) {
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(18), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1)
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(18),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) },
bioEth2,
FluidUtils.getWater(1000),
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1)},
- new int[] {10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1) },
+ new int[] { 10000 },
120 * 20,
80);
}
@@ -84,18 +83,13 @@ public class CoalTar extends ItemPackage {
public static void recipeCreateBenzene() {
// C7H8 + 2H = CH4 + C6H6
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellToluene", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2)
- },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellToluene", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) },
null,
null,
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellMethane", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 1),
- Materials.Empty.getCells(1)
- },
- new int[] {10000, 10000, 10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellMethane", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 1), Materials.Empty.getCells(1) },
+ new int[] { 10000, 10000, 10000 },
20 * 10,
90);
}
@@ -164,7 +158,7 @@ public class CoalTar extends ItemPackage {
600, // aDuration
64, // aEUt
false // Hidden?
- );
+ );
GT_Values.RA.addDistilleryRecipe(
CI.getNumberedCircuit(2), // Circuit
FluidUtils.getFluidStack("fluid.coaltar", 1000), // aInput
@@ -172,7 +166,7 @@ public class CoalTar extends ItemPackage {
300, // aDuration
30, // aEUt
false // Hidden?
- );
+ );
GT_Values.RA.addDistilleryRecipe(
CI.getNumberedCircuit(3), // Circuit
FluidUtils.getFluidStack("fluid.coaltar", 1000), // aInput
@@ -180,7 +174,7 @@ public class CoalTar extends ItemPackage {
450, // aDuration
86, // aEUt
false // Hidden?
- );
+ );
GT_Values.RA.addDistilleryRecipe(
CI.getNumberedCircuit(4), // Circuit
FluidUtils.getFluidStack("fluid.coaltar", 1000), // aInput
@@ -188,7 +182,7 @@ public class CoalTar extends ItemPackage {
900, // aDuration
30, // aEUt
false // Hidden?
- );
+ );
GT_Values.RA.addDistilleryRecipe(
CI.getNumberedCircuit(5), // Circuit
FluidUtils.getFluidStack("fluid.coaltar", 1500), // aInput
@@ -196,16 +190,15 @@ public class CoalTar extends ItemPackage {
300, // aDuration
64, // aEUt
false // Hidden?
- );
+ );
GT_Values.RA.addDistillationTowerRecipe(
FluidUtils.getFluidStack("fluid.coaltar", 1200),
- new FluidStack[] {
- FluidUtils.getFluidStack("fluid.coaltaroil", 500), // aOutput
- FluidUtils.getFluidStack("liquid_naphtha", 100), // aOutput
- FluidUtils.getFluidStack("fluid.ethylbenzene", 150), // aOutput
- FluidUtils.getFluidStack("fluid.anthracene", 50), // aOutput
- FluidUtils.getFluidStack("fluid.kerosene", 400), // aOutput
+ new FluidStack[] { FluidUtils.getFluidStack("fluid.coaltaroil", 500), // aOutput
+ FluidUtils.getFluidStack("liquid_naphtha", 100), // aOutput
+ FluidUtils.getFluidStack("fluid.ethylbenzene", 150), // aOutput
+ FluidUtils.getFluidStack("fluid.anthracene", 50), // aOutput
+ FluidUtils.getFluidStack("fluid.kerosene", 400), // aOutput
},
null,
900,
@@ -228,7 +221,7 @@ public class CoalTar extends ItemPackage {
1200, // aDuration
30, // aEUt
false // Hidden?
- );
+ );
}
private static void recipeNaphthaleneToPhthalicAcid() {
@@ -244,11 +237,11 @@ public class CoalTar extends ItemPackage {
private static void recipePhthalicAcidToPhthalicAnhydride() {
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedBioCircuit(15)},
+ new ItemStack[] { CI.getNumberedBioCircuit(15) },
FluidUtils.getFluidStack("fluid.phthalicacid", 1000),
null,
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15)},
- new int[] {10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15) },
+ new int[] { 10000 },
60 * 20,
120);
}
@@ -299,11 +292,17 @@ public class CoalTar extends ItemPackage {
// v - Dehydrate at 180C+
// Create Phthalic Anhydride
ItemUtils.generateSpecialUseDusts(
- "PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O", Utils.rgbtoHexValue(175, 175, 175));
+ "PhthalicAnhydride",
+ "Phthalic Anhydride",
+ "C6H4(CO)2O",
+ Utils.rgbtoHexValue(175, 175, 175));
// Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
ItemUtils.generateSpecialUseDusts(
- "LithiumHydroperoxide", "Lithium Hydroperoxide", "HLiO2", Utils.rgbtoHexValue(125, 125, 125));
+ "LithiumHydroperoxide",
+ "Lithium Hydroperoxide",
+ "HLiO2",
+ Utils.rgbtoHexValue(125, 125, 125));
// v - Dehydrate
// Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
// Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new
@@ -317,15 +316,20 @@ public class CoalTar extends ItemPackage {
public void fluids() {
// Create Coal Gas
- Coal_Gas = FluidUtils.generateFluidNonMolten(
- "CoalGas", "Coal Gas", 500, new short[] {48, 48, 48, 100}, null, null);
+ Coal_Gas = FluidUtils
+ .generateFluidNonMolten("CoalGas", "Coal Gas", 500, new short[] { 48, 48, 48, 100 }, null, null);
// Ethanol
// v - Dehydrate cells to remove water
// Create Ethylene
if (!FluidUtils.doesFluidExist("ethylene")) {
Ethylene = FluidUtils.generateFluidNonMolten(
- "ethylene", "Ethylene", -103, new short[] {255, 255, 255, 100}, null, null);
+ "ethylene",
+ "Ethylene",
+ -103,
+ new short[] { 255, 255, 255, 100 },
+ null,
+ null);
} else {
Ethylene = FluidUtils.getWildcardFluidStack("ethylene", 1).getFluid();
}
@@ -334,37 +338,72 @@ public class CoalTar extends ItemPackage {
// acid-catalyzed chemical reaction
// Use Chemical Reactor
Ethylbenzene = FluidUtils.generateFluidNonMolten(
- "Ethylbenzene", "Ethylbenzene", 136, new short[] {255, 255, 255, 100}, null, null);
+ "Ethylbenzene",
+ "Ethylbenzene",
+ 136,
+ new short[] { 255, 255, 255, 100 },
+ null,
+ null);
// Create Anthracene
Anthracene = FluidUtils.generateFluidNonMolten(
- "Anthracene", "Anthracene", 340, new short[] {255, 255, 255, 100}, null, null);
+ "Anthracene",
+ "Anthracene",
+ 340,
+ new short[] { 255, 255, 255, 100 },
+ null,
+ null);
// Toluene
if (!FluidUtils.doesFluidExist("liquid_toluene")) {
Toluene = FluidUtils.generateFluidNonMolten(
- "liquid_toluene", "Toluene", -95, new short[] {140, 70, 20, 100}, null, null);
+ "liquid_toluene",
+ "Toluene",
+ -95,
+ new short[] { 140, 70, 20, 100 },
+ null,
+ null);
} else {
Toluene = FluidUtils.getWildcardFluidStack("liquid_toluene", 1).getFluid();
}
// Create Coal Tar
- Coal_Tar = FluidUtils.generateFluidNonMolten(
- "CoalTar", "Coal Tar", 450, new short[] {32, 32, 32, 100}, null, null);
+ Coal_Tar = FluidUtils
+ .generateFluidNonMolten("CoalTar", "Coal Tar", 450, new short[] { 32, 32, 32, 100 }, null, null);
// v - Distill (60% Tar oil/15% Naphtha/20% Ethylbenzene/5% Anthracene)
// Create Coal Tar Oil
Coal_Tar_Oil = FluidUtils.generateFluidNonMolten(
- "CoalTarOil", "Coal Tar Oil", 240, new short[] {240, 240, 150, 100}, null, null);
+ "CoalTarOil",
+ "Coal Tar Oil",
+ 240,
+ new short[] { 240, 240, 150, 100 },
+ null,
+ null);
// v - Wash With Sulfuric Acid
// Create Sulfuric Coal Tar Oil
Sulfuric_Coal_Tar_Oil = FluidUtils.generateFluidNonMolten(
- "SulfuricCoalTarOil", "Sulfuric Coal Tar Oil", 240, new short[] {250, 170, 12, 100}, null, null);
+ "SulfuricCoalTarOil",
+ "Sulfuric Coal Tar Oil",
+ 240,
+ new short[] { 250, 170, 12, 100 },
+ null,
+ null);
// v - Distill (No loss, just time consuming)
// Create Naphthalene
Naphthalene = FluidUtils.generateFluidNonMolten(
- "Naphthalene", "Naphthalene", 115, new short[] {210, 185, 135, 100}, null, null);
+ "Naphthalene",
+ "Naphthalene",
+ 115,
+ new short[] { 210, 185, 135, 100 },
+ null,
+ null);
// v - Oxidize with mercury and nitric acid
// Create Phthalic Acid
Phthalic_Acid = FluidUtils.generateFluidNonMolten(
- "PhthalicAcid", "Phthalic Acid", 207, new short[] {210, 220, 210, 100}, null, null);
+ "PhthalicAcid",
+ "Phthalic Acid",
+ 207,
+ new short[] { 210, 220, 210, 100 },
+ null,
+ null);
// v - Dehydrate at 180C+
// Create Phthalic Anhydride
// ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O",
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index cabd9542f8..1765b387f3 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -1,5 +1,10 @@
package gtPlusPlus.core.item.chemistry;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.*;
+
import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
@@ -17,10 +22,6 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.plugin.agrichem.BioRecipes;
import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.*;
public class GenericChem extends ItemPackage {
@@ -48,7 +49,7 @@ public class GenericChem extends ItemPackage {
"Teflon",
MaterialState.SOLID,
TextureSet.SET_SHINY,
- new short[] {75, 45, 75},
+ new short[] { 75, 45, 75 },
330,
640,
-1,
@@ -134,7 +135,10 @@ public class GenericChem extends ItemPackage {
@Override
public void items() {
PhenolicResins = ItemUtils.generateSpecialUseDusts(
- "phenolicresins", "Phenolic Resin", "HOC6H4CH2OH", Utils.rgbtoHexValue(80, 40, 40))[0];
+ "phenolicresins",
+ "Phenolic Resin",
+ "HOC6H4CH2OH",
+ Utils.rgbtoHexValue(80, 40, 40))[0];
// MaterialGenerator.generate(BAKELITE, false);
// MaterialGenerator.generate(NYLON, false);
MaterialGenerator.generate(TEFLON, false);
@@ -225,24 +229,25 @@ public class GenericChem extends ItemPackage {
public void fluids() {
if (!FluidRegistry.isFluidRegistered("benzene")) {
- Benzene = FluidUtils.generateFluidNoPrefix("benzene", "Benzene", 278, new short[] {100, 70, 30, 100}, true);
+ Benzene = FluidUtils
+ .generateFluidNoPrefix("benzene", "Benzene", 278, new short[] { 100, 70, 30, 100 }, true);
} else {
Benzene = FluidRegistry.getFluid("benzene");
}
- NitroBenzene = FluidUtils.generateFluidNoPrefix(
- "nitrobenzene", "Nitrobenzene", 278, new short[] {70, 50, 40, 100}, true);
+ NitroBenzene = FluidUtils
+ .generateFluidNoPrefix("nitrobenzene", "Nitrobenzene", 278, new short[] { 70, 50, 40, 100 }, true);
- Aniline = FluidUtils.generateFluidNoPrefix("aniline", "Aniline", 266, new short[] {100, 100, 30, 100}, true);
+ Aniline = FluidUtils.generateFluidNoPrefix("aniline", "Aniline", 266, new short[] { 100, 100, 30, 100 }, true);
- BoricAcid =
- FluidUtils.generateFluidNoPrefix("boricacid", "Boric Acid", 278, new short[] {90, 30, 120, 100}, true);
+ BoricAcid = FluidUtils
+ .generateFluidNoPrefix("boricacid", "Boric Acid", 278, new short[] { 90, 30, 120, 100 }, true);
- Polyurethane = FluidUtils.generateFluidNoPrefix(
- "polyurethane", "Polyurethane", 350, new short[] {100, 70, 100, 100}, true);
+ Polyurethane = FluidUtils
+ .generateFluidNoPrefix("polyurethane", "Polyurethane", 350, new short[] { 100, 70, 100, 100 }, true);
if (!FluidRegistry.isFluidRegistered("phenol")) {
- Phenol = FluidUtils.generateFluidNoPrefix("phenol", "Phenol", 313, new short[] {100, 70, 30, 100}, true);
+ Phenol = FluidUtils.generateFluidNoPrefix("phenol", "Phenol", 313, new short[] { 100, 70, 30, 100 }, true);
} else {
Phenol = FluidRegistry.getFluid("phenol");
}
@@ -252,50 +257,71 @@ public class GenericChem extends ItemPackage {
HydrochloricAcid = FluidRegistry.getFluid("hydrochloricacid_gt5u");
} else {
HydrochloricAcid = FluidUtils.generateFluidNoPrefix(
- "hydrochloricacid", "Hydrochloric Acid", 285, new short[] {183, 200, 196, 100}, true);
+ "hydrochloricacid",
+ "Hydrochloric Acid",
+ 285,
+ new short[] { 183, 200, 196, 100 },
+ true);
}
- Cyclohexane = FluidUtils.generateFluidNoPrefix(
- "cyclohexane", "Cyclohexane", 32 + 175, new short[] {100, 70, 30, 100}, true);
+ Cyclohexane = FluidUtils
+ .generateFluidNoPrefix("cyclohexane", "Cyclohexane", 32 + 175, new short[] { 100, 70, 30, 100 }, true);
Cyclohexanone = FluidUtils.generateFluidNoPrefix(
- "cyclohexanone", "Cyclohexanone", 32 + 175, new short[] {100, 70, 30, 100}, true);
+ "cyclohexanone",
+ "Cyclohexanone",
+ 32 + 175,
+ new short[] { 100, 70, 30, 100 },
+ true);
- Cadaverine = FluidUtils.generateFluidNoPrefix(
- "cadaverine", "Cadaverine", 32 + 175, new short[] {100, 70, 30, 100}, true);
- Putrescine = FluidUtils.generateFluidNoPrefix(
- "putrescine", "Putrescine", 32 + 175, new short[] {100, 70, 30, 100}, true);
+ Cadaverine = FluidUtils
+ .generateFluidNoPrefix("cadaverine", "Cadaverine", 32 + 175, new short[] { 100, 70, 30, 100 }, true);
+ Putrescine = FluidUtils
+ .generateFluidNoPrefix("putrescine", "Putrescine", 32 + 175, new short[] { 100, 70, 30, 100 }, true);
// Create 2-Ethylanthraquinone
// 2-Ethylanthraquinone is prepared from the reaction of phthalic anhydride and ethylbenzene
Ethylanthraquinone2 = FluidUtils.generateFluidNonMolten(
- "2Ethylanthraquinone", "2-Ethylanthraquinone", 415, new short[] {227, 255, 159, 100}, null, null);
+ "2Ethylanthraquinone",
+ "2-Ethylanthraquinone",
+ 415,
+ new short[] { 227, 255, 159, 100 },
+ null,
+ null);
// Create 2-Ethylanthrahydroquinone
// Palladium plate + Hydrogen(250) + 2-Ethylanthraquinone(500) = 600 Ethylanthrahydroquinone
Ethylanthrahydroquinone2 = FluidUtils.generateFluidNonMolten(
"2Ethylanthrahydroquinone",
"2-Ethylanthrahydroquinone",
415,
- new short[] {207, 225, 129, 100},
+ new short[] { 207, 225, 129, 100 },
null,
null);
// Create Hydrogen Peroxide
// Compressed Air(1500) + Ethylanthrahydroquinone(500) + Anthracene(5) = 450 Ethylanthraquinone && 200 Peroxide
Hydrogen_Peroxide = FluidUtils.generateFluidNonMolten(
- "HydrogenPeroxide", "Hydrogen Peroxide", 150, new short[] {210, 255, 255, 100}, null, null);
+ "HydrogenPeroxide",
+ "Hydrogen Peroxide",
+ 150,
+ new short[] { 210, 255, 255, 100 },
+ null,
+ null);
if (FluidRegistry.isFluidRegistered("nitricoxide")) {
Nitric_Oxide = FluidRegistry.getFluid("nitricoxide");
usingGregtechNitricOxide = true;
} else {
- Nitric_Oxide = FluidUtils.generateFluidNoPrefix(
- "nitricoxide", "Nitric Oxide", 200, new short[] {125, 200, 240, 100});
+ Nitric_Oxide = FluidUtils
+ .generateFluidNoPrefix("nitricoxide", "Nitric Oxide", 200, new short[] { 125, 200, 240, 100 });
}
if (FluidRegistry.isFluidRegistered("nitrogendioxide")) {
Nitrogen_Dioxide = FluidRegistry.getFluid("nitrogendioxide");
usingGregtechNitrogenDioxide = true;
} else {
Nitrogen_Dioxide = FluidUtils.generateFluidNoPrefix(
- "nitrogendioxide", "Nitrogen Dioxide", 200, new short[] {100, 175, 255, 100});
+ "nitrogendioxide",
+ "Nitrogen Dioxide",
+ 200,
+ new short[] { 100, 175, 255, 100 });
}
// Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
@@ -304,10 +330,15 @@ public class GenericChem extends ItemPackage {
// v - Dehydrate
// Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
Lithium_Peroxide = FluidUtils.generateFluidNonMolten(
- "LithiumPeroxide", "Lithium Peroxide", 446, new short[] {135, 135, 135, 100}, null, null);
+ "LithiumPeroxide",
+ "Lithium Peroxide",
+ 446,
+ new short[] { 135, 135, 135, 100 },
+ null,
+ null);
- Carbon_Disulfide = FluidUtils.generateFluidNoPrefix(
- "CarbonDisulfide", "Carbon Disulfide", 350, new short[] {175, 175, 175, 100});
+ Carbon_Disulfide = FluidUtils
+ .generateFluidNoPrefix("CarbonDisulfide", "Carbon Disulfide", 350, new short[] { 175, 175, 175, 100 });
if (FluidRegistry.isFluidRegistered("fluid.liquid_hydricsulfur")
|| MaterialUtils.doesMaterialExist("HydricSulfide")) {
@@ -323,13 +354,15 @@ public class GenericChem extends ItemPackage {
}
}
if (aFluid == null) {
- aFluid = FluidUtils.getWildcardFluidStack("liquid_hydricsulfur", 1000)
- .getFluid();
+ aFluid = FluidUtils.getWildcardFluidStack("liquid_hydricsulfur", 1000).getFluid();
}
Hydrogen_Sulfide = aFluid;
} else {
Hydrogen_Sulfide = FluidUtils.generateFluidNoPrefix(
- "HydrogenSulfide", "Hydrogen Sulfide", 446, new short[] {240, 130, 30, 100});
+ "HydrogenSulfide",
+ "Hydrogen Sulfide",
+ 446,
+ new short[] { 240, 130, 30, 100 });
}
}
@@ -398,12 +431,10 @@ public class GenericChem extends ItemPackage {
private void recipeSodiumEthoxide() {
// C2H5OH + Na → C2H5ONa + H
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(16), ELEMENT.getInstance().SODIUM.getDust(1)
- },
- new FluidStack[] {Materials.Ethanol.getFluid(1000)},
- new ItemStack[] {ItemUtils.getSimpleStack(mSodiumEthoxide, 9)},
- new FluidStack[] {ELEMENT.getInstance().HYDROGEN.getFluidStack(1000)},
+ new ItemStack[] { CI.getNumberedCircuit(16), ELEMENT.getInstance().SODIUM.getDust(1) },
+ new FluidStack[] { Materials.Ethanol.getFluid(1000) },
+ new ItemStack[] { ItemUtils.getSimpleStack(mSodiumEthoxide, 9) },
+ new FluidStack[] { ELEMENT.getInstance().HYDROGEN.getFluidStack(1000) },
20 * 20,
120,
2);
@@ -412,16 +443,11 @@ public class GenericChem extends ItemPackage {
private void recipePotassiumHydroxide() {
// Ca(OH)2 + K2O + CO2 → CaCO3 + 2 KOH
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(18),
- Materials.Potash.getDust(3),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5),
- },
- new FluidStack[] {Materials.CarbonDioxide.getGas(1000)},
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 5),
- ItemUtils.getSimpleStack(mPotassiumHydroxide, 6)
- },
+ new ItemStack[] { CI.getNumberedCircuit(18), Materials.Potash.getDust(3),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), },
+ new FluidStack[] { Materials.CarbonDioxide.getGas(1000) },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 5),
+ ItemUtils.getSimpleStack(mPotassiumHydroxide, 6) },
new FluidStack[] {},
20 * 30,
120,
@@ -432,25 +458,20 @@ public class GenericChem extends ItemPackage {
// Potassium ethyl xanthate - CH3CH2OH + CS2 + KOH → C3H5KOS2 + H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(mPotassiumHydroxide, 3),
- },
- new FluidStack[] {
- Materials.Ethanol.getFluid(1000), FluidUtils.getFluidStack(Carbon_Disulfide, 1000),
- },
- new ItemStack[] {ItemUtils.getSimpleStack(mPotassiumEthylXanthate, 12)},
- new FluidStack[] {FluidUtils.getWater(1000)},
+ new ItemStack[] { CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(mPotassiumHydroxide, 3), },
+ new FluidStack[] { Materials.Ethanol.getFluid(1000),
+ FluidUtils.getFluidStack(Carbon_Disulfide, 1000), },
+ new ItemStack[] { ItemUtils.getSimpleStack(mPotassiumEthylXanthate, 12) },
+ new FluidStack[] { FluidUtils.getWater(1000) },
20 * 60,
120,
4);
// Sodium ethyl xanthate - CH3CH2ONa + CS2 → CH3CH2OCS2Na
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(mSodiumEthoxide, 9)},
- new FluidStack[] {
- FluidUtils.getFluidStack(Carbon_Disulfide, 1000),
- },
- new ItemStack[] {ItemUtils.getSimpleStack(mSodiumEthylXanthate, 12)},
+ new ItemStack[] { CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(mSodiumEthoxide, 9) },
+ new FluidStack[] { FluidUtils.getFluidStack(Carbon_Disulfide, 1000), },
+ new ItemStack[] { ItemUtils.getSimpleStack(mSodiumEthylXanthate, 12) },
new FluidStack[] {},
20 * 60,
120,
@@ -483,28 +504,21 @@ public class GenericChem extends ItemPackage {
private void recipeCarbonDisulfide() {
CORE.RA.addBlastRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 16)
- },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 16) },
new FluidStack[] {},
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustDarkAsh", 1)},
- new FluidStack[] {FluidUtils.getFluidStack(Carbon_Disulfide, 4000)},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustDarkAsh", 1) },
+ new FluidStack[] { FluidUtils.getFluidStack(Carbon_Disulfide, 4000) },
20 * 60 * 10,
30,
1500);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(20),
- ItemUtils.getSimpleStack(mBrownCatalyst, 0),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 4)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(CoalTar.Coal_Gas, 1000),
- },
+ new ItemStack[] { CI.getNumberedCircuit(20), ItemUtils.getSimpleStack(mBrownCatalyst, 0),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 4) },
+ new FluidStack[] { FluidUtils.getFluidStack(CoalTar.Coal_Gas, 1000), },
new ItemStack[] {},
- new FluidStack[] {FluidUtils.getFluidStack(Carbon_Disulfide, 2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(Carbon_Disulfide, 2000) },
20 * 60 * 5,
30,
2);
@@ -514,19 +528,14 @@ public class GenericChem extends ItemPackage {
// Endgame soldering alloy meant for the bioware circuit line and beyond.
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 0),
- ItemList.Circuit_Chip_Biocell.get(64),
- ItemList.Gravistar.get(8),
- Materials.InfinityCatalyst.getDust(2)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("plasma.tin", 18000),
- FluidUtils.getFluidStack("plasma.bismuth", 18000),
- FluidUtils.getFluidStack("cryotheum", 4000)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 0),
+ ItemList.Circuit_Chip_Biocell.get(64), ItemList.Gravistar.get(8),
+ Materials.InfinityCatalyst.getDust(2) },
+ new FluidStack[] { FluidUtils.getFluidStack("plasma.tin", 18000),
+ FluidUtils.getFluidStack("plasma.bismuth", 18000),
+ FluidUtils.getFluidStack("cryotheum", 4000) },
new ItemStack[] {},
- new FluidStack[] {MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 280)},
+ new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 280) },
20 * 800,
3842160,
7);
@@ -542,7 +551,7 @@ public class GenericChem extends ItemPackage {
private void recipeGrindingBallAlumina() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {CI.getNumberedCircuit(10), ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64)},
+ new ItemStack[] { CI.getNumberedCircuit(10), ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64) },
FluidUtils.getFluidStack(GenericChem.Aniline, 4000),
ItemUtils.getSimpleStack(mMillingBallAlumina, 8),
180 * 20,
@@ -551,9 +560,8 @@ public class GenericChem extends ItemPackage {
private void recipeGrindingBallSoapstone() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10), ItemUtils.getItemStackOfAmountFromOreDict("dustSoapstone", 32)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSoapstone", 32) },
FluidUtils.getFluidStack(AgrichemFluids.mLiquidResin, 2500),
ItemUtils.getSimpleStack(mMillingBallSoapstone, 8),
120 * 20,
@@ -685,12 +693,10 @@ public class GenericChem extends ItemPackage {
160,
30);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {GT_Utility.getIntegratedCircuit(1)},
- new FluidStack[] {
- MISC_MATERIALS.AMMONIA.getFluidStack(8000),
- ELEMENT.getInstance().OXYGEN.getFluidStack(5000)
- },
- new FluidStack[] {FluidUtils.getFluidStack(Nitric_Oxide, 4000), FluidUtils.getWater(9000)},
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
+ new FluidStack[] { MISC_MATERIALS.AMMONIA.getFluidStack(8000),
+ ELEMENT.getInstance().OXYGEN.getFluidStack(5000) },
+ new FluidStack[] { FluidUtils.getFluidStack(Nitric_Oxide, 4000), FluidUtils.getWater(9000) },
null,
160,
30);
@@ -769,12 +775,11 @@ public class GenericChem extends ItemPackage {
// C6H6 + 6H = C6H12
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getTierTwoChip(), ItemUtils.getSimpleStack(mBrownCatalyst, 0)},
- new FluidStack[] {FluidUtils.getFluidStack(Benzene, 1000), FluidUtils.getFluidStack("hydrogen", 6000)},
+ new ItemStack[] { getTierTwoChip(), ItemUtils.getSimpleStack(mBrownCatalyst, 0) },
+ new FluidStack[] { FluidUtils.getFluidStack(Benzene, 1000),
+ FluidUtils.getFluidStack("hydrogen", 6000) },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Cyclohexane, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Cyclohexane, 1000), },
20 * 120,
120,
2);
@@ -784,26 +789,20 @@ public class GenericChem extends ItemPackage {
// C6H12 + 2O(Air) = C6H10O + H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getTierTwoChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0)},
- new FluidStack[] {FluidUtils.getFluidStack(Cyclohexane, 1000), FluidUtils.getFluidStack("air", 4000)},
+ new ItemStack[] { getTierTwoChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0) },
+ new FluidStack[] { FluidUtils.getFluidStack(Cyclohexane, 1000), FluidUtils.getFluidStack("air", 4000) },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Cyclohexanone, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Cyclohexanone, 1000), },
20 * 120,
120,
2);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getTierTwoChip(),
- },
- new FluidStack[] {FluidUtils.getFluidStack(Cyclohexane, 1000), FluidUtils.getFluidStack("oxygen", 2000)
- },
+ new ItemStack[] { getTierTwoChip(), },
+ new FluidStack[] { FluidUtils.getFluidStack(Cyclohexane, 1000),
+ FluidUtils.getFluidStack("oxygen", 2000) },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Cyclohexanone, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Cyclohexanone, 1000), },
20 * 120,
120,
2);
@@ -812,12 +811,8 @@ public class GenericChem extends ItemPackage {
private void recipeCatalystRed() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getTierOneChip(),
- CI.getEmptyCatalyst(10),
- ELEMENT.getInstance().IRON.getDust(2),
- ELEMENT.getInstance().COPPER.getDust(2),
- },
+ new ItemStack[] { getTierOneChip(), CI.getEmptyCatalyst(10), ELEMENT.getInstance().IRON.getDust(2),
+ ELEMENT.getInstance().COPPER.getDust(2), },
GT_Values.NF,
ItemUtils.getSimpleStack(mRedCatalyst, 10),
20 * 20,
@@ -827,12 +822,8 @@ public class GenericChem extends ItemPackage {
private void recipeCatalystYellow() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getTierThreeChip(),
- CI.getEmptyCatalyst(10),
- ELEMENT.getInstance().TUNGSTEN.getDust(4),
- ELEMENT.getInstance().NICKEL.getDust(4),
- },
+ new ItemStack[] { getTierThreeChip(), CI.getEmptyCatalyst(10),
+ ELEMENT.getInstance().TUNGSTEN.getDust(4), ELEMENT.getInstance().NICKEL.getDust(4), },
GT_Values.NF,
ItemUtils.getSimpleStack(mYellowCatalyst, 10),
60 * 20,
@@ -842,12 +833,8 @@ public class GenericChem extends ItemPackage {
private void recipeCatalystBlue() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getTierTwoChip(),
- CI.getEmptyCatalyst(10),
- ELEMENT.getInstance().COBALT.getDust(3),
- ELEMENT.getInstance().TITANIUM.getDust(3),
- },
+ new ItemStack[] { getTierTwoChip(), CI.getEmptyCatalyst(10), ELEMENT.getInstance().COBALT.getDust(3),
+ ELEMENT.getInstance().TITANIUM.getDust(3), },
GT_Values.NF,
ItemUtils.getSimpleStack(mBlueCatalyst, 10),
40 * 20,
@@ -857,12 +844,8 @@ public class GenericChem extends ItemPackage {
private void recipeCatalystOrange() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getTierTwoChip(),
- CI.getEmptyCatalyst(10),
- ELEMENT.getInstance().VANADIUM.getDust(5),
- ELEMENT.getInstance().PALLADIUM.getDust(5),
- },
+ new ItemStack[] { getTierTwoChip(), CI.getEmptyCatalyst(10), ELEMENT.getInstance().VANADIUM.getDust(5),
+ ELEMENT.getInstance().PALLADIUM.getDust(5), },
GT_Values.NF,
ItemUtils.getSimpleStack(mOrangeCatalyst, 10),
40 * 20,
@@ -872,12 +855,8 @@ public class GenericChem extends ItemPackage {
private void recipeCatalystPurple() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getTierFourChip(),
- CI.getEmptyCatalyst(10),
- ELEMENT.getInstance().IRIDIUM.getDust(6),
- ELEMENT.getInstance().RUTHENIUM.getDust(6),
- },
+ new ItemStack[] { getTierFourChip(), CI.getEmptyCatalyst(10), ELEMENT.getInstance().IRIDIUM.getDust(6),
+ ELEMENT.getInstance().RUTHENIUM.getDust(6), },
GT_Values.NF,
ItemUtils.getSimpleStack(mPurpleCatalyst, 10),
120 * 20,
@@ -887,12 +866,8 @@ public class GenericChem extends ItemPackage {
private void recipeCatalystBrown() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getTierOneChip(),
- CI.getEmptyCatalyst(10),
- ELEMENT.getInstance().NICKEL.getDust(4),
- ELEMENT.getInstance().ALUMINIUM.getDust(4),
- },
+ new ItemStack[] { getTierOneChip(), CI.getEmptyCatalyst(10), ELEMENT.getInstance().NICKEL.getDust(4),
+ ELEMENT.getInstance().ALUMINIUM.getDust(4), },
GT_Values.NF,
ItemUtils.getSimpleStack(mBrownCatalyst, 10),
15 * 20,
@@ -902,12 +877,8 @@ public class GenericChem extends ItemPackage {
private void recipeCatalystPink() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getTierThreeChip(),
- CI.getEmptyCatalyst(10),
- ELEMENT.getInstance().PLATINUM.getDust(4),
- ELEMENT.getInstance().RHODIUM.getDust(4),
- },
+ new ItemStack[] { getTierThreeChip(), CI.getEmptyCatalyst(10),
+ ELEMENT.getInstance().PLATINUM.getDust(4), ELEMENT.getInstance().RHODIUM.getDust(4), },
GT_Values.NF,
ItemUtils.getSimpleStack(mPinkCatalyst, 10),
30 * 20,
@@ -917,11 +888,8 @@ public class GenericChem extends ItemPackage {
private void recipeCatalystFormaldehyde() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getTierThreeChip(),
- CI.getEmptyCatalyst(4),
- ItemUtils.getSimpleStack(RocketFuels.Formaldehyde_Catalyst_Dust, 8)
- },
+ new ItemStack[] { getTierThreeChip(), CI.getEmptyCatalyst(4),
+ ItemUtils.getSimpleStack(RocketFuels.Formaldehyde_Catalyst_Dust, 8) },
GT_Values.NF,
ItemUtils.getSimpleStack(mFormaldehydeCatalyst, 4),
30 * 20,
@@ -931,11 +899,8 @@ public class GenericChem extends ItemPackage {
private void recipeCatalystSolidAcid() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getTierThreeChip(),
- CI.getEmptyCatalyst(5),
- ItemUtils.getItemStackOfAmountFromOreDict("dustLapis", 2)
- },
+ new ItemStack[] { getTierThreeChip(), CI.getEmptyCatalyst(5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLapis", 2) },
MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000),
ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 5),
30 * 20,
@@ -945,12 +910,8 @@ public class GenericChem extends ItemPackage {
private void recipeCatalystInfiniteMutation() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getTierThreeChip(),
- CI.getEmptyCatalyst(5),
- Materials.Infinity.getDust(1),
- Materials.Naquadria.getDust(10)
- },
+ new ItemStack[] { getTierThreeChip(), CI.getEmptyCatalyst(5), Materials.Infinity.getDust(1),
+ Materials.Naquadria.getDust(10) },
GT_Values.NF,
ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 5),
5 * 20,
@@ -961,28 +922,23 @@ public class GenericChem extends ItemPackage {
// Basic Recipe
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getTierOneChip(), ItemUtils.getSimpleStack(Items.rotten_flesh, 64)},
- new FluidStack[] {FluidUtils.getHotWater(2000)},
+ new ItemStack[] { getTierOneChip(), ItemUtils.getSimpleStack(Items.rotten_flesh, 64) },
+ new FluidStack[] { FluidUtils.getHotWater(2000) },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Cadaverine, 250), FluidUtils.getFluidStack(Putrescine, 250),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Cadaverine, 250),
+ FluidUtils.getFluidStack(Putrescine, 250), },
20 * 120,
120,
1);
// Advanced Recipe
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getTierTwoChip(),
- ItemUtils.getSimpleStack(Items.rotten_flesh, 128),
- ItemUtils.simpleMetaStack(AgriculturalChem.mAgrichemItem1, 8, 32)
- },
- new FluidStack[] {FluidUtils.getHotWater(3000)},
+ new ItemStack[] { getTierTwoChip(), ItemUtils.getSimpleStack(Items.rotten_flesh, 128),
+ ItemUtils.simpleMetaStack(AgriculturalChem.mAgrichemItem1, 8, 32) },
+ new FluidStack[] { FluidUtils.getHotWater(3000) },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Cadaverine, 750), FluidUtils.getFluidStack(Putrescine, 750),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Cadaverine, 750),
+ FluidUtils.getFluidStack(Putrescine, 750), },
20 * 120,
240,
2);
@@ -992,14 +948,11 @@ public class GenericChem extends ItemPackage {
// C6H5NO2 + 6H = C6H7N + 2H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getTierThreeChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0)},
- new FluidStack[] {
- FluidUtils.getFluidStack(NitroBenzene, 1000), FluidUtils.getFluidStack("hydrogen", 6000)
- },
+ new ItemStack[] { getTierThreeChip(), ItemUtils.getSimpleStack(mBlueCatalyst, 0) },
+ new FluidStack[] { FluidUtils.getFluidStack(NitroBenzene, 1000),
+ FluidUtils.getFluidStack("hydrogen", 6000) },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Aniline, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Aniline, 1000), },
20 * 30,
500,
3);
@@ -1009,19 +962,13 @@ public class GenericChem extends ItemPackage {
// C6H6 + HNO3 =H2SO4= C6H5NO2 +H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getTierThreeChip(),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(Benzene, 5000),
- FluidUtils.getFluidStack("sulfuricacid", 3000),
- FluidUtils.getFluidStack("nitricacid", 5000),
- FluidUtils.getDistilledWater(10000)
- },
+ new ItemStack[] { getTierThreeChip(), },
+ new FluidStack[] { FluidUtils.getFluidStack(Benzene, 5000),
+ FluidUtils.getFluidStack("sulfuricacid", 3000), FluidUtils.getFluidStack("nitricacid", 5000),
+ FluidUtils.getDistilledWater(10000) },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack("dilutedsulfuricacid", 3000), FluidUtils.getFluidStack(NitroBenzene, 5000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack("dilutedsulfuricacid", 3000),
+ FluidUtils.getFluidStack(NitroBenzene, 5000), },
20 * 30,
500,
4);
@@ -1031,16 +978,11 @@ public class GenericChem extends ItemPackage {
// C6H4(CO)2O + C6H5CH2CH3 = C6H4(CO)2C6H3CH2CH3 + H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(4), ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(CoalTar.Ethylbenzene, 1000),
- },
+ new ItemStack[] { CI.getNumberedCircuit(4),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15), },
+ new FluidStack[] { FluidUtils.getFluidStack(CoalTar.Ethylbenzene, 1000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Ethylanthraquinone2, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Ethylanthraquinone2, 1000), },
20 * 15,
120,
2);
@@ -1050,16 +992,11 @@ public class GenericChem extends ItemPackage {
// C6H4(CO)2C6H3CH2CH3 + 2H = C6H4(COH)2C6H3CH2CH3
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(4), ItemUtils.getSimpleStack(mOrangeCatalyst, 0),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(Ethylanthraquinone2, 1000), FluidUtils.getFluidStack("hydrogen", 2000),
- },
+ new ItemStack[] { CI.getNumberedCircuit(4), ItemUtils.getSimpleStack(mOrangeCatalyst, 0), },
+ new FluidStack[] { FluidUtils.getFluidStack(Ethylanthraquinone2, 1000),
+ FluidUtils.getFluidStack("hydrogen", 2000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 1000), },
20 * 40,
120,
2);
@@ -1068,17 +1005,13 @@ public class GenericChem extends ItemPackage {
private void recipeLithiumPeroxide() {
// 2HLiO2 = Li2O2 + H2O2
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 8),
- ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1)
- },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) },
null,
null,
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 4),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1),
- },
- new int[] {10000, 10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1), },
+ new int[] { 10000, 10000 },
20 * 100,
120);
}
@@ -1087,81 +1020,56 @@ public class GenericChem extends ItemPackage {
// LiOH + H2O2 = HLiO2 + H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(4), ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 3),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000),
- },
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 4),
- },
+ new ItemStack[] { CI.getNumberedCircuit(4),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 3), },
+ new FluidStack[] { FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000), },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 4), },
new FluidStack[] {},
20 * 30,
240,
1);
- /*CORE.RA.addChemicalRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1),
- 20,
- FluidUtils.getFluidStack("fluid.cellhydrogenperoxide", 50),
- null,
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 14),
- CI.emptyCells(1),
- 20*30,
- 240); */
+ /*
+ * CORE.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7),
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1), 20,
+ * FluidUtils.getFluidStack("fluid.cellhydrogenperoxide", 50), null,
+ * ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 14), CI.emptyCells(1), 20*30, 240);
+ */
}
private void recipeHydrogenPeroxide() {
// C6H4(COH)2C6H3CH2CH3 + 2O =(C6H4CH)2= H2O2 + C6H4(CO)2C6H3CH2CH3
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(4),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("air", 20000),
- FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000),
- FluidUtils.getFluidStack("fluid.anthracene", 50),
- },
+ new ItemStack[] { CI.getNumberedCircuit(4), },
+ new FluidStack[] { FluidUtils.getFluidStack("air", 20000),
+ FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000),
+ FluidUtils.getFluidStack("fluid.anthracene", 50), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Ethylanthraquinone2, 5000),
- FluidUtils.getFluidStack("fluid.hydrogenperoxide", 5000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Ethylanthraquinone2, 5000),
+ FluidUtils.getFluidStack("fluid.hydrogenperoxide", 5000), },
20 * 30,
240,
1);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(4),
- },
- new FluidStack[] {
- Materials.Oxygen.getGas(10000),
- FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000),
- FluidUtils.getFluidStack("fluid.anthracene", 50),
- },
+ new ItemStack[] { CI.getNumberedCircuit(4), },
+ new FluidStack[] { Materials.Oxygen.getGas(10000),
+ FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000),
+ FluidUtils.getFluidStack("fluid.anthracene", 50), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Ethylanthraquinone2, 5000),
- FluidUtils.getFluidStack("fluid.hydrogenperoxide", 5000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Ethylanthraquinone2, 5000),
+ FluidUtils.getFluidStack("fluid.hydrogenperoxide", 5000), },
20 * 5,
240,
1);
- /* CORE.RA.addChemicalRecipe(
- GT_ModHandler.getAirCell(15),
- ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthrahydroquinone", 5),
- 20,
- FluidUtils.getFluidStack("fluid.anthracene", 50),
- FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", 4450),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 2),
- CI.emptyCells(18),
- 20*30,
- 240);*/
+ /*
+ * CORE.RA.addChemicalRecipe( GT_ModHandler.getAirCell(15),
+ * ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthrahydroquinone", 5), 20,
+ * FluidUtils.getFluidStack("fluid.anthracene", 50), FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone",
+ * 4450), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 2), CI.emptyCells(18), 20*30, 240);
+ */
}
@@ -1185,104 +1093,128 @@ public class GenericChem extends ItemPackage {
GT_ModHandler.addShapelessCraftingRecipe(
GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 0L),
0,
- new Object[] {OrePrefixes.circuit.get(Materials.Advanced)});
+ new Object[] { OrePrefixes.circuit.get(Materials.Advanced) });
long bits = 0;
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 1L, new Object[0]), bits, new Object[] {
- "d ", " P ", " ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 1L, new Object[0]),
+ bits,
+ new Object[] { "d ", " P ", " ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 2L, new Object[0]), bits, new Object[] {
- " d ", " P ", " ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 2L, new Object[0]),
+ bits,
+ new Object[] { " d ", " P ", " ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 3L, new Object[0]), bits, new Object[] {
- " d", " P ", " ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 3L, new Object[0]),
+ bits,
+ new Object[] { " d", " P ", " ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 4L, new Object[0]), bits, new Object[] {
- " ", " Pd", " ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 4L, new Object[0]),
+ bits,
+ new Object[] { " ", " Pd", " ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 5L, new Object[0]), bits, new Object[] {
- " ", " P ", " d", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 5L, new Object[0]),
+ bits,
+ new Object[] { " ", " P ", " d", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 6L, new Object[0]), bits, new Object[] {
- " ", " P ", " d ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 6L, new Object[0]),
+ bits,
+ new Object[] { " ", " P ", " d ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 7L, new Object[0]), bits, new Object[] {
- " ", " P ", "d ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 7L, new Object[0]),
+ bits,
+ new Object[] { " ", " P ", "d ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 8L, new Object[0]), bits, new Object[] {
- " ", "dP ", " ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 8L, new Object[0]),
+ bits,
+ new Object[] { " ", "dP ", " ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 9L, new Object[0]), bits, new Object[] {
- "P d", " ", " ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 9L, new Object[0]),
+ bits,
+ new Object[] { "P d", " ", " ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 10L, new Object[0]), bits, new Object[] {
- "P ", " d", " ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 10L, new Object[0]),
+ bits,
+ new Object[] { "P ", " d", " ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 11L, new Object[0]), bits, new Object[] {
- "P ", " ", " d", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 11L, new Object[0]),
+ bits,
+ new Object[] { "P ", " ", " d", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 12L, new Object[0]), bits, new Object[] {
- "P ", " ", " d ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 12L, new Object[0]),
+ bits,
+ new Object[] { "P ", " ", " d ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 13L, new Object[0]), bits, new Object[] {
- " P", " ", " d", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 13L, new Object[0]),
+ bits,
+ new Object[] { " P", " ", " d", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 14L, new Object[0]), bits, new Object[] {
- " P", " ", " d ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 14L, new Object[0]),
+ bits,
+ new Object[] { " P", " ", " d ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 15L, new Object[0]), bits, new Object[] {
- " P", " ", "d ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 15L, new Object[0]),
+ bits,
+ new Object[] { " P", " ", "d ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 16L, new Object[0]), bits, new Object[] {
- " P", "d ", " ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 16L, new Object[0]),
+ bits,
+ new Object[] { " P", "d ", " ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 17L, new Object[0]), bits, new Object[] {
- " ", " ", "d P", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 17L, new Object[0]),
+ bits,
+ new Object[] { " ", " ", "d P", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 18L, new Object[0]), bits, new Object[] {
- " ", "d ", " P", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 18L, new Object[0]),
+ bits,
+ new Object[] { " ", "d ", " P", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 19L, new Object[0]), bits, new Object[] {
- "d ", " ", " P", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 19L, new Object[0]),
+ bits,
+ new Object[] { "d ", " ", " P", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 20L, new Object[0]), bits, new Object[] {
- " d ", " ", " P", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 20L, new Object[0]),
+ bits,
+ new Object[] { " d ", " ", " P", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 21L, new Object[0]), bits, new Object[] {
- "d ", " ", "P ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 21L, new Object[0]),
+ bits,
+ new Object[] { "d ", " ", "P ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 22L, new Object[0]), bits, new Object[] {
- " d ", " ", "P ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 22L, new Object[0]),
+ bits,
+ new Object[] { " d ", " ", "P ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 23L, new Object[0]), bits, new Object[] {
- " d", " ", "P ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 23L, new Object[0]),
+ bits,
+ new Object[] { " d", " ", "P ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
BioRecipes.addCraftingRecipe(
- GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 24L, new Object[0]), bits, new Object[] {
- " ", " d", "P ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 24L, new Object[0]),
+ bits,
+ new Object[] { " ", " d", "P ", 'P',
+ GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0]) });
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
index c2671fd401..78fe9aa9e2 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
@@ -1,12 +1,8 @@
package gtPlusPlus.core.item.chemistry;
-import gregtech.api.enums.Materials;
-import gtPlusPlus.core.item.base.misc.BaseItemParticle;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.util.Utils;
import java.util.HashMap;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
@@ -15,6 +11,12 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
+import gregtech.api.enums.Materials;
+import gtPlusPlus.core.item.base.misc.BaseItemParticle;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.util.Utils;
+
public class IonParticles extends BaseItemParticle {
public static HashMap<String, Integer> NameToMetaMap = new HashMap<String, Integer>();
@@ -47,7 +49,7 @@ public class IonParticles extends BaseItemParticle {
@Override
public String[] getAffixes() {
- return new String[] {"", ""};
+ return new String[] { "", "" };
}
@Override
@@ -109,8 +111,12 @@ public class IonParticles extends BaseItemParticle {
String aState = EnumChatFormatting.YELLOW + "Unknown" + EnumChatFormatting.GRAY;
// State not set
if (aCharge == 0) {
- list.add(EnumChatFormatting.GRAY + "A " + MetaToNameMap.get(stack.getItemDamage()) + " Ion with an "
- + aState + " charge state");
+ list.add(
+ EnumChatFormatting.GRAY + "A "
+ + MetaToNameMap.get(stack.getItemDamage())
+ + " Ion with an "
+ + aState
+ + " charge state");
} else {
if (aCharge > 0) {
aState = EnumChatFormatting.GREEN + "Positive" + EnumChatFormatting.GRAY;
@@ -118,8 +124,14 @@ public class IonParticles extends BaseItemParticle {
aState = EnumChatFormatting.RED + "Negative" + EnumChatFormatting.GRAY;
}
- list.add(EnumChatFormatting.GRAY + "A " + MetaToNameMap.get(stack.getItemDamage()) + " Ion with a " + aState
- + " charge state of " + aCharge + "");
+ list.add(
+ EnumChatFormatting.GRAY + "A "
+ + MetaToNameMap.get(stack.getItemDamage())
+ + " Ion with a "
+ + aState
+ + " charge state of "
+ + aCharge
+ + "");
}
super.addInformation(stack, player, list, bool);
}
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
index 497334881d..55bd54a3a1 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
@@ -1,5 +1,12 @@
package gtPlusPlus.core.item.chemistry;
+import java.util.HashMap;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
@@ -18,11 +25,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.*;
import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
-import java.util.HashMap;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public class MilledOreProcessing extends ItemPackage {
@@ -112,35 +114,35 @@ public class MilledOreProcessing extends ItemPackage {
"froth.zincflotation",
"Sphalerite Froth",
32 + 175,
- new short[] {aZincFrothRGB[0], aZincFrothRGB[1], aZincFrothRGB[2], 100},
+ new short[] { aZincFrothRGB[0], aZincFrothRGB[1], aZincFrothRGB[2], 100 },
true);
short[] aCopperFrothRGB = Materials.Chalcopyrite.mRGBa;
ChalcopyriteFlotationFroth = FluidUtils.generateFluidNoPrefix(
"froth.copperflotation",
"Chalcopyrite Froth",
32 + 175,
- new short[] {aCopperFrothRGB[0], aCopperFrothRGB[1], aCopperFrothRGB[2], 100},
+ new short[] { aCopperFrothRGB[0], aCopperFrothRGB[1], aCopperFrothRGB[2], 100 },
true);
short[] aNickelFrothRGB = Materials.Nickel.mRGBa;
NickelFlotationFroth = FluidUtils.generateFluidNoPrefix(
"froth.nickelflotation",
"Nickel Froth",
32 + 175,
- new short[] {aNickelFrothRGB[0], aNickelFrothRGB[1], aNickelFrothRGB[2], 100},
+ new short[] { aNickelFrothRGB[0], aNickelFrothRGB[1], aNickelFrothRGB[2], 100 },
true);
short[] aPlatinumFrothRGB = Materials.Platinum.mRGBa;
PlatinumFlotationFroth = FluidUtils.generateFluidNoPrefix(
"froth.platinumflotation",
"Platinum Froth",
32 + 175,
- new short[] {aPlatinumFrothRGB[0], aPlatinumFrothRGB[1], aPlatinumFrothRGB[2], 100},
+ new short[] { aPlatinumFrothRGB[0], aPlatinumFrothRGB[1], aPlatinumFrothRGB[2], 100 },
true);
short[] aPentlanditeFrothRGB = Materials.Pentlandite.mRGBa;
PentlanditeFlotationFroth = FluidUtils.generateFluidNoPrefix(
"froth.pentlanditeflotation",
"Pentlandite Froth",
32 + 175,
- new short[] {aPentlanditeFrothRGB[0], aPentlanditeFrothRGB[1], aPentlanditeFrothRGB[2], 100},
+ new short[] { aPentlanditeFrothRGB[0], aPentlanditeFrothRGB[1], aPentlanditeFrothRGB[2], 100 },
true);
short[] aRedstoneFrothRGB = Materials.Redstone.mRGBa;
@@ -148,46 +150,46 @@ public class MilledOreProcessing extends ItemPackage {
"froth.redstoneflotation",
"Redstone Froth",
32 + 175,
- new short[] {aRedstoneFrothRGB[0], aRedstoneFrothRGB[1], aRedstoneFrothRGB[2], 100},
+ new short[] { aRedstoneFrothRGB[0], aRedstoneFrothRGB[1], aRedstoneFrothRGB[2], 100 },
true);
short[] aSpessartineFrothRGB = Materials.Spessartine.mRGBa;
SpessartineFlotationFroth = FluidUtils.generateFluidNoPrefix(
"froth.spessartineflotation",
"Spessartine Froth",
32 + 175,
- new short[] {aSpessartineFrothRGB[0], aSpessartineFrothRGB[1], aSpessartineFrothRGB[2], 100},
+ new short[] { aSpessartineFrothRGB[0], aSpessartineFrothRGB[1], aSpessartineFrothRGB[2], 100 },
true);
short[] aGrossularFrothRGB = Materials.Grossular.mRGBa;
GrossularFlotationFroth = FluidUtils.generateFluidNoPrefix(
"froth.grossularflotation",
"Grossular Froth",
32 + 175,
- new short[] {aGrossularFrothRGB[0], aGrossularFrothRGB[1], aGrossularFrothRGB[2], 100},
+ new short[] { aGrossularFrothRGB[0], aGrossularFrothRGB[1], aGrossularFrothRGB[2], 100 },
true);
short[] aAlmandineFrothRGB = Materials.Almandine.mRGBa;
AlmandineFlotationFroth = FluidUtils.generateFluidNoPrefix(
"froth.almandineflotation",
"Almandine Froth",
32 + 175,
- new short[] {aAlmandineFrothRGB[0], aAlmandineFrothRGB[1], aAlmandineFrothRGB[2], 100},
+ new short[] { aAlmandineFrothRGB[0], aAlmandineFrothRGB[1], aAlmandineFrothRGB[2], 100 },
true);
short[] aPyropeFrothRGB = Materials.Pyrope.mRGBa;
PyropeFlotationFroth = FluidUtils.generateFluidNoPrefix(
"froth.pyropeflotation",
"Pyrope Froth",
32 + 175,
- new short[] {aPyropeFrothRGB[0], aPyropeFrothRGB[1], aPyropeFrothRGB[2], 100},
+ new short[] { aPyropeFrothRGB[0], aPyropeFrothRGB[1], aPyropeFrothRGB[2], 100 },
true);
short[] aMonaziteFrothRGB = Materials.Monazite.mRGBa;
MonaziteFlotationFroth = FluidUtils.generateFluidNoPrefix(
"froth.Monaziteflotation",
"Monazite Froth",
32 + 175,
- new short[] {aMonaziteFrothRGB[0], aMonaziteFrothRGB[1], aMonaziteFrothRGB[2], 100},
+ new short[] { aMonaziteFrothRGB[0], aMonaziteFrothRGB[1], aMonaziteFrothRGB[2], 100 },
true);
- PineOil = FluidUtils.generateFluidNoPrefix(
- "pineoil", "Pine Oil", 32 + 175, new short[] {250, 200, 60, 100}, true);
+ PineOil = FluidUtils
+ .generateFluidNoPrefix("pineoil", "Pine Oil", 32 + 175, new short[] { 250, 200, 60, 100 }, true);
}
public MilledOreProcessing() {
@@ -198,7 +200,7 @@ public class MilledOreProcessing extends ItemPackage {
private static void addMiscRecipes() {
/*
- * First 5
+ * First 5
*/
// milledSphalerite
@@ -258,7 +260,7 @@ public class MilledOreProcessing extends ItemPackage {
10);
/*
- * Second 5
+ * Second 5
*/
// milledRedstone
registerOreDataForMilledType(
@@ -347,92 +349,92 @@ public class MilledOreProcessing extends ItemPackage {
int aCircuitID = 1;
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(SphaleriteFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(SphaleriteFlotationFroth, 4000) },
getOutputsFromMap(SphaleriteFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(6),
5500);
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 4000) },
getOutputsFromMap(ChalcopyriteFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(5),
4500);
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(NickelFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(NickelFlotationFroth, 4000) },
getOutputsFromMap(NickelFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(5),
4500);
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(PlatinumFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(PlatinumFlotationFroth, 4000) },
getOutputsFromMap(PlatinumFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(6),
5500);
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(PentlanditeFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(PentlanditeFlotationFroth, 4000) },
getOutputsFromMap(PentlanditeFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(6),
5500);
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(RedstoneFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(RedstoneFlotationFroth, 4000) },
getOutputsFromMap(RedstoneFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(5),
4500);
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(SpessartineFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(SpessartineFlotationFroth, 4000) },
getOutputsFromMap(SpessartineFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(6),
5500);
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(GrossularFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(GrossularFlotationFroth, 4000) },
getOutputsFromMap(GrossularFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(6),
5500);
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(AlmandineFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(AlmandineFlotationFroth, 4000) },
getOutputsFromMap(AlmandineFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(6),
5500);
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(PyropeFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(PyropeFlotationFroth, 4000) },
getOutputsFromMap(PyropeFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(4),
3500);
CORE.RA.addVacuumFurnaceRecipe(
- new ItemStack[] {CI.getNumberedCircuit(aCircuitID++)},
- new FluidStack[] {FluidUtils.getFluidStack(MonaziteFlotationFroth, 4000)},
+ new ItemStack[] { CI.getNumberedCircuit(aCircuitID++) },
+ new FluidStack[] { FluidUtils.getFluidStack(MonaziteFlotationFroth, 4000) },
getOutputsFromMap(MonaziteFlotationFroth),
- new FluidStack[] {FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000)},
+ new FluidStack[] { FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000) },
20 * 120,
MaterialUtils.getVoltageForTier(7),
7500);
@@ -444,10 +446,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Sphalerite,
ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 14000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(SphaleriteFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 14000), },
+ new FluidStack[] { FluidUtils.getFluidStack(SphaleriteFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(6));
@@ -455,10 +455,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Chalcopyrite,
ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 12000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 12000), },
+ new FluidStack[] { FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(5));
@@ -466,10 +464,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Nickel,
ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 25000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(NickelFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 25000), },
+ new FluidStack[] { FluidUtils.getFluidStack(NickelFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(5));
@@ -477,10 +473,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Platinum,
ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 35000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(PlatinumFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 35000), },
+ new FluidStack[] { FluidUtils.getFluidStack(PlatinumFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(6));
@@ -488,10 +482,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Pentlandite,
ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 14000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(PentlanditeFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 14000), },
+ new FluidStack[] { FluidUtils.getFluidStack(PentlanditeFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(6));
}
@@ -502,10 +494,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Redstone,
ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 13000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(RedstoneFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 13000), },
+ new FluidStack[] { FluidUtils.getFluidStack(RedstoneFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(5));
@@ -513,10 +503,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Spessartine,
ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 35000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(SpessartineFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 35000), },
+ new FluidStack[] { FluidUtils.getFluidStack(SpessartineFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(6));
@@ -524,10 +512,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Grossular,
ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 28000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(GrossularFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 28000), },
+ new FluidStack[] { FluidUtils.getFluidStack(GrossularFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(6));
@@ -535,10 +521,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Almandine,
ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 18000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(AlmandineFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 18000), },
+ new FluidStack[] { FluidUtils.getFluidStack(AlmandineFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(5));
@@ -546,10 +530,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Pyrope,
ItemUtils.getSimpleStack(GenericChem.mSodiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 8000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(PyropeFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 8000), },
+ new FluidStack[] { FluidUtils.getFluidStack(PyropeFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(4));
@@ -557,10 +539,8 @@ public class MilledOreProcessing extends ItemPackage {
CORE.RA.addFlotationRecipe(
Materials.Monazite,
ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 1),
- new FluidStack[] {
- FluidUtils.getFluidStack(PineOil, 30000),
- },
- new FluidStack[] {FluidUtils.getFluidStack(MonaziteFlotationFroth, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 30000), },
+ new FluidStack[] { FluidUtils.getFluidStack(MonaziteFlotationFroth, 1000) },
20 * 480,
MaterialUtils.getVoltageForTier(6));
}
@@ -598,48 +578,45 @@ public class MilledOreProcessing extends ItemPackage {
}
for (ItemStack aLog : aLogs) {
- addRecipe(aLog, ItemUtils.getSimpleStack(aCrushedPine, 16), new int[] {10000, 7500, 5000, 2500}, 10, 120);
+ addRecipe(aLog, ItemUtils.getSimpleStack(aCrushedPine, 16), new int[] { 10000, 7500, 5000, 2500 }, 10, 120);
}
for (ItemStack aLeaf : aLeaves) {
- addRecipe(aLeaf, ItemUtils.getSimpleStack(aCrushedPine, 2), new int[] {5000, 5000, 2500, 2500}, 10, 30);
+ addRecipe(aLeaf, ItemUtils.getSimpleStack(aCrushedPine, 2), new int[] { 5000, 5000, 2500, 2500 }, 10, 30);
}
for (ItemStack aSapling : aSaplings) {
- addRecipe(aSapling, ItemUtils.getSimpleStack(aCrushedPine, 4), new int[] {7500, 7500, 2500, 2500}, 10, 60);
+ addRecipe(
+ aSapling,
+ ItemUtils.getSimpleStack(aCrushedPine, 4),
+ new int[] { 7500, 7500, 2500, 2500 },
+ 10,
+ 60);
}
for (ItemStack aCone : aPinecones) {
- addRecipe(aCone, ItemUtils.getSimpleStack(aCrushedPine, 1), new int[] {7500, 7500, 5000, 2500}, 10, 60);
+ addRecipe(aCone, ItemUtils.getSimpleStack(aCrushedPine, 1), new int[] { 7500, 7500, 5000, 2500 }, 10, 60);
}
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedAdvancedCircuit(16), ItemUtils.getSimpleStack(aCrushedPine, 64)},
- new FluidStack[] {
- FluidUtils.getSteam(5000),
- },
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5)
- },
- new FluidStack[] {FluidUtils.getFluidStack(PineOil, 500)},
- new int[] {2000, 2000, 2000, 2000},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(16), ItemUtils.getSimpleStack(aCrushedPine, 64) },
+ new FluidStack[] { FluidUtils.getSteam(5000), },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5) },
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 500) },
+ new int[] { 2000, 2000, 2000, 2000 },
20 * 60,
120,
3);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedAdvancedCircuit(18), ItemUtils.getSimpleStack(aCrushedPine, 64)},
- new FluidStack[] {
- FluidUtils.getSuperHeatedSteam(5000),
- },
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5)
- },
- new FluidStack[] {FluidUtils.getFluidStack(PineOil, 1500)},
- new int[] {3000, 3000, 3000, 3000},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemUtils.getSimpleStack(aCrushedPine, 64) },
+ new FluidStack[] { FluidUtils.getSuperHeatedSteam(5000), },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 5) },
+ new FluidStack[] { FluidUtils.getFluidStack(PineOil, 1500) },
+ new int[] { 3000, 3000, 3000, 3000 },
20 * 45,
120,
4);
@@ -658,7 +635,7 @@ public class MilledOreProcessing extends ItemPackage {
}
return CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedAdvancedCircuit(14), aInput},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(14), aInput },
new FluidStack[] {},
aOutputs,
new FluidStack[] {},
@@ -686,31 +663,10 @@ public class MilledOreProcessing extends ItemPackage {
return aOutput;
}
- private static final HashMap<
- String,
- Quad<
- Pair<Material, Integer>,
- Pair<Material, Integer>,
- Pair<Material, Integer>,
- Pair<Material, Integer>>>
- aMilledFluidMap = new HashMap<
- String,
- Quad<
- Pair<Material, Integer>,
- Pair<Material, Integer>,
- Pair<Material, Integer>,
- Pair<Material, Integer>>>();
-
- public static void registerOreDataForMilledType(
- Fluid aMilledFluid,
- Materials aOutput1,
- int aPerc1,
- Materials aOutput2,
- int aPerc2,
- Materials aOutput3,
- int aPerc3,
- Materials aOutput4,
- int aPerc4) {
+ private static final HashMap<String, Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>>> aMilledFluidMap = new HashMap<String, Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>>>();
+
+ public static void registerOreDataForMilledType(Fluid aMilledFluid, Materials aOutput1, int aPerc1,
+ Materials aOutput2, int aPerc2, Materials aOutput3, int aPerc3, Materials aOutput4, int aPerc4) {
registerOreDataForMilledType(
aMilledFluid,
MaterialUtils.generateMaterialFromGtENUM(aOutput1),
@@ -723,27 +679,18 @@ public class MilledOreProcessing extends ItemPackage {
aPerc4);
}
- public static void registerOreDataForMilledType(
- Fluid aMilledFluid,
- Material aOutput1,
- int aPerc1,
- Material aOutput2,
- int aPerc2,
- Material aOutput3,
- int aPerc3,
- Material aOutput4,
- int aPerc4) {
+ public static void registerOreDataForMilledType(Fluid aMilledFluid, Material aOutput1, int aPerc1,
+ Material aOutput2, int aPerc2, Material aOutput3, int aPerc3, Material aOutput4, int aPerc4) {
Pair<Material, Integer> aFluidOutput1 = new Pair<Material, Integer>(aOutput1, aPerc1);
Pair<Material, Integer> aFluidOutput2 = new Pair<Material, Integer>(aOutput2, aPerc2);
Pair<Material, Integer> aFluidOutput3 = new Pair<Material, Integer>(aOutput3, aPerc3);
Pair<Material, Integer> aFluidOutput4 = new Pair<Material, Integer>(aOutput4, aPerc4);
- Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>>
- aDataQuad = new Quad<
- Pair<Material, Integer>,
- Pair<Material, Integer>,
- Pair<Material, Integer>,
- Pair<Material, Integer>>(aFluidOutput1, aFluidOutput2, aFluidOutput3, aFluidOutput4);
+ Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>> aDataQuad = new Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>>(
+ aFluidOutput1,
+ aFluidOutput2,
+ aFluidOutput3,
+ aFluidOutput4);
aMilledFluidMap.put(aMilledFluid.getUnlocalizedName(), aDataQuad);
}
@@ -753,8 +700,7 @@ public class MilledOreProcessing extends ItemPackage {
}
private static ItemStack[] getArrayFromQuad(
- Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>>
- aData) {
+ Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>> aData) {
AutoMap<ItemStack> aOutputs = new AutoMap<ItemStack>();
for (Object aPair : aData.values()) {
if (aPair != null && Pair.class.isInstance(aPair)) {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java
index 069ab4a724..0db5a9bba3 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java
@@ -1,5 +1,9 @@
package gtPlusPlus.core.item.chemistry;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+
import gtPlusPlus.api.objects.minecraft.ItemPackage;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.chemistry.general.ItemNuclearChemBase;
@@ -7,9 +11,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
public class NuclearChem extends ItemPackage {
@@ -60,16 +61,41 @@ public class NuclearChem extends ItemPackage {
public void fluids() {
// Create Used Nuclear Fuels
Burnt_LiFBeF2ThF4UF4 = FluidUtils.generateFluidNonMolten(
- "BurntLiFBeF2ThF4UF4", "Burnt LiFBeF2ThF4UF4 Salt", 545, new short[] {48, 175, 48, 100}, null, null);
+ "BurntLiFBeF2ThF4UF4",
+ "Burnt LiFBeF2ThF4UF4 Salt",
+ 545,
+ new short[] { 48, 175, 48, 100 },
+ null,
+ null);
Burnt_LiFBeF2ZrF4UF4 = FluidUtils.generateFluidNonMolten(
- "BurntLiFBeF2ZrF4UF4", "Burnt LiFBeF2ZrF4UF4 Salt", 520, new short[] {48, 168, 68, 100}, null, null);
+ "BurntLiFBeF2ZrF4UF4",
+ "Burnt LiFBeF2ZrF4UF4 Salt",
+ 520,
+ new short[] { 48, 168, 68, 100 },
+ null,
+ null);
Burnt_LiFBeF2ZrF4U235 = FluidUtils.generateFluidNonMolten(
- "BurntLiFBeF2ZrF4U235", "Burnt LiFBeF2ZrF4U235 Salt", 533, new short[] {68, 185, 48, 100}, null, null);
+ "BurntLiFBeF2ZrF4U235",
+ "Burnt LiFBeF2ZrF4U235 Salt",
+ 533,
+ new short[] { 68, 185, 48, 100 },
+ null,
+ null);
Impure_LiFBeF2 = FluidUtils.generateFluidNonMolten(
- "ImpureLiFBeF2", "Impure Molten Salt Base", 533, new short[] {110, 75, 186, 100}, null, null);
+ "ImpureLiFBeF2",
+ "Impure Molten Salt Base",
+ 533,
+ new short[] { 110, 75, 186, 100 },
+ null,
+ null);
if (FluidUtils.getFluidStack("fluid.Mutagen", 1) == null) {
GeneticMutagen = FluidUtils.generateFluidNonMolten(
- "GeneticMutagen", "Genetic Mutagen", 12, new short[] {22, 148, 185, 100}, null, null);
+ "GeneticMutagen",
+ "Genetic Mutagen",
+ 12,
+ new short[] { 22, 148, 185, 100 },
+ null,
+ null);
generateMutagenRecipe = true;
} else {
GeneticMutagen = FluidUtils.getFluidStack("fluid.Mutagen", 1).getFluid();
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 0c84e778d6..5af0676af7 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -1,5 +1,15 @@
package gtPlusPlus.core.item.chemistry;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
@@ -18,14 +28,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
public class RocketFuels extends ItemPackage {
@@ -68,12 +70,22 @@ public class RocketFuels extends ItemPackage {
if (fuelA != null) {
// GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
GT_Values.RA.addDistilleryRecipe(
- CI.getNumberedCircuit(23), fuelA, FluidUtils.getFluidStack(Kerosene, 1800), 200, 64, false);
+ CI.getNumberedCircuit(23),
+ fuelA,
+ FluidUtils.getFluidStack(Kerosene, 1800),
+ 200,
+ 64,
+ false);
}
if (fuelA == null && fuelB != null) {
// GT_Values.RA.addDistilleryRecipe(23, fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
GT_Values.RA.addDistilleryRecipe(
- CI.getNumberedCircuit(23), fuelB, FluidUtils.getFluidStack(Kerosene, 1800), 200, 64, false);
+ CI.getNumberedCircuit(23),
+ fuelB,
+ FluidUtils.getFluidStack(Kerosene, 1800),
+ 200,
+ 64,
+ false);
}
}
@@ -81,25 +93,24 @@ public class RocketFuels extends ItemPackage {
FluidStack fuelA = FluidUtils.getFluidStack(Kerosene, 1000);
if (fuelA != null) {
GT_Values.RA.addDistilleryRecipe(
- CI.getNumberedCircuit(23), fuelA, FluidUtils.getFluidStack(RP1, 750), 20 * 40, 120, false);
+ CI.getNumberedCircuit(23),
+ fuelA,
+ FluidUtils.getFluidStack(RP1, 750),
+ 20 * 40,
+ 120,
+ false);
}
}
public static void createNitrogenTetroxide() {
// 2HNO3 + Cu = N2O4 + H2O + CuO
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1),
- ItemUtils.getSimpleStack(GenericChem.mOrangeCatalyst, 0),
- },
- new FluidStack[] {FluidUtils.getFluidStack("nitricacid", 2000)},
- new ItemStack[] {
- Materials.CupricOxide.getDust(2),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(Nitrogen_Tetroxide, 1000),
- },
- new int[] {100, 100, 50, 50},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1),
+ ItemUtils.getSimpleStack(GenericChem.mOrangeCatalyst, 0), },
+ new FluidStack[] { FluidUtils.getFluidStack("nitricacid", 2000) },
+ new ItemStack[] { Materials.CupricOxide.getDust(2), },
+ new FluidStack[] { FluidUtils.getFluidStack(Nitrogen_Tetroxide, 1000), },
+ new int[] { 100, 100, 50, 50 },
20 * 30,
MaterialUtils.getVoltageForTier(3),
3);
@@ -109,14 +120,11 @@ public class RocketFuels extends ItemPackage {
// H2O2 + 2NH3 = N2H4 + 2H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedCircuit(21)},
- new FluidStack[] {
- FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000), FluidUtils.getFluidStack("ammonia", 2000),
- },
+ new ItemStack[] { CI.getNumberedCircuit(21) },
+ new FluidStack[] { FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000),
+ FluidUtils.getFluidStack("ammonia", 2000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Hydrazine, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Hydrazine, 1000), },
20 * 30,
MaterialUtils.getVoltageForTier(2),
1);
@@ -147,14 +155,10 @@ public class RocketFuels extends ItemPackage {
if (aBartWorksHydrogenPeroxide != null) {
Logger.INFO("Found BW Hydrogen Peroxide, adding compat recipe.");
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedCircuit(22)},
- new FluidStack[] {
- aBartWorksHydrogenPeroxide, FluidUtils.getFluidStack("ammonia", 2000),
- },
+ new ItemStack[] { CI.getNumberedCircuit(22) },
+ new FluidStack[] { aBartWorksHydrogenPeroxide, FluidUtils.getFluidStack("ammonia", 2000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Hydrazine, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Hydrazine, 1000), },
20 * 30,
MaterialUtils.getVoltageForTier(2),
1);
@@ -183,14 +187,12 @@ public class RocketFuels extends ItemPackage {
// C + 2H + N2H4 = CH6N2
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1)},
- new FluidStack[] {
- FluidUtils.getFluidStack("hydrogen", 2000), FluidUtils.getFluidStack(Hydrazine, 1000),
- },
+ new ItemStack[] { CI.getNumberedCircuit(21),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1) },
+ new FluidStack[] { FluidUtils.getFluidStack("hydrogen", 2000),
+ FluidUtils.getFluidStack(Hydrazine, 1000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Monomethylhydrazine, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Monomethylhydrazine, 1000), },
20 * 48,
240,
2);
@@ -225,8 +227,8 @@ public class RocketFuels extends ItemPackage {
20 * 16);
CORE.RA.addAdvancedFreezerRecipe(
new ItemStack[] {},
- new FluidStack[] {FluidUtils.getFluidStack("oxygen", 3000)},
- new FluidStack[] {FluidUtils.getFluidStack(Liquid_Oxygen, 3000)},
+ new FluidStack[] { FluidUtils.getFluidStack("oxygen", 3000) },
+ new FluidStack[] { FluidUtils.getFluidStack(Liquid_Oxygen, 3000) },
new ItemStack[] {},
new int[] {},
20 * 16,
@@ -241,8 +243,8 @@ public class RocketFuels extends ItemPackage {
20 * 16);
CORE.RA.addAdvancedFreezerRecipe(
new ItemStack[] {},
- new FluidStack[] {FluidUtils.getFluidStack("hydrogen", 300)},
- new FluidStack[] {FluidUtils.getFluidStack(Liquid_Hydrogen, 300)},
+ new FluidStack[] { FluidUtils.getFluidStack("hydrogen", 300) },
+ new FluidStack[] { FluidUtils.getFluidStack(Liquid_Hydrogen, 300) },
new ItemStack[] {},
new int[] {},
20 * 4,
@@ -254,16 +256,11 @@ public class RocketFuels extends ItemPackage {
// NH3 + HNO3 = NH4NO3
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(21),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("ammonia", 4000), FluidUtils.getFluidStack("nitricacid", 4000),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(21), },
+ new FluidStack[] { FluidUtils.getFluidStack("ammonia", 4000),
+ FluidUtils.getFluidStack("nitricacid", 4000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 5184),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 5184), },
20 * 60,
120,
1);
@@ -271,11 +268,11 @@ public class RocketFuels extends ItemPackage {
private static void createAmmoniumNitrateDust() {
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedCircuit(8)},
+ new ItemStack[] { CI.getNumberedCircuit(8) },
FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 8 * 144),
FluidUtils.getWater(2000),
- new ItemStack[] {ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8)},
- new int[] {10000},
+ new ItemStack[] { ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8) },
+ new int[] { 10000 },
90 * 20,
480);
}
@@ -284,16 +281,12 @@ public class RocketFuels extends ItemPackage {
// O + CH4O = CH2O + H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(21), ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("oxygen", 32000), FluidUtils.getFluidStack("methanol", 32000),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(21),
+ ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0), },
+ new FluidStack[] { FluidUtils.getFluidStack("oxygen", 32000),
+ FluidUtils.getFluidStack("methanol", 32000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Formaldehyde, 32000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Formaldehyde, 32000), },
20 * 90,
120,
1);
@@ -337,18 +330,13 @@ public class RocketFuels extends ItemPackage {
private static void createUnsymmetricalDimethylhydrazine() {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(21), ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("fluid.hydrazine", 2000),
- FluidUtils.getFluidStack(Formaldehyde, 2000),
- FluidUtils.getFluidStack("hydrogen", 4000),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(21),
+ ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0), },
+ new FluidStack[] { FluidUtils.getFluidStack("fluid.hydrazine", 2000),
+ FluidUtils.getFluidStack(Formaldehyde, 2000), FluidUtils.getFluidStack("hydrogen", 4000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 2000), FluidUtils.getWater(2000)
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 2000),
+ FluidUtils.getWater(2000) },
20 * 60,
120,
3);
@@ -364,7 +352,7 @@ public class RocketFuels extends ItemPackage {
new ItemStack[] {},
null,
new int[] {},
- new FluidStack[] {FluidUtils.getFluidStack(RP1_Plus_Liquid_Oxygen, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(RP1_Plus_Liquid_Oxygen, 1000) },
new FluidStack[] {},
0,
0,
@@ -378,7 +366,7 @@ public class RocketFuels extends ItemPackage {
new ItemStack[] {},
null,
new int[] {},
- new FluidStack[] {FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 1000) },
new FluidStack[] {},
0,
0,
@@ -392,7 +380,7 @@ public class RocketFuels extends ItemPackage {
new ItemStack[] {},
null,
new int[] {},
- new FluidStack[] {FluidUtils.getFluidStack(Monomethylhydrazine_Plus_Nitric_Acid, 1000)},
+ new FluidStack[] { FluidUtils.getFluidStack(Monomethylhydrazine_Plus_Nitric_Acid, 1000) },
new FluidStack[] {},
0,
0,
@@ -406,9 +394,8 @@ public class RocketFuels extends ItemPackage {
new ItemStack[] {},
null,
new int[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide, 1000)
- },
+ new FluidStack[] { FluidUtils
+ .getFluidStack(Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide, 1000) },
new FluidStack[] {},
0,
0,
@@ -432,65 +419,44 @@ public class RocketFuels extends ItemPackage {
// RP1_Plus_Liquid_Oxygen
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(1),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(Liquid_Oxygen, 2000), FluidUtils.getFluidStack(RP1, 500),
- },
+ new ItemStack[] { CI.getNumberedCircuit(1), },
+ new FluidStack[] { FluidUtils.getFluidStack(Liquid_Oxygen, 2000), FluidUtils.getFluidStack(RP1, 500), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(RP1_Plus_Liquid_Oxygen, 1500),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(RP1_Plus_Liquid_Oxygen, 1500), },
20 * 15,
240,
3);
// Dense_Hydrazine_Mix
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(2),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(Hydrazine, 4000), FluidUtils.getFluidStack("methanol", 6000),
- },
+ new ItemStack[] { CI.getNumberedCircuit(2), },
+ new FluidStack[] { FluidUtils.getFluidStack(Hydrazine, 4000),
+ FluidUtils.getFluidStack("methanol", 6000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 10000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 10000), },
20 * 30,
240,
4);
// Monomethylhydrazine_Plus_Nitric_Acid
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(3),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(Monomethylhydrazine, 2000), FluidUtils.getFluidStack("nitricacid", 1000),
- },
+ new ItemStack[] { CI.getNumberedCircuit(3), },
+ new FluidStack[] { FluidUtils.getFluidStack(Monomethylhydrazine, 2000),
+ FluidUtils.getFluidStack("nitricacid", 1000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(Monomethylhydrazine_Plus_Nitric_Acid, 2000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(Monomethylhydrazine_Plus_Nitric_Acid, 2000), },
20 * 45,
480,
5);
// Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(4),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 2000),
- FluidUtils.getFluidStack(Nitrogen_Tetroxide, 2000),
- },
+ new ItemStack[] { CI.getNumberedCircuit(4), },
+ new FluidStack[] { FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 2000),
+ FluidUtils.getFluidStack(Nitrogen_Tetroxide, 2000), },
new ItemStack[] {},
new FluidStack[] {
- FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide, 5000),
- },
+ FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide, 5000), },
20 * 60,
480,
6);
@@ -529,7 +495,10 @@ public class RocketFuels extends ItemPackage {
@Override
public void items() {
Formaldehyde_Catalyst_Dust = ItemUtils.generateSpecialUseDusts(
- "FormaldehydeCatalyst", "Formaldehyde Catalyst", "Fe16V1", Utils.rgbtoHexValue(25, 5, 25))[0];
+ "FormaldehydeCatalyst",
+ "Formaldehyde Catalyst",
+ "Fe16V1",
+ Utils.rgbtoHexValue(25, 5, 25))[0];
Formaldehyde_Catalyst_Stack = ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust);
}
@@ -544,47 +513,62 @@ public class RocketFuels extends ItemPackage {
// 5.08 Compat
if (!FluidUtils.doesFluidExist("liquid_heavy_oil")) {
- Oil_Heavy = FluidUtils.generateFluidNoPrefix(
- "liquid_heavy_oil", "Heavy Oil", 200, new short[] {10, 10, 10, 100});
+ Oil_Heavy = FluidUtils
+ .generateFluidNoPrefix("liquid_heavy_oil", "Heavy Oil", 200, new short[] { 10, 10, 10, 100 });
} else {
Oil_Heavy = MaterialUtils.getMaterial("OilHeavy", "Oil").getFluid(1).getFluid();
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellOilHeavy", 1) == null) {
- new BaseItemComponent("OilHeavy", "Heavy Oil", new short[] {10, 10, 10});
+ new BaseItemComponent("OilHeavy", "Heavy Oil", new short[] { 10, 10, 10 });
}
}
// Create Kerosene
- Kerosene = FluidUtils.generateFluidNonMolten(
- "Kerosene", "Kerosene", 233, new short[] {150, 40, 150, 100}, null, null);
+ Kerosene = FluidUtils
+ .generateFluidNonMolten("Kerosene", "Kerosene", 233, new short[] { 150, 40, 150, 100 }, null, null);
CoalTar.Coal_Oil = Kerosene;
// RP! Focket Fuel
- RP1 = FluidUtils.generateFluidNonMolten("RP1Fuel", "RP-1", 500, new short[] {210, 50, 50, 100}, null, null);
+ RP1 = FluidUtils.generateFluidNonMolten("RP1Fuel", "RP-1", 500, new short[] { 210, 50, 50, 100 }, null, null);
// Create Nitrogen Tetroxide
Nitrogen_Tetroxide = FluidUtils.generateFluidNonMolten(
- "NitrogenTetroxide", "Nitrogen Tetroxide", 261, new short[] {170, 170, 0, 100}, null, null);
+ "NitrogenTetroxide",
+ "Nitrogen Tetroxide",
+ 261,
+ new short[] { 170, 170, 0, 100 },
+ null,
+ null);
// Create Hydrazine
- Hydrazine = FluidUtils.generateFluidNonMolten(
- "Hydrazine", "Hydrazine", 275, new short[] {250, 250, 250, 100}, null, null);
+ Hydrazine = FluidUtils
+ .generateFluidNonMolten("Hydrazine", "Hydrazine", 275, new short[] { 250, 250, 250, 100 }, null, null);
// Create Monomethylhydrazine
Monomethylhydrazine = FluidUtils.generateFluidNonMolten(
- "Monomethylhydrazine", "Monomethylhydrazine", 221, new short[] {125, 125, 125, 100}, null, null);
+ "Monomethylhydrazine",
+ "Monomethylhydrazine",
+ 221,
+ new short[] { 125, 125, 125, 100 },
+ null,
+ null);
// Create Anthracene
Nitrous_Oxide = FluidUtils.generateFluidNonMolten(
- "NitrousOxide", "Nitrous Oxide", 182, new short[] {255, 255, 255, 100}, null, null);
+ "NitrousOxide",
+ "Nitrous Oxide",
+ 182,
+ new short[] { 255, 255, 255, 100 },
+ null,
+ null);
// Nos
if (!FluidUtils.doesFluidExist("NitrousOxide")) {
- Nitrous_Oxide = FluidUtils.generateFluidNoPrefix(
- "NitrousOxide", "Nitrous Oxide", 182, new short[] {255, 255, 255, 100});
+ Nitrous_Oxide = FluidUtils
+ .generateFluidNoPrefix("NitrousOxide", "Nitrous Oxide", 182, new short[] { 255, 255, 255, 100 });
} else {
Nitrous_Oxide = FluidUtils.getWildcardFluidStack("NitrousOxide", 1).getFluid();
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellNitrousOxide", 1) == null) {
- new BaseItemComponent("NitrousOxide", "Nitrous Oxide", new short[] {10, 10, 175});
+ new BaseItemComponent("NitrousOxide", "Nitrous Oxide", new short[] { 10, 10, 175 });
}
}
@@ -594,12 +578,11 @@ public class RocketFuels extends ItemPackage {
"UnsymmetricalDimethylhydrazine",
"Unsymmetrical Dimethylhydrazine",
216,
- new short[] {70, 210, 20, 100},
+ new short[] { 70, 210, 20, 100 },
null,
null);
} else {
- Unsymmetrical_Dimethylhydrazine =
- FluidUtils.getFluidStack("1,1dimethylhydrazine", 1000).getFluid();
+ Unsymmetrical_Dimethylhydrazine = FluidUtils.getFluidStack("1,1dimethylhydrazine", 1000).getFluid();
}
// Create Hydrated_Ammonium_Nitrate_Slurry
@@ -607,19 +590,27 @@ public class RocketFuels extends ItemPackage {
"AmmoniumNitrateSlurry",
"Hydrated Ammonium Nitrate Slurry",
450,
- new short[] {150, 75, 150, 100},
+ new short[] { 150, 75, 150, 100 },
null,
null);
// Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
Ammonium_Nitrate_Dust = ItemUtils.generateSpecialUseDusts(
- "AmmoniumNitrate", "Ammonium Nitrate", "N2H4O3", Utils.rgbtoHexValue(150, 75, 150))[0];
+ "AmmoniumNitrate",
+ "Ammonium Nitrate",
+ "N2H4O3",
+ Utils.rgbtoHexValue(150, 75, 150))[0];
// Create Liquid_Oxygen
if (FluidUtils.getFluidStack("LiquidOxygen", 1) == null
&& FluidUtils.getFluidStack("liquidoxygen", 1) == null) {
Liquid_Oxygen = FluidUtils.generateFluidNonMolten(
- "LiquidOxygen", "Liquid Oxygen", 54, new short[] {75, 75, 220, 100}, null, null);
+ "LiquidOxygen",
+ "Liquid Oxygen",
+ 54,
+ new short[] { 75, 75, 220, 100 },
+ null,
+ null);
} else {
if (FluidUtils.getFluidStack("LiquidOxygen", 1) != null) {
Liquid_Oxygen = FluidUtils.getFluidStack("LiquidOxygen", 1).getFluid();
@@ -627,7 +618,7 @@ public class RocketFuels extends ItemPackage {
Liquid_Oxygen = FluidUtils.getFluidStack("liquidoxygen", 1).getFluid();
}
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellLiquidOxygen", 1) == null) {
- new BaseItemComponent("LiquidOxygen", "Liquid Oxygen", new short[] {10, 10, 175});
+ new BaseItemComponent("LiquidOxygen", "Liquid Oxygen", new short[] { 10, 10, 175 });
}
}
@@ -635,7 +626,12 @@ public class RocketFuels extends ItemPackage {
if (FluidUtils.getFluidStack("LiquidHydrogen", 1) == null
&& FluidUtils.getFluidStack("liquidhydrogen", 1) == null) {
Liquid_Hydrogen = FluidUtils.generateFluidNonMolten(
- "LiquidHydrogen", "Liquid Hydrogen", 14, new short[] {75, 75, 220, 100}, null, null);
+ "LiquidHydrogen",
+ "Liquid Hydrogen",
+ 14,
+ new short[] { 75, 75, 220, 100 },
+ null,
+ null);
} else {
if (FluidUtils.getFluidStack("LiquidHydrogen", 1) != null) {
Liquid_Hydrogen = FluidUtils.getFluidStack("LiquidHydrogen", 1).getFluid();
@@ -643,309 +639,156 @@ public class RocketFuels extends ItemPackage {
Liquid_Hydrogen = FluidUtils.getFluidStack("liquidhydrogen", 1).getFluid();
}
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellLiquidHydrogen", 1) == null) {
- new BaseItemComponent("LiquidHydrogen", "Liquid Hydrogen", new short[] {10, 10, 175});
+ new BaseItemComponent("LiquidHydrogen", "Liquid Hydrogen", new short[] { 10, 10, 175 });
}
}
Formaldehyde = FluidUtils.generateFluidNonMolten(
- "Formaldehyde", "Formaldehyde", 185, new short[] {150, 75, 150, 100}, null, null);
+ "Formaldehyde",
+ "Formaldehyde",
+ 185,
+ new short[] { 150, 75, 150, 100 },
+ null,
+ null);
Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide = FluidUtils.generateFluidNonMolten(
- "RocketFuelMixA", "H8N4C2O4 Rocket Fuel", 216, new short[] {50, 220, 50, 100}, null, null);
+ "RocketFuelMixA",
+ "H8N4C2O4 Rocket Fuel",
+ 216,
+ new short[] { 50, 220, 50, 100 },
+ null,
+ null);
RP1_Plus_Liquid_Oxygen = FluidUtils.generateFluidNonMolten(
- "RocketFuelMixB", "Rp-1 Rocket Fuel", 250, new short[] {250, 50, 50, 100}, null, null);
+ "RocketFuelMixB",
+ "Rp-1 Rocket Fuel",
+ 250,
+ new short[] { 250, 50, 50, 100 },
+ null,
+ null);
Monomethylhydrazine_Plus_Nitric_Acid = FluidUtils.generateFluidNonMolten(
- "RocketFuelMixC", "CN3H7O3 Rocket Fuel", 221, new short[] {125, 75, 180, 100}, null, null);
+ "RocketFuelMixC",
+ "CN3H7O3 Rocket Fuel",
+ 221,
+ new short[] { 125, 75, 180, 100 },
+ null,
+ null);
Dense_Hydrazine_Mix = FluidUtils.generateFluidNonMolten(
- "RocketFuelMixD", "Dense Hydrazine Fuel Mixture", 275, new short[] {175, 80, 120, 100}, null, null);
+ "RocketFuelMixD",
+ "Dense Hydrazine Fuel Mixture",
+ 275,
+ new short[] { 175, 80, 120, 100 },
+ null,
+ null);
}
@Override
public boolean onLoadComplete(FMLLoadCompleteEvent event) {
Logger.INFO("Trying to remove GT recipes for '1,1dimethylhydrazine' && 'rocket_fuel' if they exist.");
- /*if (FluidRegistry.isFluidRegistered("1,1dimethylhydrazine")) {
-
- // Try Remove recipes for GT/EIO Rocket Fuel Cells
- if (FluidRegistry.isFluidRegistered("rocket_fuel")) {
-
- // Old Recipe
- if (MaterialUtils.doesMaterialExist("NitrogenDioxide")) {
- GT_Recipe aOldRecipe = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellNitrogenDioxide", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("air", 500)
- },
- 388);
- boolean aDidRemove = removeRecipe(aOldRecipe, GT_Recipe_Map.sChemicalRecipes);
- Logger.INFO("Removed Old Recipe for Rocket Fuel: "+aDidRemove);
- }
-
- // Simple Recipes
- if (MaterialUtils.doesMaterialExist("Ammonia") && MaterialUtils.doesMaterialExist("Methanol")) {
-
- GT_Recipe aSimpleRecipe1 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 3),
- ItemUtils.getItemStackOfAmountFromOreDict("cellMethanol", 4),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("chlorine", 1000)
- },
- 480);
- GT_Recipe aSimpleRecipe2 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellChlorine", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("cellMethanol", 4),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("ammonia", 3000)
- },
- 480);
- GT_Recipe aSimpleRecipe3 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 3),
- ItemUtils.getItemStackOfAmountFromOreDict("cellChlorine", 1),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("methanol", 4000)
- },
- 480);
-
- boolean aDidRemove1 = removeRecipe(aSimpleRecipe1, GT_Recipe_Map.sChemicalRecipes);
- boolean aDidRemove2 = removeRecipe(aSimpleRecipe2, GT_Recipe_Map.sChemicalRecipes);
- boolean aDidRemove3 = removeRecipe(aSimpleRecipe3, GT_Recipe_Map.sChemicalRecipes);
- Logger.INFO("Removed Simple Recipe 1 for Rocket Fuel: "+aDidRemove1);
- Logger.INFO("Removed Simple Recipe 2 for Rocket Fuel: "+aDidRemove2);
- Logger.INFO("Removed Simple Recipe 3 for Rocket Fuel: "+aDidRemove3);
- }
-
-
- // Complex Recipes I
- if (MaterialUtils.doesMaterialExist("Dimethylhydrazine") && MaterialUtils.doesMaterialExist("DinitrogenTetroxide")) {
-
- GT_Recipe aAdvRecipe1 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylhydrazine", 1),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("dinitrogentetroxide", 1000)
- },
- 16);
- GT_Recipe aAdvRecipe2 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellDinitrogenTetroxide", 1),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("dimethylhydrazine", 1000)
- },
- 16);
-
- GT_Recipe aAdvRecipe3 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylhydrazine", 2),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("oxygen", 1000)
- },
- 16);
- GT_Recipe aAdvRecipe4 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("dimethylhydrazine", 2000)
- },
- 16);
-
- boolean aDidRemove1 = removeRecipe(aAdvRecipe1, GT_Recipe_Map.sMixerRecipes);
- boolean aDidRemove2 = removeRecipe(aAdvRecipe2, GT_Recipe_Map.sMixerRecipes);
- boolean aDidRemove3 = removeRecipe(aAdvRecipe3, GT_Recipe_Map.sMixerRecipes);
- boolean aDidRemove4 = removeRecipe(aAdvRecipe4, GT_Recipe_Map.sMixerRecipes);
- Logger.INFO("Removed Complex Recipe 1 for Rocket Fuel: "+aDidRemove1);
- Logger.INFO("Removed Complex Recipe 2 for Rocket Fuel: "+aDidRemove2);
- Logger.INFO("Removed Complex Recipe 3 for Rocket Fuel: "+aDidRemove3);
- Logger.INFO("Removed Complex Recipe 4 for Rocket Fuel: "+aDidRemove4);
- }
- }
-
-
- // Complex Recipes II
- if (MaterialUtils.doesMaterialExist("Dimethylhydrazine")) {
-
- GT_Recipe aAdvRecipe1 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylhydrazine", 2),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("oxygen", 1000)
- },
- 16);
- GT_Recipe aAdvRecipe2 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("dimethylhydrazine", 2000)
- },
- 16);
-
- boolean aDidRemove1 = removeRecipe(aAdvRecipe1, GT_Recipe_Map.sMixerRecipes);
- boolean aDidRemove2 = removeRecipe(aAdvRecipe2, GT_Recipe_Map.sMixerRecipes);
- Logger.INFO("Removed Complex Recipe 5 for Rocket Fuel: "+aDidRemove1);
- Logger.INFO("Removed Complex Recipe 6 for Rocket Fuel: "+aDidRemove2);
- }
-
- if (MaterialUtils.doesMaterialExist("Chloramine") && MaterialUtils.doesMaterialExist("Dimethylamine")) {
- GT_Recipe aSimpleRecipe1 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 2),
- GT_Utility.getIntegratedCircuit(1)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("dimethylamine", 5000)
- },
- 480);
- GT_Recipe aSimpleRecipe2 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 5),
- GT_Utility.getIntegratedCircuit(1)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("chloramine", 2000)
- },
- 16);
-
-
-
- GT_Recipe aAdvRecipe1 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 2),
- CI.emptyCells(4)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("dimethylamine", 5000)
- },
- 480);
- GT_Recipe aAdvRecipe2 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 5),
- CI.emptyCells(1)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("chloramine", 2000)
- },
- 16);
- GT_Recipe aAdvRecipe3 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 5),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("chloramine", 2000)
- },
- 480);
-
- boolean aDidRemove1 = removeRecipe(aSimpleRecipe1, GT_Recipe_Map.sChemicalRecipes);
- boolean aDidRemove2 = removeRecipe(aSimpleRecipe2, GT_Recipe_Map.sChemicalRecipes);
- boolean aDidRemove3 = removeRecipe(aAdvRecipe1, GT_Recipe_Map.sChemicalRecipes);
- boolean aDidRemove4 = removeRecipe(aAdvRecipe2, GT_Recipe_Map.sChemicalRecipes);
- boolean aDidRemove5 = removeRecipe(aAdvRecipe3, GT_Recipe_Map.sChemicalRecipes);
- Logger.INFO("Removed Complex Recipe 1 for 1,1dimethylhydrazine: "+aDidRemove1);
- Logger.INFO("Removed Complex Recipe 2 for 1,1dimethylhydrazine: "+aDidRemove2);
- Logger.INFO("Removed Complex Recipe 3 for 1,1dimethylhydrazine: "+aDidRemove3);
- Logger.INFO("Removed Complex Recipe 4 for 1,1dimethylhydrazine: "+aDidRemove4);
- Logger.INFO("Removed Complex Recipe 5 for 1,1dimethylhydrazine: "+aDidRemove5);
-
- }
-
- if (MaterialUtils.doesMaterialExist("Chloramine") && MaterialUtils.doesMaterialExist("Dimethylamine")) {
- GT_Recipe aSimpleRecipe1 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 1),
- GT_Utility.getIntegratedCircuit(1)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("dimethylamine", 1000)
- },
- 480);
- GT_Recipe aSimpleRecipe2 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 1),
- GT_Utility.getIntegratedCircuit(1)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("chloramine", 1000)
- },
- 16);
-
-
-
- GT_Recipe aAdvRecipe1 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 1),
- GT_Utility.getIntegratedCircuit(11)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("dimethylamine", 1000)
- },
- 480);
- GT_Recipe aAdvRecipe2 = getHalfBakedRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 1),
- GT_Utility.getIntegratedCircuit(11)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("chloramine", 1000)
- },
- 16);
-
- boolean aDidRemove1 = removeRecipe(aSimpleRecipe1, GT_Recipe_Map.sChemicalRecipes);
- boolean aDidRemove2 = removeRecipe(aSimpleRecipe2, GT_Recipe_Map.sChemicalRecipes);
- boolean aDidRemove3 = removeRecipe(aAdvRecipe1, GT_Recipe_Map.sChemicalRecipes);
- boolean aDidRemove4 = removeRecipe(aAdvRecipe2, GT_Recipe_Map.sChemicalRecipes);
- Logger.INFO("Removed Complex Recipe 5 for 1,1dimethylhydrazine: "+aDidRemove1);
- Logger.INFO("Removed Complex Recipe 6 for 1,1dimethylhydrazine: "+aDidRemove2);
- Logger.INFO("Removed Complex Recipe 7 for 1,1dimethylhydrazine: "+aDidRemove3);
- Logger.INFO("Removed Complex Recipe 8 for 1,1dimethylhydrazine: "+aDidRemove4);
-
- }
-
- if (MaterialUtils.doesMaterialExist("HypochlorousAcid") && MaterialUtils.doesMaterialExist("Ammonia") && MaterialUtils.doesMaterialExist("Methanol")) {
-
- GT_Recipe aAdvRecipe1 = getHalfBakedRecipe(
- new ItemStack[] {
- GT_Utility.getIntegratedCircuit(24),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("hypochlorousacid", 3000),
- FluidUtils.getFluidStack("ammonia", 8000),
- FluidUtils.getFluidStack("methanol", 12000)
- },
- 480);
-
- GT_Recipe aAdvRecipe2 = getHalfBakedRecipe(
- new ItemStack[] {
- GT_Utility.getIntegratedCircuit(24),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack("hypochlorousacid", 1000),
- FluidUtils.getFluidStack("ammonia", 1000),
- FluidUtils.getFluidStack("methanol", 2000)
- },
- 480);
-
- boolean aDidRemove1 = removeRecipe(aAdvRecipe1, StaticFields59.getLargeChemicalReactorRecipeMap());
- boolean aDidRemove2 = removeRecipe(aAdvRecipe2, StaticFields59.getLargeChemicalReactorRecipeMap());
- Logger.INFO("Removed Complex Recipe 9 for 1,1dimethylhydrazine: "+aDidRemove1);
- Logger.INFO("Removed Complex Recipe 10 for 1,1dimethylhydrazine: "+aDidRemove2);
-
-
- }
- }*/
+ /*
+ * if (FluidRegistry.isFluidRegistered("1,1dimethylhydrazine")) { // Try Remove recipes for GT/EIO Rocket Fuel
+ * Cells if (FluidRegistry.isFluidRegistered("rocket_fuel")) { // Old Recipe if
+ * (MaterialUtils.doesMaterialExist("NitrogenDioxide")) { GT_Recipe aOldRecipe = getHalfBakedRecipe( new
+ * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellNitrogenDioxide", 1),
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("air", 500) }, 388); boolean aDidRemove = removeRecipe(aOldRecipe,
+ * GT_Recipe_Map.sChemicalRecipes); Logger.INFO("Removed Old Recipe for Rocket Fuel: "+aDidRemove); } // Simple
+ * Recipes if (MaterialUtils.doesMaterialExist("Ammonia") && MaterialUtils.doesMaterialExist("Methanol")) {
+ * GT_Recipe aSimpleRecipe1 = getHalfBakedRecipe( new ItemStack[] {
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 3),
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellMethanol", 4), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("chlorine", 1000) }, 480); GT_Recipe aSimpleRecipe2 = getHalfBakedRecipe( new
+ * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellChlorine", 1),
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellMethanol", 4), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("ammonia", 3000) }, 480); GT_Recipe aSimpleRecipe3 = getHalfBakedRecipe( new
+ * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 3),
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellChlorine", 1), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("methanol", 4000) }, 480); boolean aDidRemove1 = removeRecipe(aSimpleRecipe1,
+ * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove2 = removeRecipe(aSimpleRecipe2,
+ * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove3 = removeRecipe(aSimpleRecipe3,
+ * GT_Recipe_Map.sChemicalRecipes); Logger.INFO("Removed Simple Recipe 1 for Rocket Fuel: "+aDidRemove1);
+ * Logger.INFO("Removed Simple Recipe 2 for Rocket Fuel: "+aDidRemove2);
+ * Logger.INFO("Removed Simple Recipe 3 for Rocket Fuel: "+aDidRemove3); } // Complex Recipes I if
+ * (MaterialUtils.doesMaterialExist("Dimethylhydrazine") &&
+ * MaterialUtils.doesMaterialExist("DinitrogenTetroxide")) { GT_Recipe aAdvRecipe1 = getHalfBakedRecipe( new
+ * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylhydrazine", 1), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("dinitrogentetroxide", 1000) }, 16); GT_Recipe aAdvRecipe2 = getHalfBakedRecipe( new
+ * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDinitrogenTetroxide", 1), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("dimethylhydrazine", 1000) }, 16); GT_Recipe aAdvRecipe3 = getHalfBakedRecipe( new
+ * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylhydrazine", 2), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("oxygen", 1000) }, 16); GT_Recipe aAdvRecipe4 = getHalfBakedRecipe( new ItemStack[]
+ * { ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("dimethylhydrazine", 2000) }, 16); boolean aDidRemove1 = removeRecipe(aAdvRecipe1,
+ * GT_Recipe_Map.sMixerRecipes); boolean aDidRemove2 = removeRecipe(aAdvRecipe2, GT_Recipe_Map.sMixerRecipes);
+ * boolean aDidRemove3 = removeRecipe(aAdvRecipe3, GT_Recipe_Map.sMixerRecipes); boolean aDidRemove4 =
+ * removeRecipe(aAdvRecipe4, GT_Recipe_Map.sMixerRecipes);
+ * Logger.INFO("Removed Complex Recipe 1 for Rocket Fuel: "+aDidRemove1);
+ * Logger.INFO("Removed Complex Recipe 2 for Rocket Fuel: "+aDidRemove2);
+ * Logger.INFO("Removed Complex Recipe 3 for Rocket Fuel: "+aDidRemove3);
+ * Logger.INFO("Removed Complex Recipe 4 for Rocket Fuel: "+aDidRemove4); } } // Complex Recipes II if
+ * (MaterialUtils.doesMaterialExist("Dimethylhydrazine")) { GT_Recipe aAdvRecipe1 = getHalfBakedRecipe( new
+ * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylhydrazine", 2), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("oxygen", 1000) }, 16); GT_Recipe aAdvRecipe2 = getHalfBakedRecipe( new ItemStack[]
+ * { ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("dimethylhydrazine", 2000) }, 16); boolean aDidRemove1 = removeRecipe(aAdvRecipe1,
+ * GT_Recipe_Map.sMixerRecipes); boolean aDidRemove2 = removeRecipe(aAdvRecipe2, GT_Recipe_Map.sMixerRecipes);
+ * Logger.INFO("Removed Complex Recipe 5 for Rocket Fuel: "+aDidRemove1);
+ * Logger.INFO("Removed Complex Recipe 6 for Rocket Fuel: "+aDidRemove2); } if
+ * (MaterialUtils.doesMaterialExist("Chloramine") && MaterialUtils.doesMaterialExist("Dimethylamine")) {
+ * GT_Recipe aSimpleRecipe1 = getHalfBakedRecipe( new ItemStack[] {
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 2), GT_Utility.getIntegratedCircuit(1) }, new
+ * FluidStack[] { FluidUtils.getFluidStack("dimethylamine", 5000) }, 480); GT_Recipe aSimpleRecipe2 =
+ * getHalfBakedRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 5),
+ * GT_Utility.getIntegratedCircuit(1) }, new FluidStack[] { FluidUtils.getFluidStack("chloramine", 2000) }, 16);
+ * GT_Recipe aAdvRecipe1 = getHalfBakedRecipe( new ItemStack[] {
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 2), CI.emptyCells(4) }, new FluidStack[] {
+ * FluidUtils.getFluidStack("dimethylamine", 5000) }, 480); GT_Recipe aAdvRecipe2 = getHalfBakedRecipe( new
+ * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 5), CI.emptyCells(1) }, new
+ * FluidStack[] { FluidUtils.getFluidStack("chloramine", 2000) }, 16); GT_Recipe aAdvRecipe3 =
+ * getHalfBakedRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 2),
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 5), }, new FluidStack[] {
+ * FluidUtils.getFluidStack("chloramine", 2000) }, 480); boolean aDidRemove1 = removeRecipe(aSimpleRecipe1,
+ * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove2 = removeRecipe(aSimpleRecipe2,
+ * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove3 = removeRecipe(aAdvRecipe1,
+ * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove4 = removeRecipe(aAdvRecipe2,
+ * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove5 = removeRecipe(aAdvRecipe3,
+ * GT_Recipe_Map.sChemicalRecipes);
+ * Logger.INFO("Removed Complex Recipe 1 for 1,1dimethylhydrazine: "+aDidRemove1);
+ * Logger.INFO("Removed Complex Recipe 2 for 1,1dimethylhydrazine: "+aDidRemove2);
+ * Logger.INFO("Removed Complex Recipe 3 for 1,1dimethylhydrazine: "+aDidRemove3);
+ * Logger.INFO("Removed Complex Recipe 4 for 1,1dimethylhydrazine: "+aDidRemove4);
+ * Logger.INFO("Removed Complex Recipe 5 for 1,1dimethylhydrazine: "+aDidRemove5); } if
+ * (MaterialUtils.doesMaterialExist("Chloramine") && MaterialUtils.doesMaterialExist("Dimethylamine")) {
+ * GT_Recipe aSimpleRecipe1 = getHalfBakedRecipe( new ItemStack[] {
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 1), GT_Utility.getIntegratedCircuit(1) }, new
+ * FluidStack[] { FluidUtils.getFluidStack("dimethylamine", 1000) }, 480); GT_Recipe aSimpleRecipe2 =
+ * getHalfBakedRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 1),
+ * GT_Utility.getIntegratedCircuit(1) }, new FluidStack[] { FluidUtils.getFluidStack("chloramine", 1000) }, 16);
+ * GT_Recipe aAdvRecipe1 = getHalfBakedRecipe( new ItemStack[] {
+ * ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 1), GT_Utility.getIntegratedCircuit(11) }, new
+ * FluidStack[] { FluidUtils.getFluidStack("dimethylamine", 1000) }, 480); GT_Recipe aAdvRecipe2 =
+ * getHalfBakedRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 1),
+ * GT_Utility.getIntegratedCircuit(11) }, new FluidStack[] { FluidUtils.getFluidStack("chloramine", 1000) },
+ * 16); boolean aDidRemove1 = removeRecipe(aSimpleRecipe1, GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove2
+ * = removeRecipe(aSimpleRecipe2, GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove3 =
+ * removeRecipe(aAdvRecipe1, GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove4 = removeRecipe(aAdvRecipe2,
+ * GT_Recipe_Map.sChemicalRecipes);
+ * Logger.INFO("Removed Complex Recipe 5 for 1,1dimethylhydrazine: "+aDidRemove1);
+ * Logger.INFO("Removed Complex Recipe 6 for 1,1dimethylhydrazine: "+aDidRemove2);
+ * Logger.INFO("Removed Complex Recipe 7 for 1,1dimethylhydrazine: "+aDidRemove3);
+ * Logger.INFO("Removed Complex Recipe 8 for 1,1dimethylhydrazine: "+aDidRemove4); } if
+ * (MaterialUtils.doesMaterialExist("HypochlorousAcid") && MaterialUtils.doesMaterialExist("Ammonia") &&
+ * MaterialUtils.doesMaterialExist("Methanol")) { GT_Recipe aAdvRecipe1 = getHalfBakedRecipe( new ItemStack[] {
+ * GT_Utility.getIntegratedCircuit(24), }, new FluidStack[] { FluidUtils.getFluidStack("hypochlorousacid",
+ * 3000), FluidUtils.getFluidStack("ammonia", 8000), FluidUtils.getFluidStack("methanol", 12000) }, 480);
+ * GT_Recipe aAdvRecipe2 = getHalfBakedRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(24), }, new
+ * FluidStack[] { FluidUtils.getFluidStack("hypochlorousacid", 1000), FluidUtils.getFluidStack("ammonia", 1000),
+ * FluidUtils.getFluidStack("methanol", 2000) }, 480); boolean aDidRemove1 = removeRecipe(aAdvRecipe1,
+ * StaticFields59.getLargeChemicalReactorRecipeMap()); boolean aDidRemove2 = removeRecipe(aAdvRecipe2,
+ * StaticFields59.getLargeChemicalReactorRecipeMap());
+ * Logger.INFO("Removed Complex Recipe 9 for 1,1dimethylhydrazine: "+aDidRemove1);
+ * Logger.INFO("Removed Complex Recipe 10 for 1,1dimethylhydrazine: "+aDidRemove2); } }
+ */
// Try Butcher recipes manually
@@ -955,8 +798,7 @@ public class RocketFuels extends ItemPackage {
AutoMap<GT_Recipe> aToRemoveSingle = new AutoMap<GT_Recipe>();
ItemStack aUnsymCell = ItemUtils.getItemStackOfAmountFromOreDict("cell1,1Dimethylhydrazine", 1);
FluidStack aUnsymFluid = FluidUtils.getFluidStack("1,1dimethylhydrazine", 1);
- recipe:
- for (GT_Recipe aRecipeSingleBlock : GT_Recipe_Map.sChemicalRecipes.mRecipeList) {
+ recipe: for (GT_Recipe aRecipeSingleBlock : GT_Recipe_Map.sChemicalRecipes.mRecipeList) {
if (aRecipeSingleBlock != null && aRecipeSingleBlock.mEnabled) {
if (aRecipeSingleBlock.mOutputs != null && aRecipeSingleBlock.mOutputs.length > 0) {
for (ItemStack aOutputItem : aRecipeSingleBlock.mOutputs) {
@@ -980,8 +822,7 @@ public class RocketFuels extends ItemPackage {
}
// Handle Multi Also
AutoMap<GT_Recipe> aToRemoveMulti = new AutoMap<GT_Recipe>();
- recipe:
- for (GT_Recipe aRecipeSingleBlock : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
+ recipe: for (GT_Recipe aRecipeSingleBlock : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
if (aRecipeSingleBlock != null && aRecipeSingleBlock.mEnabled) {
if (aRecipeSingleBlock.mOutputs != null && aRecipeSingleBlock.mOutputs.length > 0) {
for (ItemStack aOutputItem : aRecipeSingleBlock.mOutputs) {
@@ -1012,9 +853,7 @@ public class RocketFuels extends ItemPackage {
if (!aToRemoveMulti.isEmpty()) {
Logger.INFO("Found " + aToRemoveSingle.size() + " multiblock recipes, removing by force.");
for (GT_Recipe remove : aToRemoveMulti) {
- StaticFields59.getLargeChemicalReactorRecipeMap()
- .mRecipeList
- .remove(remove);
+ StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList.remove(remove);
}
}
}
@@ -1023,8 +862,7 @@ public class RocketFuels extends ItemPackage {
Logger.INFO("Making sure all Mixer recipes for rocket_fuel have been removed.");
AutoMap<GT_Recipe> aToRemoveSingle = new AutoMap<GT_Recipe>();
FluidStack aRocketFluid = FluidUtils.getFluidStack("rocket_fuel", 1);
- recipe:
- for (GT_Recipe aRecipeSingleBlock : GT_Recipe_Map.sMixerRecipes.mRecipeList) {
+ recipe: for (GT_Recipe aRecipeSingleBlock : GT_Recipe_Map.sMixerRecipes.mRecipeList) {
if (aRecipeSingleBlock != null && aRecipeSingleBlock.mEnabled) {
if (aRecipeSingleBlock.mFluidOutputs != null && aRecipeSingleBlock.mFluidOutputs.length > 0) {
for (FluidStack aOutput : aRecipeSingleBlock.mFluidOutputs) {
@@ -1045,8 +883,7 @@ public class RocketFuels extends ItemPackage {
}
Logger.INFO("Making sure all Chemical Reactor recipes for rocket_fuel have been removed.");
- recipe:
- for (GT_Recipe aRecipeSingleBlock : GT_Recipe_Map.sChemicalRecipes.mRecipeList) {
+ recipe: for (GT_Recipe aRecipeSingleBlock : GT_Recipe_Map.sChemicalRecipes.mRecipeList) {
if (aRecipeSingleBlock != null && aRecipeSingleBlock.mEnabled) {
if (aRecipeSingleBlock.mFluidOutputs != null && aRecipeSingleBlock.mFluidOutputs.length > 0) {
for (FluidStack aOutput : aRecipeSingleBlock.mFluidOutputs) {
@@ -1060,8 +897,7 @@ public class RocketFuels extends ItemPackage {
}
// Handle Multi Also
AutoMap<GT_Recipe> aToRemoveMulti = new AutoMap<GT_Recipe>();
- recipe:
- for (GT_Recipe aRecipeSingleBlock : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
+ recipe: for (GT_Recipe aRecipeSingleBlock : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
if (aRecipeSingleBlock != null && aRecipeSingleBlock.mEnabled) {
if (aRecipeSingleBlock.mFluidOutputs != null && aRecipeSingleBlock.mFluidOutputs.length > 0) {
for (FluidStack aOutput : aRecipeSingleBlock.mFluidOutputs) {
@@ -1082,9 +918,7 @@ public class RocketFuels extends ItemPackage {
if (!aToRemoveMulti.isEmpty()) {
Logger.INFO("Found " + aToRemoveSingle.size() + " multiblock recipes, removing by force.");
for (GT_Recipe remove : aToRemoveMulti) {
- StaticFields59.getLargeChemicalReactorRecipeMap()
- .mRecipeList
- .remove(remove);
+ StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList.remove(remove);
}
}
}
@@ -1099,8 +933,8 @@ public class RocketFuels extends ItemPackage {
public static boolean removeRecipe(GT_Recipe aRecipe, GT_Recipe_Map aMap) {
if (aMap != GT_Recipe_Map.sChemicalRecipes) {
- GT_Recipe aFoundRecipe =
- aMap.findRecipe(null, false, true, aRecipe.mEUt, aRecipe.mFluidInputs, aRecipe.mInputs);
+ GT_Recipe aFoundRecipe = aMap
+ .findRecipe(null, false, true, aRecipe.mEUt, aRecipe.mFluidInputs, aRecipe.mInputs);
boolean aSingle = false;
if (aFoundRecipe != null) {
Logger.INFO("Found Single Block Recipe, removing.");
@@ -1109,8 +943,8 @@ public class RocketFuels extends ItemPackage {
}
return aSingle;
} else {
- GT_Recipe aFoundRecipe =
- aMap.findRecipe(null, false, true, aRecipe.mEUt, aRecipe.mFluidInputs, aRecipe.mInputs);
+ GT_Recipe aFoundRecipe = aMap
+ .findRecipe(null, false, true, aRecipe.mEUt, aRecipe.mFluidInputs, aRecipe.mInputs);
GT_Recipe aFoundRecipe2 = StaticFields59.getLargeChemicalReactorRecipeMap()
.findRecipe(null, false, true, aRecipe.mEUt, aRecipe.mFluidInputs, aRecipe.mInputs);
boolean aSingle = false;
@@ -1122,9 +956,7 @@ public class RocketFuels extends ItemPackage {
}
if (aFoundRecipe2 != null) {
Logger.INFO("Found Multiblock Recipe, removing.");
- aMulti = StaticFields59.getLargeChemicalReactorRecipeMap()
- .mRecipeList
- .remove(aFoundRecipe2);
+ aMulti = StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList.remove(aFoundRecipe2);
Logger.INFO("Success? " + aSingle);
}
return aSingle && aMulti;
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
index 1b8a5f21cc..f67b37d9b9 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
@@ -1,13 +1,8 @@
package gtPlusPlus.core.item.chemistry;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.item.base.misc.BaseItemParticle;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Particle;
-import gtPlusPlus.core.material.Particle.ElementaryGroup;
-import gtPlusPlus.core.util.Utils;
import java.util.HashMap;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
@@ -15,6 +10,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.item.base.misc.BaseItemParticle;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Particle;
+import gtPlusPlus.core.material.Particle.ElementaryGroup;
+import gtPlusPlus.core.util.Utils;
+
public class StandardBaseParticles extends BaseItemParticle {
public static HashMap<String, Integer> NameToMetaMap = new HashMap<String, Integer>();
@@ -24,33 +26,10 @@ public class StandardBaseParticles extends BaseItemParticle {
super("Base", aTypes.length, EnumRarity.rare);
}
- private static final String[] aTypes = new String[] {
- "Graviton",
- "Up",
- "Down",
- "Charm",
- "Strange",
- "Top",
- "Bottom",
- "Electron",
- "Electron Neutrino",
- "Muon",
- "Muon Neutrino",
- "Tau",
- "Tau Neutrino",
- "Gluon",
- "Photon",
- "Z Boson",
- "W Boson",
- "Higgs Boson",
- "Proton",
- "Neutron",
- "Lambda",
- "Omega",
- "Pion",
- "ETA Meson",
- "Unknown"
- };
+ private static final String[] aTypes = new String[] { "Graviton", "Up", "Down", "Charm", "Strange", "Top", "Bottom",
+ "Electron", "Electron Neutrino", "Muon", "Muon Neutrino", "Tau", "Tau Neutrino", "Gluon", "Photon",
+ "Z Boson", "W Boson", "Higgs Boson", "Proton", "Neutron", "Lambda", "Omega", "Pion", "ETA Meson",
+ "Unknown" };
public IIcon[] icons = new IIcon[aTypes.length];
@@ -93,7 +72,7 @@ public class StandardBaseParticles extends BaseItemParticle {
@Override
public String[] getAffixes() {
- return new String[] {"", ""};
+ return new String[] { "", "" };
}
@Override
@@ -124,7 +103,7 @@ public class StandardBaseParticles extends BaseItemParticle {
return super.getColorFromParentClass(stack, HEX_OxFFFFFF);
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
Particle aCharge = getParticle(stack);
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
index b8a1bc4041..76d66f9e41 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
@@ -1,11 +1,7 @@
package gtPlusPlus.core.item.chemistry.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.item.chemistry.GenericChem;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
@@ -18,6 +14,12 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.item.chemistry.GenericChem;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class ItemGenericChemBase extends Item {
protected final IIcon base[];
@@ -25,34 +27,19 @@ public class ItemGenericChemBase extends Item {
private final int aMetaSize = 28;
/*
- * 0 - Red Metal Catalyst //FeCu
- * 1 - Yellow Metal Catalyst //WNi
- * 2 - Blue Metal Catalyst //CoTi
- * 3 - Orange Metal Catalyst //Vanadium Pd
- * 4 - Purple Metal Catalyst //IrIdium Ruthenium
- * 5 - Brown Metal Catalyst //NiAl
- * 6 - Pink Metal Catalyst //PtRh
- * 7 - Alumina Grinding Ball
- * 8 - Soapstone Grinding Ball
- * 9 - Sodium Ethoxide // 2 Sodium + 1 Ethanol | 2 C2H5OH + 2 Na → 2 C2H5ONa + H2
- * 10 - Sodium Ethyl Xanthate //CH3CH2ONa + CS2 → CH3CH2OCS2Na
- * 11 - Potassium Ethyl Xanthate //CH3CH2OH + CS2 + KOH → CH3CH2OCS2K + H2O
- * 12 - Potassium Hydroxide // KOH
- * 13 - Formaldehyde Catalyst //Fe16V1
- * 14 - Solid Acid Catalyst //H2SO4
- * 15 - Infinite Mutation Catalyst (for Mutated Living Solder)
- * 16 - Platinum Group Catalyst (for platline skip)
- * 17 - Plastic Polymer Catalyst (for early plastics skip)
- * 18 - Rubber Polymer Catalyst (for early rubbers skip)
- * 19 - Adhesion Promoter Catalyst (for glue/solder skip)
- * 20 - Tita-Tungsten Indium Catalyst (for titanium/tungsten/indium skip)
- * 21 - Radioactivity Catalyst (for thorium/uranium/plutonium skip)
- * 22 - Rare-Earth Group Catalyst (for monaline skip)
- * 23 - Simple Naquadah Catalyst (for early naqline skip)
- * 24 - Advanced Naquadah Catalyst (for late naqline skip)
- * 25 - Raw Intelligence Catalyst (for stem cells skip)
- * 26 - Ultimate Plasticizer Catalyst (for late plastics skip)
- * 27 - Biological Intelligence Catalyst (for bio cells skip)
+ * 0 - Red Metal Catalyst //FeCu 1 - Yellow Metal Catalyst //WNi 2 - Blue Metal Catalyst //CoTi 3 - Orange Metal
+ * Catalyst //Vanadium Pd 4 - Purple Metal Catalyst //IrIdium Ruthenium 5 - Brown Metal Catalyst //NiAl 6 - Pink
+ * Metal Catalyst //PtRh 7 - Alumina Grinding Ball 8 - Soapstone Grinding Ball 9 - Sodium Ethoxide // 2 Sodium + 1
+ * Ethanol | 2 C2H5OH + 2 Na → 2 C2H5ONa + H2 10 - Sodium Ethyl Xanthate //CH3CH2ONa + CS2 → CH3CH2OCS2Na 11 -
+ * Potassium Ethyl Xanthate //CH3CH2OH + CS2 + KOH → CH3CH2OCS2K + H2O 12 - Potassium Hydroxide // KOH 13 -
+ * Formaldehyde Catalyst //Fe16V1 14 - Solid Acid Catalyst //H2SO4 15 - Infinite Mutation Catalyst (for Mutated
+ * Living Solder) 16 - Platinum Group Catalyst (for platline skip) 17 - Plastic Polymer Catalyst (for early plastics
+ * skip) 18 - Rubber Polymer Catalyst (for early rubbers skip) 19 - Adhesion Promoter Catalyst (for glue/solder
+ * skip) 20 - Tita-Tungsten Indium Catalyst (for titanium/tungsten/indium skip) 21 - Radioactivity Catalyst (for
+ * thorium/uranium/plutonium skip) 22 - Rare-Earth Group Catalyst (for monaline skip) 23 - Simple Naquadah Catalyst
+ * (for early naqline skip) 24 - Advanced Naquadah Catalyst (for late naqline skip) 25 - Raw Intelligence Catalyst
+ * (for stem cells skip) 26 - Ultimate Plasticizer Catalyst (for late plastics skip) 27 - Biological Intelligence
+ * Catalyst (for bio cells skip)
*/
public ItemGenericChemBase() {
@@ -84,8 +71,8 @@ public class ItemGenericChemBase extends Item {
}
@Override
- public void onUpdate(
- ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
+ public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_,
+ boolean p_77663_5_) {
super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_);
}
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java
index 4e3ca1477e..07ca7e02a7 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java
@@ -1,9 +1,7 @@
package gtPlusPlus.core.item.chemistry.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
@@ -14,6 +12,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class ItemNuclearChemBase extends Item {
protected final IIcon base[];
@@ -21,10 +23,7 @@ public class ItemNuclearChemBase extends Item {
private final int aMetaSize = 4;
/*
- * 0 - Uranium Residue
- * 1 - Plutonium Residue
- * 2 - Fluoride Reside
- * 3 - Noble Gas Residue
+ * 0 - Uranium Residue 1 - Plutonium Residue 2 - Fluoride Reside 3 - Noble Gas Residue
*/
public ItemNuclearChemBase() {
@@ -53,8 +52,8 @@ public class ItemNuclearChemBase extends Item {
}
@Override
- public void onUpdate(
- ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
+ public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_,
+ boolean p_77663_5_) {
super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_);
}
diff --git a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java b/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java
index cbc7be7efc..3c70981ff5 100644
--- a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java
+++ b/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java
@@ -1,22 +1,11 @@
package gtPlusPlus.core.item.circuit;
-import com.gtnewhorizons.modularui.api.UIInfos;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.interfaces.INetworkUpdatableItem;
-import gregtech.api.net.GT_Packet_UpdateItem;
-import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.BiFunction;
import java.util.function.Predicate;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -32,9 +21,25 @@ import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.common.util.FakePlayer;
+
import org.apache.commons.lang3.tuple.Pair;
+import com.gtnewhorizons.modularui.api.UIInfos;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.interfaces.INetworkUpdatableItem;
+import gregtech.api.net.GT_Packet_UpdateItem;
+import gregtech.api.objects.XSTR;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatableItem {
+
private final List<ItemStack> ALL_VARIANTS = new ArrayList<>();
private final String iconLocation;
@@ -64,18 +69,14 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab
public void addInformation(ItemStack aStack, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
try {
aList.add("Configuration == " + aStack.getItemDamage());
- aList.add(GT_LanguageManager.addStringLocalization(
- new StringBuilder()
- .append(getUnlocalizedName())
- .append(".tooltip.0")
- .toString(),
- "Right click to reconfigure"));
- aList.add(GT_LanguageManager.addStringLocalization(
- new StringBuilder()
- .append(getUnlocalizedName())
- .append(".tooltip.1")
- .toString(),
- "Needs a screwdriver or circuit programming tool"));
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
+ new StringBuilder().append(getUnlocalizedName()).append(".tooltip.0").toString(),
+ "Right click to reconfigure"));
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
+ new StringBuilder().append(getUnlocalizedName()).append(".tooltip.1").toString(),
+ "Needs a screwdriver or circuit programming tool"));
} catch (Throwable t) {
t.printStackTrace();
}
@@ -165,13 +166,15 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab
count = Integer.parseInt(
StatCollector.translateToLocal("GT5U.item.programmed_circuit.no_screwdriver.count"));
} catch (NumberFormatException e) {
- player.addChatComponentMessage(new ChatComponentText(
- "Error in translation GT5U.item.programmed_circuit.no_screwdriver.count: "
- + e.getMessage()));
+ player.addChatComponentMessage(
+ new ChatComponentText(
+ "Error in translation GT5U.item.programmed_circuit.no_screwdriver.count: "
+ + e.getMessage()));
count = 1;
}
- player.addChatComponentMessage(new ChatComponentTranslation(
- "GT5U.item.programmed_circuit.no_screwdriver." + XSTR.XSTR_INSTANCE.nextInt(count)));
+ player.addChatComponentMessage(
+ new ChatComponentTranslation(
+ "GT5U.item.programmed_circuit.no_screwdriver." + XSTR.XSTR_INSTANCE.nextInt(count)));
return stack;
}
configuratorStack = player.inventory.mainInventory[configurator.getKey()];
@@ -181,14 +184,15 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab
}
private void openSelectorGui(ItemStack configurator, int meta, EntityPlayer player) {
- UIInfos.openClientUI(player, buildContext -> new SelectItemUIFactory(
+ UIInfos.openClientUI(
+ player,
+ buildContext -> new SelectItemUIFactory(
StatCollector.translateToLocal("GT5U.item.programmed_circuit.select.header"),
configurator,
GTPP_IntegratedCircuit_Item::onConfigured,
ALL_VARIANTS,
meta,
- true)
- .createWindow(buildContext));
+ true).createWindow(buildContext));
}
private static void onConfigured(ItemStack stack) {
@@ -205,8 +209,8 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab
if (!GT_Utility.isStackValid(toolStack)) continue;
- for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p :
- GregTech_API.sCircuitProgrammerList.entrySet())
+ for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTech_API.sCircuitProgrammerList
+ .entrySet())
if (p.getKey().test(toolStack)) return Pair.of(j, p.getValue());
}
return null;
diff --git a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
index ddd3ab1542..13da48410a 100644
--- a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
+++ b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
@@ -1,5 +1,13 @@
package gtPlusPlus.core.item.crafting;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.item.ModItems;
@@ -7,16 +15,11 @@ import gtPlusPlus.core.item.general.ItemGenericToken;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
public class ItemDummyResearch extends ItemGenericToken {
public static enum ASSEMBLY_LINE_RESEARCH {
+
RESEARCH_1_CONTAINMENT("Containment Fields", "Advanced scientific study"),
RESEARCH_2_BASIC_CHEM("Basic Chemistry", "Time to start at the beginning"),
RESEARCH_3_ADV_CHEM("Advanced Chemistry", "Best learn more than chemical equations"),
@@ -52,13 +55,13 @@ public class ItemDummyResearch extends ItemGenericToken {
private int aID = 0;
public ItemDummyResearch() {
- super("dummyResearch", "Research", new String[] {"This object requires some further study"}, "research");
+ super("dummyResearch", "Research", new String[] { "This object requires some further study" }, "research");
}
/**
*
* @param aResearchType - What is the research for?
- * @param aDescriptThe - tooltip for this research
+ * @param aDescriptThe - tooltip for this research
* @return - Did we register a custom research item?
*/
public boolean register(String aResearchType, String aDescript) {
@@ -73,7 +76,7 @@ public class ItemDummyResearch extends ItemGenericToken {
id,
aLocalName,
1,
- new String[] {aDescript, EnumChatFormatting.DARK_GRAY + "Used to further your knowledge"},
+ new String[] { aDescript, EnumChatFormatting.DARK_GRAY + "Used to further your knowledge" },
EnumRarity.common,
EnumChatFormatting.LIGHT_PURPLE);
}
diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java b/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java
index 310a940090..ac51c20a18 100644
--- a/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java
+++ b/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java
@@ -1,23 +1,20 @@
package gtPlusPlus.core.item.effects;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
/*
- *
-This determines the name colour. EnumRarity can be:
-EnumRarity.common - the standard white colour.
-EnumRarity.uncommon - a yellow colour.
-EnumRarity.rare - a light blue colour. This is used for enchanted items.
-EnumRarity.epic - the purple colour used on the Golden Apple.
-@SideOnly is an FML annotation. It marks the method below it for existing only on one side. Possible values are:
-Side.CLIENT is probably the most common one. This marks the method as existing only on the client side.
-Side.SERVER marks the method as existing only on the server side.
- *
+ * This determines the name colour. EnumRarity can be: EnumRarity.common - the standard white colour.
+ * EnumRarity.uncommon - a yellow colour. EnumRarity.rare - a light blue colour. This is used for enchanted items.
+ * EnumRarity.epic - the purple colour used on the Golden Apple.
+ * @SideOnly is an FML annotation. It marks the method below it for existing only on one side. Possible values are:
+ * Side.CLIENT is probably the most common one. This marks the method as existing only on the client side. Side.SERVER
+ * marks the method as existing only on the server side.
*/
public class RarityEffect extends Item {
diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java b/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java
index a1234d6885..a8081615d7 100644
--- a/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java
+++ b/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.item.effects;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class RarityEpic extends Item {
public RarityEpic(final int par1) {
diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java b/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java
index fc1fabea14..e448cfafe7 100644
--- a/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java
+++ b/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.item.effects;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class RarityRare extends Item {
public RarityRare() {
diff --git a/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java b/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java
index f16a6693c6..89764a718f 100644
--- a/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java
+++ b/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.item.effects;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class RarityUncommon extends Item {
@Override
diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
index 1a4be0d8e9..fa27b760ac 100644
--- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
+++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
@@ -1,16 +1,9 @@
package gtPlusPlus.core.item.food;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
@@ -24,21 +17,23 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class BaseItemMetaFood extends ItemFood {
private static final HashMap<Integer, IIcon> mIconMap = new HashMap<Integer, IIcon>();
private static int mTotalMetaItems = 0;
/*
- * 0 - Raw Human Meat
- * 1 - Cooked Human Meat
- * 2 - Raw Horse Meat
- * 3 - Cooked Horse Meat
- * 4 - Raw Wolf Meat
- * 5 - Cooked Wolf Meat
- * 6 - Raw Ocelot Meat
- * 7 - Cooked Ocelot Meat
- * 8 - Blaze Flesh
+ * 0 - Raw Human Meat 1 - Cooked Human Meat 2 - Raw Horse Meat 3 - Cooked Horse Meat 4 - Raw Wolf Meat 5 - Cooked
+ * Wolf Meat 6 - Raw Ocelot Meat 7 - Cooked Ocelot Meat 8 - Blaze Flesh
*/
// listAllmeatraw
@@ -105,19 +100,13 @@ public class BaseItemMetaFood extends ItemFood {
private static final HashMap<Integer, EnumRarity> mRarityMap = new HashMap<Integer, EnumRarity>();
private static final HashMap<Integer, Integer> mHealAmountMap = new HashMap<Integer, Integer>();
private static final HashMap<Integer, Float> mSaturationAmountMap = new HashMap<Integer, Float>();
- private static final HashMap<Integer, AutoMap<PotionEffectPackage>> mPotionEffectsMap =
- new HashMap<Integer, AutoMap<PotionEffectPackage>>();
+ private static final HashMap<Integer, AutoMap<PotionEffectPackage>> mPotionEffectsMap = new HashMap<Integer, AutoMap<PotionEffectPackage>>();
private static final HashMap<Integer, Boolean> mHasSpecialBehaviourMap = new HashMap<Integer, Boolean>();
- private static final HashMap<Integer, SpecialFoodBehaviour> mSpecialBehaviourMap =
- new HashMap<Integer, SpecialFoodBehaviour>();
+ private static final HashMap<Integer, SpecialFoodBehaviour> mSpecialBehaviourMap = new HashMap<Integer, SpecialFoodBehaviour>();
private static final HashMap<Integer, ArrayList<String>> mOreDictNames = new HashMap<Integer, ArrayList<String>>();
- public static void registerNewMetaFood(
- final int aMetaID,
- String aTooltip,
- final int aHealAmount,
- final float aSaturationModifier,
- final int aMaxStacksize) {
+ public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount,
+ final float aSaturationModifier, final int aMaxStacksize) {
registerNewMetaFood(
aMetaID,
aTooltip,
@@ -130,13 +119,8 @@ public class BaseItemMetaFood extends ItemFood {
new ArrayList<String>());
}
- public static void registerNewMetaFood(
- final int aMetaID,
- String aTooltip,
- final int aHealAmount,
- final float aSaturationModifier,
- final int aMaxStacksize,
- final ArrayList<String> aOreDictNames) {
+ public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount,
+ final float aSaturationModifier, final int aMaxStacksize, final ArrayList<String> aOreDictNames) {
registerNewMetaFood(
aMetaID,
aTooltip,
@@ -149,12 +133,8 @@ public class BaseItemMetaFood extends ItemFood {
aOreDictNames);
}
- public static void registerNewMetaFood(
- final int aMetaID,
- String aTooltip,
- final int aHealAmount,
- final float aSaturationModifier,
- final int aMaxStacksize,
+ public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount,
+ final float aSaturationModifier, final int aMaxStacksize,
final AutoMap<PotionEffectPackage> aPotionEffects) {
registerNewMetaFood(
aMetaID,
@@ -168,13 +148,8 @@ public class BaseItemMetaFood extends ItemFood {
new ArrayList<String>());
}
- public static void registerNewMetaFood(
- final int aMetaID,
- String aTooltip,
- final int aHealAmount,
- final float aSaturationModifier,
- final int aMaxStacksize,
- final AutoMap<PotionEffectPackage> aPotionEffects,
+ public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount,
+ final float aSaturationModifier, final int aMaxStacksize, final AutoMap<PotionEffectPackage> aPotionEffects,
final ArrayList<String> aOreDictNames) {
registerNewMetaFood(
aMetaID,
@@ -188,15 +163,9 @@ public class BaseItemMetaFood extends ItemFood {
aOreDictNames);
}
- public static void registerNewMetaFood(
- final int aMetaID,
- String aTooltip,
- EnumRarity aRarity,
- final int aHealAmount,
- final float aSaturationModifier,
- final int aMaxStacksize,
- final AutoMap<PotionEffectPackage> aPotionEffects,
- final SpecialFoodBehaviour aSpecialBehaviour) {
+ public static void registerNewMetaFood(final int aMetaID, String aTooltip, EnumRarity aRarity,
+ final int aHealAmount, final float aSaturationModifier, final int aMaxStacksize,
+ final AutoMap<PotionEffectPackage> aPotionEffects, final SpecialFoodBehaviour aSpecialBehaviour) {
registerNewMetaFood(
aMetaID,
aTooltip,
@@ -209,15 +178,9 @@ public class BaseItemMetaFood extends ItemFood {
new ArrayList<String>());
}
- public static void registerNewMetaFood(
- final int aMetaID,
- String aTooltip,
- EnumRarity aRarity,
- final int aHealAmount,
- final float aSaturationModifier,
- final int aMaxStacksize,
- final AutoMap<PotionEffectPackage> aPotionEffects,
- final SpecialFoodBehaviour aSpecialBehaviour,
+ public static void registerNewMetaFood(final int aMetaID, String aTooltip, EnumRarity aRarity,
+ final int aHealAmount, final float aSaturationModifier, final int aMaxStacksize,
+ final AutoMap<PotionEffectPackage> aPotionEffects, final SpecialFoodBehaviour aSpecialBehaviour,
final ArrayList<String> aOreDictNames) {
mTotalMetaItems++;
mMaxStackSizeMap.put(aMetaID, aMaxStacksize);
@@ -285,11 +248,12 @@ public class BaseItemMetaFood extends ItemFood {
if (MathUtils.randInt(0, 100) <= aFoodEffect.getChance() || aFoodEffect.getChance() == 100) {
PotionEffect aEffect = aFoodEffect.getEffect();
if (aEffect != null && aEffect.getPotionID() > 0) {
- aPlayer.addPotionEffect(new PotionEffect(
- aEffect.getPotionID(),
- aEffect.getDuration() * 20,
- aEffect.getAmplifier(),
- aEffect.getIsAmbient()));
+ aPlayer.addPotionEffect(
+ new PotionEffect(
+ aEffect.getPotionID(),
+ aEffect.getDuration() * 20,
+ aEffect.getAmplifier(),
+ aEffect.getIsAmbient()));
}
}
}
@@ -325,8 +289,8 @@ public class BaseItemMetaFood extends ItemFood {
}
@Override
- public void onUpdate(
- ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
+ public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_,
+ boolean p_77663_5_) {
super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_);
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java b/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java
index 6eaa4b1588..b13a191225 100644
--- a/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java
+++ b/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java
@@ -1,13 +1,7 @@
package gtPlusPlus.core.item.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
@@ -15,6 +9,14 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.lib.CORE;
+
public class BaseItemGrindle extends Item {
protected final String unlocalName;
diff --git a/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java b/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java
index a57f1ff63f..d23c825131 100644
--- a/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java
+++ b/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java
@@ -1,8 +1,7 @@
package gtPlusPlus.core.item.general;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -11,6 +10,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
public class BedLocator_Base extends Item {
public int bed_X = 0;
@@ -24,7 +26,7 @@ public class BedLocator_Base extends Item {
this.setCreativeTab(AddToCreativeTab.tabMachines);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
@@ -52,15 +54,10 @@ public class BedLocator_Base extends Item {
}
// Ticking and NBT Handling
- /* Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and
- * update it's contents.
- *
- * public int fuelRemaining = 0;
- public int maximumFuel = 0;
- public String fuelType = "";
- public float heat = 0;
- public float maxHeat = 5000;
- *
+ /*
+ * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and
+ * update it's contents. public int fuelRemaining = 0; public int maximumFuel = 0; public String fuelType = "";
+ * public float heat = 0; public float maxHeat = 5000;
*/
@Override
public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) {
@@ -74,11 +71,7 @@ public class BedLocator_Base extends Item {
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World par2World,
- final Entity par3Entity,
- final int par4,
+ public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4,
final boolean par5) {}
@Override
diff --git a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java b/src/main/java/gtPlusPlus/core/item/general/BufferCore.java
index a85c23be81..9648801b25 100644
--- a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java
+++ b/src/main/java/gtPlusPlus/core/item/general/BufferCore.java
@@ -1,5 +1,11 @@
package gtPlusPlus.core.item.general;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.GT_Values;
@@ -7,10 +13,6 @@ import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.math.MathUtils;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
public class BufferCore extends BaseItemWithDamageValue {
@@ -25,7 +27,7 @@ public class BufferCore extends BaseItemWithDamageValue {
@Override
public String getItemStackDisplayName(final ItemStack stack) {
- return super.getItemStackDisplayName(stack) /*+" ["+GT_Values.VN[this.coreTier-1]+"]."*/;
+ return super.getItemStackDisplayName(stack) /* +" ["+GT_Values.VN[this.coreTier-1]+"]." */;
}
@Override
@@ -34,11 +36,13 @@ public class BufferCore extends BaseItemWithDamageValue {
return true;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
- list.add(EnumChatFormatting.GRAY + "A key crafting component for " + GT_Values.VN[this.coreTier - 1]
- + " Applicances");
+ list.add(
+ EnumChatFormatting.GRAY + "A key crafting component for "
+ + GT_Values.VN[this.coreTier - 1]
+ + " Applicances");
}
public final int getCoreTier() {
@@ -48,21 +52,16 @@ public class BufferCore extends BaseItemWithDamageValue {
@Override
public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {
- int[] mTierTypes = new int[] {
- Utils.rgbtoHexValue(200, 180, 180),
- Utils.rgbtoHexValue(142, 153, 161),
- Utils.rgbtoHexValue(230, 121, 75),
- Utils.rgbtoHexValue(215, 156, 70),
- Utils.rgbtoHexValue(97, 97, 96), // EV
- Utils.rgbtoHexValue(202, 202, 201),
- Utils.rgbtoHexValue(247, 159, 157),
- Utils.rgbtoHexValue(181, 223, 223),
- Utils.rgbtoHexValue(187, 219, 185),
- };
+ int[] mTierTypes = new int[] { Utils.rgbtoHexValue(200, 180, 180), Utils.rgbtoHexValue(142, 153, 161),
+ Utils.rgbtoHexValue(230, 121, 75), Utils.rgbtoHexValue(215, 156, 70), Utils.rgbtoHexValue(97, 97, 96), // EV
+ Utils.rgbtoHexValue(202, 202, 201), Utils.rgbtoHexValue(247, 159, 157),
+ Utils.rgbtoHexValue(181, 223, 223), Utils.rgbtoHexValue(187, 219, 185), };
if (this.coreTier == 10) {
return Utils.rgbtoHexValue(
- MathUtils.randInt(220, 250), MathUtils.randInt(221, 251), MathUtils.randInt(220, 250));
+ MathUtils.randInt(220, 250),
+ MathUtils.randInt(221, 251),
+ MathUtils.randInt(220, 250));
}
return mTierTypes[this.coreTier - 1];
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java
index 98cb1bba74..ddd88f7169 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java
@@ -1,10 +1,7 @@
package gtPlusPlus.core.item.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -14,6 +11,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+
public class ItemAirFilter extends Item {
public IIcon[] icons = new IIcon[1];
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java b/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java
index b4b35c06e8..676cde058e 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java
@@ -1,16 +1,7 @@
package gtPlusPlus.core.item.general;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.common.blocks.GT_Block_Ores;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.block.base.BlockBaseOre;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.CoreItem;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -23,6 +14,17 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.common.blocks.GT_Block_Ores;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.block.base.BlockBaseOre;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
public class ItemAreaClear extends CoreItem {
public IIcon[] mIcon = new IIcon[1];
@@ -33,7 +35,7 @@ public class ItemAreaClear extends CoreItem {
AddToCreativeTab.tabMachines,
1,
100,
- new String[] {EnumChatFormatting.OBFUSCATED + "F A N C Y N A M E"},
+ new String[] { EnumChatFormatting.OBFUSCATED + "F A N C Y N A M E" },
EnumRarity.rare,
EnumChatFormatting.BOLD,
false,
@@ -148,7 +150,7 @@ public class ItemAreaClear extends CoreItem {
}
} else {
if ((world.getBlock(pos.xPos + i, pos.yPos + j, pos.zPos) == Blocks.glowstone
- && ((pos.yPos + j) > 50))
+ && ((pos.yPos + j) > 50))
|| world.getBlock(pos.xPos + i, pos.yPos + j, pos.zPos) != Blocks.glowstone) {
world.setBlockToAir(pos.xPos + i, pos.yPos + j, pos.zPos);
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java b/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java
index e64b85c515..dec01d1a71 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java
@@ -1,15 +1,16 @@
package gtPlusPlus.core.item.general;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import gtPlusPlus.core.block.general.FirePit;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.CoreItem;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class ItemBasicFirestarter extends CoreItem {
@@ -19,16 +20,8 @@ public class ItemBasicFirestarter extends CoreItem {
}
@Override
- public boolean onItemUse(
- final ItemStack thisItem,
- final EntityPlayer thisPlayer,
- final World thisWorld,
- int blockX,
- int blockY,
- int blockZ,
- final int p_77648_7_,
- final float p_77648_8_,
- final float p_77648_9_,
+ public boolean onItemUse(final ItemStack thisItem, final EntityPlayer thisPlayer, final World thisWorld, int blockX,
+ int blockY, int blockZ, final int p_77648_7_, final float p_77648_8_, final float p_77648_9_,
final float p_77648_10_) {
if (p_77648_7_ == 0) {
--blockY;
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java b/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java
index b1a06daab6..6ffd22e6b8 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java
@@ -1,10 +1,7 @@
package gtPlusPlus.core.item.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -14,6 +11,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+
public class ItemBasicScrubberTurbine extends Item {
public IIcon[] icons = new IIcon[1];
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java
index d3f1c2bed6..9e8573f6a8 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java
@@ -1,14 +1,7 @@
package gtPlusPlus.core.item.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.interfaces.IItemBlueprint;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import java.util.List;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
@@ -19,6 +12,15 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.interfaces.IItemBlueprint;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class ItemBlueprint extends Item implements IItemBlueprint {
public ItemBlueprint(final String unlocalizedName) {
@@ -30,10 +32,10 @@ public class ItemBlueprint extends Item implements IItemBlueprint {
GameRegistry.registerItem(this, unlocalizedName);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public void addInformation(
- final ItemStack itemStack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+ public void addInformation(final ItemStack itemStack, final EntityPlayer aPlayer, final List list,
+ final boolean bool) {
// Create some NBT if it's not there, otherwise this does nothing.
if (!itemStack.hasTagCompound()) {
this.createNBT(itemStack);
@@ -76,11 +78,7 @@ public class ItemBlueprint extends Item implements IItemBlueprint {
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World par2World,
- final Entity par3Entity,
- final int par4,
+ public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4,
final boolean par5) {}
@Override
@@ -89,8 +87,13 @@ public class ItemBlueprint extends Item implements IItemBlueprint {
if (itemStack.hasTagCompound()) {
PlayerUtils.messagePlayer(
par3Entity,
- "This Blueprint holds NBT data. " + "|" + this.getNBT(itemStack, "mID") + "|"
- + this.getNBT(itemStack, "mBlueprint") + "|" + this.getNBT(itemStack, "mName") + "|"
+ "This Blueprint holds NBT data. " + "|"
+ + this.getNBT(itemStack, "mID")
+ + "|"
+ + this.getNBT(itemStack, "mBlueprint")
+ + "|"
+ + this.getNBT(itemStack, "mName")
+ + "|"
+ ItemUtils.getArrayStackNames(this.readItemsFromNBT(itemStack)));
} else {
this.createNBT(itemStack);
@@ -227,19 +230,20 @@ public class ItemBlueprint extends Item implements IItemBlueprint {
return false;
} else if (itemStack.stackTagCompound.getBoolean("mBlueprint")
&& !itemStack.stackTagCompound.getString("mName").equals("")) {
- // Has Blueprint but invalid name set
- Logger.WARNING("Has Blueprint but invalid name set");
- // itemStack.stackTagCompound = null;
- // createNBT(itemStack);
- return false;
- } else if (!itemStack.stackTagCompound.getBoolean("mBlueprint")
- && itemStack.stackTagCompound.getString("mName").equals("")) {
- // Has no Blueprint, but strangely has a name
- Logger.WARNING("Has no Blueprint, but strangely has a name");
- // itemStack.stackTagCompound = null;
- // createNBT(itemStack);
- return false;
- }
+ // Has Blueprint but invalid name set
+ Logger.WARNING("Has Blueprint but invalid name set");
+ // itemStack.stackTagCompound = null;
+ // createNBT(itemStack);
+ return false;
+ } else
+ if (!itemStack.stackTagCompound.getBoolean("mBlueprint")
+ && itemStack.stackTagCompound.getString("mName").equals("")) {
+ // Has no Blueprint, but strangely has a name
+ Logger.WARNING("Has no Blueprint, but strangely has a name");
+ // itemStack.stackTagCompound = null;
+ // createNBT(itemStack);
+ return false;
+ }
return false;
} else if (!itemStack.hasTagCompound()) {
final int bpID = MathUtils.randInt(0, 1000);
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
index d0df323916..e71858a991 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java
@@ -1,5 +1,17 @@
package gtPlusPlus.core.item.general;
+import java.util.List;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
import baubles.api.BaubleType;
import baubles.api.IBauble;
import cpw.mods.fml.common.Optional;
@@ -11,22 +23,10 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import ic2.api.item.IElectricItemManager;
-import java.util.List;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
@Optional.InterfaceList(
- value = {
- @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
- @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")
- })
+ value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
+ @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") })
public class ItemCloakingDevice extends Item implements IElectricItem, IElectricItemManager, IBauble {
private final String unlocalizedName = "personalCloakingDevice";
@@ -49,11 +49,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World worldObj,
- final Entity player,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
final boolean p_77663_5_) {
if (worldObj.isRemote) {
return;
@@ -140,47 +136,51 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
list.add(EnumChatFormatting.GREEN + "Drains 10,000EU/t to provide invisibility." + EnumChatFormatting.GRAY);
list.add("");
list.add(EnumChatFormatting.GOLD + "IC2/EU Information" + EnumChatFormatting.GRAY);
- list.add(EnumChatFormatting.GRAY + "Tier: [" + EnumChatFormatting.YELLOW + this.getTier(this.thisStack)
- + EnumChatFormatting.GRAY + "] Input Limit: [" + EnumChatFormatting.YELLOW
- + this.getTransferLimit(this.thisStack) + EnumChatFormatting.GRAY + "EU/t]");
- list.add(EnumChatFormatting.GRAY + "Current Power: [" + EnumChatFormatting.YELLOW + (long) this.getCharge(stack)
- + EnumChatFormatting.GRAY + "EU] [" + EnumChatFormatting.YELLOW
- + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY
- + "%]");
- list.add(EnumChatFormatting.GRAY + "Time Remaining: [" + EnumChatFormatting.YELLOW + this.secondsLeft(stack)
- + EnumChatFormatting.GRAY + " seconds]");
+ list.add(
+ EnumChatFormatting.GRAY + "Tier: ["
+ + EnumChatFormatting.YELLOW
+ + this.getTier(this.thisStack)
+ + EnumChatFormatting.GRAY
+ + "] Input Limit: ["
+ + EnumChatFormatting.YELLOW
+ + this.getTransferLimit(this.thisStack)
+ + EnumChatFormatting.GRAY
+ + "EU/t]");
+ list.add(
+ EnumChatFormatting.GRAY + "Current Power: ["
+ + EnumChatFormatting.YELLOW
+ + (long) this.getCharge(stack)
+ + EnumChatFormatting.GRAY
+ + "EU] ["
+ + EnumChatFormatting.YELLOW
+ + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))
+ + EnumChatFormatting.GRAY
+ + "%]");
+ list.add(
+ EnumChatFormatting.GRAY + "Time Remaining: ["
+ + EnumChatFormatting.YELLOW
+ + this.secondsLeft(stack)
+ + EnumChatFormatting.GRAY
+ + " seconds]");
super.addInformation(stack, aPlayer, list, bool);
}
- /*@Override
- public ItemStack getContainerItem(ItemStack itemStack)
- {
- ItemStack newItem = itemStack.copy();
- newItem.stackSize = 1;
- extractEnergy(newItem, 150000, false);
- return newItem;
- }*/
-
- /*@Override
- public boolean hasContainerItem(ItemStack stack)
- {
- return true;
- }*/
-
- /*@Override
- public int getBurnTime(ItemStack fuel) {
- if ((fuel == null) || (fuel.getItem() != this)) {
- return 0;
- }
- return extractEnergy(fuel, 150000, true) / 50 / 100;
- }*/
+ /*
+ * @Override public ItemStack getContainerItem(ItemStack itemStack) { ItemStack newItem = itemStack.copy();
+ * newItem.stackSize = 1; extractEnergy(newItem, 150000, false); return newItem; }
+ */
+
+ /*
+ * @Override public boolean hasContainerItem(ItemStack stack) { return true; }
+ */
+
+ /*
+ * @Override public int getBurnTime(ItemStack fuel) { if ((fuel == null) || (fuel.getItem() != this)) { return 0; }
+ * return extractEnergy(fuel, 150000, true) / 50 / 100; }
+ */
@Override
- public double charge(
- final ItemStack stack,
- final double amount,
- final int tier,
- final boolean ignoreTransferLimit,
+ public double charge(final ItemStack stack, final double amount, final int tier, final boolean ignoreTransferLimit,
final boolean simulate) {
if (!simulate) {
@@ -190,13 +190,8 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric
}
@Override
- public double discharge(
- final ItemStack stack,
- final double amount,
- final int tier,
- final boolean ignoreTransferLimit,
- final boolean externally,
- final boolean simulate) {
+ public double discharge(final ItemStack stack, final double amount, final int tier,
+ final boolean ignoreTransferLimit, final boolean externally, final boolean simulate) {
if (!simulate) {
ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java b/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java
index e210ba87b6..21e127e387 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java
@@ -1,10 +1,7 @@
package gtPlusPlus.core.item.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -13,6 +10,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.core.lib.CORE;
+
public class ItemControlCore extends Item {
public static IIcon[] icons = new IIcon[10];
@@ -46,7 +48,7 @@ public class ItemControlCore extends Item {
return this.icons[meta];
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (int i = 0; i < 10; i++) {
@@ -59,11 +61,13 @@ public class ItemControlCore extends Item {
return this.getUnlocalizedName() + "_" + stack.getItemDamage();
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
- list.add(EnumChatFormatting.GRAY + "Allows a Multiblock to function upto " + GT_Values.VN[stack.getItemDamage()]
- + "");
+ list.add(
+ EnumChatFormatting.GRAY + "Allows a Multiblock to function upto "
+ + GT_Values.VN[stack.getItemDamage()]
+ + "");
list.add(EnumChatFormatting.GRAY + "Required Tier is determined by the sum of the eu/t of all Energy Inputs");
list.add(EnumChatFormatting.GRAY + "Lower tiers may be used to underclock, which is useful in some situations");
}
@@ -83,11 +87,9 @@ public class ItemControlCore extends Item {
return aReturnValue;
}
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
- if (aReturnValue == null
- || !aReturnValue.toLowerCase().contains("control core")
+ if (aReturnValue == null || !aReturnValue.toLowerCase().contains("control core")
|| aReturnValue.length() <= 0) {
aReturnValue = "Error";
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java b/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java
index 9c6e6b257c..19adddfd42 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java
@@ -1,15 +1,17 @@
package gtPlusPlus.core.item.general;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.GregTech_API;
+import gtPlusPlus.core.lib.CORE;
+
public class ItemCreativeTab extends Item {
public IIcon[] icons = new IIcon[10];
@@ -42,7 +44,7 @@ public class ItemCreativeTab extends Item {
return this.icons[meta];
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (int i = 0; i < 10; i++) {
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemEmpty.java b/src/main/java/gtPlusPlus/core/item/general/ItemEmpty.java
index dc306f8fa2..773a45aa0a 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemEmpty.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemEmpty.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.item.general;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.CoreItem;
-import net.minecraft.item.ItemStack;
public class ItemEmpty extends CoreItem {
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java b/src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java
index 25c67aeb21..cfb8a5a163 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java
@@ -1,40 +1,25 @@
package gtPlusPlus.core.item.general;
-import gtPlusPlus.core.item.base.BaseItemColourable;
-import gtPlusPlus.core.util.Utils;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import gtPlusPlus.core.item.base.BaseItemColourable;
+import gtPlusPlus.core.util.Utils;
+
public class ItemGemShards extends BaseItemColourable {
- public ItemGemShards(
- String unlocalizedName,
- CreativeTabs creativeTab,
- int stackSize,
- int maxDmg,
- String description,
- EnumRarity regRarity,
- EnumChatFormatting colour,
- boolean Effect,
- int rgb) {
+ public ItemGemShards(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg,
+ String description, EnumRarity regRarity, EnumChatFormatting colour, boolean Effect, int rgb) {
super(unlocalizedName, creativeTab, stackSize, maxDmg, description, regRarity, colour, Effect, rgb);
}
- public ItemGemShards(
- String unlocalizedName,
- String displayName,
- CreativeTabs creativeTab,
- int stackSize,
- int maxDmg,
- String description,
- EnumRarity regRarity,
- EnumChatFormatting colour,
- boolean Effect,
- int rgb) {
+ public ItemGemShards(String unlocalizedName, String displayName, CreativeTabs creativeTab, int stackSize,
+ int maxDmg, String description, EnumRarity regRarity, EnumChatFormatting colour, boolean Effect, int rgb) {
super(
unlocalizedName,
displayName,
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
index 8ab8efcd12..7b79556693 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java
@@ -1,12 +1,8 @@
package gtPlusPlus.core.item.general;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.CoreItem;
-import gtPlusPlus.core.lib.CORE;
import java.util.HashMap;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -16,6 +12,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+
public class ItemGenericToken extends CoreItem {
public final HashMap<Integer, String> mLocalNames;
@@ -27,7 +29,7 @@ public class ItemGenericToken extends CoreItem {
private final String mTextureDir;
public ItemGenericToken() {
- this("itemGenericToken", "Token", new String[] {"Can be reclaimed in some way, shape or form"}, "token");
+ this("itemGenericToken", "Token", new String[] { "Can be reclaimed in some way, shape or form" }, "token");
}
public ItemGenericToken(String aUnlocalName, String aInternalName, String[] aBaseTooltip, String aTextureDir) {
@@ -52,19 +54,14 @@ public class ItemGenericToken extends CoreItem {
}
public boolean register(int id, String aLocalName, int aMaxStack, String aDescript) {
- return register(id, aLocalName, aMaxStack, new String[] {aDescript});
+ return register(id, aLocalName, aMaxStack, new String[] { aDescript });
}
public boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript) {
return register(id, aLocalName, aMaxStack, aDescript, EnumRarity.common, EnumChatFormatting.RESET);
}
- public boolean register(
- int id,
- String aLocalName,
- int aMaxStack,
- String[] aDescript,
- EnumRarity aRarity,
+ public boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript, EnumRarity aRarity,
EnumChatFormatting aCustomNameColour) {
int[][] sizes = new int[2][6];
sizes[0][0] = mLocalNames.size();
@@ -84,8 +81,7 @@ public class ItemGenericToken extends CoreItem {
sizes[1][3] = mRarities.size();
sizes[1][4] = mCustomNameColours.size();
// sizes[1][5] = mIcons.size();
- boolean b = sizes[0][0] > sizes[1][0]
- && sizes[0][1] > sizes[1][1]
+ boolean b = sizes[0][0] > sizes[1][0] && sizes[0][1] > sizes[1][1]
&& sizes[0][2] > sizes[1][2]
&& sizes[0][3] > sizes[1][3]
&& sizes[0][4] > sizes[1][4];
@@ -93,7 +89,7 @@ public class ItemGenericToken extends CoreItem {
}
// Handle Sub items
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item var1, final CreativeTabs aCreativeTab, final List aList) {
@@ -116,8 +112,7 @@ public class ItemGenericToken extends CoreItem {
String s = "" + mCustomNameColours.get(tItem.getItemDamage());
String parent = super.getItemStackDisplayName(tItem);
- if (mLocalNames.get(tItem.getItemDamage()).length() > 0
- && parent.toLowerCase().contains(".name")) {
+ if (mLocalNames.get(tItem.getItemDamage()).length() > 0 && parent.toLowerCase().contains(".name")) {
s = s + mLocalNames.get(tItem.getItemDamage());
} else {
s = s + parent;
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java
index 8f1d1629a6..6afb84765f 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java
@@ -2,6 +2,18 @@ package gtPlusPlus.core.item.general;
import static gtPlusPlus.core.lib.CORE.RANDOM;
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.entity.item.ItemEntityGiantEgg;
@@ -13,16 +25,6 @@ import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.NBTUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.util.List;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
public class ItemGiantEgg extends BaseItemTickable {
@@ -39,9 +41,10 @@ public class ItemGiantEgg extends BaseItemTickable {
}
public ItemGiantEgg() {
- this(Utils.rgbtoHexValue(255, 255, 255), Short.MAX_VALUE * Byte.MAX_VALUE, new String[] {
- "I had best try disassemble this.. for science!"
- });
+ this(
+ Utils.rgbtoHexValue(255, 255, 255),
+ Short.MAX_VALUE * Byte.MAX_VALUE,
+ new String[] { "I had best try disassemble this.. for science!" });
}
private ItemGiantEgg(int colour, int maxTicks, String[] desc1) {
@@ -61,20 +64,13 @@ public class ItemGiantEgg extends BaseItemTickable {
private static ItemStack getSpawnEggStack() {
// Set the correct egg for future hatches
if (mCorrectEgg == null) {
- /*for (int g=0;g<Byte.MAX_VALUE;g++) {
- ItemStack mSpawn = ItemUtils.simpleMetaStack(Items.spawn_egg, g, 1);
- if (mSpawn != null) {
- //String s = ("" + StatCollector.translateToLocal(mSpawn.getUnlocalizedName() + ".name")).trim();
- String s1 = EntityList.getStringFromID(mSpawn.getItemDamage());
- if (s1 != null){
- //s = s + " " + StatCollector.translateToLocal("entity." + s1 + ".name");
- if (s1.equalsIgnoreCase("bigChickenFriendly")) {
- mCorrectEgg = mSpawn;
- return mCorrectEgg;
- }
- }
- }
- }*/
+ /*
+ * for (int g=0;g<Byte.MAX_VALUE;g++) { ItemStack mSpawn = ItemUtils.simpleMetaStack(Items.spawn_egg, g, 1);
+ * if (mSpawn != null) { //String s = ("" + StatCollector.translateToLocal(mSpawn.getUnlocalizedName() +
+ * ".name")).trim(); String s1 = EntityList.getStringFromID(mSpawn.getItemDamage()); if (s1 != null){ //s =
+ * s + " " + StatCollector.translateToLocal("entity." + s1 + ".name"); if
+ * (s1.equalsIgnoreCase("bigChickenFriendly")) { mCorrectEgg = mSpawn; return mCorrectEgg; } } } }
+ */
ItemStack aTempEgg = ItemCustomSpawnEgg.getSpawnEggForEntityname("bigChickenFriendly", 1);
if (aTempEgg != null) {
mCorrectEgg = aTempEgg;
@@ -86,8 +82,8 @@ public class ItemGiantEgg extends BaseItemTickable {
private static ItemStack getStemCellStack() {
if (mCorrectStemCells == null) {
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() > 28) {
- ItemStack xl = ItemUtils.getValueOfItemList(
- "Circuit_Chip_Stemcell", 1, ItemUtils.getSimpleStack(Items.egg, 2));
+ ItemStack xl = ItemUtils
+ .getValueOfItemList("Circuit_Chip_Stemcell", 1, ItemUtils.getSimpleStack(Items.egg, 2));
if (xl != null) {
mCorrectStemCells = xl.copy();
}
@@ -146,18 +142,16 @@ public class ItemGiantEgg extends BaseItemTickable {
if (mexpected > 0) {
NBTUtils.setInteger(aStack, "mExpected", mexpected);
NBTUtils.writeItemsToGtCraftingComponents(
- aStack, new ItemStack[] {ItemUtils.getSimpleStack(aStemCells, mexpected)}, true);
+ aStack,
+ new ItemStack[] { ItemUtils.getSimpleStack(aStemCells, mexpected) },
+ true);
}
}
return aSuper;
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (world == null || iStack == null) {
return;
@@ -212,10 +206,10 @@ public class ItemGiantEgg extends BaseItemTickable {
@Override
public String getItemStackDisplayName(ItemStack aStack) {
String localName = super.getItemStackDisplayName(aStack);
- /*if (aStack.getTagCompound() == null){
- createNBT(null, aStack);
- Logger.INFO("Egg has no NBT, creating (getDisplayName)");
- }*/
+ /*
+ * if (aStack.getTagCompound() == null){ createNBT(null, aStack);
+ * Logger.INFO("Egg has no NBT, creating (getDisplayName)"); }
+ */
int size = 1;
if (NBTUtils.hasKey(aStack, "size")) {
size = NBTUtils.getInteger(aStack, "size");
@@ -255,8 +249,8 @@ public class ItemGiantEgg extends BaseItemTickable {
entityitem.motionZ = (double) (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI)
* MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI)
* f);
- entityitem.motionY =
- (double) (-MathHelper.sin(player.rotationPitch / 180.0F * (float) Math.PI) * f + 0.1F);
+ entityitem.motionY = (double) (-MathHelper.sin(player.rotationPitch / 180.0F * (float) Math.PI) * f
+ + 0.1F);
f = 0.02F;
f1 = RANDOM.nextFloat() * (float) Math.PI * 2.0F;
f *= RANDOM.nextFloat();
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java b/src/main/java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java
index aa3d5b62e1..b4f32e81fd 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java
@@ -1,26 +1,20 @@
package gtPlusPlus.core.item.general;
-import gtPlusPlus.core.item.base.BaseItemColourable;
-import gtPlusPlus.core.util.Utils;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import gtPlusPlus.core.item.base.BaseItemColourable;
+import gtPlusPlus.core.util.Utils;
+
public class ItemHalfCompleteCasings extends BaseItemColourable {
- public ItemHalfCompleteCasings(
- String unlocalizedName,
- CreativeTabs creativeTab,
- int stackSize,
- int maxDmg,
- String description,
- EnumRarity regRarity,
- EnumChatFormatting colour,
- boolean Effect,
- int rgb) {
+ public ItemHalfCompleteCasings(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg,
+ String description, EnumRarity regRarity, EnumChatFormatting colour, boolean Effect, int rgb) {
super(unlocalizedName, creativeTab, stackSize, maxDmg, description, regRarity, colour, Effect, rgb);
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java
index 9a47a32d9b..8bb2ac7929 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java
@@ -1,5 +1,16 @@
package gtPlusPlus.core.item.general;
+import java.util.List;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.*;
+import net.minecraft.world.World;
+
import baubles.api.BaubleType;
import baubles.api.IBauble;
import cpw.mods.fml.common.Optional;
@@ -14,21 +25,10 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.sys.KeyboardUtils;
import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
import ic2.api.item.*;
-import java.util.List;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.*;
-import net.minecraft.world.World;
@Optional.InterfaceList(
- value = {
- @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
- @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")
- })
+ value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
+ @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") })
public class ItemHealingDevice extends Item implements IElectricItem, IElectricItemManager, IBauble {
private final String unlocalizedName = "personalHealingDevice";
@@ -44,11 +44,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World worldObj,
- final Entity player,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
final boolean p_77663_5_) {
if (worldObj.isRemote) {
return;
@@ -114,7 +110,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
return (int) r;
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
@@ -142,27 +138,44 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
list.add("");
list.add(EnumChatFormatting.GOLD + aEuInfo + EnumChatFormatting.GRAY);
- list.add(EnumChatFormatting.GRAY + aTier + ": [" + EnumChatFormatting.YELLOW + this.getTier(stack)
- + EnumChatFormatting.GRAY + "] " + aInputLimit + ": [" + EnumChatFormatting.YELLOW
- + this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT + "]");
- list.add(EnumChatFormatting.GRAY + aCurrentPower + ": [" + EnumChatFormatting.YELLOW
- + (long) this.getCharge(stack)
- + EnumChatFormatting.GRAY + aEU + "] [" + EnumChatFormatting.YELLOW
- + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY
- + "%]");
+ list.add(
+ EnumChatFormatting.GRAY + aTier
+ + ": ["
+ + EnumChatFormatting.YELLOW
+ + this.getTier(stack)
+ + EnumChatFormatting.GRAY
+ + "] "
+ + aInputLimit
+ + ": ["
+ + EnumChatFormatting.YELLOW
+ + this.getTransferLimit(stack)
+ + EnumChatFormatting.GRAY
+ + aEUT
+ + "]");
+ list.add(
+ EnumChatFormatting.GRAY + aCurrentPower
+ + ": ["
+ + EnumChatFormatting.YELLOW
+ + (long) this.getCharge(stack)
+ + EnumChatFormatting.GRAY
+ + aEU
+ + "] ["
+ + EnumChatFormatting.YELLOW
+ + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))
+ + EnumChatFormatting.GRAY
+ + "%]");
list.add(EnumChatFormatting.GOLD + aString5 + EnumChatFormatting.GRAY);
- list.add(EnumChatFormatting.GOLD + aStringTooltip + " "
- + (!isShowing ? EnumChatFormatting.DARK_GREEN : EnumChatFormatting.DARK_RED) + !isShowing
- + EnumChatFormatting.GRAY);
+ list.add(
+ EnumChatFormatting.GOLD + aStringTooltip
+ + " "
+ + (!isShowing ? EnumChatFormatting.DARK_GREEN : EnumChatFormatting.DARK_RED)
+ + !isShowing
+ + EnumChatFormatting.GRAY);
super.addInformation(stack, aPlayer, list, bool);
}
@Override
- public double charge(
- final ItemStack stack,
- final double amount,
- final int tier,
- final boolean ignoreTransferLimit,
+ public double charge(final ItemStack stack, final double amount, final int tier, final boolean ignoreTransferLimit,
final boolean simulate) {
if (!simulate) {
@@ -172,13 +185,8 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
}
@Override
- public double discharge(
- final ItemStack stack,
- final double amount,
- final int tier,
- final boolean ignoreTransferLimit,
- final boolean externally,
- final boolean simulate) {
+ public double discharge(final ItemStack stack, final double amount, final int tier,
+ final boolean ignoreTransferLimit, final boolean externally, final boolean simulate) {
return ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
}
@@ -261,8 +269,8 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
if (aCurrentChargeForThisBauble < maxValueEU) {
if ((ElectricItem.manager.getCharge(aInvStack) >= aTransferRate)) {
if (electricItem.canProvideEnergy(aInvStack)) {
- double d = ElectricItem.manager.discharge(
- aInvStack, aTransferRate, mTier, false, true, false);
+ double d = ElectricItem.manager
+ .discharge(aInvStack, aTransferRate, mTier, false, true, false);
// Logger.INFO("Charging from "+aInvStack.getDisplayName() +" | "+d);
ElectricItem.manager.charge(aBaubleStack, d, mTier, true, false);
}
@@ -313,9 +321,9 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
// Only show Messages if they're enabled.
if (getShowMessages(aBaubleStack)) {
- if (hp > 0 || hunger > 0 || saturation > 0)
- PlayerUtils.messagePlayer(
- (EntityPlayer) arg1, "Your NanoBooster Whirs! Leaving you feeling stronger.");
+ if (hp > 0 || hunger > 0 || saturation > 0) PlayerUtils.messagePlayer(
+ (EntityPlayer) arg1,
+ "Your NanoBooster Whirs! Leaving you feeling stronger.");
if (hp > 0) PlayerUtils.messagePlayer((EntityPlayer) arg1, "Healed " + hp + " hp.");
@@ -324,10 +332,9 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
if (saturation > 0)
PlayerUtils.messagePlayer((EntityPlayer) arg1, "Satured Hunger by " + saturation + ".");
- if (hp > 0 || hunger > 0 || saturation > 0)
- PlayerUtils.messagePlayer(
- (EntityPlayer) arg1,
- "You check it's remaining uses, it has " + (int) this.secondsLeft(aBaubleStack) + ".");
+ if (hp > 0 || hunger > 0 || saturation > 0) PlayerUtils.messagePlayer(
+ (EntityPlayer) arg1,
+ "You check it's remaining uses, it has " + (int) this.secondsLeft(aBaubleStack) + ".");
}
}
}
@@ -366,17 +373,8 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI
}
@Override
- public boolean onItemUse(
- ItemStack p_77648_1_,
- EntityPlayer p_77648_2_,
- World p_77648_3_,
- int p_77648_4_,
- int p_77648_5_,
- int p_77648_6_,
- int p_77648_7_,
- float p_77648_8_,
- float p_77648_9_,
- float p_77648_10_) {
+ public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_,
+ int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) {
// TODO Auto-generated method stub
return super.onItemUse(
p_77648_1_,
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java
index 79076ec571..3373473b75 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java
@@ -1,10 +1,7 @@
package gtPlusPlus.core.item.general;
-import gregtech.api.enums.ItemList;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.CoreItem;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
@@ -13,6 +10,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
+import gregtech.api.enums.ItemList;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+
public class ItemLavaFilter extends CoreItem {
public IIcon[] mIcon = new IIcon[1];
@@ -23,7 +25,7 @@ public class ItemLavaFilter extends CoreItem {
AddToCreativeTab.tabMachines,
1,
100,
- new String[] {"Lava Filter"},
+ new String[] { "Lava Filter" },
EnumRarity.common,
EnumChatFormatting.BLACK,
false,
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java
index feab0f0cf6..e9a971b16e 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java
@@ -1,5 +1,17 @@
package gtPlusPlus.core.item.general;
+import java.lang.ref.WeakReference;
+import java.util.*;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.*;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityBeacon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.living.LivingDeathEvent;
+
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
@@ -11,16 +23,6 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.base.CoreItem;
import gtPlusPlus.core.lib.CORE;
-import java.lang.ref.WeakReference;
-import java.util.*;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.*;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityBeacon;
-import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.living.LivingDeathEvent;
public class ItemMagicFeather extends CoreItem {
@@ -34,7 +36,7 @@ public class ItemMagicFeather extends CoreItem {
AddToCreativeTab.tabMisc,
1,
100,
- new String[] {"Lets you fly around Beacons"},
+ new String[] { "Lets you fly around Beacons" },
EnumRarity.uncommon,
null,
false,
@@ -69,26 +71,22 @@ public class ItemMagicFeather extends CoreItem {
return false;
}
HashSet<TileEntityBeacon> aBeaconData = sBeaconData.computeIfAbsent(player, k -> new HashSet<>());
- int chunkXlo = (int) (player.posX - 50) >> 4,
- chunkXhi = (int) (player.posX + 50) >> 4,
- chunkZlo = (int) (player.posZ - 50) >> 4,
- chunkZhi = (int) (player.posZ + 50) >> 4;
+ int chunkXlo = (int) (player.posX - 50) >> 4, chunkXhi = (int) (player.posX + 50) >> 4,
+ chunkZlo = (int) (player.posZ - 50) >> 4, chunkZhi = (int) (player.posZ + 50) >> 4;
for (int chunkX = chunkXlo; chunkX < chunkXhi; chunkX++) {
for (int chunkZ = chunkZlo; chunkZ < chunkZhi; chunkZ++) {
if (!world.getChunkProvider().chunkExists(chunkX, chunkZ)) continue;
findSuitableBeacon(
player,
- world.getChunkFromChunkCoords(chunkX, chunkZ)
- .chunkTileEntityMap
- .values(),
+ world.getChunkFromChunkCoords(chunkX, chunkZ).chunkTileEntityMap.values(),
aBeaconData);
}
}
return aBeaconData.size() > 0;
}
- private static void findSuitableBeacon(
- EntityPlayer player, Collection<TileEntity> tileEntities, HashSet<TileEntityBeacon> aBeaconData) {
+ private static void findSuitableBeacon(EntityPlayer player, Collection<TileEntity> tileEntities,
+ HashSet<TileEntityBeacon> aBeaconData) {
for (TileEntity t : tileEntities) {
if (!(t instanceof TileEntityBeacon)) {
continue;
@@ -137,7 +135,7 @@ public class ItemMagicFeather extends CoreItem {
EntityPlayer player = event.player;
HashSet<TileEntityBeacon> aBeaconData = sBeaconData.get(player);
if (aBeaconData != null && !aBeaconData.isEmpty()) {
- for (Iterator<TileEntityBeacon> iterator = aBeaconData.iterator(); iterator.hasNext(); ) {
+ for (Iterator<TileEntityBeacon> iterator = aBeaconData.iterator(); iterator.hasNext();) {
TileEntityBeacon aBeacon = iterator.next();
int level = aBeacon.getLevels();
if (level == 0) {
@@ -147,8 +145,7 @@ public class ItemMagicFeather extends CoreItem {
int radius = (level * 10 + 10);
int x = aBeacon.xCoord;
int z = aBeacon.zCoord;
- if (player.posX < (x - radius)
- || player.posX > (x + radius)
+ if (player.posX < (x - radius) || player.posX > (x + radius)
|| player.posZ < (z - radius)
|| player.posZ > (z + radius)) {
iterator.remove();
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
index 3ec417e2d6..ee4fe31bc3 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
@@ -1,5 +1,15 @@
package gtPlusPlus.core.item.general;
+import java.util.List;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
import baubles.api.BaubleType;
import baubles.api.IBauble;
import cpw.mods.fml.common.Optional;
@@ -9,20 +19,10 @@ import gtPlusPlus.core.handler.events.CustomMovementHandler;
import gtPlusPlus.core.handler.events.SneakManager;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.List;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
@Optional.InterfaceList(
- value = {
- @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
- @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")
- })
+ value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
+ @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") })
public class ItemSlowBuildingRing extends Item implements IBauble {
private final String unlocalizedName = "SlowBuildingRing";
@@ -38,11 +38,7 @@ public class ItemSlowBuildingRing extends Item implements IBauble {
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World worldObj,
- final Entity player,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
final boolean p_77663_5_) {
if (worldObj.isRemote) {
return;
@@ -64,8 +60,9 @@ public class ItemSlowBuildingRing extends Item implements IBauble {
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add("");
- list.add(EnumChatFormatting.GREEN + "Worn as a Ring within Baubles. Prevents you from sprinting."
- + EnumChatFormatting.GRAY);
+ list.add(
+ EnumChatFormatting.GREEN + "Worn as a Ring within Baubles. Prevents you from sprinting."
+ + EnumChatFormatting.GRAY);
list.add(EnumChatFormatting.GREEN + "Movement speed reduced to crouch speed." + EnumChatFormatting.GRAY);
list.add(
EnumChatFormatting.GREEN + "Press shift while worn to toggle crouch on/off." + EnumChatFormatting.GRAY);
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java b/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java
index e3b1314e4b..b6b5d24d3c 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java
@@ -1,10 +1,11 @@
package gtPlusPlus.core.item.general;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.util.EnumChatFormatting;
+
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.CoreItem;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.util.EnumChatFormatting;
public class ItemSunnariumBit extends CoreItem {
diff --git a/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java b/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java
index 8d5be9f8ec..92a5fafe20 100644
--- a/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java
+++ b/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.item.general;
-import cpw.mods.fml.common.eventhandler.Event;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
@@ -14,7 +13,10 @@ import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.FillBucketEvent;
+import cpw.mods.fml.common.eventhandler.Event;
+
public class NuclearFuelRodBase extends Item {
+
/** field for checking if the bucket has been filled. */
private final Block isFull;
@@ -28,11 +30,11 @@ public class NuclearFuelRodBase extends Item {
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/
@Override
- public ItemStack onItemRightClick(
- final ItemStack p_77659_1_, final World p_77659_2_, final EntityPlayer p_77659_3_) {
+ public ItemStack onItemRightClick(final ItemStack p_77659_1_, final World p_77659_2_,
+ final EntityPlayer p_77659_3_) {
final boolean flag = this.isFull == Blocks.air;
- final MovingObjectPosition movingobjectposition =
- this.getMovingObjectPositionFromPlayer(p_77659_2_, p_77659_3_, flag);
+ final MovingObjectPosition movingobjectposition = this
+ .getMovingObjectPositionFromPlayer(p_77659_2_, p_77659_3_, flag);
if (movingobjectposition == null) {
return p_77659_1_;
@@ -125,8 +127,8 @@ public class NuclearFuelRodBase extends Item {
return p_77659_1_;
}
- private ItemStack func_150910_a(
- final ItemStack p_150910_1_, final EntityPlayer p_150910_2_, final Item p_150910_3_) {
+ private ItemStack func_150910_a(final ItemStack p_150910_1_, final EntityPlayer p_150910_2_,
+ final Item p_150910_3_) {
if (p_150910_2_.capabilities.isCreativeMode) {
return p_150910_1_;
} else if (--p_150910_1_.stackSize <= 0) {
@@ -143,13 +145,12 @@ public class NuclearFuelRodBase extends Item {
/**
* Attempts to place the liquid contained inside the bucket.
*/
- public boolean tryPlaceContainedLiquid(
- final World p_77875_1_, final int p_77875_2_, final int p_77875_3_, final int p_77875_4_) {
+ public boolean tryPlaceContainedLiquid(final World p_77875_1_, final int p_77875_2_, final int p_77875_3_,
+ final int p_77875_4_) {
if (this.isFull == Blocks.air) {
return false;
}
- final Material material =
- p_77875_1_.getBlock(p_77875_2_, p_77875_3_, p_77875_4_).getMaterial();
+ final Material material = p_77875_1_.getBlock(p_77875_2_, p_77875_3_, p_77875_4_).getMaterial();
final boolean flag = !material.isSolid();
if (!p_77875_1_.isAirBlock(p_77875_2_, p_77875_3_, p_77875_4_) && !flag) {
diff --git a/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java
index d5c606b964..a1f46a46fa 100644
--- a/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java
+++ b/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java
@@ -1,5 +1,18 @@
package gtPlusPlus.core.item.general;
+import java.util.List;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
import cofh.api.energy.ItemEnergyContainer;
import cpw.mods.fml.common.IFuelHandler;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -12,17 +25,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import ic2.api.item.IElectricItemManager;
-import java.util.List;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, IElectricItemManager, IFuelHandler {
@@ -47,11 +49,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World worldObj,
- final Entity player,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
final boolean p_77663_5_) {
this.getEnergyStored(itemStack);
if (worldObj.isRemote) {
@@ -149,21 +147,52 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add(EnumChatFormatting.YELLOW + "IC2/EU Information" + EnumChatFormatting.GRAY);
- list.add(EnumChatFormatting.GRAY + "Tier: [" + EnumChatFormatting.YELLOW + this.getTier(this.thisStack)
- + EnumChatFormatting.GRAY + "] Current Power: [" + EnumChatFormatting.YELLOW
- + (long) this.getCharge(stack) + EnumChatFormatting.GRAY + "/EU]");
- list.add(EnumChatFormatting.GRAY + "Transfer Limit: [" + EnumChatFormatting.YELLOW
- + this.getTransferLimit(this.thisStack) + EnumChatFormatting.GRAY + "Eu/t]" + "Burn Time: ["
- + EnumChatFormatting.YELLOW + (this.getBurnTime(stack) / 20) + EnumChatFormatting.GRAY + "s]");
+ list.add(
+ EnumChatFormatting.GRAY + "Tier: ["
+ + EnumChatFormatting.YELLOW
+ + this.getTier(this.thisStack)
+ + EnumChatFormatting.GRAY
+ + "] Current Power: ["
+ + EnumChatFormatting.YELLOW
+ + (long) this.getCharge(stack)
+ + EnumChatFormatting.GRAY
+ + "/EU]");
+ list.add(
+ EnumChatFormatting.GRAY + "Transfer Limit: ["
+ + EnumChatFormatting.YELLOW
+ + this.getTransferLimit(this.thisStack)
+ + EnumChatFormatting.GRAY
+ + "Eu/t]"
+ + "Burn Time: ["
+ + EnumChatFormatting.YELLOW
+ + (this.getBurnTime(stack) / 20)
+ + EnumChatFormatting.GRAY
+ + "s]");
list.add("");
list.add(EnumChatFormatting.RED + "RF Information");
- list.add(EnumChatFormatting.GRAY + "Extraction Rate: [" + EnumChatFormatting.RED + this.maxExtract
- + EnumChatFormatting.GRAY + "Rf/t]" + " Insert Rate: [" + EnumChatFormatting.RED + this.maxReceive
- + EnumChatFormatting.GRAY + "Rf/t]");
- list.add(EnumChatFormatting.GRAY + "Current Charge: [" + EnumChatFormatting.RED + this.getEnergyStored(stack)
- + EnumChatFormatting.GRAY + "Rf / " + this.getMaxEnergyStored(stack) + "Rf] " + EnumChatFormatting.RED
- + MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack))
- + EnumChatFormatting.GRAY + "%");
+ list.add(
+ EnumChatFormatting.GRAY + "Extraction Rate: ["
+ + EnumChatFormatting.RED
+ + this.maxExtract
+ + EnumChatFormatting.GRAY
+ + "Rf/t]"
+ + " Insert Rate: ["
+ + EnumChatFormatting.RED
+ + this.maxReceive
+ + EnumChatFormatting.GRAY
+ + "Rf/t]");
+ list.add(
+ EnumChatFormatting.GRAY + "Current Charge: ["
+ + EnumChatFormatting.RED
+ + this.getEnergyStored(stack)
+ + EnumChatFormatting.GRAY
+ + "Rf / "
+ + this.getMaxEnergyStored(stack)
+ + "Rf] "
+ + EnumChatFormatting.RED
+ + MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack))
+ + EnumChatFormatting.GRAY
+ + "%");
super.addInformation(stack, aPlayer, list, bool);
}
@@ -189,11 +218,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
}
@Override
- public double charge(
- final ItemStack stack,
- final double amount,
- final int tier,
- final boolean ignoreTransferLimit,
+ public double charge(final ItemStack stack, final double amount, final int tier, final boolean ignoreTransferLimit,
final boolean simulate) {
if (stack.stackTagCompound == null) {
stack.stackTagCompound = new NBTTagCompound();
@@ -210,13 +235,8 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem,
}
@Override
- public double discharge(
- final ItemStack stack,
- final double amount,
- final int tier,
- final boolean ignoreTransferLimit,
- final boolean externally,
- final boolean simulate) {
+ public double discharge(final ItemStack stack, final double amount, final int tier,
+ final boolean ignoreTransferLimit, final boolean externally, final boolean simulate) {
if ((stack.stackTagCompound == null) || (!stack.stackTagCompound.hasKey("Energy"))) {
final double euCharge = this.getCharge(ItemUtils.getSimpleStack(this));
if ((euCharge != 0) && (euCharge >= 1)) {
diff --git a/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
index c71dc5b9e3..7ed538faa0 100644
--- a/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
+++ b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
@@ -3,18 +3,10 @@ package gtPlusPlus.core.item.general.books;
import static gtPlusPlus.core.handler.BookHandler.mBookMap;
import static gtPlusPlus.core.util.Utils.addBookTitleLocalization;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.BookHandler;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.NBTUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
+
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.creativetab.CreativeTabs;
@@ -25,6 +17,16 @@ import net.minecraft.item.ItemWritableBook;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.BookHandler;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.NBTUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class ItemBaseBook extends ItemWritableBook {
public ItemBaseBook() {
@@ -40,13 +42,10 @@ public class ItemBaseBook extends ItemWritableBook {
for (int i = 0; i < BookHandler.mBookMap.size(); i++) {
ItemStack bookstack = new ItemStack(item, 1, i);
- /*bookstack = Utils.getWrittenBook(
- bookstack,
- i,
- mBookMap.get(i).mMapping,
- mBookMap.get(i).mTitle,
- mBookMap.get(i).mAuthor,
- mBookMap.get(i).mPages);*/
+ /*
+ * bookstack = Utils.getWrittenBook( bookstack, i, mBookMap.get(i).mMapping, mBookMap.get(i).mTitle,
+ * mBookMap.get(i).mAuthor, mBookMap.get(i).mPages);
+ */
NBTUtils.createIntegerTagCompound(bookstack, "stats", "mMeta", i);
list.add(bookstack);
@@ -108,14 +107,10 @@ public class ItemBaseBook extends ItemWritableBook {
try {
Class<?> clazz = ReflectionUtils.getClass("net.minecraft.client.gui.GuiScreenBook");
Constructor<?> ctor = clazz.getConstructor(EntityPlayer.class, ItemStack.class, boolean.class);
- Object object = ctor.newInstance(new Object[] {player, bookstack, false});
+ Object object = ctor.newInstance(new Object[] { player, bookstack, false });
Minecraft.getMinecraft().displayGuiScreen((GuiScreen) object);
- } catch (InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException
- | NoSuchMethodException
- | SecurityException e) {
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java b/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
index 382765b015..26668b567c 100644
--- a/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
+++ b/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
@@ -1,5 +1,16 @@
package gtPlusPlus.core.item.general.capture;
+import java.util.List;
+import java.util.UUID;
+
+import net.minecraft.entity.*;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gtPlusPlus.api.interfaces.IEntityCatcher;
import gtPlusPlus.api.objects.Logger;
@@ -10,15 +21,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.NBTUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.util.List;
-import java.util.UUID;
-import net.minecraft.entity.*;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
public class ItemEntityCatcher extends Item implements IEntityCatcher {
@@ -149,8 +151,8 @@ public class ItemEntityCatcher extends Item implements IEntityCatcher {
NBTUtils.setEntityCustomData(mEntityToSpawn, mEntityData);
}
- mEntityToSpawn.setLocationAndAngles(
- aPos.xPos, aPos.yPos, aPos.zPos, aWorld.rand.nextFloat() * 360.0F, 0.0F);
+ mEntityToSpawn
+ .setLocationAndAngles(aPos.xPos, aPos.yPos, aPos.zPos, aWorld.rand.nextFloat() * 360.0F, 0.0F);
if (mEntityToSpawn != null) {
mEntityToSpawn.onSpawnWithEgg(null);
aWorld.spawnEntityInWorld(mEntityToSpawn);
@@ -191,17 +193,8 @@ public class ItemEntityCatcher extends Item implements IEntityCatcher {
}
@Override
- public boolean onItemUse(
- ItemStack itemstack,
- EntityPlayer player,
- World world,
- int x,
- int y,
- int z,
- int side,
- float xOffset,
- float yOffset,
- float zOffset) {
+ public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side,
+ float xOffset, float yOffset, float zOffset) {
if (Utils.isServer()) {
Logger.WARNING("Trying to release (1)");
if (NBTUtils.hasKey(itemstack, "mHasEntity") && NBTUtils.getBoolean(itemstack, "mHasEntity")) {
@@ -210,7 +203,8 @@ public class ItemEntityCatcher extends Item implements IEntityCatcher {
if (!mDidSpawn) {
PlayerUtils.messagePlayer(
- player, "You failed to release a " + NBTUtils.getString(itemstack, "mEntityName") + ".");
+ player,
+ "You failed to release a " + NBTUtils.getString(itemstack, "mEntityName") + ".");
}
return mDidSpawn;
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
index ba726bd3ec..22d851938b 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
@@ -1,16 +1,18 @@
package gtPlusPlus.core.item.general.chassis;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+
public class ItemBoilerChassis extends Item {
public IIcon[] icons = new IIcon[1];
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
index 11828ce4ea..3fd7a7ee1e 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
@@ -1,15 +1,17 @@
package gtPlusPlus.core.item.general.chassis;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
public class ItemDehydratorCoil extends Item {
public IIcon[] icons = new IIcon[4];
@@ -64,22 +66,12 @@ public class ItemDehydratorCoil extends Item {
return (itemName + suffixName);
}
- /*@Override
- public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {
- int meta = stack.getItemDamage();
- if (meta == 0){
- HEX_OxFFFFFF = Utils.rgbtoHexValue(10,110,30);
- }
- else if (meta == 1){
- HEX_OxFFFFFF = Utils.rgbtoHexValue(150,180,35);
- }
- else if (meta == 2){
- HEX_OxFFFFFF = Utils.rgbtoHexValue(200,85,40);
- }
- else if (meta == 3){
- HEX_OxFFFFFF = Utils.rgbtoHexValue(255,150,50);
- }
- return HEX_OxFFFFFF;
- }*/
+ /*
+ * @Override public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { int meta =
+ * stack.getItemDamage(); if (meta == 0){ HEX_OxFFFFFF = Utils.rgbtoHexValue(10,110,30); } else if (meta == 1){
+ * HEX_OxFFFFFF = Utils.rgbtoHexValue(150,180,35); } else if (meta == 2){ HEX_OxFFFFFF =
+ * Utils.rgbtoHexValue(200,85,40); } else if (meta == 3){ HEX_OxFFFFFF = Utils.rgbtoHexValue(255,150,50); } return
+ * HEX_OxFFFFFF; }
+ */
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
index 57cd2fe663..e987030b6e 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
@@ -1,15 +1,17 @@
package gtPlusPlus.core.item.general.chassis;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
public class ItemDehydratorCoilWire extends Item {
public IIcon[] icons = new IIcon[4];
@@ -64,22 +66,12 @@ public class ItemDehydratorCoilWire extends Item {
return (itemName + suffixName);
}
- /* @Override
- public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {
- int meta = stack.getItemDamage();
- if (meta == 0){
- HEX_OxFFFFFF = Utils.rgbtoHexValue(10,110,30);
- }
- else if (meta == 1){
- HEX_OxFFFFFF = Utils.rgbtoHexValue(150,180,35);
- }
- else if (meta == 2){
- HEX_OxFFFFFF = Utils.rgbtoHexValue(200,85,40);
- }
- else if (meta == 3){
- HEX_OxFFFFFF = Utils.rgbtoHexValue(255,150,50);
- }
- return HEX_OxFFFFFF;
- }*/
+ /*
+ * @Override public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { int meta =
+ * stack.getItemDamage(); if (meta == 0){ HEX_OxFFFFFF = Utils.rgbtoHexValue(10,110,30); } else if (meta == 1){
+ * HEX_OxFFFFFF = Utils.rgbtoHexValue(150,180,35); } else if (meta == 2){ HEX_OxFFFFFF =
+ * Utils.rgbtoHexValue(200,85,40); } else if (meta == 3){ HEX_OxFFFFFF = Utils.rgbtoHexValue(255,150,50); } return
+ * HEX_OxFFFFFF; }
+ */
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java
index 97e5367936..687e697028 100644
--- a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java
+++ b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java
@@ -1,8 +1,7 @@
package gtPlusPlus.core.item.general.fuelrods;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -11,6 +10,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
public class FuelRod_Base extends Item {
public int fuelRemaining = 0;
@@ -51,7 +53,7 @@ public class FuelRod_Base extends Item {
}
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
@@ -95,17 +97,15 @@ public class FuelRod_Base extends Item {
formattedHeat = EnumChatFormatting.GRAY + tempHeat + EnumChatFormatting.GRAY;
} else if ((tempCurrentHeat <= (this.maxHeat / 3)) && (tempCurrentHeat > 200)) {
formattedHeat = EnumChatFormatting.YELLOW + tempHeat + EnumChatFormatting.GRAY;
- } else if ((tempCurrentHeat >= (this.maxHeat / 3))
- && (tempMax < ((this.maxHeat / 3) * 2))
+ } else if ((tempCurrentHeat >= (this.maxHeat / 3)) && (tempMax < ((this.maxHeat / 3) * 2))
&& (tempCurrentHeat != 0)) {
- formattedHeat = EnumChatFormatting.GOLD + tempHeat + EnumChatFormatting.GRAY;
- } else if ((tempCurrentHeat >= ((this.maxHeat / 3) * 2))
- && (tempMax <= this.maxHeat)
- && (tempCurrentHeat != 0)) {
- formattedHeat = EnumChatFormatting.RED + tempHeat + EnumChatFormatting.GRAY;
- } else {
- formattedHeat = EnumChatFormatting.BLUE + tempHeat + EnumChatFormatting.GRAY;
- }
+ formattedHeat = EnumChatFormatting.GOLD + tempHeat + EnumChatFormatting.GRAY;
+ } else
+ if ((tempCurrentHeat >= ((this.maxHeat / 3) * 2)) && (tempMax <= this.maxHeat) && (tempCurrentHeat != 0)) {
+ formattedHeat = EnumChatFormatting.RED + tempHeat + EnumChatFormatting.GRAY;
+ } else {
+ formattedHeat = EnumChatFormatting.BLUE + tempHeat + EnumChatFormatting.GRAY;
+ }
list.add(EnumChatFormatting.GRAY + "A " + formattedType + " Fuel Rod.");
list.add(EnumChatFormatting.GRAY + "Running at " + formattedHeat + "/" + formattedMaxHeat + " Kelvin.");
list.add(EnumChatFormatting.GRAY + "Fuel Remaining: " + formattedFuelLeft + "L.");
@@ -174,15 +174,10 @@ public class FuelRod_Base extends Item {
}
// Ticking and NBT Handling
- /* Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and
- * update it's contents.
- *
- * public int fuelRemaining = 0;
- public int maximumFuel = 0;
- public String fuelType = "";
- public float heat = 0;
- public float maxHeat = 5000;
- *
+ /*
+ * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and
+ * update it's contents. public int fuelRemaining = 0; public int maximumFuel = 0; public String fuelType = "";
+ * public float heat = 0; public float maxHeat = 5000;
*/
@Override
public void onCreated(final ItemStack itemStack, final World world, final EntityPlayer player) {
@@ -196,11 +191,7 @@ public class FuelRod_Base extends Item {
}
@Override
- public void onUpdate(
- final ItemStack itemStack,
- final World par2World,
- final Entity par3Entity,
- final int par4,
+ public void onUpdate(final ItemStack itemStack, final World par2World, final Entity par3Entity, final int par4,
final boolean par5) {
itemStack.stackTagCompound = new NBTTagCompound();
itemStack.stackTagCompound.setInteger("fuelRemaining", this.getFuelRemaining(itemStack));
diff --git a/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java b/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java
index d6919a4b80..90dc554165 100644
--- a/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java
+++ b/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java
@@ -1,14 +1,16 @@
package gtPlusPlus.core.item.general.rfchargingpack;
-import cofh.api.energy.ItemEnergyContainer;
-import gtPlusPlus.core.util.math.MathUtils;
import java.util.List;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import cofh.api.energy.ItemEnergyContainer;
+import gtPlusPlus.core.util.math.MathUtils;
+
public class ChargingPackBase extends ItemEnergyContainer {
protected final int mCapacityMax;
@@ -60,7 +62,9 @@ public class ChargingPackBase extends ItemEnergyContainer {
mCurrent = current.getEnergyStored(invStack);
if (mCurrent + mTransLimit <= mMaxStorage) {
current.extractEnergy(
- aStack, current.receiveEnergy(invStack, mTransLimit, false), false);
+ aStack,
+ current.receiveEnergy(invStack, mTransLimit, false),
+ false);
}
}
}
@@ -75,13 +79,29 @@ public class ChargingPackBase extends ItemEnergyContainer {
@Override
public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) {
list.add(EnumChatFormatting.RED + "RF Information");
- list.add(EnumChatFormatting.GRAY + "Extraction Rate: [" + EnumChatFormatting.RED + this.maxExtract
- + EnumChatFormatting.GRAY + "Rf/t]" + " Insert Rate: [" + EnumChatFormatting.RED + this.maxReceive
- + EnumChatFormatting.GRAY + "Rf/t]");
- list.add(EnumChatFormatting.GRAY + "Current Charge: [" + EnumChatFormatting.RED + this.getEnergyStored(stack)
- + EnumChatFormatting.GRAY + "Rf / " + this.getMaxEnergyStored(stack) + "Rf] " + EnumChatFormatting.RED
- + MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack))
- + EnumChatFormatting.GRAY + "%");
+ list.add(
+ EnumChatFormatting.GRAY + "Extraction Rate: ["
+ + EnumChatFormatting.RED
+ + this.maxExtract
+ + EnumChatFormatting.GRAY
+ + "Rf/t]"
+ + " Insert Rate: ["
+ + EnumChatFormatting.RED
+ + this.maxReceive
+ + EnumChatFormatting.GRAY
+ + "Rf/t]");
+ list.add(
+ EnumChatFormatting.GRAY + "Current Charge: ["
+ + EnumChatFormatting.RED
+ + this.getEnergyStored(stack)
+ + EnumChatFormatting.GRAY
+ + "Rf / "
+ + this.getMaxEnergyStored(stack)
+ + "Rf] "
+ + EnumChatFormatting.RED
+ + MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack))
+ + EnumChatFormatting.GRAY
+ + "%");
super.addInformation(stack, p_77624_2_, list, p_77624_4_);
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java
index a8d57c9892..60a4eddef1 100644
--- a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java
+++ b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java
@@ -1,14 +1,9 @@
package gtPlusPlus.core.item.general.spawn;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -19,6 +14,13 @@ import net.minecraft.item.*;
import net.minecraft.util.*;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class ItemCustomSpawnEgg extends ItemMonsterPlacer {
private static final HashMap<Integer, IIcon> mIconMap = new HashMap<Integer, IIcon>();
@@ -41,8 +43,8 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer {
return ItemUtils.simpleMetaStack(ModItems.itemCustomSpawnEgg, mReverseEntityMap.get(aEntityName), aSize);
}
- public static void registerEntityForSpawnEgg(
- final int aMetaID, String parEntityToSpawnName, int aPrimaryColor, int aSecondaryColor) {
+ public static void registerEntityForSpawnEgg(final int aMetaID, String parEntityToSpawnName, int aPrimaryColor,
+ int aSecondaryColor) {
registerEntityForSpawnEgg(
aMetaID,
parEntityToSpawnName,
@@ -52,13 +54,8 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer {
new ArrayList<String>());
}
- public static void registerEntityForSpawnEgg(
- final int aMetaID,
- String parEntityToSpawnName,
- int aPrimaryColor,
- int aSecondaryColor,
- EnumRarity aRarity,
- final ArrayList<String> aOreDictNames) {
+ public static void registerEntityForSpawnEgg(final int aMetaID, String parEntityToSpawnName, int aPrimaryColor,
+ int aSecondaryColor, EnumRarity aRarity, final ArrayList<String> aOreDictNames) {
mTotalMetaItems++;
mMaxStackSizeMap.put(aMetaID, 64);
mRarityMap.put(aMetaID, aRarity);
@@ -91,24 +88,13 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer {
}
/**
- * Callback for item usage. If the item does something special on right
- * clicking,
+ * Callback for item usage. If the item does something special on right clicking,
*
- * he will have one of those. Return True if something happen and false if
- * it don't. This is for ITEMS, not BLOCKS
+ * he will have one of those. Return True if something happen and false if it don't. This is for ITEMS, not BLOCKS
*/
@Override
- public boolean onItemUse(
- ItemStack par1ItemStack,
- EntityPlayer par2EntityPlayer,
- World par3World,
- int par4,
- int par5,
- int par6,
- int par7,
- float par8,
- float par9,
- float par10) {
+ public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4,
+ int par5, int par6, int par7, float par8, float par9, float par10) {
if (par3World.isRemote) {
return true;
} else {
@@ -139,8 +125,7 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer {
}
/**
- * Called whenever this item is equipped and the right mouse button is
- * pressed.
+ * Called whenever this item is equipped and the right mouse button is pressed.
*
* Args: itemStack, world, entityPlayer
*/
@@ -149,8 +134,10 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer {
if (par2World.isRemote) {
return par1ItemStack;
} else {
- MovingObjectPosition movingobjectposition =
- getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true);
+ MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(
+ par2World,
+ par3EntityPlayer,
+ true);
if (movingobjectposition == null) {
return par1ItemStack;
@@ -191,10 +178,10 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer {
}
/**
- * Spawns the creature specified by the egg's type in the location specified
- * by
+ * Spawns the creature specified by the egg's type in the location specified by
*
* the last three parameters. Parameters: world, entityID, x, y, z.
+ *
* @param par1ItemStack
*/
public Entity spawnEntity(ItemStack par1ItemStack, World parWorld, double parX, double parY, double parZ) {
@@ -208,7 +195,11 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer {
if (EntityList.stringToClassMapping.containsKey(entityToSpawnNameFull)) {
entityToSpawn = (EntityLiving) EntityList.createEntityByName(entityToSpawnNameFull, parWorld);
entityToSpawn.setLocationAndAngles(
- parX, parY, parZ, MathHelper.wrapAngleTo180_float(parWorld.rand.nextFloat() * 360.0F), 0.0F);
+ parX,
+ parY,
+ parZ,
+ MathHelper.wrapAngleTo180_float(parWorld.rand.nextFloat() * 360.0F),
+ 0.0F);
parWorld.spawnEntityInWorld(entityToSpawn);
entityToSpawn.onSpawnWithEgg((IEntityLivingData) null);
entityToSpawn.playLivingSound();
@@ -222,8 +213,7 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer {
}
/**
- * returns a list of items with the same ID, but different meta (eg: dye
- * returns 16 items)
+ * returns a list of items with the same ID, but different meta (eg: dye returns 16 items)
*/
@Override
@SideOnly(Side.CLIENT)
diff --git a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java
index 4aa6f11e7a..4f2e91d429 100644
--- a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java
+++ b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java
@@ -1,14 +1,15 @@
package gtPlusPlus.core.item.general.throwables;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.entity.projectile.EntityHydrofluoricAcidPotion;
-import gtPlusPlus.core.item.base.CoreItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.entity.projectile.EntityHydrofluoricAcidPotion;
+import gtPlusPlus.core.item.base.CoreItem;
+
public class ItemHydrofluoricAcidPotion extends CoreItem {
public ItemHydrofluoricAcidPotion(String unlocalizedName, String displayName, String description) {
@@ -18,7 +19,7 @@ public class ItemHydrofluoricAcidPotion extends CoreItem {
AddToCreativeTab.tabMisc,
16,
0,
- new String[] {description},
+ new String[] { description },
EnumRarity.uncommon,
EnumChatFormatting.GRAY,
false,
diff --git a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java
index a553e46cf3..32f6c69e1c 100644
--- a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java
+++ b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java
@@ -1,14 +1,15 @@
package gtPlusPlus.core.item.general.throwables;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion;
-import gtPlusPlus.core.item.base.CoreItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion;
+import gtPlusPlus.core.item.base.CoreItem;
+
public class ItemSulfuricAcidPotion extends CoreItem {
public ItemSulfuricAcidPotion(String unlocalizedName, String displayName, String description) {
@@ -18,7 +19,7 @@ public class ItemSulfuricAcidPotion extends CoreItem {
AddToCreativeTab.tabMisc,
16,
0,
- new String[] {description},
+ new String[] { description },
EnumRarity.common,
EnumChatFormatting.GRAY,
false,
diff --git a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java
index fedff944d1..62e0a6aa17 100644
--- a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java
+++ b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java
@@ -1,16 +1,7 @@
package gtPlusPlus.core.item.general.throwables;
-import gregtech.api.enums.ItemList;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.entity.projectile.EntityThrowableBomb;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.item.base.CoreItem;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -22,6 +13,17 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import gregtech.api.enums.ItemList;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.entity.projectile.EntityThrowableBomb;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
+
public class ItemThrowableBomb extends CoreItem {
private static AutoMap<ItemStack> mLighters = new AutoMap<ItemStack>();
@@ -34,7 +36,7 @@ public class ItemThrowableBomb extends CoreItem {
AddToCreativeTab.tabMisc,
16,
0,
- new String[] {"Just like Bomberman", "Have a fire source in inventory to prime"},
+ new String[] { "Just like Bomberman", "Have a fire source in inventory to prime" },
EnumRarity.uncommon,
EnumChatFormatting.GRAY,
false,
@@ -82,9 +84,9 @@ public class ItemThrowableBomb extends CoreItem {
if (!world.isRemote) {
world.spawnEntityInWorld(new EntityThrowableBomb(world, player));
}
- /*if (item.stackSize <= 0) {
- item = null;
- }*/
+ /*
+ * if (item.stackSize <= 0) { item = null; }
+ */
}
return item;
}
@@ -100,7 +102,7 @@ public class ItemThrowableBomb extends CoreItem {
return this.icons[meta];
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (int i = 0; i < 2; i++) {
diff --git a/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java b/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java
index c3ca06684e..1eefb4c4ab 100644
--- a/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java
+++ b/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java
@@ -1,5 +1,14 @@
package gtPlusPlus.core.item.init;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.base.foods.BaseItemFood;
@@ -9,14 +18,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.EntityUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import net.minecraft.entity.monster.EntityBlaze;
-import net.minecraft.entity.passive.EntityHorse;
-import net.minecraft.entity.passive.EntityOcelot;
-import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.entity.passive.EntityWolf;
-import net.minecraft.item.ItemStack;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
public class ItemsFoods {
@@ -28,40 +29,62 @@ public class ItemsFoods {
// Raisin Bread
ModItems.itemIngotRaisinBread = new BaseItemFood(
- "itemIngotRaisinBread",
- "Raisin Bread",
- 3,
- 1.5f,
- false,
- new PotionEffect(Potion.weakness.id, 40, 1))
- .setAlwaysEdible();
+ "itemIngotRaisinBread",
+ "Raisin Bread",
+ 3,
+ 1.5f,
+ false,
+ new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible();
GT_OreDictUnificator.registerOre(
- "foodRaisinBread", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemIngotRaisinBread", 1));
+ "foodRaisinBread",
+ ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemIngotRaisinBread", 1));
// Hot Raisin Bread
ModItems.itemHotIngotRaisinBread = new BaseItemHotFood(
- "itemHotIngotRaisinBread", 1, 0.5f, "Raisin Bread", 120, ModItems.itemIngotRaisinBread);
+ "itemHotIngotRaisinBread",
+ 1,
+ 0.5f,
+ "Raisin Bread",
+ 120,
+ ModItems.itemIngotRaisinBread);
GT_OreDictUnificator.registerOre(
- "foodHotRaisinBread", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotIngotRaisinBread", 1));
+ "foodHotRaisinBread",
+ ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotIngotRaisinBread", 1));
// Raisin Bread
- ModItems.itemFoodRaisinToast =
- new BaseItemFood("itemFoodRaisinToast", "Raisin Toast", 1, 0.5f, false).setAlwaysEdible();
- GT_OreDictUnificator.registerOre(
- "foodRaisinToast", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemFoodRaisinToast", 1));
+ ModItems.itemFoodRaisinToast = new BaseItemFood("itemFoodRaisinToast", "Raisin Toast", 1, 0.5f, false)
+ .setAlwaysEdible();
+ GT_OreDictUnificator
+ .registerOre("foodRaisinToast", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemFoodRaisinToast", 1));
// Hot Raisin Bread
ModItems.itemHotFoodRaisinToast = new BaseItemHotFood(
- "itemHotFoodRaisinToast", 1, 0.5f, "Raisin Toast", 20, ModItems.itemFoodRaisinToast);
+ "itemHotFoodRaisinToast",
+ 1,
+ 0.5f,
+ "Raisin Toast",
+ 20,
+ ModItems.itemFoodRaisinToast);
GT_OreDictUnificator.registerOre(
- "foodHotRaisinToast", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotFoodRaisinToast", 1));
+ "foodHotRaisinToast",
+ ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotFoodRaisinToast", 1));
// Raisin Bread
- ModItems.itemFoodCurriedSausages =
- new BaseItemFood("itemFoodCurriedSausages", "Curried Sausages", 5, 2f, false);
+ ModItems.itemFoodCurriedSausages = new BaseItemFood(
+ "itemFoodCurriedSausages",
+ "Curried Sausages",
+ 5,
+ 2f,
+ false);
GT_OreDictUnificator.registerOre(
- "foodCurriedSausages", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemFoodCurriedSausages", 1));
+ "foodCurriedSausages",
+ ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemFoodCurriedSausages", 1));
// Hot Raisin Bread
ModItems.itemHotFoodCurriedSausages = new BaseItemHotFood(
- "itemHotFoodCurriedSausages", 1, 0.5f, "Curried Sausages", 240, ModItems.itemFoodCurriedSausages);
+ "itemHotFoodCurriedSausages",
+ 1,
+ 0.5f,
+ "Curried Sausages",
+ 240,
+ ModItems.itemFoodCurriedSausages);
GT_OreDictUnificator.registerOre(
"foodHotCurriedSausages",
ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotFoodCurriedSausages", 1));
diff --git a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java
index a9c4adac97..95d90ac0dd 100644
--- a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java
+++ b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java
@@ -2,13 +2,8 @@ package gtPlusPlus.core.item.materials;
import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.handler.Recipes.DecayableRecipe;
-import gtPlusPlus.core.item.base.BaseItemTickable;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -16,6 +11,13 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.handler.Recipes.DecayableRecipe;
+import gtPlusPlus.core.item.base.BaseItemTickable;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class DustDecayable extends BaseItemTickable {
private final Item turnsIntoItem;
@@ -37,7 +39,7 @@ public class DustDecayable extends BaseItemTickable {
this.mIcon[1] = reg.registerIcon(gt2);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
super.addInformation(stack, player, list, bool);
@@ -47,11 +49,7 @@ public class DustDecayable extends BaseItemTickable {
}
@Override
- public void onUpdate(
- final ItemStack iStack,
- final World world,
- final Entity entityHolding,
- final int p_77663_4_,
+ public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
final boolean p_77663_5_) {
if (world == null || iStack == null) {
return;
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java b/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java
index 8c58c1b927..95dc7822c2 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java
@@ -1,14 +1,9 @@
package gtPlusPlus.core.item.tool.misc;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -17,6 +12,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
+
public class ConnectedBlockFinder extends BaseItemWithDamageValue {
public ConnectedBlockFinder() {
@@ -28,7 +30,7 @@ public class ConnectedBlockFinder extends BaseItemWithDamageValue {
GameRegistry.registerItem(this, getUnlocalizedName());
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add(EnumChatFormatting.GRAY + "Finds connected blocks, turns them to Glass once found.");
@@ -67,17 +69,8 @@ public class ConnectedBlockFinder extends BaseItemWithDamageValue {
}
@Override
- public boolean onItemUse(
- ItemStack stack,
- EntityPlayer player,
- World world,
- int x,
- int y,
- int z,
- int side,
- float hitX,
- float hitY,
- float hitZ) {
+ public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
+ float hitX, float hitY, float hitZ) {
BlockPos mStartPoint = new BlockPos(x, y, z, world);
Block mBlockType = world.getBlock(x, y, z);
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
index a9272d8baa..c0ccd66fae 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.item.tool.misc;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.CoreItem;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
@@ -13,6 +9,11 @@ import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class DebugScanner extends CoreItem {
public DebugScanner() {
@@ -21,9 +22,7 @@ public class DebugScanner extends CoreItem {
AddToCreativeTab.tabTools,
1,
0,
- new String[] {
- "Used to obtain information from GT/GT++ content", "Right Click to use",
- },
+ new String[] { "Used to obtain information from GT/GT++ content", "Right Click to use", },
EnumRarity.epic);
setTextureName(CORE.MODID + ":itemStickyRubber");
}
@@ -34,17 +33,8 @@ public class DebugScanner extends CoreItem {
}
@Override
- public boolean onItemUse(
- ItemStack aStack,
- EntityPlayer aPlayer,
- World aWorld,
- int p_77648_4_,
- int p_77648_5_,
- int p_77648_6_,
- int p_77648_7_,
- float p_77648_8_,
- float p_77648_9_,
- float p_77648_10_) {
+ public boolean onItemUse(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int p_77648_4_, int p_77648_5_,
+ int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) {
// TODO Auto-generated method stub
return super.onItemUse(
aStack,
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java b/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java
index ac63ef24f7..be0b4d43e1 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java
@@ -1,16 +1,18 @@
package gtPlusPlus.core.item.tool.misc;
-import gregtech.api.enums.Materials;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.CoreItem;
-import gtPlusPlus.core.util.Utils;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import gregtech.api.enums.Materials;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.util.Utils;
+
public class FakeGregtechTool extends CoreItem {
public final int componentColour;
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
index 91dfb88ea3..9750f0818b 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
@@ -2,6 +2,33 @@ package gtPlusPlus.core.item.tool.misc;
import static gregtech.api.enums.GT_Values.V;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidContainerItem;
+import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.IFluidTank;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -31,31 +58,6 @@ import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidContainerItem;
-import net.minecraftforge.fluids.IFluidHandler;
-import net.minecraftforge.fluids.IFluidTank;
public class GregtechPump extends Item implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem {
@@ -63,17 +65,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
* Right Click Functions
*/
@Override
- public boolean onItemUse(
- ItemStack aStack,
- EntityPlayer aPlayer,
- World aWorld,
- int aX,
- int aY,
- int aZ,
- int a4,
- float p_77648_8_,
- float p_77648_9_,
- float p_77648_10_) {
+ public boolean onItemUse(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int a4,
+ float p_77648_8_, float p_77648_9_, float p_77648_10_) {
if (aStack == null || aPlayer == null || aWorld == null || aWorld.isRemote) {
return false;
}
@@ -120,26 +113,19 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
aEuMax, // Eu Storage
(short) aTier, // Tier
"Can be used to remove fluids from GT machine input & output slots.", // Tooltip
- aTier <= 0
- ? EnumRarity.common
- : aTier == 1
- ? EnumRarity.uncommon
- : aTier == 2
- ? EnumRarity.rare
- : aTier == 3 ? EnumRarity.epic : EnumRarity.common, // Rarity
+ aTier <= 0 ? EnumRarity.common
+ : aTier == 1 ? EnumRarity.uncommon
+ : aTier == 2 ? EnumRarity.rare : aTier == 3 ? EnumRarity.epic : EnumRarity.common, // Rarity
EnumChatFormatting.GRAY, // Desc colour
false // Effect?
- );
+ );
}
public GregtechPump() {
this("MU-metatool.01", AddToCreativeTab.tabTools, (short) 1000, (short) 31766);
}
- public GregtechPump(
- final String unlocalizedName,
- final CreativeTabs creativeTab,
- final short aOffset,
+ public GregtechPump(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset,
final short aItemAmount) {
this.mEnabledItems = new BitSet(aItemAmount);
this.mVisibleItems = new BitSet(aItemAmount);
@@ -155,8 +141,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
}
}
- public void registerItem(
- final int id, final String localizedName, final long euStorage, final int tier, final String description) {
+ public void registerItem(final int id, final String localizedName, final long euStorage, final int tier,
+ final String description) {
this.registerItem(
id,
localizedName,
@@ -168,13 +154,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
false);
}
- public void registerItem(
- final int id,
- final String localizedName,
- final long euStorage,
- final int tier,
- final String description,
- final int burnTime) {
+ public void registerItem(final int id, final String localizedName, final long euStorage, final int tier,
+ final String description, final int burnTime) {
this.registerItem(
id,
localizedName,
@@ -187,14 +168,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
this.setBurnValue(id, burnTime);
}
- public void registerItem(
- final int id,
- final String localizedName,
- final long euStorage,
- final short tier,
- final String description,
- final EnumRarity regRarity,
- final EnumChatFormatting colour,
+ public void registerItem(final int id, final String localizedName, final long euStorage, final short tier,
+ final String description, final EnumRarity regRarity, final EnumChatFormatting colour,
final boolean Effect) {
this.addItem(id, localizedName, EnumChatFormatting.YELLOW + "Electric", new Object[] {});
if (euStorage > 0 && tier > 0)
@@ -225,7 +200,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
return false;
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
@Override
public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) {
// aList.add("Meta: "+(aStack.getItemDamage()-mOffset));
@@ -242,25 +217,38 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
aList.add("Cannot be emptied via RMB, use inside a tank with GUI");
aList.add(EnumChatFormatting.DARK_GRAY + "This is technically just a fancy fluid cell");
aList.add(EnumChatFormatting.BLUE + (f != null ? f.getLocalizedName() : "No Fluids Contained"));
- aList.add(EnumChatFormatting.BLUE + (f != null ? "" + f.amount : "" + 0) + "L" + " / " + getCapacity(aStack)
- + "L");
+ aList.add(
+ EnumChatFormatting.BLUE + (f != null ? "" + f.amount : "" + 0)
+ + "L"
+ + " / "
+ + getCapacity(aStack)
+ + "L");
}
final Long[] tStats = this.getElectricStats(aStack);
if (tStats != null) {
if (tStats[3] > 0) {
- aList.add(EnumChatFormatting.AQUA + "Contains " + GT_Utility.formatNumbers(tStats[3]) + " EU Tier: "
- + (tStats[2] >= 0 ? tStats[2] : 0) + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.AQUA + "Contains "
+ + GT_Utility.formatNumbers(tStats[3])
+ + " EU Tier: "
+ + (tStats[2] >= 0 ? tStats[2] : 0)
+ + EnumChatFormatting.GRAY);
} else {
final long tCharge = this.getRealCharge(aStack);
if ((tStats[3] == -2) && (tCharge <= 0)) {
- aList.add(EnumChatFormatting.AQUA + "Empty. You should recycle it properly."
- + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.AQUA + "Empty. You should recycle it properly."
+ + EnumChatFormatting.GRAY);
} else {
- aList.add(EnumChatFormatting.AQUA + "" + GT_Utility.formatNumbers(tCharge) + " / "
- + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: "
- + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]
- + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.AQUA + ""
+ + GT_Utility.formatNumbers(tCharge)
+ + " / "
+ + GT_Utility.formatNumbers(Math.abs(tStats[0]))
+ + " EU - Voltage: "
+ + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]
+ + EnumChatFormatting.GRAY);
}
}
}
@@ -308,29 +296,19 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
}
@Override
- public final double charge(
- final ItemStack aStack,
- final double aCharge,
- final int aTier,
- final boolean aIgnoreTransferLimit,
- final boolean aSimulate) {
+ public final double charge(final ItemStack aStack, final double aCharge, final int aTier,
+ final boolean aIgnoreTransferLimit, final boolean aSimulate) {
final Long[] tStats = this.getElectricStats(aStack);
- if ((tStats == null)
- || (tStats[2] > aTier)
+ if ((tStats == null) || (tStats[2] > aTier)
|| !((tStats[3] == -1) || (tStats[3] == -3) || ((tStats[3] < 0) && (aCharge == Integer.MAX_VALUE)))
|| (aStack.stackSize != 1)) {
return 0;
}
- final long tChargeBefore = this.getRealCharge(aStack),
- tNewCharge =
- aCharge == Integer.MAX_VALUE
- ? Long.MAX_VALUE
- : Math.min(
- Math.abs(tStats[0]),
- tChargeBefore
- + (aIgnoreTransferLimit
- ? (long) aCharge
- : Math.min(tStats[1], (long) aCharge)));
+ final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = aCharge == Integer.MAX_VALUE
+ ? Long.MAX_VALUE
+ : Math.min(
+ Math.abs(tStats[0]),
+ tChargeBefore + (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
if (!aSimulate) {
this.setCharge(aStack, tNewCharge);
}
@@ -338,13 +316,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
}
@Override
- public final double discharge(
- final ItemStack aStack,
- final double aCharge,
- final int aTier,
- final boolean aIgnoreTransferLimit,
- final boolean aBatteryAlike,
- final boolean aSimulate) {
+ public final double discharge(final ItemStack aStack, final double aCharge, final int aTier,
+ final boolean aIgnoreTransferLimit, final boolean aBatteryAlike, final boolean aSimulate) {
final Long[] tStats = this.getElectricStats(aStack);
if ((tStats == null) || (tStats[2] > aTier)) {
return 0;
@@ -361,14 +334,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
}
return tStats[3];
}
- final long tChargeBefore = this.getRealCharge(aStack),
- tNewCharge =
- Math.max(
- 0,
- tChargeBefore
- - (aIgnoreTransferLimit
- ? (long) aCharge
- : Math.min(tStats[1], (long) aCharge)));
+ final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = Math
+ .max(0, tChargeBefore - (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
if (!aSimulate) {
this.setCharge(aStack, tNewCharge);
}
@@ -504,7 +471,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
public final String getToolTip(final ItemStack aStack) {
return null;
} // This has its own ToolTip Handler, no need to let the IC2 Handler screw us up
- // at this Point
+ // at this Point
@Override
public final IElectricItemManager getManager(final ItemStack aStack) {
@@ -514,10 +481,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
/**
* Sets the Furnace Burn Value for the Item.
*
- * @param aMetaValue
- * the Meta Value of the Item you want to set it to. [0 - 32765]
- * @param aValue
- * 200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU)
+ * @param aMetaValue the Meta Value of the Item you want to set it to. [0 - 32765]
+ * @param aValue 200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU)
* @return the Item itself for convenience in constructing.
*/
public final GregtechPump setBurnValue(final int aMetaValue, final int aValue) {
@@ -533,30 +498,18 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
}
/**
- * @param aMetaValue
- * the Meta Value of the Item you want to set it to. [0 - 32765]
- * @param aMaxCharge
- * Maximum Charge. (if this is == 0 it will remove the Electric
- * Behavior)
- * @param aTransferLimit
- * Transfer Limit.
- * @param aTier
- * The electric Tier.
- * @param aSpecialData
- * If this Item has a Fixed Charge, like a SingleUse Battery (if >
- * 0). Use -1 if you want to make this Battery chargeable (the use
- * and canUse Functions will still discharge if you just use this)
- * Use -2 if you want to make this Battery dischargeable. Use -3 if
- * you want to make this Battery charge/discharge-able.
+ * @param aMetaValue the Meta Value of the Item you want to set it to. [0 - 32765]
+ * @param aMaxCharge Maximum Charge. (if this is == 0 it will remove the Electric Behavior)
+ * @param aTransferLimit Transfer Limit.
+ * @param aTier The electric Tier.
+ * @param aSpecialData If this Item has a Fixed Charge, like a SingleUse Battery (if > 0). Use -1 if you want to
+ * make this Battery chargeable (the use and canUse Functions will still discharge if you just
+ * use this) Use -2 if you want to make this Battery dischargeable. Use -3 if you want to make
+ * this Battery charge/discharge-able.
* @return the Item itself for convenience in constructing.
*/
- public final GregtechPump setElectricStats(
- final int aMetaValue,
- final long aMaxCharge,
- final long aTransferLimit,
- final long aTier,
- final long aSpecialData,
- final boolean aUseAnimations) {
+ public final GregtechPump setElectricStats(final int aMetaValue, final long aMaxCharge, final long aTransferLimit,
+ final long aTier, final long aSpecialData, final boolean aUseAnimations) {
if (aMetaValue < 0) {
return this;
}
@@ -565,12 +518,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
} else {
this.mElectricStats.put(
(short) aMetaValue,
- new Long[] {aMaxCharge, Math.max(0, aTransferLimit), Math.max(-1, aTier), aSpecialData});
+ new Long[] { aMaxCharge, Math.max(0, aTransferLimit), Math.max(-1, aTier), aSpecialData });
}
return this;
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item var1, final CreativeTabs aCreativeTab, final List aList) {
@@ -598,7 +551,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
for (short i = 0, j = (short) this.mEnabledItems.length(); i < j; i++) {
if (this.mEnabledItems.get(i)) {
mIconMap.put(
- (int) i, aIconRegister.registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i)));
+ (int) i,
+ aIconRegister.registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i)));
}
}
}
@@ -657,13 +611,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
/**
* Adds a special Item Behaviour to the Item.
* <p/>
- * Note: the boolean Behaviours sometimes won't be executed if another boolean
- * Behaviour returned true before.
+ * Note: the boolean Behaviours sometimes won't be executed if another boolean Behaviour returned true before.
*
- * @param aMetaValue
- * the Meta Value of the Item you want to add it to. [0 - 32765]
- * @param aBehavior
- * the Click Behavior you want to add.
+ * @param aMetaValue the Meta Value of the Item you want to add it to. [0 - 32765]
+ * @param aBehavior the Click Behavior you want to add.
* @return the Item itself for convenience in constructing.
*/
public final GregtechPump addItemBehavior(final int aMetaValue, final IItemBehaviour<GregtechPump> aBehavior) {
@@ -682,20 +633,11 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
/**
* This adds a Custom Item to the ending Range.
*
- * @param aID
- * The Id of the assigned Item [0 - mItemAmount] (The MetaData gets
- * auto-shifted by +mOffset)
- * @param aEnglish
- * The Default Localized Name of the created Item
- * @param aToolTip
- * The Default ToolTip of the created Item, you can also insert null
- * for having no ToolTip
- * @param aFoodBehavior
- * The Food Value of this Item. Can be null aswell. Just a
- * convenience thing.
- * @param aRandomData
- * The OreDict Names you want to give the Item. Also used for TC
- * Aspects and some other things.
+ * @param aID The Id of the assigned Item [0 - mItemAmount] (The MetaData gets auto-shifted by +mOffset)
+ * @param aEnglish The Default Localized Name of the created Item
+ * @param aToolTip The Default ToolTip of the created Item, you can also insert null for having no ToolTip
+ * @param aFoodBehavior The Food Value of this Item. Can be null aswell. Just a convenience thing.
+ * @param aRandomData The OreDict Names you want to give the Item. Also used for TC Aspects and some other things.
* @return An ItemStack containing the newly created Item.
*/
@SuppressWarnings("unchecked")
@@ -815,8 +757,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
if (!container.hasTagCompound() || !container.getTagCompound().hasKey("mInit")) {
initNBT(container);
}
- if (container.getTagCompound().hasKey("mInit")
- && container.getTagCompound().getBoolean("mInit")) {
+ if (container.getTagCompound().hasKey("mInit") && container.getTagCompound().getBoolean("mInit")) {
String fluidname;
Integer amount = 0;
fluidname = NBTUtils.getString(container, "mFluid");
@@ -835,8 +776,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
if (!container.hasTagCompound() || !container.getTagCompound().hasKey("mInit")) {
initNBT(container);
}
- if (container.getTagCompound().hasKey("mInit")
- && container.getTagCompound().getBoolean("mInit")) {
+ if (container.getTagCompound().hasKey("mInit") && container.getTagCompound().getBoolean("mInit")) {
return container.getTagCompound().getInteger("mCapacity");
}
int aMeta = this.getCorrectMetaForItemstack(container);
@@ -857,8 +797,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
if (!container.hasTagCompound() || !container.getTagCompound().hasKey("mInit")) {
initNBT(container);
}
- if (container.getTagCompound().hasKey("mInit")
- && container.getTagCompound().getBoolean("mInit")) {
+ if (container.getTagCompound().hasKey("mInit") && container.getTagCompound().getBoolean("mInit")) {
String aStored;
int aStoredAmount = 0;
int aCapacity = getCapacity(container);
@@ -930,8 +869,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
if (!container.hasTagCompound() || !container.getTagCompound().hasKey("mInit")) {
initNBT(container);
}
- if (container.getTagCompound().hasKey("mInit")
- && container.getTagCompound().getBoolean("mInit")) {
+ if (container.getTagCompound().hasKey("mInit") && container.getTagCompound().getBoolean("mInit")) {
String aStored;
int aStoredAmount = 0;
@@ -1055,8 +993,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
}
}
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return false;
}
@@ -1064,8 +1001,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
* Vanilla IFluidTank
*/
- public boolean drainIFluidTank(
- TileEntity tTileEntity, ItemStack aStack, World aWorld, EntityPlayer aPlayer, int aX, int aY, int aZ) {
+ public boolean drainIFluidTank(TileEntity tTileEntity, ItemStack aStack, World aWorld, EntityPlayer aPlayer, int aX,
+ int aY, int aZ) {
if (tTileEntity == null) {
Logger.INFO("Invalid Tile, somehow.");
return false;
@@ -1082,15 +1019,16 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
if (mAmountInserted == aStored.amount) {
newStackRemainingInTank = null;
} else {
- newStackRemainingInTank =
- FluidUtils.getFluidStack(aStored, (aStored.amount - mAmountInserted));
+ newStackRemainingInTank = FluidUtils
+ .getFluidStack(aStored, (aStored.amount - mAmountInserted));
}
boolean b = setStoredFluidOfVanillaTank(tTileEntity, newStackRemainingInTank);
Logger.INFO("Cleared Tank? " + b + " | mAmountInserted: " + mAmountInserted);
Logger.INFO("Returning " + b + " - drainTankVanilla.");
if (b) {
PlayerUtils.messagePlayer(
- aPlayer, "Drained " + mAmountInserted + "L of " + aStored.getLocalizedName() + ".");
+ aPlayer,
+ "Drained " + mAmountInserted + "L of " + aStored.getLocalizedName() + ".");
}
return b;
}
@@ -1109,8 +1047,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
* GT Tanks
*/
- public boolean drainTankGT(
- TileEntity tTileEntity, ItemStack aStack, World aWorld, EntityPlayer aPlayer, int aX, int aY, int aZ) {
+ public boolean drainTankGT(TileEntity tTileEntity, ItemStack aStack, World aWorld, EntityPlayer aPlayer, int aX,
+ int aY, int aZ) {
if (tTileEntity == null) {
return false;
}
@@ -1134,11 +1072,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
if (mAmountInserted == aStored.amount) {
newStackRemainingInTank = null;
} else {
- newStackRemainingInTank =
- FluidUtils.getFluidStack(aStored, (aStored.amount - mAmountInserted));
+ newStackRemainingInTank = FluidUtils
+ .getFluidStack(aStored, (aStored.amount - mAmountInserted));
}
boolean b = setStoredFluidOfGTMachine(
- (IGregTechTileEntity) tTileEntity, newStackRemainingInTank);
+ (IGregTechTileEntity) tTileEntity,
+ newStackRemainingInTank);
Logger.INFO("Cleared Tank? " + b + " | mAmountInserted: " + mAmountInserted);
Logger.INFO("Returning " + b + " - drainTankGT.");
if (b) {
@@ -1180,8 +1119,9 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
public FluidStack getStoredFluidOfVanillaTank(IFluidTank aTileEntity) {
FluidStack f = aTileEntity.getFluid();
- Logger.INFO("Returning Fluid stack from tile. Found: "
- + (f != null ? f.getLocalizedName() + " - " + f.amount + "L" : "Nothing"));
+ Logger.INFO(
+ "Returning Fluid stack from tile. Found: "
+ + (f != null ? f.getLocalizedName() + " - " + f.amount + "L" : "Nothing"));
return f;
}
@@ -1243,8 +1183,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
if (a1 != null) {
if (a1[0] != null) {
aTankContents = a1[0].fluid;
- Logger.INFO("Found Fluid in Tank. " + aTankContents.getLocalizedName() + " - "
- + aTankContents.amount);
+ Logger.INFO(
+ "Found Fluid in Tank. " + aTankContents.getLocalizedName()
+ + " - "
+ + aTankContents.amount);
}
}
if (aSetFluid == null) {
@@ -1253,8 +1195,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
} else {
Logger.INFO("Setting fluid to tank contents, as we're going to empty it totally.");
}
- Logger.INFO("Tile Was instance of IFluidHandler. Trying to Drain " + aSetFluid.getLocalizedName()
- + " - " + aSetFluid.amount);
+ Logger.INFO(
+ "Tile Was instance of IFluidHandler. Trying to Drain " + aSetFluid.getLocalizedName()
+ + " - "
+ + aSetFluid.amount);
if (a1 == null || aTankContents == null) {
Logger.INFO("Tank is empty.");
@@ -1286,8 +1230,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
if (aTileEntity == null) {
return null;
}
- final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
- ;
+ final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();;
if (aMetaTileEntity == null) {
return null;
}
@@ -1304,21 +1247,19 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
// Let's see if this machine has output fluid too
/*
- * if (f == null) {
- * Logger.INFO("Could not find any input fluid, checking output if possible.");
- * if (aTileEntity instanceof GT_MetaTileEntity_BasicMachine) {
- * GT_MetaTileEntity_BasicMachine g = (GT_MetaTileEntity_BasicMachine)
- * aTileEntity;
- * Logger.INFO("Tile is a Basic Machine of some sort - "+g.mNEIName); if (g !=
- * null) { f = g.mOutputFluid; if (f != null) {
- * Logger.INFO("Found output fluid! "+f.getLocalizedName()); } else {
+ * if (f == null) { Logger.INFO("Could not find any input fluid, checking output if possible."); if (aTileEntity
+ * instanceof GT_MetaTileEntity_BasicMachine) { GT_MetaTileEntity_BasicMachine g =
+ * (GT_MetaTileEntity_BasicMachine) aTileEntity;
+ * Logger.INFO("Tile is a Basic Machine of some sort - "+g.mNEIName); if (g != null) { f = g.mOutputFluid; if (f
+ * != null) { Logger.INFO("Found output fluid! "+f.getLocalizedName()); } else {
* Logger.INFO("Did not find anything!"); f = g.getFluid(); if (f != null) {
- * Logger.INFO("Found fluid! "+f.getLocalizedName()); } else {
- * Logger.INFO("Did not find anything!"); f = g.getFluid(); } } } } }
+ * Logger.INFO("Found fluid! "+f.getLocalizedName()); } else { Logger.INFO("Did not find anything!"); f =
+ * g.getFluid(); } } } } }
*/
- Logger.INFO("Returning Fluid stack from tile. Found: "
- + (f != null ? f.getLocalizedName() + " - " + f.amount + "L" : "Nothing"));
+ Logger.INFO(
+ "Returning Fluid stack from tile. Found: "
+ + (f != null ? f.getLocalizedName() + " - " + f.amount + "L" : "Nothing"));
return f;
}
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java
index 3f4a754ab8..bb9cdb595c 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java
@@ -1,18 +1,21 @@
package gtPlusPlus.core.item.tool.misc;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
+import gtPlusPlus.core.lib.CORE;
+
public class SandstoneHammer extends BaseItemWithDamageValue {
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see net.minecraft.item.Item#getColorFromItemStack(net.minecraft.item.ItemStack, int)
*/
@Override
@@ -29,7 +32,7 @@ public class SandstoneHammer extends BaseItemWithDamageValue {
this.setMaxDamage(2500);
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add(EnumChatFormatting.GRAY + "Allows you to craft sand from cobble, or sandstone from sand.");
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java
index 7f4e971e5a..492adc4e07 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java
@@ -7,11 +7,9 @@ public class AutoLunchBox extends BaseBoxItem {
public AutoLunchBox(String displayName) {
super(
displayName,
- new String[] {
- "Stores 9 pieces of food",
- "Food will automatically be eaten from slot 1, through to "
- + gtPlusPlus.core.item.tool.misc.box.AutoLunchBox.SLOTS
- },
+ new String[] { "Stores 9 pieces of food",
+ "Food will automatically be eaten from slot 1, through to "
+ + gtPlusPlus.core.item.tool.misc.box.AutoLunchBox.SLOTS },
gtPlusPlus.core.item.tool.misc.box.AutoLunchBox.SLOTS);
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java
index 40fd5dfc7d..e8988c62ac 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java
@@ -1,5 +1,12 @@
package gtPlusPlus.core.item.tool.misc.box;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.GTplusplus;
@@ -7,12 +14,6 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.CoreItem;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
public class BaseBoxItem extends CoreItem {
@@ -54,7 +55,12 @@ public class BaseBoxItem extends CoreItem {
// If player not sneaking, open the inventory gui
if (!player.isSneaking()) {
player.openGui(
- GTplusplus.instance, GUI, world, (int) player.posX, (int) player.posY, (int) player.posZ);
+ GTplusplus.instance,
+ GUI,
+ world,
+ (int) player.posX,
+ (int) player.posY,
+ (int) player.posZ);
}
}
return itemstack;
@@ -63,7 +69,6 @@ public class BaseBoxItem extends CoreItem {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
- this.itemIcon = iconRegister.registerIcon(
- CORE.MODID + ":" + this.getUnlocalizedName().substring(5));
+ this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + this.getUnlocalizedName().substring(5));
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java
index 242b659462..c46552298a 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.item.tool.misc.box;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -12,12 +13,10 @@ import net.minecraft.item.ItemStack;
public class ContainerBoxBase extends Container {
/*
- * Finally, in your Container class, you will need to check if the currently
- * opened inventory's uniqueID is equal to the itemstack's uniqueID in the
- * method 'transferStackInSlot' as well as check if the itemstack is the
- * currently equipped item in the method 'slotClick'. In both cases, you'll need
- * to prevent the itemstack from being moved or it will cause bad things to
- * happen.
+ * Finally, in your Container class, you will need to check if the currently opened inventory's uniqueID is equal to
+ * the itemstack's uniqueID in the method 'transferStackInSlot' as well as check if the itemstack is the currently
+ * equipped item in the method 'slotClick'. In both cases, you'll need to prevent the itemstack from being moved or
+ * it will cause bad things to happen.
*/
/**
@@ -25,28 +24,22 @@ public class ContainerBoxBase extends Container {
*/
/*
- * There's a LOT of code in this one, but read through all of the comments
- * carefully and it should become clear what everything does. As a bonus, one of
- * my previous tutorials is included within!
- * "How to Properly Override Shift-Clicking" is here and better than ever! At
- * least in my opinion. If you're like me, and you find no end of frustration
- * trying to figure out which f-ing index you should use for which slots in your
- * container when overriding transferStackInSlot, or if your following the
- * original tutorial, then read on.
+ * There's a LOT of code in this one, but read through all of the comments carefully and it should become clear what
+ * everything does. As a bonus, one of my previous tutorials is included within!
+ * "How to Properly Override Shift-Clicking" is here and better than ever! At least in my opinion. If you're like
+ * me, and you find no end of frustration trying to figure out which f-ing index you should use for which slots in
+ * your container when overriding transferStackInSlot, or if your following the original tutorial, then read on.
*/
/**
- * The Item Inventory for this Container, only needed if you want to reference
- * isUseableByPlayer
+ * The Item Inventory for this Container, only needed if you want to reference isUseableByPlayer
*/
private final CustomBoxInventory inventory;
/**
- * Using these will make transferStackInSlot easier to understand and implement
- * INV_START is the index of the first slot in the Player's Inventory, so our
- * CustomBoxInventory's number of slots (e.g. 5 slots is array indices 0-4, so
- * start at 5) Notice how we don't have to remember how many slots we made? We
- * can just use CustomBoxInventory.INV_SIZE and if we ever change it, the
- * Container updates automatically.
+ * Using these will make transferStackInSlot easier to understand and implement INV_START is the index of the first
+ * slot in the Player's Inventory, so our CustomBoxInventory's number of slots (e.g. 5 slots is array indices 0-4,
+ * so start at 5) Notice how we don't have to remember how many slots we made? We can just use
+ * CustomBoxInventory.INV_SIZE and if we ever change it, the Container updates automatically.
*/
private final int INV_START, INV_END, HOTBAR_START, HOTBAR_END;
@@ -54,29 +47,23 @@ public class ContainerBoxBase extends Container {
// ARMOR_START = CustomBoxInventory.INV_SIZE, ARMOR_END = ARMOR_START+3,
// INV_START = ARMOR_END+1, and then carry on like above.
- private Slot generateSlot(
- final Constructor<?> aClazz, final IInventory base, final int id, final int x, final int y) {
+ private Slot generateSlot(final Constructor<?> aClazz, final IInventory base, final int id, final int x,
+ final int y) {
Slot aSlot;
try {
aSlot = (Slot) aClazz.newInstance(base, id, x, y);
if (aSlot != null) {
return aSlot;
}
- } catch (InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
e.printStackTrace();
}
return null;
}
- public ContainerBoxBase(
- EntityPlayer par1Player,
- InventoryPlayer inventoryPlayer,
- CustomBoxInventory CustomBoxInventory,
- Class<?> aClazz,
- int aSlotCount) {
+ public ContainerBoxBase(EntityPlayer par1Player, InventoryPlayer inventoryPlayer,
+ CustomBoxInventory CustomBoxInventory, Class<?> aClazz, int aSlotCount) {
INV_START = aSlotCount;
INV_END = INV_START + 26;
@@ -101,17 +88,21 @@ public class ContainerBoxBase extends Container {
// from being stored within itself, but if you want to allow that and
// you followed my advice at the end of the above step, then you
// could get away with using the vanilla Slot class
- this.addSlotToContainer(generateSlot(
- constructor, this.getInventoryObject(), i, 80 + (18 * (int) (i / 4)), 8 + (18 * (i % 4))));
+ this.addSlotToContainer(
+ generateSlot(
+ constructor,
+ this.getInventoryObject(),
+ i,
+ 80 + (18 * (int) (i / 4)),
+ 8 + (18 * (i % 4))));
}
// If you want, you can add ARMOR SLOTS here as well, but you need to
// make a public version of SlotArmor. I won't be doing that in this tutorial.
/*
- * for (i = 0; i < 4; ++i) { // These are the standard positions for survival
- * inventory layout this.addSlotToContainer(new SlotArmor(this.player,
- * inventoryPlayer, inventoryPlayer.getSizeInventory() - 1 - i, 8, 8 + i * 18,
- * i)); }
+ * for (i = 0; i < 4; ++i) { // These are the standard positions for survival inventory layout
+ * this.addSlotToContainer(new SlotArmor(this.player, inventoryPlayer, inventoryPlayer.getSizeInventory() -
+ * 1 - i, 8, 8 + i * 18, i)); }
*/
// PLAYER INVENTORY - uses default locations for standard inventory texture file
@@ -140,8 +131,7 @@ public class ContainerBoxBase extends Container {
}
/**
- * Called when a player shift-clicks on a slot. You must override this or you
- * will crash when someone does that.
+ * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that.
*/
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int index) {
ItemStack itemstack = null;
@@ -164,23 +154,17 @@ public class ContainerBoxBase extends Container {
// slots
else {
/*
- * If your inventory only stores certain instances of Items, you can implement
- * shift-clicking to your inventory like this:
- *
- * // Check that the item is the right type if (itemstack1.getItem() instanceof
+ * If your inventory only stores certain instances of Items, you can implement shift-clicking to your
+ * inventory like this: // Check that the item is the right type if (itemstack1.getItem() instanceof
* ItemCustom) { // Try to merge into your custom inventory slots // We use
- * 'CustomBoxInventory.INV_SIZE' instead of INV_START just in case // you also
- * add armor or other custom slots if (!this.mergeItemStack(itemstack1, 0,
- * CustomBoxInventory.INV_SIZE, false)) { return null; } } // If you added armor
- * slots, check them here as well: // Item being shift-clicked is armor - try to
- * put in armor slot if (itemstack1.getItem() instanceof ItemArmor) { int type =
- * ((ItemArmor) itemstack1.getItem()).armorType; if
- * (!this.mergeItemStack(itemstack1, ARMOR_START + type, ARMOR_START + type + 1,
- * false)) { return null; } } Otherwise, you have basically 2 choices: 1.
- * shift-clicking between player inventory and custom inventory 2.
- * shift-clicking between action bar and inventory
- *
- * Be sure to choose only ONE of the following implementations!!!
+ * 'CustomBoxInventory.INV_SIZE' instead of INV_START just in case // you also add armor or other custom
+ * slots if (!this.mergeItemStack(itemstack1, 0, CustomBoxInventory.INV_SIZE, false)) { return null; } }
+ * // If you added armor slots, check them here as well: // Item being shift-clicked is armor - try to
+ * put in armor slot if (itemstack1.getItem() instanceof ItemArmor) { int type = ((ItemArmor)
+ * itemstack1.getItem()).armorType; if (!this.mergeItemStack(itemstack1, ARMOR_START + type, ARMOR_START
+ * + type + 1, false)) { return null; } } Otherwise, you have basically 2 choices: 1. shift-clicking
+ * between player inventory and custom inventory 2. shift-clicking between action bar and inventory Be
+ * sure to choose only ONE of the following implementations!!!
*/
/**
* Implementation number 1: Shift-click into your custom inventory
@@ -227,9 +211,8 @@ public class ContainerBoxBase extends Container {
}
/**
- * You should override this method to prevent the player from moving the stack
- * that opened the inventory, otherwise if the player moves it, the inventory
- * will not be able to save properly
+ * You should override this method to prevent the player from moving the stack that opened the inventory, otherwise
+ * if the player moves it, the inventory will not be able to save properly
*/
@Override
public ItemStack slotClick(int slot, int button, int flag, EntityPlayer player) {
@@ -242,14 +225,12 @@ public class ContainerBoxBase extends Container {
}
/*
- * Special note: If your custom inventory's stack limit is 1 and you allow
- * shift-clicking itemstacks into it, you will need to override mergeStackInSlot
- * to avoid losing all the items but one in a stack when you shift-click.
+ * Special note: If your custom inventory's stack limit is 1 and you allow shift-clicking itemstacks into it, you
+ * will need to override mergeStackInSlot to avoid losing all the items but one in a stack when you shift-click.
*/
/**
- * Vanilla mergeItemStack method doesn't correctly handle inventories whose max
- * stack size is 1 when you shift-click into the inventory. This is a modified
- * method I wrote to handle such cases. Note you only need it if your slot /
+ * Vanilla mergeItemStack method doesn't correctly handle inventories whose max stack size is 1 when you shift-click
+ * into the inventory. This is a modified method I wrote to handle such cases. Note you only need it if your slot /
* inventory's max stack size is 1
*/
@Override
@@ -269,8 +250,7 @@ public class ContainerBoxBase extends Container {
continue;
}
- if (itemstack1 != null
- && itemstack1.getItem() == stack.getItem()
+ if (itemstack1 != null && itemstack1.getItem() == stack.getItem()
&& (!stack.getHasSubtypes() || stack.getItemDamage() == itemstack1.getItemDamage())
&& ItemStack.areItemStackTagsEqual(stack, itemstack1)) {
int l = itemstack1.stackSize + stack.stackSize;
@@ -312,7 +292,8 @@ public class ContainerBoxBase extends Container {
break;
} else {
putStackInSlot(
- k, new ItemStack(stack.getItem(), slot.getSlotStackLimit(), stack.getItemDamage()));
+ k,
+ new ItemStack(stack.getItem(), slot.getSlotStackLimit(), stack.getItemDamage()));
stack.stackSize -= slot.getSlotStackLimit();
getInventoryObject().markDirty();
flag1 = true;
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java
index ed5ebb41e3..858689f33d 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java
@@ -1,6 +1,7 @@
package gtPlusPlus.core.item.tool.misc.box;
import java.util.UUID;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -132,9 +133,9 @@ public abstract class CustomBoxInventory implements IInventory {
}
/**
- * This is the method that will handle saving the inventory contents, as it is called (or should be called!)
- * anytime the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also
- * let you change things in your inventory without ever opening a Gui, if you want.
+ * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime
+ * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change
+ * things in your inventory without ever opening a Gui, if you want.
*/
// 1.7.2+ renamed to markDirty
@Override
@@ -163,9 +164,8 @@ public abstract class CustomBoxInventory implements IInventory {
public void closeInventory() {}
/**
- * This method doesn't seem to do what it claims to do, as
- * items can still be left-clicked and placed in the inventory
- * even when this returns false
+ * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the
+ * inventory even when this returns false
*/
@Override
public abstract boolean isItemValidForSlot(int slot, ItemStack itemstack);
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java
index 9c5258f515..e121bb5085 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java
@@ -7,9 +7,8 @@ public class MagicToolBag extends BaseBoxItem {
public MagicToolBag(String displayName) {
super(
displayName,
- new String[] {
- "Can store magic tools from TC, BM, etc", "Please ask for additional mod support on Github"
- },
+ new String[] { "Can store magic tools from TC, BM, etc",
+ "Please ask for additional mod support on Github" },
gtPlusPlus.core.item.tool.misc.box.MagicToolBag.SLOTS);
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java
index 6ddc51ec49..b39609fb02 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java
@@ -9,10 +9,8 @@ public class UniversalToolBox extends BaseBoxItem {
public UniversalToolBox(String displayName) {
super(
displayName,
- new String[] {
- "Can store tools from Gregtech, IC2, BC, Forestry",
- "Please ask for additional mod support on Github"
- },
+ new String[] { "Can store tools from Gregtech, IC2, BC, Forestry",
+ "Please ask for additional mod support on Github" },
GuiHandler.GUI10);
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
index ad5fa11160..30ab292c5f 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java
@@ -1,5 +1,16 @@
package gtPlusPlus.core.item.tool.staballoy;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -11,19 +22,11 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class MultiPickaxeBase extends StaballoyPickaxe {
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see net.minecraft.item.Item#getDurabilityForDisplay(net.minecraft.item.ItemStack)
*/
@Override
@@ -41,12 +44,8 @@ public class MultiPickaxeBase extends StaballoyPickaxe {
public boolean isValid = true;
private final Pair<?, ?> enchantment;
- public MultiPickaxeBase(
- final String unlocalizedName,
- final ToolMaterial material,
- final long materialDurability,
- final int colour,
- final Object enchant) {
+ public MultiPickaxeBase(final String unlocalizedName, final ToolMaterial material, final long materialDurability,
+ final int colour, final Object enchant) {
super(Utils.sanitizeString(unlocalizedName), material);
this.setUnlocalizedName(Utils.sanitizeString(unlocalizedName));
// this.setTextureName(CORE.MODID + ":" + "itemPickaxe");
@@ -76,8 +75,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe {
try {
this.isValid = this.addRecipe();
- } catch (final Throwable e) {
- }
+ } catch (final Throwable e) {}
if ((colour != 0) && this.isValid && (materialDurability > 10000)) {
if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null) {
GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName));
@@ -86,13 +84,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe {
}
/*
- *
- *
- *
- * Methods
- *
- *
- *
+ * Methods
*/
private boolean addRecipe() {
@@ -180,7 +172,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe {
bDurabilityLoss = 100;
// Utils.LOG_WARNING("Durability Loss: "+bDurabilityLoss);
- correctTool = this.canPickaxeBlock(removalist, world, new int[] {X, Y, Z});
+ correctTool = this.canPickaxeBlock(removalist, world, new int[] { X, Y, Z });
Logger.WARNING("" + correctTool);
if (!correctTool) {
@@ -195,40 +187,17 @@ public class MultiPickaxeBase extends StaballoyPickaxe {
}
// Should clear up blocks quicker if I chain it.
- /*@Override
- public void removeBlockAndDropAsItem(World world, int X, int Y, int Z, ItemStack heldItem){
- localWorld = world;
- try {
- Block block = world.getBlock(X, Y, Z);
- float dur = calculateDurabilityLoss(world, X, Y, Z);
- Utils.LOG_WARNING(block.toString());
- String removalTool = "";
- removalTool = block.getHarvestTool(1);
-
- if (removalTool.equals("pickaxe") || UtilsMining.getBlockType(block, world, new int[]{X,Y,Z}, miningLevel)){
- if (canPickaxeBlock(block, world, new int[]{X,Y,Z})){
- if((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) != -1) && (block.getBlockHardness(world, X, Y, Z) <= 100) && (block != Blocks.water) && (block != Blocks.lava)){
-
- if (heldItem.getItemDamage() <= (heldItem.getMaxDamage()-dur)){
-
- block.dropBlockAsItem(world, X, Y, Z, world.getBlockMetadata(X, Y, Z), 0);
- world.setBlockToAir(X, Y, Z);
-
- }
- else {
- return;
- }
-
- }
- }
- else {
- Utils.LOG_WARNING("Incorrect Tool for mining this block.");
- }
- }
- } catch (NullPointerException e){
-
- }
- }*/
+ /*
+ * @Override public void removeBlockAndDropAsItem(World world, int X, int Y, int Z, ItemStack heldItem){ localWorld
+ * = world; try { Block block = world.getBlock(X, Y, Z); float dur = calculateDurabilityLoss(world, X, Y, Z);
+ * Utils.LOG_WARNING(block.toString()); String removalTool = ""; removalTool = block.getHarvestTool(1); if
+ * (removalTool.equals("pickaxe") || UtilsMining.getBlockType(block, world, new int[]{X,Y,Z}, miningLevel)){ if
+ * (canPickaxeBlock(block, world, new int[]{X,Y,Z})){ if((block != Blocks.bedrock) && (block.getBlockHardness(world,
+ * X, Y, Z) != -1) && (block.getBlockHardness(world, X, Y, Z) <= 100) && (block != Blocks.water) && (block !=
+ * Blocks.lava)){ if (heldItem.getItemDamage() <= (heldItem.getMaxDamage()-dur)){ block.dropBlockAsItem(world, X, Y,
+ * Z, world.getBlockMetadata(X, Y, Z), 0); world.setBlockToAir(X, Y, Z); } else { return; } } } else {
+ * Utils.LOG_WARNING("Incorrect Tool for mining this block."); } } } catch (NullPointerException e){ } }
+ */
@Override
public void damageItem(final ItemStack item, final int damage, final EntityPlayer localPlayer) {
diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
index 53d3152d84..c0d7f08bea 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java
@@ -1,5 +1,8 @@
package gtPlusPlus.core.item.tool.staballoy;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -9,12 +12,11 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.ItemStack;
public class MultiSpadeBase extends StaballoySpade {
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see net.minecraft.item.Item#getDurabilityForDisplay(net.minecraft.item.ItemStack)
*/
@Override
@@ -30,8 +32,8 @@ public class MultiSpadeBase extends StaballoySpade {
protected final String displayName;
public boolean isValid = true;
- public MultiSpadeBase(
- final String unlocalizedName, final ToolMaterial material, final int materialDurability, final int colour) {
+ public MultiSpadeBase(final String unlocalizedName, final ToolMaterial material, final int materialDurability,
+ final int colour) {
super(Utils.sanitizeString(unlocalizedName), material);
this.setUnlocalizedName(Utils.sanitizeString(unlocalizedName));
// this.setTextureName(CORE.MODID + ":" + "itemShovel");
@@ -44,8 +46,7 @@ public class MultiSpadeBase extends StaballoySpade {
this.setCreativeTab(AddToCreativeTab.tabTools);
try {
this.isValid = this.addRecipe();
- } catch (final Throwable e) {
- }
+ } catch (final Throwable e) {}
if ((colour != 0) && this.isValid) {
if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null) {
GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName));
@@ -107,13 +108,10 @@ public class MultiSpadeBase extends StaballoySpade {
@Override
public String getItemStackDisplayName(final ItemStack iStack) {
return this.displayName;
- /*String name;
- if (getUnlocalizedName().toLowerCase().contains("wood")){
- name = "Wooden";
- }
- else {
- }
- return "Big "+name+" Spade";*/
+ /*
+ * String name; if (getUnlocalizedName().toLowerCase().contains("wood")){ name = "Wooden"; } else { } return
+ * "Big "+name+" Spade";
+ */
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java
index ec1c08dad8..c146dba547 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java
@@ -1,9 +1,7 @@
package gtPlusPlus.core.item.tool.staballoy;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.block.*;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EntityLivingBase;
@@ -15,7 +13,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.lib.CORE;
+
public class StaballoyAxe extends ItemAxe {
+
public String mat;
public StaballoyAxe(final String unlocalizedName, final ToolMaterial material) {
@@ -24,7 +27,7 @@ public class StaballoyAxe extends ItemAxe {
this.setTextureName(CORE.MODID + ":" + unlocalizedName);
}
- // EXPLODE TREE
+ // EXPLODE TREE
byte[] tre = new byte[32000];
byte unchecked = 0;
byte needcheck = 1;
@@ -42,7 +45,7 @@ public class StaballoyAxe extends ItemAxe {
return true;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add(EnumChatFormatting.GOLD + "Fells entire trees in a single swipe!..");
@@ -92,22 +95,21 @@ public class StaballoyAxe extends ItemAxe {
return false;
}
- private int check(
- final World par1World, final int x, final int y, final int z, final int xo, final int yo, final int zo) {
+ private int check(final World par1World, final int x, final int y, final int z, final int xo, final int yo,
+ final int zo) {
int f = 0;
final int o = x + (z * 20) + (y * 400);
if (this.tre[o] == this.needcheck) {
this.tre[o] = this.ignore;
final Block bit = par1World.getBlock(x + xo, y + yo, z + zo);
- if ((bit instanceof BlockLog)
- || (bit instanceof BlockLeavesBase)
+ if ((bit instanceof BlockLog) || (bit instanceof BlockLeavesBase)
|| (bit instanceof BlockHugeMushroom)
|| (bit.getUnlocalizedName().toLowerCase().contains("log"))
|| (bit.getUnlocalizedName().toLowerCase().contains("wood"))) {
f = 1;
this.tre[o] = this.harvest;
// if (bit instanceof BlockLog){
- // LoonTools.log("^ Found log @ "+x+xo+" "+y+yo+" "+z+zo+" ");
+ // LoonTools.log("^ Found log @ "+x+xo+" "+y+yo+" "+z+zo+" ");
// }
for (int xb = -1; xb < 2; xb++) {
for (int yb = -1; yb < 2; yb++) {
@@ -129,7 +131,7 @@ public class StaballoyAxe extends ItemAxe {
public int checkTree(final World par1World, final int xo, final int yo, final int zo) {
boolean f;
- for (f = true; f == true; ) {
+ for (f = true; f == true;) {
f = false;
for (int y = 0; y < 80; y++) {
for (int z = 0; z < 20; z++) {
@@ -166,8 +168,8 @@ public class StaballoyAxe extends ItemAxe {
return 1;
}
- private int check2(
- final World par1World, final int x, final int y, final int z, final int xo, final int yo, final int zo) {
+ private int check2(final World par1World, final int x, final int y, final int z, final int xo, final int yo,
+ final int zo) {
int f = 0;
final int o = x + (z * 20) + (y * 400);
if (this.tre[o] == this.needcheck) {
@@ -177,7 +179,7 @@ public class StaballoyAxe extends ItemAxe {
f = 1;
this.tre[o] = this.harvest;
// if (bit instanceof BlockLog){
- // LoonTools.log("^ Found log @ "+x+xo+" "+y+yo+" "+z+zo+" ");
+ // LoonTools.log("^ Found log @ "+x+xo+" "+y+yo+" "+z+zo+" ");
// }
for (int xb = -1; xb < 2; xb++) {
for (int yb = -1; yb < 2; yb++) {
@@ -188,8 +190,7 @@ public class StaballoyAxe extends ItemAxe {
}
}
}
- } else if (bit instanceof BlockLeavesBase) {
- } else {
+ } else if (bit instanceof BlockLeavesBase) {} else {
if (!canIgnore(bit)) {
return 2;
}
@@ -200,7 +201,7 @@ public class StaballoyAxe extends ItemAxe {
public int checkTree2(final World par1World, final int xo, final int yo, final int zo) {
boolean f;
- for (f = true; f == true; ) {
+ for (f = true; f == true;) {
f = false;
for (int y = 0; y < 80; y++) {
for (int z = 0; z < 20; z++) {
@@ -246,8 +247,7 @@ public class StaballoyAxe extends ItemAxe {
final Block bit = par1World.getBlock(x + xo, y + yo, z + zo);
final int met = par1World.getBlockMetadata(x + xo, y + yo, z + zo);
- if ((bit instanceof BlockLog)
- || (bit instanceof BlockLeavesBase)
+ if ((bit instanceof BlockLog) || (bit instanceof BlockLeavesBase)
|| (bit.getUnlocalizedName().toLowerCase().contains("log"))
|| (bit.getUnlocalizedName().toLowerCase().contains("wood"))) {
bit.harvestBlock(par1World, plr, x + xo, y + yo, z + zo, met);
@@ -259,20 +259,15 @@ public class StaballoyAxe extends ItemAxe {
}
}
- private static void breakMushroom(
- final World wld,
- final Block bit,
- final EntityPlayer plr,
- final boolean silk,
- final int x,
- final int y,
- final int z,
- final int met) {
+ private static void breakMushroom(final World wld, final Block bit, final EntityPlayer plr, final boolean silk,
+ final int x, final int y, final int z, final int met) {
if (silk) {
final ItemStack stk = null; // TODO
- /*if (bit==Blocks.brown_mushroom_block) stk = new ItemStack(LoonToolItems.brown_mushroom_block,1,met);
- else if (bit==Blocks.red_mushroom_block) stk = new ItemStack(LoonToolItems.red_mushroom_block,1,met);
- else stk = new ItemStack(bit,1,met);*/
+ /*
+ * if (bit==Blocks.brown_mushroom_block) stk = new ItemStack(LoonToolItems.brown_mushroom_block,1,met); else
+ * if (bit==Blocks.red_mushroom_block) stk = new ItemStack(LoonToolItems.red_mushroom_block,1,met); else stk
+ * = new ItemStack(bit,1,met);
+ */
final EntityItem entityitem = new EntityItem(wld, x + 0.5, y + 0.5, z + 0.5, stk);
entityitem.delayBeforeCanPickup = 10;
wld.spawnEntityInWorld(entityitem);
@@ -282,12 +277,7 @@ public class StaballoyAxe extends ItemAxe {
wld.setBlockToAir(x, y, z);
}
- public void exploadMushroom(
- final World par1World,
- final int xo,
- final int yo,
- final int zo,
- final EntityPlayer plr,
+ public void exploadMushroom(final World par1World, final int xo, final int yo, final int zo, final EntityPlayer plr,
final boolean silk) {
for (int y = 0; y < 80; y++) {
for (int z = 0; z < 20; z++) {
@@ -309,14 +299,8 @@ public class StaballoyAxe extends ItemAxe {
}
@Override
- public boolean onBlockDestroyed(
- final ItemStack itm,
- final World wld,
- final Block blk,
- final int x,
- final int y,
- final int z,
- final EntityLivingBase plr) {
+ public boolean onBlockDestroyed(final ItemStack itm, final World wld, final Block blk, final int x, final int y,
+ final int z, final EntityLivingBase plr) {
if (!wld.isRemote) {
final Block bit = wld.getBlock(x, y, z);
final boolean silk = EnchantmentHelper.getSilkTouchModifier(plr);
@@ -333,8 +317,7 @@ public class StaballoyAxe extends ItemAxe {
}
}
- if ((bit instanceof BlockLog)
- || (bit.getUnlocalizedName().toLowerCase().contains("log"))
+ if ((bit instanceof BlockLog) || (bit.getUnlocalizedName().toLowerCase().contains("log"))
|| (bit.getUnlocalizedName().toLowerCase().contains("wood"))) {
// LoonTools.log("cutting tree @ "+x+" "+y+" "+z+" ");
for (int n = 0; n < 32000; n++) {
diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
index 873d9a843c..d9c4aaa18b 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java
@@ -1,11 +1,7 @@
package gtPlusPlus.core.item.tool.staballoy;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.MiningUtils;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -19,9 +15,16 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.MiningUtils;
+
public class StaballoyPickaxe extends ItemPickaxe {
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see net.minecraft.item.Item#getDurabilityForDisplay(net.minecraft.item.ItemStack)
*/
@Override
@@ -30,8 +33,8 @@ public class StaballoyPickaxe extends ItemPickaxe {
}
/**
- * Creates an NBT tag for this item if it doesn't have one.
- * This also set some default values.
+ * Creates an NBT tag for this item if it doesn't have one. This also set some default values.
+ *
* @param rStack
* @return
*/
@@ -138,13 +141,7 @@ public class StaballoyPickaxe extends ItemPickaxe {
protected int miningLevel;
/*
- *
- *
- *
- * Methods
- *
- *
- *
+ * Methods
*/
@Override
@@ -153,18 +150,19 @@ public class StaballoyPickaxe extends ItemPickaxe {
}
@Override
- public boolean onBlockDestroyed(
- final ItemStack stack,
- final World world,
- final Block block,
- final int X,
- final int Y,
- final int Z,
- final EntityLivingBase entity) {
+ public boolean onBlockDestroyed(final ItemStack stack, final World world, final Block block, final int X,
+ final int Y, final int Z, final EntityLivingBase entity) {
if (!world.isRemote) {
if (entity instanceof EntityPlayer) {
this.GetDestroyOrientation(
- (EntityPlayer) entity, block, getLookingDirection(stack), world, X, Y, Z, stack);
+ (EntityPlayer) entity,
+ block,
+ getLookingDirection(stack),
+ world,
+ X,
+ Y,
+ Z,
+ stack);
}
}
return super.onBlockDestroyed(stack, world, block, X, Y, Z, entity);
@@ -185,7 +183,7 @@ public class StaballoyPickaxe extends ItemPickaxe {
bDurabilityLoss = (bDurabilityLoss + bHardness);
// Utils.LOG_WARNING("Durability Loss: "+bDurabilityLoss);
- correctTool = this.canPickaxeBlock(removalist, world, new int[] {X, Y, Z});
+ correctTool = this.canPickaxeBlock(removalist, world, new int[] { X, Y, Z });
Logger.WARNING("" + correctTool);
if (!correctTool) {
@@ -217,15 +215,8 @@ public class StaballoyPickaxe extends ItemPickaxe {
return false;
}
- private void GetDestroyOrientation(
- EntityPlayer entity,
- final Block block,
- final String FACING,
- final World world,
- final int X,
- final int Y,
- final int Z,
- final ItemStack heldItem) {
+ private void GetDestroyOrientation(EntityPlayer entity, final Block block, final String FACING, final World world,
+ final int X, final int Y, final int Z, final ItemStack heldItem) {
float DURABILITY_LOSS = 0;
if (!world.isRemote) {
@@ -274,11 +265,16 @@ public class StaballoyPickaxe extends ItemPickaxe {
final int durNow = maxdmg - itemdmg;
final int durLeft = (int) ((maxdmg - itemdmg) - DURABILITY_LOSS);
- Logger.WARNING("Current Damage: " + itemdmg
- + " Max Damage: " + maxdmg
- + " Durability to be lost: " + dodmg
- + " Current Durability: " + durNow
- + " Remaining Durability: " + durLeft);
+ Logger.WARNING(
+ "Current Damage: " + itemdmg
+ + " Max Damage: "
+ + maxdmg
+ + " Durability to be lost: "
+ + dodmg
+ + " Current Durability: "
+ + durNow
+ + " Remaining Durability: "
+ + durLeft);
// Break Tool
if (((durNow - dodmg) <= (99)) && (itemdmg != 0)) {
@@ -293,14 +289,14 @@ public class StaballoyPickaxe extends ItemPickaxe {
this.damageItem(heldItem, (durNow - durLeft) - 1, entity);
}
- /*if (heldItem.getItemDamage() <= ((heldItem.getMaxDamage()-heldItem.getItemDamage())-DURABILITY_LOSS)){
- Utils.LOG_WARNING("2: "+DURABILITY_LOSS+" 3: "+((heldItem.getMaxDamage()-heldItem.getItemDamage())-DURABILITY_LOSS));
- setItemDamage(heldItem, (int) (heldItem.getMaxDamage()-(heldItem.getMaxDamage()-heldItem.getItemDamage())-DURABILITY_LOSS));
- }
- else {
- Utils.LOG_WARNING("3: "+( heldItem.getMaxDamage()-(heldItem.getMaxDamage()-heldItem.getItemDamage())));
- setItemDamage(heldItem, heldItem.getMaxDamage()-(heldItem.getMaxDamage()-heldItem.getItemDamage()));
- }*/
+ /*
+ * if (heldItem.getItemDamage() <= ((heldItem.getMaxDamage()-heldItem.getItemDamage())-DURABILITY_LOSS)){
+ * Utils.LOG_WARNING("2: "+DURABILITY_LOSS+" 3: "+((heldItem.getMaxDamage()-heldItem.getItemDamage())-
+ * DURABILITY_LOSS)); setItemDamage(heldItem, (int)
+ * (heldItem.getMaxDamage()-(heldItem.getMaxDamage()-heldItem.getItemDamage())-DURABILITY_LOSS)); } else {
+ * Utils.LOG_WARNING("3: "+( heldItem.getMaxDamage()-(heldItem.getMaxDamage()-heldItem.getItemDamage())));
+ * setItemDamage(heldItem, heldItem.getMaxDamage()-(heldItem.getMaxDamage()-heldItem.getItemDamage())); }
+ */
// Utils.LOG_WARNING("|GID|Durability: "+heldItem.getItemDamage());
DURABILITY_LOSS = 0;
}
@@ -315,8 +311,8 @@ public class StaballoyPickaxe extends ItemPickaxe {
}
// Should clear up blocks quicker if I chain it.
- public final void removeBlockAndDropAsItem(
- final World world, final int X, final int Y, final int Z, final ItemStack heldItem) {
+ public final void removeBlockAndDropAsItem(final World world, final int X, final int Y, final int Z,
+ final ItemStack heldItem) {
try {
final Block block = world.getBlock(X, Y, Z);
final float dur = this.calculateDurabilityLoss(world, X, Y, Z);
@@ -325,19 +321,19 @@ public class StaballoyPickaxe extends ItemPickaxe {
removalTool = block.getHarvestTool(1);
Logger.WARNING("Removing.1 " + removalTool);
- /*if ((removalTool.equalsIgnoreCase("pickaxe") || removalTool.equalsIgnoreCase("null") || removalTool == null)){
- Utils.LOG_WARNING("Removing.2");
- if (UtilsMining.getBlockType(block, world, new int[]{X,Y,Z}, miningLevel)) {
- Utils.LOG_WARNING("Removing.3"); */
- if (this.canPickaxeBlock(block, world, new int[] {X, Y, Z})) {
+ /*
+ * if ((removalTool.equalsIgnoreCase("pickaxe") || removalTool.equalsIgnoreCase("null") || removalTool ==
+ * null)){ Utils.LOG_WARNING("Removing.2"); if (UtilsMining.getBlockType(block, world, new int[]{X,Y,Z},
+ * miningLevel)) { Utils.LOG_WARNING("Removing.3");
+ */
+ if (this.canPickaxeBlock(block, world, new int[] { X, Y, Z })) {
Logger.WARNING("Removing.4");
if (block == Blocks.air) {
return;
}
- if ((block != Blocks.bedrock)
- && (block.getBlockHardness(world, X, Y, Z) >= 0)
+ if ((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) >= 0)
&& (block.getBlockHardness(world, X, Y, Z) <= 100)
&& (block != Blocks.water)
&& (block != Blocks.lava)) {
@@ -353,9 +349,9 @@ public class StaballoyPickaxe extends ItemPickaxe {
}
}
}
- /*}
-
- }*/
+ /*
+ * } }
+ */
} else {
Logger.WARNING("Incorrect Tool for mining this block.");
}
@@ -370,12 +366,12 @@ public class StaballoyPickaxe extends ItemPickaxe {
// Utils.LOG_WARNING("Player - F: "+direction);
// Utils.LOG_WARNING("Player - getLookVec(): "+localPlayer.getLookVec().yCoord);
- /*if (localPlayer.getLookVec().yCoord > 0){
- localPlayer.getLookVec().yCoord;
- }*/
+ /*
+ * if (localPlayer.getLookVec().yCoord > 0){ localPlayer.getLookVec().yCoord; }
+ */
- final MovingObjectPosition movingobjectposition =
- this.getMovingObjectPositionFromPlayer(world, aPlayer, false);
+ final MovingObjectPosition movingobjectposition = this
+ .getMovingObjectPositionFromPlayer(world, aPlayer, false);
if (movingobjectposition != null) {
final int sideHit = movingobjectposition.sideHit;
String playerStandingPosition = "";
@@ -420,12 +416,15 @@ public class StaballoyPickaxe extends ItemPickaxe {
return false;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add(EnumChatFormatting.GRAY + "Mines a 3x3 at 100 durability per block mined.");
- list.add(EnumChatFormatting.GRAY + "Durability: " + (stack.getMaxDamage() - stack.getItemDamage()) + "/"
- + stack.getMaxDamage());
+ list.add(
+ EnumChatFormatting.GRAY + "Durability: "
+ + (stack.getMaxDamage() - stack.getItemDamage())
+ + "/"
+ + stack.getMaxDamage());
// super.addInformation(stack, aPlayer, list, bool);
}
@@ -441,8 +440,8 @@ public class StaballoyPickaxe extends ItemPickaxe {
}
@Override
- public boolean onBlockStartBreak(
- final ItemStack itemstack, final int X, final int Y, final int Z, final EntityPlayer aPlayer) {
+ public boolean onBlockStartBreak(final ItemStack itemstack, final int X, final int Y, final int Z,
+ final EntityPlayer aPlayer) {
this.checkFacing(itemstack, aPlayer, aPlayer.getEntityWorld());
return super.onBlockStartBreak(itemstack, X, Y, Z, aPlayer);
}
diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java
index 6cad8cf5fc..0fb3291f8f 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java
@@ -1,11 +1,7 @@
package gtPlusPlus.core.item.tool.staballoy;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.MiningUtils;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -19,9 +15,16 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.MiningUtils;
+
public class StaballoySpade extends ItemSpade {
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see net.minecraft.item.Item#getDurabilityForDisplay(net.minecraft.item.ItemStack)
*/
@Override
@@ -33,8 +36,8 @@ public class StaballoySpade extends ItemSpade {
}
/**
- * Creates an NBT tag for this item if it doesn't have one.
- * This also set some default values.
+ * Creates an NBT tag for this item if it doesn't have one. This also set some default values.
+ *
* @param rStack
* @return
*/
@@ -141,13 +144,7 @@ public class StaballoySpade extends ItemSpade {
private int miningLevel;
/*
- *
- *
- *
- * Methods
- *
- *
- *
+ * Methods
*/
@Override
@@ -156,14 +153,8 @@ public class StaballoySpade extends ItemSpade {
}
@Override
- public boolean onBlockDestroyed(
- final ItemStack stack,
- final World world,
- final Block block,
- final int X,
- final int Y,
- final int Z,
- final EntityLivingBase entity) {
+ public boolean onBlockDestroyed(final ItemStack stack, final World world, final Block block, final int X,
+ final int Y, final int Z, final EntityLivingBase entity) {
if (!world.isRemote) {
if (entity instanceof EntityPlayer) {
this.GetDestroyOrientation((EntityPlayer) entity, getLookingDirection(stack), world, X, Y, Z, stack);
@@ -192,14 +183,8 @@ public class StaballoySpade extends ItemSpade {
return false;
}
- private void GetDestroyOrientation(
- EntityPlayer player,
- final String FACING,
- final World world,
- final int X,
- final int Y,
- final int Z,
- final ItemStack heldItem) {
+ private void GetDestroyOrientation(EntityPlayer player, final String FACING, final World world, final int X,
+ final int Y, final int Z, final ItemStack heldItem) {
float DURABILITY_LOSS = 0;
if (!world.isRemote) {
@@ -207,24 +192,24 @@ public class StaballoySpade extends ItemSpade {
DURABILITY_LOSS = 0;
for (int i = -1; i < 2; i++) {
for (int j = -1; j < 2; j++) {
- DURABILITY_LOSS =
- (DURABILITY_LOSS + this.removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem));
+ DURABILITY_LOSS = (DURABILITY_LOSS
+ + this.removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem));
}
}
} else if (FACING.equals("facingEast") || FACING.equals("facingWest")) {
DURABILITY_LOSS = 0;
for (int i = -1; i < 2; i++) {
for (int j = -1; j < 2; j++) {
- DURABILITY_LOSS =
- (DURABILITY_LOSS + this.removeBlockAndDropAsItem(world, X, Y + i, Z + j, heldItem));
+ DURABILITY_LOSS = (DURABILITY_LOSS
+ + this.removeBlockAndDropAsItem(world, X, Y + i, Z + j, heldItem));
}
}
} else if (FACING.equals("facingNorth") || FACING.equals("facingSouth")) {
DURABILITY_LOSS = 0;
for (int i = -1; i < 2; i++) {
for (int j = -1; j < 2; j++) {
- DURABILITY_LOSS =
- (DURABILITY_LOSS + this.removeBlockAndDropAsItem(world, X + j, Y + i, Z, heldItem));
+ DURABILITY_LOSS = (DURABILITY_LOSS
+ + this.removeBlockAndDropAsItem(world, X + j, Y + i, Z, heldItem));
}
}
}
@@ -241,11 +226,16 @@ public class StaballoySpade extends ItemSpade {
final int durNow = maxdmg - itemdmg;
final int durLeft = (int) ((maxdmg - itemdmg) - DURABILITY_LOSS);
- Logger.WARNING("Current Damage: " + itemdmg
- + " Max Damage: " + maxdmg
- + " Durability to be lost: " + dodmg
- + " Current Durability: " + durNow
- + " Remaining Durability: " + durLeft);
+ Logger.WARNING(
+ "Current Damage: " + itemdmg
+ + " Max Damage: "
+ + maxdmg
+ + " Durability to be lost: "
+ + dodmg
+ + " Current Durability: "
+ + durNow
+ + " Remaining Durability: "
+ + durLeft);
// Break Tool
if (((durNow - dodmg) <= (900)) && (itemdmg != 0)) {
@@ -272,8 +262,8 @@ public class StaballoySpade extends ItemSpade {
}
// Should clear up blocks quicker if I chain it.
- public int removeBlockAndDropAsItem(
- final World world, final int X, final int Y, final int Z, final ItemStack heldItem) {
+ public int removeBlockAndDropAsItem(final World world, final int X, final int Y, final int Z,
+ final ItemStack heldItem) {
Logger.WARNING("Trying to drop/remove a block.");
try {
final Block block = world.getBlock(X, Y, Z);
@@ -282,9 +272,8 @@ public class StaballoySpade extends ItemSpade {
removalTool = block.getHarvestTool(0);
if (removalTool != null) {
if (removalTool.equals("shovel")) {
- if (this.canPickaxeBlock(block, world, new int[] {X, Y, Z})) {
- if ((block != Blocks.bedrock)
- && (block.getBlockHardness(world, X, Y, Z) != -1)
+ if (this.canPickaxeBlock(block, world, new int[] { X, Y, Z })) {
+ if ((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) != -1)
&& (block.getBlockHardness(world, X, Y, Z) <= 100)
&& (block != Blocks.water)
&& (block != Blocks.lava)) {
@@ -329,12 +318,12 @@ public class StaballoySpade extends ItemSpade {
// Utils.LOG_WARNING("Player - F: "+direction);
// Utils.LOG_WARNING("Player - getLookVec(): "+localPlayer.getLookVec().yCoord);
- /*if (localPlayer.getLookVec().yCoord > 0){
- localPlayer.getLookVec().yCoord;
- }*/
+ /*
+ * if (localPlayer.getLookVec().yCoord > 0){ localPlayer.getLookVec().yCoord; }
+ */
- final MovingObjectPosition movingobjectposition =
- this.getMovingObjectPositionFromPlayer(world, aPlayer, false);
+ final MovingObjectPosition movingobjectposition = this
+ .getMovingObjectPositionFromPlayer(world, aPlayer, false);
if (movingobjectposition != null) {
final int sideHit = movingobjectposition.sideHit;
String playerStandingPosition = "";
@@ -379,7 +368,7 @@ public class StaballoySpade extends ItemSpade {
return false;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add(EnumChatFormatting.GOLD + "Spades a 3x3 area in the direction you are facing.");
@@ -398,8 +387,8 @@ public class StaballoySpade extends ItemSpade {
}
@Override
- public boolean onBlockStartBreak(
- final ItemStack itemstack, final int X, final int Y, final int Z, final EntityPlayer aPlayer) {
+ public boolean onBlockStartBreak(final ItemStack itemstack, final int X, final int Y, final int Z,
+ final EntityPlayer aPlayer) {
this.checkFacing(itemstack, aPlayer, aPlayer.worldObj);
return super.onBlockStartBreak(itemstack, X, Y, Z, aPlayer);
}
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java
index 2034d209e7..d26cdedf4b 100644
--- a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java
+++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.item.wearable.armour;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.item.wearable.armour.tinfoil.ArmourTinFoilHat;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraftforge.common.util.EnumHelper;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.item.wearable.armour.tinfoil.ArmourTinFoilHat;
+import gtPlusPlus.core.lib.CORE;
+
public class ArmourLoader {
// Glass
@@ -18,9 +19,9 @@ public class ArmourLoader {
// Tin Foil
public static Item TinFoilHat;
- public static ArmorMaterial ClearGlassArmour =
- EnumHelper.addArmorMaterial("ClearGlassArmor", 1, new int[] {1, 1, 1, 1}, 100);
- public static ArmorMaterial TinFoilArmour = EnumHelper.addArmorMaterial("TINFOIL", 5, new int[] {1, 1, 1, 1}, 50);
+ public static ArmorMaterial ClearGlassArmour = EnumHelper
+ .addArmorMaterial("ClearGlassArmor", 1, new int[] { 1, 1, 1, 1 }, 100);
+ public static ArmorMaterial TinFoilArmour = EnumHelper.addArmorMaterial("TINFOIL", 5, new int[] { 1, 1, 1, 1 }, 50);
public static void run() {
glassArmour();
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java
index a1762a070c..47c71a34a3 100644
--- a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java
+++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java
@@ -1,11 +1,7 @@
package gtPlusPlus.core.item.wearable.armour.hazmat;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.item.wearable.armour.ArmourLoader;
-import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -17,6 +13,12 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.wearable.armour.ArmourLoader;
+import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm;
+import gtPlusPlus.core.lib.CORE;
+
public class ArmourHazmat extends BaseArmourHelm {
public IIcon iconHelm;
@@ -60,7 +62,7 @@ public class ArmourHazmat extends BaseArmourHelm {
@Override
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
@Override
public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
aList.add("DoomSquirter's protection against cosmic radiation!");
@@ -70,8 +72,8 @@ public class ArmourHazmat extends BaseArmourHelm {
}
@Override
- public ArmorProperties getProperties(
- EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
+ public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
+ int slot) {
return new ArmorProperties(0, 0, 0);
}
@@ -81,8 +83,8 @@ public class ArmourHazmat extends BaseArmourHelm {
}
@Override
- public boolean itemInteractionForEntity(
- ItemStack p_111207_1_, EntityPlayer p_111207_2_, EntityLivingBase p_111207_3_) {
+ public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_,
+ EntityLivingBase p_111207_3_) {
return super.itemInteractionForEntity(p_111207_1_, p_111207_2_, p_111207_3_);
}
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java
index 532f9de530..ad3272bccf 100644
--- a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java
+++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java
@@ -1,12 +1,7 @@
package gtPlusPlus.core.item.wearable.armour.tinfoil;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.item.wearable.armour.ArmourLoader;
-import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -29,6 +24,13 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.item.wearable.armour.ArmourLoader;
+import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm;
+import gtPlusPlus.core.lib.CORE;
+
public class ArmourTinFoilHat extends BaseArmourHelm {
public IIcon iconHelm;
@@ -72,7 +74,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm {
@Override
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
aList.add("DoomSquirter's protection against cosmic radiation!");
@@ -82,8 +84,8 @@ public class ArmourTinFoilHat extends BaseArmourHelm {
}
@Override
- public ArmorProperties getProperties(
- EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
+ public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
+ int slot) {
return new ArmorProperties(0, 0, 0);
}
@@ -93,8 +95,8 @@ public class ArmourTinFoilHat extends BaseArmourHelm {
}
@Override
- public boolean itemInteractionForEntity(
- ItemStack p_111207_1_, EntityPlayer p_111207_2_, EntityLivingBase p_111207_3_) {
+ public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_,
+ EntityLivingBase p_111207_3_) {
return super.itemInteractionForEntity(p_111207_1_, p_111207_2_, p_111207_3_);
}
@@ -132,8 +134,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm {
if (g.size() > 0) {
for (Entity e : g) {
if (e != null) {
- if (!EntityXPOrb.class.isInstance(e)
- && !EntityBoat.class.isInstance(e)
+ if (!EntityXPOrb.class.isInstance(e) && !EntityBoat.class.isInstance(e)
&& !EntitySnowball.class.isInstance(e)
&& !EntityFireball.class.isInstance(e)
&& !EntityEgg.class.isInstance(e)
@@ -158,8 +159,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm {
}
}
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java b/src/main/java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java
index 8dca1e0ded..1ec92b0a51 100644
--- a/src/main/java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java
+++ b/src/main/java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java
@@ -17,8 +17,8 @@ public abstract class BaseItemWearable extends ItemArmor implements ISpecialArmo
public abstract int getRenderIndex();
@Override
- public abstract ArmorProperties getProperties(
- EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot);
+ public abstract ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source,
+ double damage, int slot);
@Override
public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
@@ -27,8 +27,8 @@ public abstract class BaseItemWearable extends ItemArmor implements ISpecialArmo
}
@Override
- public abstract void damageArmor(
- EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot);
+ public abstract void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage,
+ int slot);
public void dyeArmour(ItemStack aArmour, int aColour) {
func_82813_b(aArmour, aColour);
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java b/src/main/java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java
index c4923ccd67..495b131aea 100644
--- a/src/main/java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java
+++ b/src/main/java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java
@@ -1,24 +1,25 @@
package gtPlusPlus.core.item.wearable.hazmat;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.ic2.CustomInternalName;
import ic2.core.IC2;
import ic2.core.init.InternalName;
import ic2.core.item.armor.ItemArmorHazmat;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
public class ItemArmorHazmatEx extends ItemArmorHazmat {
public static void init() {
- GregtechItemList.Armour_Hazmat_Advanced_Helmet.set(
- new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatHelmetEx, 0)));
- GregtechItemList.Armour_Hazmat_Advanced_Chest.set(
- new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatChestEx, 1)));
- GregtechItemList.Armour_Hazmat_Advanced_Legs.set(
- new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatLegsEx, 2)));
- GregtechItemList.Armour_Hazmat_Advanced_Boots.set(
- new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatBootsEx, 3)));
+ GregtechItemList.Armour_Hazmat_Advanced_Helmet
+ .set(new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatHelmetEx, 0)));
+ GregtechItemList.Armour_Hazmat_Advanced_Chest
+ .set(new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatChestEx, 1)));
+ GregtechItemList.Armour_Hazmat_Advanced_Legs
+ .set(new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatLegsEx, 2)));
+ GregtechItemList.Armour_Hazmat_Advanced_Boots
+ .set(new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatBootsEx, 3)));
}
private ItemArmorHazmatEx(InternalName internalName, int type) {
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index ce3ca22a37..82ecda5f53 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -1,6 +1,19 @@
package gtPlusPlus.core.lib;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraftforge.common.config.Configuration;
+import net.minecraftforge.common.util.FakePlayerFactory;
+
import com.mojang.authlib.GameProfile;
+
import cpw.mods.fml.common.FMLCommonHandler;
import gregtech.api.GregTech_API;
import gtPlusPlus.api.objects.Logger;
@@ -13,16 +26,6 @@ import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.common.util.FakePlayerFactory;
public class CORE {
@@ -42,8 +45,7 @@ public class CORE {
public static boolean DEVENV = false;
// Only can be set in Dev, no config or setting elsewhere.
- public static final boolean LOAD_ALL_CONTENT = false;
- ;
+ public static final boolean LOAD_ALL_CONTENT = false;;
// Mod Variables
@@ -62,16 +64,28 @@ public class CORE {
public static int turbineCutoffBase = 75000;
// GT++ Fake Player Profile
- public static final GameProfile gameProfile =
- new GameProfile(UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()), "[GT++]");
+ public static final GameProfile gameProfile = new GameProfile(
+ UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()),
+ "[GT++]");
public static final WeakHashMap<World, EntityPlayerMP> fakePlayerCache = new WeakHashMap<World, EntityPlayerMP>();
// Tooltips;
- public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN + "Alkalus "
- + EnumChatFormatting.GRAY + "- " + EnumChatFormatting.RED + "[GT++]";
- public static final String GT_Tooltip_Builder = "" + EnumChatFormatting.DARK_GREEN + "Alkalus "
- + EnumChatFormatting.GRAY + "- " + EnumChatFormatting.RED + "[GT++]";
- public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY + "Warning: " + EnumChatFormatting.GREEN
- + "Radioactive! " + EnumChatFormatting.GOLD + " Avoid direct handling without hazmat protection.";
+ public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN
+ + "Alkalus "
+ + EnumChatFormatting.GRAY
+ + "- "
+ + EnumChatFormatting.RED
+ + "[GT++]";
+ public static final String GT_Tooltip_Builder = "" + EnumChatFormatting.DARK_GREEN
+ + "Alkalus "
+ + EnumChatFormatting.GRAY
+ + "- "
+ + EnumChatFormatting.RED
+ + "[GT++]";
+ public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY + "Warning: "
+ + EnumChatFormatting.GREEN
+ + "Radioactive! "
+ + EnumChatFormatting.GOLD
+ + " Avoid direct handling without hazmat protection.";
public static final String noItem = "";
// Because I want to be lazy Gregtech New Horizons Var.
@@ -89,10 +103,8 @@ public class CORE {
public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>();
// TesseractMaps
- public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap =
- new HashMap<>();
- public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap =
- new HashMap<>();
+ public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<>();
+ public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<>();
// BookMap
public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>();
@@ -110,28 +122,21 @@ public class CORE {
/**
* File Paths and Resource Paths
*/
- public static final String TEX_DIR = "textures/",
- TEX_DIR_GUI = TEX_DIR + "gui/",
- TEX_DIR_ITEM = TEX_DIR + "items/",
- TEX_DIR_BLOCK = TEX_DIR + "blocks/",
- TEX_DIR_ENTITY = TEX_DIR + "entity/",
- TEX_DIR_ASPECTS = TEX_DIR + "aspects/",
- TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/",
- RES_PATH = MODID + ":" + TEX_DIR,
- RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI,
- RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM,
- RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK,
- RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY,
- RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS,
+ public static final String TEX_DIR = "textures/", TEX_DIR_GUI = TEX_DIR + "gui/", TEX_DIR_ITEM = TEX_DIR + "items/",
+ TEX_DIR_BLOCK = TEX_DIR + "blocks/", TEX_DIR_ENTITY = TEX_DIR + "entity/",
+ TEX_DIR_ASPECTS = TEX_DIR + "aspects/", TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/",
+ RES_PATH = MODID + ":" + TEX_DIR, RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI,
+ RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM, RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK,
+ RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY, RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS,
RES_PATH_FLUIDS = MODID + ":" + TEX_DIR_FLUIDS;
- /** Used to create a {@link EntityPlayer} instance from {@link FakePlayerFactory}.
- * If this instance already exists in the cache, we will return that instead.
- * These instances are held via weak reference, if the world object is unloaded, they too will be removed.
- * This is the suggested way to handle them, as suggested by Forge.
+ /**
+ * Used to create a {@link EntityPlayer} instance from {@link FakePlayerFactory}. If this instance already exists in
+ * the cache, we will return that instead. These instances are held via weak reference, if the world object is
+ * unloaded, they too will be removed. This is the suggested way to handle them, as suggested by Forge.
*
- * @param world - The {@link World} object for which you want to check for in the cache.
- * This object is used as a weak reference in a {@link WeakHashMap}.
+ * @param world - The {@link World} object for which you want to check for in the cache. This object is used as a
+ * weak reference in a {@link WeakHashMap}.
* @return - An {@link EntityPlayerMP} instance, returned either from cache or created and cached prior to return.
*/
public static EntityPlayerMP getFakePlayer(World world) {
@@ -146,6 +151,7 @@ public class CORE {
*/
public static class ConfigSwitches {
+
// Debug
public static boolean disableEnderIOIntegration = false;
public static boolean disableEnderIOIngotTooltips = false;
@@ -278,17 +284,19 @@ public class CORE {
public static int pollutionPerSecondMultiIndustrialChisel = 50;
// pollution single blocks
public static int basePollutionPerSecondSemiFluidGenerator = 40;
- public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[] {0, 2.0, 4.0, 8.0, 12.0, 16, 0};
+ public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[] { 0, 2.0, 4.0, 8.0, 12.0, 16,
+ 0 };
public static int basePollutionPerSecondBoiler = 35;
- public static double[] pollutionReleasedByTierBoiler = new double[] {0, 1.0, 1.43, 1.86};
+ public static double[] pollutionReleasedByTierBoiler = new double[] { 0, 1.0, 1.43, 1.86 };
public static int baseMinPollutionPerSecondRocketFuelGenerator = 250;
public static int baseMaxPollutionPerSecondRocketFuelGenerator = 2000;
- public static double[] pollutionReleasedByTierRocketFuelGenerator = new double[] {0, 0, 0, 0, 1, 2, 3};
+ public static double[] pollutionReleasedByTierRocketFuelGenerator = new double[] { 0, 0, 0, 0, 1, 2, 3 };
public static int basePollutionPerSecondGeothermalGenerator = 100;
- public static double[] pollutionReleasedByTierGeothermalGenerator = new double[] {0, 0, 0, 0, 1, 1, 1};
+ public static double[] pollutionReleasedByTierGeothermalGenerator = new double[] { 0, 0, 0, 0, 1, 1, 1 };
}
public static class Everglades {
+
public static final String MODID = "ToxicEverglades";
public static final String NAME = "GT++ Toxic Everglades";
public static final String VERSION = "GRADLETOKEN_VERSION";
diff --git a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
index 43822f868e..da24c8bbc1 100644
--- a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
@@ -2,13 +2,14 @@ package gtPlusPlus.core.lib;
import static gtPlusPlus.core.lib.CORE.*;
+import java.util.HashMap;
+
import cpw.mods.fml.common.Loader;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE.ConfigSwitches;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures;
import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder;
-import java.util.HashMap;
public class LoadedMods {
@@ -363,9 +364,7 @@ public class LoadedMods {
}
public static String getModVersion(final String modName) {
- final String ver = cpw.mods.fml.common.FMLCommonHandler.instance()
- .findContainerFor(modName)
- .getVersion();
+ final String ver = cpw.mods.fml.common.FMLCommonHandler.instance().findContainerFor(modName).getVersion();
return ver;
}
diff --git a/src/main/java/gtPlusPlus/core/lib/VanillaColours.java b/src/main/java/gtPlusPlus/core/lib/VanillaColours.java
index 19e9d1c735..70e7902fbf 100644
--- a/src/main/java/gtPlusPlus/core/lib/VanillaColours.java
+++ b/src/main/java/gtPlusPlus/core/lib/VanillaColours.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.lib;
import gtPlusPlus.core.util.Utils;
public enum VanillaColours {
+
BONE_MEAL(249, 255, 254),
INK_BLACK(29, 29, 33),
COCOA_BEANS(131, 84, 50),
@@ -23,6 +24,7 @@ public enum VanillaColours {
DYE_DARK_BLUE(60, 68, 170),
DYE_DARK_PURPLE(137, 50, 184),
DYE_DARK_GRAY(71, 79, 82);
+
private final int r, g, b;
private VanillaColours(int aR, int aG, int aB) {
@@ -32,7 +34,7 @@ public enum VanillaColours {
}
public short[] getAsShort() {
- return new short[] {(short) r, (short) g, (short) b};
+ return new short[] { (short) r, (short) g, (short) b };
}
public int getAsInt() {
diff --git a/src/main/java/gtPlusPlus/core/material/ALLOY.java b/src/main/java/gtPlusPlus/core/material/ALLOY.java
index a3c373b860..d9df4b115e 100644
--- a/src/main/java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/main/java/gtPlusPlus/core/material/ALLOY.java
@@ -17,12 +17,12 @@ public final class ALLOY {
public static final Material STAINLESS_STEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.StainlessSteel);
public static final Material OSMIRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmiridium);
public static final Material POLYETHYLENE = MaterialUtils.generateMaterialFromGtENUM(Materials.Plastic);
- public static final Material POLYTETRAFLUOROETHYLENE =
- MaterialUtils.generateMaterialFromGtENUM(Materials.Polytetrafluoroethylene);
+ public static final Material POLYTETRAFLUOROETHYLENE = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.Polytetrafluoroethylene);
public static final Material ENERGYCRYSTAL = new Material(
"Energy Crystal", // Material Name
MaterialState.SOLID, // State
- new short[] {228, 255, 0, 0}, // Material Colour
+ new short[] { 228, 255, 0, 0 }, // Material Colour
4660, // Melting Point in C
5735, // Boiling Point in C
90, // Protons
@@ -30,163 +30,138 @@ public final class ALLOY {
true, // Uses Blast furnace?
"⬟ ⯂ ⬢ ⬣ ⯃ ⯄",
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().AER, 5),
- new MaterialStack(ELEMENT.getInstance().IGNIS, 5),
- new MaterialStack(ELEMENT.getInstance().TERRA, 5),
- new MaterialStack(ELEMENT.getInstance().AQUA, 5)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().AER, 5),
+ new MaterialStack(ELEMENT.getInstance().IGNIS, 5),
+ new MaterialStack(ELEMENT.getInstance().TERRA, 5),
+ new MaterialStack(ELEMENT.getInstance().AQUA, 5) });
public static final Material BLOODSTEEL = new Material(
"Blood Steel", // Material Name
MaterialState.SOLID, // State
- new short[] {142, 28, 0, 0}, // Material Colour
+ new short[] { 142, 28, 0, 0 }, // Material Colour
2500, // Melting Point in C
0, // Boiling Point in C
100, // Protons
100, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {new MaterialStack(ALLOY.STEEL, 5), new MaterialStack(ELEMENT.getInstance().IGNIS, 5)});
+ new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 5),
+ new MaterialStack(ELEMENT.getInstance().IGNIS, 5) });
public static final Material STABALLOY = new Material(
"Staballoy", // Material Name
MaterialState.SOLID, // State
- new short[] {68, 75, 66, 0}, // Material Colour
+ new short[] { 68, 75, 66, 0 }, // Material Colour
3450, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().URANIUM238, 9),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().URANIUM238, 9),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 1) });
public static final Material TANTALLOY_60 = new Material(
"Tantalloy-60", // Material Name
MaterialState.SOLID, // State
- new short[] {213, 231, 237, 0}, // Material Colour
+ new short[] { 213, 231, 237, 0 }, // Material Colour
3025, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 46)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 46) });
public static final Material TANTALLOY_61 = new Material(
"Tantalloy-61", // Material Name
MaterialState.SOLID, // State
- new short[] {193, 211, 217, 0}, // Material Colour
+ new short[] { 193, 211, 217, 0 }, // Material Colour
3030, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.TANTALLOY_60, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.TANTALLOY_60, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8) });
public static final Material TUMBAGA = new Material(
"Tumbaga", // Material Name
MaterialState.SOLID, // State
- new short[] {255, 178, 15, 0}, // Material Colour
+ new short[] { 255, 178, 15, 0 }, // Material Colour
-1,
-1,
-1,
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().GOLD, 70), new MaterialStack(ELEMENT.getInstance().COPPER, 30)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 70),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 30) });
public static final Material POTIN = new Material(
"Potin", // Material Name
MaterialState.SOLID, // State
- new short[] {201, 151, 129, 0}, // Material Colour
+ new short[] { 201, 151, 129, 0 }, // Material Colour
-1,
-1,
-1,
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().LEAD, 40),
- new MaterialStack(ALLOY.BRONZE, 40),
- new MaterialStack(ELEMENT.getInstance().TIN, 20)
- });
-
- /*public static final Material BEDROCKIUM = new Material(
- "Bedrockium", //Material Name
- new short[]{32, 32, 32, 0}, //Material Colour
- 7735, //Melting Point in C
- 0, //Boiling Point in C
- 100, //Protons
- 100, //Neutrons
- false, //Uses Blast furnace?
- //Material Stacks with Percentage of required elements.
- null);*/
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LEAD, 40),
+ new MaterialStack(ALLOY.BRONZE, 40), new MaterialStack(ELEMENT.getInstance().TIN, 20) });
+
+ /*
+ * public static final Material BEDROCKIUM = new Material( "Bedrockium", //Material Name new short[]{32, 32, 32, 0},
+ * //Material Colour 7735, //Melting Point in C 0, //Boiling Point in C 100, //Protons 100, //Neutrons false, //Uses
+ * Blast furnace? //Material Stacks with Percentage of required elements. null);
+ */
public static final Material INCONEL_625 = new Material(
"Inconel-625", // Material Name
MaterialState.SOLID, // State
- new short[] {128, 200, 128, 0}, // Material Colour
+ new short[] { 128, 200, 128, 0 }, // Material Colour
2425, // Melting Point in C
3758,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NICKEL, 3),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 7),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10),
- new MaterialStack(INVAR, 10),
- new MaterialStack(NICHROME, 13)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 3),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 7),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10), new MaterialStack(INVAR, 10),
+ new MaterialStack(NICHROME, 13) });
public static final Material INCONEL_690 = new Material(
"Inconel-690", // Material Name
MaterialState.SOLID, // State
- new short[] {118, 220, 138, 0}, // Material Colour
+ new short[] { 118, 220, 138, 0 }, // Material Colour
3425, // Melting Point in C
4895,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 5),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10),
- new MaterialStack(NICHROME, 15)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CHROMIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10), new MaterialStack(NICHROME, 15) });
public static final Material INCONEL_792 = new Material(
"Inconel-792", // Material Name
MaterialState.SOLID, // State
- new short[] {108, 240, 118, 0}, // Material Colour
+ new short[] { 108, 240, 118, 0 }, // Material Colour
3425, // Melting Point in C
6200,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NICKEL, 20),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20),
- new MaterialStack(NICHROME, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 20),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20), new MaterialStack(NICHROME, 10) });
public static final Material NITINOL_60 = new Material(
"Nitinol 60", // Material Name
@@ -198,29 +173,24 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NICKEL, 40),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 60)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 40),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 60) });
public static final Material ZERON_100 = new Material(
"Zeron-100", // Material Name
MaterialState.SOLID, // State
- new short[] {180, 180, 20, 0}, // Material Colour
+ new short[] { 180, 180, 20, 0 }, // Material Colour
6100,
9785,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 26),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 6),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
- new MaterialStack(ELEMENT.getInstance().COPPER, 20),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
- new MaterialStack(ALLOY.STEEL, 40)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CHROMIUM, 26),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 6),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 20),
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4), new MaterialStack(ALLOY.STEEL, 40) });
public static final Material MARAGING250 = new Material(
"Maraging Steel 250", // Material Name
@@ -232,13 +202,11 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.STEEL, 64),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
- new MaterialStack(ELEMENT.getInstance().COBALT, 8),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 64),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 8), });
public static final Material MARAGING300 = new Material(
"Maraging Steel 300", // Material Name
@@ -250,13 +218,11 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.STEEL, 64),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
- new MaterialStack(ELEMENT.getInstance().COBALT, 8),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 64),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 8), });
public static final Material MARAGING350 = new Material(
"Maraging Steel 350", // Material Name
@@ -268,33 +234,29 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.STEEL, 64),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
- new MaterialStack(ELEMENT.getInstance().COBALT, 8),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 64),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 8), });
public static final Material AQUATIC_STEEL = new Material(
"Watertight Steel", // Material Name
MaterialState.SOLID, // State
- new short[] {120, 120, 180}, // Material Colour
+ new short[] { 120, 120, 180 }, // Material Colour
2673, // Melting Point in C
4835,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.STEEL, 60),
- new MaterialStack(ELEMENT.getInstance().CARBON, 10),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 5),
- new MaterialStack(ELEMENT.getInstance().SILICON, 10),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 5),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 5)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 60),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 10),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 5),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 10),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 5),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 5) });
public static final Material STELLITE = new Material(
"Stellite", // Material Name
@@ -306,12 +268,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().COBALT, 35),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 35),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 20),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 35),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 35),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 20),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 10) });
public static final Material TALONITE = new Material(
"Talonite", // Material Name
@@ -323,12 +283,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().COBALT, 40),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 30),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 20),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 40),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 30),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 20),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10) });
public static final Material HASTELLOY_W = new Material(
"Hastelloy-W", // Material Name
@@ -340,13 +298,11 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 06),
- new MaterialStack(ELEMENT.getInstance().COBALT, 2),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 24),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 6),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 62)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 06),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 2),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 24),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 6),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 62) });
public static final Material HASTELLOY_X = new Material(
"Hastelloy-X", // Material Name
@@ -358,14 +314,12 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 18),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 2),
- new MaterialStack(ELEMENT.getInstance().SILICON, 2),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 8),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 48)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 18),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 2),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 8),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 48) });
public static final Material HASTELLOY_N = new Material(
"Hastelloy-N", // Material Name
@@ -377,13 +331,11 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 8),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 60)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 8),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 60) });
public static final Material HASTELLOY_C276 = new Material(
"Hastelloy-C276", // Material Name
@@ -395,14 +347,12 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().COBALT, 2),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 2),
- new MaterialStack(ELEMENT.getInstance().COPPER, 2),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 14),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 64)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 2),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 2),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 2),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 14),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 64) });
public static final Material INCOLOY_020 = new Material(
"Incoloy-020", // Material Name
@@ -414,12 +364,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 40),
- new MaterialStack(ELEMENT.getInstance().COPPER, 4),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 36)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 40),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 4),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 36) });
public static final Material INCOLOY_DS = new Material(
"Incoloy-DS", // Material Name
@@ -431,12 +379,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 46),
- new MaterialStack(ELEMENT.getInstance().COBALT, 18),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 18),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 18)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 46),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 18),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 18),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 18) });
public static final Material INCOLOY_MA956 = new Material(
"Incoloy-MA956", // Material Name
@@ -448,17 +394,15 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 64),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 64),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4) });
public static final Material TUNGSTEN_CARBIDE = new Material(
"Tungsten Carbide", // Material Name
MaterialState.SOLID, // State
- new short[] {44, 44, 44, 0}, // Material Colour
+ new short[] { 44, 44, 44, 0 }, // Material Colour
3422, // Melting Point in C
-1,
-1,
@@ -466,10 +410,8 @@ public final class ALLOY {
true, // Uses Blast furnace?
false, // Generate cells
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CARBON, 50),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CARBON, 50),
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50) });
public static final Material TUNGSTEN_TITANIUM_CARBIDE = new Material(
"Tungsten Titanium Carbide", // Material Name
@@ -481,69 +423,60 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(TUNGSTEN_CARBIDE, 70), new MaterialStack(ELEMENT.getInstance().TITANIUM, 30)
- });
+ new MaterialStack[] { new MaterialStack(TUNGSTEN_CARBIDE, 70),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 30) });
public static final Material SILICON_CARBIDE = new Material(
"Silicon Carbide", // Material Name
MaterialState.SOLID, // State
- new short[] {40, 48, 36, 0}, // Material Colour
+ new short[] { 40, 48, 36, 0 }, // Material Colour
1414, // Melting Point in C
-1,
-1,
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().SILICON, 50),
- new MaterialStack(ELEMENT.getInstance().CARBON, 50)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SILICON, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50) });
public static final Material TANTALUM_CARBIDE = new Material(
"Tantalum Carbide", // Material Name
MaterialState.SOLID, // State
- new short[] {139, 136, 120, 0}, // Material Colour
+ new short[] { 139, 136, 120, 0 }, // Material Colour
2980, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 50),
- new MaterialStack(ELEMENT.getInstance().CARBON, 50)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TANTALUM, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50) });
public static final Material ZIRCONIUM_CARBIDE = new Material(
"Zirconium Carbide", // Material Name
MaterialState.SOLID, // State
- new short[] {222, 202, 180, 0}, // Material Colour
+ new short[] { 222, 202, 180, 0 }, // Material Colour
1555, // Melting Point in C
-1,
-1,
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 50),
- new MaterialStack(ELEMENT.getInstance().CARBON, 50)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50) });
public static final Material NIOBIUM_CARBIDE = new Material(
"Niobium Carbide", // Material Name
MaterialState.SOLID, // State
- new short[] {205, 197, 191, 0}, // Material Colour
+ new short[] { 205, 197, 191, 0 }, // Material Colour
2477, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50),
- new MaterialStack(ELEMENT.getInstance().CARBON, 50)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50) });
public static final Material ARCANITE = new Material(
"Arcanite", // Material Name
@@ -555,30 +488,26 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().THORIUM232, 40),
- new MaterialStack(ENERGYCRYSTAL, 40),
- new MaterialStack(ELEMENT.getInstance().ORDO, 10),
- new MaterialStack(ELEMENT.getInstance().PERDITIO, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 40),
+ new MaterialStack(ENERGYCRYSTAL, 40), new MaterialStack(ELEMENT.getInstance().ORDO, 10),
+ new MaterialStack(ELEMENT.getInstance().PERDITIO, 10) });
public static final Material LEAGRISIUM = new Material(
"Grisium", // Material Name
MaterialState.SOLID, // State
- new short[] {53, 93, 106, 0}, // Material Colour
+ new short[] { 53, 93, 106, 0 }, // Material Colour
3850, // Melting Point in C
5550, // Boiling Point in C
96, // Protons
128, // Neutrons
true, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 18),
- new MaterialStack(ELEMENT.getInstance().CARBON, 18),
- new MaterialStack(ELEMENT.getInstance().POTASSIUM, 18),
- new MaterialStack(ELEMENT.getInstance().LITHIUM, 18),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 18),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
- }); // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TITANIUM, 18),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 18),
+ new MaterialStack(ELEMENT.getInstance().POTASSIUM, 18),
+ new MaterialStack(ELEMENT.getInstance().LITHIUM, 18),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 18),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10) }); // Material Stacks with Percentage of
+ // required elements.
public static final Material EGLIN_STEEL_BASE = new Material(
"Eglin Steel Base Compound", // Material Name
@@ -590,45 +519,38 @@ public final class ALLOY {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 12),
- new MaterialStack(KANTHAL, 3),
- new MaterialStack(INVAR, 15)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 12), new MaterialStack(KANTHAL, 3),
+ new MaterialStack(INVAR, 15) });
public static final Material EGLIN_STEEL = new Material(
"Eglin Steel", // Material Name
MaterialState.SOLID, // State
- new short[] {139, 69, 19, 0}, // Material Colour
+ new short[] { 139, 69, 19, 0 }, // Material Colour
1048, // Melting Point in C
1973, // Boiling Point in C
-1,
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.EGLIN_STEEL_BASE, 10),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
- new MaterialStack(ELEMENT.getInstance().SILICON, 4),
- new MaterialStack(ELEMENT.getInstance().CARBON, 1)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.EGLIN_STEEL_BASE, 10),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 4),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 1) });
public static final Material HG1223 = new Material(
"HG-1223", // Material Name
MaterialState.LIQUID, // State
- new short[] {39, 85, 159, 0}, // Material Colour
+ new short[] { 39, 85, 159, 0 }, // Material Colour
6357, // Melting Point in C
8563, // Boiling Point in C
-1,
-1,
false, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().MERCURY, 1),
- new MaterialStack(ELEMENT.getInstance().BARIUM, 2),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
- new MaterialStack(ELEMENT.getInstance().COPPER, 3),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().MERCURY, 1),
+ new MaterialStack(ELEMENT.getInstance().BARIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 3),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) });
public static final Material HS188A = new Material(
"HS188-A", // Material Name
@@ -639,16 +561,12 @@ public final class ALLOY {
-1, // Protons
-1, // Neutrons
true, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().COBALT, 20),
- new MaterialStack(ELEMENT.getInstance().HAFNIUM, 20),
- new MaterialStack(TALONITE, 16),
- new MaterialStack(ELEMENT.getInstance().RHENIUM, 10),
- new MaterialStack(NIOBIUM_CARBIDE, 10),
- new MaterialStack(HASTELLOY_X, 8),
- new MaterialStack(TUNGSTENSTEEL, 8),
- new MaterialStack(ZIRCONIUM_CARBIDE, 8),
- }); // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 20),
+ new MaterialStack(ELEMENT.getInstance().HAFNIUM, 20), new MaterialStack(TALONITE, 16),
+ new MaterialStack(ELEMENT.getInstance().RHENIUM, 10), new MaterialStack(NIOBIUM_CARBIDE, 10),
+ new MaterialStack(HASTELLOY_X, 8), new MaterialStack(TUNGSTENSTEEL, 8),
+ new MaterialStack(ZIRCONIUM_CARBIDE, 8), }); // Material Stacks with Percentage of required
+ // elements.
/**
* Stargate Materials - #D2FFA9 210, 255, 170
@@ -662,10 +580,8 @@ public final class ALLOY {
-1,
-1,
true, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 3),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 7)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 3),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 7) });
public static final Material TRINIUM_NAQUADAH = new Material(
"Trinium Naquadah Alloy", // Material Name
@@ -676,10 +592,8 @@ public final class ALLOY {
-1,
-1,
false, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 5),
- new MaterialStack(ELEMENT.getInstance().NAQUADAH, 9)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 5),
+ new MaterialStack(ELEMENT.getInstance().NAQUADAH, 9) });
public static final Material TRINIUM_NAQUADAH_CARBON = new Material(
"Trinium Naquadah Carbonite", // Material Name
MaterialState.SOLID, // State
@@ -689,27 +603,22 @@ public final class ALLOY {
-1,
-1,
true, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(TRINIUM_NAQUADAH, 9), new MaterialStack(ELEMENT.getInstance().CARBON, 1)
- });
+ new MaterialStack[] { new MaterialStack(TRINIUM_NAQUADAH, 9),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 1) });
public static final Material TRINIUM_REINFORCED_STEEL = new Material(
"Arceus Alloy 2B", // Material Name
MaterialState.SOLID, // State
- new short[] {205, 197, 23, 0}, // Material Colour
+ new short[] { 205, 197, 23, 0 }, // Material Colour
7555, // Melting Point in C
12350,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 30),
- new MaterialStack(ALLOY.MARAGING350, 40),
- new MaterialStack(ALLOY.TUNGSTENSTEEL, 20),
- new MaterialStack(ALLOY.OSMIRIDIUM, 10),
- new MaterialStack(ELEMENT.getInstance().STRONTIUM, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 30),
+ new MaterialStack(ALLOY.MARAGING350, 40), new MaterialStack(ALLOY.TUNGSTENSTEEL, 20),
+ new MaterialStack(ALLOY.OSMIRIDIUM, 10), new MaterialStack(ELEMENT.getInstance().STRONTIUM, 10) });
/*
* Witchery Material
@@ -718,18 +627,16 @@ public final class ALLOY {
public static final Material KOBOLDITE = new Material(
"Koboldite", // Material Name
MaterialState.SOLID, // State
- new short[] {80, 210, 255, 0}, // Material Colour
+ new short[] { 80, 210, 255, 0 }, // Material Colour
-1, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NICKEL, 35),
- new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30),
- new MaterialStack(ELEMENT.getInstance().IRON, 35)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 35),
+ new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30),
+ new MaterialStack(ELEMENT.getInstance().IRON, 35) });
/*
* Top Tier Alloys
@@ -745,13 +652,11 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().HELIUM, 20),
- new MaterialStack(ELEMENT.getInstance().LITHIUM, 20),
- new MaterialStack(ELEMENT.getInstance().COBALT, 20),
- new MaterialStack(ELEMENT.getInstance().PLATINUM, 20),
- new MaterialStack(ELEMENT.getInstance().ERBIUM, 20)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().HELIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().LITHIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 20),
+ new MaterialStack(ELEMENT.getInstance().PLATINUM, 20),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 20) });
// 0lafe Compound
public static final Material LAFIUM = new Material(
@@ -764,16 +669,14 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.HASTELLOY_N, 8),
- new MaterialStack(ELEMENT.getInstance().NAQUADAH, 4),
- new MaterialStack(ELEMENT.getInstance().SAMARIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
- new MaterialStack(ELEMENT.getInstance().ARGON, 2),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 6),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 8),
- new MaterialStack(ELEMENT.getInstance().CARBON, 2)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.HASTELLOY_N, 8),
+ new MaterialStack(ELEMENT.getInstance().NAQUADAH, 4),
+ new MaterialStack(ELEMENT.getInstance().SAMARIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
+ new MaterialStack(ELEMENT.getInstance().ARGON, 2),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 6),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 8),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 2) });
// Cinobi Alloy
public static final Material CINOBITE = new Material(
@@ -786,38 +689,31 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.ZERON_100, 16),
- new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 7),
- new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 5),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
- new MaterialStack(ELEMENT.getInstance().MERCURY, 2),
- new MaterialStack(ELEMENT.getInstance().TIN, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
- new MaterialStack(ALLOY.OSMIRIDIUM, 6)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.ZERON_100, 16),
+ new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 7),
+ new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().MERCURY, 2),
+ new MaterialStack(ELEMENT.getInstance().TIN, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), new MaterialStack(ALLOY.OSMIRIDIUM, 6) });
// Piky Alloy
public static final Material PIKYONIUM = new Material(
"Pikyonium 64B", // Material Name
MaterialState.SOLID, // State
- new short[] {52, 103, 186, 0}, // Material Colour
+ new short[] { 52, 103, 186, 0 }, // Material Colour
6850, // Melting Point in C
11765, // Boiling Point in C
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.INCONEL_792, 16),
- new MaterialStack(ALLOY.EGLIN_STEEL, 10),
- new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 8),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 6),
- new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4),
- new MaterialStack(ELEMENT.getInstance().PLATINUM, 4),
- new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
- new MaterialStack(ALLOY.TUNGSTENSTEEL, 8)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.INCONEL_792, 16), new MaterialStack(ALLOY.EGLIN_STEEL, 10),
+ new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 8),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 6),
+ new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4),
+ new MaterialStack(ELEMENT.getInstance().PLATINUM, 4),
+ new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), new MaterialStack(ALLOY.TUNGSTENSTEEL, 8) });
// Piky Alloy
public static final Material ABYSSAL = new Material(
@@ -830,53 +726,45 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.STAINLESS_STEEL, 10),
- new MaterialStack(ALLOY.TUNGSTEN_CARBIDE, 10),
- new MaterialStack(ALLOY.NICHROME, 10),
- new MaterialStack(ALLOY.BRONZE, 10),
- new MaterialStack(ALLOY.INCOLOY_MA956, 10),
- new MaterialStack(ELEMENT.getInstance().IODINE, 2),
- new MaterialStack(ELEMENT.getInstance().RADON, 2),
- new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STAINLESS_STEEL, 10),
+ new MaterialStack(ALLOY.TUNGSTEN_CARBIDE, 10), new MaterialStack(ALLOY.NICHROME, 10),
+ new MaterialStack(ALLOY.BRONZE, 10), new MaterialStack(ALLOY.INCOLOY_MA956, 10),
+ new MaterialStack(ELEMENT.getInstance().IODINE, 2),
+ new MaterialStack(ELEMENT.getInstance().RADON, 2),
+ new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2), });
// Alkalus Alloy
public static final Material LAURENIUM = new Material(
"Laurenium", // Material Name
MaterialState.SOLID, // State
- new short[] {244, 168, 255, 0}, // Material Colour
+ new short[] { 244, 168, 255, 0 }, // Material Colour
6825, // Melting Point in C
11355, // Boiling Point in C
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.EGLIN_STEEL, 40),
- new MaterialStack(ELEMENT.getInstance().INDIUM, 10),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
- new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 5),
- new MaterialStack(ELEMENT.getInstance().RHENIUM, 5),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.EGLIN_STEEL, 40),
+ new MaterialStack(ELEMENT.getInstance().INDIUM, 10),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().RHENIUM, 5), });
// Bot Alloy
public static final Material BOTMIUM = new Material(
"Botmium", // Material Name
MaterialState.SOLID, // State
- new short[] {80, 160, 80, 0}, // Material Colour
+ new short[] { 80, 160, 80, 0 }, // Material Colour
8220, // Melting Point in C
10540, // Boiling Point in C
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.NITINOL_60, 2),
- new MaterialStack(ELEMENT.getInstance().OSMIUM, 12),
- new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 12),
- new MaterialStack(ELEMENT.getInstance().THALLIUM, 6),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.NITINOL_60, 2),
+ new MaterialStack(ELEMENT.getInstance().OSMIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().THALLIUM, 6), });
// Titansteel
public static final Material TITANSTEEL = new Material(
@@ -889,12 +777,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.TUNGSTEN_TITANIUM_CARBIDE, 3),
- new MaterialStack(ELEMENT.getInstance().IGNIS, 1),
- new MaterialStack(ELEMENT.getInstance().TERRA, 1),
- new MaterialStack(ELEMENT.getInstance().PERDITIO, 1),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.TUNGSTEN_TITANIUM_CARBIDE, 3),
+ new MaterialStack(ELEMENT.getInstance().IGNIS, 1),
+ new MaterialStack(ELEMENT.getInstance().TERRA, 1),
+ new MaterialStack(ELEMENT.getInstance().PERDITIO, 1), });
public static final Material OCTIRON = new Material(
"Octiron", // Material Name
@@ -906,13 +792,9 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ARCANITE, 30),
- new MaterialStack(TITANSTEEL, 30),
- new MaterialStack(ENERGYCRYSTAL, 5),
- new MaterialStack(STEEL_BLACK, 10),
- new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25)
- });
+ new MaterialStack[] { new MaterialStack(ARCANITE, 30), new MaterialStack(TITANSTEEL, 30),
+ new MaterialStack(ENERGYCRYSTAL, 5), new MaterialStack(STEEL_BLACK, 10),
+ new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25) });
public static final Material BLACK_TITANIUM = new Material(
"Black Titanium", // Material Name
@@ -924,17 +806,15 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 55),
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 12),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 8),
- new MaterialStack(ELEMENT.getInstance().COBALT, 6),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 4),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 4),
- new MaterialStack(ELEMENT.getInstance().PALLADIUM, 4),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().ARGON, 5)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TITANIUM, 55),
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 12),
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 8),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 6),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 4),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 4),
+ new MaterialStack(ELEMENT.getInstance().PALLADIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().ARGON, 5) });
public static final Material BABBIT_ALLOY = new Material(
"Babbit Alloy", // Material Name
@@ -946,12 +826,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TIN, 10),
- new MaterialStack(ELEMENT.getInstance().LEAD, 72),
- new MaterialStack(ELEMENT.getInstance().ANTIMONY, 16),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TIN, 10),
+ new MaterialStack(ELEMENT.getInstance().LEAD, 72),
+ new MaterialStack(ELEMENT.getInstance().ANTIMONY, 16),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 2) });
public static final Material INDALLOY_140 = new Material(
"Indalloy 140", // Material Name
@@ -963,13 +841,10 @@ public final class ALLOY {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().BISMUTH, 47),
- new MaterialStack(ELEMENT.getInstance().LEAD, 25),
- new MaterialStack(ELEMENT.getInstance().TIN, 13),
- new MaterialStack(ELEMENT.getInstance().CADMIUM, 10),
- new MaterialStack(ELEMENT.getInstance().INDIUM, 5)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BISMUTH, 47),
+ new MaterialStack(ELEMENT.getInstance().LEAD, 25), new MaterialStack(ELEMENT.getInstance().TIN, 13),
+ new MaterialStack(ELEMENT.getInstance().CADMIUM, 10),
+ new MaterialStack(ELEMENT.getInstance().INDIUM, 5) });
// Quantum
public static final Material QUANTUM = new Material(
@@ -982,14 +857,10 @@ public final class ALLOY {
200, // Neutrons
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.STELLITE, 15),
- new MaterialStack(ALLOY.ENERGYCRYSTAL, 5),
- new MaterialStack(ALLOY.SILICON_CARBIDE, 5),
- new MaterialStack(ELEMENT.getInstance().GALLIUM, 5),
- new MaterialStack(ELEMENT.getInstance().AMERICIUM, 5),
- new MaterialStack(ELEMENT.getInstance().PALLADIUM, 5),
- new MaterialStack(ELEMENT.getInstance().BISMUTH, 5),
- new MaterialStack(ELEMENT.getInstance().GERMANIUM, 5)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STELLITE, 15), new MaterialStack(ALLOY.ENERGYCRYSTAL, 5),
+ new MaterialStack(ALLOY.SILICON_CARBIDE, 5), new MaterialStack(ELEMENT.getInstance().GALLIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().AMERICIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().PALLADIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().BISMUTH, 5),
+ new MaterialStack(ELEMENT.getInstance().GERMANIUM, 5) });
}
diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java
index fca5a36821..f73c1af0ab 100644
--- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java
@@ -11,126 +11,20 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
public final class ELEMENT {
- public static final String[] NAMES = new String[] {
- "Hydrogen",
- "Helium",
- "Lithium",
- "Beryllium",
- "Boron",
- "Carbon",
- "Nitrogen",
- "Oxygen",
- "Fluorine",
- "Neon",
- "Sodium",
- "Magnesium",
- "Aluminium",
- "Silicon",
- "Phosphorus",
- "Sulfur",
- "Chlorine",
- "Argon",
- "Potassium",
- "Calcium",
- "Scandium",
- "Titanium",
- "Vanadium",
- "Chromium",
- "Manganese",
- "Iron",
- "Cobalt",
- "Nickel",
- "Copper",
- "Zinc",
- "Gallium",
- "Germanium",
- "Arsenic",
- "Selenium",
- "Bromine",
- "Krypton",
- "Rubidium",
- "Strontium",
- "Yttrium",
- "Zirconium",
- "Niobium",
- "Molybdenum",
- "Technetium",
- "Ruthenium",
- "Rhodium",
- "Palladium",
- "Silver",
- "Cadmium",
- "Indium",
- "Tin",
- "Antimony",
- "Tellurium",
- "Iodine",
- "Xenon",
- "Caesium",
- "Barium",
- "Lanthanum",
- "Cerium",
- "Praseodymium",
- "Neodymium",
- "Promethium",
- "Samarium",
- "Europium",
- "Gadolinium",
- "Terbium",
- "Dysprosium",
- "Holmium",
- "Erbium",
- "Thulium",
- "Ytterbium",
- "Lutetium",
- "Hafnium",
- "Tantalum",
- "Tungsten",
- "Rhenium",
- "Osmium",
- "Iridium",
- "Platinum",
- "Gold",
- "Mercury",
- "Thallium",
- "Lead",
- "Bismuth",
- "Polonium",
- "Astatine",
- "Radon",
- "Francium",
- "Radium",
- "Actinium",
- "Thorium",
- "Protactinium",
- "Uranium",
- "Neptunium",
- "Plutonium",
- "Americium",
- "Curium",
- "Berkelium",
- "Californium",
- "Einsteinium",
- "Fermium",
- "Mendelevium",
- "Nobelium",
- "Lawrencium",
- "Rutherfordium",
- "Dubnium",
- "Seaborgium",
- "Bohrium",
- "Hassium",
- "Meitnerium",
- "Darmstadtium",
- "Roentgenium",
- "Copernicium",
- "Nihonium",
- "Flerovium",
- "Moscovium",
- "Livermorium",
- "Tennessine",
- "Oganesson"
- };
+ public static final String[] NAMES = new String[] { "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon",
+ "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus",
+ "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium",
+ "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium",
+ "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum",
+ "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony",
+ "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium",
+ "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium",
+ "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum",
+ "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium",
+ "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium",
+ "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium",
+ "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium",
+ "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson" };
// First 50 Elements
public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
@@ -145,7 +39,7 @@ public final class ELEMENT {
public final Material NEON = new Material(
"Neon",
MaterialState.PURE_GAS,
- new short[] {240, 180, 30},
+ new short[] { 240, 180, 30 },
-248,
-246,
10,
@@ -179,7 +73,7 @@ public final class ELEMENT {
public final Material GERMANIUM = new Material(
"Germanium",
MaterialState.SOLID,
- new short[] {200, 200, 200},
+ new short[] { 200, 200, 200 },
937,
2830,
32,
@@ -191,7 +85,7 @@ public final class ELEMENT {
public final Material SELENIUM = new Material(
"Selenium",
MaterialState.SOLID,
- new short[] {190, 190, 190},
+ new short[] { 190, 190, 190 },
217,
685,
34,
@@ -202,7 +96,7 @@ public final class ELEMENT {
public final Material BROMINE = new Material(
"Bromine",
MaterialState.PURE_LIQUID,
- new short[] {200, 25, 25},
+ new short[] { 200, 25, 25 },
-7,
58,
35,
@@ -213,7 +107,7 @@ public final class ELEMENT {
public final Material KRYPTON = new Material(
"Krypton",
MaterialState.PURE_GAS,
- new short[] {5, 200, 220},
+ new short[] { 5, 200, 220 },
-157,
-153,
36,
@@ -222,13 +116,13 @@ public final class ELEMENT {
"Kr",
0); // Not a GT Inherited Material
public final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium);
- public final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(
- Materials.Strontium, new short[] {230, 210, 110}, TextureSet.SET_FLINT);
+ public final Material STRONTIUM = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.Strontium, new short[] { 230, 210, 110 }, TextureSet.SET_FLINT);
public final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium);
public final Material ZIRCONIUM = new Material(
"Zirconium",
MaterialState.SOLID,
- new short[] {255, 250, 205},
+ new short[] { 255, 250, 205 },
1855,
4377,
40,
@@ -242,7 +136,7 @@ public final class ELEMENT {
"Technetium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {220, 220, 220},
+ new short[] { 220, 220, 220 },
2200,
4877,
43,
@@ -253,7 +147,7 @@ public final class ELEMENT {
public final Material RUTHENIUM = new Material(
"Ruthenium",
MaterialState.SOLID,
- new short[] {220, 220, 220},
+ new short[] { 220, 220, 220 },
2250,
3900,
44,
@@ -264,7 +158,7 @@ public final class ELEMENT {
public final Material RHODIUM = new Material(
"Rhodium",
MaterialState.SOLID,
- new short[] {220, 220, 220},
+ new short[] { 220, 220, 220 },
1966,
3727,
45,
@@ -281,7 +175,7 @@ public final class ELEMENT {
public final Material TELLURIUM = new Material(
"Tellurium",
MaterialState.SOLID,
- new short[] {210, 210, 210},
+ new short[] { 210, 210, 210 },
449,
989,
52,
@@ -293,7 +187,7 @@ public final class ELEMENT {
"Iodine",
MaterialState.SOLID,
TextureSet.SET_SHINY,
- new short[] {96, 96, 96},
+ new short[] { 96, 96, 96 },
114,
184,
53,
@@ -304,7 +198,7 @@ public final class ELEMENT {
public final Material XENON = new Material(
"Xenon",
MaterialState.PURE_GAS,
- new short[] {5, 105, 210},
+ new short[] { 5, 105, 210 },
-111,
-108,
54,
@@ -326,7 +220,7 @@ public final class ELEMENT {
public final Material DYSPROSIUM = new Material(
"Dysprosium",
MaterialState.SOLID,
- new short[] {180, 180, 180},
+ new short[] { 180, 180, 180 },
1412,
2562,
66,
@@ -342,7 +236,7 @@ public final class ELEMENT {
public final Material HAFNIUM = new Material(
"Hafnium",
MaterialState.SOLID,
- new short[] {128, 128, 128},
+ new short[] { 128, 128, 128 },
2150,
5400,
72,
@@ -357,7 +251,7 @@ public final class ELEMENT {
public final Material RHENIUM = new Material(
"Rhenium",
MaterialState.SOLID,
- new short[] {150, 150, 150},
+ new short[] { 150, 150, 150 },
3180,
3627,
75,
@@ -373,7 +267,7 @@ public final class ELEMENT {
public final Material THALLIUM = new Material(
"Thallium",
MaterialState.SOLID,
- new short[] {175, 175, 175},
+ new short[] { 175, 175, 175 },
304,
1457,
81,
@@ -387,7 +281,7 @@ public final class ELEMENT {
"Polonium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {180, 170, 180},
+ new short[] { 180, 170, 180 },
254,
962,
84,
@@ -399,7 +293,7 @@ public final class ELEMENT {
"Astatine",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {170, 180, 170},
+ new short[] { 170, 180, 170 },
302,
337,
85,
@@ -412,7 +306,7 @@ public final class ELEMENT {
"Francium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {170, 160, 170},
+ new short[] { 170, 160, 170 },
27,
677,
87,
@@ -424,7 +318,7 @@ public final class ELEMENT {
"Radium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {165, 165, 165},
+ new short[] { 165, 165, 165 },
700,
1737,
88,
@@ -436,7 +330,7 @@ public final class ELEMENT {
"Actinium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {150, 165, 165},
+ new short[] { 150, 165, 165 },
1050,
3200,
89,
@@ -459,7 +353,7 @@ public final class ELEMENT {
"Protactinium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {190, 150, 170},
+ new short[] { 190, 150, 170 },
1568,
4027,
91,
@@ -473,7 +367,7 @@ public final class ELEMENT {
"Neptunium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {200, 220, 205},
+ new short[] { 200, 220, 205 },
640,
3902,
93,
@@ -488,7 +382,7 @@ public final class ELEMENT {
"Curium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {175, 85, 110},
+ new short[] { 175, 85, 110 },
1340,
3110,
96,
@@ -500,7 +394,7 @@ public final class ELEMENT {
"Berkelium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {110, 250, 85},
+ new short[] { 110, 250, 85 },
985,
710,
97,
@@ -512,7 +406,7 @@ public final class ELEMENT {
"Californium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {85, 110, 205},
+ new short[] { 85, 110, 205 },
899,
1472,
98,
@@ -524,7 +418,7 @@ public final class ELEMENT {
"Einsteinium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {255, 85, 110},
+ new short[] { 255, 85, 110 },
860,
3500,
99,
@@ -536,7 +430,7 @@ public final class ELEMENT {
"Fermium",
MaterialState.LIQUID,
TextureSets.NUCLEAR.get(),
- new short[] {75, 90, 25},
+ new short[] { 75, 90, 25 },
1527,
3850,
100,
@@ -547,20 +441,20 @@ public final class ELEMENT {
// Misc
public final Material AER = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedAir, TextureSets.GEM_A.get());
- public final Material IGNIS =
- MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire, TextureSets.GEM_A.get());
- public final Material TERRA =
- MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEarth, TextureSets.GEM_A.get());
- public final Material AQUA =
- MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedWater, TextureSets.GEM_A.get());
- public final Material PERDITIO =
- MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEntropy, TextureSets.GEM_A.get());
- public final Material ORDO =
- MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedOrder, TextureSets.GEM_A.get());
+ public final Material IGNIS = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.InfusedFire, TextureSets.GEM_A.get());
+ public final Material TERRA = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.InfusedEarth, TextureSets.GEM_A.get());
+ public final Material AQUA = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.InfusedWater, TextureSets.GEM_A.get());
+ public final Material PERDITIO = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.InfusedEntropy, TextureSets.GEM_A.get());
+ public final Material ORDO = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.InfusedOrder, TextureSets.GEM_A.get());
// Fictional
- public final Material YELLORIUM = MaterialUtils.generateMaterialFromGtENUM(
- Materials.Yellorium, new short[] {255, 242, 10}, TextureSets.NUCLEAR.get());
+ public final Material YELLORIUM = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.Yellorium, new short[] { 255, 242, 10 }, TextureSets.NUCLEAR.get());
public final Material NAQUADAH = MaterialUtils.generateMaterialFromGtENUM(Materials.Naquadah);
public final Material NAQUADAH_ENRICHED = MaterialUtils.generateMaterialFromGtENUM(Materials.NaquadahEnriched);
public final Material NAQUADRIA = MaterialUtils.generateMaterialFromGtENUM(Materials.Naquadria);
@@ -586,7 +480,7 @@ public final class ELEMENT {
"Uranium 232",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {88, 220, 103, 0},
+ new short[] { 88, 220, 103, 0 },
1132,
4131,
92,
@@ -598,7 +492,7 @@ public final class ELEMENT {
"Uranium 233",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {73, 220, 83, 0},
+ new short[] { 73, 220, 83, 0 },
1132,
4131,
92,
@@ -610,7 +504,7 @@ public final class ELEMENT {
"Thorium 232",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {15, 60, 15, 0},
+ new short[] { 15, 60, 15, 0 },
Materials.Thorium.mMeltingPoint,
Materials.Thorium.mBlastFurnaceTemp,
90,
@@ -691,7 +585,8 @@ public final class ELEMENT {
2,
false); // Not a GT Inherited Material
- public final Material MAGIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Magic, new short[] {10, 185, 140});
+ public final Material MAGIC = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.Magic, new short[] { 10, 185, 140 });
public final Material THAUMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thaumium);
static {
@@ -739,7 +634,7 @@ public final class ELEMENT {
"Trinium",
MaterialState.SOLID,
TextureSet.SET_FINE,
- new short[] {70, 110, 30},
+ new short[] { 70, 110, 30 },
604,
4057,
181,
@@ -752,7 +647,7 @@ public final class ELEMENT {
"Refined Trinium",
MaterialState.SOLID,
TextureSets.REFINED.get(),
- new short[] {210, 255, 170},
+ new short[] { 210, 255, 170 },
4304,
14057,
181,
@@ -760,7 +655,7 @@ public final class ELEMENT {
false,
"Ke",
0,
- new MaterialStack[] {new MaterialStack(TRINIUM, 1)}); // Not a GT Inherited Material
+ new MaterialStack[] { new MaterialStack(TRINIUM, 1) }); // Not a GT Inherited Material
}
}
@@ -774,7 +669,7 @@ public final class ELEMENT {
"Celestial Tungsten",
MaterialState.SOLID,
TextureSets.REFINED.get(),
- new short[] {50, 50, 50, 2},
+ new short[] { 50, 50, 50, 2 },
INSTANCE.TUNGSTEN.getMeltingPointC() + 6500,
INSTANCE.TUNGSTEN.getBoilingPointC() + 7500,
160,
@@ -786,7 +681,7 @@ public final class ELEMENT {
"Astral Titanium",
MaterialState.SOLID,
TextureSets.REFINED.get(),
- new short[] {220, 160, 240, 2},
+ new short[] { 220, 160, 240, 2 },
INSTANCE.TITANIUM.getMeltingPointC() + 7500,
INSTANCE.TITANIUM.getBoilingPointC() + 7500,
145,
@@ -797,7 +692,7 @@ public final class ELEMENT {
public static final Material CHRONOMATIC_GLASS = new Material(
"Chromatic Glass",
MaterialState.SOLID,
- new short[] {255, 255, 255, 3},
+ new short[] { 255, 255, 255, 3 },
9200,
17550,
40,
@@ -821,7 +716,7 @@ public final class ELEMENT {
"Hypogen",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {220, 120, 75, 2},
+ new short[] { 220, 120, 75, 2 },
11255,
19377,
240,
@@ -833,7 +728,7 @@ public final class ELEMENT {
"Rhugnor",
MaterialState.SOLID,
TextureSets.ENRICHED.get(),
- new short[] {190, 0, 255, 0},
+ new short[] { 190, 0, 255, 0 },
8750,
14757,
184,
@@ -845,7 +740,7 @@ public final class ELEMENT {
"Force",
MaterialState.SOLID,
TextureSets.ENRICHED.get(),
- new short[] {250, 250, 20, 0},
+ new short[] { 250, 250, 20, 0 },
4550,
6830,
63,
@@ -859,7 +754,7 @@ public final class ELEMENT {
"Black Metal",
MaterialState.SOLID,
TextureSet.SET_METALLIC,
- new short[] {5, 5, 5},
+ new short[] { 5, 5, 5 },
2350,
4650,
24,
@@ -867,16 +762,17 @@ public final class ELEMENT {
false,
"҈",
0,
- new MaterialStack[] {
- new MaterialStack(getInstance().LEAD, 15),
- new MaterialStack(getInstance().MANGANESE, 25),
- new MaterialStack(getInstance().CARBON, 60)
- }); // Not a GT Inherited Material
+ new MaterialStack[] { new MaterialStack(getInstance().LEAD, 15),
+ new MaterialStack(getInstance().MANGANESE, 25), new MaterialStack(getInstance().CARBON, 60) }); // Not
+ // a
+ // GT
+ // Inherited
+ // Material
public static final Material WHITE_METAL = new Material(
"White Metal",
MaterialState.SOLID,
TextureSet.SET_METALLIC,
- new short[] {255, 255, 255},
+ new short[] { 255, 255, 255 },
4560,
7580,
35,
@@ -884,18 +780,15 @@ public final class ELEMENT {
false,
"҉",
0,
- new MaterialStack[] {
- new MaterialStack(getInstance().COPPER, 5),
- new MaterialStack(getInstance().ANTIMONY, 10),
- new MaterialStack(getInstance().PLATINUM, 10),
- new MaterialStack(getInstance().TIN, 75)
- }); // Not a GT Inherited Material
+ new MaterialStack[] { new MaterialStack(getInstance().COPPER, 5),
+ new MaterialStack(getInstance().ANTIMONY, 10), new MaterialStack(getInstance().PLATINUM, 10),
+ new MaterialStack(getInstance().TIN, 75) }); // Not a GT Inherited Material
public static final Material GRANITE = new Material(
"Ancient Granite",
MaterialState.SOLID,
TextureSet.SET_SAND,
- new short[] {107, 107, 107},
+ new short[] { 107, 107, 107 },
500,
2000,
16,
@@ -904,22 +797,21 @@ public final class ELEMENT {
"«»",
0,
false,
- new MaterialStack[] {
- new MaterialStack(getInstance().OXYGEN, 16),
- new MaterialStack(getInstance().IRON, 10),
- new MaterialStack(getInstance().SILICONDIOXIDE, 10),
- new MaterialStack(getInstance().ALUMINIUMOXIDE, 6),
- new MaterialStack(getInstance().POTASSIUM, 6),
- new MaterialStack(getInstance().CALCIUM, 4),
- new MaterialStack(getInstance().SODIUM, 4),
- new MaterialStack(getInstance().YTTERBIUM, 2)
- }); // Not a GT Inherited Material
+ new MaterialStack[] { new MaterialStack(getInstance().OXYGEN, 16),
+ new MaterialStack(getInstance().IRON, 10), new MaterialStack(getInstance().SILICONDIOXIDE, 10),
+ new MaterialStack(getInstance().ALUMINIUMOXIDE, 6),
+ new MaterialStack(getInstance().POTASSIUM, 6), new MaterialStack(getInstance().CALCIUM, 4),
+ new MaterialStack(getInstance().SODIUM, 4), new MaterialStack(getInstance().YTTERBIUM, 2) }); // Not
+ // a
+ // GT
+ // Inherited
+ // Material
public static final Material RUNITE = new Material(
"Runite",
MaterialState.SOLID,
TextureSet.SET_FINE,
- new short[] {60, 200, 190},
+ new short[] { 60, 200, 190 },
6750,
11550,
73,
@@ -931,7 +823,7 @@ public final class ELEMENT {
"Dragonblood",
MaterialState.SOLID,
TextureSet.SET_SHINY,
- new short[] {220, 40, 20, 2},
+ new short[] { 220, 40, 20, 2 },
10160,
17850,
96,
diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 677aa21150..c829f49bfc 100644
--- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -10,8 +10,8 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
public final class MISC_MATERIALS {
/*
- * Some of these materials purely exist as data objects, items will most likely be assigned seperately.
- * Most are just compositions which will have dusts assigned to them.
+ * Some of these materials purely exist as data objects, items will most likely be assigned seperately. Most are
+ * just compositions which will have dusts assigned to them.
*/
public static void run() {
@@ -76,7 +76,7 @@ public final class MISC_MATERIALS {
public static final Material SOLAR_SALT_HOT = new Material(
"Solar Salt (Hot)",
MaterialState.PURE_LIQUID, // State
- new short[] {200, 25, 25}, // Material Colour
+ new short[] { 200, 25, 25 }, // Material Colour
1200, // Melting Point in C
3300, // Boiling Point in C
-1, // Protons
@@ -173,7 +173,7 @@ public final class MISC_MATERIALS {
"Wood's Glass", // Material Name
MaterialState.SOLID, // State
TextureSets.GEM_A.get(), // Texture Set
- new short[] {220, 60, 255}, // Material Colour
+ new short[] { 220, 60, 255 }, // Material Colour
-1,
-1,
-1,
@@ -201,17 +201,12 @@ public final class MISC_MATERIALS {
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ORES.GREENOCKITE, 1),
- new MaterialStack(ORES.LANTHANITE_CE, 1),
- new MaterialStack(ORES.AGARDITE_CD, 1),
- new MaterialStack(ORES.YTTRIALITE, 1),
- new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1),
- new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
- new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
- new MaterialStack(ORES.CRYOLITE, 1),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(ORES.GREENOCKITE, 1), new MaterialStack(ORES.LANTHANITE_CE, 1),
+ new MaterialStack(ORES.AGARDITE_CD, 1), new MaterialStack(ORES.YTTRIALITE, 1),
+ new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1),
+ new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
+ new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
+ new MaterialStack(ORES.CRYOLITE, 1), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1) });
public static final Material RARE_EARTH_MID = new Material(
"Rare Earth (II)", // Material Name
@@ -223,17 +218,12 @@ public final class MISC_MATERIALS {
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ORES.LANTHANITE_ND, 1),
- new MaterialStack(ORES.AGARDITE_ND, 1),
- new MaterialStack(ORES.YTTRIAITE, 1),
- new MaterialStack(ORES.CROCROITE, 1),
- new MaterialStack(ORES.NICHROMITE, 1),
- new MaterialStack(ORES.ZIRCON, 1),
- new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1),
- new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1),
- new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1)
- });
+ new MaterialStack[] { new MaterialStack(ORES.LANTHANITE_ND, 1), new MaterialStack(ORES.AGARDITE_ND, 1),
+ new MaterialStack(ORES.YTTRIAITE, 1), new MaterialStack(ORES.CROCROITE, 1),
+ new MaterialStack(ORES.NICHROMITE, 1), new MaterialStack(ORES.ZIRCON, 1),
+ new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1),
+ new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1),
+ new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1) });
public static final Material RARE_EARTH_HIGH = new Material(
"Rare Earth (III)", // Material Name
@@ -245,17 +235,11 @@ public final class MISC_MATERIALS {
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ORES.GADOLINITE_Y, 1),
- new MaterialStack(ORES.LEPERSONNITE, 1),
- new MaterialStack(ORES.FLORENCITE, 1),
- new MaterialStack(ORES.FLUORCAPHITE, 1),
- new MaterialStack(ORES.LAUTARITE, 1),
- new MaterialStack(ORES.DEMICHELEITE_BR, 1),
- new MaterialStack(ORES.ALBURNITE, 1),
- new MaterialStack(ORES.SAMARSKITE_Y, 1),
- new MaterialStack(ORES.AGARDITE_LA, 1),
- });
+ new MaterialStack[] { new MaterialStack(ORES.GADOLINITE_Y, 1), new MaterialStack(ORES.LEPERSONNITE, 1),
+ new MaterialStack(ORES.FLORENCITE, 1), new MaterialStack(ORES.FLUORCAPHITE, 1),
+ new MaterialStack(ORES.LAUTARITE, 1), new MaterialStack(ORES.DEMICHELEITE_BR, 1),
+ new MaterialStack(ORES.ALBURNITE, 1), new MaterialStack(ORES.SAMARSKITE_Y, 1),
+ new MaterialStack(ORES.AGARDITE_LA, 1), });
public static final Material WATER = new Material(
"Water",
@@ -369,7 +353,7 @@ public final class MISC_MATERIALS {
public static final Material ACETIC_ANHYDRIDE = new Material(
"Acetic Anhydride",
MaterialState.PURE_LIQUID, // State
- new short[] {250, 240, 110}, // Material Colour
+ new short[] { 250, 240, 110 }, // Material Colour
-73, // Melting Point in C
139, // Boiling Point in C
-1, // Protons
@@ -385,7 +369,7 @@ public final class MISC_MATERIALS {
public static final Material CHLOROACETIC_ACID = new Material(
"Chloroacetic Acid",
MaterialState.PURE_LIQUID, // State
- new short[] {230, 200, 90}, // Material Colour
+ new short[] { 230, 200, 90 }, // Material Colour
63, // Melting Point in C
189, // Boiling Point in C
-1, // Protons
@@ -402,7 +386,7 @@ public final class MISC_MATERIALS {
public static final Material DICHLOROACETIC_ACID = new Material(
"Dichloroacetic Acid",
MaterialState.PURE_LIQUID, // State
- new short[] {190, 160, 60}, // Material Colour
+ new short[] { 190, 160, 60 }, // Material Colour
13, // Melting Point in C
194, // Boiling Point in C
-1, // Protons
@@ -419,7 +403,7 @@ public final class MISC_MATERIALS {
public static final Material TRICHLOROACETIC_ACID = new Material(
"Trichloroacetic Acid",
MaterialState.PURE_LIQUID, // State
- new short[] {120, 100, 30}, // Material Colour
+ new short[] { 120, 100, 30 }, // Material Colour
57, // Melting Point in C
196, // Boiling Point in C
-1, // Protons
@@ -437,7 +421,7 @@ public final class MISC_MATERIALS {
"Chloroacetic Mixture",
MaterialState.LIQUID, // State
null,
- new short[] {210, 160, 10},
+ new short[] { 210, 160, 10 },
40,
192,
-1,
@@ -454,7 +438,7 @@ public final class MISC_MATERIALS {
public static final Material SODIUM_CYANIDE = new Material(
"Sodium Cyanide",
MaterialState.SOLID, // State
- new short[] {180, 190, 255}, // Material Colour
+ new short[] { 180, 190, 255 }, // Material Colour
563, // Melting Point in C
1496, // Boiling Point in C
-1, // Protons
@@ -470,7 +454,7 @@ public final class MISC_MATERIALS {
public static final Material CALCIUM_CHLORIDE = new Material(
"Calcium Chloride",
MaterialState.SOLID, // State
- new short[] {180, 190, 255}, // Material Colour
+ new short[] { 180, 190, 255 }, // Material Colour
563, // Melting Point in C
1496, // Boiling Point in C
-1, // Protons
@@ -485,7 +469,7 @@ public final class MISC_MATERIALS {
public static final Material CYANOACETIC_ACID = new Material(
"Cyanoacetic Acid",
MaterialState.SOLID, // State
- new short[] {130, 130, 40}, // Material Colour
+ new short[] { 130, 130, 40 }, // Material Colour
66, // Melting Point in C
108, // Boiling Point in C
-1, // Protons
@@ -502,7 +486,7 @@ public final class MISC_MATERIALS {
public static final Material SOLID_ACID_MIXTURE = new Material(
"Solid Acid Catalyst Mixture",
MaterialState.LIQUID, // State
- new short[] {80, 40, 0}, // Material Colour
+ new short[] { 80, 40, 0 }, // Material Colour
-10, // Melting Point in C
337, // Boiling Point in C
-1, // Protons
@@ -518,7 +502,7 @@ public final class MISC_MATERIALS {
public static final Material COPPER_SULFATE = new Material(
"Copper(II) Sulfate",
MaterialState.SOLID, // State
- new short[] {200, 200, 200}, // Material Colour
+ new short[] { 200, 200, 200 }, // Material Colour
590, // Melting Point in C
650, // Boiling Point in C
-1, // Protons
@@ -534,7 +518,7 @@ public final class MISC_MATERIALS {
public static final Material COPPER_SULFATE_HYDRATED = new Material(
"Copper(II) Sulfate Pentahydrate",
MaterialState.SOLID, // State
- new short[] {90, 170, 255}, // Material Colour
+ new short[] { 90, 170, 255 }, // Material Colour
590, // Melting Point in C
650, // Boiling Point in C
-1, // Protons
@@ -550,7 +534,7 @@ public final class MISC_MATERIALS {
public static final Material ETHYL_CYANOACETATE = new Material(
"Ethyl Cyanoacetate",
MaterialState.PURE_LIQUID, // State
- new short[] {0, 75, 160}, // Material Colour
+ new short[] { 0, 75, 160 }, // Material Colour
-22, // Melting Point in C
210, // Boiling Point in C
-1, // Protons
@@ -567,7 +551,7 @@ public final class MISC_MATERIALS {
public static final Material CYANOACRYLATE_POLYMER = new Material(
"Cyanoacrylate Polymer",
MaterialState.LIQUID, // State
- new short[] {140, 150, 160}, // Material Colour
+ new short[] { 140, 150, 160 }, // Material Colour
-25, // Melting Point in C
55, // Boiling Point in C
-1, // Protons
@@ -584,7 +568,7 @@ public final class MISC_MATERIALS {
public static final Material ETHYL_CYANOACRYLATE = new Material(
"Ethyl Cyanoacrylate (Super Glue)",
MaterialState.PURE_LIQUID, // State
- new short[] {170, 190, 200}, // Material Colour
+ new short[] { 170, 190, 200 }, // Material Colour
-25, // Melting Point in C
55, // Boiling Point in C
-1, // Protons
@@ -601,7 +585,7 @@ public final class MISC_MATERIALS {
public static final Material MUTATED_LIVING_SOLDER = new Material(
"Mutated Living Solder",
MaterialState.PURE_LIQUID, // State
- new short[] {147, 109, 155}, // Material Colour
+ new short[] { 147, 109, 155 }, // Material Colour
-200, // Melting Point in C
500, // Boiling Point in C
-1, // Protons
diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index fa3194a67b..98ab4739d4 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -3,6 +3,19 @@ package gtPlusPlus.core.material;
import static gregtech.api.enums.GT_Values.M;
import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TextureSet;
@@ -23,25 +36,13 @@ import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public class Material {
public static final Set<Material> mMaterialMap = new HashSet<Material>();
public static HashMap<String, Material> mMaterialCache = new HashMap<String, Material>();
- public static final Map<String, Map<String, ItemStack>> mComponentMap =
- new HashMap<String, Map<String, ItemStack>>();
+ public static final Map<String, Map<String, ItemStack>> mComponentMap = new HashMap<String, Map<String, ItemStack>>();
public static HashMap<String, String> sChemicalFormula = new HashMap<String, String>();
@@ -98,19 +99,12 @@ public class Material {
this(materialName, defaultState, null, inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final short[] rgba,
+ public Material(final String materialName, final MaterialState defaultState, final short[] rgba,
final MaterialStack... inputs) {
this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", 0, false, false, inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final short[] rgba,
- int radiationLevel,
+ public Material(final String materialName, final MaterialState defaultState, final short[] rgba, int radiationLevel,
MaterialStack... materialStacks) {
this(
materialName,
@@ -129,29 +123,13 @@ public class Material {
materialStacks);
}
- public Material(
- String materialName,
- MaterialState defaultState,
- short[] rgba,
- int j,
- int k,
- int l,
- int m,
- int radiationLevel,
- MaterialStack[] materialStacks) {
+ public Material(String materialName, MaterialState defaultState, short[] rgba, int j, int k, int l, int m,
+ int radiationLevel, MaterialStack[] materialStacks) {
this(materialName, defaultState, null, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks);
}
- public Material(
- String materialName,
- MaterialState defaultState,
- final TextureSet set,
- short[] rgba,
- int meltingPoint,
- int boilingPoint,
- int protons,
- int neutrons,
- int radiationLevel,
+ public Material(String materialName, MaterialState defaultState, final TextureSet set, short[] rgba,
+ int meltingPoint, int boilingPoint, int protons, int neutrons, int radiationLevel,
MaterialStack[] materialStacks) {
this(
materialName,
@@ -170,16 +148,9 @@ public class Material {
materialStacks);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final MaterialStack... inputs) {
+ public Material(final String materialName, final MaterialState defaultState, final short[] rgba,
+ final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, final MaterialStack... inputs) {
this(
materialName,
defaultState,
@@ -195,17 +166,9 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final String chemSymbol,
- final MaterialStack... inputs) {
+ public Material(final String materialName, final MaterialState defaultState, final short[] rgba,
+ final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, final String chemSymbol, final MaterialStack... inputs) {
this(
materialName,
defaultState,
@@ -221,17 +184,9 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- boolean generateCells,
- final MaterialStack... inputs) {
+ public Material(final String materialName, final MaterialState defaultState, final short[] rgba,
+ final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, boolean generateCells, final MaterialStack... inputs) {
this(
materialName,
defaultState,
@@ -250,17 +205,9 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final int radiationLevel,
- final MaterialStack... inputs) {
+ public Material(final String materialName, final MaterialState defaultState, final short[] rgba,
+ final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, final int radiationLevel, final MaterialStack... inputs) {
this(
materialName,
defaultState,
@@ -276,18 +223,9 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final long durability,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final int radiationLevel,
- final MaterialStack... inputs) {
+ public Material(final String materialName, final MaterialState defaultState, final long durability,
+ final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, final int radiationLevel, final MaterialStack... inputs) {
this(
materialName,
defaultState,
@@ -303,17 +241,9 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final String chemicalSymbol,
- final int radiationLevel,
+ public Material(final String materialName, final MaterialState defaultState, final short[] rgba,
+ final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel,
final MaterialStack... inputs) {
this(
materialName,
@@ -330,18 +260,9 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final String chemicalSymbol,
- final int radiationLevel,
- boolean addCells,
+ public Material(final String materialName, final MaterialState defaultState, final short[] rgba,
+ final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean addCells,
final MaterialStack... inputs) {
this(
materialName,
@@ -361,18 +282,9 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- TextureSet textureSet,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final String chemicalSymbol,
- final int radiationLevel,
+ public Material(final String materialName, final MaterialState defaultState, TextureSet textureSet,
+ final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel,
final MaterialStack... inputs) {
this(
materialName,
@@ -392,19 +304,9 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- TextureSet textureSet,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final String chemicalSymbol,
- final int radiationLevel,
- boolean addCells,
+ public Material(final String materialName, final MaterialState defaultState, TextureSet textureSet,
+ final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean addCells,
final MaterialStack... inputs) {
this(
materialName,
@@ -424,18 +326,9 @@ public class Material {
inputs);
}
- private Material(
- final String materialName,
- final MaterialState defaultState,
- final long durability,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final String chemicalSymbol,
- final int radiationLevel,
+ private Material(final String materialName, final MaterialState defaultState, final long durability,
+ final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel,
final MaterialStack... inputs) {
this(
materialName,
@@ -455,21 +348,10 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final TextureSet set,
- final long durability,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final String chemicalSymbol,
- final int radiationLevel,
- boolean generateCells,
- final MaterialStack... inputs) {
+ public Material(final String materialName, final MaterialState defaultState, final TextureSet set,
+ final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint,
+ final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol,
+ final int radiationLevel, boolean generateCells, final MaterialStack... inputs) {
this(
materialName,
defaultState,
@@ -488,22 +370,10 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final TextureSet set,
- final long durability,
- short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- String chemicalSymbol,
- final int radiationLevel,
- boolean generateCells,
- boolean generateFluid,
- final MaterialStack... inputs) {
+ public Material(final String materialName, final MaterialState defaultState, final TextureSet set,
+ final long durability, short[] rgba, final int meltingPoint, final int boilingPoint, final long protons,
+ final long neutrons, final boolean blastFurnace, String chemicalSymbol, final int radiationLevel,
+ boolean generateCells, boolean generateFluid, final MaterialStack... inputs) {
if (mMaterialMap.add(this)) {}
@@ -516,11 +386,10 @@ public class Material {
try {
this.unlocalizedName = Utils.sanitizeString(materialName);
this.localizedName = materialName;
- this.translatedName =
- GT_LanguageManager.addStringLocalization("gtplusplus.material." + unlocalizedName, localizedName);
+ this.translatedName = GT_LanguageManager
+ .addStringLocalization("gtplusplus.material." + unlocalizedName, localizedName);
mMaterialCache.put(getLocalizedName().toLowerCase(), this);
- Logger.INFO("Stored " + getLocalizedName() + " to cache with key: "
- + getLocalizedName().toLowerCase());
+ Logger.INFO("Stored " + getLocalizedName() + " to cache with key: " + getLocalizedName().toLowerCase());
this.materialState = defaultState;
@@ -561,8 +430,7 @@ public class Material {
}
Short aAverage = MathUtils.getShortAverage(aDataSet);
- if (aAverage > Short.MAX_VALUE
- || aAverage < Short.MIN_VALUE
+ if (aAverage > Short.MAX_VALUE || aAverage < Short.MIN_VALUE
|| aAverage < 0
|| aAverage > 255) {
if (aAverage > 255) {
@@ -576,7 +444,7 @@ public class Material {
}
if (mMixedRGB != null && mMixedRGB[0] != null && mMixedRGB[1] != null && mMixedRGB[2] != null) {
- this.RGBA = new short[] {mMixedRGB[0], mMixedRGB[1], mMixedRGB[2], 0};
+ this.RGBA = new short[] { mMixedRGB[0], mMixedRGB[1], mMixedRGB[2], 0 };
} else {
this.RGBA = Materials.Steel.mRGBa;
}
@@ -679,11 +547,8 @@ public class Material {
aTempDura += safeCast_LongToInt(g.getStackMaterial().getMass() * 2000);
}
}
- this.vDurability = aTempDura > 0
- ? aTempDura
- : (this.getComposites().isEmpty()
- ? 51200
- : 32000 * this.getComposites().size());
+ this.vDurability = aTempDura > 0 ? aTempDura
+ : (this.getComposites().isEmpty() ? 51200 : 32000 * this.getComposites().size());
}
if ((this.vDurability >= 0) && (this.vDurability < 64000)) {
@@ -719,8 +584,10 @@ public class Material {
}
byte aAverage = MathUtils.getByteAverage(aDataSet);
if (aAverage > 0) {
- Logger.MATERIALS(this.getLocalizedName() + " is radioactive due to trace elements. Level: "
- + aAverage + ".");
+ Logger.MATERIALS(
+ this.getLocalizedName() + " is radioactive due to trace elements. Level: "
+ + aAverage
+ + ".");
this.isRadioactive = true;
this.vRadiationLevel = (byte) aAverage;
} else {
@@ -735,34 +602,16 @@ public class Material {
}
}
- /*if (vMaterialInput.size() > 0) {
- AutoMap<Integer> aDataSet = new AutoMap<Integer>();
-
- int bonus = 0;
- bonus += this.vMaterialInput.size();
- bonus += MathUtils.roundToClosestInt(meltingPointC/1000);
-
-
-
- aDataSet.put(bonus);
-
- for (MaterialStack m : this.vMaterialInput) {
- aDataSet.put(m.getStackMaterial().vTier);
- }
- int aAverage = MathUtils.getIntAverage(aDataSet);
- if (aAverage > Integer.MAX_VALUE || aAverage < Integer.MIN_VALUE) {
- aAverage = 0;
- }
- if (aAverage > 0) {
- this.vTier = Math.min(aAverage, 10);
- }
- else {
- this.vTier = MaterialUtils.getTierOfMaterial((int) MathUtils.celsiusToKelvin(meltingPoint));
- }
- }
- else {
- this.vTier = MaterialUtils.getTierOfMaterial((int) MathUtils.celsiusToKelvin(meltingPoint));
- }*/
+ /*
+ * if (vMaterialInput.size() > 0) { AutoMap<Integer> aDataSet = new AutoMap<Integer>(); int bonus = 0; bonus
+ * += this.vMaterialInput.size(); bonus += MathUtils.roundToClosestInt(meltingPointC/1000);
+ * aDataSet.put(bonus); for (MaterialStack m : this.vMaterialInput) {
+ * aDataSet.put(m.getStackMaterial().vTier); } int aAverage = MathUtils.getIntAverage(aDataSet); if
+ * (aAverage > Integer.MAX_VALUE || aAverage < Integer.MIN_VALUE) { aAverage = 0; } if (aAverage > 0) {
+ * this.vTier = Math.min(aAverage, 10); } else { this.vTier = MaterialUtils.getTierOfMaterial((int)
+ * MathUtils.celsiusToKelvin(meltingPoint)); } } else { this.vTier = MaterialUtils.getTierOfMaterial((int)
+ * MathUtils.celsiusToKelvin(meltingPoint)); }
+ */
this.vTier = MaterialUtils.getTierOfMaterial(meltingPoint);
// Sets the materials 'tier'. Will probably replace this logic.
@@ -847,8 +696,12 @@ public class Material {
sChemicalFormula.put(materialName.toLowerCase(), this.vChemicalFormula);
Logger.MATERIALS("Creating a Material instance for " + materialName);
- Logger.MATERIALS("Formula: " + this.vChemicalFormula + " Smallest Stack: "
- + this.smallestStackSizeWhenProcessing + " Smallest Ratio:" + ratio);
+ Logger.MATERIALS(
+ "Formula: " + this.vChemicalFormula
+ + " Smallest Stack: "
+ + this.smallestStackSizeWhenProcessing
+ + " Smallest Ratio:"
+ + ratio);
Logger.MATERIALS("Protons: " + this.vProtons);
Logger.MATERIALS("Neutrons: " + this.vNeutrons);
Logger.MATERIALS("Mass: " + this.vMass + "/units");
@@ -899,8 +752,11 @@ public class Material {
public TextureSet setTextureSet(TextureSet set, int aTier) {
if (set != null) {
- Logger.MATERIALS("Set textureset for " + this.localizedName + " to be " + set.mSetName
- + ". This textureSet was supplied.");
+ Logger.MATERIALS(
+ "Set textureset for " + this.localizedName
+ + " to be "
+ + set.mSetName
+ + ". This textureSet was supplied.");
return set;
}
@@ -952,12 +808,18 @@ public class Material {
if (aSet == null) {
if (aGem >= this.getComposites().size() / 2) {
if (MathUtils.isNumberEven(aGem)) {
- Logger.MATERIALS("Set textureset for " + this.localizedName + " to be "
- + TextureSet.SET_GEM_HORIZONTAL.mSetName + ".");
+ Logger.MATERIALS(
+ "Set textureset for " + this.localizedName
+ + " to be "
+ + TextureSet.SET_GEM_HORIZONTAL.mSetName
+ + ".");
return TextureSet.SET_GEM_HORIZONTAL;
} else {
- Logger.MATERIALS("Set textureset for " + this.localizedName + " to be "
- + TextureSet.SET_GEM_VERTICAL.mSetName + ".");
+ Logger.MATERIALS(
+ "Set textureset for " + this.localizedName
+ + " to be "
+ + TextureSet.SET_GEM_VERTICAL.mSetName
+ + ".");
return TextureSet.SET_GEM_VERTICAL;
}
}
@@ -981,16 +843,19 @@ public class Material {
sets.put(r.getStackMaterial());
}
}
- TextureSet mostUsedTypeTextureSet =
- MaterialUtils.getMostCommonTextureSet(new ArrayList<Material>(sets.values()));
+ TextureSet mostUsedTypeTextureSet = MaterialUtils
+ .getMostCommonTextureSet(new ArrayList<Material>(sets.values()));
if (mostUsedTypeTextureSet != null && mostUsedTypeTextureSet instanceof TextureSet) {
Logger.MATERIALS(
"Set textureset for " + this.localizedName + " to be " + mostUsedTypeTextureSet.mSetName + ".");
return mostUsedTypeTextureSet;
}
}
- Logger.MATERIALS("Set textureset for " + this.localizedName + " to be " + Materials.Iron.mIconSet.mSetName
- + ". [Fallback]");
+ Logger.MATERIALS(
+ "Set textureset for " + this.localizedName
+ + " to be "
+ + Materials.Iron.mIconSet.mSetName
+ + ". [Fallback]");
return Materials.Gold.mIconSet;
}
@@ -1023,7 +888,7 @@ public class Material {
if (this.RGBA != null) {
return this.RGBA;
}
- return new short[] {255, 0, 0};
+ return new short[] { 255, 0, 0 };
}
public final short[] getRGBA() {
@@ -1031,10 +896,10 @@ public class Material {
if (this.RGBA.length == 4) {
return this.RGBA;
} else {
- return new short[] {this.RGBA[0], this.RGBA[1], this.RGBA[2], 0};
+ return new short[] { this.RGBA[0], this.RGBA[1], this.RGBA[2], 0 };
}
}
- return new short[] {255, 0, 0, 0};
+ return new short[] { 255, 0, 0, 0 };
}
public final int getRgbAsHex() {
@@ -1104,8 +969,10 @@ public class Material {
if (aPrefix == OrePrefixes.cell) {
Erg = ItemUtils.getOrePrefixStack(OrePrefixes.cellMolten, Erf, stacksize);
if (Erg != null && ItemUtils.checkForInvalidItems(Erg)) {
- Logger.MATERIALS("Found \"" + OrePrefixes.cellMolten.name() + this.unlocalizedName
- + "\" using backup GT Materials option.");
+ Logger.MATERIALS(
+ "Found \"" + OrePrefixes.cellMolten.name()
+ + this.unlocalizedName
+ + "\" using backup GT Materials option.");
g.put(aKey, Erg);
mComponentMap.put(unlocalizedName, g);
return Erg;
@@ -1128,16 +995,16 @@ public class Material {
public final Block getBlock() {
Block b = Block.getBlockFromItem(getBlock(1).getItem());
if (b == null) {
- Logger.INFO("[ERROR] Tried to get invalid block for " + this.getLocalizedName()
- + ", returning debug block instead.");
+ Logger.INFO(
+ "[ERROR] Tried to get invalid block for " + this.getLocalizedName()
+ + ", returning debug block instead.");
}
return b != null ? b : Blocks.lit_furnace;
}
public final ItemStack getBlock(final int stacksize) {
ItemStack i = getComponentByPrefix(OrePrefixes.block, stacksize);
- return i != null
- ? i
+ return i != null ? i
: ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block" + this.unlocalizedName, stacksize);
}
@@ -1280,11 +1147,13 @@ public class Material {
/**
* Ore Components
+ *
* @return
*/
public final ItemStack getOre(final int stacksize) {
return ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
- "ore" + Utils.sanitizeString(this.getUnlocalizedName()), stacksize);
+ "ore" + Utils.sanitizeString(this.getUnlocalizedName()),
+ stacksize);
}
public final Block getOreBlock(final int stacksize) {
@@ -1298,9 +1167,10 @@ public class Material {
return a3;
}
- Block x = Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
- "ore" + Utils.sanitizeString(this.unlocalizedName), stacksize)
- .getItem());
+ Block x = Block.getBlockFromItem(
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
+ "ore" + Utils.sanitizeString(this.unlocalizedName),
+ stacksize).getItem());
if (x != null) {
return x;
}
@@ -1336,8 +1206,8 @@ public class Material {
}
public final boolean hasSolidForm() {
- if (ItemUtils.checkForInvalidItems(
- new ItemStack[] {getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1)})) {
+ if (ItemUtils
+ .checkForInvalidItems(new ItemStack[] { getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1) })) {
return true;
}
return false;
@@ -1479,8 +1349,10 @@ public class Material {
if (dummyFormulaArray[e] > 1) {
if (aChemFormula.length() > 3) {
- dummyFormula =
- dummyFormula + "(" + aChemFormula + ")" + dummyFormulaArray[e];
+ dummyFormula = dummyFormula + "("
+ + aChemFormula
+ + ")"
+ + dummyFormulaArray[e];
} else {
dummyFormula = dummyFormula + aChemFormula + dummyFormulaArray[e];
}
@@ -1535,17 +1407,17 @@ public class Material {
Fluid aGTBaseFluid = null;
// Clean up Internal Fluid Generation
- final Materials n1 =
- MaterialUtils.getMaterial(this.getLocalizedName(), Utils.sanitizeString(this.getLocalizedName()));
- final Materials n2 =
- MaterialUtils.getMaterial(this.getUnlocalizedName(), Utils.sanitizeString(this.getUnlocalizedName()));
+ final Materials n1 = MaterialUtils
+ .getMaterial(this.getLocalizedName(), Utils.sanitizeString(this.getLocalizedName()));
+ final Materials n2 = MaterialUtils
+ .getMaterial(this.getUnlocalizedName(), Utils.sanitizeString(this.getUnlocalizedName()));
FluidStack f1 = FluidUtils.getWildcardFluidStack(n1, 1);
FluidStack f2 = FluidUtils.getWildcardFluidStack(n2, 1);
- FluidStack f3 = FluidUtils.getWildcardFluidStack(
- Utils.sanitizeString(this.getUnlocalizedName(), new char[] {'-', '_'}), 1);
- FluidStack f4 = FluidUtils.getWildcardFluidStack(
- Utils.sanitizeString(this.getLocalizedName(), new char[] {'-', '_'}), 1);
+ FluidStack f3 = FluidUtils
+ .getWildcardFluidStack(Utils.sanitizeString(this.getUnlocalizedName(), new char[] { '-', '_' }), 1);
+ FluidStack f4 = FluidUtils
+ .getWildcardFluidStack(Utils.sanitizeString(this.getLocalizedName(), new char[] { '-', '_' }), 1);
if (f1 != null) {
aGTBaseFluid = f1.getFluid();
@@ -1560,14 +1432,16 @@ public class Material {
ItemStack aFullCell = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell" + this.getUnlocalizedName(), 1);
ItemStack aFullCell2 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell" + this.getLocalizedName(), 1);
ItemStack aFullCell3 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
- "cell" + Utils.sanitizeString(this.getUnlocalizedName(), new char[] {'-', '_'}), 1);
+ "cell" + Utils.sanitizeString(this.getUnlocalizedName(), new char[] { '-', '_' }),
+ 1);
ItemStack aFullCell4 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
- "cell" + Utils.sanitizeString(this.getLocalizedName(), new char[] {'-', '_'}), 1);
+ "cell" + Utils.sanitizeString(this.getLocalizedName(), new char[] { '-', '_' }),
+ 1);
Logger.MATERIALS("Generating our own fluid.");
// Generate a Cell if we need to, but first validate all four searches are invalid
- if (!ItemUtils.checkForInvalidItems(new ItemStack[] {aFullCell, aFullCell2, aFullCell3, aFullCell4})) {
+ if (!ItemUtils.checkForInvalidItems(new ItemStack[] { aFullCell, aFullCell2, aFullCell3, aFullCell4 })) {
if (this.vGenerateCells) {
Item g = new BaseItemCell(this);
aFullCell = ItemUtils.getSimpleStack(g);
@@ -1619,17 +1493,15 @@ public class Material {
this.vGenerateCells);
} else if (this.materialState == MaterialState.GAS || this.materialState == MaterialState.PURE_GAS) {
return FluidUtils.generateGas(
- unlocalizedName, this.getLocalizedName(), getMeltingPointK(), getRGBA(), vGenerateCells);
- /*return FluidUtils.addGTFluid(
- this.getUnlocalizedName(),
- this.getLocalizedName()+" Gas",
- this.RGBA,
- 2,
- this.getMeltingPointK(),
- aFullCell,
- ItemUtils.getEmptyCell(),
- 1000,
- this.vGenerateCells);*/
+ unlocalizedName,
+ this.getLocalizedName(),
+ getMeltingPointK(),
+ getRGBA(),
+ vGenerateCells);
+ /*
+ * return FluidUtils.addGTFluid( this.getUnlocalizedName(), this.getLocalizedName()+" Gas", this.RGBA, 2,
+ * this.getMeltingPointK(), aFullCell, ItemUtils.getEmptyCell(), 1000, this.vGenerateCells);
+ */
} else { // Plasma
return this.generatePlasma();
}
@@ -1779,13 +1651,13 @@ public class Material {
return registerComponentForMaterial(this, aPrefix, aStack);
}
- public static boolean registerComponentForMaterial(
- Material componentMaterial, ComponentTypes aPrefix, ItemStack aStack) {
+ public static boolean registerComponentForMaterial(Material componentMaterial, ComponentTypes aPrefix,
+ ItemStack aStack) {
return registerComponentForMaterial(componentMaterial, aPrefix.getGtOrePrefix(), aStack);
}
- public static boolean registerComponentForMaterial(
- Material componentMaterial, OrePrefixes aPrefix, ItemStack aStack) {
+ public static boolean registerComponentForMaterial(Material componentMaterial, OrePrefixes aPrefix,
+ ItemStack aStack) {
if (componentMaterial == null) {
return false;
}
@@ -1798,8 +1670,11 @@ public class Material {
ItemStack x = aMap.get(aKey);
if (x == null) {
aMap.put(aKey, aStack);
- Logger.MATERIALS("Registering a material component. Item: [" + componentMaterial.getUnlocalizedName()
- + "] Map: [" + aKey + "]");
+ Logger.MATERIALS(
+ "Registering a material component. Item: [" + componentMaterial.getUnlocalizedName()
+ + "] Map: ["
+ + aKey
+ + "]");
Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap);
return true;
} else {
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
index 27a9ea3750..3f1b695869 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -1,5 +1,12 @@
package gtPlusPlus.core.material;
+import java.util.Set;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
@@ -50,16 +57,10 @@ import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plasma;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting;
-import java.util.Set;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class MaterialGenerator {
- public static final AutoMap<Set<RunnableWithInfo<Material>>> mRecipeMapsToGenerate =
- new AutoMap<Set<RunnableWithInfo<Material>>>();
+ public static final AutoMap<Set<RunnableWithInfo<Material>>> mRecipeMapsToGenerate = new AutoMap<Set<RunnableWithInfo<Material>>>();
@SuppressWarnings("unused")
private static volatile Item temp;
@@ -67,30 +68,22 @@ public class MaterialGenerator {
@SuppressWarnings("unused")
private static volatile Block tempBlock;
- public static boolean addFluidCannerRecipe(
- ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut) {
+ public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn,
+ FluidStack rFluidOut) {
return addFluidCannerRecipe(aEmpty, aFullContainer, aFluidIn, rFluidOut, null, null);
}
+
/**
* Called Reflectively from CORE.RA.addFluidCannerRecipe
+ *
* @return
*/
- public static boolean addFluidCannerRecipe(
- ItemStack aEmpty,
- ItemStack aFullContainer,
- FluidStack aFluidIn,
- FluidStack rFluidOut,
- Integer aTime,
- Integer aEu) {
- /*GT_Recipe r = new Recipe_GT(
- true,
- new ItemStack[] {aEmpty},
- new ItemStack[] {aFullContainer},
- null,
- new int[] {},
- new FluidStack[] {rFluidIn},
- new FluidStack[] {rFluidOut},
- 0, 0, 0);*/
+ public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn,
+ FluidStack rFluidOut, Integer aTime, Integer aEu) {
+ /*
+ * GT_Recipe r = new Recipe_GT( true, new ItemStack[] {aEmpty}, new ItemStack[] {aFullContainer}, null, new
+ * int[] {}, new FluidStack[] {rFluidIn}, new FluidStack[] {rFluidOut}, 0, 0, 0);
+ */
// new RecipeGen_FluidCanning(r, false);
RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0);
if (g != null && g.valid()) {
@@ -107,8 +100,8 @@ public class MaterialGenerator {
generate(matInfo, generateEverything, true);
}
- public static boolean generate(
- final Material matInfo, final boolean generateEverything, final boolean generateBlastSmelterRecipes) {
+ public static boolean generate(final Material matInfo, final boolean generateEverything,
+ final boolean generateBlastSmelterRecipes) {
try {
final String unlocalizedName = matInfo.getUnlocalizedName();
final String materialName = matInfo.getLocalizedName();
@@ -259,19 +252,20 @@ public class MaterialGenerator {
generateNuclearMaterial(matInfo, false, true, false, false, true);
if (generateDehydratorRecipe && matInfo.getFluid() != null && matInfo.getDust(0) != null) {
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedCircuit(20)},
+ new ItemStack[] { CI.getNumberedCircuit(20) },
matInfo.getFluidStack(144),
null,
- new ItemStack[] {
- matInfo.getDust(1),
- },
- new int[] {10000},
+ new ItemStack[] { matInfo.getDust(1), },
+ new int[] { 10000 },
10 * (matInfo.vVoltageMultiplier / 5), // Time in ticks
matInfo.vVoltageMultiplier); // EU
} else {
Logger.INFO(
- "Nuclear Dehydrator: Did not generate recipe for " + matInfo.getLocalizedName() + " | Null Fluid? "
- + (matInfo.getFluid() == null) + " | Null Dust? " + (matInfo.getDust(0) == null));
+ "Nuclear Dehydrator: Did not generate recipe for " + matInfo.getLocalizedName()
+ + " | Null Fluid? "
+ + (matInfo.getFluid() == null)
+ + " | Null Dust? "
+ + (matInfo.getDust(0) == null));
}
}
@@ -279,12 +273,8 @@ public class MaterialGenerator {
generateNuclearMaterial(matInfo, true, true, true, generatePlates, true);
}
- public static void generateNuclearMaterial(
- final Material matInfo,
- final boolean generateBlock,
- final boolean generateDusts,
- final boolean generateIngot,
- final boolean generatePlates,
+ public static void generateNuclearMaterial(final Material matInfo, final boolean generateBlock,
+ final boolean generateDusts, final boolean generateIngot, final boolean generatePlates,
final boolean disableOptionalRecipes) {
try {
@@ -328,12 +318,8 @@ public class MaterialGenerator {
}
@SuppressWarnings("unused")
- public static void generateOreMaterial(
- final Material matInfo,
- boolean generateOre,
- boolean generateDust,
- boolean generateSmallTinyDusts,
- short[] customRGB) {
+ public static void generateOreMaterial(final Material matInfo, boolean generateOre, boolean generateDust,
+ boolean generateSmallTinyDusts, short[] customRGB) {
try {
if (matInfo == null) {
@@ -379,8 +365,9 @@ public class MaterialGenerator {
temp = new BaseItemImpureDust(matInfo);
temp = new BaseItemPurifiedDust(matInfo);
- Logger.MATERIALS("Generated all ore components for " + matInfo.getLocalizedName()
- + ", now generating processing recipes.");
+ Logger.MATERIALS(
+ "Generated all ore components for " + matInfo.getLocalizedName()
+ + ", now generating processing recipes.");
if (matInfo == FLUORIDES.FLUORITE) {
new RecipeGen_Fluorite(matInfo);
@@ -389,8 +376,9 @@ public class MaterialGenerator {
}
} catch (final Throwable t) {
- Logger.MATERIALS("[Error] " + (matInfo != null ? matInfo.getLocalizedName() : "Null Material")
- + " failed to generate.");
+ Logger.MATERIALS(
+ "[Error] " + (matInfo != null ? matInfo.getLocalizedName() : "Null Material")
+ + " failed to generate.");
t.printStackTrace();
}
}
@@ -418,8 +406,9 @@ public class MaterialGenerator {
temp = new BaseItemImpureDust(matInfo);
temp = new BaseItemPurifiedDust(matInfo);
- Logger.MATERIALS("Generated all ore & base components for " + matInfo.getLocalizedName()
- + ", now generating processing recipes.");
+ Logger.MATERIALS(
+ "Generated all ore & base components for " + matInfo.getLocalizedName()
+ + ", now generating processing recipes.");
new RecipeGen_Ore(matInfo, true);
new RecipeGen_AlloySmelter(matInfo);
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialStack.java b/src/main/java/gtPlusPlus/core/material/MaterialStack.java
index 0e05b9b3b3..f0d99ef554 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialStack.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialStack.java
@@ -1,13 +1,15 @@
package gtPlusPlus.core.material;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.OrePrefixes;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.bartworks.BW_Utils;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import net.minecraft.item.ItemStack;
public class MaterialStack {
@@ -55,8 +57,8 @@ public class MaterialStack {
public ItemStack getUnificatedDustStack(final int amount) {
if (this.stackMaterial.werkstoffID != 0) {
- ItemStack stack =
- BW_Utils.getCorrespondingItemStack(OrePrefixes.dust, this.stackMaterial.werkstoffID, amount);
+ ItemStack stack = BW_Utils
+ .getCorrespondingItemStack(OrePrefixes.dust, this.stackMaterial.werkstoffID, amount);
if (stack != null) {
return stack;
}
diff --git a/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java b/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java
index 180bb15888..4ef9303f79 100644
--- a/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java
+++ b/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java
@@ -28,12 +28,12 @@ public class NONMATERIAL {
public static final Material WROUGHT_IRON = MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron);
// PTFE
- public static final Material PTFE =
- MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterial("Polytetrafluoroethylene", "Plastic"));
+ public static final Material PTFE = MaterialUtils
+ .generateMaterialFromGtENUM(MaterialUtils.getMaterial("Polytetrafluoroethylene", "Plastic"));
// Plastic
- public static final Material PLASTIC =
- MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterial("Plastic", "Rubber"));
+ public static final Material PLASTIC = MaterialUtils
+ .generateMaterialFromGtENUM(MaterialUtils.getMaterial("Plastic", "Rubber"));
static {
MEAT.setTextureSet(TextureSet.SET_ROUGH);
diff --git a/src/main/java/gtPlusPlus/core/material/ORES.java b/src/main/java/gtPlusPlus/core/material/ORES.java
index be19b58a45..12300af51a 100644
--- a/src/main/java/gtPlusPlus/core/material/ORES.java
+++ b/src/main/java/gtPlusPlus/core/material/ORES.java
@@ -10,77 +10,73 @@ public final class ORES {
"Agardite (Cd)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {170, 188, 33, 0}, // Material Colour
+ new short[] { 170, 188, 33, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (CdCa)Cu7(AsO2)4(O2H)5·3H2O
- new MaterialStack(ELEMENT.getInstance().CADMIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().COPPER, 7),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 11)
- });
+ new MaterialStack(ELEMENT.getInstance().CADMIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 7),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 11) });
public static final Material AGARDITE_LA = new Material(
"Agardite (La)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {206, 232, 9, 0}, // Material Colour
+ new short[] { 206, 232, 9, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (LaCa)Cu5(AsO6)2(OH)4·3H2O
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().COPPER, 5),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
- });
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 5),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10) });
public static final Material AGARDITE_ND = new Material(
"Agardite (Nd)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {225, 244, 78, 0}, // Material Colour
+ new short[] { 225, 244, 78, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (NdCa)Cu6(As3O3)2(O2H)6·3H2O
- new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().COPPER, 6),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12)
- });
+ new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 6),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) });
public static final Material AGARDITE_Y = new Material(
"Agardite (Y)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {210, 232, 44, 0}, // Material Colour
+ new short[] { 210, 232, 44, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (YCa)Cu5(As2O4)3(OH)6·3H2O
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().COPPER, 5),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12)
- });
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 5),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) });
// Alburnite
// Ag8GeTe2S4
@@ -88,39 +84,37 @@ public final class ORES {
"Alburnite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {16, 5, 105, 0}, // Material Colour
+ new short[] { 16, 5, 105, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().GOLD, 8),
- new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1),
- new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 4)
- });
+ new MaterialStack(ELEMENT.getInstance().GOLD, 8),
+ new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 4) });
public static final Material CERITE = new Material(
"Cerite", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {68, 13, 0, 0}, // Material Colour
+ new short[] { 68, 13, 0, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3
- new MaterialStack(ELEMENT.getInstance().CERIUM, 9),
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 9),
- new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 3),
- new MaterialStack(ELEMENT.getInstance().IRON, 3),
- new MaterialStack(ELEMENT.getInstance().SILICON, 7),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 20),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4)
- });
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 9),
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 9),
+ new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().IRON, 3),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 7),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 20),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4) });
// Comancheite
// Hg55N24(NH2,OH)4(Cl,Br)34
@@ -128,204 +122,189 @@ public final class ORES {
"Comancheite", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {65, 205, 105, 0}, // Material Colour
+ new short[] { 65, 205, 105, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().MERCURY, 54 / 4),
- new MaterialStack(ELEMENT.getInstance().NITROGEN, 28 / 4),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12 / 4),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 8 / 4),
- new MaterialStack(ELEMENT.getInstance().CHLORINE, 34 / 4),
- new MaterialStack(ELEMENT.getInstance().BROMINE, 34 / 4)
- });
+ new MaterialStack(ELEMENT.getInstance().MERCURY, 54 / 4),
+ new MaterialStack(ELEMENT.getInstance().NITROGEN, 28 / 4),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12 / 4),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 8 / 4),
+ new MaterialStack(ELEMENT.getInstance().CHLORINE, 34 / 4),
+ new MaterialStack(ELEMENT.getInstance().BROMINE, 34 / 4) });
public static final Material CROCROITE = new Material(
"Crocoite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_GEM_VERTICAL, // Texture Set
- new short[] {255, 143, 84, 0}, // Material Colour
+ new short[] { 255, 143, 84, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().LEAD, 2),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
- new MaterialStack(ELEMENT.getInstance().CAESIUM, 1),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LEAD, 2),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+ new MaterialStack(ELEMENT.getInstance().CAESIUM, 1), });
public static final Material CRYOLITE = new Material(
"Cryolite (F)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_SHINY, // Texture Set
- new short[] {205, 205, 255, 0}, // Material Colour
+ new short[] { 205, 205, 255, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
- });
+ new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
// Demicheleite-(Br)
- // BiSBr
+ // BiSBr
public static final Material DEMICHELEITE_BR = new Material(
"Demicheleite (Br)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_SHINY, // Texture Set
- new short[] {165, 75, 75, 0}, // Material Colour
+ new short[] { 165, 75, 75, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().BISMUTH, 13),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 11),
- new MaterialStack(ELEMENT.getInstance().BROMINE, 1)
- });
+ new MaterialStack(ELEMENT.getInstance().BISMUTH, 13),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 11),
+ new MaterialStack(ELEMENT.getInstance().BROMINE, 1) });
public static final Material FLORENCITE = new Material(
"Florencite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {249, 249, 124, 0}, // Material Colour
+ new short[] { 249, 249, 124, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // SmAl3(PO4)2(OH)6
- new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 10),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6)
- });
+ new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 10),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6) });
public static final Material FLUORCAPHITE = new Material(
"Fluorcaphite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {255, 255, 30, 0}, // Material Colour
+ new short[] { 255, 255, 30, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (Ca,Sr,Ce,Na)5(PO4)3F
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 5),
- new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 5),
- new MaterialStack(ELEMENT.getInstance().SODIUM, 5),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 12),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 6),
- });
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 5),
+ new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().SODIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 12),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 6), });
// Gadolinite_Ce
public static final Material GADOLINITE_CE = new Material(
"Gadolinite (Ce)", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {15, 159, 59, 0}, // Material Colour
+ new short[] { 15, 159, 59, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CERIUM, 4),
- new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
- new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
- new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 1),
- new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SILICON, 7),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 14),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 7),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 14), });
// Gadolinite_Y
public static final Material GADOLINITE_Y = new Material(
"Gadolinite (Y)", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {35, 189, 99, 0}, // Material Colour
+ new short[] { 35, 189, 99, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
- new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
- new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4),
- new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
- new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 3),
- new MaterialStack(ELEMENT.getInstance().SILICON, 4),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 9),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 4),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 9), });
public static final Material GEIKIELITE = new Material(
"Geikielite", // Material Name
MaterialState.ORE, // State
TextureSets.GEM_A.get(), // Texture Set
- new short[] {187, 193, 204, 0}, // Material Colour
+ new short[] { 187, 193, 204, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) });
public static final Material GREENOCKITE = new Material(
"Greenockite", // Material Name
MaterialState.ORE, // State
TextureSets.GEM_A.get(), // Texture Set
- new short[] {110, 193, 25, 0}, // Material Colour
+ new short[] { 110, 193, 25, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CADMIUM, 1), new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CADMIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 1), });
public static final Material HIBONITE = new Material(
"Hibonite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {58, 31, 0, 0}, // Material Colour
+ new short[] { 58, 31, 0, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // ((Ca,Ce)(Al,Ti,Mg)12O19)
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
- new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 12),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
- });
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 19), });
// Honeaite
// Au3TlTe2
@@ -333,17 +312,16 @@ public final class ORES {
"Honeaite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {165, 165, 5, 0}, // Material Colour
+ new short[] { 165, 165, 5, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().GOLD, 3),
- new MaterialStack(ELEMENT.getInstance().THALLIUM, 1),
- new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2)
- });
+ new MaterialStack(ELEMENT.getInstance().GOLD, 3),
+ new MaterialStack(ELEMENT.getInstance().THALLIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2) });
// Irarsite
// (Ir,Ru,Rh,Pt)AsS
@@ -351,21 +329,20 @@ public final class ORES {
"Irarsite", // Material Name
MaterialState.ORE, // State
TextureSets.ENRICHED.get(), // Texture Set
- new short[] {125, 105, 105, 0}, // Material Colour
+ new short[] { 125, 105, 105, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1),
- new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1),
- new MaterialStack(ELEMENT.getInstance().RHODIUM, 1),
- new MaterialStack(ELEMENT.getInstance().PLATINUM, 1),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 1),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
- });
+ new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().RHODIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().PLATINUM, 1),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 1),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 1) });
// Kashinite
// (Ir,Rh)2S3
@@ -373,125 +350,117 @@ public final class ORES {
"Kashinite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_SHINY, // Texture Set
- new short[] {75, 105, 75, 0}, // Material Colour
+ new short[] { 75, 105, 75, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2),
- new MaterialStack(ELEMENT.getInstance().RHODIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 3)
- });
+ new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().RHODIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 3) });
- // Tl(Cl,Br)
+ // Tl(Cl,Br)
public static final Material LAFOSSAITE = new Material(
"Lafossaite", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {165, 105, 205, 0}, // Material Colour
+ new short[] { 165, 105, 205, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
- new MaterialStack(ELEMENT.getInstance().BROMINE, 1),
- new MaterialStack(ELEMENT.getInstance().THALLIUM, 1)
- });
+ new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
+ new MaterialStack(ELEMENT.getInstance().BROMINE, 1),
+ new MaterialStack(ELEMENT.getInstance().THALLIUM, 1) });
public static final Material LANTHANITE_CE = new Material(
"Lanthanite (Ce)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {186, 113, 179, 0}, // Material Colour
+ new short[] { 186, 113, 179, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (Ce)2(CO3)3·8(H2O)
- new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
- });
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), });
public static final Material LANTHANITE_LA = new Material(
"Lanthanite (La)", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {219, 160, 214, 0}, // Material Colour
+ new short[] { 219, 160, 214, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (La)2(CO3)3·8(H2O)
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
- });
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), });
public static final Material LANTHANITE_ND = new Material(
"Lanthanite (Nd)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {153, 76, 145, 0}, // Material Colour
+ new short[] { 153, 76, 145, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (Nd)2(CO3)3·8(H2O)
- new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
- });
+ new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), });
// Iodine Source
public static final Material LAUTARITE = new Material(
"Lautarite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {165, 105, 205, 0}, // Material Colour
+ new short[] { 165, 105, 205, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().IODINE, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 6)
- });
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().IODINE, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) });
public static final Material LEPERSONNITE = new Material(
"Lepersonnite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_EMERALD, // Texture Set
- new short[] {175, 175, 20, 0}, // Material Colour
+ new short[] { 175, 175, 20, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 3),
- new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
- new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 29),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 29),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24) });
// Miessiite
// Pd11Te2Se2
@@ -499,36 +468,33 @@ public final class ORES {
"Miessiite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {75, 75, 75, 0}, // Material Colour
+ new short[] { 75, 75, 75, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11),
- new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SELENIUM, 2)
- });
+ new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11),
+ new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SELENIUM, 2) });
public static final Material NICHROMITE = new Material(
"Nichromite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {22, 19, 19, 0}, // Material Colour
+ new short[] { 22, 19, 19, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NICKEL, 1),
- new MaterialStack(ELEMENT.getInstance().COBALT, 1),
- new MaterialStack(ELEMENT.getInstance().IRON, 3),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 2),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 1),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 1),
+ new MaterialStack(ELEMENT.getInstance().IRON, 3),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) });
// Perroudite
// Hg5Ag4S5(I,Br)2Cl2
@@ -536,42 +502,38 @@ public final class ORES {
"Perroudite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {77, 165, 174, 0}, // Material Colour
+ new short[] { 77, 165, 174, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
- new MaterialStack(ELEMENT.getInstance().SILVER, 4),
- new MaterialStack(ELEMENT.getInstance().IODINE, 2),
- new MaterialStack(ELEMENT.getInstance().MERCURY, 5),
- new MaterialStack(ELEMENT.getInstance().BROMINE, 2),
- new MaterialStack(ELEMENT.getInstance().CHLORINE, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
+ new MaterialStack(ELEMENT.getInstance().SILVER, 4),
+ new MaterialStack(ELEMENT.getInstance().IODINE, 2),
+ new MaterialStack(ELEMENT.getInstance().MERCURY, 5),
+ new MaterialStack(ELEMENT.getInstance().BROMINE, 2),
+ new MaterialStack(ELEMENT.getInstance().CHLORINE, 2) });
public static final Material POLYCRASE = new Material(
"Polycrase", // Material Name
MaterialState.ORE, // State
TextureSet.SET_ROUGH, // Texture Set
- new short[] {51, 0, 11, 0}, // Material Colour
+ new short[] { 51, 0, 11, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 6)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) });
// Radiobarite
// Radium, Barium, Barite?
@@ -579,245 +541,220 @@ public final class ORES {
"Barite (Rd)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FLINT, // Texture Set
- new short[] {205, 205, 205, 0}, // Material Colour
+ new short[] { 205, 205, 205, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().BARIUM, 32),
- new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 16),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 15)
- });
+ new MaterialStack(ELEMENT.getInstance().BARIUM, 32),
+ new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 16),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 15) });
// Samarskite_Y
public static final Material SAMARSKITE_Y = new Material(
"Samarskite (Y)", // Material Name
MaterialState.ORE, // State
TextureSets.ENRICHED.get(), // Texture Set
- new short[] {65, 163, 164, 0}, // Material Colour
+ new short[] { 65, 163, 164, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), // Y not YT/YB
- new MaterialStack(ELEMENT.getInstance().IRON, 10),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 3),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 3)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), // Y not YT/YB
+ new MaterialStack(ELEMENT.getInstance().IRON, 10),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) });
// Samarskite_YB
public static final Material SAMARSKITE_YB = new Material(
"Samarskite (Yb)", // Material Name
MaterialState.ORE, // State
TextureSets.ENRICHED.get(), // Texture Set
- new short[] {95, 193, 194, 0}, // Material Colour
+ new short[] { 95, 193, 194, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), // Y not YT/YB
- new MaterialStack(ELEMENT.getInstance().IRON, 9),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 3),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 3),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), // Y not YT/YB
+ new MaterialStack(ELEMENT.getInstance().IRON, 9),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 3),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 2) });
public static final Material TITANITE = new Material(
"Titanite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {184, 198, 105, 0}, // Material Colour
+ new short[] { 184, 198, 105, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SILICON, 2),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 2),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 10) });
public static final Material XENOTIME = new Material(
"Xenotime", // Material Name
MaterialState.ORE, // State
TextureSet.SET_OPAL, // Texture Set
- new short[] {235, 89, 199, 0}, // Material Colour
+ new short[] { 235, 89, 199, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
- new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().EUROPIUM, 1),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().EUROPIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) });
public static final Material YTTRIAITE = new Material( // TODO
"Yttriaite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {255, 143, 84, 0}, // Material Colour
+ new short[] { 255, 143, 84, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), // Y not YT/YB
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
- new MaterialStack(ELEMENT.getInstance().IRON, 4),
- new MaterialStack(ELEMENT.getInstance().TIN, 1),
- new MaterialStack(ELEMENT.getInstance().NITROGEN, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), // Y not YT/YB
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+ new MaterialStack(ELEMENT.getInstance().IRON, 4), new MaterialStack(ELEMENT.getInstance().TIN, 1),
+ new MaterialStack(ELEMENT.getInstance().NITROGEN, 2) });
public static final Material YTTRIALITE = new Material(
"Yttrialite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_RUBY, // Texture Set
- new short[] {35, 189, 99, 0}, // Material Colour
+ new short[] { 35, 189, 99, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SILICON, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 7),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 7), });
public static final Material YTTROCERITE = new Material(
"Yttrocerite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_DIAMOND, // Texture Set
- new short[] {35, 19, 199, 0}, // Material Colour
+ new short[] { 35, 19, 199, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 5),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 5),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), });
public static final Material ZIMBABWEITE = new Material(
"Zimbabweite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {193, 187, 131, 0}, // Material Colour
+ new short[] { 193, 187, 131, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
- new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2),
- new MaterialStack(ELEMENT.getInstance().LEAD, 1),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 4),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 4),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 18)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().LEAD, 1),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 4),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 18) });
public static final Material ZIRCON = new Material(
"Zircon", // Material Name
MaterialState.ORE, // State
TextureSets.GEM_A.get(), // Texture Set
- new short[] {195, 19, 19, 0}, // Material Colour
+ new short[] { 195, 19, 19, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
- new MaterialStack(ELEMENT.getInstance().SILICON, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 4),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 4), });
public static final Material ZIRCONILITE = new Material(
"Zirconolite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {45, 26, 0, 0}, // Material Colour
+ new short[] { 45, 26, 0, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 14)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 14) });
public static final Material ZIRCOPHYLLITE = new Material(
"Zircophyllite", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {30, 0, 6, 0}, // Material Colour
+ new short[] { 30, 0, 6, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3),
- new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 7),
- new MaterialStack(ELEMENT.getInstance().IRON, 7),
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SILICON, 8),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 13),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 7),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 7),
+ new MaterialStack(ELEMENT.getInstance().IRON, 7),
+ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 8),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 13),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 7), });
public static final Material ZIRKELITE = new Material(
"Zirkelite", // Material Name
MaterialState.ORE, // State
TextureSets.GEM_A.get(), // Texture Set
- new short[] {229, 208, 48, 0}, // Material Colour
+ new short[] { 229, 208, 48, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (Ca,Th,Ce)Zr(Ti,Nb)2O7
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 7)
- });
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 7) });
public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material(
"Radioactive Mineral Mix", // Material Name
@@ -830,14 +767,11 @@ public final class ORES {
-1,
4, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().RADON, 2),
- new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
- new MaterialStack(ELEMENT.getInstance().URANIUM238, 10),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 25),
- new MaterialStack(ELEMENT.getInstance().THORIUM232, 4),
- new MaterialStack(FLUORCAPHITE, 6),
- new MaterialStack(SAMARSKITE_Y, 8),
- new MaterialStack(TITANITE, 4)
- });
+ new MaterialStack(ELEMENT.getInstance().RADON, 2),
+ new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
+ new MaterialStack(ELEMENT.getInstance().URANIUM238, 10),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 25),
+ new MaterialStack(ELEMENT.getInstance().THORIUM232, 4), new MaterialStack(FLUORCAPHITE, 6),
+ new MaterialStack(SAMARSKITE_Y, 8), new MaterialStack(TITANITE, 4) });
}
diff --git a/src/main/java/gtPlusPlus/core/material/Particle.java b/src/main/java/gtPlusPlus/core/material/Particle.java
index 7067052cb5..77ccb2ab43 100644
--- a/src/main/java/gtPlusPlus/core/material/Particle.java
+++ b/src/main/java/gtPlusPlus/core/material/Particle.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.material;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.chemistry.IonParticles;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
public class Particle {
@@ -80,14 +81,14 @@ public class Particle {
*/
// Baryons
- PROTON = new Particle(ElementaryGroup.BARYON, "Proton", new Particle[] {UP, UP, DOWN});
- NEUTRON = new Particle(ElementaryGroup.BARYON, "Neutron", new Particle[] {UP, DOWN, DOWN});
- LAMBDA = new Particle(ElementaryGroup.BARYON, "Lambda", new Particle[] {UP, DOWN, STRANGE});
- OMEGA = new Particle(ElementaryGroup.BARYON, "Omega", new Particle[] {STRANGE, STRANGE, STRANGE});
+ PROTON = new Particle(ElementaryGroup.BARYON, "Proton", new Particle[] { UP, UP, DOWN });
+ NEUTRON = new Particle(ElementaryGroup.BARYON, "Neutron", new Particle[] { UP, DOWN, DOWN });
+ LAMBDA = new Particle(ElementaryGroup.BARYON, "Lambda", new Particle[] { UP, DOWN, STRANGE });
+ OMEGA = new Particle(ElementaryGroup.BARYON, "Omega", new Particle[] { STRANGE, STRANGE, STRANGE });
// Mesons
- PION = new Particle(ElementaryGroup.MESON, "Pion", new Particle[] {MUON, MUON_NEUTRINO});
- ETA_MESON = new Particle(ElementaryGroup.MESON, "ETA Meson", new Particle[] {PION, PION, PION});
+ PION = new Particle(ElementaryGroup.MESON, "Pion", new Particle[] { MUON, MUON_NEUTRINO });
+ ETA_MESON = new Particle(ElementaryGroup.MESON, "ETA Meson", new Particle[] { PION, PION, PION });
// Wildcard
UNKNOWN = new Particle(ElementaryGroup.UNKNOWN, "Unknown");
@@ -113,15 +114,15 @@ public class Particle {
public Particle(ElementaryGroup aParticleType, String aParticleName, Particle[] aComposition) {
mParticleType = aParticleType;
mParticleName = aParticleName;
- mComposition = aComposition == null ? new Particle[] {this} : aComposition;
+ mComposition = aComposition == null ? new Particle[] { this } : aComposition;
aMap.put(this);
}
public static ItemStack getIon(String aElementName, int aCharge) {
for (String g : gtPlusPlus.core.item.chemistry.IonParticles.NameToMetaMap.keySet()) {
if (g.toLowerCase().equals(Utils.sanitizeString(aElementName.toLowerCase()))) {
- Integer meta = gtPlusPlus.core.item.chemistry.IonParticles.NameToMetaMap.get(
- Utils.sanitizeString(aElementName.toLowerCase()));
+ Integer meta = gtPlusPlus.core.item.chemistry.IonParticles.NameToMetaMap
+ .get(Utils.sanitizeString(aElementName.toLowerCase()));
if (meta == null) {
meta = 0;
}
diff --git a/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java
index dc70ccfe7a..0530436ca2 100644
--- a/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java
+++ b/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java
@@ -6,76 +6,34 @@ public class CustomGTMaterials {
// "Fireclay").addDustItems().setRGB(173, 160, 155).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Brick,
// 1)).constructMaterial();
- /**int aMetaItemSubID,
- * TextureSet aIconSet,
- * float aToolSpeed,
- * int aDurability,
- * int aToolQuality,
- * boolean aUnificatable,
- * String aName, String aDefaultLocalName,
- * String aConfigSection,
- * boolean aCustomOre,
- * String aCustomID) {
+ /**
+ * int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, boolean
+ * aUnificatable, String aName, String aDefaultLocalName, String aConfigSection, boolean aCustomOre, String
+ * aCustomID) {
*
**/
- /*public static List<Materials> Custom_GT_Materials = new ArrayList<Materials>();
-
- public static Materials Zirconium = materialBuilder_Element(1232, TextureSet.SET_METALLIC, 6.0F, 256, 2, 1|2|8|32|64|128, 200, 200, 200, 0, "Zirconium", "Zirconium", 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Zr, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3)));
- public static Materials Geikielite = materialBuilder(1234, TextureSet.SET_SHINY, new int[]{1,2,3}, "Geikielite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 3)));
- public static Materials Zirconolite = materialBuilder(1235, TextureSet.SET_METALLIC, new int[]{1,2,3}, "Zirconolite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Zirconium, 1), new MaterialStack(Titanium, 2), new MaterialStack(Oxygen, 7)));
-
- public static final void run(){
- Utils.LOG_INFO("[Custom] Trying to initialise custom materials.");
- }
-
- private final static boolean registerMaterial(Materials r){
- Custom_GT_Materials.add(r);
- Utils.LOG_INFO("[Custom] Registered new Gregtech material - "+r.mName);
- return true;
- }
-
- public final static Materials materialBuilder(int ID, TextureSet texture, int[] rgb, String materialName, Dyes dyeColour, List<MaterialStack> composition){
- Materials newMat = new Materials(
- ID,
- texture,
- 1.0F,
- 0,
- 2,
- 1 |8 ,
- rgb[0], rgb[1], rgb[2], 0,
- materialName, materialName,
- 0, 0, -1, 0, false, false, 3, 1, 1,
- dyeColour,
- 1,
- composition
- );
- registerMaterial(newMat);
- return newMat;
- }
-
- public final static Materials materialBuilder_Element(
- int ID, TextureSet texture,
- float a, int b, int c,
- int d, int r2, int g2, int b2, int a2,
- String materialName, String e,
- int f, int g, int h, int i,
- boolean j, boolean k,
- int l, int m, int n,
- Dyes dyeColour, Element o,
- List<TC_AspectStack> aspects){
- Materials newMat = new Materials(
- ID, texture,
- a, b, c,
- d, r2, g2, b2, a2,
- materialName, e,
- f, g, h, i, j, k, l, m, n,
- dyeColour, o,
- aspects
- );
- registerMaterial(newMat);
- return newMat;
- }
- */
+ /*
+ * public static List<Materials> Custom_GT_Materials = new ArrayList<Materials>(); public static Materials Zirconium
+ * = materialBuilder_Element(1232, TextureSet.SET_METALLIC, 6.0F, 256, 2, 1|2|8|32|64|128, 200, 200, 200, 0,
+ * "Zirconium", "Zirconium", 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Zr, Arrays.asList(new
+ * TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3))); public static Materials Geikielite = materialBuilder(1234,
+ * TextureSet.SET_SHINY, new int[]{1,2,3}, "Geikielite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Titanium,
+ * 1), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 3))); public static Materials Zirconolite =
+ * materialBuilder(1235, TextureSet.SET_METALLIC, new int[]{1,2,3}, "Zirconolite", Dyes.dyeBlack, Arrays.asList(new
+ * MaterialStack(Calcium, 1), new MaterialStack(Zirconium, 1), new MaterialStack(Titanium, 2), new
+ * MaterialStack(Oxygen, 7))); public static final void run(){
+ * Utils.LOG_INFO("[Custom] Trying to initialise custom materials."); } private final static boolean
+ * registerMaterial(Materials r){ Custom_GT_Materials.add(r);
+ * Utils.LOG_INFO("[Custom] Registered new Gregtech material - "+r.mName); return true; } public final static
+ * Materials materialBuilder(int ID, TextureSet texture, int[] rgb, String materialName, Dyes dyeColour,
+ * List<MaterialStack> composition){ Materials newMat = new Materials( ID, texture, 1.0F, 0, 2, 1 |8 , rgb[0],
+ * rgb[1], rgb[2], 0, materialName, materialName, 0, 0, -1, 0, false, false, 3, 1, 1, dyeColour, 1, composition );
+ * registerMaterial(newMat); return newMat; } public final static Materials materialBuilder_Element( int ID,
+ * TextureSet texture, float a, int b, int c, int d, int r2, int g2, int b2, int a2, String materialName, String e,
+ * int f, int g, int h, int i, boolean j, boolean k, int l, int m, int n, Dyes dyeColour, Element o,
+ * List<TC_AspectStack> aspects){ Materials newMat = new Materials( ID, texture, a, b, c, d, r2, g2, b2, a2,
+ * materialName, e, f, g, h, i, j, k, l, m, n, dyeColour, o, aspects ); registerMaterial(newMat); return newMat; }
+ */
}
diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index 55e2b95535..fab71be1bf 100644
--- a/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -20,12 +20,10 @@ public class FLUORIDES {
false, // Uses Blast furnace?
false, // Generate cells
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 16),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 32),
- new MaterialStack(ELEMENT.getInstance().IRON, 4),
- new MaterialStack(ELEMENT.getInstance().CARBON, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 16),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 32),
+ new MaterialStack(ELEMENT.getInstance().IRON, 4),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 2) });
// ThF4
public static final Material THORIUM_TETRAFLUORIDE = new Material(
@@ -38,10 +36,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
// ThF6
public static final Material THORIUM_HEXAFLUORIDE = new Material(
@@ -54,11 +50,9 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 12)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 12) });
// UF4
public static final Material URANIUM_TETRAFLUORIDE = new Material(
@@ -71,10 +65,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().URANIUM233, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().URANIUM233, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
// UF6
public static final Material URANIUM_HEXAFLUORIDE = new Material(
@@ -87,10 +79,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
// ZrF4
@@ -109,25 +99,16 @@ public class FLUORIDES {
-1,
true,
false,
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
- /* public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material(
- "Zirconium Tetrafluoride", //Material Name
- MaterialState.LIQUID, //State
- null, //Material Colour
- -1, //Melting Point in C
- -1, //Boiling Point in C
- -1, //Protons
- -1, //Neutrons
- false, //Uses Blast furnace?
- //Material Stacks with Percentage of required elements.
- new MaterialStack[]{
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
- });*/
+ /*
+ * public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material( "Zirconium Tetrafluoride", //Material Name
+ * MaterialState.LIQUID, //State null, //Material Colour -1, //Melting Point in C -1, //Boiling Point in C -1,
+ * //Protons -1, //Neutrons false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new
+ * MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), new
+ * MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
+ */
// BeF2
public static final Material BERYLLIUM_FLUORIDE = new Material(
@@ -140,10 +121,8 @@ public class FLUORIDES {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
// LiF
public static final Material LITHIUM_FLUORIDE = new Material(
@@ -156,10 +135,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().LITHIUM7, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM7, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 1) });
// LFTR sub components
@@ -174,11 +151,9 @@ public class FLUORIDES {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(MISC_MATERIALS.AMMONIUM, 1),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
- });
+ new MaterialStack[] { new MaterialStack(MISC_MATERIALS.AMMONIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
// Be(OH)2
public static final Material BERYLLIUM_HYDROXIDE = new Material(
@@ -191,9 +166,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1), new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
+ new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2) });
// (NH4)2Be(OH)2 / (NH4)2BeF4
public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material(
@@ -206,9 +180,8 @@ public class FLUORIDES {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(MISC_MATERIALS.AMMONIUM, 2), new MaterialStack(FLUORIDES.BERYLLIUM_HYDROXIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(MISC_MATERIALS.AMMONIUM, 2),
+ new MaterialStack(FLUORIDES.BERYLLIUM_HYDROXIDE, 1) });
// LFTR Output
public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material(
@@ -221,10 +194,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NEPTUNIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NEPTUNIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
public static final Material TECHNETIUM_HEXAFLUORIDE = new Material(
"Technetium Hexafluoride", // Material Name
@@ -236,10 +207,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TECHNETIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TECHNETIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
public static final Material SELENIUM_HEXAFLUORIDE = new Material(
"Selenium Hexafluoride", // Material Name
@@ -251,10 +220,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
public static final Material SODIUM_FLUORIDE = new Material(
"Sodium Fluoride", // Material Name
@@ -266,9 +233,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().SODIUM, 1), new MaterialStack(ELEMENT.getInstance().FLUORINE, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 1) });
private static final FLUORIDES INSTANCE = new FLUORIDES();
diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index 549d3b4a88..e22d56f9f5 100644
--- a/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -21,10 +21,9 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "Li2BeF4"), // Chemical Formula
4, // Radioactivity Level
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 2), new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1)
- });
+ // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 2),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1) });
public static final Material LiFBeF2ThF4UF4 = new Material(
"LFTR Fuel 3", // Material Name
@@ -38,13 +37,11 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4UF4"), // Chemical Formula
5, // Radioactivity Level
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28),
- new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1)
- });
+ // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28),
+ new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) });
public static final Material LiFBeF2ZrF4UF4 = new Material(
"LFTR Fuel 2", // Material Name
@@ -58,13 +55,11 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ZrF4UF4"), // Chemical Formula
5, // Radioactivity Level
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28),
- new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 5),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 2)
- });
+ // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28),
+ new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 5),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 2) });
public static final Material LiFBeF2ZrF4U235 = new Material(
"LFTR Fuel 1", // Material Name
@@ -76,16 +71,14 @@ public final class NUCLIDE {
-1, // Protons
-1, // Neutrons
false, // Uses Blast furnace?
- StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ZrF4")
- + StringUtils.superscript("235U"), // Chemical Formula
+ StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ZrF4") + StringUtils.superscript("235U"), // Chemical
+ // Formula
5, // Radioactivity Level
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 55),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 25),
- new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 6),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 14)
- });
+ // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 55),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 25),
+ new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 6),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 14) });
// Misc
public static final Material BurntLftrFuel_MK1 = new Material(
@@ -99,12 +92,10 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
public static final Material BurntLftrFuel_MK2 = new Material(
"Burnt Reactor Fuel II", // Material Name
@@ -117,12 +108,10 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
// LFTR Core Fluids
public static final Material LiFBeF2UF4FP = new Material(
@@ -136,12 +125,10 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
public static final Material Sparged_LiFBeF2UF4FP = new Material(
"Helium Sparged U Salt", // Material Name
@@ -154,12 +141,10 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
public static final Material UF6F2FP = new Material(
"Phosphorous Uranium Hexafluoride (P-UF6)", // Material Name
@@ -172,11 +157,9 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript("UF6F2FP"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 3),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 3),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1) });
public static final Material LiFBeF2 = new Material(
"Stable Molten Salt Base", // Material Name
@@ -189,9 +172,8 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1) });
public static final Material LiFBeF2UF4 = new Material(
"LFTR Fuel Base", // Material Name
@@ -204,7 +186,8 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {new MaterialStack(LiFBeF2, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1)});
+ new MaterialStack[] { new MaterialStack(LiFBeF2, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) });
// LFTR Blanket Fluids
@@ -220,9 +203,8 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
// Tier 2 Fuel blanket output
public static final Material LiFBeF2ThF4 = new Material(
@@ -236,11 +218,9 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
// Tier 1 Fuel blanket output
public static final Material Sparged_LiFThF4 = new Material(
@@ -254,9 +234,8 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
// Tier 2 Fuel blanket output
public static final Material Sparged_LiFBeF2ThF4 = new Material(
@@ -270,11 +249,9 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
public static final Material UF6F2 = new Material(
"Fluorinated Uranium Hexafluoride (F-UF6)", // Material Name
@@ -287,10 +264,8 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript("UF6F2"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
// Secondary material is molten metal
public static final Material NAQ_FUEL_T1 = new Material(
@@ -303,10 +278,8 @@ public final class NUCLIDE {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NAQUADAH, 2),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 3)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADAH, 2),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) });
// Secondary material is a plasma
public static final Material NAQ_FUEL_T2 = new Material(
@@ -319,10 +292,8 @@ public final class NUCLIDE {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 3)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 3) });
// Secondary material is a plasma
public static final Material NAQ_FUEL_T3 = new Material(
@@ -335,10 +306,8 @@ public final class NUCLIDE {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 2),
- new MaterialStack(ELEMENT.getInstance().AMERICIUM, 3)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 2),
+ new MaterialStack(ELEMENT.getInstance().AMERICIUM, 3) });
private static final NUCLIDE INSTANCE = new NUCLIDE();
diff --git a/src/main/java/gtPlusPlus/core/material/state/MaterialState.java b/src/main/java/gtPlusPlus/core/material/state/MaterialState.java
index 5b48907656..34abbd0844 100644
--- a/src/main/java/gtPlusPlus/core/material/state/MaterialState.java
+++ b/src/main/java/gtPlusPlus/core/material/state/MaterialState.java
@@ -1,6 +1,7 @@
package gtPlusPlus.core.material.state;
public enum MaterialState {
+
SOLID(0),
LIQUID(1),
GAS(2),
@@ -8,6 +9,7 @@ public enum MaterialState {
PURE_LIQUID(4),
ORE(5),
PURE_GAS(6);
+
private int STATE;
private MaterialState(final int State) {
diff --git a/src/main/java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java b/src/main/java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java
index 548809261f..1d2f0cef24 100644
--- a/src/main/java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java
+++ b/src/main/java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.network.handler;
+import net.minecraft.entity.player.EntityPlayer;
+
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import net.minecraft.entity.player.EntityPlayer;
public abstract class AbstractClientMessageHandler<T extends IMessage> extends AbstractMessageHandler<T> {
diff --git a/src/main/java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java b/src/main/java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java
index 3c60855c97..a50bee6092 100644
--- a/src/main/java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java
+++ b/src/main/java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java
@@ -1,16 +1,19 @@
package gtPlusPlus.core.network.handler;
+import net.minecraft.entity.player.EntityPlayer;
+
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.GTplusplus;
-import net.minecraft.entity.player.EntityPlayer;
public abstract class AbstractMessageHandler<T extends IMessage> implements IMessageHandler<T, IMessage> {
+
/**
* Handle a message received on the client side
+ *
* @return a message to send back to the Server, or null if no reply is necessary
*/
@SideOnly(Side.CLIENT)
@@ -18,6 +21,7 @@ public abstract class AbstractMessageHandler<T extends IMessage> implements IMes
/**
* Handle a message received on the server side
+ *
* @return a message to send back to the Client, or null if no reply is necessary
*/
public abstract IMessage handleServerMessage(EntityPlayer player, T message, MessageContext ctx);
diff --git a/src/main/java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java b/src/main/java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java
index 1529c636ec..dd61ca081f 100644
--- a/src/main/java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java
+++ b/src/main/java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.network.handler;
+import net.minecraft.entity.player.EntityPlayer;
+
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import net.minecraft.entity.player.EntityPlayer;
public abstract class AbstractServerMessageHandler<T extends IMessage> extends AbstractMessageHandler<T> {
diff --git a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java b/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java
index 87c9018a94..668d7952d1 100644
--- a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java
+++ b/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java
@@ -1,5 +1,9 @@
package gtPlusPlus.core.network.packet;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
@@ -8,9 +12,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.network.handler.AbstractServerMessageHandler;
import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
import io.netty.buffer.ByteBuf;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
public class Packet_VolumetricFlaskGui extends AbstractServerMessageHandler<Packet_VolumetricFlaskGui>
implements AbstractPacket {
diff --git a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java b/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java
index 350b72bbca..f66eeb64a6 100644
--- a/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java
+++ b/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java
@@ -1,5 +1,9 @@
package gtPlusPlus.core.network.packet;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
@@ -8,9 +12,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.network.handler.AbstractClientMessageHandler;
import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter;
import io.netty.buffer.ByteBuf;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
public class Packet_VolumetricFlaskGui2 extends AbstractClientMessageHandler<Packet_VolumetricFlaskGui2>
implements AbstractPacket {
diff --git a/src/main/java/gtPlusPlus/core/players/FakeFarmer.java b/src/main/java/gtPlusPlus/core/players/FakeFarmer.java
index ad47cce495..9a0d33f7cd 100644
--- a/src/main/java/gtPlusPlus/core/players/FakeFarmer.java
+++ b/src/main/java/gtPlusPlus/core/players/FakeFarmer.java
@@ -1,8 +1,7 @@
package gtPlusPlus.core.players;
-import com.mojang.authlib.GameProfile;
-import cpw.mods.fml.common.FMLCommonHandler;
import java.util.UUID;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
@@ -15,7 +14,11 @@ import net.minecraft.util.IChatComponent;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
+import com.mojang.authlib.GameProfile;
+import cpw.mods.fml.common.FMLCommonHandler;
+
public class FakeFarmer extends EntityPlayerMP {
+
private static final UUID uuid = UUID.fromString("c1ddfd7f-120a-4437-8b64-38660d3ec62d");
private static GameProfile FAKE_PROFILE = new GameProfile(uuid, "[GT_Farm_Manager]");
@@ -48,8 +51,8 @@ public class FakeFarmer extends EntityPlayerMP {
public void addStat(final StatBase par1StatBase, final int par2) {}
@Override
- public void openGui(
- final Object mod, final int modGuiId, final World world, final int x, final int y, final int z) {}
+ public void openGui(final Object mod, final int modGuiId, final World world, final int x, final int y,
+ final int z) {}
@Override
public boolean isEntityInvulnerable() {
@@ -74,8 +77,8 @@ public class FakeFarmer extends EntityPlayerMP {
public void func_147100_a(final C15PacketClientSettings pkt) {}
@Override
- public boolean canPlayerEdit(
- final int par1, final int par2, final int par3, final int par4, final ItemStack par5ItemStack) {
+ public boolean canPlayerEdit(final int par1, final int par2, final int par3, final int par4,
+ final ItemStack par5ItemStack) {
return true;
}
}
diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
index 2385d426b9..c98128dba6 100644
--- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -1,5 +1,20 @@
package gtPlusPlus.core.proxy;
+import java.util.ArrayList;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.client.renderer.entity.RenderFireball;
+import net.minecraft.client.renderer.entity.RenderSnowball;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.client.IItemRenderer;
+import net.minecraftforge.client.MinecraftForgeClient;
+import net.minecraftforge.fluids.*;
+
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -31,19 +46,6 @@ import gtPlusPlus.core.util.minecraft.particles.EntityParticleFXMysterious;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
import gtPlusPlus.xmod.gregtech.common.render.*;
import ic2.core.item.ItemFluidCell;
-import java.util.ArrayList;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.particle.EntityFX;
-import net.minecraft.client.renderer.entity.RenderFireball;
-import net.minecraft.client.renderer.entity.RenderSnowball;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.client.IItemRenderer;
-import net.minecraftforge.client.MinecraftForgeClient;
-import net.minecraftforge.fluids.*;
public class ClientProxy extends CommonProxy implements Runnable {
@@ -115,22 +117,25 @@ public class ClientProxy extends CommonProxy implements Runnable {
/**
* Entities
*/
- RenderingRegistry.registerEntityRenderingHandler(
- EntityPrimedMiningExplosive.class, new RenderMiningExplosivesPrimed());
+ RenderingRegistry
+ .registerEntityRenderingHandler(EntityPrimedMiningExplosive.class, new RenderMiningExplosivesPrimed());
RenderingRegistry.registerEntityRenderingHandler(EntitySickBlaze.class, new RenderSickBlaze());
- RenderingRegistry.registerEntityRenderingHandler(
- EntityStaballoyConstruct.class, new RenderStaballoyConstruct());
+ RenderingRegistry
+ .registerEntityRenderingHandler(EntityStaballoyConstruct.class, new RenderStaballoyConstruct());
RenderingRegistry.registerEntityRenderingHandler(EntityToxinballSmall.class, new RenderToxinball(1F));
RenderingRegistry.registerEntityRenderingHandler(
- EntitySulfuricAcidPotion.class, new RenderSnowball(ModItems.itemSulfuricPotion));
+ EntitySulfuricAcidPotion.class,
+ new RenderSnowball(ModItems.itemSulfuricPotion));
RenderingRegistry.registerEntityRenderingHandler(
- EntityHydrofluoricAcidPotion.class, new RenderSnowball(ModItems.itemHydrofluoricPotion));
+ EntityHydrofluoricAcidPotion.class,
+ new RenderSnowball(ModItems.itemHydrofluoricPotion));
RenderingRegistry.registerEntityRenderingHandler(EntityTeslaTowerLightning.class, new RenderPlasmaBolt());
RenderingRegistry.registerEntityRenderingHandler(
- EntityGiantChickenBase.class, new RenderGiantChicken(new ModelGiantChicken(), 1f));
+ EntityGiantChickenBase.class,
+ new RenderGiantChicken(new ModelGiantChicken(), 1f));
RenderingRegistry.registerEntityRenderingHandler(EntityBatKing.class, new RenderBatKing());
- RenderingRegistry.registerEntityRenderingHandler(
- EntityThrowableBomb.class, new RenderSnowball(ModItems.itemBomb, 1));
+ RenderingRegistry
+ .registerEntityRenderingHandler(EntityThrowableBomb.class, new RenderSnowball(ModItems.itemBomb, 1));
RenderingRegistry.registerEntityRenderingHandler(EntityLightningAttack.class, new RenderFireball(1F));
/**
@@ -187,36 +192,23 @@ public class ClientProxy extends CommonProxy implements Runnable {
}
public void onPreLoad() {
- /*if (ConfigSwitches.enableCustomCapes){
- String arr$[] = {
- "draknyte1", "fobius"
- };
- int len$ = arr$.length;
- for (int i$ = 0; i$ < len$; i$++) {
- String tName = arr$[i$];
- mCapeList.add(tName.toLowerCase());
- }
- (new Thread(this)).start();
- }*/
+ /*
+ * if (ConfigSwitches.enableCustomCapes){ String arr$[] = { "draknyte1", "fobius" }; int len$ = arr$.length; for
+ * (int i$ = 0; i$ < len$; i$++) { String tName = arr$[i$]; mCapeList.add(tName.toLowerCase()); } (new
+ * Thread(this)).start(); }
+ */
}
@Override
public void run() {
- /*try {
- if (ConfigSwitches.enableCustomCapes){
- Logger.INFO("GT++ Mod: Downloading Cape List.");
- @SuppressWarnings("resource")
- Scanner tScanner = new Scanner(new URL("https://github.com/draknyte1/GTplusplus/blob/master/SupporterList.txt").openStream());
- while (tScanner.hasNextLine()) {
- String tName = tScanner.nextLine();
- if (!this.mCapeList.contains(tName.toLowerCase())) {
- this.mCapeList.add(tName.toLowerCase());
- }
- }
- }
- } catch (Throwable e) {
- Logger.INFO("Failed to download GT++ cape list.");
- }*/
+ /*
+ * try { if (ConfigSwitches.enableCustomCapes){ Logger.INFO("GT++ Mod: Downloading Cape List.");
+ * @SuppressWarnings("resource") Scanner tScanner = new Scanner(new
+ * URL("https://github.com/draknyte1/GTplusplus/blob/master/SupporterList.txt").openStream()); while
+ * (tScanner.hasNextLine()) { String tName = tScanner.nextLine(); if
+ * (!this.mCapeList.contains(tName.toLowerCase())) { this.mCapeList.add(tName.toLowerCase()); } } } } catch
+ * (Throwable e) { Logger.INFO("Failed to download GT++ cape list."); }
+ */
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java b/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
index 9348584e34..0b2b452e43 100644
--- a/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
+++ b/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.recipe;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
public class Gregtech_Recipe_Adder {
@@ -16,35 +17,15 @@ public class Gregtech_Recipe_Adder {
private static ItemStack outputStack1;
private static ItemStack outputStack2;
- public static void addRecipe(
- final Item maceratorInput,
- final int maceratorInputAmount1,
- final Item maceratorOutput,
- final int maceratorOutputAmount1,
- final Item compressorInput,
- final int compressorInputAmount1,
- final Item compressorOutput,
- final int compressorOutputAmount1,
- final Item blastFurnaceInput,
- final int blastFurnaceInputAmount1,
- final Item blastFurnaceOutput,
- final int blastFurnaceOutputAmount1,
- final Item blastFurnaceInput2,
- final int blastFurnaceInputAmount2,
- final Item blastFurnaceOutput2,
- final int blastFurnaceOutputAmount2,
- final Item smeltingInput,
- final int smeltingInputAmount1,
- final Item smeltingOutput,
- final int smeltingOutputAmount1,
- final int euPerTick,
- final int timeInTicks,
- final boolean addMaceratorRecipe,
- final boolean addCompressorRecipe,
- final boolean addBlastFurnaceRecipe,
- final int blastFurnaceTemp,
- final boolean addSmeltingRecipe,
- final boolean addMixerRecipe) {
+ public static void addRecipe(final Item maceratorInput, final int maceratorInputAmount1, final Item maceratorOutput,
+ final int maceratorOutputAmount1, final Item compressorInput, final int compressorInputAmount1,
+ final Item compressorOutput, final int compressorOutputAmount1, final Item blastFurnaceInput,
+ final int blastFurnaceInputAmount1, final Item blastFurnaceOutput, final int blastFurnaceOutputAmount1,
+ final Item blastFurnaceInput2, final int blastFurnaceInputAmount2, final Item blastFurnaceOutput2,
+ final int blastFurnaceOutputAmount2, final Item smeltingInput, final int smeltingInputAmount1,
+ final Item smeltingOutput, final int smeltingOutputAmount1, final int euPerTick, final int timeInTicks,
+ final boolean addMaceratorRecipe, final boolean addCompressorRecipe, final boolean addBlastFurnaceRecipe,
+ final int blastFurnaceTemp, final boolean addSmeltingRecipe, final boolean addMixerRecipe) {
euT = euPerTick;
ticks = timeInTicks;
@@ -92,15 +73,11 @@ public class Gregtech_Recipe_Adder {
GT_ModHandler.addCompressionRecipe(input1, output1);
}
- private static void addBlastFurnaceRecipe(
- final ItemStack input1,
- final ItemStack input2,
- final ItemStack output1,
- final ItemStack output2,
- final int tempRequired) {
+ private static void addBlastFurnaceRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1,
+ final ItemStack output2, final int tempRequired) {
Logger.INFO("Registering Blast Furnace Recipes.");
- GT_Values.RA.addBlastRecipe(
- input1, input2, GT_Values.NF, GT_Values.NF, output1, output2, ticks, euT, tempRequired);
+ GT_Values.RA
+ .addBlastRecipe(input1, input2, GT_Values.NF, GT_Values.NF, output1, output2, ticks, euT, tempRequired);
}
private static void addSmeltingRecipe(final ItemStack input1, final ItemStack output1) {
diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
index 07622ee65b..ff104057b1 100644
--- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
+++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java
@@ -66,16 +66,11 @@ public class LOADER_Machine_Components {
CI.sensor_EV = ItemList.Sensor_EV.get(1);
CI.sensor_IV = ItemList.Sensor_IV.get(1);
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV)
- .get(1);
- CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV)
- .get(1);
- CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV)
- .get(1);
- CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV)
- .get(1);
- CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV)
- .get(1);
+ CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
+ CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
+ CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
+ CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
+ CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1);
}
}
@@ -107,12 +102,9 @@ public class LOADER_Machine_Components {
CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV)
- .get(1);
- CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM)
- .get(1);
- CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV)
- .get(1);
+ CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
+ CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
+ CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
}
registerComponentsULV();
@@ -154,12 +146,9 @@ public class LOADER_Machine_Components {
CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV)
- .get(1);
- CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM)
- .get(1);
- CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV)
- .get(1);
+ CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1);
+ CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1);
+ CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1);
}
registerComponentsULV();
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java
index 122a35f3a6..524aa08f60 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.recipe;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.*;
import gregtech.api.interfaces.IOreRecipeRegistrator;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import net.minecraft.item.ItemStack;
public class RECIPES_Extruder implements IOreRecipeRegistrator {
@@ -15,17 +16,11 @@ public class RECIPES_Extruder implements IOreRecipeRegistrator {
OrePrefixes.dust.add((IOreRecipeRegistrator) this);
}
- public void registerOre(
- final OrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
- if (!CORE.GTNH
- && ((aMaterial == Materials.Glass
- || aMaterial == Materials.WroughtIron
- || GT_OreDictUnificator.get(OrePrefixes.ingot, (Object) aMaterial, 1L) != null)
- && !aMaterial.contains(SubTag.NO_SMELTING))) {
+ public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
+ if (!CORE.GTNH && ((aMaterial == Materials.Glass || aMaterial == Materials.WroughtIron
+ || GT_OreDictUnificator.get(OrePrefixes.ingot, (Object) aMaterial, 1L) != null)
+ && !aMaterial.contains(SubTag.NO_SMELTING))) {
final long aMaterialMass = aMaterial.getMass();
final int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L);
if (tAmount > 0 && tAmount <= 64 && aPrefix.mMaterialAmount % 3628800L == 0L) {
@@ -37,17 +32,17 @@ public class RECIPES_Extruder implements IOreRecipeRegistrator {
}
GT_Values.RA.addExtruderRecipe(
- GT_Utility.copyAmount(1L, new Object[] {aStack}),
+ GT_Utility.copyAmount(1L, new Object[] { aStack }),
GregtechItemList.Shape_Extruder_SmallGear.get(0L, new Object[0]),
- GT_OreDictUnificator.get(
- OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount),
+ GT_OreDictUnificator
+ .get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount),
((int) Math.max(aMaterialMass * 5L * tAmount, tAmount) / 4),
8 * tVoltageMultiplier);
GT_Values.RA.addAlloySmelterRecipe(
- GT_Utility.copyAmount(2L, new Object[] {aStack}),
+ GT_Utility.copyAmount(2L, new Object[] { aStack }),
ItemList.Shape_Mold_Gear_Small.get(0L, new Object[0]),
- GT_OreDictUnificator.get(
- OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount),
+ GT_OreDictUnificator
+ .get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount),
((int) Math.max(aMaterialMass * 10L * tAmount, tAmount) / 4),
2 * tVoltageMultiplier);
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 41313c68c5..0dcdb008bb 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -2,6 +2,14 @@ package gtPlusPlus.core.recipe;
import static gtPlusPlus.core.lib.CORE.GTNH;
+import java.util.ArrayList;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import cpw.mods.fml.common.Loader;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
@@ -30,12 +38,6 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import java.util.ArrayList;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
public class RECIPES_GREGTECH {
@@ -128,77 +130,50 @@ public class RECIPES_GREGTECH {
// Advanced method for Nitric Acid Production
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(17), CI.getPinkCatalyst(0),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(GenericChem.Nitrogen_Dioxide, 4000),
- FluidUtils.getAir(4000),
- FluidUtils.getWater(2000),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.getPinkCatalyst(0), },
+ new FluidStack[] { FluidUtils.getFluidStack(GenericChem.Nitrogen_Dioxide, 4000),
+ FluidUtils.getAir(4000), FluidUtils.getWater(2000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack("nitricacid", 4000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack("nitricacid", 4000), },
10 * 20,
480,
3);
// Advanced recipe for Fluorine Production
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(17),
- CI.getPurpleCatalyst(0),
- ItemUtils.getSimpleStack(Blocks.sandstone, 64),
- ItemUtils.getSimpleStack(Blocks.sandstone, 64)
- },
- new FluidStack[] {FluidUtils.getFluidStack("nitricacid", 4000), FluidUtils.getAir(8000)},
- new ItemStack[] {
- FLUORIDES.FLUORITE.getOre(8),
- FLUORIDES.FLUORITE.getOre(4),
- FLUORIDES.FLUORITE.getOre(4),
- FLUORIDES.FLUORITE.getOre(4),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.getPurpleCatalyst(0),
+ ItemUtils.getSimpleStack(Blocks.sandstone, 64),
+ ItemUtils.getSimpleStack(Blocks.sandstone, 64) },
+ new FluidStack[] { FluidUtils.getFluidStack("nitricacid", 4000), FluidUtils.getAir(8000) },
+ new ItemStack[] { FLUORIDES.FLUORITE.getOre(8), FLUORIDES.FLUORITE.getOre(4),
+ FLUORIDES.FLUORITE.getOre(4), FLUORIDES.FLUORITE.getOre(4), },
new FluidStack[] {},
- new int[] {0, 2500, 2000, 1500},
+ new int[] { 0, 2500, 2000, 1500 },
10 * 20,
1024,
5);
// Advanced recipe for Fluorine Production
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(17),
- CI.getPurpleCatalyst(0),
- ItemUtils.getSimpleStack(Blocks.sand, 64),
- ItemUtils.getSimpleStack(Blocks.sand, 64)
- },
- new FluidStack[] {FluidUtils.getFluidStack("nitricacid", 5000), FluidUtils.getAir(12000)},
- new ItemStack[] {
- FLUORIDES.FLUORITE.getOre(4),
- FLUORIDES.FLUORITE.getOre(2),
- FLUORIDES.FLUORITE.getOre(2),
- FLUORIDES.FLUORITE.getOre(2),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.getPurpleCatalyst(0),
+ ItemUtils.getSimpleStack(Blocks.sand, 64), ItemUtils.getSimpleStack(Blocks.sand, 64) },
+ new FluidStack[] { FluidUtils.getFluidStack("nitricacid", 5000), FluidUtils.getAir(12000) },
+ new ItemStack[] { FLUORIDES.FLUORITE.getOre(4), FLUORIDES.FLUORITE.getOre(2),
+ FLUORIDES.FLUORITE.getOre(2), FLUORIDES.FLUORITE.getOre(2), },
new FluidStack[] {},
- new int[] {7500, 1500, 1000, 500},
+ new int[] { 7500, 1500, 1000, 500 },
10 * 20,
1024,
5);
// 3NO2 + H2O = 2HNO3 + NO
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(16), CI.getPinkCatalyst(0),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(GenericChem.Nitrogen_Dioxide, 3000), FluidUtils.getDistilledWater(1000)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(16), CI.getPinkCatalyst(0), },
+ new FluidStack[] { FluidUtils.getFluidStack(GenericChem.Nitrogen_Dioxide, 3000),
+ FluidUtils.getDistilledWater(1000) },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack("nitricacid", 2000),
- FluidUtils.getFluidStack(GenericChem.Nitric_Oxide, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack("nitricacid", 2000),
+ FluidUtils.getFluidStack(GenericChem.Nitric_Oxide, 1000), },
10 * 20,
480,
2);
@@ -206,44 +181,34 @@ public class RECIPES_GREGTECH {
// Produce Boric Acid
// Na2B4O7·10H2O + 2HCl = 4B(OH)3 + 2NaCl + 5H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(21), ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 23),
- },
- new FluidStack[] {FluidUtils.getFluidStack(GenericChem.HydrochloricAcid, 2000)},
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 4),
- },
- new FluidStack[] {FluidUtils.getFluidStack("boricacid", 4000), FluidUtils.getWater(5000)},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(21),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 23), },
+ new FluidStack[] { FluidUtils.getFluidStack(GenericChem.HydrochloricAcid, 2000) },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 4), },
+ new FluidStack[] { FluidUtils.getFluidStack("boricacid", 4000), FluidUtils.getWater(5000) },
20 * 30,
MaterialUtils.getVoltageForTier(3),
3);
// Produce Th232
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(22),
- ELEMENT.getInstance().THORIUM.getDust(16)
- },
- new FluidStack[] {FluidUtils.getDistilledWater(2000), FluidUtils.getFluidStack("boricacid", 1500)},
- new ItemStack[] {
- ELEMENT.getInstance().THORIUM.getSmallDust(32),
- ELEMENT.getInstance().THORIUM232.getDust(2),
- ELEMENT.getInstance().THORIUM232.getSmallDust(2),
- ELEMENT.getInstance().URANIUM232.getDust(1),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(22), ELEMENT.getInstance().THORIUM.getDust(16) },
+ new FluidStack[] { FluidUtils.getDistilledWater(2000), FluidUtils.getFluidStack("boricacid", 1500) },
+ new ItemStack[] { ELEMENT.getInstance().THORIUM.getSmallDust(32),
+ ELEMENT.getInstance().THORIUM232.getDust(2), ELEMENT.getInstance().THORIUM232.getSmallDust(2),
+ ELEMENT.getInstance().URANIUM232.getDust(1), },
new FluidStack[] {},
- new int[] {0, 0, 1000, 250},
+ new int[] { 0, 0, 1000, 250 },
20 * 300,
MaterialUtils.getVoltageForTier(4),
4);
// Modify Sapling into Pine Sapling
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedBioCircuit(6), ItemUtils.getSimpleStack(Blocks.sapling, 32)},
- new FluidStack[] {
- FluidUtils.getFluidStack("fluid.geneticmutagen", 2000), FluidUtils.getDistilledWater(8000)
- },
- new ItemStack[] {ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine, 16)},
+ new ItemStack[] { CI.getNumberedBioCircuit(6), ItemUtils.getSimpleStack(Blocks.sapling, 32) },
+ new FluidStack[] { FluidUtils.getFluidStack("fluid.geneticmutagen", 2000),
+ FluidUtils.getDistilledWater(8000) },
+ new ItemStack[] { ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine, 16) },
new FluidStack[] {},
120 * 20,
64,
@@ -252,34 +217,28 @@ public class RECIPES_GREGTECH {
// Convert GT++ Plutonium239 into normal Plutonium
if (Materials.Plutonium.mDefaultLocalName.equals("Plutonium 239")) {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(16),
- ELEMENT.getInstance().PLUTONIUM239.getDust(1)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(16),
+ ELEMENT.getInstance().PLUTONIUM239.getDust(1) },
new FluidStack[] {},
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustPlutonium", 1)},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPlutonium", 1) },
new FluidStack[] {},
5 * 20,
1,
2);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(16),
- ELEMENT.getInstance().PLUTONIUM239.getSmallDust(1)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(16),
+ ELEMENT.getInstance().PLUTONIUM239.getSmallDust(1) },
new FluidStack[] {},
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustSmallPlutonium", 1)},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustSmallPlutonium", 1) },
new FluidStack[] {},
5 * 20,
1,
2);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(16),
- ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(16),
+ ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1) },
new FluidStack[] {},
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustTinyPlutonium", 1)},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyPlutonium", 1) },
new FluidStack[] {},
5 * 20,
1,
@@ -289,18 +248,12 @@ public class RECIPES_GREGTECH {
int aLaureniumTier = ALLOY.LAURENIUM.vTier;
// Adding Recipes for Casings
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(12),
- CI.getTieredMachineCasing(aLaureniumTier - 1),
- ALLOY.LAURENIUM.getPlate(8),
- CI.getGear(aLaureniumTier, 2)
- },
- new FluidStack[] {
- CI.getTieredFluid(aLaureniumTier, 2 * 144),
- CI.getAlternativeTieredFluid(aLaureniumTier - 1, 4 * 144),
- CI.getTertiaryTieredFluid(aLaureniumTier - 2, 6 * 144)
- },
- new ItemStack[] {GregtechItemList.Casing_Machine_Custom_3.get(1)},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(12), CI.getTieredMachineCasing(aLaureniumTier - 1),
+ ALLOY.LAURENIUM.getPlate(8), CI.getGear(aLaureniumTier, 2) },
+ new FluidStack[] { CI.getTieredFluid(aLaureniumTier, 2 * 144),
+ CI.getAlternativeTieredFluid(aLaureniumTier - 1, 4 * 144),
+ CI.getTertiaryTieredFluid(aLaureniumTier - 2, 6 * 144) },
+ new ItemStack[] { GregtechItemList.Casing_Machine_Custom_3.get(1) },
new FluidStack[] {},
20 * 20,
MaterialUtils.getVoltageForTier(aLaureniumTier - 2),
@@ -309,18 +262,12 @@ public class RECIPES_GREGTECH {
int aBotmiumTier = ALLOY.BOTMIUM.vTier;
// Adding Recipes for Casings
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(12),
- CI.getTieredMachineCasing(aBotmiumTier - 1),
- ALLOY.BOTMIUM.getPlate(8),
- CI.getGear(aBotmiumTier, 2)
- },
- new FluidStack[] {
- CI.getTieredFluid(aBotmiumTier, 2 * 144),
- CI.getAlternativeTieredFluid(aBotmiumTier - 1, 4 * 144),
- CI.getTertiaryTieredFluid(aBotmiumTier - 2, 6 * 144)
- },
- new ItemStack[] {GregtechItemList.Casing_Machine_Custom_4.get(1)},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(12), CI.getTieredMachineCasing(aBotmiumTier - 1),
+ ALLOY.BOTMIUM.getPlate(8), CI.getGear(aBotmiumTier, 2) },
+ new FluidStack[] { CI.getTieredFluid(aBotmiumTier, 2 * 144),
+ CI.getAlternativeTieredFluid(aBotmiumTier - 1, 4 * 144),
+ CI.getTertiaryTieredFluid(aBotmiumTier - 2, 6 * 144) },
+ new ItemStack[] { GregtechItemList.Casing_Machine_Custom_4.get(1) },
new FluidStack[] {},
20 * 20,
MaterialUtils.getVoltageForTier(aBotmiumTier - 2),
@@ -329,12 +276,10 @@ public class RECIPES_GREGTECH {
// Refine GT HF into GT++ HF
if (FluidUtils.doesHydrofluoricAcidGtExist()) {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(22),
- },
- new FluidStack[] {FluidUtils.getHydrofluoricAcid(2000), FluidUtils.getHydrofluoricAcidGT(5000)},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(22), },
+ new FluidStack[] { FluidUtils.getHydrofluoricAcid(2000), FluidUtils.getHydrofluoricAcidGT(5000) },
new ItemStack[] {},
- new FluidStack[] {FluidUtils.getHydrofluoricAcid(4500)},
+ new FluidStack[] { FluidUtils.getHydrofluoricAcid(4500) },
30 * 20,
480,
3);
@@ -343,18 +288,28 @@ public class RECIPES_GREGTECH {
private static void fluidheaterRecipes() {
GT_Values.RA.addFluidHeaterRecipe(
- CI.getNumberedCircuit(20), FluidUtils.getWater(1000), FluidUtils.getHotWater(1000), 30, 30);
+ CI.getNumberedCircuit(20),
+ FluidUtils.getWater(1000),
+ FluidUtils.getHotWater(1000),
+ 30,
+ 30);
}
private static void vacuumFreezerRecipes() {
GT_Values.RA.addVacuumFreezerRecipe(
- GregtechItemList.Bomb_Cast_Molten.get(1), GregtechItemList.Bomb_Cast_Set.get(1), 20 * 30);
+ GregtechItemList.Bomb_Cast_Molten.get(1),
+ GregtechItemList.Bomb_Cast_Set.get(1),
+ 20 * 30);
}
private static void latheRecipes() {
GT_Values.RA.addLatheRecipe(
- ALLOY.EGLIN_STEEL.getBlock(1), GregtechItemList.Bomb_Cast_Mold.get(1), null, 20 * 60 * 15, 120);
+ ALLOY.EGLIN_STEEL.getBlock(1),
+ GregtechItemList.Bomb_Cast_Mold.get(1),
+ null,
+ 20 * 60 * 15,
+ 120);
GT_Values.RA.addLatheRecipe(
GregtechItemList.Bomb_Cast_Set.get(1),
@@ -378,14 +333,10 @@ public class RECIPES_GREGTECH {
*/
// Hydrogen Plasma
- /*CORE.RA.addFusionReactorRecipe(
- Particle.getIon("Hydrogen", 0),
- Particle.getIon("Hydrogen", 0),
- Materials.Hydrogen.getPlasma(1),
- 5000,
- 16,
- 4096,
- 40000000);*/
+ /*
+ * CORE.RA.addFusionReactorRecipe( Particle.getIon("Hydrogen", 0), Particle.getIon("Hydrogen", 0),
+ * Materials.Hydrogen.getPlasma(1), 5000, 16, 4096, 40000000);
+ */
// Hypogen Creation
GT_Values.RA.addFusionReactorRecipe(
@@ -409,115 +360,77 @@ public class RECIPES_GREGTECH {
private static void assemblyLineRecipes() {
ItemStack[] aCoilWire = new ItemStack[] {
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 64 : 32),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 64 : 32),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 64 : 32),
- };
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 64 : 32),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 64 : 32),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 64 : 32), };
// Containment Casings
CORE.RA.addAssemblylineRecipe(
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1),
20 * 60 * 30,
- new Object[] {
- ItemList.Field_Generator_IV.get(GTNH ? 32 : 16),
- ItemList.Electric_Motor_EV.get(GTNH ? 64 : 32),
- ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.cableGt12, 7, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.wireGt16, 6, GTNH ? 64 : 32),
- ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, GTNH ? 64 : 16),
- ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8),
- ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4),
- ALLOY.ARCANITE.getGear(GTNH ? 8 : 2),
- new Object[] {CI.getTieredCircuitOreDictName(5), 64},
- new Object[] {CI.getTieredCircuitOreDictName(6), 32},
- new Object[] {CI.getTieredCircuitOreDictName(7), 16},
- GregtechItemList.Laser_Lens_Special.get(1),
- aCoilWire[3]
- },
- new FluidStack[] {
- ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)),
- ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * (GTNH ? 8 : 4)),
- ALLOY.TUMBAGA.getFluidStack(144 * 9 * (GTNH ? 32 : 8)),
- ALLOY.NICHROME.getFluidStack(144 * 1 * (GTNH ? 16 : 4)),
- },
+ new Object[] { ItemList.Field_Generator_IV.get(GTNH ? 32 : 16),
+ ItemList.Electric_Motor_EV.get(GTNH ? 64 : 32),
+ ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16),
+ CI.getTieredComponent(OrePrefixes.cableGt12, 7, GTNH ? 32 : 16),
+ CI.getTieredComponent(OrePrefixes.wireGt16, 6, GTNH ? 64 : 32),
+ ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, GTNH ? 64 : 16),
+ ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8),
+ ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.ARCANITE.getGear(GTNH ? 8 : 2),
+ new Object[] { CI.getTieredCircuitOreDictName(5), 64 },
+ new Object[] { CI.getTieredCircuitOreDictName(6), 32 },
+ new Object[] { CI.getTieredCircuitOreDictName(7), 16 },
+ GregtechItemList.Laser_Lens_Special.get(1), aCoilWire[3] },
+ new FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)),
+ ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * (GTNH ? 8 : 4)),
+ ALLOY.TUMBAGA.getFluidStack(144 * 9 * (GTNH ? 32 : 8)),
+ ALLOY.NICHROME.getFluidStack(144 * 1 * (GTNH ? 16 : 4)), },
ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32),
20 * 60 * 10 * (GTNH ? 2 : 1),
(int) MaterialUtils.getVoltageForTier(6));
// Slow Fusion Controller
- /*CORE.RA.addAssemblylineRecipe(
- GregtechItemList.COMET_Cyclotron.get(1),
- 20 * 60 * 30,
- new ItemStack[] {
- CI.getFieldGenerator(6, GTNH ? 32 : 8),
- ItemList.Electric_Motor_EV.get(GTNH ? 32 : 8),
- ItemList.Tool_Scanner.get(GTNH ? 4 : 2),
- CI.getTieredComponent(OrePrefixes.cableGt12, 6, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 64 : 32),
- CI.getTieredComponent(OrePrefixes.plate, 6, GTNH ? 64 : 32),
- ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8),
- ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4),
- ALLOY.INCOLOY_MA956.getGear(GTNH ? 8 : 2),
- CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32),
- CI.getTieredComponent(OrePrefixes.circuit, 6, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8)
- },
- new FluidStack[] {
- CI.getTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
- CI.getTertiaryTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
- CI.getAlternativeTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
- CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),
- },
- GregtechItemList.Miniature_Fusion.get(1),
- 20 * 60 * 5 * (GTNH ? 2 : 1),
- (int) MaterialUtils.getVoltageForTier(7));*/
+ /*
+ * CORE.RA.addAssemblylineRecipe( GregtechItemList.COMET_Cyclotron.get(1), 20 * 60 * 30, new ItemStack[] {
+ * CI.getFieldGenerator(6, GTNH ? 32 : 8), ItemList.Electric_Motor_EV.get(GTNH ? 32 : 8),
+ * ItemList.Tool_Scanner.get(GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.cableGt12, 6, GTNH ? 32 : 16),
+ * CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 64 : 32), CI.getTieredComponent(OrePrefixes.plate, 6,
+ * GTNH ? 64 : 32), ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8),
+ * ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.INCOLOY_MA956.getGear(GTNH ? 8 : 2),
+ * CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32), CI.getTieredComponent(OrePrefixes.circuit, 6,
+ * GTNH ? 32 : 16), CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8) }, new FluidStack[] {
+ * CI.getTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), CI.getTertiaryTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
+ * CI.getAlternativeTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),
+ * }, GregtechItemList.Miniature_Fusion.get(1), 20 * 60 * 5 * (GTNH ? 2 : 1), (int)
+ * MaterialUtils.getVoltageForTier(7));
+ */
// Plasma Tank
- /*CORE.RA.addAssemblylineRecipe(
- ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.Superconductor, 1),
- 20 * 60 * 5,
- new ItemStack[] {
- CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 16 : 4),
- CI.getTieredComponent(OrePrefixes.pipeHuge, 5, GTNH ? 16 : 4),
- CI.getTieredComponent(OrePrefixes.cableGt08, 7, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 8 : 4),
- aCoilWire[2]
- },
- new FluidStack[] {
- CI.getTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)),
-
- },
- GregtechItemList.Plasma_Tank.get(1),
- 20 * 60 * 1 * (GTNH ? 2 : 1),
- (int) MaterialUtils.getVoltageForTier(5));*/
+ /*
+ * CORE.RA.addAssemblylineRecipe( ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.Superconductor,
+ * 1), 20 * 60 * 5, new ItemStack[] { CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 32 : 16),
+ * CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 16 : 4), CI.getTieredComponent(OrePrefixes.pipeHuge, 5,
+ * GTNH ? 16 : 4), CI.getTieredComponent(OrePrefixes.cableGt08, 7, GTNH ? 32 : 16),
+ * CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 8 : 4), aCoilWire[2] }, new FluidStack[] {
+ * CI.getTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), CI.getTertiaryTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)),
+ * CI.getAlternativeTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)), }, GregtechItemList.Plasma_Tank.get(1), 20 * 60 *
+ * 1 * (GTNH ? 2 : 1), (int) MaterialUtils.getVoltageForTier(5));
+ */
// Turbine Automation Port
CORE.RA.addAssemblylineRecipe(
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1),
20 * 60 * 60 * 24,
- new Object[] {
- CI.getTieredMachineHull(8, 4),
- CI.getConveyor(8, GTNH ? 24 : 12),
- CI.getElectricMotor(7, GTNH ? 32 : 16),
- CI.getElectricPiston(7, GTNH ? 16 : 4),
- CI.getEnergyCore(6, GTNH ? 8 : 2),
- CI.getPlate(8, GTNH ? 24 : 12),
- CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 48 : 24),
- CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 12 : 6),
- new Object[] {CI.getTieredCircuitOreDictName(7), 20},
- CI.getTieredComponent(OrePrefixes.rotor, 6, GTNH ? 16 : 8),
- },
- new FluidStack[] {
- CI.getTieredFluid(8, 144 * 32),
- CI.getAlternativeTieredFluid(7, 144 * 16),
- CI.getTertiaryTieredFluid(7, 144 * 16),
- ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144)
- },
+ new Object[] { CI.getTieredMachineHull(8, 4), CI.getConveyor(8, GTNH ? 24 : 12),
+ CI.getElectricMotor(7, GTNH ? 32 : 16), CI.getElectricPiston(7, GTNH ? 16 : 4),
+ CI.getEnergyCore(6, GTNH ? 8 : 2), CI.getPlate(8, GTNH ? 24 : 12),
+ CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 48 : 24),
+ CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 32 : 16),
+ CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 12 : 6),
+ new Object[] { CI.getTieredCircuitOreDictName(7), 20 },
+ CI.getTieredComponent(OrePrefixes.rotor, 6, GTNH ? 16 : 8), },
+ new FluidStack[] { CI.getTieredFluid(8, 144 * 32), CI.getAlternativeTieredFluid(7, 144 * 16),
+ CI.getTertiaryTieredFluid(7, 144 * 16), ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144) },
GregtechItemList.Hatch_Input_TurbineHousing.get(4),
20 * 60 * 60 * (GTNH ? 2 : 1),
(int) MaterialUtils.getVoltageForTier(8));
@@ -526,35 +439,24 @@ public class RECIPES_GREGTECH {
* Contianment casings
*/
- ItemStack[] aGemCasings = new ItemStack[] {
- GregtechItemList.Battery_Casing_Gem_1.get(1),
- GregtechItemList.Battery_Casing_Gem_2.get(1),
- GregtechItemList.Battery_Casing_Gem_3.get(1),
- GregtechItemList.Battery_Casing_Gem_4.get(1),
- };
- ItemStack[] aResearch = new ItemStack[] {
- Particle.getBaseParticle(Particle.UNKNOWN),
- GregtechItemList.Battery_Casing_Gem_1.get(1),
- GregtechItemList.Battery_Casing_Gem_2.get(1),
- GregtechItemList.Battery_Casing_Gem_3.get(1),
- };
+ ItemStack[] aGemCasings = new ItemStack[] { GregtechItemList.Battery_Casing_Gem_1.get(1),
+ GregtechItemList.Battery_Casing_Gem_2.get(1), GregtechItemList.Battery_Casing_Gem_3.get(1),
+ GregtechItemList.Battery_Casing_Gem_4.get(1), };
+ ItemStack[] aResearch = new ItemStack[] { Particle.getBaseParticle(Particle.UNKNOWN),
+ GregtechItemList.Battery_Casing_Gem_1.get(1), GregtechItemList.Battery_Casing_Gem_2.get(1),
+ GregtechItemList.Battery_Casing_Gem_3.get(1), };
int aCasingSlot = 0;
for (int j = 6; j < 10; j++) {
CORE.RA.addAssemblylineRecipe(
aResearch[aCasingSlot],
20 * 60 * 60,
- new ItemStack[] {
- CI.getTieredComponent(OrePrefixes.plate, j - 1, 16),
- CI.getTieredComponent(OrePrefixes.cableGt08, j + 1, (GTNH ? 32 : 16)),
- CI.getTieredComponent(OrePrefixes.gearGt, j - 1, 4),
- aCoilWire[aCasingSlot]
- },
- new FluidStack[] {
- CI.getTieredFluid(j, 144 * (GTNH ? 8 : 4)),
- CI.getTertiaryTieredFluid(j - 2, 144 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 12)),
- },
+ new ItemStack[] { CI.getTieredComponent(OrePrefixes.plate, j - 1, 16),
+ CI.getTieredComponent(OrePrefixes.cableGt08, j + 1, (GTNH ? 32 : 16)),
+ CI.getTieredComponent(OrePrefixes.gearGt, j - 1, 4), aCoilWire[aCasingSlot] },
+ new FluidStack[] { CI.getTieredFluid(j, 144 * (GTNH ? 8 : 4)),
+ CI.getTertiaryTieredFluid(j - 2, 144 * (GTNH ? 16 : 8)),
+ CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 12)), },
aGemCasings[aCasingSlot++],
20 * 60 * 1 * (GTNH ? 2 : 1),
(int) MaterialUtils.getVoltageForTier(j));
@@ -564,39 +466,28 @@ public class RECIPES_GREGTECH {
* Gem Battery Recipes
*/
- ItemStack[] aGemBatteries = new ItemStack[] {
- GregtechItemList.Battery_Gem_1.get(1),
- GregtechItemList.Battery_Gem_2.get(1),
- GregtechItemList.Battery_Gem_3.get(1),
- GregtechItemList.Battery_Gem_4.get(1),
- };
-
- ItemStack[] aExoticInputs = new ItemStack[] {
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.ELECTRON),
- Particle.getBaseParticle(Particle.CHARM),
- Particle.getBaseParticle(Particle.GRAVITON)
- };
+ ItemStack[] aGemBatteries = new ItemStack[] { GregtechItemList.Battery_Gem_1.get(1),
+ GregtechItemList.Battery_Gem_2.get(1), GregtechItemList.Battery_Gem_3.get(1),
+ GregtechItemList.Battery_Gem_4.get(1), };
+
+ ItemStack[] aExoticInputs = new ItemStack[] { Particle.getBaseParticle(Particle.PROTON),
+ Particle.getBaseParticle(Particle.ELECTRON), Particle.getBaseParticle(Particle.CHARM),
+ Particle.getBaseParticle(Particle.GRAVITON) };
aCasingSlot = 0;
for (int j = 6; j < 10; j++) {
CORE.RA.addAssemblylineRecipe(
aExoticInputs[aCasingSlot],
20 * 60 * 60 * 5,
- new Object[] {
- aGemCasings[aCasingSlot],
- ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], 16),
- CI.getTieredComponent(OrePrefixes.plate, j, 16),
- new Object[] {CI.getTieredCircuitOreDictName(j), 8},
- CI.getTieredComponent(OrePrefixes.wireGt16, j + 1, GTNH ? 32 : 16),
- CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4),
- CI.getTieredComponent(OrePrefixes.screw, j - 1, GTNH ? 8 : 4),
- },
- new FluidStack[] {
- CI.getTieredFluid(j, 144 * 1 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(j - 2, 144 * 2 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(j - 1, 144 * (GTNH ? 16 : 8)),
- },
+ new Object[] { aGemCasings[aCasingSlot], ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], 16),
+ CI.getTieredComponent(OrePrefixes.plate, j, 16),
+ new Object[] { CI.getTieredCircuitOreDictName(j), 8 },
+ CI.getTieredComponent(OrePrefixes.wireGt16, j + 1, GTNH ? 32 : 16),
+ CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4),
+ CI.getTieredComponent(OrePrefixes.screw, j - 1, GTNH ? 8 : 4), },
+ new FluidStack[] { CI.getTieredFluid(j, 144 * 1 * (GTNH ? 16 : 8)),
+ CI.getTertiaryTieredFluid(j - 2, 144 * 2 * (GTNH ? 16 : 8)),
+ CI.getAlternativeTieredFluid(j, 144 * (GTNH ? 16 : 8)),
+ CI.getTertiaryTieredFluid(j - 1, 144 * (GTNH ? 16 : 8)), },
aGemBatteries[aCasingSlot++],
20 * 60 * 1 * (GTNH ? 2 : 1),
(int) MaterialUtils.getVoltageForTier(j));
@@ -607,23 +498,18 @@ public class RECIPES_GREGTECH {
CORE.RA.addAssemblylineRecipe(
ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1),
20 * 60 * 10,
- new Object[] {
- ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2),
- CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
- new Object[] {CI.getTieredCircuitOreDictName(7), 16},
- CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3),
- CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.bolt, 5, GTNH ? 24 : 12),
- CI.getTieredComponent(OrePrefixes.frameGt, 4, GTNH ? 12 : 6),
- aCoilWire[3]
- },
- new FluidStack[] {
- CI.getTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(6, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
- },
+ new Object[] { ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2),
+ CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
+ new Object[] { CI.getTieredCircuitOreDictName(7), 16 },
+ CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8),
+ CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3),
+ CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8),
+ CI.getTieredComponent(OrePrefixes.bolt, 5, GTNH ? 24 : 12),
+ CI.getTieredComponent(OrePrefixes.frameGt, 4, GTNH ? 12 : 6), aCoilWire[3] },
+ new FluidStack[] { CI.getTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+ CI.getTertiaryTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+ CI.getAlternativeTieredFluid(6, 144 * 18 * (GTNH ? 16 : 8)),
+ CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)), },
ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1),
20 * 60 * 30 * (GTNH ? 2 : 1),
(int) MaterialUtils.getVoltageForTier(7));
@@ -631,41 +517,33 @@ public class RECIPES_GREGTECH {
// Charge Pack LuV-UV
ItemStack[] aChargeResearch = new ItemStack[] {
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1),
- };
-
- ItemStack[] aChargeOutputs = new ItemStack[] {
- ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1),
- ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1),
- ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
- ItemUtils.getSimpleStack(ModItems.itemChargePack_High_4, 1),
- };
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1), };
+
+ ItemStack[] aChargeOutputs = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack_High_4, 1), };
int aCurrSlot = 0;
for (int h = 6; h < 10; h++) {
CORE.RA.addAssemblylineRecipe(
aChargeResearch[aCurrSlot],
20 * 60 * 10 * (aCurrSlot + 1),
- new Object[] {
- ItemUtils.getSimpleStack(aGemBatteries[aCurrSlot], 2),
- aCoilWire[aCurrSlot],
- CI.getTieredComponent(OrePrefixes.plate, h, 8),
- new Object[] {CI.getTieredCircuitOreDictName(h), 4},
- new Object[] {CI.getTieredCircuitOreDictName(h - 1), 8},
- CI.getTieredComponent(OrePrefixes.cableGt12, h - 1, 16),
- CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.bolt, h - 2, GTNH ? 32 : 16),
- CI.getFieldGenerator(h, 1),
- },
- new FluidStack[] {
- CI.getTieredFluid(h, 144 * 4 * (GTNH ? 8 : 4)),
- CI.getTertiaryTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)),
- CI.getAlternativeTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)),
- CI.getAlternativeTieredFluid(h - 2, 144 * 4 * (GTNH ? 8 : 4)),
- },
+ new Object[] { ItemUtils.getSimpleStack(aGemBatteries[aCurrSlot], 2), aCoilWire[aCurrSlot],
+ CI.getTieredComponent(OrePrefixes.plate, h, 8),
+ new Object[] { CI.getTieredCircuitOreDictName(h), 4 },
+ new Object[] { CI.getTieredCircuitOreDictName(h - 1), 8 },
+ CI.getTieredComponent(OrePrefixes.cableGt12, h - 1, 16),
+ CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8),
+ CI.getTieredComponent(OrePrefixes.bolt, h - 2, GTNH ? 32 : 16),
+ CI.getFieldGenerator(h, 1), },
+ new FluidStack[] { CI.getTieredFluid(h, 144 * 4 * (GTNH ? 8 : 4)),
+ CI.getTertiaryTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)),
+ CI.getAlternativeTieredFluid(h - 1, 144 * 4 * (GTNH ? 8 : 4)),
+ CI.getAlternativeTieredFluid(h - 2, 144 * 4 * (GTNH ? 8 : 4)), },
aChargeOutputs[aCurrSlot],
20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot + 1),
(int) MaterialUtils.getVoltageForTier(h));
@@ -676,23 +554,18 @@ public class RECIPES_GREGTECH {
CORE.RA.addAssemblylineRecipe(
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1),
20 * 60 * 10,
- new Object[] {
- ItemUtils.getSimpleStack(aGemCasings[3], GTNH ? 4 : 2),
- CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
- new Object[] {CI.getTieredCircuitOreDictName(7), 16},
- CI.getTieredComponent(OrePrefixes.cableGt04, 8, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.gearGt, 7, GTNH ? 6 : 3),
- CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 16 : 8),
- CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 24 : 12),
- CI.getTieredComponent(OrePrefixes.frameGt, 5, GTNH ? 12 : 6),
- aCoilWire[3]
- },
- new FluidStack[] {
- CI.getTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getTertiaryTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
- CI.getAlternativeTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
- },
+ new Object[] { ItemUtils.getSimpleStack(aGemCasings[3], GTNH ? 4 : 2),
+ CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
+ new Object[] { CI.getTieredCircuitOreDictName(7), 16 },
+ CI.getTieredComponent(OrePrefixes.cableGt04, 8, GTNH ? 16 : 8),
+ CI.getTieredComponent(OrePrefixes.gearGt, 7, GTNH ? 6 : 3),
+ CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 16 : 8),
+ CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 24 : 12),
+ CI.getTieredComponent(OrePrefixes.frameGt, 5, GTNH ? 12 : 6), aCoilWire[3] },
+ new FluidStack[] { CI.getTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
+ CI.getTertiaryTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)),
+ CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+ CI.getAlternativeTieredFluid(8, 144 * 18 * (GTNH ? 16 : 8)), },
ItemUtils.getItemStackFromFQRN("miscutils:personalCloakingDevice", 1),
20 * 60 * 30 * (GTNH ? 2 : 1),
(int) MaterialUtils.getVoltageForTier(8));
@@ -700,24 +573,18 @@ public class RECIPES_GREGTECH {
GT_Values.RA.addAssemblylineRecipe(
GregtechItemList.Industrial_AlloyBlastSmelter.get(1, new Object() {}),
20 * 60 * 30,
- new Object[] {
- GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}),
- GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}),
- GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}),
- GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}),
- ItemList.UV_Coil.get(16L, new Object() {}),
- ItemList.Conveyor_Module_UV.get(4L, new Object() {}),
- new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 8},
- new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 16},
- ItemList.Circuit_Chip_PPIC.get(16, new Object() {}),
- ALLOY.PIKYONIUM.getPlate(16),
- ALLOY.CINOBITE.getScrew(32)
- },
- new FluidStack[] {
- ALLOY.PIKYONIUM.getFluidStack(144 * 8),
- ALLOY.INDALLOY_140.getFluidStack(144 * 9),
- Materials.SolderingAlloy.getMolten(144 * 10)
- },
+ new Object[] { GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}),
+ GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}),
+ GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}),
+ GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}),
+ ItemList.UV_Coil.get(16L, new Object() {}),
+ ItemList.Conveyor_Module_UV.get(4L, new Object() {}),
+ new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 8 },
+ new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 16 },
+ ItemList.Circuit_Chip_PPIC.get(16, new Object() {}), ALLOY.PIKYONIUM.getPlate(16),
+ ALLOY.CINOBITE.getScrew(32) },
+ new FluidStack[] { ALLOY.PIKYONIUM.getFluidStack(144 * 8), ALLOY.INDALLOY_140.getFluidStack(144 * 9),
+ Materials.SolderingAlloy.getMolten(144 * 10) },
GregtechItemList.Mega_AlloyBlastSmelter.get(1L),
60 * 20,
1000000);
@@ -726,18 +593,12 @@ public class RECIPES_GREGTECH {
private static void laserEngraverRecipes() {
// Laser Sensors and Emitters together
- GregtechItemList[] aTransParts = new GregtechItemList[] {
- GregtechItemList.TransmissionComponent_ULV,
- GregtechItemList.TransmissionComponent_LV,
- GregtechItemList.TransmissionComponent_MV,
- GregtechItemList.TransmissionComponent_HV,
- GregtechItemList.TransmissionComponent_EV,
- GregtechItemList.TransmissionComponent_IV,
- GregtechItemList.TransmissionComponent_LuV,
- GregtechItemList.TransmissionComponent_ZPM,
- GregtechItemList.TransmissionComponent_UV,
- GregtechItemList.TransmissionComponent_MAX,
- };
+ GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV,
+ GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV,
+ GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV,
+ GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV,
+ GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV,
+ GregtechItemList.TransmissionComponent_MAX, };
for (int i = 0; i < 10; i++) {
GT_Values.RA.addLaserEngraverRecipe(
CI.getEmitter(i, 2),
@@ -747,12 +608,12 @@ public class RECIPES_GREGTECH {
MaterialUtils.getVoltageForTier(i));
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
false,
- new ItemStack[] {aTransParts[i].get(1)},
- new ItemStack[] {CI.getEmitter(i, 2), CI.getSensor(i, 2)},
+ new ItemStack[] { aTransParts[i].get(1) },
+ new ItemStack[] { CI.getEmitter(i, 2), CI.getSensor(i, 2) },
null,
null,
- new FluidStack[] {GT_Values.NF},
- new FluidStack[] {GT_Values.NF},
+ new FluidStack[] { GT_Values.NF },
+ new FluidStack[] { GT_Values.NF },
Math.max(300 >> Math.max(i - 1, 0), 1),
MaterialUtils.getVoltageForTier(i),
0);
@@ -812,9 +673,19 @@ public class RECIPES_GREGTECH {
private static void breweryRecipes() {
CORE.RA.addBrewingRecipe(
- 14, EnchantingUtils.getMobEssence(100), EnchantingUtils.getLiquidXP(1332), 100, 120, false);
+ 14,
+ EnchantingUtils.getMobEssence(100),
+ EnchantingUtils.getLiquidXP(1332),
+ 100,
+ 120,
+ false);
CORE.RA.addBrewingRecipe(
- 14, EnchantingUtils.getLiquidXP(1332), EnchantingUtils.getMobEssence(100), 100, 120, false);
+ 14,
+ EnchantingUtils.getLiquidXP(1332),
+ EnchantingUtils.getMobEssence(100),
+ 100,
+ 120,
+ false);
CORE.RA.addBrewingRecipe(
ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest),
FluidUtils.getFluidStack("water", 100),
@@ -883,17 +754,11 @@ public class RECIPES_GREGTECH {
if (!GTNH) {
// Trinium
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(8),
- ELEMENT.getInstance().BISMUTH.getDust(8),
- ELEMENT.getInstance().IRON.getDust(64),
- ELEMENT.getInstance().CARBON.getDust(16),
- ELEMENT.getInstance().GOLD.getDust(16),
- ELEMENT.getInstance().SILVER.getDust(16),
- ELEMENT.getInstance().OSMIUM.getDust(4),
- ELEMENT.getInstance().IRIDIUM.getDust(4),
- ELEMENT.getInstance().CERIUM.getDust(8)
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(8), ELEMENT.getInstance().BISMUTH.getDust(8),
+ ELEMENT.getInstance().IRON.getDust(64), ELEMENT.getInstance().CARBON.getDust(16),
+ ELEMENT.getInstance().GOLD.getDust(16), ELEMENT.getInstance().SILVER.getDust(16),
+ ELEMENT.getInstance().OSMIUM.getDust(4), ELEMENT.getInstance().IRIDIUM.getDust(4),
+ ELEMENT.getInstance().CERIUM.getDust(8) },
FluidUtils.getFluidStack("molten.trinium", 136 * 144),
0,
20 * 3000,
@@ -902,15 +767,9 @@ public class RECIPES_GREGTECH {
// Eglin Steel
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(6),
- ELEMENT.getInstance().IRON.getDust(4),
- ALLOY.KANTHAL.getDust(1),
- ALLOY.INVAR.getDust(5),
- ELEMENT.getInstance().SULFUR.getDust(1),
- ELEMENT.getInstance().CARBON.getDust(1),
- ELEMENT.getInstance().SILICON.getDust(4)
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(6), ELEMENT.getInstance().IRON.getDust(4),
+ ALLOY.KANTHAL.getDust(1), ALLOY.INVAR.getDust(5), ELEMENT.getInstance().SULFUR.getDust(1),
+ ELEMENT.getInstance().CARBON.getDust(1), ELEMENT.getInstance().SILICON.getDust(4) },
ALLOY.EGLIN_STEEL.getFluidStack(16 * 144),
0,
20 * 45,
@@ -918,29 +777,20 @@ public class RECIPES_GREGTECH {
// HG1223
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(5),
- ELEMENT.getInstance().BARIUM.getDust(2),
- ELEMENT.getInstance().CALCIUM.getDust(2),
- ELEMENT.getInstance().COPPER.getDust(3),
- },
- new FluidStack[] {
- ELEMENT.getInstance().OXYGEN.getFluidStack(8000),
- ELEMENT.getInstance().MERCURY.getFluidStack(1000),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(5), ELEMENT.getInstance().BARIUM.getDust(2),
+ ELEMENT.getInstance().CALCIUM.getDust(2), ELEMENT.getInstance().COPPER.getDust(3), },
+ new FluidStack[] { ELEMENT.getInstance().OXYGEN.getFluidStack(8000),
+ ELEMENT.getInstance().MERCURY.getFluidStack(1000), },
ALLOY.HG1223.getFluidStack(16 * 144),
null,
- new int[] {10000}, // Output Chance
+ new int[] { 10000 }, // Output Chance
20 * 120,
30720);
// NITINOL_60
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(2),
- ELEMENT.getInstance().TITANIUM.getDust(3),
- ELEMENT.getInstance().NICKEL.getDust(2)
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(2), ELEMENT.getInstance().TITANIUM.getDust(3),
+ ELEMENT.getInstance().NICKEL.getDust(2) },
ALLOY.NITINOL_60.getFluidStack(5 * 144),
0,
20 * 75,
@@ -948,14 +798,9 @@ public class RECIPES_GREGTECH {
// INDALLOY_140
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(5),
- ELEMENT.getInstance().BISMUTH.getDust(47),
- ELEMENT.getInstance().LEAD.getDust(25),
- ELEMENT.getInstance().TIN.getDust(13),
- ELEMENT.getInstance().CADMIUM.getDust(10),
- ELEMENT.getInstance().INDIUM.getDust(5)
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(5), ELEMENT.getInstance().BISMUTH.getDust(47),
+ ELEMENT.getInstance().LEAD.getDust(25), ELEMENT.getInstance().TIN.getDust(13),
+ ELEMENT.getInstance().CADMIUM.getDust(10), ELEMENT.getInstance().INDIUM.getDust(5) },
ALLOY.INDALLOY_140.getFluidStack(100 * 144),
0,
20 * 40,
@@ -963,11 +808,9 @@ public class RECIPES_GREGTECH {
// Germanium Roasting
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(15),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedSphalerite", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(15),
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedSphalerite", 8),
+ ELEMENT.getInstance().CARBON.getDust(32), },
Materials.SulfuricAcid.getFluid(2000),
ELEMENT.getInstance().GERMANIUM.getFluidStack(288),
0,
@@ -976,44 +819,36 @@ public class RECIPES_GREGTECH {
// Ruthenium Roasting
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(19),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIridium", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(19),
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIridium", 8),
+ ELEMENT.getInstance().CARBON.getDust(32), },
Materials.SulfuricAcid.getFluid(2000),
ELEMENT.getInstance().RUTHENIUM.getFluidStack(288),
0,
20 * 300,
8000);
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(19),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedOsmium", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(19),
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedOsmium", 8),
+ ELEMENT.getInstance().CARBON.getDust(32), },
Materials.SulfuricAcid.getFluid(2000),
ELEMENT.getInstance().RUTHENIUM.getFluidStack(288),
0,
20 * 300,
8000);
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(19),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPlatinum", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(19),
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPlatinum", 8),
+ ELEMENT.getInstance().CARBON.getDust(32), },
Materials.SulfuricAcid.getFluid(2000),
ELEMENT.getInstance().RUTHENIUM.getFluidStack(288),
0,
20 * 300,
8000);
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(19),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCooperite", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(19),
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCooperite", 8),
+ ELEMENT.getInstance().CARBON.getDust(32), },
Materials.SulfuricAcid.getFluid(8000),
ELEMENT.getInstance().RUTHENIUM.getFluidStack(144),
0,
@@ -1022,33 +857,27 @@ public class RECIPES_GREGTECH {
// Rhenium Roasting
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(20),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedScheelite", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(20),
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedScheelite", 8),
+ ELEMENT.getInstance().CARBON.getDust(32), },
Materials.SulfuricAcid.getFluid(10000),
ELEMENT.getInstance().RHENIUM.getFluidStack(144),
0,
20 * 300,
4000);
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(20),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenite", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(20),
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenite", 8),
+ ELEMENT.getInstance().CARBON.getDust(32), },
Materials.SulfuricAcid.getFluid(7500),
ELEMENT.getInstance().RHENIUM.getFluidStack(144),
0,
20 * 300,
4000);
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(20),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenum", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(20),
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMolybdenum", 8),
+ ELEMENT.getInstance().CARBON.getDust(32), },
Materials.SulfuricAcid.getFluid(5000),
ELEMENT.getInstance().RHENIUM.getFluidStack(288),
0,
@@ -1057,16 +886,14 @@ public class RECIPES_GREGTECH {
// Thallium Roasting
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(21),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedZinc", 3),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 4),
- ELEMENT.getInstance().CARBON.getDust(16),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(21),
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedZinc", 3),
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 4),
+ ELEMENT.getInstance().CARBON.getDust(16), },
Materials.SulfuricAcid.getFluid(1250),
ELEMENT.getInstance().THALLIUM.getFluidStack(288),
new ItemStack[] {},
- new int[] {0},
+ new int[] { 0 },
20 * 75,
8000,
3700,
@@ -1074,30 +901,23 @@ public class RECIPES_GREGTECH {
// Strontium processing
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(21),
- MISC_MATERIALS.STRONTIUM_OXIDE.getDust(8),
- ELEMENT.getInstance().ALUMINIUM.getDust(8),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(21), MISC_MATERIALS.STRONTIUM_OXIDE.getDust(8),
+ ELEMENT.getInstance().ALUMINIUM.getDust(8), },
(FluidStack) null,
ELEMENT.getInstance().OXYGEN.getFluidStack(8000),
- new ItemStack[] {
- ELEMENT.getInstance().ALUMINIUM.getIngot(8),
- ELEMENT.getInstance().STRONTIUM.getIngot(8)
- },
- new int[] {10000, 10000}, // Output Chance
+ new ItemStack[] { ELEMENT.getInstance().ALUMINIUM.getIngot(8),
+ ELEMENT.getInstance().STRONTIUM.getIngot(8) },
+ new int[] { 10000, 10000 }, // Output Chance
20 * 120,
480 * 4);
// molten botmium
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(4),
- ItemUtils.getItemStackOfAmountFromOreDict("dustNitinol60", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 6),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRuthenium", 6),
- ItemUtils.getItemStackOfAmountFromOreDict("dustThallium", 3)
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(4),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustNitinol60", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 6),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRuthenium", 6),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustThallium", 3) },
GT_Values.NF,
ALLOY.BOTMIUM.getFluidStack(2304),
0,
@@ -1158,7 +978,10 @@ public class RECIPES_GREGTECH {
// Ender Fluid
CORE.RA.addFluidExtractionRecipe(
- ItemUtils.getSimpleStack(Items.ender_pearl), FluidUtils.getFluidStack("ender", 250), 100, 30);
+ ItemUtils.getSimpleStack(Items.ender_pearl),
+ FluidUtils.getFluidStack("ender", 250),
+ 100,
+ 30);
// Blazing Pyrotheum
CORE.RA.addFluidExtractionRecipe(
@@ -1237,46 +1060,41 @@ public class RECIPES_GREGTECH {
ItemStack cropGrape = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cropGrape", 1);
ItemStack foodRaisins = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1);
- if (cropGrape != null && foodRaisins != null)
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedBioCircuit(20), cropGrape}, // Item
- null, // Fluid input (slot 1)
- null, // Fluid output (slot 2)
- new ItemStack[] {foodRaisins}, // Output
- new int[] {10000},
- 10, // Time in ticks
- 2); // EU
+ if (cropGrape != null && foodRaisins != null) CORE.RA.addDehydratorRecipe(
+ new ItemStack[] { CI.getNumberedBioCircuit(20), cropGrape }, // Item
+ null, // Fluid input (slot 1)
+ null, // Fluid output (slot 2)
+ new ItemStack[] { foodRaisins }, // Output
+ new int[] { 10000 },
+ 10, // Time in ticks
+ 2); // EU
// Process Waste Water
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedBioCircuit(21)},
+ new ItemStack[] { CI.getNumberedBioCircuit(21) },
FluidUtils.getFluidStack("fluid.sludge", 1000),
FluidUtils.getFluidStack("nitricacid", 10),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1)
- },
- new int[] {10, 5, 5, 4, 4, 3, 2, 2, 1},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) },
+ new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 },
2 * 20,
500); // EU
// C8H10 = C8H8 + 2H
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedAdvancedCircuit(18), CI.emptyCells(3)},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), CI.emptyCells(3) },
FluidUtils.getFluidStack("fluid.ethylbenzene", 1000),
null,
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2)
- },
- new int[] {10000, 10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) },
+ new int[] { 10000, 10000 },
3 * 20,
30);
@@ -1288,24 +1106,22 @@ public class RECIPES_GREGTECH {
aLeather1 = ItemUtils.getCorrectStacktype("harvestcraft:hardenedleatherItem", 1);
aLeather2 = ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1);
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedAdvancedCircuit(18), aLeather1},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), aLeather1 },
FluidUtils.getFluidStack("fluid.ethylbenzene", 1000),
null,
- new ItemStack[] {aLeather2},
- new int[] {10000},
+ new ItemStack[] { aLeather2 },
+ new int[] { 10000 },
5 * 20,
180);
}
// Alternative ACETIC ANHYDRIDE recipe for Kevlar Line
// 2C2H4O2 = C4H6O3 + H2O
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedAdvancedCircuit(18), CI.emptyCells(1)},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), CI.emptyCells(1) },
FluidUtils.getFluidStack("aceticacid", 2000),
MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1),
- },
- new int[] {10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1), },
+ new int[] { 10000 },
30 * 20,
480);
}
@@ -1314,21 +1130,21 @@ public class RECIPES_GREGTECH {
// Styrene
// C8H10 = C8H8 + 2H
CORE.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {CI.getNumberedCircuit(24)},
- new FluidStack[] {FluidUtils.getFluidStack("fluid.ethylbenzene", 1000)},
- new FluidStack[] {MaterialUtils.getMaterial("Styrene").getFluid(1000), Materials.Hydrogen.getGas(2000)},
+ new ItemStack[] { CI.getNumberedCircuit(24) },
+ new FluidStack[] { FluidUtils.getFluidStack("fluid.ethylbenzene", 1000) },
+ new FluidStack[] { MaterialUtils.getMaterial("Styrene").getFluid(1000),
+ Materials.Hydrogen.getGas(2000) },
null,
30,
30);
// Short-cut Styrene
// C6H6 + C2H4 = C8H8 + 2H
CORE.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {CI.getNumberedCircuit(24)},
- new FluidStack[] {
- MaterialUtils.getMaterial("Ethylene").getGas(500),
- MaterialUtils.getMaterial("Benzene").getFluid(500)
- },
- new FluidStack[] {MaterialUtils.getMaterial("Styrene").getFluid(500), Materials.Hydrogen.getGas(1000)},
+ new ItemStack[] { CI.getNumberedCircuit(24) },
+ new FluidStack[] { MaterialUtils.getMaterial("Ethylene").getGas(500),
+ MaterialUtils.getMaterial("Benzene").getFluid(500) },
+ new FluidStack[] { MaterialUtils.getMaterial("Styrene").getFluid(500),
+ Materials.Hydrogen.getGas(1000) },
null,
240,
120);
@@ -1360,17 +1176,15 @@ public class RECIPES_GREGTECH {
120);
/*
- addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1),
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 4), FluidUtils.getFluidStack("oxygen", 16000),
- ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 240);
+ * addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1),
+ * ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 4), FluidUtils.getFluidStack("oxygen", 16000),
+ * ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 240);
*/
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1),
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 4),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(3), 4),
- ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorHV", 2)
- },
+ new ItemStack[] { ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(3), 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorHV", 2) },
FluidUtils.getFluidStack("oxygen", 16000),
ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1),
64,
@@ -1385,87 +1199,62 @@ public class RECIPES_GREGTECH {
ItemStack T6 = GregtechItemList.Casing_Vanadium_Redox_MAX.get(1);
/*
- addAR(T1,
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTitanium", 4),
- FluidUtils.getFluidStack("nitrogen", 16000),
- T2, 120, 2000);
- */
+ * addAR(T1, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTitanium", 4),
+ * FluidUtils.getFluidStack("nitrogen", 16000), T2, 120, 2000);
+ */
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- T1,
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTitanium", 4),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 4),
- ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorEV", 2)
- },
+ new ItemStack[] { T1, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTitanium", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorEV", 2) },
FluidUtils.getFluidStack("nitrogen", 16000),
T2,
120,
2000);
/*
- addAR(T2,
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTungstenSteel", 4),
- FluidUtils.getFluidStack("helium", 8000),
- T3, 250, 8000);
- */
+ * addAR(T2, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTungstenSteel", 4),
+ * FluidUtils.getFluidStack("helium", 8000), T3, 250, 8000);
+ */
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- T2,
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTungstenSteel", 4),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 4),
- ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorIV", 2)
- },
+ new ItemStack[] { T2, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseTungstenSteel", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorIV", 2) },
FluidUtils.getFluidStack("helium", 8000),
T3,
250,
8000);
/*
- addAR(T3,
- ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 16),
- FluidUtils.getFluidStack("argon", 4000),
- T4, 500, 32000);
- */
+ * addAR(T3, ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 16),
+ * FluidUtils.getFluidStack("argon", 4000), T4, 500, 32000);
+ */
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- T3,
- ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 16),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4),
- ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorLuV", 2)
- },
+ new ItemStack[] { T3, ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 16),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorLuV", 2) },
FluidUtils.getFluidStack("argon", 4000),
T4,
500,
32000);
/*
- addAR(T4,
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNaquadah", 4),
- FluidUtils.getFluidStack("radon", 4000),
- T5, 1000, 128000);
- */
+ * addAR(T4, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNaquadah", 4),
+ * FluidUtils.getFluidStack("radon", 4000), T5, 1000, 128000);
+ */
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- T4,
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNaquadah", 4),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 4),
- ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorZPM", 2)
- },
+ new ItemStack[] { T4, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNaquadah", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorZPM", 2) },
FluidUtils.getFluidStack("radon", 4000),
T5,
1000,
128000);
/*
- addAR(T5,
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseAmericium", 4),
- FluidUtils.getFluidStack("krypton", 500),
- T6, 2000, 512000);
- */
+ * addAR(T5, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseAmericium", 4),
+ * FluidUtils.getFluidStack("krypton", 500), T6, 2000, 512000);
+ */
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- T5,
- ItemUtils.getItemStackOfAmountFromOreDict("plateDenseAmericium", 4),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 4),
- ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorUV", 2)
- },
+ new ItemStack[] { T5, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseAmericium", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireGt01SuperconductorUV", 2) },
FluidUtils.getFluidStack("krypton", 500),
T6,
2000,
@@ -1486,111 +1275,84 @@ public class RECIPES_GREGTECH {
30,
120);
- /*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16),
- ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null,
- GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);*/
-
- /*CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
- GregtechItemList.Casing_Multi_Use.get(1),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 8),
- CI.sensor_HV,
- CI.emitter_HV,
- CI.fieldGenerator_HV,
- },
- null,
- ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame),
- 20*20,
- 2048);
-
- */
+ /*
+ * addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16),
+ * ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null,
+ * GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);
+ */
+
+ /*
+ * CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { GregtechItemList.Casing_Multi_Use.get(1),
+ * ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1),
+ * ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 8), CI.sensor_HV, CI.emitter_HV,
+ * CI.fieldGenerator_HV, }, null, ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame), 20*20, 2048);
+ */
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {ItemUtils.getSimpleStack(ModItems.itemRope, 6)},
+ new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemRope, 6) },
null,
ItemUtils.getSimpleStack(ModBlocks.blockNet, 2),
1 * 20,
8);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(CI.explosiveITNT, 2),
- ItemUtils.getSimpleStack(CI.explosiveTNT, 4),
- ELEMENT.getInstance().SULFUR.getDust(2),
- ELEMENT.getInstance().IRON.getFrameBox(1)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(CI.explosiveITNT, 2),
+ ItemUtils.getSimpleStack(CI.explosiveTNT, 4), ELEMENT.getInstance().SULFUR.getDust(2),
+ ELEMENT.getInstance().IRON.getFrameBox(1) },
null,
ItemUtils.getSimpleStack(ModBlocks.blockMiningExplosive, 3),
5 * 20,
60);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(Items.nether_star),
- ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 8),
- ItemUtils.getItemStackOfAmountFromOreDict("stickBlackSteel", 8)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(Items.nether_star),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("stickBlackSteel", 8) },
null,
ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 64),
30 * 20,
500);
- ItemStack aFluidReg1 = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV)
- .get(1);
- ItemStack aFluidReg2 = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV)
- .get(1);
- ItemStack aFluidReg3 = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV)
- .get(1);
- ItemStack aFluidReg4 = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV)
- .get(1);
+ ItemStack aFluidReg1 = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1);
+ ItemStack aFluidReg2 = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1);
+ ItemStack aFluidReg3 = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1);
+ ItemStack aFluidReg4 = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- aFluidReg1,
- CI.electricMotor_LV,
- CI.getTieredComponent(OrePrefixes.bolt, 1, GTNH ? 8 : 4),
- ItemUtils.getItemStackOfAmountFromOreDict("ringBrass", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("stickBrass", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 2)
- },
+ new ItemStack[] { aFluidReg1, CI.electricMotor_LV,
+ CI.getTieredComponent(OrePrefixes.bolt, 1, GTNH ? 8 : 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("ringBrass", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("stickBrass", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 2) },
null,
ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1),
10 * 20,
30);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- aFluidReg2,
- CI.electricMotor_MV,
- CI.getTieredComponent(OrePrefixes.bolt, 2, GTNH ? 8 : 4),
- ItemUtils.getItemStackOfAmountFromOreDict("ringInvar", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("stickInvar", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("plateAluminium", 2)
- },
+ new ItemStack[] { aFluidReg2, CI.electricMotor_MV,
+ CI.getTieredComponent(OrePrefixes.bolt, 2, GTNH ? 8 : 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("ringInvar", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("stickInvar", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateAluminium", 2) },
null,
ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1),
10 * 20 * 2,
120);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- aFluidReg3,
- CI.electricMotor_HV,
- CI.getTieredComponent(OrePrefixes.bolt, 3, GTNH ? 8 : 4),
- ItemUtils.getItemStackOfAmountFromOreDict("ringChrome", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("stickChrome", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 2)
- },
+ new ItemStack[] { aFluidReg3, CI.electricMotor_HV,
+ CI.getTieredComponent(OrePrefixes.bolt, 3, GTNH ? 8 : 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("ringChrome", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("stickChrome", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 2) },
null,
ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1),
10 * 20 * 3,
480);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- aFluidReg4,
- CI.electricMotor_EV,
- CI.getTieredComponent(OrePrefixes.bolt, 4, GTNH ? 8 : 4),
- ItemUtils.getItemStackOfAmountFromOreDict("ringTitanium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("stickTitanium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 2)
- },
+ new ItemStack[] { aFluidReg4, CI.electricMotor_EV,
+ CI.getTieredComponent(OrePrefixes.bolt, 4, GTNH ? 8 : 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("ringTitanium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("stickTitanium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 2) },
null,
ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1),
10 * 20 * 4,
@@ -1623,58 +1385,33 @@ public class RECIPES_GREGTECH {
// Low tier Charge Packs
- final ItemStack[] aPackBatteries = new ItemStack[] {
- ItemList.Battery_RE_LV_Lithium.get(4),
- ItemList.Battery_RE_MV_Lithium.get(4),
- ItemList.Battery_RE_HV_Lithium.get(4),
- GregtechItemList.Battery_RE_EV_Lithium.get(4),
- ItemList.Energy_LapotronicOrb.get(4),
- };
- final ItemStack[] aPackPlates = new ItemStack[] {
- CI.getPlate(1, 8), CI.getPlate(2, 8), CI.getPlate(3, 8), CI.getPlate(4, 8), CI.getPlate(5, 8),
- };
- final ItemStack[] aPackWire = new ItemStack[] {
- CI.getTieredComponent(OrePrefixes.wireGt02, 1, 6),
- CI.getTieredComponent(OrePrefixes.wireGt04, 2, 6),
- CI.getTieredComponent(OrePrefixes.wireGt08, 3, 6),
- CI.getTieredComponent(OrePrefixes.wireGt12, 4, 6),
- CI.getTieredComponent(OrePrefixes.wireGt16, 5, 6),
- };
- final ItemStack[] aPackCircuit = new ItemStack[] {
- CI.getTieredComponent(OrePrefixes.circuit, 1, 4),
- CI.getTieredComponent(OrePrefixes.circuit, 2, 4),
- CI.getTieredComponent(OrePrefixes.circuit, 3, 4),
- CI.getTieredComponent(OrePrefixes.circuit, 4, 4),
- CI.getTieredComponent(OrePrefixes.circuit, 5, 4),
- };
- final ItemStack[] aPackRing = new ItemStack[] {
- CI.getTieredComponent(OrePrefixes.ring, 1, 12),
- CI.getTieredComponent(OrePrefixes.ring, 2, 12),
- CI.getTieredComponent(OrePrefixes.ring, 3, 12),
- CI.getTieredComponent(OrePrefixes.ring, 4, 12),
- CI.getTieredComponent(OrePrefixes.ring, 5, 12),
- };
- final ItemStack[] aPackOutput = new ItemStack[] {
- ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_1),
- ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_2),
- ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_3),
- ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_4),
- ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_5)
- };
+ final ItemStack[] aPackBatteries = new ItemStack[] { ItemList.Battery_RE_LV_Lithium.get(4),
+ ItemList.Battery_RE_MV_Lithium.get(4), ItemList.Battery_RE_HV_Lithium.get(4),
+ GregtechItemList.Battery_RE_EV_Lithium.get(4), ItemList.Energy_LapotronicOrb.get(4), };
+ final ItemStack[] aPackPlates = new ItemStack[] { CI.getPlate(1, 8), CI.getPlate(2, 8), CI.getPlate(3, 8),
+ CI.getPlate(4, 8), CI.getPlate(5, 8), };
+ final ItemStack[] aPackWire = new ItemStack[] { CI.getTieredComponent(OrePrefixes.wireGt02, 1, 6),
+ CI.getTieredComponent(OrePrefixes.wireGt04, 2, 6), CI.getTieredComponent(OrePrefixes.wireGt08, 3, 6),
+ CI.getTieredComponent(OrePrefixes.wireGt12, 4, 6), CI.getTieredComponent(OrePrefixes.wireGt16, 5, 6), };
+ final ItemStack[] aPackCircuit = new ItemStack[] { CI.getTieredComponent(OrePrefixes.circuit, 1, 4),
+ CI.getTieredComponent(OrePrefixes.circuit, 2, 4), CI.getTieredComponent(OrePrefixes.circuit, 3, 4),
+ CI.getTieredComponent(OrePrefixes.circuit, 4, 4), CI.getTieredComponent(OrePrefixes.circuit, 5, 4), };
+ final ItemStack[] aPackRing = new ItemStack[] { CI.getTieredComponent(OrePrefixes.ring, 1, 12),
+ CI.getTieredComponent(OrePrefixes.ring, 2, 12), CI.getTieredComponent(OrePrefixes.ring, 3, 12),
+ CI.getTieredComponent(OrePrefixes.ring, 4, 12), CI.getTieredComponent(OrePrefixes.ring, 5, 12), };
+ final ItemStack[] aPackOutput = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_1),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_2),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_3),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_4),
+ ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_5) };
for (int i = 1; i < 6; i++) {
int aAS = i - 1;
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- aPackPlates[aAS],
- aPackRing[aAS],
- aPackWire[aAS],
- aPackCircuit[aAS],
- aPackBatteries[aAS],
- CI.getSensor(i, GTNH ? 4 : 2),
- },
+ new ItemStack[] { aPackPlates[aAS], aPackRing[aAS], aPackWire[aAS], aPackCircuit[aAS],
+ aPackBatteries[aAS], CI.getSensor(i, GTNH ? 4 : 2), },
CI.getTieredFluid(i, (144 * (GTNH ? 4 : 2))),
aPackOutput[aAS],
30 * 20 * i,
@@ -1740,14 +1477,13 @@ public class RECIPES_GREGTECH {
// Turbine Housing Research Page
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(17),
- ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", GTNH ? 64 : 32),
- CI.getSensor(6, GTNH ? 6 : 3),
- CI.getBolt(7, GTNH ? 64 : 32),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), GTNH ? 12 : 6)
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(17),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", GTNH ? 64 : 32),
+ CI.getSensor(6, GTNH ? 6 : 3), CI.getBolt(7, GTNH ? 64 : 32),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32),
+ ItemUtils.getItemStackOfAmountFromOreDict(
+ CI.getTieredCircuitOreDictName(7),
+ GTNH ? 12 : 6) },
CI.getAlternativeTieredFluid(7, 144 * 32),
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1),
20 * 60 * 5,
@@ -1755,13 +1491,13 @@ public class RECIPES_GREGTECH {
// Cloaking Device Research Page
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(17),
- ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4),
- CI.getFieldGenerator(6, GTNH ? 16 : 8),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFinePalladium", GTNH ? 32 : 16),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), GTNH ? 12 : 6)
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(17),
+ ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 4),
+ CI.getFieldGenerator(6, GTNH ? 16 : 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireFinePalladium", GTNH ? 32 : 16),
+ ItemUtils.getItemStackOfAmountFromOreDict(
+ CI.getTieredCircuitOreDictName(6),
+ GTNH ? 12 : 6) },
CI.getAlternativeTieredFluid(7, 144 * 32),
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1),
20 * 60 * 10,
@@ -1769,13 +1505,12 @@ public class RECIPES_GREGTECH {
// Supreme Pizza Gloves
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(19),
- ItemUtils.getSimpleStack(ModItems.itemRope, GTNH ? 32 : 16),
- ItemUtils.getItemStackOfAmountFromOreDict("gearGtSmallWroughtIron", GTNH ? 8 : 4),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 32 : 16),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), GTNH ? 2 : 1)
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(19),
+ ItemUtils.getSimpleStack(ModItems.itemRope, GTNH ? 32 : 16),
+ ItemUtils.getItemStackOfAmountFromOreDict("gearGtSmallWroughtIron", GTNH ? 8 : 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 32 : 16),
+ ItemUtils
+ .getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), GTNH ? 2 : 1) },
FluidUtils.getFluidStack("molten.rubber", 2000),
ItemUtils.getSimpleStack(ModItems.itemPersonalFireProofDevice),
20 * 60 * 5,
@@ -1783,13 +1518,8 @@ public class RECIPES_GREGTECH {
}
}
- private static boolean addAR(
- final ItemStack inputA,
- final ItemStack inputB,
- final FluidStack inputFluidA,
- final ItemStack outputA,
- final int seconds,
- final int voltage) {
+ private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final FluidStack inputFluidA,
+ final ItemStack outputA, final int seconds, final int voltage) {
// return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA,
// seconds*20, voltage);
return GT_Values.RA.addAssemblerRecipe(inputA, inputB, inputFluidA, outputA, seconds * 20, voltage);
@@ -1813,25 +1543,28 @@ public class RECIPES_GREGTECH {
// Apatite Distillation
/*
- * so if you dissolve aparite in sulphuric acid you'll get a mixture of
- * SO2, H2O, HF and HCl
+ * so if you dissolve aparite in sulphuric acid you'll get a mixture of SO2, H2O, HF and HCl
*/
- final FluidStack[] apatiteOutput = {
- FluidUtils.getFluidStack("sulfurousacid", 3800),
- FluidUtils.getFluidStack("hydrogenchloride", 1000),
- FluidUtils.getFluidStack("hydrofluoricacid", 400)
- };
+ final FluidStack[] apatiteOutput = { FluidUtils.getFluidStack("sulfurousacid", 3800),
+ FluidUtils.getFluidStack("hydrogenchloride", 1000), FluidUtils.getFluidStack("hydrofluoricacid", 400) };
GT_Values.RA.addDistillationTowerRecipe(
- FluidUtils.getFluidStack("sulfuricapatite", 5200), apatiteOutput, null, 45 * 20, 120);
+ FluidUtils.getFluidStack("sulfuricapatite", 5200),
+ apatiteOutput,
+ null,
+ 45 * 20,
+ 120);
- final FluidStack[] sulfurousacidOutput = {
- FluidUtils.getFluidStack("sulfurdioxide", 500), FluidUtils.getFluidStack("water", 500)
- };
+ final FluidStack[] sulfurousacidOutput = { FluidUtils.getFluidStack("sulfurdioxide", 500),
+ FluidUtils.getFluidStack("water", 500) };
GT_Values.RA.addDistillationTowerRecipe(
- FluidUtils.getFluidStack("sulfurousacid", 1000), sulfurousacidOutput, null, 10 * 20, 60);
+ FluidUtils.getFluidStack("sulfurousacid", 1000),
+ sulfurousacidOutput,
+ null,
+ 10 * 20,
+ 60);
if (!GTNH) {
- final FluidStack[] sulfurdioxideOutput = {FluidUtils.getFluidStack("oxygen", 2000)};
+ final FluidStack[] sulfurdioxideOutput = { FluidUtils.getFluidStack("oxygen", 2000) };
GT_Values.RA.addDistillationTowerRecipe(
FluidUtils.getFluidStack("sulfurdioxide", 144 * 3),
sulfurdioxideOutput,
@@ -1853,29 +1586,25 @@ public class RECIPES_GREGTECH {
HotFuel.addNewHotFuel(
FluidUtils.getLava(83),
FluidUtils.getPahoehoeLava(83),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("nuggetCopper", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("nuggetTin", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("nuggetGold", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("nuggetSilver", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("nuggetTantalum", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1),
- ItemUtils.getSimpleStack(Blocks.obsidian)
- },
- new int[] {2000, 1000, 250, 250, 250, 250, 500},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("nuggetCopper", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("nuggetTin", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("nuggetGold", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("nuggetSilver", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("nuggetTantalum", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1),
+ ItemUtils.getSimpleStack(Blocks.obsidian) },
+ new int[] { 2000, 1000, 250, 250, 250, 250, 500 },
0);
HotFuel.addNewHotFuel(
FluidUtils.getPahoehoeLava(83),
GT_Values.NF,
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("nuggetBronze", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("nuggetElectrum", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("nuggetTantalum", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1),
- ItemUtils.getSimpleStack(Blocks.obsidian)
- },
- new int[] {750, 250, 250, 250, 1850},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("nuggetBronze", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("nuggetElectrum", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("nuggetTantalum", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1),
+ ItemUtils.getSimpleStack(Blocks.obsidian) },
+ new int[] { 750, 250, 250, 250, 1850 },
0);
HotFuel.addNewHotFuel(
@@ -1885,8 +1614,8 @@ public class RECIPES_GREGTECH {
0);
/*
- * HotFuel.addNewHotFuel( FluidUtils.getFluidStack("ic2hotcoolant",
- * 100), GT_Values.NF, new ItemStack[]{}, new int[]{}, 0);
+ * HotFuel.addNewHotFuel( FluidUtils.getFluidStack("ic2hotcoolant", 100), GT_Values.NF, new ItemStack[]{}, new
+ * int[]{}, 0);
*/
ThermalFuel.addSteamTurbineFuel(FluidUtils.getFluidStack("steam", 1024));
@@ -2091,7 +1820,8 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9));
GT_ModHandler.addPulverisationRecipe(
- GregtechItemList.Bomb_Cast_Broken.get(1), ItemUtils.getItemStackOfAmountFromOreDict("dustClay", 3));
+ GregtechItemList.Bomb_Cast_Broken.get(1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustClay", 3));
if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) {
GT_ModHandler.addPulverisationRecipe(
@@ -2106,9 +1836,9 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(1),
FluidUtils.getFluidStack("molten.bismuth", 1),
- new ItemStack[] {GregtechItemList.Pellet_RTG_PO210.get(1)},
+ new ItemStack[] { GregtechItemList.Pellet_RTG_PO210.get(1) },
null,
- new int[] {100},
+ new int[] { 100 },
20 * 300 * 100,
2040 * 4,
500 * 20);
@@ -2117,9 +1847,9 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(1),
FluidUtils.getFluidStack("molten.americium", 1),
- new ItemStack[] {GregtechItemList.Pellet_RTG_AM241.get(4)},
+ new ItemStack[] { GregtechItemList.Pellet_RTG_AM241.get(4) },
null,
- new int[] {2500},
+ new int[] { 2500 },
20 * 300 * 100,
1020 * 4,
500 * 20); // PO Special Value
@@ -2128,9 +1858,9 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(1),
FluidUtils.getFluidStack("molten.uranium235", 10),
- new ItemStack[] {GregtechItemList.Pellet_RTG_SR90.get(1)},
+ new ItemStack[] { GregtechItemList.Pellet_RTG_SR90.get(1) },
null,
- new int[] {570},
+ new int[] { 570 },
20 * 300 * 100,
1020 * 4,
500 * 20); // PO Special Value
@@ -2139,9 +1869,9 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(1),
FluidUtils.getFluidStack("molten.uranium233", 10),
- new ItemStack[] {GregtechItemList.Pellet_RTG_SR90.get(1)},
+ new ItemStack[] { GregtechItemList.Pellet_RTG_SR90.get(1) },
null,
- new int[] {660},
+ new int[] { 660 },
20 * 300 * 100,
1020 * 4,
500 * 20); // PO Special Value
@@ -2150,9 +1880,9 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(1),
FluidUtils.getFluidStack("molten.plutonium239", 10),
- new ItemStack[] {GregtechItemList.Pellet_RTG_SR90.get(1)},
+ new ItemStack[] { GregtechItemList.Pellet_RTG_SR90.get(1) },
null,
- new int[] {220},
+ new int[] { 220 },
20 * 300 * 100,
1020 * 4,
500 * 20); // PO Special Value
@@ -2161,20 +1891,20 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(1),
FluidUtils.getFluidStack("molten.plutonium238", 1),
- new ItemStack[] {GregtechItemList.Pellet_RTG_PU238.get(2)},
+ new ItemStack[] { GregtechItemList.Pellet_RTG_PU238.get(2) },
null,
- new int[] {780},
+ new int[] { 780 },
20 * 300 * 100,
1020 * 4,
500 * 20); // PO Special Value
// Neptunium
CORE.RA.addCyclotronRecipe(
- new ItemStack[] {ELEMENT.getInstance().URANIUM238.getDust(1)},
+ new ItemStack[] { ELEMENT.getInstance().URANIUM238.getDust(1) },
FluidUtils.getFluidStack("deuterium", 400),
- new ItemStack[] {ItemUtils.getSimpleStack(ModItems.dustNeptunium238)},
+ new ItemStack[] { ItemUtils.getSimpleStack(ModItems.dustNeptunium238) },
null,
- new int[] {500},
+ new int[] { 500 },
20 * 5,
500 * 4,
500 * 20); // PO Special Value
@@ -2187,16 +1917,11 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(3),
FluidUtils.getFluidStack("plasma.hydrogen", 100),
- new ItemStack[] {
- Particle.getBaseParticle(Particle.UP),
- Particle.getBaseParticle(Particle.DOWN),
- Particle.getBaseParticle(Particle.CHARM),
- Particle.getBaseParticle(Particle.STRANGE),
- Particle.getBaseParticle(Particle.TOP),
- Particle.getBaseParticle(Particle.BOTTOM),
- },
+ new ItemStack[] { Particle.getBaseParticle(Particle.UP), Particle.getBaseParticle(Particle.DOWN),
+ Particle.getBaseParticle(Particle.CHARM), Particle.getBaseParticle(Particle.STRANGE),
+ Particle.getBaseParticle(Particle.TOP), Particle.getBaseParticle(Particle.BOTTOM), },
null,
- new int[] {50, 50, 50, 50, 50, 50},
+ new int[] { 50, 50, 50, 50, 50, 50 },
20 * 300 * 9,
(int) MaterialUtils.getVoltageForTier(7),
750 * 20);
@@ -2205,16 +1930,12 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(6),
FluidUtils.getFluidStack("plasma.helium", 1500),
- new ItemStack[] {
- Particle.getBaseParticle(Particle.ELECTRON),
- Particle.getBaseParticle(Particle.MUON),
- Particle.getBaseParticle(Particle.TAU),
- Particle.getBaseParticle(Particle.ELECTRON_NEUTRINO),
- Particle.getBaseParticle(Particle.MUON_NEUTRINO),
- Particle.getBaseParticle(Particle.TAU_NEUTRINO),
- },
+ new ItemStack[] { Particle.getBaseParticle(Particle.ELECTRON), Particle.getBaseParticle(Particle.MUON),
+ Particle.getBaseParticle(Particle.TAU), Particle.getBaseParticle(Particle.ELECTRON_NEUTRINO),
+ Particle.getBaseParticle(Particle.MUON_NEUTRINO),
+ Particle.getBaseParticle(Particle.TAU_NEUTRINO), },
null,
- new int[] {600, 40, 20, 15, 10, 5},
+ new int[] { 600, 40, 20, 15, 10, 5 },
20 * 300 * 8,
(int) MaterialUtils.getVoltageForTier(7),
750 * 20);
@@ -2223,15 +1944,11 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(9),
FluidUtils.getFluidStack("plasma.helium", 1500),
- new ItemStack[] {
- Particle.getBaseParticle(Particle.GLUON),
- Particle.getBaseParticle(Particle.PHOTON),
- Particle.getBaseParticle(Particle.Z_BOSON),
- Particle.getBaseParticle(Particle.W_BOSON),
- Particle.getBaseParticle(Particle.HIGGS_BOSON),
- },
+ new ItemStack[] { Particle.getBaseParticle(Particle.GLUON), Particle.getBaseParticle(Particle.PHOTON),
+ Particle.getBaseParticle(Particle.Z_BOSON), Particle.getBaseParticle(Particle.W_BOSON),
+ Particle.getBaseParticle(Particle.HIGGS_BOSON), },
null,
- new int[] {160, 260, 150, 150, 1},
+ new int[] { 160, 260, 150, 150, 1 },
20 * 300 * 6,
(int) MaterialUtils.getVoltageForTier(7),
750 * 20);
@@ -2240,18 +1957,13 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(12),
FluidUtils.getFluidStack("plasma.beryllium", 2500),
- new ItemStack[] {
- Particle.getBaseParticle(Particle.GRAVITON),
- Particle.getBaseParticle(Particle.ETA_MESON),
- Particle.getBaseParticle(Particle.PION),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.NEUTRON),
- Particle.getBaseParticle(Particle.LAMBDA),
- Particle.getBaseParticle(Particle.OMEGA),
- Particle.getBaseParticle(Particle.HIGGS_BOSON),
- },
+ new ItemStack[] { Particle.getBaseParticle(Particle.GRAVITON),
+ Particle.getBaseParticle(Particle.ETA_MESON), Particle.getBaseParticle(Particle.PION),
+ Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON),
+ Particle.getBaseParticle(Particle.LAMBDA), Particle.getBaseParticle(Particle.OMEGA),
+ Particle.getBaseParticle(Particle.HIGGS_BOSON), },
null,
- new int[] {10, 20, 20, 10, 10, 5, 5, 2},
+ new int[] { 10, 20, 20, 10, 10, 5, 5, 2 },
17 * 247 * 32,
(int) MaterialUtils.getVoltageForTier(8),
750 * 20);
@@ -2260,10 +1972,10 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(15),
FluidUtils.getFluidStack("plasma.hydrogen", GTNH ? 50 : 10),
- new ItemStack[] {Particle.getBaseParticle(Particle.GRAVITON), Particle.getBaseParticle(Particle.UNKNOWN)
- },
+ new ItemStack[] { Particle.getBaseParticle(Particle.GRAVITON),
+ Particle.getBaseParticle(Particle.UNKNOWN) },
null,
- new int[] {15, 100},
+ new int[] { 15, 100 },
20 * (GTNH ? 90 : 30),
(int) MaterialUtils.getVoltageForTier(6),
1000 * 20);
@@ -2277,13 +1989,11 @@ public class RECIPES_GREGTECH {
// Quantum Anomaly
CORE.RA.addCyclotronRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(24), Particle.getBaseParticle(Particle.UNKNOWN),
- },
+ new ItemStack[] { CI.getNumberedCircuit(24), Particle.getBaseParticle(Particle.UNKNOWN), },
aPlasma,
- new ItemStack[] {GregtechItemList.Laser_Lens_Special.get(1)},
+ new ItemStack[] { GregtechItemList.Laser_Lens_Special.get(1) },
null,
- new int[] {100},
+ new int[] { 100 },
20 * (GTNH ? 25 : 60),
(int) MaterialUtils.getVoltageForTier(8),
500 * 20);
@@ -2309,19 +2019,11 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(1 + (tenCountA - 1)),
aPlasma2 != null ? aPlasma2 : aPlasma3,
- new ItemStack[] {
- Particle.getIon(y, 1),
- Particle.getIon(y, 2),
- Particle.getIon(y, 3),
- Particle.getIon(y, -1),
- Particle.getIon(y, -2),
- Particle.getIon(y, -3),
- Particle.getIon(y, 1),
- Particle.getIon(y, 2),
- Particle.getIon(y, -1),
- },
+ new ItemStack[] { Particle.getIon(y, 1), Particle.getIon(y, 2), Particle.getIon(y, 3),
+ Particle.getIon(y, -1), Particle.getIon(y, -2), Particle.getIon(y, -3),
+ Particle.getIon(y, 1), Particle.getIon(y, 2), Particle.getIon(y, -1), },
null,
- new int[] {275, 250, 225, 275, 250, 225, 275, 250, 275},
+ new int[] { 275, 250, 225, 275, 250, 225, 275, 250, 275 },
20 * 20 * (IonCount++) * tenCountA,
(int) MaterialUtils.getVoltageForTier(7),
1500 * 20 * tenCountA);
@@ -2341,123 +2043,83 @@ public class RECIPES_GREGTECH {
CORE.RA.addCyclotronRecipe(
CI.getNumberedCircuit(24),
FluidUtils.getWildcardFluidStack("hydrogen", 1000),
- new ItemStack[] {
- Particle.getIon("Hydrogen", 1),
- Particle.getIon("Hydrogen", 2),
- Particle.getIon("Hydrogen", 3),
- Particle.getIon("Hydrogen", 1),
- Particle.getIon("Hydrogen", 2),
- Particle.getIon("Hydrogen", 3),
- Particle.getIon("Hydrogen", -1),
- Particle.getIon("Hydrogen", -2),
- Particle.getIon("Hydrogen", -3)
- },
+ new ItemStack[] { Particle.getIon("Hydrogen", 1), Particle.getIon("Hydrogen", 2),
+ Particle.getIon("Hydrogen", 3), Particle.getIon("Hydrogen", 1), Particle.getIon("Hydrogen", 2),
+ Particle.getIon("Hydrogen", 3), Particle.getIon("Hydrogen", -1),
+ Particle.getIon("Hydrogen", -2), Particle.getIon("Hydrogen", -3) },
null,
- new int[] {500, 500, 500, 500, 500, 500, 500, 500, 500},
+ new int[] { 500, 500, 500, 500, 500, 500, 500, 500, 500 },
20 * 20,
(int) MaterialUtils.getVoltageForTier(6),
2500);
// Generate Hydrogen Plasma Recipe
CORE.RA.addCyclotronRecipe(
- new ItemStack[] {
- Particle.getIon("Hydrogen", 0), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1)
- },
+ new ItemStack[] { Particle.getIon("Hydrogen", 0),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1) },
null,
- new ItemStack[] {
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.NEUTRON),
- Particle.getBaseParticle(Particle.ELECTRON),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- CI.emptyCells(1)
- },
+ new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON),
+ Particle.getBaseParticle(Particle.ELECTRON), Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN),
+ CI.emptyCells(1) },
FluidUtils.getFluidStack("plasma.hydrogen", 100),
- new int[] {1250, 1250, 1250, 750, 750, 750, 10000},
+ new int[] { 1250, 1250, 1250, 750, 750, 750, 10000 },
20 * 60 * 2,
(int) MaterialUtils.getVoltageForTier(6),
750 * 20);
CORE.RA.addCyclotronRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(21), Particle.getIon("Hydrogen", 0),
- },
+ new ItemStack[] { CI.getNumberedCircuit(21), Particle.getIon("Hydrogen", 0), },
FluidUtils.getFluidStack("hydrogen", 1000),
- new ItemStack[] {
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.NEUTRON),
- Particle.getBaseParticle(Particle.ELECTRON),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- },
+ new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON),
+ Particle.getBaseParticle(Particle.ELECTRON), Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), },
FluidUtils.getFluidStack("plasma.hydrogen", 100),
- new int[] {1250, 1250, 1250, 750, 750, 750},
+ new int[] { 1250, 1250, 1250, 750, 750, 750 },
20 * 60 * 2,
(int) MaterialUtils.getVoltageForTier(6),
750 * 20);
// Generate Protons Easily
CORE.RA.addCyclotronRecipe(
- new ItemStack[] {CI.getNumberedCircuit(20), Particle.getIon("Hydrogen", 0)},
+ new ItemStack[] { CI.getNumberedCircuit(20), Particle.getIon("Hydrogen", 0) },
FluidUtils.getWildcardFluidStack("hydrogen", 100),
- new ItemStack[] {
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- },
+ new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON),
+ Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON),
+ Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON),
+ Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON),
+ Particle.getBaseParticle(Particle.PROTON), },
null,
- new int[] {750, 750, 750, 750, 750, 750, 750, 750, 750},
+ new int[] { 750, 750, 750, 750, 750, 750, 750, 750, 750 },
20 * 20,
(int) MaterialUtils.getVoltageForTier(6),
1500);
CORE.RA.addCyclotronRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(22), Particle.getBaseParticle(Particle.UNKNOWN),
- },
+ new ItemStack[] { CI.getNumberedCircuit(22), Particle.getBaseParticle(Particle.UNKNOWN), },
FluidUtils.getWildcardFluidStack("hydrogen", 100),
- new ItemStack[] {
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- Particle.getBaseParticle(Particle.PROTON),
- },
+ new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON),
+ Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON),
+ Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON),
+ Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.PROTON),
+ Particle.getBaseParticle(Particle.PROTON), },
null,
- new int[] {375, 375, 375, 375, 375, 375, 375, 375, 375},
+ new int[] { 375, 375, 375, 375, 375, 375, 375, 375, 375 },
20 * 20,
(int) MaterialUtils.getVoltageForTier(6),
1500);
// Create Strange Dust
CORE.RA.addCyclotronRecipe(
- new ItemStack[] {
- ELEMENT.getInstance().PLUTONIUM238.getDust(1),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- Particle.getBaseParticle(Particle.UNKNOWN),
- },
+ new ItemStack[] { ELEMENT.getInstance().PLUTONIUM238.getDust(1),
+ Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN),
+ Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN), },
FluidUtils.getFluidStack(FluidUtils.getWildcardFluidStack("ender", 1000), 1000),
- new ItemStack[] {ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1)},
+ new ItemStack[] { ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1) },
null,
- new int[] {2500},
+ new int[] { 2500 },
20 * 60 * 15,
(int) MaterialUtils.getVoltageForTier(7),
250);
@@ -2474,7 +2136,7 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallNaquadahEnriched", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
- new int[] {10000, 2500, 5000},
+ new int[] { 10000, 2500, 5000 },
20 * 20,
24);
@@ -2484,7 +2146,7 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallOsmium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
- new int[] {10000, 2500, 5000},
+ new int[] { 10000, 2500, 5000 },
20 * 20,
24);
@@ -2494,7 +2156,7 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustWulfenite", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
- new int[] {10000, 3000, 3000},
+ new int[] { 10000, 3000, 3000 },
20 * 20,
24);
}
@@ -2502,14 +2164,13 @@ public class RECIPES_GREGTECH {
private static void advancedMixerRecipes() {
// HgBa2Ca2Cu3O8
- /*CORE.RA.addMixerRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3),
- FluidUtils.getFluidStack("oxygen", 8000),
- null, CI.emptyCells(1), ALLOY.HG1223.getDust(16), null, null,
- 30 * 20, 500); */
+ /*
+ * CORE.RA.addMixerRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1),
+ * ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2),
+ * ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2),
+ * ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), FluidUtils.getFluidStack("oxygen", 8000), null,
+ * CI.emptyCells(1), ALLOY.HG1223.getDust(16), null, null, 30 * 20, 500);
+ */
}
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
index f2eb616df2..ee9d2c4d29 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -6,6 +6,10 @@ import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generatePipeRecipes;
import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generateWireRecipes;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -25,9 +29,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
public class RECIPES_General {
@@ -155,13 +156,17 @@ public class RECIPES_General {
ItemUtils.getSimpleStack(ModItems.shardAqua));
GT_ModHandler.addPulverisationRecipe(
- ItemUtils.getSimpleStack(ModItems.shardAer), ItemUtils.getSimpleStack(ModItems.dustAer, 2));
+ ItemUtils.getSimpleStack(ModItems.shardAer),
+ ItemUtils.getSimpleStack(ModItems.dustAer, 2));
GT_ModHandler.addPulverisationRecipe(
- ItemUtils.getSimpleStack(ModItems.shardIgnis), ItemUtils.getSimpleStack(ModItems.dustIgnis, 2));
+ ItemUtils.getSimpleStack(ModItems.shardIgnis),
+ ItemUtils.getSimpleStack(ModItems.dustIgnis, 2));
GT_ModHandler.addPulverisationRecipe(
- ItemUtils.getSimpleStack(ModItems.shardTerra), ItemUtils.getSimpleStack(ModItems.dustTerra, 2));
+ ItemUtils.getSimpleStack(ModItems.shardTerra),
+ ItemUtils.getSimpleStack(ModItems.dustTerra, 2));
GT_ModHandler.addPulverisationRecipe(
- ItemUtils.getSimpleStack(ModItems.shardAqua), ItemUtils.getSimpleStack(ModItems.dustAqua, 2));
+ ItemUtils.getSimpleStack(ModItems.shardAqua),
+ ItemUtils.getSimpleStack(ModItems.dustAqua, 2));
}
// Rainforest oak Sapling
@@ -206,22 +211,13 @@ public class RECIPES_General {
if (!CORE.GTNH) {
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Shape_Extruder_SmallGear.get(1L),
- GT_ModHandler.RecipeBits.BUFFERED
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE,
- new Object[] {
- "hXS",
- "XPX",
- "fXd",
- Character.valueOf('P'),
- ItemList.Shape_Extruder_Gear,
- Character.valueOf('X'),
- OrePrefixes.plate.get(Materials.Steel),
- Character.valueOf('S'),
- OrePrefixes.screw.get(Materials.Steel)
- });
-
- String[] ironTypes = {"", "Wrought", "Pig", "Any"};
+ new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Gear,
+ Character.valueOf('X'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('S'),
+ OrePrefixes.screw.get(Materials.Steel) });
+
+ String[] ironTypes = { "", "Wrought", "Pig", "Any" };
for (int y = 0; y < ironTypes.length; y++) {
// Iron bars
String ironRecipe = "stick" + ironTypes[y] + "Iron";
@@ -245,23 +241,21 @@ public class RECIPES_General {
// Potin
if (RecipeUtils.addShapelessGregtechRecipe(
- new Object[] {"dustLead", "dustBronze", "dustTin", "dustLead", "dustBronze"}, ALLOY.POTIN.getDust(5))) {
+ new Object[] { "dustLead", "dustBronze", "dustTin", "dustLead", "dustBronze" },
+ ALLOY.POTIN.getDust(5))) {
Logger.INFO("Added shapeless recipe for Potin Dust.");
}
// Tumbaga
if (RecipeUtils.addShapelessGregtechRecipe(
- new Object[] {"dustGold", "dustGold", "dustCopper"},
+ new Object[] { "dustGold", "dustGold", "dustCopper" },
ItemUtils.getSimpleStack(ModItems.dustTumbagaMix))) {
Logger.INFO("Added shapeless recipe for Tumbaga Mix.");
}
if (RecipeUtils.addShapelessGregtechRecipe(
- new Object[] {
- ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
- ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
- ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
- "dustGold"
- },
+ new Object[] { ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
+ ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
+ ItemUtils.getSimpleStack(ModItems.dustTumbagaMix), "dustGold" },
ALLOY.TUMBAGA.getDust(10))) {
Logger.INFO("Added shapeless recipe for Tumbaga Dust.");
}
@@ -304,24 +298,17 @@ public class RECIPES_General {
if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(4),
- ItemUtils.getSimpleStack(Blocks.glass, 16),
- ItemUtils.getSimpleStack(Blocks.glowstone, 16),
- ItemList.Large_Fluid_Cell_Steel.get(1)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(4), ItemUtils.getSimpleStack(Blocks.glass, 16),
+ ItemUtils.getSimpleStack(Blocks.glowstone, 16), ItemList.Large_Fluid_Cell_Steel.get(1) },
FluidUtils.getFluidStack("molten.borosilicateglass", 2000),
VolumetricFlaskHelper.getLargeVolumetricFlask(2),
20 * 15,
MaterialUtils.getVoltageForTier(3));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(5),
- ItemUtils.getSimpleStack(Blocks.glass, 64),
- ItemUtils.getSimpleStack(Blocks.glowstone, 64),
- ItemList.Large_Fluid_Cell_TungstenSteel.get(1)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(5), ItemUtils.getSimpleStack(Blocks.glass, 64),
+ ItemUtils.getSimpleStack(Blocks.glowstone, 64),
+ ItemList.Large_Fluid_Cell_TungstenSteel.get(1) },
FluidUtils.getFluidStack("molten.borosilicateglass", 8000),
VolumetricFlaskHelper.getGiganticVolumetricFlask(2),
20 * 15,
@@ -359,20 +346,15 @@ public class RECIPES_General {
Logger.INFO("Added a recipe for The Alkalus Disk.");
}
- /*final String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby", "gemExquisiteSapphire"};
- final ItemStack gemShards[] = new ItemStack[]{ItemUtils.simpleMetaStack(ModItems.itemGemShards, 0, 1),
- ItemUtils.simpleMetaStack(ModItems.itemGemShards, 1, 1),
- ItemUtils.simpleMetaStack(ModItems.itemGemShards, 2, 1),
- ItemUtils.simpleMetaStack(ModItems.itemGemShards, 3, 1)};
-
- int l=0;
- for (final String gem : fancyGems){
- GameRegistry.addShapelessRecipe(
- gemShards[l],
- ItemUtils.getItemStackOfAmountFromOreDict(gem, 1),
- new ItemStack(ModItems.itemAlkalusDisk, 1, OreDictionary.WILDCARD_VALUE));
- l++;
- }*/
+ /*
+ * final String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby",
+ * "gemExquisiteSapphire"}; final ItemStack gemShards[] = new
+ * ItemStack[]{ItemUtils.simpleMetaStack(ModItems.itemGemShards, 0, 1),
+ * ItemUtils.simpleMetaStack(ModItems.itemGemShards, 1, 1), ItemUtils.simpleMetaStack(ModItems.itemGemShards, 2,
+ * 1), ItemUtils.simpleMetaStack(ModItems.itemGemShards, 3, 1)}; int l=0; for (final String gem : fancyGems){
+ * GameRegistry.addShapelessRecipe( gemShards[l], ItemUtils.getItemStackOfAmountFromOreDict(gem, 1), new
+ * ItemStack(ModItems.itemAlkalusDisk, 1, OreDictionary.WILDCARD_VALUE)); l++; }
+ */
Logger.RECIPE("[Inspection] Wither Cage");
if (RecipeUtils.addShapedRecipe(
@@ -389,30 +371,27 @@ public class RECIPES_General {
Logger.INFO("Added a recipe for Wither Cages.");
}
- /*Logger.RECIPE("[Inspection] Xp Converter");
- if (RecipeUtils.addShapedRecipe(
- getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
- ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), getSimpleStack(Items.nether_star), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1),
- getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
- ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1))){
- Logger.INFO("Added a recipe for XP Converter.");
- }*/
+ /*
+ * Logger.RECIPE("[Inspection] Xp Converter"); if (RecipeUtils.addShapedRecipe(
+ * getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1),
+ * getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1),
+ * getSimpleStack(Items.nether_star), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1),
+ * getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1),
+ * getSimpleStack(Items.experience_bottle), ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1))){
+ * Logger.INFO("Added a recipe for XP Converter."); }
+ */
// Rope/Fiber/Net
if (RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1),
- ItemUtils.getSimpleStack(Items.reeds)
- },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1),
+ ItemUtils.getSimpleStack(Items.reeds) },
ItemUtils.getSimpleStack(ModItems.itemFiber, 16))) {
Logger.INFO("Added a recipe for Fiber.");
}
if (RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1),
- ItemUtils.getSimpleStack(Blocks.sapling)
- },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1),
+ ItemUtils.getSimpleStack(Blocks.sapling) },
ItemUtils.getSimpleStack(ModItems.itemFiber, 32))) {
Logger.INFO("Added a recipe for Fiber.");
}
@@ -448,12 +427,9 @@ public class RECIPES_General {
// Slow Builders Ring
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(Blocks.ice, 8),
- ItemUtils.getSimpleStack(ModBlocks.blockNet, 8),
- ItemUtils.getSimpleStack(Blocks.vine, 8),
- ALLOY.TUMBAGA.getRing(1),
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(Blocks.ice, 8),
+ ItemUtils.getSimpleStack(ModBlocks.blockNet, 8), ItemUtils.getSimpleStack(Blocks.vine, 8),
+ ALLOY.TUMBAGA.getRing(1), },
FluidUtils.getWater(1000), // Fluid
ItemUtils.getItemStackFromFQRN("miscutils:SlowBuildingRing", 1), // Output
20 * 30, // Dur
@@ -461,14 +437,10 @@ public class RECIPES_General {
// Magic Feather
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(Items.feather, 64),
- ItemUtils.getSimpleStack(Blocks.emerald_block, 32),
- ItemUtils.getSimpleStack(Blocks.diamond_block, 32),
- Materials.Ruby.getBlocks(32),
- Materials.Sapphire.getBlocks(32),
- ItemUtils.getSimpleStack(Blocks.gold_block, 32),
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(Items.feather, 64),
+ ItemUtils.getSimpleStack(Blocks.emerald_block, 32),
+ ItemUtils.getSimpleStack(Blocks.diamond_block, 32), Materials.Ruby.getBlocks(32),
+ Materials.Sapphire.getBlocks(32), ItemUtils.getSimpleStack(Blocks.gold_block, 32), },
Materials.Silver.getMolten(32 * 144), // Fluid
ItemUtils.getSimpleStack(ModItems.itemMagicFeather, 1), // Output
20 * 120, // Dur
@@ -476,13 +448,9 @@ public class RECIPES_General {
// Pest Killer
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(16),
- CI.getTieredMachineCasing(1),
- CI.getElectricPump(2, 1),
- CI.getPlate(2, GTNH ? 4 : 2),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), GTNH ? 2 : 1),
- },
+ new ItemStack[] { CI.getNumberedCircuit(16), CI.getTieredMachineCasing(1), CI.getElectricPump(2, 1),
+ CI.getPlate(2, GTNH ? 4 : 2),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), GTNH ? 2 : 1), },
FluidUtils.getHotWater(500), // Fluid
ItemUtils.getSimpleStack(ModBlocks.blockPestKiller), // Output
20 * 60, // Dur
@@ -528,7 +496,8 @@ public class RECIPES_General {
Logger.INFO("Added a recipe for Compressed Obsidian [" + r + "]");
}
- if (RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {output}, ItemUtils.getSimpleStack(input, 9))) {
+ if (RecipeUtils
+ .addShapelessGregtechRecipe(new ItemStack[] { output }, ItemUtils.getSimpleStack(input, 9))) {
Logger.INFO("Added a shapeless recipe for Compressed Obsidian [" + r + "]");
}
}
@@ -553,7 +522,8 @@ public class RECIPES_General {
Logger.INFO("Added a recipe for Compressed Glowstone [" + r + "]");
}
- if (RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {output}, ItemUtils.getSimpleStack(input, 9))) {
+ if (RecipeUtils
+ .addShapelessGregtechRecipe(new ItemStack[] { output }, ItemUtils.getSimpleStack(input, 9))) {
Logger.INFO("Added a shapeless recipe for Compressed Glowstone [" + r + "]");
}
}
@@ -572,19 +542,10 @@ public class RECIPES_General {
generateWireRecipes(ALLOY.TRINIUM_TITANIUM);
generateWireRecipes(ELEMENT.STANDALONE.HYPOGEN);
- GT_Materials[] g = new GT_Materials[] {
- GT_Materials.Staballoy,
- GT_Materials.Tantalloy60,
- GT_Materials.Tantalloy61,
- GT_Materials.Void,
- GT_Materials.Potin,
- GT_Materials.MaragingSteel300,
- GT_Materials.MaragingSteel350,
- GT_Materials.Inconel690,
- GT_Materials.Inconel792,
- GT_Materials.HastelloyX,
- GT_Materials.TriniumNaquadahCarbonite,
- };
+ GT_Materials[] g = new GT_Materials[] { GT_Materials.Staballoy, GT_Materials.Tantalloy60,
+ GT_Materials.Tantalloy61, GT_Materials.Void, GT_Materials.Potin, GT_Materials.MaragingSteel300,
+ GT_Materials.MaragingSteel350, GT_Materials.Inconel690, GT_Materials.Inconel792,
+ GT_Materials.HastelloyX, GT_Materials.TriniumNaquadahCarbonite, };
for (GT_Materials e : g) {
if (e == GT_Materials.Void) {
if (!LoadedMods.Thaumcraft) {
@@ -595,9 +556,8 @@ public class RECIPES_General {
generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier);
}
- Materials[] h = new Materials[] {
- Materials.Europium, Materials.Tungsten, Materials.DarkSteel, Materials.Clay, Materials.Lead,
- };
+ Materials[] h = new Materials[] { Materials.Europium, Materials.Tungsten, Materials.DarkSteel, Materials.Clay,
+ Materials.Lead, };
for (Materials e : h) {
if (e == Materials.DarkSteel) {
@@ -647,86 +607,50 @@ public class RECIPES_General {
if (PollutionUtils.isPollutionEnabled()) {
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), bitsd, new Object[] {
- "M",
- "P",
- Character.valueOf('M'),
- ItemList.Hatch_Muffler_LV.get(1),
- Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_LV.get(1)
- });
+ GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1),
+ Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LV.get(1) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), bitsd, new Object[] {
- "M",
- "P",
- Character.valueOf('M'),
- ItemList.Hatch_Muffler_MV.get(1),
- Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_MV.get(1)
- });
+ GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1),
+ Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MV.get(1) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), bitsd, new Object[] {
- "M",
- "P",
- Character.valueOf('M'),
- ItemList.Hatch_Muffler_HV.get(1),
- Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_HV.get(1)
- });
+ GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1),
+ Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_HV.get(1) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), bitsd, new Object[] {
- "M",
- "P",
- Character.valueOf('M'),
- ItemList.Hatch_Muffler_EV.get(1),
- Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_EV.get(1)
- });
+ GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1),
+ Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_EV.get(1) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), bitsd, new Object[] {
- "M",
- "P",
- Character.valueOf('M'),
- ItemList.Hatch_Muffler_IV.get(1),
- Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_IV.get(1)
- });
+ GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1),
+ Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_IV.get(1) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), bitsd, new Object[] {
- "M",
- "P",
- Character.valueOf('M'),
- ItemList.Hatch_Muffler_LuV.get(1),
- Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_LuV.get(1)
- });
+ GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1),
+ Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LuV.get(1) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), bitsd, new Object[] {
- "M",
- "P",
- Character.valueOf('M'),
- ItemList.Hatch_Muffler_ZPM.get(1),
- Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_ZPM.get(1)
- });
+ GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1),
+ Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_ZPM.get(1) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), bitsd, new Object[] {
- "M",
- "P",
- Character.valueOf('M'),
- ItemList.Hatch_Muffler_UV.get(1),
- Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_UV.get(1)
- });
+ GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1),
+ Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_UV.get(1) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), bitsd, new Object[] {
- "M",
- "P",
- Character.valueOf('M'),
- ItemList.Hatch_Muffler_MAX.get(1),
- Character.valueOf('P'),
- GregtechItemList.Pollution_Cleaner_MAX.get(1)
- });
+ GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1),
+ Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MAX.get(1) });
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index aab90619cb..bd5ac25bf3 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -1,5 +1,7 @@
package gtPlusPlus.core.recipe;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.*;
import gregtech.api.interfaces.IOreRecipeRegistrator;
import gregtech.api.util.GT_OreDictUnificator;
@@ -10,27 +12,23 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import net.minecraft.item.ItemStack;
public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
+
public RECIPES_LaserEngraver() {
OrePrefixes.crafting.add(this);
}
@Override
- public void registerOre(
- final OrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString())) {
if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) {
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilYttriumBariumCuprate", 1) != null) {
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.YttriumBariumCuprate, 2L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]),
64,
480);
@@ -43,7 +41,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilVanadiumGallium", 1) != null) {
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.VanadiumGallium, 2L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]),
64,
480);
@@ -56,7 +54,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilNiobiumTitanium", 1) != null) {
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 2L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]),
64,
480);
@@ -73,7 +71,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilOsmium", 1) != null) {
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Circuit_Parts_Wiring_LuV.get(1L, new Object[0]),
64,
1024);
@@ -85,104 +83,136 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
}
}
- } else if (aOreDictName.equals(OreDictNames.craftingLensCyan.toString())) {
- } else if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) {
- } else if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) {
- if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) {
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilNaquadah", 1) != null) {
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 2L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
- GregtechItemList.Circuit_Parts_Wiring_ZPM.get(1L, new Object[0]),
- 64,
- 2000);
- } else {
- Logger.INFO(
- "foilNaquadah does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Logger.INFO(
- "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
- }
- }
- } else if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) {
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) != null) {
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
- ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1),
- 4 * 60 * 20,
- 2000);
- } else {
- Logger.INFO(
- "plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Logger.INFO(
- "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
- }
- if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLithium", 1) != null) {
- GT_Values.RA.addLaserEngraverRecipe(
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1),
- 2 * 60 * 20,
- 2000);
- } else {
- Logger.INFO(
- "dustLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Logger.INFO(
- "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
- }
+ } else if (aOreDictName.equals(OreDictNames.craftingLensCyan.toString())) {} else
+ if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) {} else
+ if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) {
+ if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH) {
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilNaquadah", 1) != null) {
+ GT_Values.RA.addLaserEngraverRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 2L),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ GregtechItemList.Circuit_Parts_Wiring_ZPM.get(1L, new Object[0]),
+ 64,
+ 2000);
+ } else {
+ Logger.INFO(
+ "foilNaquadah does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO(
+ "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ }
+ }
+ } else if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) {
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) != null) {
+ GT_Values.RA.addLaserEngraverRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1),
+ 4 * 60 * 20,
+ 2000);
+ } else {
+ Logger.INFO(
+ "plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO(
+ "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ }
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLithium", 1) != null) {
+ GT_Values.RA.addLaserEngraverRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1),
+ 2 * 60 * 20,
+ 2000);
+ } else {
+ Logger.INFO(
+ "dustLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO(
+ "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ }
- } else if (aOreDictName.equals(OreDictNames.craftingLensLime.toString())) {
- // Coil Wires
- ItemStack coilWire1 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 1);
- ItemStack coilWire2 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 1);
- ItemStack coilWire3 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 1);
- ItemStack coilWire4 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 1);
+ } else if (aOreDictName.equals(OreDictNames.craftingLensLime.toString())) {
+ // Coil Wires
+ ItemStack coilWire1 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 1);
+ ItemStack coilWire2 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 1);
+ ItemStack coilWire3 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 1);
+ ItemStack coilWire4 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 1);
- // Simple Life
- String wire = "wireGt02";
+ // Simple Life
+ String wire = "wireGt02";
- // Wires to Laser
- ItemStack wireT1a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Aluminium", 1);
- ItemStack wireT1b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Nichrome", 1);
- ItemStack wireT2a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Osmium", 1);
- ItemStack wireT2b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Platinum", 1);
- ItemStack wireT3a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "VanadiumGallium", 1);
- ItemStack wireT3b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "YttriumBariumCuprate", 1);
- ItemStack wireT3c = ItemUtils.getItemStackOfAmountFromOreDict(wire + "NiobiumTitanium", 1);
- ItemStack wireT4a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Naquadah", 1);
+ // Wires to Laser
+ ItemStack wireT1a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Aluminium", 1);
+ ItemStack wireT1b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Nichrome", 1);
+ ItemStack wireT2a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Osmium", 1);
+ ItemStack wireT2b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Platinum", 1);
+ ItemStack wireT3a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "VanadiumGallium", 1);
+ ItemStack wireT3b = ItemUtils.getItemStackOfAmountFromOreDict(wire + "YttriumBariumCuprate", 1);
+ ItemStack wireT3c = ItemUtils.getItemStackOfAmountFromOreDict(wire + "NiobiumTitanium", 1);
+ ItemStack wireT4a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Naquadah", 1);
- // T1
- GT_Values.RA.addLaserEngraverRecipe(
- wireT1a, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire1, 10 * 20, 500);
- GT_Values.RA.addLaserEngraverRecipe(
- wireT1b, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire1, 10 * 20, 500);
- // T2
- GT_Values.RA.addLaserEngraverRecipe(
- wireT2a, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire2, 20 * 20, 2000);
- GT_Values.RA.addLaserEngraverRecipe(
- wireT2b, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire2, 20 * 20, 2000);
- // T3
- GT_Values.RA.addLaserEngraverRecipe(
- wireT3a, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire3, 30 * 20, 8000);
- GT_Values.RA.addLaserEngraverRecipe(
- wireT3b, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire3, 30 * 20, 8000);
- GT_Values.RA.addLaserEngraverRecipe(
- wireT3c, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire3, 30 * 20, 8000);
- // T4
- GT_Values.RA.addLaserEngraverRecipe(
- wireT4a, GT_Utility.copyAmount(0L, new Object[] {aStack}), coilWire4, 40 * 20, 32000);
+ // T1
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT1a,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire1,
+ 10 * 20,
+ 500);
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT1b,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire1,
+ 10 * 20,
+ 500);
+ // T2
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT2a,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire2,
+ 20 * 20,
+ 2000);
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT2b,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire2,
+ 20 * 20,
+ 2000);
+ // T3
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT3a,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire3,
+ 30 * 20,
+ 8000);
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT3b,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire3,
+ 30 * 20,
+ 8000);
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT3c,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire3,
+ 30 * 20,
+ 8000);
+ // T4
+ GT_Values.RA.addLaserEngraverRecipe(
+ wireT4a,
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ coilWire4,
+ 40 * 20,
+ 32000);
- } else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) {
- GT_Values.RA.addLaserEngraverRecipe(
- ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
- ItemUtils.getSimpleStack(Dimension_Everglades.portalItem),
- 360 * 60 * 20,
- 4096);
- }
+ } else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) {
+ GT_Values.RA.addLaserEngraverRecipe(
+ ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ ItemUtils.getSimpleStack(Dimension_Everglades.portalItem),
+ 360 * 60 * 20,
+ 4096);
+ }
}
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
index cac350b98e..ec23017166 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
@@ -7,17 +7,9 @@ public class RECIPES_MTWRAPPER {
public static void run() {}
- public static void addShaped(
- final Object item_Output,
- final Object item_1,
- final Object item_2,
- final Object item_3,
- final Object item_4,
- final Object item_5,
- final Object item_6,
- final Object item_7,
- final Object item_8,
- final Object item_9) {}
+ public static void addShaped(final Object item_Output, final Object item_1, final Object item_2,
+ final Object item_3, final Object item_4, final Object item_5, final Object item_6, final Object item_7,
+ final Object item_8, final Object item_9) {}
public static void addShapeless() {}
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index 13abb8cfa5..54f0fe7849 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -725,8 +725,7 @@ public class RECIPES_MachineComponents {
1024);
for (final Materials tMat : Materials.values()) {
if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) {
- final int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD)
- ? 1
+ final int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1
: tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2;
GT_Values.RA.addAssemblerRecipe(
GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]),
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 78254859d4..cace9cff2c 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1,7 +1,17 @@
package gtPlusPlus.core.recipe;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import com.github.technus.tectech.recipe.TT_recipeAdder;
import com.github.technus.tectech.thing.CustomItemList;
+
import cpw.mods.fml.common.Loader;
import gregtech.api.GregTech_API;
import gregtech.api.enums.*;
@@ -31,14 +41,6 @@ import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
public class RECIPES_Machines {
@@ -130,8 +132,8 @@ public class RECIPES_Machines {
public static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1);
public static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1);
public static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1);
- public static ItemStack RECIPE_BufferCore_MAX =
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1);
+ public static ItemStack RECIPE_BufferCore_MAX = ItemUtils
+ .getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1);
// Wire
public static String wireTier1 = "wireGt08Lead";
@@ -281,25 +283,16 @@ public class RECIPES_Machines {
private static void advHeatExchanger() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.Machine_Multi_HeatExchanger.get(1),
- CI.getDoublePlate(6, 8),
- CI.getScrew(6, 16),
- CI.getCircuit(5, 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Machine_Multi_HeatExchanger.get(1),
+ CI.getDoublePlate(6, 8), CI.getScrew(6, 16), CI.getCircuit(5, 8) },
CI.tieredMaterials[5].getMolten(144 * 8),
GregtechItemList.XL_HeatExchanger.get(1),
20 * 60,
MaterialUtils.getVoltageForTier(6));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.Casing_StableTitanium.get(1),
- CI.getPlate(5, 4),
- CI.getScrew(5, 8),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_StableTitanium.get(1),
+ CI.getPlate(5, 4), CI.getScrew(5, 8), },
CI.tieredMaterials[5].getMolten(144 * 2),
GregtechItemList.Casing_XL_HeatExchanger.get(1),
20 * 5,
@@ -309,14 +302,9 @@ public class RECIPES_Machines {
private static void computerCube() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(20),
- CI.getTieredGTPPMachineCasing(4, 1),
- CI.getCircuit(4, 8),
- CI.getFieldGenerator(2, 4),
- CI.getDoublePlate(4, 8),
- CI.getRobotArm(4, 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(20), CI.getTieredGTPPMachineCasing(4, 1),
+ CI.getCircuit(4, 8), CI.getFieldGenerator(2, 4), CI.getDoublePlate(4, 8),
+ CI.getRobotArm(4, 8) },
Materials.Redstone.getMolten(144 * 32),
GregtechItemList.Gregtech_Computer_Cube_Machine.get(1),
20 * 60 * 10,
@@ -325,18 +313,14 @@ public class RECIPES_Machines {
private static void gt4FarmManager() {
- ItemList[] aInputHatches = new ItemList[] {
- ItemList.Hatch_Input_LV, ItemList.Hatch_Input_MV, ItemList.Hatch_Input_HV,
- ItemList.Hatch_Input_EV, ItemList.Hatch_Input_IV, ItemList.Hatch_Input_LuV,
- ItemList.Hatch_Input_ZPM, ItemList.Hatch_Input_UV
- };
- GregtechItemList[] aOutputMachines = new GregtechItemList[] {
- GregtechItemList.GT4_Crop_Harvester_LV, GregtechItemList.GT4_Crop_Harvester_MV,
- GregtechItemList.GT4_Crop_Harvester_HV,
- GregtechItemList.GT4_Crop_Harvester_EV, GregtechItemList.GT4_Crop_Harvester_IV,
- GregtechItemList.GT4_Crop_Harvester_LuV,
- GregtechItemList.GT4_Crop_Harvester_ZPM, GregtechItemList.GT4_Crop_Harvester_UV
- };
+ ItemList[] aInputHatches = new ItemList[] { ItemList.Hatch_Input_LV, ItemList.Hatch_Input_MV,
+ ItemList.Hatch_Input_HV, ItemList.Hatch_Input_EV, ItemList.Hatch_Input_IV, ItemList.Hatch_Input_LuV,
+ ItemList.Hatch_Input_ZPM, ItemList.Hatch_Input_UV };
+ GregtechItemList[] aOutputMachines = new GregtechItemList[] { GregtechItemList.GT4_Crop_Harvester_LV,
+ GregtechItemList.GT4_Crop_Harvester_MV, GregtechItemList.GT4_Crop_Harvester_HV,
+ GregtechItemList.GT4_Crop_Harvester_EV, GregtechItemList.GT4_Crop_Harvester_IV,
+ GregtechItemList.GT4_Crop_Harvester_LuV, GregtechItemList.GT4_Crop_Harvester_ZPM,
+ GregtechItemList.GT4_Crop_Harvester_UV };
int aTier = 1;
for (int i = 0; i < 8; i++) {
@@ -427,7 +411,7 @@ public class RECIPES_Machines {
GregtechItemList.GT4_Redstone_Scale.get(8));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {CI.getTieredMachineHull(1), ItemUtils.getSimpleStack(Blocks.stone_button, 16)},
+ new ItemStack[] { CI.getTieredMachineHull(1), ItemUtils.getSimpleStack(Blocks.stone_button, 16) },
null,
GregtechItemList.GT4_Redstone_Button_Panel.get(1),
800,
@@ -459,25 +443,21 @@ public class RECIPES_Machines {
private static void gt4Inventory() {
- ItemList[] aEnergyHatches = new ItemList[] {
- ItemList.Hatch_Energy_LV, ItemList.Hatch_Energy_MV, ItemList.Hatch_Energy_HV,
- ItemList.Hatch_Energy_EV, ItemList.Hatch_Energy_IV, ItemList.Hatch_Energy_LuV,
- ItemList.Hatch_Energy_ZPM, ItemList.Hatch_Energy_UV
- };
+ ItemList[] aEnergyHatches = new ItemList[] { ItemList.Hatch_Energy_LV, ItemList.Hatch_Energy_MV,
+ ItemList.Hatch_Energy_HV, ItemList.Hatch_Energy_EV, ItemList.Hatch_Energy_IV, ItemList.Hatch_Energy_LuV,
+ ItemList.Hatch_Energy_ZPM, ItemList.Hatch_Energy_UV };
- ItemList[] aRegulators = new ItemList[] {
- ItemList.Automation_Regulator_LV, ItemList.Automation_Regulator_MV, ItemList.Automation_Regulator_HV,
- ItemList.Automation_Regulator_EV, ItemList.Automation_Regulator_IV, ItemList.Automation_Regulator_LuV,
- ItemList.Automation_Regulator_ZPM, ItemList.Automation_Regulator_UV
- };
+ ItemList[] aRegulators = new ItemList[] { ItemList.Automation_Regulator_LV, ItemList.Automation_Regulator_MV,
+ ItemList.Automation_Regulator_HV, ItemList.Automation_Regulator_EV, ItemList.Automation_Regulator_IV,
+ ItemList.Automation_Regulator_LuV, ItemList.Automation_Regulator_ZPM,
+ ItemList.Automation_Regulator_UV };
GregtechItemList[] aOutputInventoryManager = new GregtechItemList[] {
- GregtechItemList.GT4_Electric_Inventory_Manager_LV, GregtechItemList.GT4_Electric_Inventory_Manager_MV,
- GregtechItemList.GT4_Electric_Inventory_Manager_HV,
- GregtechItemList.GT4_Electric_Inventory_Manager_EV, GregtechItemList.GT4_Electric_Inventory_Manager_IV,
- GregtechItemList.GT4_Electric_Inventory_Manager_LuV,
- GregtechItemList.GT4_Electric_Inventory_Manager_ZPM, GregtechItemList.GT4_Electric_Inventory_Manager_UV
- };
+ GregtechItemList.GT4_Electric_Inventory_Manager_LV, GregtechItemList.GT4_Electric_Inventory_Manager_MV,
+ GregtechItemList.GT4_Electric_Inventory_Manager_HV, GregtechItemList.GT4_Electric_Inventory_Manager_EV,
+ GregtechItemList.GT4_Electric_Inventory_Manager_IV, GregtechItemList.GT4_Electric_Inventory_Manager_LuV,
+ GregtechItemList.GT4_Electric_Inventory_Manager_ZPM,
+ GregtechItemList.GT4_Electric_Inventory_Manager_UV };
int aTier = 1;
for (int i = 0; i < 8; i++) {
@@ -496,12 +476,10 @@ public class RECIPES_Machines {
}
GregtechItemList[] aOutputElectricCraftingTable = new GregtechItemList[] {
- GregtechItemList.GT4_Electric_Auto_Workbench_LV, GregtechItemList.GT4_Electric_Auto_Workbench_MV,
- GregtechItemList.GT4_Electric_Auto_Workbench_HV,
- GregtechItemList.GT4_Electric_Auto_Workbench_EV, GregtechItemList.GT4_Electric_Auto_Workbench_IV,
- GregtechItemList.GT4_Electric_Auto_Workbench_LuV,
- GregtechItemList.GT4_Electric_Auto_Workbench_ZPM, GregtechItemList.GT4_Electric_Auto_Workbench_UV
- };
+ GregtechItemList.GT4_Electric_Auto_Workbench_LV, GregtechItemList.GT4_Electric_Auto_Workbench_MV,
+ GregtechItemList.GT4_Electric_Auto_Workbench_HV, GregtechItemList.GT4_Electric_Auto_Workbench_EV,
+ GregtechItemList.GT4_Electric_Auto_Workbench_IV, GregtechItemList.GT4_Electric_Auto_Workbench_LuV,
+ GregtechItemList.GT4_Electric_Auto_Workbench_ZPM, GregtechItemList.GT4_Electric_Auto_Workbench_UV };
aTier = 1;
for (int i = 0; i < 8; i++) {
@@ -522,65 +500,39 @@ public class RECIPES_Machines {
private static void multiGeneratorArray() {
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_Array_Controller.get(1L), CI.bitsd, new Object[] {
- "CTC",
- "FMF",
- "CBC",
- 'M',
- CI.getTieredGTPPMachineCasing(4, 1),
- 'B',
- OrePrefixes.pipeHuge.get(Materials.StainlessSteel),
- 'C',
- OrePrefixes.circuit.get(Materials.Data),
- 'F',
- ItemList.Electric_Pump_EV,
- 'T',
- CI.getSensor(4, 1)
- });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_Array_Controller.get(1L),
+ CI.bitsd,
+ new Object[] { "CTC", "FMF", "CBC", 'M', CI.getTieredGTPPMachineCasing(4, 1), 'B',
+ OrePrefixes.pipeHuge.get(Materials.StainlessSteel), 'C',
+ OrePrefixes.circuit.get(Materials.Data), 'F', ItemList.Electric_Pump_EV, 'T',
+ CI.getSensor(4, 1) });
}
private static void multiForgeHammer() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(CI.machineHull_IV, 2),
- ItemList.Machine_IV_Hammer.get(1),
- CI.getPlate(4, 8),
- CI.getBolt(5, 32),
- ELEMENT.getInstance().ZIRCONIUM.getFineWire(32),
- ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 4)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(CI.machineHull_IV, 2), ItemList.Machine_IV_Hammer.get(1),
+ CI.getPlate(4, 8), CI.getBolt(5, 32), ELEMENT.getInstance().ZIRCONIUM.getFineWire(32),
+ ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 4) },
CI.getTieredFluid(4, 144 * 12),
GregtechItemList.Controller_IndustrialForgeHammer.get(1),
20 * 30,
MaterialUtils.getVoltageForTier(5));
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Casing_IndustrialForgeHammer.get(1), CI.bitsd, new Object[] {
- "IBI",
- "HCH",
- "IHI",
- 'I',
- CI.getPlate(4, 1),
- 'B',
- ALLOY.BABBIT_ALLOY.getPlate(1),
- 'C',
- ItemList.Casing_HeatProof.get(1),
- 'H',
- ALLOY.HASTELLOY_X.getRod(1)
- });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Casing_IndustrialForgeHammer.get(1),
+ CI.bitsd,
+ new Object[] { "IBI", "HCH", "IHI", 'I', CI.getPlate(4, 1), 'B', ALLOY.BABBIT_ALLOY.getPlate(1), 'C',
+ ItemList.Casing_HeatProof.get(1), 'H', ALLOY.HASTELLOY_X.getRod(1) });
}
private static void multiMolecularTransformer() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getTieredGTPPMachineCasing(6, 1),
- CI.getPlate(5, 16),
- CI.getBolt(5, 32),
- ALLOY.HG1223.getFineWire(64),
- CI.getEmitter(4, 8),
- ItemUtils.getItemStackOfAmountFromOreDict("circuitMaster", 10)
- },
+ new ItemStack[] { CI.getTieredGTPPMachineCasing(6, 1), CI.getPlate(5, 16), CI.getBolt(5, 32),
+ ALLOY.HG1223.getFineWire(64), CI.getEmitter(4, 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("circuitMaster", 10) },
CI.getTieredFluid(5, 144 * 16),
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_11_MOLECULAR_TRANSFORMER, 1),
20 * 60,
@@ -589,68 +541,43 @@ public class RECIPES_Machines {
CORE.RA.addAssemblylineRecipe(
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_11_MOLECULAR_TRANSFORMER, 1),
20 * 60 * 30,
- new Object[] {
- ALLOY.HG1223.getFineWire(64),
- ALLOY.HG1223.getFineWire(64),
- ItemList.Electric_Motor_IV.get(16),
- ItemList.Energy_LapotronicOrb.get(16),
- CI.getTieredComponent(OrePrefixes.cableGt12, 6, 16),
- CI.getTieredComponent(OrePrefixes.wireGt16, 5, 32),
- ALLOY.ZERON_100.getFrameBox(4),
- ALLOY.ZIRCONIUM_CARBIDE.getPlateDouble(32),
- ALLOY.BABBIT_ALLOY.getPlate(64),
- ALLOY.LEAGRISIUM.getGear(8),
- new Object[] {CI.getTieredCircuitOreDictName(4), 64},
- new Object[] {CI.getTieredCircuitOreDictName(5), 32},
- new Object[] {CI.getTieredCircuitOreDictName(6), 16},
- GregtechItemList.Laser_Lens_WoodsGlass.get(1),
- },
- new FluidStack[] {
- ALLOY.NITINOL_60.getFluidStack(144 * 9 * (2)),
- ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (8)),
- ALLOY.KANTHAL.getFluidStack(144 * 1 * (4)),
- },
+ new Object[] { ALLOY.HG1223.getFineWire(64), ALLOY.HG1223.getFineWire(64),
+ ItemList.Electric_Motor_IV.get(16), ItemList.Energy_LapotronicOrb.get(16),
+ CI.getTieredComponent(OrePrefixes.cableGt12, 6, 16),
+ CI.getTieredComponent(OrePrefixes.wireGt16, 5, 32), ALLOY.ZERON_100.getFrameBox(4),
+ ALLOY.ZIRCONIUM_CARBIDE.getPlateDouble(32), ALLOY.BABBIT_ALLOY.getPlate(64),
+ ALLOY.LEAGRISIUM.getGear(8), new Object[] { CI.getTieredCircuitOreDictName(4), 64 },
+ new Object[] { CI.getTieredCircuitOreDictName(5), 32 },
+ new Object[] { CI.getTieredCircuitOreDictName(6), 16 },
+ GregtechItemList.Laser_Lens_WoodsGlass.get(1), },
+ new FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * (2)),
+ ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (8)), ALLOY.KANTHAL.getFluidStack(144 * 1 * (4)), },
GregtechItemList.Controller_MolecularTransformer.get(1),
20 * 60 * 10 * (1),
(int) MaterialUtils.getVoltageForTier(6));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(16),
- CI.getPlate(6, 4),
- CI.getScrew(6, 8),
- ELEMENT.getInstance().PALLADIUM.getFineWire(16),
- CI.getSensor(5, 2),
- ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 4)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(16), CI.getPlate(6, 4), CI.getScrew(6, 8),
+ ELEMENT.getInstance().PALLADIUM.getFineWire(16), CI.getSensor(5, 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 4) },
CI.getTieredFluid(5, 144 * 4),
GregtechItemList.Casing_Molecular_Transformer_1.get(1),
20 * 20,
MaterialUtils.getVoltageForTier(5));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(16),
- CI.getPlate(5, 4),
- CI.getScrew(5, 8),
- ItemList.Casing_Coil_Nichrome.get(2),
- CI.getFieldGenerator(3, 2),
- ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(16), CI.getPlate(5, 4), CI.getScrew(5, 8),
+ ItemList.Casing_Coil_Nichrome.get(2), CI.getFieldGenerator(3, 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 8) },
CI.getTieredFluid(5, 144 * 4),
GregtechItemList.Casing_Molecular_Transformer_2.get(1),
20 * 20,
MaterialUtils.getVoltageForTier(5));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(16),
- ItemUtils.getSimpleStack(Blocks.glowstone, 16),
- CI.getGear(5, 8),
- ELEMENT.getInstance().TITANIUM.getWire04(4),
- CI.getFieldGenerator(4, 2),
- ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(16), ItemUtils.getSimpleStack(Blocks.glowstone, 16),
+ CI.getGear(5, 8), ELEMENT.getInstance().TITANIUM.getWire04(4), CI.getFieldGenerator(4, 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 8) },
CI.getTieredFluid(5, 144 * 4),
GregtechItemList.Casing_Molecular_Transformer_3.get(1),
20 * 60,
@@ -672,14 +599,8 @@ public class RECIPES_Machines {
GregtechItemList.Casing_Turbine_Shaft.get(1));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.Casing_Turbine.get(1),
- CI.getPlate(4, 4),
- CI.getScrew(4, 8),
- CI.getCircuit(4, 4),
- CI.getGear(3, 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine.get(1), CI.getPlate(4, 4),
+ CI.getScrew(4, 8), CI.getCircuit(4, 4), CI.getGear(3, 8) },
CI.tieredMaterials[3].getMolten(144 * 8),
GregtechItemList.Hatch_Turbine_Rotor.get(1),
20 * 60,
@@ -687,25 +608,15 @@ public class RECIPES_Machines {
// Steam
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.Casing_Turbine.get(1),
- CI.getPlate(3, 4),
- CI.getScrew(3, 8),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine.get(1), CI.getPlate(3, 4),
+ CI.getScrew(3, 8), },
CI.tieredMaterials[2].getMolten(144 * 2),
GregtechItemList.Casing_Turbine_LP.get(1),
20 * 5,
MaterialUtils.getVoltageForTier(3));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.LargeSteamTurbine.get(1),
- CI.getPlate(4, 8),
- CI.getScrew(4, 16),
- CI.getGear(4, 4),
- CI.getCircuit(4, 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.LargeSteamTurbine.get(1),
+ CI.getPlate(4, 8), CI.getScrew(4, 16), CI.getGear(4, 4), CI.getCircuit(4, 8) },
CI.tieredMaterials[4].getMolten(144 * 8),
GregtechItemList.Large_Steam_Turbine.get(1),
20 * 60,
@@ -713,25 +624,15 @@ public class RECIPES_Machines {
// Gas
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.Casing_Turbine1.get(1),
- CI.getPlate(4, 4),
- CI.getScrew(4, 8),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine1.get(1), CI.getPlate(4, 4),
+ CI.getScrew(4, 8), },
CI.tieredMaterials[3].getMolten(144 * 2),
GregtechItemList.Casing_Turbine_Gas.get(1),
20 * 5,
MaterialUtils.getVoltageForTier(4));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.LargeGasTurbine.get(1),
- CI.getPlate(5, 8),
- CI.getScrew(5, 16),
- CI.getGear(5, 4),
- CI.getCircuit(5, 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.LargeGasTurbine.get(1), CI.getPlate(5, 8),
+ CI.getScrew(5, 16), CI.getGear(5, 4), CI.getCircuit(5, 8) },
CI.tieredMaterials[5].getMolten(144 * 8),
GregtechItemList.Large_Gas_Turbine.get(1),
20 * 60,
@@ -739,25 +640,15 @@ public class RECIPES_Machines {
// HP Steam
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.Casing_Turbine2.get(1),
- CI.getPlate(5, 4),
- CI.getScrew(5, 8),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine2.get(1), CI.getPlate(5, 4),
+ CI.getScrew(5, 8), },
CI.tieredMaterials[4].getMolten(144 * 2),
GregtechItemList.Casing_Turbine_HP.get(1),
20 * 5,
MaterialUtils.getVoltageForTier(5));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.LargeHPSteamTurbine.get(1),
- CI.getPlate(6, 8),
- CI.getScrew(6, 16),
- CI.getGear(6, 4),
- CI.getCircuit(6, 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.LargeHPSteamTurbine.get(1),
+ CI.getPlate(6, 8), CI.getScrew(6, 16), CI.getGear(6, 4), CI.getCircuit(6, 8) },
CI.tieredMaterials[6].getMolten(144 * 8),
GregtechItemList.Large_HPSteam_Turbine.get(1),
20 * 60,
@@ -765,50 +656,36 @@ public class RECIPES_Machines {
// Plasma
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.Casing_Turbine3.get(1),
- CI.getPlate(6, 4),
- CI.getScrew(6, 8),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.Casing_Turbine3.get(1), CI.getPlate(6, 4),
+ CI.getScrew(6, 8), },
CI.tieredMaterials[5].getMolten(144 * 2),
GregtechItemList.Casing_Turbine_Plasma.get(1),
20 * 5,
MaterialUtils.getVoltageForTier(6));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- ItemList.LargePlasmaTurbine.get(1),
- CI.getPlate(7, 8),
- CI.getScrew(7, 16),
- CI.getGear(7, 4),
- CI.getCircuit(7, 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18), ItemList.LargePlasmaTurbine.get(1),
+ CI.getPlate(7, 8), CI.getScrew(7, 16), CI.getGear(7, 4), CI.getCircuit(7, 8) },
CI.tieredMaterials[7].getMolten(144 * 8),
GregtechItemList.Large_Plasma_Turbine.get(1),
20 * 60,
MaterialUtils.getVoltageForTier(7));
if (LoadedMods.GoodGenerator) {
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- GT_ModHandler.getModItem("GoodGenerator", "supercriticalFluidTurbineCasing", 1),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 4, 10101),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 8, 10101)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18),
+ GT_ModHandler.getModItem("GoodGenerator", "supercriticalFluidTurbineCasing", 1),
+ GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 4, 10101),
+ GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 8, 10101) },
FluidRegistry.getFluidStack("molten.adamantium alloy", 144 * 2),
GregtechItemList.Casing_Turbine_SC.get(1),
20 * 5,
MaterialUtils.getVoltageForTier(6));
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(18),
- GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 32016),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 8, 10104),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 16, 10104),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedgearGt", 4, 10104),
- CI.getCircuit(7, 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(18),
+ GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 32016),
+ GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 8, 10104),
+ GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 16, 10104),
+ GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedgearGt", 4, 10104),
+ CI.getCircuit(7, 8) },
FluidRegistry.getFluidStack("molten.hikarium", 144 * 8),
GregtechItemList.Large_SCSteam_Turbine.get(1),
20 * 60,
@@ -819,65 +696,42 @@ public class RECIPES_Machines {
private static void multiSolarTower() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(17),
- CI.getTieredGTPPMachineCasing(3, 4),
- ALLOY.MARAGING250.getPlate(8),
- ALLOY.MARAGING250.getBolt(8),
- ALLOY.MARAGING250.getScrew(8),
- CI.getCircuit(5, 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.getTieredGTPPMachineCasing(3, 4),
+ ALLOY.MARAGING250.getPlate(8), ALLOY.MARAGING250.getBolt(8), ALLOY.MARAGING250.getScrew(8),
+ CI.getCircuit(5, 8) },
CI.getTieredFluid(3, 144 * 16),
GregtechItemList.Industrial_Solar_Tower.get(1),
20 * 30,
MaterialUtils.getVoltageForTier(4));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(17),
- ALLOY.MARAGING350.getFrameBox(1),
- ALLOY.STAINLESS_STEEL.getPlate(4),
- ALLOY.MARAGING350.getScrew(8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(17), ALLOY.MARAGING350.getFrameBox(1),
+ ALLOY.STAINLESS_STEEL.getPlate(4), ALLOY.MARAGING350.getScrew(8) },
CI.getTieredFluid(3, 144 * 4),
GregtechItemList.Casing_SolarTower_Structural.get(1),
20 * 30,
MaterialUtils.getVoltageForTier(3));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(17),
- ALLOY.MARAGING250.getFrameBox(1),
- ALLOY.STAINLESS_STEEL.getPlate(4),
- ALLOY.MARAGING250.getBolt(16),
- ELEMENT.getInstance().ALUMINIUM.getScrew(8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(17), ALLOY.MARAGING250.getFrameBox(1),
+ ALLOY.STAINLESS_STEEL.getPlate(4), ALLOY.MARAGING250.getBolt(16),
+ ELEMENT.getInstance().ALUMINIUM.getScrew(8) },
CI.getTieredFluid(3, 144 * 4),
GregtechItemList.Casing_SolarTower_SaltContainment.get(1),
20 * 30,
MaterialUtils.getVoltageForTier(3));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(17),
- ALLOY.MARAGING250.getFrameBox(1),
- ALLOY.STEEL_BLACK.getPlate(4),
- ALLOY.MARAGING250.getScrew(8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(17), ALLOY.MARAGING250.getFrameBox(1),
+ ALLOY.STEEL_BLACK.getPlate(4), ALLOY.MARAGING250.getScrew(8) },
CI.getAlternativeTieredFluid(3, 144 * 4),
GregtechItemList.Casing_SolarTower_HeatContainment.get(1),
20 * 30,
MaterialUtils.getVoltageForTier(3));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(17),
- CI.getTieredGTPPMachineCasing(2, 1),
- CI.getPlate(3, 2),
- CI.getGear(3, 4),
- CI.getElectricMotor(3, 2),
- CI.getCircuit(3, 4)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.getTieredGTPPMachineCasing(2, 1),
+ CI.getPlate(3, 2), CI.getGear(3, 4), CI.getElectricMotor(3, 2), CI.getCircuit(3, 4) },
CI.getTertiaryTieredFluid(3, 144 * 4),
GregtechItemList.Solar_Tower_Reflector.get(1),
20 * 60,
@@ -889,26 +743,13 @@ public class RECIPES_Machines {
CORE.RA.addAssemblylineRecipe(
ItemList.Machine_IV_Replicator.get(1),
20 * 60 * 60 * 12,
- new Object[] {
- CI.getTieredMachineHull(7, 4),
- CI.getFieldGenerator(5, 16),
- CI.getElectricMotor(7, 16),
- CI.getElectricPiston(7, 4),
- CI.getEnergyCore(6, 2),
- CI.getPlate(7, 16),
- CI.getScrew(7, 32),
- CI.getBolt(6, 32),
- CI.getTieredComponent(OrePrefixes.rod, 6, 10),
- new Object[] {CI.getTieredCircuitOreDictName(7), 20},
- ItemList.Tool_DataOrb.get(32),
- GregtechItemList.Laser_Lens_Special.get(1)
- },
- new FluidStack[] {
- CI.getTieredFluid(7, 144 * 32),
- CI.getAlternativeTieredFluid(6, 144 * 16),
- CI.getTertiaryTieredFluid(6, 144 * 16),
- ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144),
- },
+ new Object[] { CI.getTieredMachineHull(7, 4), CI.getFieldGenerator(5, 16), CI.getElectricMotor(7, 16),
+ CI.getElectricPiston(7, 4), CI.getEnergyCore(6, 2), CI.getPlate(7, 16), CI.getScrew(7, 32),
+ CI.getBolt(6, 32), CI.getTieredComponent(OrePrefixes.rod, 6, 10),
+ new Object[] { CI.getTieredCircuitOreDictName(7), 20 }, ItemList.Tool_DataOrb.get(32),
+ GregtechItemList.Laser_Lens_Special.get(1) },
+ new FluidStack[] { CI.getTieredFluid(7, 144 * 32), CI.getAlternativeTieredFluid(6, 144 * 16),
+ CI.getTertiaryTieredFluid(6, 144 * 16), ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144), },
GregtechItemList.Controller_ElementalDuplicator.get(1),
20 * 60 * 60,
(int) MaterialUtils.getVoltageForTier(7));
@@ -916,23 +757,12 @@ public class RECIPES_Machines {
CORE.RA.addAssemblylineRecipe(
GregtechItemList.Modulator_III.get(1),
20 * 60 * 60 * 4,
- new Object[] {
- CI.getTieredGTPPMachineCasing(7, 2),
- CI.getFieldGenerator(4, 4),
- CI.getEnergyCore(4, 2),
- CI.getPlate(7, 8),
- CI.getScrew(6, 16),
- CI.getBolt(6, 16),
- CI.getTieredComponent(OrePrefixes.rod, 5, 16),
- new Object[] {CI.getTieredCircuitOreDictName(6), 32},
- ItemList.Tool_DataOrb.get(32),
- },
- new FluidStack[] {
- CI.getTieredFluid(6, 144 * 16),
- CI.getAlternativeTieredFluid(5, 144 * 8),
- CI.getTertiaryTieredFluid(5, 144 * 8),
- ALLOY.BABBIT_ALLOY.getFluidStack(64 * 144),
- },
+ new Object[] { CI.getTieredGTPPMachineCasing(7, 2), CI.getFieldGenerator(4, 4), CI.getEnergyCore(4, 2),
+ CI.getPlate(7, 8), CI.getScrew(6, 16), CI.getBolt(6, 16),
+ CI.getTieredComponent(OrePrefixes.rod, 5, 16),
+ new Object[] { CI.getTieredCircuitOreDictName(6), 32 }, ItemList.Tool_DataOrb.get(32), },
+ new FluidStack[] { CI.getTieredFluid(6, 144 * 16), CI.getAlternativeTieredFluid(5, 144 * 8),
+ CI.getTertiaryTieredFluid(5, 144 * 8), ALLOY.BABBIT_ALLOY.getFluidStack(64 * 144), },
GregtechItemList.Hatch_Input_Elemental_Duplicator.get(1),
20 * 60 * 60 * (2),
(int) MaterialUtils.getVoltageForTier(6));
@@ -940,23 +770,12 @@ public class RECIPES_Machines {
CORE.RA.addAssemblylineRecipe(
GregtechItemList.ResonanceChamber_III.get(1),
20 * 60 * 60 * 2,
- new Object[] {
- CI.getTieredMachineHull(6, 5),
- CI.getFieldGenerator(3, 16),
- CI.getEnergyCore(2, 2),
- CI.getPlate(7, 4),
- CI.getScrew(7, 4),
- CI.getBolt(6, 8),
- CI.getTieredComponent(OrePrefixes.rod, 5, 4),
- new Object[] {CI.getTieredCircuitOreDictName(5), 4},
- ItemList.Tool_DataStick.get(4),
- },
- new FluidStack[] {
- CI.getTieredFluid(5, 144 * 16),
- CI.getAlternativeTieredFluid(4, 144 * 8),
- CI.getTertiaryTieredFluid(4, 144 * 8),
- ALLOY.BABBIT_ALLOY.getFluidStack(16 * 144),
- },
+ new Object[] { CI.getTieredMachineHull(6, 5), CI.getFieldGenerator(3, 16), CI.getEnergyCore(2, 2),
+ CI.getPlate(7, 4), CI.getScrew(7, 4), CI.getBolt(6, 8),
+ CI.getTieredComponent(OrePrefixes.rod, 5, 4),
+ new Object[] { CI.getTieredCircuitOreDictName(5), 4 }, ItemList.Tool_DataStick.get(4), },
+ new FluidStack[] { CI.getTieredFluid(5, 144 * 16), CI.getAlternativeTieredFluid(4, 144 * 8),
+ CI.getTertiaryTieredFluid(4, 144 * 8), ALLOY.BABBIT_ALLOY.getFluidStack(16 * 144), },
GregtechItemList.Casing_ElementalDuplicator.get(1),
20 * 60 * (10),
(int) MaterialUtils.getVoltageForTier(6));
@@ -1002,14 +821,9 @@ public class RECIPES_Machines {
private static void zyngen() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(6),
- CI.getTieredMachineHull(4),
- ItemList.Machine_IV_AlloySmelter.get(1),
- CI.getGear(3, 16),
- CI.getBolt(3, 64),
- CI.getPlate(4, 16)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(6), CI.getTieredMachineHull(4),
+ ItemList.Machine_IV_AlloySmelter.get(1), CI.getGear(3, 16), CI.getBolt(3, 64),
+ CI.getPlate(4, 16) },
CI.getAlternativeTieredFluid(4, 144 * 8),
GregtechItemList.Industrial_AlloySmelter.get(1),
20 * 30,
@@ -1019,50 +833,34 @@ public class RECIPES_Machines {
private static void chemPlant() {
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Casing_Machine_Custom_1.get(2L, new Object[0]), CI.bits, new Object[] {
- "PhP",
- "PFP",
- "PwP",
- 'P',
- OrePrefixes.plate.get(Materials.Bronze),
- 'F',
- OrePrefixes.frameGt.get(Materials.Bronze)
- });
+ GregtechItemList.Casing_Machine_Custom_1.get(2L, new Object[0]),
+ CI.bits,
+ new Object[] { "PhP", "PFP", "PwP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F',
+ OrePrefixes.frameGt.get(Materials.Bronze) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Casing_Machine_Custom_2.get(2L, new Object[0]), CI.bits, new Object[] {
- "PPP",
- "hFw",
- "PPP",
- 'P',
- OrePrefixes.plate.get(Materials.Aluminium),
- 'F',
- OrePrefixes.frameGt.get(Materials.Aluminium)
- });
+ GregtechItemList.Casing_Machine_Custom_2.get(2L, new Object[0]),
+ CI.bits,
+ new Object[] { "PPP", "hFw", "PPP", 'P', OrePrefixes.plate.get(Materials.Aluminium), 'F',
+ OrePrefixes.frameGt.get(Materials.Aluminium) });
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(19),
- CI.getTieredGTPPMachineCasing(2, 4),
- CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGt, 4),
- CI.getTieredComponentOfMaterial(Materials.AnnealedCopper, OrePrefixes.plate, 16),
- CI.getTieredComponentOfMaterial(Materials.Plastic, OrePrefixes.pipeLarge, 4),
- CI.getTieredComponent(OrePrefixes.frameGt, 2, 4),
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(19), CI.getTieredGTPPMachineCasing(2, 4),
+ CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGt, 4),
+ CI.getTieredComponentOfMaterial(Materials.AnnealedCopper, OrePrefixes.plate, 16),
+ CI.getTieredComponentOfMaterial(Materials.Plastic, OrePrefixes.pipeLarge, 4),
+ CI.getTieredComponent(OrePrefixes.frameGt, 2, 4), },
ALLOY.STEEL_BLACK.getFluidStack(2 * (144 * 4)),
GregtechItemList.ChemicalPlant_Controller.get(1),
120 * 20,
MaterialUtils.getVoltageForTier(2));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(15),
- CI.getTieredGTPPMachineCasing(1, 2),
- ItemList.Hatch_Input_Bus_MV.get(1),
- CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.gearGt, 8),
- CI.getTieredComponentOfMaterial(Materials.Lead, OrePrefixes.plate, 48),
- CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16),
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(15), CI.getTieredGTPPMachineCasing(1, 2),
+ ItemList.Hatch_Input_Bus_MV.get(1),
+ CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.gearGt, 8),
+ CI.getTieredComponentOfMaterial(Materials.Lead, OrePrefixes.plate, 48),
+ CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16), },
ALLOY.BRONZE.getFluidStack(2 * (144 * 4)),
GregtechItemList.Bus_Catalysts.get(1),
60 * 20,
@@ -1082,14 +880,11 @@ public class RECIPES_Machines {
false);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(21),
- CI.getTieredGTPPMachineCasing(0, 4),
- CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.rod, 12),
- CI.getTieredComponentOfMaterial(Materials.Wood, OrePrefixes.plate, 32),
- CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.bolt, 16),
- CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32),
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(21), CI.getTieredGTPPMachineCasing(0, 4),
+ CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.rod, 12),
+ CI.getTieredComponentOfMaterial(Materials.Wood, OrePrefixes.plate, 32),
+ CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.bolt, 16),
+ CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32), },
ALLOY.POTIN.getFluidStack(2 * (144 * 4)),
GregtechItemList.AlgaeFarm_Controller.get(1),
60 * 20,
@@ -1099,19 +894,12 @@ public class RECIPES_Machines {
private static void distillus() {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(19),
- ItemList.Distillation_Tower.get(2),
- GregtechItemList.GTPP_Casing_IV.get(16),
- CI.getTieredComponent(OrePrefixes.circuit, 6, 8)
- },
- new FluidStack[] {
- ALLOY.AQUATIC_STEEL.getFluidStack(144 * 32),
- ALLOY.BABBIT_ALLOY.getFluidStack(144 * 16),
- ALLOY.BRONZE.getFluidStack(144 * 64),
- ALLOY.KANTHAL.getFluidStack(144 * 16),
- },
- new ItemStack[] {GregtechItemList.Machine_Adv_DistillationTower.get(1)},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(19), ItemList.Distillation_Tower.get(2),
+ GregtechItemList.GTPP_Casing_IV.get(16), CI.getTieredComponent(OrePrefixes.circuit, 6, 8) },
+ new FluidStack[] { ALLOY.AQUATIC_STEEL.getFluidStack(144 * 32),
+ ALLOY.BABBIT_ALLOY.getFluidStack(144 * 16), ALLOY.BRONZE.getFluidStack(144 * 64),
+ ALLOY.KANTHAL.getFluidStack(144 * 16), },
+ new ItemStack[] { GregtechItemList.Machine_Adv_DistillationTower.get(1) },
new FluidStack[] {},
20 * 600,
MaterialUtils.getVoltageForTier(6),
@@ -1120,11 +908,8 @@ public class RECIPES_Machines {
private static void chunkloaders() {
- ItemStack aOutputs[] = new ItemStack[] {
- GregtechItemList.GT_Chunkloader_HV.get(1L),
- GregtechItemList.GT_Chunkloader_IV.get(1L),
- GregtechItemList.GT_Chunkloader_ZPM.get(1L),
- };
+ ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.GT_Chunkloader_HV.get(1L),
+ GregtechItemList.GT_Chunkloader_IV.get(1L), GregtechItemList.GT_Chunkloader_ZPM.get(1L), };
int aIndex = 0;
@@ -1133,14 +918,9 @@ public class RECIPES_Machines {
continue;
}
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(21),
- CI.getElectricPiston(i, 10),
- CI.getFieldGenerator(i + 1, 6),
- CI.getPlate(i, 16),
- CI.getTransmissionComponent(i - 1, 8),
- CI.getTieredComponent(OrePrefixes.cableGt08, i, 16)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(21), CI.getElectricPiston(i, 10),
+ CI.getFieldGenerator(i + 1, 6), CI.getPlate(i, 16), CI.getTransmissionComponent(i - 1, 8),
+ CI.getTieredComponent(OrePrefixes.cableGt08, i, 16) },
ALLOY.EGLIN_STEEL.getFluidStack(i * (144 * 4)),
aOutputs[aIndex++].copy(),
300 * 20,
@@ -1149,23 +929,15 @@ public class RECIPES_Machines {
}
private static void overflowValveCovers() {
- ItemStack aOutputs[] = new ItemStack[] {
- GregtechItemList.Cover_Overflow_ULV.get(1L),
- GregtechItemList.Cover_Overflow_LV.get(1L),
- GregtechItemList.Cover_Overflow_MV.get(1L),
- GregtechItemList.Cover_Overflow_HV.get(1L),
- GregtechItemList.Cover_Overflow_EV.get(1L),
- GregtechItemList.Cover_Overflow_IV.get(1L),
- };
+ ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.Cover_Overflow_ULV.get(1L),
+ GregtechItemList.Cover_Overflow_LV.get(1L), GregtechItemList.Cover_Overflow_MV.get(1L),
+ GregtechItemList.Cover_Overflow_HV.get(1L), GregtechItemList.Cover_Overflow_EV.get(1L),
+ GregtechItemList.Cover_Overflow_IV.get(1L), };
for (int i = 0; i < 6; i++) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(19),
- CI.getElectricPump(i, 2),
- CI.getElectricMotor(i, 2),
- CI.getPlate(i, 4)
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(19), CI.getElectricPump(i, 2), CI.getElectricMotor(i, 2),
+ CI.getPlate(i, 4) },
Materials.SolderingAlloy.getFluid(i * (144 * 1)),
aOutputs[i].copy(),
20 * 20,
@@ -1175,29 +947,16 @@ public class RECIPES_Machines {
private static void tieredMachineHulls() {
- GregtechItemList[] aHulls = new GregtechItemList[] {
- GregtechItemList.GTPP_Casing_ULV,
- GregtechItemList.GTPP_Casing_LV,
- GregtechItemList.GTPP_Casing_MV,
- GregtechItemList.GTPP_Casing_HV,
- GregtechItemList.GTPP_Casing_EV,
- GregtechItemList.GTPP_Casing_IV,
- GregtechItemList.GTPP_Casing_LuV,
- GregtechItemList.GTPP_Casing_ZPM,
- GregtechItemList.GTPP_Casing_UV,
- GregtechItemList.GTPP_Casing_MAX
- };
+ GregtechItemList[] aHulls = new GregtechItemList[] { GregtechItemList.GTPP_Casing_ULV,
+ GregtechItemList.GTPP_Casing_LV, GregtechItemList.GTPP_Casing_MV, GregtechItemList.GTPP_Casing_HV,
+ GregtechItemList.GTPP_Casing_EV, GregtechItemList.GTPP_Casing_IV, GregtechItemList.GTPP_Casing_LuV,
+ GregtechItemList.GTPP_Casing_ZPM, GregtechItemList.GTPP_Casing_UV, GregtechItemList.GTPP_Casing_MAX };
for (int i = 0; i < 10; i++) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(20),
- CI.getTieredMachineCasing(i),
- CI.getPlate(i, 8),
- CI.getGear(i, 2),
- CI.getTieredComponent(OrePrefixes.cableGt02, i, 4),
- CI.getTieredComponent(OrePrefixes.circuit, i, 2)
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(20), CI.getTieredMachineCasing(i), CI.getPlate(i, 8),
+ CI.getGear(i, 2), CI.getTieredComponent(OrePrefixes.cableGt02, i, 4),
+ CI.getTieredComponent(OrePrefixes.circuit, i, 2) },
CI.getAlternativeTieredFluid(i, 144 * (i + 1) * 2),
aHulls[i].get(1),
20 * 20,
@@ -1208,8 +967,8 @@ public class RECIPES_Machines {
private static void initModItems() {
if (LoadedMods.IndustrialCraft2) {
IC2MFE = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFE", 1, 1);
- IC2MFSU =
- ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFSU", 2, 1);
+ IC2MFSU = ItemUtils
+ .getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFSU", 2, 1);
}
if (LoadedMods.Gregtech) {
@@ -1234,13 +993,17 @@ public class RECIPES_Machines {
if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
if (LoadedMods.Railcraft) {
// Misc
- INPUT_RCCokeOvenBlock = ItemUtils.getItemStackWithMeta(
- LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1);
+ INPUT_RCCokeOvenBlock = ItemUtils
+ .getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1);
}
if (LoadedMods.ImmersiveEngineering) {
// Misc
INPUT_IECokeOvenBlock = ItemUtils.getItemStackWithMeta(
- LoadedMods.ImmersiveEngineering, "ImmersiveEngineering:stoneDecoration", "Coke_Oven_IE", 1, 1);
+ LoadedMods.ImmersiveEngineering,
+ "ImmersiveEngineering:stoneDecoration",
+ "Coke_Oven_IE",
+ 1,
+ 1);
}
}
runModRecipes();
@@ -1250,12 +1013,9 @@ public class RECIPES_Machines {
if (LoadedMods.Gregtech) {
// Computer Cube
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (1)),
- ItemList.Cover_Screen.get(4),
- CI.machineHull_IV,
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (1)), ItemList.Cover_Screen.get(4),
+ CI.machineHull_IV,
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2) },
ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16),
GregtechItemList.Gregtech_Computer_Cube.get(1),
60 * 20 * 3,
@@ -1263,42 +1023,32 @@ public class RECIPES_Machines {
// Circuit programmer
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)),
- ItemList.Cover_Controller.get(1, CI.electricMotor_MV),
- CI.machineHull_MV,
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)),
+ ItemList.Cover_Controller.get(1, CI.electricMotor_MV), CI.machineHull_MV,
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2) },
ELEMENT.getInstance().IRON.getFluidStack(144 * 4),
ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
60 * 10 * 1,
30);
// Lead Lined Chest
- for (ItemStack plateRubber : OreDictionary.getOres("plateAnyRubber"))
- CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.machineHull_LV,
- GT_Utility.copyAmount(32, plateRubber),
+ for (ItemStack plateRubber : OreDictionary.getOres("plateAnyRubber")) CORE.RA.addSixSlotAssemblingRecipe(
+ new ItemStack[] { CI.machineHull_LV, GT_Utility.copyAmount(32, plateRubber),
ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9),
- ItemUtils.getSimpleStack(Blocks.chest)
- },
- ELEMENT.getInstance().LEAD.getFluidStack(144 * 16),
- ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest),
- 60 * 10 * 3,
- 60);
+ ItemUtils.getSimpleStack(Blocks.chest) },
+ ELEMENT.getInstance().LEAD.getFluidStack(144 * 16),
+ ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest),
+ 60 * 10 * 3,
+ 60);
// RTG
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1),
- ALLOY.NITINOL_60.getPlate(8),
- ALLOY.MARAGING350.getGear(4),
- ItemUtils.getSimpleStack(CI.fieldGenerator_EV, 8),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", 32),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4)
- },
+ new ItemStack[] { ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1),
+ ALLOY.NITINOL_60.getPlate(8), ALLOY.MARAGING350.getGear(4),
+ ItemUtils.getSimpleStack(CI.fieldGenerator_EV, 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", 32),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4) },
ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16),
GregtechItemList.RTG.get(1),
60 * 20 * 10,
@@ -1306,19 +1056,16 @@ public class RECIPES_Machines {
// Super Jukebox
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.machineHull_LV,
- ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 4),
- ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8),
- ItemUtils.getSimpleStack(Blocks.jukebox)
- },
+ new ItemStack[] { CI.machineHull_LV, ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8),
+ ItemUtils.getSimpleStack(Blocks.jukebox) },
ELEMENT.getInstance().COPPER.getFluidStack(144 * 2),
ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox),
20 * 30,
30);
- ItemStack aFluidRegulator1 =
- ItemUtils.getValueOfItemList("FluidRegulator_MV", 2, ItemList.Electric_Pump_HV);
+ ItemStack aFluidRegulator1 = ItemUtils
+ .getValueOfItemList("FluidRegulator_MV", 2, ItemList.Electric_Pump_HV);
ItemStack aFluidRegulator2 = ItemUtils.getValueOfItemList(
"FluidRegulator_IV",
2,
@@ -1326,13 +1073,9 @@ public class RECIPES_Machines {
// Poo Collector
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.machineHull_MV,
- aFluidRegulator1,
- CI.getTieredComponent(OrePrefixes.pipeMedium, 2, 2),
- ALLOY.EGLIN_STEEL.getPlate(4),
- ALLOY.POTIN.getScrew(6)
- },
+ new ItemStack[] { CI.machineHull_MV, aFluidRegulator1,
+ CI.getTieredComponent(OrePrefixes.pipeMedium, 2, 2), ALLOY.EGLIN_STEEL.getPlate(4),
+ ALLOY.POTIN.getScrew(6) },
ALLOY.TUMBAGA.getFluidStack(144 * 4),
ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
20 * 60,
@@ -1340,13 +1083,10 @@ public class RECIPES_Machines {
// Adv. Poo Collector
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getTieredMachineHull(-1),
- ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
- aFluidRegulator2,
- CI.getTieredComponent(OrePrefixes.pipeHuge, 6, 4),
- CI.getTieredComponent(OrePrefixes.screw, 6, 16)
- },
+ new ItemStack[] { CI.getTieredMachineHull(-1),
+ ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), aFluidRegulator2,
+ CI.getTieredComponent(OrePrefixes.pipeHuge, 6, 4),
+ CI.getTieredComponent(OrePrefixes.screw, 6, 16) },
CI.getAlternativeTieredFluid(5, 144 * 9),
ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1),
20 * 60 * 5,
@@ -1489,13 +1229,9 @@ public class RECIPES_Machines {
// Egg Box
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(8),
- CI.getTieredMachineHull(3),
- ItemUtils.getSimpleStack(Items.egg, 64),
- ItemUtils.getSimpleStack(ModItems.itemRope, 32),
- CI.getPlate(4, 8)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(3),
+ ItemUtils.getSimpleStack(Items.egg, 64), ItemUtils.getSimpleStack(ModItems.itemRope, 32),
+ CI.getPlate(4, 8) },
FluidUtils.getFluidStack("mobessence", 4096),
ItemUtils.getSimpleStack(ModBlocks.blockEggBox, 1),
20 * 60,
@@ -1504,14 +1240,10 @@ public class RECIPES_Machines {
// Flask Configurator
if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(8),
- CI.getTieredMachineHull(2),
- ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
- VolumetricFlaskHelper.getVolumetricFlask(8),
- CI.getTieredComponent(OrePrefixes.pipeSmall, 2, 2),
- CI.getPlate(2, 4)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(2),
+ ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
+ VolumetricFlaskHelper.getVolumetricFlask(8),
+ CI.getTieredComponent(OrePrefixes.pipeSmall, 2, 2), CI.getPlate(2, 4) },
CI.getAlternativeTieredFluid(1, 144 * 8),
ItemUtils.getSimpleStack(ModBlocks.blockVolumetricFlaskSetter, 1),
20 * 60,
@@ -1559,11 +1291,9 @@ public class RECIPES_Machines {
null);
GT_Values.RA.addArcFurnaceRecipe(
RECIPE_IronPlatedBricks,
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6),
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2)
- },
- new int[] {0},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6),
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2) },
+ new int[] { 0 },
32 * 20,
32);
}
@@ -1598,12 +1328,8 @@ public class RECIPES_Machines {
CI.component_Plate[6],
RECIPE_IndustrialCentrifugeCasing);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.MARAGING250.getPlate(4),
- ALLOY.INCONEL_792.getPlate(2),
- ALLOY.TUMBAGA.getRod(3),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.MARAGING250.getPlate(4), ALLOY.INCONEL_792.getPlate(2),
+ ALLOY.TUMBAGA.getRod(3), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialCentrifugeCasing,
50,
@@ -1658,12 +1384,8 @@ public class RECIPES_Machines {
CI.component_Plate[7],
RECIPE_IndustrialCokeOvenFrame);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.TANTALLOY_61.getPlate(4),
- ALLOY.TANTALLOY_61.getRod(4),
- ALLOY.TANTALLOY_61.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.TANTALLOY_61.getPlate(4), ALLOY.TANTALLOY_61.getRod(4),
+ ALLOY.TANTALLOY_61.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialCokeOvenFrame,
50,
@@ -1712,13 +1434,9 @@ public class RECIPES_Machines {
"platePotin",
RECIPE_IndustrialElectrolyzerFrame);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.POTIN.getPlate(4),
- ALLOY.POTIN.getLongRod(3),
- GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1),
- ALLOY.POTIN.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.POTIN.getPlate(4), ALLOY.POTIN.getLongRod(3),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1),
+ ALLOY.POTIN.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialElectrolyzerFrame,
50,
@@ -1755,13 +1473,9 @@ public class RECIPES_Machines {
"plateTitanium",
RECIPE_IndustrialMaterialPressFrame);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4),
- ALLOY.TANTALLOY_60.getRod(2),
- ALLOY.TUMBAGA.getLongRod(2),
- ALLOY.TUMBAGA.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4),
+ ALLOY.TANTALLOY_60.getRod(2), ALLOY.TUMBAGA.getLongRod(2), ALLOY.TUMBAGA.getFrameBox(1),
+ GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialMaterialPressFrame,
50,
@@ -1798,13 +1512,10 @@ public class RECIPES_Machines {
"platePalladium",
RECIPE_IndustrialMacerationStackFrame);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5),
- GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2),
- GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1),
- ALLOY.INCONEL_625.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5),
+ GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1),
+ ALLOY.INCONEL_625.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialMacerationStackFrame,
50,
@@ -1841,12 +1552,10 @@ public class RECIPES_Machines {
"plateBlueSteel",
RECIPE_IndustrialWireFactoryFrame);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4),
- GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4),
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4),
+ GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1),
+ GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialWireFactoryFrame,
50,
@@ -1883,15 +1592,21 @@ public class RECIPES_Machines {
ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket);
// Allows clearing stored fluids.
- GregtechItemList[] aTanks = new GregtechItemList[] {
- GregtechItemList.GT_FluidTank_ULV,
- GregtechItemList.GT_FluidTank_LV,
- GregtechItemList.GT_FluidTank_MV,
- GregtechItemList.GT_FluidTank_HV
- };
+ GregtechItemList[] aTanks = new GregtechItemList[] { GregtechItemList.GT_FluidTank_ULV,
+ GregtechItemList.GT_FluidTank_LV, GregtechItemList.GT_FluidTank_MV,
+ GregtechItemList.GT_FluidTank_HV };
for (GregtechItemList aTank : aTanks) {
RecipeUtils.addShapedGregtechRecipe(
- aTank.get(1), null, null, null, null, null, null, null, null, aTank.get(1));
+ aTank.get(1),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ aTank.get(1));
}
RecipeUtils.addShapedGregtechRecipe(
@@ -1974,67 +1689,34 @@ public class RECIPES_Machines {
// Semi-Fluid Generators
ItemStack[][] aSemiFluidInputs = new ItemStack[5][10];
- aSemiFluidInputs[0] = new ItemStack[] {
- CI.getNumberedBioCircuit(14),
- CI.getTieredMachineHull(1, 1),
- CI.getElectricMotor(1, 2),
- CI.getElectricPiston(1, 2),
- CI.getTieredComponent(OrePrefixes.cableGt01, 1, 1),
- CI.getTieredComponent(OrePrefixes.circuit, 1, 1),
- CI.getGear(1, 2)
- };
- aSemiFluidInputs[1] = new ItemStack[] {
- CI.getNumberedBioCircuit(14),
- CI.getTieredMachineHull(2, 1),
- CI.getElectricMotor(2, 2),
- CI.getElectricPiston(2, 2),
- CI.getTieredComponent(OrePrefixes.cableGt01, 2, 1),
- CI.getTieredComponent(OrePrefixes.circuit, 2, 1),
- CI.getGear(2, 2)
- };
- aSemiFluidInputs[2] = new ItemStack[] {
- CI.getNumberedBioCircuit(14),
- CI.getTieredMachineHull(3, 1),
- CI.getElectricMotor(3, 2),
- CI.getElectricPiston(3, 2),
- CI.getTieredComponent(OrePrefixes.cableGt01, 3, 1),
- CI.getTieredComponent(OrePrefixes.circuit, 3, 1),
- CI.getGear(3, 2)
- };
- aSemiFluidInputs[3] = new ItemStack[] {
- CI.getNumberedBioCircuit(14),
- CI.getTieredMachineHull(4, 1),
- CI.getElectricMotor(4, 2),
- CI.getElectricPiston(4, 2),
- CI.getTieredComponent(OrePrefixes.cableGt01, 4, 1),
- CI.getTieredComponent(OrePrefixes.circuit, 4, 1),
- CI.getGear(4, 2)
- };
- aSemiFluidInputs[4] = new ItemStack[] {
- CI.getNumberedBioCircuit(14),
- CI.getTieredMachineHull(5, 1),
- CI.getElectricMotor(5, 2),
- CI.getElectricPiston(5, 2),
- CI.getTieredComponent(OrePrefixes.cableGt01, 5, 1),
- CI.getTieredComponent(OrePrefixes.circuit, 5, 1),
- CI.getGear(5, 2)
- };
- FluidStack[] aSemiFluidFluidInputs = new FluidStack[] {
- ALLOY.POLYETHYLENE.getFluidStack(144),
- ALLOY.POLYETHYLENE.getFluidStack(144),
- ALLOY.POLYETHYLENE.getFluidStack(144),
- ALLOY.POLYETHYLENE.getFluidStack(144),
- ALLOY.POLYTETRAFLUOROETHYLENE.getFluidStack(144)
- };
+ aSemiFluidInputs[0] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(1, 1),
+ CI.getElectricMotor(1, 2), CI.getElectricPiston(1, 2),
+ CI.getTieredComponent(OrePrefixes.cableGt01, 1, 1),
+ CI.getTieredComponent(OrePrefixes.circuit, 1, 1), CI.getGear(1, 2) };
+ aSemiFluidInputs[1] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(2, 1),
+ CI.getElectricMotor(2, 2), CI.getElectricPiston(2, 2),
+ CI.getTieredComponent(OrePrefixes.cableGt01, 2, 1),
+ CI.getTieredComponent(OrePrefixes.circuit, 2, 1), CI.getGear(2, 2) };
+ aSemiFluidInputs[2] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(3, 1),
+ CI.getElectricMotor(3, 2), CI.getElectricPiston(3, 2),
+ CI.getTieredComponent(OrePrefixes.cableGt01, 3, 1),
+ CI.getTieredComponent(OrePrefixes.circuit, 3, 1), CI.getGear(3, 2) };
+ aSemiFluidInputs[3] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(4, 1),
+ CI.getElectricMotor(4, 2), CI.getElectricPiston(4, 2),
+ CI.getTieredComponent(OrePrefixes.cableGt01, 4, 1),
+ CI.getTieredComponent(OrePrefixes.circuit, 4, 1), CI.getGear(4, 2) };
+ aSemiFluidInputs[4] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(5, 1),
+ CI.getElectricMotor(5, 2), CI.getElectricPiston(5, 2),
+ CI.getTieredComponent(OrePrefixes.cableGt01, 5, 1),
+ CI.getTieredComponent(OrePrefixes.circuit, 5, 1), CI.getGear(5, 2) };
+ FluidStack[] aSemiFluidFluidInputs = new FluidStack[] { ALLOY.POLYETHYLENE.getFluidStack(144),
+ ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYETHYLENE.getFluidStack(144),
+ ALLOY.POLYETHYLENE.getFluidStack(144), ALLOY.POLYTETRAFLUOROETHYLENE.getFluidStack(144) };
// ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);
- ItemStack[] aSemifluids = new ItemStack[] {
- GregtechItemList.Generator_SemiFluid_LV.get(1),
- GregtechItemList.Generator_SemiFluid_MV.get(1),
- GregtechItemList.Generator_SemiFluid_HV.get(1),
- GregtechItemList.Generator_SemiFluid_EV.get(1),
- GregtechItemList.Generator_SemiFluid_IV.get(1)
- };
+ ItemStack[] aSemifluids = new ItemStack[] { GregtechItemList.Generator_SemiFluid_LV.get(1),
+ GregtechItemList.Generator_SemiFluid_MV.get(1), GregtechItemList.Generator_SemiFluid_HV.get(1),
+ GregtechItemList.Generator_SemiFluid_EV.get(1), GregtechItemList.Generator_SemiFluid_IV.get(1) };
for (int o = 0; o < 5; o++) {
CORE.RA.addSixSlotAssemblingRecipe(
aSemiFluidInputs[o],
@@ -2043,91 +1725,31 @@ public class RECIPES_Machines {
20 * 30,
MaterialUtils.getVoltageForTier(o + 1));
}
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_LV.get(1L), new Object[] {
- "PCP",
- "EME",
- "GWG",
- 'M',
- ItemList.Hull_LV,
- 'P',
- ItemList.Electric_Piston_LV,
- 'E',
- ItemList.Electric_Motor_LV,
- 'C',
- OrePrefixes.circuit.get(Materials.Basic),
- 'W',
- OrePrefixes.cableGt01.get(Materials.Tin),
- 'G',
- ALLOY.TUMBAGA.getGear(2)
- });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_MV.get(1L), new Object[] {
- "PCP",
- "EME",
- "GWG",
- 'M',
- ItemList.Hull_MV,
- 'P',
- ItemList.Electric_Piston_MV,
- 'E',
- ItemList.Electric_Motor_MV,
- 'C',
- OrePrefixes.circuit.get(Materials.Good),
- 'W',
- OrePrefixes.cableGt01.get(Materials.AnyCopper),
- 'G',
- ALLOY.EGLIN_STEEL.getGear(2)
- });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_HV.get(1L), new Object[] {
- "PCP",
- "EME",
- "GWG",
- 'M',
- ItemList.Hull_HV,
- 'P',
- ItemList.Electric_Piston_HV,
- 'E',
- ItemList.Electric_Motor_HV,
- 'C',
- OrePrefixes.circuit.get(Materials.Advanced),
- 'W',
- OrePrefixes.cableGt01.get(Materials.Gold),
- 'G',
- ALLOY.INCONEL_625.getGear(2)
- });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_EV.get(1L), new Object[] {
- "PCP",
- "EME",
- "GWG",
- 'M',
- ItemList.Hull_EV,
- 'P',
- ItemList.Electric_Piston_EV,
- 'E',
- ItemList.Electric_Motor_EV,
- 'C',
- OrePrefixes.circuit.get(Materials.Data),
- 'W',
- OrePrefixes.cableGt01.get(Materials.Aluminium),
- 'G',
- ALLOY.INCOLOY_DS.getGear(1)
- });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_IV.get(1L), new Object[] {
- "PCP",
- "EME",
- "GWG",
- 'M',
- ItemList.Hull_IV,
- 'P',
- ItemList.Electric_Piston_IV,
- 'E',
- ItemList.Electric_Motor_IV,
- 'C',
- OrePrefixes.circuit.get(Materials.Elite),
- 'W',
- OrePrefixes.cableGt01.get(Materials.Tungsten),
- 'G',
- ALLOY.NITINOL_60.getGear(1)
- });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_SemiFluid_LV.get(1L),
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E',
+ ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W',
+ OrePrefixes.cableGt01.get(Materials.Tin), 'G', ALLOY.TUMBAGA.getGear(2) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_SemiFluid_MV.get(1L),
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E',
+ ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W',
+ OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', ALLOY.EGLIN_STEEL.getGear(2) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_SemiFluid_HV.get(1L),
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E',
+ ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W',
+ OrePrefixes.cableGt01.get(Materials.Gold), 'G', ALLOY.INCONEL_625.getGear(2) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_SemiFluid_EV.get(1L),
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E',
+ ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W',
+ OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', ALLOY.INCOLOY_DS.getGear(1) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Generator_SemiFluid_IV.get(1L),
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E',
+ ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W',
+ OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', ALLOY.NITINOL_60.getGear(1) });
if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) {
// Industrial Blast Smelter
@@ -2160,11 +1782,8 @@ public class RECIPES_Machines {
"plateZirconiumCarbide",
RECIPE_IndustrialBlastSmelterFrame);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.ZIRCONIUM_CARBIDE.getPlate(6),
- ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.ZIRCONIUM_CARBIDE.getPlate(6), ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1),
+ GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialBlastSmelterFrame,
50,
@@ -2182,12 +1801,8 @@ public class RECIPES_Machines {
"plateStaballoy",
RECIPE_IndustrialBlastSmelterCoil);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.STABALLOY.getPlate(6),
- ALLOY.STABALLOY.getFrameBox(2),
- CI.gearboxCasing_Tier_3,
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.STABALLOY.getPlate(6), ALLOY.STABALLOY.getFrameBox(2),
+ CI.gearboxCasing_Tier_3, GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialBlastSmelterCoil,
50,
@@ -2195,12 +1810,8 @@ public class RECIPES_Machines {
}
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemList.Casing_Coil_Infinity.get(1),
- ItemList.Reactor_Coolant_Sp_6.get(4),
- ALLOY.LAURENIUM.getPlateDouble(2),
- CustomItemList.eM_Coil.get(1)
- },
+ new ItemStack[] { ItemList.Casing_Coil_Infinity.get(1), ItemList.Reactor_Coolant_Sp_6.get(4),
+ ALLOY.LAURENIUM.getPlateDouble(2), CustomItemList.eM_Coil.get(1) },
ALLOY.QUANTUM.getFluidStack(144 * 4),
GregtechItemList.Casing_Coil_QuantumForceTransformer.get(1),
60 * 30,
@@ -2212,18 +1823,13 @@ public class RECIPES_Machines {
2048,
(int) GT_Values.VP[11],
16,
- new Object[] {
- GregtechItemList.Controller_MolecularTransformer.get(1),
- GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1),
- new Object[] {OrePrefixes.circuit.get(Materials.Bio), 8},
- ItemList.Electric_Pump_UEV.get(4),
- ItemList.Field_Generator_UEV.get(4),
- GregtechItemList.Laser_Lens_Special.get(1)
- },
- new FluidStack[] {
- MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10),
- ALLOY.PIKYONIUM.getFluidStack(144 * 32)
- },
+ new Object[] { GregtechItemList.Controller_MolecularTransformer.get(1),
+ GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1),
+ new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8 },
+ ItemList.Electric_Pump_UEV.get(4), ItemList.Field_Generator_UEV.get(4),
+ GregtechItemList.Laser_Lens_Special.get(1) },
+ new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10),
+ ALLOY.PIKYONIUM.getFluidStack(144 * 32) },
GregtechItemList.QuantumForceTransformer.get(1),
1200 * 20,
(int) GT_Values.VP[11]);
@@ -2259,12 +1865,8 @@ public class RECIPES_Machines {
"plateNiobiumCarbide",
RECIPE_IndustrialMatterFabFrame);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.NIOBIUM_CARBIDE.getPlate(4),
- ALLOY.INCONEL_792.getRod(4),
- ALLOY.INCONEL_690.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.NIOBIUM_CARBIDE.getPlate(4), ALLOY.INCONEL_792.getRod(4),
+ ALLOY.INCONEL_690.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialMatterFabFrame,
50,
@@ -2282,13 +1884,8 @@ public class RECIPES_Machines {
CI.getPlate(6, 1),
RECIPE_IndustrialMatterFabCoil);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- CI.machineCasing_UV,
- ALLOY.ZERON_100.getPlate(4),
- ALLOY.PIKYONIUM.getPlate(2),
- ALLOY.STELLITE.getFrameBox(2),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { CI.machineCasing_UV, ALLOY.ZERON_100.getPlate(4), ALLOY.PIKYONIUM.getPlate(2),
+ ALLOY.STELLITE.getFrameBox(2), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialMatterFabCoil,
50,
@@ -2326,11 +1923,8 @@ public class RECIPES_Machines {
"plateEglinSteel",
RECIPE_IndustrialSieveFrame);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.EGLIN_STEEL.getPlate(8),
- ALLOY.TUMBAGA.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.EGLIN_STEEL.getPlate(8), ALLOY.TUMBAGA.getFrameBox(1),
+ GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialSieveFrame,
50,
@@ -2348,11 +1942,8 @@ public class RECIPES_Machines {
"frameGtEglinSteel",
RECIPE_IndustrialSieveGrate);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5),
- ALLOY.EGLIN_STEEL.getFrameBox(4),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5),
+ ALLOY.EGLIN_STEEL.getFrameBox(4), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
RECIPE_IndustrialSieveGrate,
50,
@@ -2377,14 +1968,10 @@ public class RECIPES_Machines {
RECIPE_TreeFarmController);
// Industrial Tree Farm Frame
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- GT_Utility.getIntegratedCircuit(2),
- ALLOY.TUMBAGA.getFrameBox(1),
- ItemUtils.getItemStackOfAmountFromOreDict("pipeTinySteel", 1),
- ItemList.MV_Coil.get(1),
- ItemList.IC2_Plantball.get(4),
- GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8),
- },
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(2), ALLOY.TUMBAGA.getFrameBox(1),
+ ItemUtils.getItemStackOfAmountFromOreDict("pipeTinySteel", 1), ItemList.MV_Coil.get(1),
+ ItemList.IC2_Plantball.get(4),
+ GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8), },
GT_ModHandler.getDistilledWater(2000),
RECIPE_TreeFarmFrame,
200,
@@ -2457,41 +2044,26 @@ public class RECIPES_Machines {
int aSlot = 0;
ItemStack[][] aInputsForSimpleWashers = new ItemStack[4][6];
- aInputsForSimpleWashers[0] = new ItemStack[] {
- CI.getTieredMachineHull(2),
- CI.getTieredComponent(OrePrefixes.screw, 2, 8),
- CI.getTieredComponent(OrePrefixes.plate, 1, 4),
- CI.getTieredComponent(OrePrefixes.rod, 2, 2),
- CI.getTieredComponent(OrePrefixes.circuit, 2, 1),
- };
- aInputsForSimpleWashers[1] = new ItemStack[] {
- CI.getTieredMachineHull(4),
- CI.getTieredComponent(OrePrefixes.screw, 4, 12),
- CI.getTieredComponent(OrePrefixes.plate, 3, 6),
- CI.getTieredComponent(OrePrefixes.rod, 4, 3),
- CI.getTieredComponent(OrePrefixes.circuit, 4, 2),
- };
- aInputsForSimpleWashers[2] = new ItemStack[] {
- CI.getTieredMachineHull(6),
- CI.getTieredComponent(OrePrefixes.screw, 6, 24),
- CI.getTieredComponent(OrePrefixes.plate, 5, 8),
- CI.getTieredComponent(OrePrefixes.rod, 6, 4),
- CI.getTieredComponent(OrePrefixes.circuit, 6, 3),
- };
- aInputsForSimpleWashers[3] = new ItemStack[] {
- CI.getTieredMachineHull(8),
- CI.getTieredComponent(OrePrefixes.screw, 8, 32),
- CI.getTieredComponent(OrePrefixes.plate, 7, 16),
- CI.getTieredComponent(OrePrefixes.rod, 8, 5),
- CI.getTieredComponent(OrePrefixes.circuit, 8, 4),
- };
-
- ItemStack[] aSimpleWashers = new ItemStack[] {
- GregtechItemList.SimpleDustWasher_MV.get(1),
- GregtechItemList.SimpleDustWasher_EV.get(1),
- GregtechItemList.SimpleDustWasher_LuV.get(1),
- GregtechItemList.SimpleDustWasher_UV.get(1)
- };
+ aInputsForSimpleWashers[0] = new ItemStack[] { CI.getTieredMachineHull(2),
+ CI.getTieredComponent(OrePrefixes.screw, 2, 8), CI.getTieredComponent(OrePrefixes.plate, 1, 4),
+ CI.getTieredComponent(OrePrefixes.rod, 2, 2),
+ CI.getTieredComponent(OrePrefixes.circuit, 2, 1), };
+ aInputsForSimpleWashers[1] = new ItemStack[] { CI.getTieredMachineHull(4),
+ CI.getTieredComponent(OrePrefixes.screw, 4, 12), CI.getTieredComponent(OrePrefixes.plate, 3, 6),
+ CI.getTieredComponent(OrePrefixes.rod, 4, 3),
+ CI.getTieredComponent(OrePrefixes.circuit, 4, 2), };
+ aInputsForSimpleWashers[2] = new ItemStack[] { CI.getTieredMachineHull(6),
+ CI.getTieredComponent(OrePrefixes.screw, 6, 24), CI.getTieredComponent(OrePrefixes.plate, 5, 8),
+ CI.getTieredComponent(OrePrefixes.rod, 6, 4),
+ CI.getTieredComponent(OrePrefixes.circuit, 6, 3), };
+ aInputsForSimpleWashers[3] = new ItemStack[] { CI.getTieredMachineHull(8),
+ CI.getTieredComponent(OrePrefixes.screw, 8, 32),
+ CI.getTieredComponent(OrePrefixes.plate, 7, 16), CI.getTieredComponent(OrePrefixes.rod, 8, 5),
+ CI.getTieredComponent(OrePrefixes.circuit, 8, 4), };
+
+ ItemStack[] aSimpleWashers = new ItemStack[] { GregtechItemList.SimpleDustWasher_MV.get(1),
+ GregtechItemList.SimpleDustWasher_EV.get(1), GregtechItemList.SimpleDustWasher_LuV.get(1),
+ GregtechItemList.SimpleDustWasher_UV.get(1) };
for (int i = 0; i < 4; i++) {
CORE.RA.addSixSlotAssemblingRecipe(
@@ -2710,15 +2282,17 @@ public class RECIPES_Machines {
// Lava Filter Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(18),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 32),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", 32),
- ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", 16),
- ItemUtils.getItemStackOfAmountFromOreDict("foilCopper", 4),
- ItemUtils.getItemStackWithMeta(
- LoadedMods.IndustrialCraft2, "IC2:itemPartCarbonMesh", "RawCarbonMesh", 0, 64),
- },
+ new ItemStack[] { CI.getNumberedCircuit(18),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 32),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", 32),
+ ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", 16),
+ ItemUtils.getItemStackOfAmountFromOreDict("foilCopper", 4),
+ ItemUtils.getItemStackWithMeta(
+ LoadedMods.IndustrialCraft2,
+ "IC2:itemPartCarbonMesh",
+ "RawCarbonMesh",
+ 0,
+ 64), },
CI.getTieredFluid(3, 144),
ItemUtils.getSimpleStack(ModItems.itemLavaFilter, 16),
1600,
@@ -2727,8 +2301,8 @@ public class RECIPES_Machines {
// Air Intake Hatch
ItemList FluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV);
- ItemStack aTieredFluidRegulator =
- CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? FluidRegulator_IV.get(1) : ItemList.Pump_IV.get(1);
+ ItemStack aTieredFluidRegulator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? FluidRegulator_IV.get(1)
+ : ItemList.Pump_IV.get(1);
RecipeUtils.addShapedGregtechRecipe(
CI.component_Plate[6],
ItemList.Casing_Grate.get(1),
@@ -2812,9 +2386,8 @@ public class RECIPES_Machines {
// LFTR Control Circuit
CORE.RA.addSixSlotAssemblingRecipe(
new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1),
- CI.fieldGenerator_HV
- },
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1),
+ CI.fieldGenerator_HV },
null,
controlCircuit,
240 * 20,
@@ -2935,17 +2508,20 @@ public class RECIPES_Machines {
GregtechItemList.GT4_Shelf.get(2));
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {GregtechItemList.GT4_Shelf.get(1)}, GregtechItemList.GT4_Shelf_Compartment.get(1));
+ new ItemStack[] { GregtechItemList.GT4_Shelf.get(1) },
+ GregtechItemList.GT4_Shelf_Compartment.get(1));
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {GregtechItemList.GT4_Shelf_Compartment.get(1)},
+ new ItemStack[] { GregtechItemList.GT4_Shelf_Compartment.get(1) },
GregtechItemList.GT4_Shelf_Desk.get(1));
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {GregtechItemList.GT4_Shelf_Desk.get(1)}, GregtechItemList.GT4_Shelf_Iron.get(1));
+ new ItemStack[] { GregtechItemList.GT4_Shelf_Desk.get(1) },
+ GregtechItemList.GT4_Shelf_Iron.get(1));
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {GregtechItemList.GT4_Shelf_Iron.get(1)},
+ new ItemStack[] { GregtechItemList.GT4_Shelf_Iron.get(1) },
GregtechItemList.GT4_Shelf_FileCabinet.get(1));
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {GregtechItemList.GT4_Shelf_FileCabinet.get(1)}, GregtechItemList.GT4_Shelf.get(1));
+ new ItemStack[] { GregtechItemList.GT4_Shelf_FileCabinet.get(1) },
+ GregtechItemList.GT4_Shelf.get(1));
// Cyclotron
if (CORE.ConfigSwitches.enableMultiblock_Cyclotron) {
@@ -2955,14 +2531,10 @@ public class RECIPES_Machines {
// Outer Casing
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemList.Casing_FrostProof.get(1),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 4),
- ALLOY.INCOLOY_DS.getPlate(8),
- ALLOY.INCONEL_690.getScrew(16),
- ALLOY.EGLIN_STEEL.getLongRod(4),
- CI.getElectricPiston(3, 2)
- },
+ new ItemStack[] { ItemList.Casing_FrostProof.get(1),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 4),
+ ALLOY.INCOLOY_DS.getPlate(8), ALLOY.INCONEL_690.getScrew(16),
+ ALLOY.EGLIN_STEEL.getLongRod(4), CI.getElectricPiston(3, 2) },
ALLOY.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8), // Input Fluid
RECIPE_CyclotronOuterCasing,
30 * 20 * 2,
@@ -2970,14 +2542,10 @@ public class RECIPES_Machines {
// Inner Coil
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemList.Casing_Coil_Nichrome.get(1),
- ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 8),
- ALLOY.INCOLOY_MA956.getPlate(8),
- ALLOY.TANTALLOY_61.getBolt(16),
- ALLOY.INCOLOY_020.getScrew(32),
- CI.getFieldGenerator(4, 1)
- },
+ new ItemStack[] { ItemList.Casing_Coil_Nichrome.get(1),
+ ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 8),
+ ALLOY.INCOLOY_MA956.getPlate(8), ALLOY.TANTALLOY_61.getBolt(16),
+ ALLOY.INCOLOY_020.getScrew(32), CI.getFieldGenerator(4, 1) },
ALLOY.HG1223.getFluidStack(144 * 5), // Input Fluid
RECIPE_CyclotronInnerCoil,
60 * 20 * 2,
@@ -2985,14 +2553,10 @@ public class RECIPES_Machines {
// Controller
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.machineHull_IV,
- ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, 2),
- ALLOY.INCOLOY_020.getPlate(8),
- ALLOY.TANTALLOY_61.getGear(2),
- ALLOY.INCOLOY_MA956.getScrew(16),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 16)
- },
+ new ItemStack[] { CI.machineHull_IV, ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, 2),
+ ALLOY.INCOLOY_020.getPlate(8), ALLOY.TANTALLOY_61.getGear(2),
+ ALLOY.INCOLOY_MA956.getScrew(16),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 16) },
ALLOY.INCOLOY_020.getFluidStack(144 * 9), // Input Fluid
RECIPE_CyclotronController,
60 * 20 * 5,
@@ -3001,23 +2565,11 @@ public class RECIPES_Machines {
// Mazut
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Controller_LargeSemifluidGenerator.get(1L), CI.bitsd, new Object[] {
- "PCP",
- "EME",
- "GWG",
- 'M',
- ItemList.Hull_EV,
- 'P',
- ItemList.Electric_Piston_EV,
- 'E',
- ItemList.Electric_Pump_EV,
- 'C',
- OrePrefixes.circuit.get(Materials.Data),
- 'W',
- OrePrefixes.cableGt08.get(Materials.Electrum),
- 'G',
- ALLOY.INCONEL_792.getGear(1)
- });
+ GregtechItemList.Controller_LargeSemifluidGenerator.get(1L),
+ CI.bitsd,
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E',
+ ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W',
+ OrePrefixes.cableGt08.get(Materials.Electrum), 'G', ALLOY.INCONEL_792.getGear(1) });
if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) {
RecipeUtils.addShapedRecipe(
@@ -3060,11 +2612,9 @@ public class RECIPES_Machines {
"plateRedSteel",
GregtechItemList.Casing_ThermalCentrifuge.get(1));
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6),
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1),
+ GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
GregtechItemList.Casing_ThermalCentrifuge.get(1L),
50,
@@ -3096,12 +2646,8 @@ public class RECIPES_Machines {
"plateGrisium",
GregtechItemList.Casing_WashPlant.get(1));
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.LEAGRISIUM.getPlate(4),
- ALLOY.TALONITE.getPlate(2),
- ALLOY.LEAGRISIUM.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.LEAGRISIUM.getPlate(4), ALLOY.TALONITE.getPlate(2),
+ ALLOY.LEAGRISIUM.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
GregtechItemList.Casing_WashPlant.get(1L),
50,
@@ -3132,41 +2678,32 @@ public class RECIPES_Machines {
aCoreBlock.stackSize = 1;
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1),
- aCoreBlock,
- CI.getTieredComponent(OrePrefixes.circuit, 2, 16),
- CI.getTieredComponent(OrePrefixes.screw, 5, 32),
- CI.getTieredComponent(OrePrefixes.bolt, 5, 12),
- CI.getTieredComponent(OrePrefixes.plate, 6, 8),
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1),
+ aCoreBlock, CI.getTieredComponent(OrePrefixes.circuit, 2, 16),
+ CI.getTieredComponent(OrePrefixes.screw, 5, 32),
+ CI.getTieredComponent(OrePrefixes.bolt, 5, 12),
+ CI.getTieredComponent(OrePrefixes.plate, 6, 8), },
CI.getTertiaryTieredFluid(6, 144 * (4)),
GregtechItemList.Casing_Autocrafter.get(1),
20 * 60 * 2,
MaterialUtils.getVoltageForTier(5));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- GregtechItemList.Casing_Refinery_Structural.get(4),
- ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 1),
- CI.getTieredComponent(OrePrefixes.cableGt08, 6, 16),
- CI.getTransmissionComponent(5, 2),
- GregtechItemList.Gregtech_Computer_Cube.get(1),
- },
+ new ItemStack[] { GregtechItemList.Casing_Refinery_Structural.get(4),
+ ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 1),
+ CI.getTieredComponent(OrePrefixes.cableGt08, 6, 16), CI.getTransmissionComponent(5, 2),
+ GregtechItemList.Gregtech_Computer_Cube.get(1), },
CI.getTieredFluid(7, 144 * 8),
GregtechItemList.GT4_Multi_Crafter.get(1),
20 * 60 * 5,
MaterialUtils.getVoltageForTier(5));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1),
- CI.getEmitter(4, 2),
- CI.getRobotArm(4, 2),
- CI.getTieredComponent(OrePrefixes.circuit, 2, 8),
- CI.getTieredComponent(OrePrefixes.screw, 3, 8),
- CI.getTieredComponent(OrePrefixes.plate, 5, 4),
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1),
+ CI.getEmitter(4, 2), CI.getRobotArm(4, 2),
+ CI.getTieredComponent(OrePrefixes.circuit, 2, 8),
+ CI.getTieredComponent(OrePrefixes.screw, 3, 8),
+ CI.getTieredComponent(OrePrefixes.plate, 5, 4), },
CI.getAlternativeTieredFluid(5, 144 * 4),
ItemUtils.getSimpleStack(ModBlocks.blockProjectTable),
20 * 30 * 3,
@@ -3187,12 +2724,8 @@ public class RECIPES_Machines {
plate,
GregtechItemList.Casing_CuttingFactoryFrame.get(1));
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.MARAGING300.getPlate(4),
- ALLOY.STELLITE.getPlate(2),
- ALLOY.TALONITE.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.MARAGING300.getPlate(4), ALLOY.STELLITE.getPlate(2),
+ ALLOY.TALONITE.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
GregtechItemList.Casing_CuttingFactoryFrame.get(1L),
50,
@@ -3226,12 +2759,8 @@ public class RECIPES_Machines {
plate,
GregtechItemList.Casing_Extruder.get(1));
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.INCONEL_690.getPlate(4),
- ALLOY.TALONITE.getPlate(2),
- ALLOY.STABALLOY.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.INCONEL_690.getPlate(4), ALLOY.TALONITE.getPlate(2),
+ ALLOY.STABALLOY.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
GregtechItemList.Casing_Extruder.get(1L),
50,
@@ -3264,12 +2793,8 @@ public class RECIPES_Machines {
plate,
GregtechItemList.Casing_FishPond.get(1));
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.AQUATIC_STEEL.getPlate(4),
- ALLOY.EGLIN_STEEL.getPlate(2),
- ALLOY.EGLIN_STEEL.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.AQUATIC_STEEL.getPlate(4), ALLOY.EGLIN_STEEL.getPlate(2),
+ ALLOY.EGLIN_STEEL.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
GregtechItemList.Casing_FishPond.get(1L),
50,
@@ -3350,29 +2875,23 @@ public class RECIPES_Machines {
GregtechItemList.Machine_Adv_BlastFurnace.get(1));
// Hatch_Input_Pyrotheum
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ItemList.Hatch_Input_IV.get(1),
- GregtechItemList.Casing_Adv_BlastFurnace.get(1),
- ALLOY.MARAGING250.getPlate(4),
- ALLOY.MARAGING300.getGear(1),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ItemList.Hatch_Input_IV.get(1),
+ GregtechItemList.Casing_Adv_BlastFurnace.get(1), ALLOY.MARAGING250.getPlate(4),
+ ALLOY.MARAGING300.getGear(1),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2),
+ GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
GregtechItemList.Hatch_Input_Pyrotheum.get(1L),
50,
16);
// Casing_Adv_BlastFurnace
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.HASTELLOY_X.getFrameBox(1),
- ALLOY.HASTELLOY_N.getPlateDouble(4),
- ALLOY.HASTELLOY_W.getGear(1),
- ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1),
- ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1),
- ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.HASTELLOY_X.getFrameBox(1), ALLOY.HASTELLOY_N.getPlateDouble(4),
+ ALLOY.HASTELLOY_W.getGear(1),
+ ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1),
+ ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1),
+ ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1),
+ GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
GregtechItemList.Casing_Adv_BlastFurnace.get(1L),
50,
@@ -3404,9 +2923,8 @@ public class RECIPES_Machines {
cell1 = CI.conveyorModule_LuV;
cell2 = CI.electricMotor_LuV;
ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1);
- ItemStack aTieredUnboxinator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK
- ? ItemUtils.getValueOfItemList(
- "Machine_LuV_Unboxinator", 1, ItemList.Machine_IV_Unboxinator.get(1))
+ ItemStack aTieredUnboxinator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemUtils
+ .getValueOfItemList("Machine_LuV_Unboxinator", 1, ItemList.Machine_IV_Unboxinator.get(1))
: ItemList.Machine_IV_Unboxinator.get(1);
RecipeUtils.addShapedRecipe(
@@ -3421,15 +2939,11 @@ public class RECIPES_Machines {
plate,
GregtechItemList.Casing_AmazonWarehouse.get(1));
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1),
- ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(4),
- ALLOY.TRINIUM_TITANIUM.getRing(1),
- ItemList.Electric_Motor_LuV.get(1),
- ItemList.Conveyor_Module_LuV.get(1),
- ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1),
+ ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(4), ALLOY.TRINIUM_TITANIUM.getRing(1),
+ ItemList.Electric_Motor_LuV.get(1), ItemList.Conveyor_Module_LuV.get(1),
+ ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1),
+ GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
GregtechItemList.Casing_AmazonWarehouse.get(1L),
50,
@@ -3482,12 +2996,9 @@ public class RECIPES_Machines {
plate,
GregtechItemList.Casing_Multi_Use.get(1));
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ALLOY.STABALLOY.getPlate(4),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
- ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1),
- GT_Utility.getIntegratedCircuit(1),
- },
+ new ItemStack[] { ALLOY.STABALLOY.getPlate(4),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2),
+ ALLOY.ZIRCONIUM_CARBIDE.getFrameBox(1), GT_Utility.getIntegratedCircuit(1), },
GT_Values.NF,
GregtechItemList.Casing_Multi_Use.get(1L),
50,
@@ -3512,18 +3023,16 @@ public class RECIPES_Machines {
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- ItemStack aDrillController = ItemUtils.getValueOfItemList("OreDrill4", ItemList.Hull_UV)
- .get(1);
+ ItemStack aDrillController = ItemUtils.getValueOfItemList("OreDrill4", ItemList.Hull_UV).get(1);
// Drilling Platform Casings
CORE.RA.addSixSlotAssemblingRecipe(
new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("frameGtTriniumNaquadahCarbonite", 4),
- ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleTriniumTitaniumAlloy", 1 * (1)),
- ItemUtils.getItemStackOfAmountFromOreDict("gearGtPikyonium64B", 2 * (1)),
- ALLOY.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * (1)),
- ItemUtils.getSimpleStack((CI.machineHull_LuV), 1 * (1)),
- },
+ ItemUtils.getItemStackOfAmountFromOreDict("frameGtTriniumNaquadahCarbonite", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleTriniumTitaniumAlloy", 1 * (1)),
+ ItemUtils.getItemStackOfAmountFromOreDict("gearGtPikyonium64B", 2 * (1)),
+ ALLOY.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * (1)),
+ ItemUtils.getSimpleStack((CI.machineHull_LuV), 1 * (1)), },
ALLOY.MARAGING350.getFluidStack(144 * 16 * (1)),
GregtechItemList.Casing_BedrockMiner.get(1),
(int) GT_Values.V[4],
@@ -3535,15 +3044,12 @@ public class RECIPES_Machines {
// Mystic Frame
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- GregtechItemList.Casing_Multi_Use.get(1),
- ItemList.Field_Generator_MV.get(1, CI.circuitTier7),
- ItemList.Field_Generator_HV.get(1, CI.circuitTier7),
- ItemList.Emitter_HV.get(1, CI.circuitTier7),
- ItemList.Sensor_HV.get(1, CI.circuitTier7),
- CI.getTieredComponent(OrePrefixes.plate, 7, 8 * aCostMultiplier),
- CI.getTieredComponent(OrePrefixes.wireGt08, 8, 4 * aCostMultiplier),
- },
+ new ItemStack[] { GregtechItemList.Casing_Multi_Use.get(1),
+ ItemList.Field_Generator_MV.get(1, CI.circuitTier7),
+ ItemList.Field_Generator_HV.get(1, CI.circuitTier7),
+ ItemList.Emitter_HV.get(1, CI.circuitTier7), ItemList.Sensor_HV.get(1, CI.circuitTier7),
+ CI.getTieredComponent(OrePrefixes.plate, 7, 8 * aCostMultiplier),
+ CI.getTieredComponent(OrePrefixes.wireGt08, 8, 4 * aCostMultiplier), },
CI.getTieredFluid(6, (144 * 8)), // Input Fluid
ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 2),
45 * 20 * 1 * (6),
@@ -3551,31 +3057,22 @@ public class RECIPES_Machines {
GT_MetaTileEntity_Disassembler.addBlacklist(ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 1));
// Player Doors
- ItemStack[] aDoorInputs = new ItemStack[] {
- ItemUtils.getSimpleStack(Blocks.log2),
- ItemUtils.getSimpleStack(Blocks.iron_block),
- ItemUtils.getSimpleStack(Blocks.glass),
- ItemUtils.getSimpleStack(Blocks.packed_ice),
- ItemUtils.getSimpleStack(Blocks.cactus),
- };
- ItemStack[] aDoorOutputs = new ItemStack[] {
- ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorWooden),
- ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorIron),
- ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Glass),
- ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Ice),
- ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Cactus),
- };
+ ItemStack[] aDoorInputs = new ItemStack[] { ItemUtils.getSimpleStack(Blocks.log2),
+ ItemUtils.getSimpleStack(Blocks.iron_block), ItemUtils.getSimpleStack(Blocks.glass),
+ ItemUtils.getSimpleStack(Blocks.packed_ice), ItemUtils.getSimpleStack(Blocks.cactus), };
+ ItemStack[] aDoorOutputs = new ItemStack[] { ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorWooden),
+ ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorIron),
+ ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Glass),
+ ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Ice),
+ ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Cactus), };
for (int y = 0; y < aDoorInputs.length; y++) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(Items.iron_door),
- aDoorInputs[y],
- ItemList.Sensor_LV.get(1, CI.circuitTier7),
- CI.getTieredComponent(OrePrefixes.plate, 1, 2 * aCostMultiplier),
- CI.getTieredComponent(OrePrefixes.wireGt02, 1, 2 * aCostMultiplier),
- ItemUtils.getSimpleStack(Items.redstone, 16)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(Items.iron_door), aDoorInputs[y],
+ ItemList.Sensor_LV.get(1, CI.circuitTier7),
+ CI.getTieredComponent(OrePrefixes.plate, 1, 2 * aCostMultiplier),
+ CI.getTieredComponent(OrePrefixes.wireGt02, 1, 2 * aCostMultiplier),
+ ItemUtils.getSimpleStack(Items.redstone, 16) },
CI.getTieredFluid(1, (144 * 2)), // Input Fluid
aDoorOutputs[y],
100,
@@ -3587,66 +3084,32 @@ public class RECIPES_Machines {
private static void controlCores() {
- Material[] aMat_A = new Material[] {
- ALLOY.POTIN,
- ALLOY.ZIRCONIUM_CARBIDE,
- ALLOY.TANTALLOY_61,
- ALLOY.INCONEL_792,
- ALLOY.STABALLOY,
- ALLOY.TALONITE,
- ALLOY.HASTELLOY_N,
- ALLOY.HG1223,
- ALLOY.LAFIUM,
- ALLOY.PIKYONIUM
- };
- Material[] aMat_B = new Material[] {
- ALLOY.TUMBAGA,
- ALLOY.SILICON_CARBIDE,
- ALLOY.EGLIN_STEEL,
- ALLOY.NICHROME,
- ALLOY.TUNGSTEN_CARBIDE,
- ALLOY.STELLITE,
- ALLOY.HASTELLOY_C276,
- ALLOY.NITINOL_60,
- ALLOY.ZERON_100,
- ALLOY.CINOBITE
- };
+ Material[] aMat_A = new Material[] { ALLOY.POTIN, ALLOY.ZIRCONIUM_CARBIDE, ALLOY.TANTALLOY_61,
+ ALLOY.INCONEL_792, ALLOY.STABALLOY, ALLOY.TALONITE, ALLOY.HASTELLOY_N, ALLOY.HG1223, ALLOY.LAFIUM,
+ ALLOY.PIKYONIUM };
+ Material[] aMat_B = new Material[] { ALLOY.TUMBAGA, ALLOY.SILICON_CARBIDE, ALLOY.EGLIN_STEEL, ALLOY.NICHROME,
+ ALLOY.TUNGSTEN_CARBIDE, ALLOY.STELLITE, ALLOY.HASTELLOY_C276, ALLOY.NITINOL_60, ALLOY.ZERON_100,
+ ALLOY.CINOBITE };
Item aBaseCore = ModItems.itemControlCore;
ItemStack[] aInputPrevTier = new ItemStack[] {
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1),
- ItemUtils.simpleMetaStack(aBaseCore, 0, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 1, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 2, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 3, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 4, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 5, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 6, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 7, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 8, 1),
- };
- ItemStack[] aOutput = new ItemStack[] {
- ItemUtils.simpleMetaStack(aBaseCore, 0, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 1, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 2, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 3, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 4, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 5, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 6, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 7, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 8, 1),
- ItemUtils.simpleMetaStack(aBaseCore, 9, 1),
- };
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1),
+ ItemUtils.simpleMetaStack(aBaseCore, 0, 1), ItemUtils.simpleMetaStack(aBaseCore, 1, 1),
+ ItemUtils.simpleMetaStack(aBaseCore, 2, 1), ItemUtils.simpleMetaStack(aBaseCore, 3, 1),
+ ItemUtils.simpleMetaStack(aBaseCore, 4, 1), ItemUtils.simpleMetaStack(aBaseCore, 5, 1),
+ ItemUtils.simpleMetaStack(aBaseCore, 6, 1), ItemUtils.simpleMetaStack(aBaseCore, 7, 1),
+ ItemUtils.simpleMetaStack(aBaseCore, 8, 1), };
+ ItemStack[] aOutput = new ItemStack[] { ItemUtils.simpleMetaStack(aBaseCore, 0, 1),
+ ItemUtils.simpleMetaStack(aBaseCore, 1, 1), ItemUtils.simpleMetaStack(aBaseCore, 2, 1),
+ ItemUtils.simpleMetaStack(aBaseCore, 3, 1), ItemUtils.simpleMetaStack(aBaseCore, 4, 1),
+ ItemUtils.simpleMetaStack(aBaseCore, 5, 1), ItemUtils.simpleMetaStack(aBaseCore, 6, 1),
+ ItemUtils.simpleMetaStack(aBaseCore, 7, 1), ItemUtils.simpleMetaStack(aBaseCore, 8, 1),
+ ItemUtils.simpleMetaStack(aBaseCore, 9, 1), };
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.machineHull_HV,
- aOutput[1],
- aMat_A[1].getGear(2),
- aMat_B[2].getPlateDouble(8),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + ("1"), 2),
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 5)
- },
+ new ItemStack[] { CI.machineHull_HV, aOutput[1], aMat_A[1].getGear(2), aMat_B[2].getPlateDouble(8),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + ("1"), 2),
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 5) },
aMat_B[3].getFluidStack(144 * 8), // Input Fluid
GregtechItemList.Hatch_Control_Core.get(1),
60 * 20 * 5,
@@ -3678,15 +3141,10 @@ public class RECIPES_Machines {
}
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getEnergyCore(i, 4),
- aPlateStack,
- aGearStack,
- aRodStack,
- aScrewStack,
- ItemUtils.getItemStackOfAmountFromOreDict(
- CI.getTieredCircuitOreDictName((int) (4 + Math.ceil((double) i / (double) 2))), i * 2)
- },
+ new ItemStack[] { CI.getEnergyCore(i, 4), aPlateStack, aGearStack, aRodStack, aScrewStack,
+ ItemUtils.getItemStackOfAmountFromOreDict(
+ CI.getTieredCircuitOreDictName((int) (4 + Math.ceil((double) i / (double) 2))),
+ i * 2) },
CI.getTieredFluid(i, 144 * 4 * (i + 1)), // Input Fluid
aOutput[i],
60 * 20 * 1 * (i + 1),
@@ -3696,31 +3154,21 @@ public class RECIPES_Machines {
private static void energyCores() {
- ItemStack[] aBufferOutput = new ItemStack[] {
- RECIPE_Buffer_ULV,
- RECIPE_Buffer_LV,
- RECIPE_Buffer_MV,
- RECIPE_Buffer_HV,
- RECIPE_Buffer_EV,
- RECIPE_Buffer_IV,
- RECIPE_Buffer_LuV,
- RECIPE_Buffer_ZPM,
- RECIPE_Buffer_UV,
- RECIPE_Buffer_MAX
- };
+ ItemStack[] aBufferOutput = new ItemStack[] { RECIPE_Buffer_ULV, RECIPE_Buffer_LV, RECIPE_Buffer_MV,
+ RECIPE_Buffer_HV, RECIPE_Buffer_EV, RECIPE_Buffer_IV, RECIPE_Buffer_LuV, RECIPE_Buffer_ZPM,
+ RECIPE_Buffer_UV, RECIPE_Buffer_MAX };
ItemStack[] aOutput = new ItemStack[] {
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "1", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "2", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "3", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "4", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "5", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "6", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "7", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "8", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "9", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "10", 1)
- };
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "1", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "2", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "3", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "4", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "5", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "6", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "7", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "8", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "9", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "10", 1) };
for (int i = 0; i < 10; i++) {
@@ -3728,14 +3176,11 @@ public class RECIPES_Machines {
aPrevTier.stackSize = 1;
int aTier = (i + 1);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- aPrevTier,
- CI.getTieredComponent(OrePrefixes.plate, aTier, 4),
- CI.getTieredComponent(OrePrefixes.cableGt04, i, 2),
- CI.getTieredComponent(OrePrefixes.circuit, aTier, 2),
- CI.getTieredComponent(OrePrefixes.screw, aTier, 6),
- CI.getTieredComponent(OrePrefixes.bolt, i, 12),
- },
+ new ItemStack[] { aPrevTier, CI.getTieredComponent(OrePrefixes.plate, aTier, 4),
+ CI.getTieredComponent(OrePrefixes.cableGt04, i, 2),
+ CI.getTieredComponent(OrePrefixes.circuit, aTier, 2),
+ CI.getTieredComponent(OrePrefixes.screw, aTier, 6),
+ CI.getTieredComponent(OrePrefixes.bolt, i, 12), },
CI.getTieredFluid(i, (144 * 4 * aTier)), // Input Fluid
aOutput[i],
45 * 10 * 1 * (aTier),
@@ -3743,14 +3188,12 @@ public class RECIPES_Machines {
// Energy Buffer
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(aOutput[i], 4),
- CI.getTieredComponent(OrePrefixes.plate, aTier, 8),
- CI.getTieredComponent(OrePrefixes.wireGt08, i, 4),
- CI.getTieredComponent(OrePrefixes.circuit, i, 4),
- CI.getTieredComponent(OrePrefixes.stickLong, aTier, 4),
- CI.getTieredComponent(OrePrefixes.gearGt, i, 5),
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(aOutput[i], 4),
+ CI.getTieredComponent(OrePrefixes.plate, aTier, 8),
+ CI.getTieredComponent(OrePrefixes.wireGt08, i, 4),
+ CI.getTieredComponent(OrePrefixes.circuit, i, 4),
+ CI.getTieredComponent(OrePrefixes.stickLong, aTier, 4),
+ CI.getTieredComponent(OrePrefixes.gearGt, i, 5), },
CI.getTieredFluid(aTier, (144 * 16 * aTier)), // Input Fluid
aBufferOutput[i],
45 * 20 * 1 * (aTier),
@@ -3760,31 +3203,20 @@ public class RECIPES_Machines {
private static void wirelessChargers() {
- ItemStack[] aChargers = new ItemStack[] {
- null,
- GregtechItemList.Charger_LV.get(1),
- GregtechItemList.Charger_MV.get(1),
- GregtechItemList.Charger_HV.get(1),
- GregtechItemList.Charger_EV.get(1),
- GregtechItemList.Charger_IV.get(1),
- GregtechItemList.Charger_LuV.get(1),
- GregtechItemList.Charger_ZPM.get(1),
- GregtechItemList.Charger_UV.get(1),
- GregtechItemList.Charger_MAX.get(1)
- };
+ ItemStack[] aChargers = new ItemStack[] { null, GregtechItemList.Charger_LV.get(1),
+ GregtechItemList.Charger_MV.get(1), GregtechItemList.Charger_HV.get(1),
+ GregtechItemList.Charger_EV.get(1), GregtechItemList.Charger_IV.get(1),
+ GregtechItemList.Charger_LuV.get(1), GregtechItemList.Charger_ZPM.get(1),
+ GregtechItemList.Charger_UV.get(1), GregtechItemList.Charger_MAX.get(1) };
for (int i = 0; i < 10; i++) {
if (i == 0) {
continue;
}
int aTier = (i + 1);
- ItemStack[] aInputs = new ItemStack[] {
- CI.getTieredMachineHull(i, 1),
- CI.getTransmissionComponent(i, 2),
- CI.getFieldGenerator(i, 1),
- CI.getTieredComponent(OrePrefixes.plate, aTier, 4),
- CI.getTieredComponent(OrePrefixes.circuit, aTier, 2),
- };
+ ItemStack[] aInputs = new ItemStack[] { CI.getTieredMachineHull(i, 1), CI.getTransmissionComponent(i, 2),
+ CI.getFieldGenerator(i, 1), CI.getTieredComponent(OrePrefixes.plate, aTier, 4),
+ CI.getTieredComponent(OrePrefixes.circuit, aTier, 2), };
CORE.RA.addSixSlotAssemblingRecipe(
aInputs,
CI.getAlternativeTieredFluid(i, (144 * 2 * aTier)), // Input Fluid
@@ -3797,26 +3229,21 @@ public class RECIPES_Machines {
private static void largeArcFurnace() {
int aCostMultiplier = 1;
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getTieredMachineHull(-1, 1 * aCostMultiplier),
- CI.getTransmissionComponent(2, 2 * aCostMultiplier),
- CI.getElectricPiston(4, 2 * aCostMultiplier),
- CI.getTieredComponent(OrePrefixes.plate, 5, 4 * aCostMultiplier),
- CI.getTieredComponent(OrePrefixes.pipeSmall, 4, 1 * aCostMultiplier),
- },
+ new ItemStack[] { CI.getTieredMachineHull(-1, 1 * aCostMultiplier),
+ CI.getTransmissionComponent(2, 2 * aCostMultiplier),
+ CI.getElectricPiston(4, 2 * aCostMultiplier),
+ CI.getTieredComponent(OrePrefixes.plate, 5, 4 * aCostMultiplier),
+ CI.getTieredComponent(OrePrefixes.pipeSmall, 4, 1 * aCostMultiplier), },
CI.getAlternativeTieredFluid(5, (144 * 2 * 4)), // Input Fluid
GregtechItemList.Casing_Industrial_Arc_Furnace.get(1),
20 * 10 * 1 * (6),
MaterialUtils.getVoltageForTier(5));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- GregtechItemList.Casing_Industrial_Arc_Furnace.get(1),
- CI.getFieldGenerator(4, 2 * aCostMultiplier),
- CI.getRobotArm(5, 4 * aCostMultiplier),
- CI.getEnergyCore(4, 2 * aCostMultiplier),
- CI.getTieredComponent(OrePrefixes.plate, 6, 8 * aCostMultiplier),
- CI.getTieredComponent(OrePrefixes.circuit, 5, 8 * aCostMultiplier),
- },
+ new ItemStack[] { GregtechItemList.Casing_Industrial_Arc_Furnace.get(1),
+ CI.getFieldGenerator(4, 2 * aCostMultiplier), CI.getRobotArm(5, 4 * aCostMultiplier),
+ CI.getEnergyCore(4, 2 * aCostMultiplier),
+ CI.getTieredComponent(OrePrefixes.plate, 6, 8 * aCostMultiplier),
+ CI.getTieredComponent(OrePrefixes.circuit, 5, 8 * aCostMultiplier), },
CI.getAlternativeTieredFluid(6, (144 * 4 * 5)), // Input Fluid
GregtechItemList.Industrial_Arc_Furnace.get(1),
60 * 20 * 8,
@@ -3826,13 +3253,9 @@ public class RECIPES_Machines {
private static void industrialVacuumFurnace() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getTieredMachineHull(-1, 1),
- CI.getHeatCoil(2),
- CI.getElectricPiston(3, 2),
- CI.getTieredComponent(OrePrefixes.plate, 6, 4),
- CI.getTieredComponent(OrePrefixes.gearGt, 6, 2),
- },
+ new ItemStack[] { CI.getTieredMachineHull(-1, 1), CI.getHeatCoil(2), CI.getElectricPiston(3, 2),
+ CI.getTieredComponent(OrePrefixes.plate, 6, 4),
+ CI.getTieredComponent(OrePrefixes.gearGt, 6, 2), },
CI.getTertiaryTieredFluid(5, (144 * 2 * 4)), // Input Fluid
GregtechItemList.Casing_Vacuum_Furnace.get(1),
20 * 10 * 6,
@@ -3841,14 +3264,10 @@ public class RECIPES_Machines {
;
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- GregtechItemList.Casing_Vacuum_Furnace.get(1),
- CI.getTieredComponent(OrePrefixes.wireGt16, 7, 4),
- CI.getEnergyCore(6, 1),
- CI.getRobotArm(4, 4),
- CI.getTieredComponent(OrePrefixes.plate, 7, 8),
- CI.getTieredComponent(OrePrefixes.circuit, 6, 8),
- },
+ new ItemStack[] { GregtechItemList.Casing_Vacuum_Furnace.get(1),
+ CI.getTieredComponent(OrePrefixes.wireGt16, 7, 4), CI.getEnergyCore(6, 1), CI.getRobotArm(4, 4),
+ CI.getTieredComponent(OrePrefixes.plate, 7, 8),
+ CI.getTieredComponent(OrePrefixes.circuit, 6, 8), },
CI.getTieredFluid(7, (144 * 4 * 5)), // Input Fluid
GregtechItemList.Controller_Vacuum_Furnace.get(1),
60 * 20 * 12,
@@ -3857,51 +3276,37 @@ public class RECIPES_Machines {
private static void milling() {
- /*public static ItemStack RECIPE_ISAMill_Controller;
- public static ItemStack RECIPE_ISAMill_Gearbox;
- public static ItemStack RECIPE_ISAMill_Casing;
- public static ItemStack RECIPE_ISAMill_Hatch;
- public static ItemStack RECIPE_Flotation_Controller;
- public static ItemStack RECIPE_Flotation_Casing;*/
+ /*
+ * public static ItemStack RECIPE_ISAMill_Controller; public static ItemStack RECIPE_ISAMill_Gearbox; public
+ * static ItemStack RECIPE_ISAMill_Casing; public static ItemStack RECIPE_ISAMill_Hatch; public static ItemStack
+ * RECIPE_Flotation_Controller; public static ItemStack RECIPE_Flotation_Casing;
+ */
// Isa Mill Controller
CORE.RA.addAssemblylineRecipe(
ItemList.Machine_IV_Macerator.get(1),
20 * 60 * 20,
- new Object[] {
- GregtechItemList.Casing_IsaMill_Gearbox.get(4),
- CI.getTieredGTPPMachineCasing(6, 4),
- ItemList.Component_Grinder_Tungsten.get(16),
- new Object[] {CI.getTieredCircuitOreDictName(6), 8},
- ALLOY.INCONEL_625.getGear(8),
- ALLOY.INCONEL_625.getPlate(32),
- ALLOY.ZERON_100.getPlateDouble(8),
- ALLOY.ZERON_100.getPlateDouble(8),
- ALLOY.ZERON_100.getScrew(64),
- CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32),
- CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32),
- CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16),
- CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16),
- },
- new FluidStack[] {
- CI.getTieredFluid(6, 16 * 144),
- CI.getAlternativeTieredFluid(6, 32 * 144),
- CI.getTertiaryTieredFluid(6, 32 * 144)
- },
+ new Object[] { GregtechItemList.Casing_IsaMill_Gearbox.get(4), CI.getTieredGTPPMachineCasing(6, 4),
+ ItemList.Component_Grinder_Tungsten.get(16),
+ new Object[] { CI.getTieredCircuitOreDictName(6), 8 }, ALLOY.INCONEL_625.getGear(8),
+ ALLOY.INCONEL_625.getPlate(32), ALLOY.ZERON_100.getPlateDouble(8),
+ ALLOY.ZERON_100.getPlateDouble(8), ALLOY.ZERON_100.getScrew(64),
+ CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32),
+ CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32),
+ CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16),
+ CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16), },
+ new FluidStack[] { CI.getTieredFluid(6, 16 * 144), CI.getAlternativeTieredFluid(6, 32 * 144),
+ CI.getTertiaryTieredFluid(6, 32 * 144) },
GregtechItemList.Controller_IsaMill.get(1),
20 * 60 * 10,
MaterialUtils.getVoltageForTier(6));
// Isa Mill Gearbox
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(7),
- ItemList.Casing_Gearbox_Titanium.get(2),
- ALLOY.INCONEL_625.getGear(4),
- CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.gearGtSmall, 8),
- ALLOY.INCONEL_625.getPlate(16),
- ALLOY.ZERON_100.getBolt(16),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(7), ItemList.Casing_Gearbox_Titanium.get(2),
+ ALLOY.INCONEL_625.getGear(4),
+ CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.gearGtSmall, 8),
+ ALLOY.INCONEL_625.getPlate(16), ALLOY.ZERON_100.getBolt(16), },
ALLOY.TUNGSTENSTEEL.getFluidStack(8 * 144),
GregtechItemList.Casing_IsaMill_Gearbox.get(1),
60 * 20 * 2,
@@ -3909,14 +3314,10 @@ public class RECIPES_Machines {
// Isa Mill Casing
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(7),
- CI.getTieredGTPPMachineCasing(5, 1),
- ALLOY.INCONEL_625.getPlate(8),
- ALLOY.ZERON_100.getRod(4),
- CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.gearGtSmall, 4),
- ALLOY.ZERON_100.getScrew(8),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(5, 1),
+ ALLOY.INCONEL_625.getPlate(8), ALLOY.ZERON_100.getRod(4),
+ CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.gearGtSmall, 4),
+ ALLOY.ZERON_100.getScrew(8), },
ELEMENT.getInstance().TITANIUM.getFluidStack(4 * 144),
GregtechItemList.Casing_IsaMill_Casing.get(1),
60 * 20 * 2,
@@ -3924,14 +3325,10 @@ public class RECIPES_Machines {
// Isa Mill Pipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(7),
- CI.getTieredGTPPMachineCasing(4, 2),
- ALLOY.INCONEL_625.getPlateDouble(4),
- ALLOY.INCOLOY_MA956.getRing(8),
- CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.plate, 8),
- ALLOY.INCOLOY_MA956.getBolt(16),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(4, 2),
+ ALLOY.INCONEL_625.getPlateDouble(4), ALLOY.INCOLOY_MA956.getRing(8),
+ CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.plate, 8),
+ ALLOY.INCOLOY_MA956.getBolt(16), },
ELEMENT.getInstance().ALUMINIUM.getFluidStack(8 * 144),
GregtechItemList.Casing_IsaMill_Pipe.get(1),
60 * 20 * 8,
@@ -3941,40 +3338,26 @@ public class RECIPES_Machines {
CORE.RA.addAssemblylineRecipe(
ItemList.Distillation_Tower.get(1),
20 * 60 * 20,
- new Object[] {
- GregtechItemList.Casing_Flotation_Cell.get(4),
- CI.getTieredGTPPMachineCasing(5, 4),
- ItemList.Machine_IV_Distillery.get(1),
- new Object[] {CI.getTieredCircuitOreDictName(6), 8},
- ALLOY.STELLITE.getGear(8),
- ALLOY.STELLITE.getPlate(32),
- ALLOY.HASTELLOY_N.getPlateDouble(8),
- ALLOY.HASTELLOY_N.getPlateDouble(8),
- ALLOY.HASTELLOY_N.getScrew(64),
- CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
- CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
- CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32),
- CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32),
- },
- new FluidStack[] {
- CI.getTieredFluid(5, 16 * 144),
- CI.getAlternativeTieredFluid(4, 32 * 144),
- CI.getTertiaryTieredFluid(4, 32 * 144)
- },
+ new Object[] { GregtechItemList.Casing_Flotation_Cell.get(4), CI.getTieredGTPPMachineCasing(5, 4),
+ ItemList.Machine_IV_Distillery.get(1), new Object[] { CI.getTieredCircuitOreDictName(6), 8 },
+ ALLOY.STELLITE.getGear(8), ALLOY.STELLITE.getPlate(32), ALLOY.HASTELLOY_N.getPlateDouble(8),
+ ALLOY.HASTELLOY_N.getPlateDouble(8), ALLOY.HASTELLOY_N.getScrew(64),
+ CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
+ CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
+ CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32),
+ CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), },
+ new FluidStack[] { CI.getTieredFluid(5, 16 * 144), CI.getAlternativeTieredFluid(4, 32 * 144),
+ CI.getTertiaryTieredFluid(4, 32 * 144) },
GregtechItemList.Controller_Flotation_Cell.get(1),
20 * 60 * 10,
MaterialUtils.getVoltageForTier(6));
// Flotation Cell Casing
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(7),
- CI.getTieredGTPPMachineCasing(4, 1),
- ALLOY.AQUATIC_STEEL.getPlate(8),
- ALLOY.STELLITE.getRing(8),
- CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.plateDouble, 4),
- ALLOY.HASTELLOY_N.getScrew(8),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(4, 1),
+ ALLOY.AQUATIC_STEEL.getPlate(8), ALLOY.STELLITE.getRing(8),
+ CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.plateDouble, 4),
+ ALLOY.HASTELLOY_N.getScrew(8), },
ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144),
GregtechItemList.Casing_Flotation_Cell.get(1),
60 * 20 * 2,
@@ -3982,14 +3365,11 @@ public class RECIPES_Machines {
// Milling Bus
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(7),
- CI.getTieredGTPPMachineCasing(5, 1),
- ItemList.Hatch_Input_Bus_EV.get(1),
- CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.gearGt, 8),
- CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plate, 32),
- CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(7), CI.getTieredGTPPMachineCasing(5, 1),
+ ItemList.Hatch_Input_Bus_EV.get(1),
+ CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.gearGt, 8),
+ CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plate, 32),
+ CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16), },
ELEMENT.getInstance().TUNGSTEN.getFluidStack(8 * 144),
GregtechItemList.Bus_Milling_Balls.get(1),
60 * 20 * 4,
@@ -4000,13 +3380,9 @@ public class RECIPES_Machines {
// Sparge Tower Research
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(8),
- ELEMENT.getInstance().HELIUM.getCell(8),
- ELEMENT.getInstance().FLUORINE.getCell(8),
- ALLOY.HS188A.getIngot(8),
- ItemList.Distillation_Tower.get(1)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(8), ELEMENT.getInstance().HELIUM.getCell(8),
+ ELEMENT.getInstance().FLUORINE.getCell(8), ALLOY.HS188A.getIngot(8),
+ ItemList.Distillation_Tower.get(1) },
null,
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_10_SPARGING, 1),
60 * 20 * 5,
@@ -4016,40 +3392,27 @@ public class RECIPES_Machines {
CORE.RA.addAssemblylineRecipe(
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_10_SPARGING, 1),
20 * 60 * 20,
- new Object[] {
- GregtechItemList.Casing_Sparge_Tower_Exterior.get(4),
- CI.getTieredGTPPMachineCasing(4, 4),
- ItemList.Machine_IV_Distillery.get(1),
- new Object[] {CI.getTieredCircuitOreDictName(5), 8},
- ALLOY.HS188A.getGear(8),
- ALLOY.HS188A.getPlate(32),
- ALLOY.HASTELLOY_N.getPlateDouble(8),
- ALLOY.HASTELLOY_N.getPlateDouble(8),
- ALLOY.HASTELLOY_N.getScrew(64),
- CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
- CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
- CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32),
- CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32),
- },
- new FluidStack[] {
- CI.getTieredFluid(4, 16 * 144),
- CI.getAlternativeTieredFluid(3, 32 * 144),
- CI.getTertiaryTieredFluid(3, 32 * 144)
- },
+ new Object[] { GregtechItemList.Casing_Sparge_Tower_Exterior.get(4),
+ CI.getTieredGTPPMachineCasing(4, 4), ItemList.Machine_IV_Distillery.get(1),
+ new Object[] { CI.getTieredCircuitOreDictName(5), 8 }, ALLOY.HS188A.getGear(8),
+ ALLOY.HS188A.getPlate(32), ALLOY.HASTELLOY_N.getPlateDouble(8),
+ ALLOY.HASTELLOY_N.getPlateDouble(8), ALLOY.HASTELLOY_N.getScrew(64),
+ CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
+ CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64),
+ CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32),
+ CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), },
+ new FluidStack[] { CI.getTieredFluid(4, 16 * 144), CI.getAlternativeTieredFluid(3, 32 * 144),
+ CI.getTertiaryTieredFluid(3, 32 * 144) },
GregtechItemList.Controller_Sparge_Tower.get(1),
20 * 60 * 10,
MaterialUtils.getVoltageForTier(6));
// Sparge Tower Casing
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(8),
- CI.getTieredGTPPMachineCasing(3, 1),
- ALLOY.HS188A.getPlate(8),
- ALLOY.HASTELLOY_N.getRing(4),
- CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plateDouble, 4),
- ALLOY.HASTELLOY_N.getScrew(4),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredGTPPMachineCasing(3, 1),
+ ALLOY.HS188A.getPlate(8), ALLOY.HASTELLOY_N.getRing(4),
+ CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plateDouble, 4),
+ ALLOY.HASTELLOY_N.getScrew(4), },
ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144),
GregtechItemList.Casing_Sparge_Tower_Exterior.get(1),
60 * 20 * 2,
@@ -4057,21 +3420,12 @@ public class RECIPES_Machines {
}
private static void chisels() {
- ItemStack[] aChisels = new ItemStack[] {
- GregtechItemList.GT_Chisel_LV.get(1),
- GregtechItemList.GT_Chisel_MV.get(1),
- GregtechItemList.GT_Chisel_HV.get(1),
- };
+ ItemStack[] aChisels = new ItemStack[] { GregtechItemList.GT_Chisel_LV.get(1),
+ GregtechItemList.GT_Chisel_MV.get(1), GregtechItemList.GT_Chisel_HV.get(1), };
for (int i = 1; i < 4; i++) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(10 + i),
- CI.getTieredMachineCasing(i),
- CI.getPlate(i, 4),
- CI.getElectricMotor(i, 2),
- CI.getConveyor(i, 2),
- CI.getRobotArm(i, 1)
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(10 + i), CI.getTieredMachineCasing(i), CI.getPlate(i, 4),
+ CI.getElectricMotor(i, 2), CI.getConveyor(i, 2), CI.getRobotArm(i, 1) },
CI.getTieredFluid(i, 144 * 4),
aChisels[i - 1],
20 * 20,
@@ -4079,28 +3433,17 @@ public class RECIPES_Machines {
}
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(14),
- aChisels[2],
- CI.getPlate(4, 8),
- CI.getElectricMotor(4, 8),
- CI.getConveyor(4, 8),
- CI.getRobotArm(4, 4)
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(14), aChisels[2], CI.getPlate(4, 8),
+ CI.getElectricMotor(4, 8), CI.getConveyor(4, 8), CI.getRobotArm(4, 4) },
CI.getTieredFluid(4, 144 * 8),
GregtechItemList.Controller_IndustrialAutoChisel.get(1),
20 * 20,
MaterialUtils.getVoltageForTier(4));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(14),
- ItemList.Casing_SolidSteel.get(2),
- CI.getPlate(4, 2),
- CI.getTieredComponent(OrePrefixes.plate, 3, 4),
- CI.getTieredComponent(OrePrefixes.ring, 3, 8),
- CI.getTieredComponent(OrePrefixes.rod, 2, 4),
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(14), ItemList.Casing_SolidSteel.get(2), CI.getPlate(4, 2),
+ CI.getTieredComponent(OrePrefixes.plate, 3, 4), CI.getTieredComponent(OrePrefixes.ring, 3, 8),
+ CI.getTieredComponent(OrePrefixes.rod, 2, 4), },
CI.getTieredFluid(2, 144 * 2),
GregtechItemList.Casing_IndustrialAutoChisel.get(1),
20 * 20,
@@ -4110,14 +3453,10 @@ public class RECIPES_Machines {
private static void rockBreaker() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(12),
- ItemList.Machine_EV_RockBreaker.get(1),
- ALLOY.STAINLESS_STEEL.getPlate(8),
- ALLOY.STAINLESS_STEEL.getRing(4),
- CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plateDouble, 8),
- ALLOY.EGLIN_STEEL.getScrew(8),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(12), ItemList.Machine_EV_RockBreaker.get(1),
+ ALLOY.STAINLESS_STEEL.getPlate(8), ALLOY.STAINLESS_STEEL.getRing(4),
+ CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plateDouble, 8),
+ ALLOY.EGLIN_STEEL.getScrew(8), },
ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8),
GregtechItemList.Controller_IndustrialRockBreaker.get(1),
60 * 20 * 2,
@@ -4125,18 +3464,12 @@ public class RECIPES_Machines {
}
private static void fakeMachineCasingCovers() {
- GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] {
- GregtechItemList.FakeMachineCasingPlate_ULV,
- GregtechItemList.FakeMachineCasingPlate_LV,
- GregtechItemList.FakeMachineCasingPlate_MV,
- GregtechItemList.FakeMachineCasingPlate_HV,
- GregtechItemList.FakeMachineCasingPlate_EV,
- GregtechItemList.FakeMachineCasingPlate_IV,
- GregtechItemList.FakeMachineCasingPlate_LuV,
- GregtechItemList.FakeMachineCasingPlate_ZPM,
- GregtechItemList.FakeMachineCasingPlate_UV,
- GregtechItemList.FakeMachineCasingPlate_MAX,
- };
+ GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { GregtechItemList.FakeMachineCasingPlate_ULV,
+ GregtechItemList.FakeMachineCasingPlate_LV, GregtechItemList.FakeMachineCasingPlate_MV,
+ GregtechItemList.FakeMachineCasingPlate_HV, GregtechItemList.FakeMachineCasingPlate_EV,
+ GregtechItemList.FakeMachineCasingPlate_IV, GregtechItemList.FakeMachineCasingPlate_LuV,
+ GregtechItemList.FakeMachineCasingPlate_ZPM, GregtechItemList.FakeMachineCasingPlate_UV,
+ GregtechItemList.FakeMachineCasingPlate_MAX, };
int aMaxTier = GT_Values.VOLTAGE_NAMES.length;
ItemStack aTier[] = new ItemStack[aMaxTier];
for (int i = 0; i < aMaxTier; i++) {
@@ -4145,12 +3478,13 @@ public class RECIPES_Machines {
// Deprecate old recipes
for (int i = 0; i < 10; i++) {
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {mMachineCasingCovers[i].get(1)}, ItemUtils.getSimpleStack(aTier[i], 1));
+ new ItemStack[] { mMachineCasingCovers[i].get(1) },
+ ItemUtils.getSimpleStack(aTier[i], 1));
}
// Add recipes for new ones
for (int i = 0; i < aMaxTier; i++) {
- GT_Values.RA.addCutterRecipe(
- CI.getTieredMachineCasing(i), aTier[i], null, 20 * 5 * i, (int) GT_Values.V[i]);
+ GT_Values.RA
+ .addCutterRecipe(CI.getTieredMachineCasing(i), aTier[i], null, 20 * 5 * i, (int) GT_Values.V[i]);
}
}
@@ -4168,20 +3502,10 @@ public class RECIPES_Machines {
// "agon", "iszm", "korp", "jelt", "bitt"
- ItemStack[] aBlocks = new ItemStack[] {
- ItemUtils.getSimpleStack(agon),
- ItemUtils.getSimpleStack(iszm),
- ItemUtils.getSimpleStack(korp),
- ItemUtils.getSimpleStack(jelt),
- ItemUtils.getSimpleStack(bitt)
- };
- MetaCustomCoverItem[] aCovers = new MetaCustomCoverItem[] {
- CoverManager.Cover_Agon,
- CoverManager.Cover_Iszm,
- CoverManager.Cover_Korp,
- CoverManager.Cover_Jelt,
- CoverManager.Cover_Bitt
- };
+ ItemStack[] aBlocks = new ItemStack[] { ItemUtils.getSimpleStack(agon), ItemUtils.getSimpleStack(iszm),
+ ItemUtils.getSimpleStack(korp), ItemUtils.getSimpleStack(jelt), ItemUtils.getSimpleStack(bitt) };
+ MetaCustomCoverItem[] aCovers = new MetaCustomCoverItem[] { CoverManager.Cover_Agon, CoverManager.Cover_Iszm,
+ CoverManager.Cover_Korp, CoverManager.Cover_Jelt, CoverManager.Cover_Bitt };
ItemStack aInputs[][] = new ItemStack[5][16];
ItemStack aOutputs[][] = new ItemStack[5][16];
@@ -4194,78 +3518,44 @@ public class RECIPES_Machines {
}
private static void superBuses() {
- GregtechItemList[] mSuperBusesInput = new GregtechItemList[] {
- GregtechItemList.Hatch_SuperBus_Input_ULV,
- GregtechItemList.Hatch_SuperBus_Input_LV,
- GregtechItemList.Hatch_SuperBus_Input_MV,
- GregtechItemList.Hatch_SuperBus_Input_HV,
- GregtechItemList.Hatch_SuperBus_Input_EV,
- GregtechItemList.Hatch_SuperBus_Input_IV,
- GregtechItemList.Hatch_SuperBus_Input_LuV,
- GregtechItemList.Hatch_SuperBus_Input_ZPM,
- GregtechItemList.Hatch_SuperBus_Input_UV,
- GregtechItemList.Hatch_SuperBus_Input_MAX,
- };
-
- GregtechItemList[] mSuperBusesOutput = new GregtechItemList[] {
- GregtechItemList.Hatch_SuperBus_Output_ULV,
- GregtechItemList.Hatch_SuperBus_Output_LV,
- GregtechItemList.Hatch_SuperBus_Output_MV,
- GregtechItemList.Hatch_SuperBus_Output_HV,
- GregtechItemList.Hatch_SuperBus_Output_EV,
- GregtechItemList.Hatch_SuperBus_Output_IV,
- GregtechItemList.Hatch_SuperBus_Output_LuV,
- GregtechItemList.Hatch_SuperBus_Output_ZPM,
- GregtechItemList.Hatch_SuperBus_Output_UV,
- GregtechItemList.Hatch_SuperBus_Output_MAX,
- };
-
- ItemStack[] mInputHatch = new ItemStack[] {
- ItemList.Hatch_Input_Bus_EV.get(1),
- ItemList.Hatch_Input_Bus_IV.get(1),
- ItemList.Hatch_Input_Bus_LuV.get(1),
- ItemList.Hatch_Input_Bus_ZPM.get(1),
- ItemList.Hatch_Input_Bus_UV.get(1),
- ItemList.Hatch_Input_Bus_MAX.get(1),
- GregtechItemList.Hatch_SuperBus_Input_LV.get(1),
- GregtechItemList.Hatch_SuperBus_Input_MV.get(1),
- GregtechItemList.Hatch_SuperBus_Input_HV.get(1),
- GregtechItemList.Hatch_SuperBus_Input_EV.get(1),
- };
-
- ItemStack[] mOutputHatch = new ItemStack[] {
- ItemList.Hatch_Output_Bus_EV.get(1),
- ItemList.Hatch_Output_Bus_IV.get(1),
- ItemList.Hatch_Output_Bus_LuV.get(1),
- ItemList.Hatch_Output_Bus_ZPM.get(1),
- ItemList.Hatch_Output_Bus_UV.get(1),
- ItemList.Hatch_Output_Bus_MAX.get(1),
- GregtechItemList.Hatch_SuperBus_Output_LV.get(1),
- GregtechItemList.Hatch_SuperBus_Output_MV.get(1),
- GregtechItemList.Hatch_SuperBus_Output_HV.get(1),
- GregtechItemList.Hatch_SuperBus_Output_EV.get(1),
- };
+ GregtechItemList[] mSuperBusesInput = new GregtechItemList[] { GregtechItemList.Hatch_SuperBus_Input_ULV,
+ GregtechItemList.Hatch_SuperBus_Input_LV, GregtechItemList.Hatch_SuperBus_Input_MV,
+ GregtechItemList.Hatch_SuperBus_Input_HV, GregtechItemList.Hatch_SuperBus_Input_EV,
+ GregtechItemList.Hatch_SuperBus_Input_IV, GregtechItemList.Hatch_SuperBus_Input_LuV,
+ GregtechItemList.Hatch_SuperBus_Input_ZPM, GregtechItemList.Hatch_SuperBus_Input_UV,
+ GregtechItemList.Hatch_SuperBus_Input_MAX, };
+
+ GregtechItemList[] mSuperBusesOutput = new GregtechItemList[] { GregtechItemList.Hatch_SuperBus_Output_ULV,
+ GregtechItemList.Hatch_SuperBus_Output_LV, GregtechItemList.Hatch_SuperBus_Output_MV,
+ GregtechItemList.Hatch_SuperBus_Output_HV, GregtechItemList.Hatch_SuperBus_Output_EV,
+ GregtechItemList.Hatch_SuperBus_Output_IV, GregtechItemList.Hatch_SuperBus_Output_LuV,
+ GregtechItemList.Hatch_SuperBus_Output_ZPM, GregtechItemList.Hatch_SuperBus_Output_UV,
+ GregtechItemList.Hatch_SuperBus_Output_MAX, };
+
+ ItemStack[] mInputHatch = new ItemStack[] { ItemList.Hatch_Input_Bus_EV.get(1),
+ ItemList.Hatch_Input_Bus_IV.get(1), ItemList.Hatch_Input_Bus_LuV.get(1),
+ ItemList.Hatch_Input_Bus_ZPM.get(1), ItemList.Hatch_Input_Bus_UV.get(1),
+ ItemList.Hatch_Input_Bus_MAX.get(1), GregtechItemList.Hatch_SuperBus_Input_LV.get(1),
+ GregtechItemList.Hatch_SuperBus_Input_MV.get(1), GregtechItemList.Hatch_SuperBus_Input_HV.get(1),
+ GregtechItemList.Hatch_SuperBus_Input_EV.get(1), };
+
+ ItemStack[] mOutputHatch = new ItemStack[] { ItemList.Hatch_Output_Bus_EV.get(1),
+ ItemList.Hatch_Output_Bus_IV.get(1), ItemList.Hatch_Output_Bus_LuV.get(1),
+ ItemList.Hatch_Output_Bus_ZPM.get(1), ItemList.Hatch_Output_Bus_UV.get(1),
+ ItemList.Hatch_Output_Bus_MAX.get(1), GregtechItemList.Hatch_SuperBus_Output_LV.get(1),
+ GregtechItemList.Hatch_SuperBus_Output_MV.get(1), GregtechItemList.Hatch_SuperBus_Output_HV.get(1),
+ GregtechItemList.Hatch_SuperBus_Output_EV.get(1), };
// Special Case recipes for ULV buses
{
int i = 0;
- ItemStack[] aInputs1 = new ItemStack[] {
- CI.getNumberedCircuit(17),
- mInputHatch[i],
- CI.getElectricMotor(i, 2),
- CI.getConveyor(i, 5),
- CI.getBolt(i, 16),
- CI.getTieredComponent(OrePrefixes.circuit, i, 2)
- };
+ ItemStack[] aInputs1 = new ItemStack[] { CI.getNumberedCircuit(17), mInputHatch[i],
+ CI.getElectricMotor(i, 2), CI.getConveyor(i, 5), CI.getBolt(i, 16),
+ CI.getTieredComponent(OrePrefixes.circuit, i, 2) };
Logger.INFO("[FIND] " + ItemUtils.getArrayStackNames(aInputs1));
- ItemStack[] aOutputs1 = new ItemStack[] {
- CI.getNumberedCircuit(18),
- mOutputHatch[i],
- CI.getElectricPiston(i, 2),
- CI.getConveyor(i, 5),
- CI.getGear(i, 3),
- CI.getTieredComponent(OrePrefixes.circuit, i, 2)
- };
+ ItemStack[] aOutputs1 = new ItemStack[] { CI.getNumberedCircuit(18), mOutputHatch[i],
+ CI.getElectricPiston(i, 2), CI.getConveyor(i, 5), CI.getGear(i, 3),
+ CI.getTieredComponent(OrePrefixes.circuit, i, 2) };
Logger.INFO("[FIND] " + ItemUtils.getArrayStackNames(aOutputs1));
FluidStack a1 = CI.getAlternativeTieredFluid(i, 144 * 8);
@@ -4275,23 +3565,25 @@ public class RECIPES_Machines {
Logger.INFO("[FIND] Output Bus Fluid: " + ItemUtils.getFluidName(a2));
CORE.RA.addSixSlotAssemblingRecipe(
- aInputs1, a1, mSuperBusesInput[i].get(1), 20 * 30 * 2 * i, (int) GT_Values.V[i]);
+ aInputs1,
+ a1,
+ mSuperBusesInput[i].get(1),
+ 20 * 30 * 2 * i,
+ (int) GT_Values.V[i]);
CORE.RA.addSixSlotAssemblingRecipe(
- aOutputs1, a2, mSuperBusesOutput[i].get(1), 20 * 30 * 2 * i, (int) GT_Values.V[i]);
+ aOutputs1,
+ a2,
+ mSuperBusesOutput[i].get(1),
+ 20 * 30 * 2 * i,
+ (int) GT_Values.V[i]);
}
// Input Buses
for (int i = 1; i < 10; i++) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(17),
- mInputHatch[i],
- CI.getElectricMotor(i, 2),
- CI.getConveyor(i, 5),
- CI.getBolt(i, 16),
- CI.getTieredComponent(OrePrefixes.circuit, i, 2)
- },
+ new ItemStack[] { CI.getNumberedCircuit(17), mInputHatch[i], CI.getElectricMotor(i, 2),
+ CI.getConveyor(i, 5), CI.getBolt(i, 16), CI.getTieredComponent(OrePrefixes.circuit, i, 2) },
CI.getAlternativeTieredFluid(i, 144 * 8),
mSuperBusesInput[i].get(1),
20 * 30 * 2,
@@ -4300,14 +3592,8 @@ public class RECIPES_Machines {
// Output Buses
for (int i = 1; i < 10; i++) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(18),
- mOutputHatch[i],
- CI.getElectricPiston(i, 2),
- CI.getConveyor(i, 5),
- CI.getGear(i, 3),
- CI.getTieredComponent(OrePrefixes.circuit, i, 2)
- },
+ new ItemStack[] { CI.getNumberedCircuit(18), mOutputHatch[i], CI.getElectricPiston(i, 2),
+ CI.getConveyor(i, 5), CI.getGear(i, 3), CI.getTieredComponent(OrePrefixes.circuit, i, 2) },
CI.getTertiaryTieredFluid(i, 144 * 8),
mSuperBusesOutput[i].get(1),
20 * 30 * 2,
@@ -4329,23 +3615,18 @@ public class RECIPES_Machines {
ItemUtils.getSimpleStack(Blocks.hopper),
ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 0, 1));
- ItemStack[] aRobinators = new ItemStack[] {
- ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 0, 1),
- ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 1, 1),
- ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 2, 1),
- ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 3, 1),
- ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 4, 1),
- };
+ ItemStack[] aRobinators = new ItemStack[] { ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 0, 1),
+ ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 1, 1),
+ ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 2, 1),
+ ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 3, 1),
+ ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 4, 1), };
for (int i = 0; i < 5; i++) {
if (i == 0) {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(17),
- CI.getTieredMachineCasing(0),
- ItemUtils.getSimpleStack(Blocks.hopper, 4),
- CI.getTieredComponent(OrePrefixes.circuit, 0, 2)
- },
+ new ItemStack[] { CI.getNumberedCircuit(17), CI.getTieredMachineCasing(0),
+ ItemUtils.getSimpleStack(Blocks.hopper, 4),
+ CI.getTieredComponent(OrePrefixes.circuit, 0, 2) },
GT_Values.NF, // Input Fluid
aRobinators[i],
45 * 10 * 1,
@@ -4353,14 +3634,10 @@ public class RECIPES_Machines {
continue;
}
int aTier = i + 1;
- ItemStack[] aInputs = new ItemStack[] {
- aRobinators[i - 1],
- CI.getTieredMachineHull(aTier, 1),
- CI.getConveyor(aTier, 2),
- CI.getElectricMotor(aTier, 2),
- CI.getTieredComponent(OrePrefixes.plate, aTier, 4),
- CI.getTieredComponent(OrePrefixes.circuit, i, 2),
- };
+ ItemStack[] aInputs = new ItemStack[] { aRobinators[i - 1], CI.getTieredMachineHull(aTier, 1),
+ CI.getConveyor(aTier, 2), CI.getElectricMotor(aTier, 2),
+ CI.getTieredComponent(OrePrefixes.plate, aTier, 4),
+ CI.getTieredComponent(OrePrefixes.circuit, i, 2), };
CORE.RA.addSixSlotAssemblingRecipe(
aInputs,
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
index 953345141b..af4f9b90b8 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
@@ -1,5 +1,7 @@
package gtPlusPlus.core.recipe;
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.Loader;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
@@ -18,49 +20,45 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import net.minecraft.item.ItemStack;
public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
+
public RECIPES_Old_Circuits() {
OrePrefixes.crafting.add(this);
}
@Override
- public void registerOre(
- final OrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) {
Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 2)");
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, 1L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1L, new Object[0]),
64,
30);
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.AnnealedCopper, 1L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1L, new Object[0]),
64,
30);
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 1L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(1L, new Object[0]),
64,
120);
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(1L, new Object[0]),
64,
120);
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 1L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Old_Circuit_Parts_Wiring_Elite.get(1L, new Object[0]),
64,
480);
@@ -68,82 +66,52 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 3)");
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Olivine, 1L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]),
256,
480);
GT_Values.RA.addLaserEngraverRecipe(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Emerald, 1L),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]),
256,
480);
} else if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString())
|| aOreDictName.equals(OreDictNames.craftingLensCyan.toString())
|| aOreDictName.equals(OreDictNames.craftingLensLightBlue.toString())) {
- Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 4)");
- GT_Values.RA.addLaserEngraverRecipe(
- ItemList.IC2_LapotronCrystal.getWildcard(1L, new Object[0]),
- GT_Utility.copyAmount(0L, new Object[] {aStack}),
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]),
- 256,
- 480);
- }
+ Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 4)");
+ GT_Values.RA.addLaserEngraverRecipe(
+ ItemList.IC2_LapotronCrystal.getWildcard(1L, new Object[0]),
+ GT_Utility.copyAmount(0L, new Object[] { aStack }),
+ GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]),
+ 256,
+ 480);
+ }
}
private static boolean addCircuitRecipes() {
Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 1)");
GT_ModHandler.addShapelessCraftingRecipe(
- GregtechItemList.Old_Circuit_Primitive.get(1L, new Object[0]), new Object[] {
- GT_ModHandler.getIC2Item("casingadviron", 1L),
- OrePrefixes.wireGt01.get(Materials.RedAlloy),
- OrePrefixes.wireGt01.get(Materials.RedAlloy),
- OrePrefixes.wireGt01.get(Materials.Tin)
- });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), new Object[] {
- "WWW",
- "CPC",
- "WWW",
- 'C',
- OrePrefixes.circuit.get(Materials.Primitive),
- 'W',
- OreDictNames.craftingWireCopper,
- 'P',
- OrePrefixes.plate.get(Materials.Steel)
- });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), new Object[] {
- "WCW",
- "WPW",
- "WCW",
- 'C',
- OrePrefixes.circuit.get(Materials.Primitive),
- 'W',
- OreDictNames.craftingWireCopper,
- 'P',
- OrePrefixes.plate.get(Materials.Steel)
- });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), new Object[] {
- "WWW",
- "CPC",
- "WWW",
- 'C',
- OrePrefixes.circuit.get(Materials.Primitive),
- 'W',
- OrePrefixes.cableGt01.get(Materials.RedAlloy),
- 'P',
- OrePrefixes.plate.get(Materials.Steel)
- });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), new Object[] {
- "WCW",
- "WPW",
- "WCW",
- 'C',
- OrePrefixes.circuit.get(Materials.Primitive),
- 'W',
- OrePrefixes.cableGt01.get(Materials.RedAlloy),
- 'P',
- OrePrefixes.plate.get(Materials.Steel)
- });
+ GregtechItemList.Old_Circuit_Primitive.get(1L, new Object[0]),
+ new Object[] { GT_ModHandler.getIC2Item("casingadviron", 1L),
+ OrePrefixes.wireGt01.get(Materials.RedAlloy), OrePrefixes.wireGt01.get(Materials.RedAlloy),
+ OrePrefixes.wireGt01.get(Materials.Tin) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]),
+ new Object[] { "WWW", "CPC", "WWW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W',
+ OreDictNames.craftingWireCopper, 'P', OrePrefixes.plate.get(Materials.Steel) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]),
+ new Object[] { "WCW", "WPW", "WCW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W',
+ OreDictNames.craftingWireCopper, 'P', OrePrefixes.plate.get(Materials.Steel) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]),
+ new Object[] { "WWW", "CPC", "WWW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W',
+ OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', OrePrefixes.plate.get(Materials.Steel) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]),
+ new Object[] { "WCW", "WPW", "WCW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W',
+ OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', OrePrefixes.plate.get(Materials.Steel) });
GT_Values.RA.addFormingPressRecipe(
GregtechItemList.Old_Empty_Board_Basic.get(1L, new Object[0]),
@@ -180,8 +148,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
int tMultiplier;
for (Materials tMat : Materials.values()) {
if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) {
- tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_BAD)
- ? 4
+ tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4
: tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : 2;
GT_Values.RA.addAssemblerRecipe(
@@ -310,8 +277,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
try {
Set.set(Get.get(1));
return true;
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return false;
}
@@ -462,108 +428,88 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
// Primitive
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32700", 32700, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32700", 32700, 1) },
ItemUtils.getItemStackOfAmountFromOreDict("circuitPrimitive", 1));
// Basic
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32701", 32701, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32701", 32701, 1) },
ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 1));
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32078", 32078, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32078", 32078, 1) },
ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 1));
// Good
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32702", 32702, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32702", 32702, 1) },
ItemUtils.getItemStackOfAmountFromOreDict("circuitGood", 1));
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32702", 32702, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32702", 32702, 1) },
ItemUtils.getItemStackOfAmountFromOreDict("circuitGood", 1));
// Advanced
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32703", 32703, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32703", 32703, 1) },
ItemUtils.getItemStackOfAmountFromOreDict("circuitAdvanced", 1));
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32703", 32703, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32703", 32703, 1) },
ItemUtils.getItemStackOfAmountFromOreDict("circuitAdvanced", 1));
// Data
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32704", 32704, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32704", 32704, 1) },
ItemUtils.getItemStackOfAmountFromOreDict("circuitData", 1));
// Elite
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32705", 32705, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32705", 32705, 1) },
ItemUtils.getItemStackOfAmountFromOreDict("circuitElite", 1));
// Master
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32706", 32706, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32706", 32706, 1) },
ItemUtils.getItemStackOfAmountFromOreDict("circuitMaster", 1));
// Components
// Green Chip
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32713", 32713, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32713", 32713, 1) },
GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1));
// Blue Chip
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32714", 32714, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32714", 32714, 1) },
GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(1));
// Basic Board
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32710", 32710, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32710", 32710, 1) },
GregtechItemList.Old_Circuit_Board_Basic.get(1));
// Advanced Board
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32711", 32711, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32711", 32711, 1) },
GregtechItemList.Old_Circuit_Board_Advanced.get(1));
// Elite Board
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32712", 32712, 1)},
+ new ItemStack[] { ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32712", 32712, 1) },
GregtechItemList.Old_Circuit_Board_Elite.get(1));
// remove a few recipes
- /*GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1));
- GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32069", 32069, 1));
- if (LoadedMods.Extra_Utils){
- ItemStack EQU = ItemUtils.simpleMetaStack("ExtraUtilities:enderQuarryUpgrade", 0, 1);
- if (EQU != null){
- GT_ModHandler.removeRecipeByOutput(EQU);
- GT_Values.RA.addAssemblerRecipe(
- ItemUtils.simpleMetaStack("ExtraUtilities:decorativeBlock1:12", 12, 1),
- GregtechItemList.Old_Circuit_Master.get(1),
- EQU,
- 80*20,
- 2);
- }
- }
- if (LoadedMods.GalacticraftCore){
- ItemStack ACW = ItemUtils.simpleMetaStack("GalacticraftCore:item.basicItem:14", 14, 1);
- if (ACW != null){
- GT_ModHandler.removeRecipeByOutput(ACW);
- GT_Values.RA.addAssemblerRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("gemDiamond", 1),
- GregtechItemList.Old_Circuit_Board_Advanced.get(1),
- ACW,
- 160*20,
- 4);
- }
- ItemStack ACW2 = ItemUtils.simpleMetaStack("GalacticraftCore:item.basicItem:13", 13, 1);
- if (ACW2 != null){
- GT_ModHandler.removeRecipeByOutput(ACW2);
- GT_Values.RA.addAssemblerRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("gemDiamond", 1),
- GregtechItemList.Old_Circuit_Board_Basic.get(1),
- ACW2,
- 80*20,
- 2);
- }
- }*/
+ /*
+ * GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1));
+ * GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32069", 32069, 1)); if
+ * (LoadedMods.Extra_Utils){ ItemStack EQU = ItemUtils.simpleMetaStack("ExtraUtilities:enderQuarryUpgrade", 0,
+ * 1); if (EQU != null){ GT_ModHandler.removeRecipeByOutput(EQU); GT_Values.RA.addAssemblerRecipe(
+ * ItemUtils.simpleMetaStack("ExtraUtilities:decorativeBlock1:12", 12, 1),
+ * GregtechItemList.Old_Circuit_Master.get(1), EQU, 80*20, 2); } } if (LoadedMods.GalacticraftCore){ ItemStack
+ * ACW = ItemUtils.simpleMetaStack("GalacticraftCore:item.basicItem:14", 14, 1); if (ACW != null){
+ * GT_ModHandler.removeRecipeByOutput(ACW); GT_Values.RA.addAssemblerRecipe(
+ * ItemUtils.getItemStackOfAmountFromOreDict("gemDiamond", 1),
+ * GregtechItemList.Old_Circuit_Board_Advanced.get(1), ACW, 160*20, 4); } ItemStack ACW2 =
+ * ItemUtils.simpleMetaStack("GalacticraftCore:item.basicItem:13", 13, 1); if (ACW2 != null){
+ * GT_ModHandler.removeRecipeByOutput(ACW2); GT_Values.RA.addAssemblerRecipe(
+ * ItemUtils.getItemStackOfAmountFromOreDict("gemDiamond", 1), GregtechItemList.Old_Circuit_Board_Basic.get(1),
+ * ACW2, 80*20, 2); } }
+ */
return true;
}
@@ -572,103 +518,39 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems");
if (isNEILoaded && !CORE.ConfigSwitches.showHiddenNEIItems) {
Logger.INFO("[Old Feature - Circuits] Hiding .28+ circuits in NEI.");
- String[] CircuitToHide = {
- "Circuit_Board_Basic",
- "Circuit_Board_Advanced",
- "Circuit_Board_Elite",
- "Circuit_Parts_Advanced",
- "Circuit_Parts_Wiring_Basic",
- "Circuit_Parts_Wiring_Advanced",
- "Circuit_Parts_Wiring_Elite",
- "Circuit_Parts_Crystal_Chip_Elite",
- "Circuit_Parts_Crystal_Chip_Master",
- "Circuit_Primitive",
- "Circuit_Basic",
- "Circuit_Integrated_Good",
- "Circuit_Good",
- "Circuit_Advanced",
- "Circuit_Data",
- "Circuit_Elite",
- "Circuit_Master",
- "Circuit_Ultimate",
- "Circuit_Board_Coated",
- "Circuit_Board_Phenolic",
- "Circuit_Board_Epoxy",
- "Circuit_Board_Fiberglass",
- "Circuit_Board_Multifiberglass",
- "Circuit_Board_Wetware",
- "Circuit_Parts_Resistor",
- "Circuit_Parts_ResistorSMD",
- "Circuit_Parts_Glass_Tube",
- "Circuit_Parts_Vacuum_Tube",
- "Circuit_Parts_Coil",
- "Circuit_Parts_Diode",
- "Circuit_Parts_DiodeSMD",
- "Circuit_Parts_Transistor",
- "Circuit_Parts_TransistorSMD",
- "Circuit_Parts_Capacitor",
- "Circuit_Parts_CapacitorSMD",
- "Circuit_Silicon_Ingot",
- "Circuit_Silicon_Ingot2",
- "Circuit_Silicon_Ingot3",
- "Circuit_Silicon_Wafer",
- "Circuit_Silicon_Wafer2",
- "Circuit_Silicon_Wafer3",
- "Circuit_Wafer_ILC",
- "Circuit_Chip_ILC",
- "Circuit_Wafer_Ram",
- "Circuit_Chip_Ram",
- "Circuit_Wafer_NAND",
- "Circuit_Chip_NAND",
- "Circuit_Wafer_NOR",
- "Circuit_Chip_NOR",
- "Circuit_Wafer_CPU",
- "Circuit_Chip_CPU",
- "Circuit_Wafer_SoC",
- "Circuit_Chip_SoC",
- "Circuit_Wafer_SoC2",
- "Circuit_Chip_SoC2",
- "Circuit_Wafer_PIC",
- "Circuit_Chip_PIC",
- "Circuit_Wafer_HPIC",
- "Circuit_Chip_HPIC",
- "Circuit_Wafer_NanoCPU",
- "Circuit_Chip_NanoCPU",
- "Circuit_Wafer_QuantumCPU",
- "Circuit_Chip_QuantumCPU",
- "Circuit_Chip_CrystalCPU",
- "Circuit_Chip_CrystalSoC",
- "Circuit_Chip_NeuroCPU",
- "Circuit_Chip_Stemcell",
- "Circuit_Processor",
- "Circuit_Computer",
- "Circuit_Nanoprocessor",
- "Circuit_Nanocomputer",
- "Circuit_Elitenanocomputer",
- "Circuit_Quantumprocessor",
- "Circuit_Quantumcomputer",
- "Circuit_Masterquantumcomputer",
- "Circuit_Quantummainframe",
- "Circuit_Crystalprocessor",
- "Circuit_Crystalcomputer",
- "Circuit_Ultimatecrystalcomputer",
- "Circuit_Crystalmainframe",
- "Circuit_Neuroprocessor",
- "Circuit_Wetwarecomputer",
- "Circuit_Wetwaresupercomputer",
- "Circuit_Wetwaremainframe",
- "Circuit_Parts_RawCrystalChip",
- // Circuits Additions in .30/.31
- "Circuit_Board_Plastic",
- "Circuit_Parts_GlassFiber",
- "Circuit_Parts_PetriDish",
- "Circuit_Microprocessor"
- };
+ String[] CircuitToHide = { "Circuit_Board_Basic", "Circuit_Board_Advanced", "Circuit_Board_Elite",
+ "Circuit_Parts_Advanced", "Circuit_Parts_Wiring_Basic", "Circuit_Parts_Wiring_Advanced",
+ "Circuit_Parts_Wiring_Elite", "Circuit_Parts_Crystal_Chip_Elite",
+ "Circuit_Parts_Crystal_Chip_Master", "Circuit_Primitive", "Circuit_Basic",
+ "Circuit_Integrated_Good", "Circuit_Good", "Circuit_Advanced", "Circuit_Data", "Circuit_Elite",
+ "Circuit_Master", "Circuit_Ultimate", "Circuit_Board_Coated", "Circuit_Board_Phenolic",
+ "Circuit_Board_Epoxy", "Circuit_Board_Fiberglass", "Circuit_Board_Multifiberglass",
+ "Circuit_Board_Wetware", "Circuit_Parts_Resistor", "Circuit_Parts_ResistorSMD",
+ "Circuit_Parts_Glass_Tube", "Circuit_Parts_Vacuum_Tube", "Circuit_Parts_Coil",
+ "Circuit_Parts_Diode", "Circuit_Parts_DiodeSMD", "Circuit_Parts_Transistor",
+ "Circuit_Parts_TransistorSMD", "Circuit_Parts_Capacitor", "Circuit_Parts_CapacitorSMD",
+ "Circuit_Silicon_Ingot", "Circuit_Silicon_Ingot2", "Circuit_Silicon_Ingot3",
+ "Circuit_Silicon_Wafer", "Circuit_Silicon_Wafer2", "Circuit_Silicon_Wafer3", "Circuit_Wafer_ILC",
+ "Circuit_Chip_ILC", "Circuit_Wafer_Ram", "Circuit_Chip_Ram", "Circuit_Wafer_NAND",
+ "Circuit_Chip_NAND", "Circuit_Wafer_NOR", "Circuit_Chip_NOR", "Circuit_Wafer_CPU",
+ "Circuit_Chip_CPU", "Circuit_Wafer_SoC", "Circuit_Chip_SoC", "Circuit_Wafer_SoC2",
+ "Circuit_Chip_SoC2", "Circuit_Wafer_PIC", "Circuit_Chip_PIC", "Circuit_Wafer_HPIC",
+ "Circuit_Chip_HPIC", "Circuit_Wafer_NanoCPU", "Circuit_Chip_NanoCPU", "Circuit_Wafer_QuantumCPU",
+ "Circuit_Chip_QuantumCPU", "Circuit_Chip_CrystalCPU", "Circuit_Chip_CrystalSoC",
+ "Circuit_Chip_NeuroCPU", "Circuit_Chip_Stemcell", "Circuit_Processor", "Circuit_Computer",
+ "Circuit_Nanoprocessor", "Circuit_Nanocomputer", "Circuit_Elitenanocomputer",
+ "Circuit_Quantumprocessor", "Circuit_Quantumcomputer", "Circuit_Masterquantumcomputer",
+ "Circuit_Quantummainframe", "Circuit_Crystalprocessor", "Circuit_Crystalcomputer",
+ "Circuit_Ultimatecrystalcomputer", "Circuit_Crystalmainframe", "Circuit_Neuroprocessor",
+ "Circuit_Wetwarecomputer", "Circuit_Wetwaresupercomputer", "Circuit_Wetwaremainframe",
+ "Circuit_Parts_RawCrystalChip",
+ // Circuits Additions in .30/.31
+ "Circuit_Board_Plastic", "Circuit_Parts_GlassFiber", "Circuit_Parts_PetriDish",
+ "Circuit_Microprocessor" };
for (String component : CircuitToHide) {
try {
- ItemUtils.hideItemFromNEI(
- ItemUtils.getValueOfItemList(component, null).get(1L, new Object[0]));
+ ItemUtils.hideItemFromNEI(ItemUtils.getValueOfItemList(component, null).get(1L, new Object[0]));
} catch (IllegalArgumentException I) {
Logger.INFO("Could not find " + component + " in the Gregtech item list.");
Logger.INFO("This is NOT an error, simply a notification.");
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
index b55bb260dd..12792ab8ea 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
@@ -9,6 +9,10 @@ import static gtPlusPlus.core.material.MISC_MATERIALS.SALT_WATER;
import static gtPlusPlus.core.material.MISC_MATERIALS.SODIUM_CHLORIDE;
import static gtPlusPlus.core.material.MISC_MATERIALS.SODIUM_HYDROXIDE;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -22,9 +26,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public class RECIPES_RareEarthProcessing {
@@ -109,7 +110,7 @@ public class RECIPES_RareEarthProcessing {
null,
null,
null,
- new int[] {10000, 10000, 10000},
+ new int[] { 10000, 10000, 10000 },
20 * 30,
120);
@@ -174,7 +175,7 @@ public class RECIPES_RareEarthProcessing {
RARE_EARTH_LOW.getCrushed(2),
RARE_EARTH_LOW.getCrushed(2),
RARE_EARTH_LOW.getCrushed(2),
- new int[] {10000, 10000, 10000},
+ new int[] { 10000, 10000, 10000 },
20 * 30,
MaterialUtils.getVoltageForTier(1));
@@ -185,7 +186,7 @@ public class RECIPES_RareEarthProcessing {
RARE_EARTH_MID.getCrushed(4),
RARE_EARTH_MID.getCrushed(4),
RARE_EARTH_MID.getCrushed(4),
- new int[] {10000, 9000, 8000},
+ new int[] { 10000, 9000, 8000 },
20 * 30,
MaterialUtils.getVoltageForTier(3));
@@ -196,7 +197,7 @@ public class RECIPES_RareEarthProcessing {
RARE_EARTH_HIGH.getCrushed(6),
RARE_EARTH_HIGH.getCrushed(6),
RARE_EARTH_HIGH.getCrushed(6),
- new int[] {10000, 9000, 8000},
+ new int[] { 10000, 9000, 8000 },
20 * 30,
MaterialUtils.getVoltageForTier(5));
@@ -208,7 +209,7 @@ public class RECIPES_RareEarthProcessing {
RARE_EARTH_HIGH.getCrushed(6),
RARE_EARTH_HIGH.getCrushed(6),
RARE_EARTH_HIGH.getCrushed(6),
- new int[] {9000, 8000, 7000},
+ new int[] { 9000, 8000, 7000 },
20 * 30,
MaterialUtils.getVoltageForTier(5));
}
@@ -217,22 +218,16 @@ public class RECIPES_RareEarthProcessing {
public static void processCopperRecipes() {
// Rare Earth Processing
- /*GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1),
- new ItemStack[] {
- ELEMENT.getInstance().YTTRIUM.getSmallDust(1),
- ELEMENT.getInstance().NEODYMIUM.getSmallDust(1),
- ELEMENT.getInstance().LANTHANUM.getSmallDust(1),
- ELEMENT.getInstance().CERIUM.getSmallDust(1),
- ELEMENT.getInstance().CADMIUM.getSmallDust(1),
- ELEMENT.getInstance().CAESIUM.getSmallDust(1),
- ORES.SAMARSKITE_YB.getSmallDust(1),
- ORES.FLORENCITE.getSmallDust(1),
- ORES.FLUORCAPHITE.getSmallDust(1),
- //ELEMENT.getInstance().YTTERBIUM.getTinyDust(1),
- //ELEMENT.getInstance().SAMARIUM.getTinyDust(1),
- //ELEMENT.getInstance().GADOLINIUM.getTinyDust(1)
- },
- new int[] { 2000, 2000, 2000, 2000, 2000, 2000, 2000, 2000, 2000 }, 20 * 30, 500);*/
+ /*
+ * GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1), new ItemStack[] {
+ * ELEMENT.getInstance().YTTRIUM.getSmallDust(1), ELEMENT.getInstance().NEODYMIUM.getSmallDust(1),
+ * ELEMENT.getInstance().LANTHANUM.getSmallDust(1), ELEMENT.getInstance().CERIUM.getSmallDust(1),
+ * ELEMENT.getInstance().CADMIUM.getSmallDust(1), ELEMENT.getInstance().CAESIUM.getSmallDust(1),
+ * ORES.SAMARSKITE_YB.getSmallDust(1), ORES.FLORENCITE.getSmallDust(1), ORES.FLUORCAPHITE.getSmallDust(1),
+ * //ELEMENT.getInstance().YTTERBIUM.getTinyDust(1), //ELEMENT.getInstance().SAMARIUM.getTinyDust(1),
+ * //ELEMENT.getInstance().GADOLINIUM.getTinyDust(1) }, new int[] { 2000, 2000, 2000, 2000, 2000, 2000, 2000,
+ * 2000, 2000 }, 20 * 30, 500);
+ */
}
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
index 16e34826e5..f08ded35c0 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java
@@ -1,5 +1,8 @@
package gtPlusPlus.core.recipe;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gtPlusPlus.core.lib.CORE;
@@ -10,8 +13,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RECIPES_SeleniumProcessing {
@@ -45,149 +46,107 @@ public class RECIPES_SeleniumProcessing {
// Make Selenium
CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(14),
- ELEMENT.getInstance().CARBON.getDust(16),
- },
- new FluidStack[] {
- MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750), Materials.SulfuricAcid.getFluid(8000),
- },
+ new ItemStack[] { ItemUtils.getGregtechCircuit(14), ELEMENT.getInstance().CARBON.getDust(16), },
+ new FluidStack[] { MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750),
+ Materials.SulfuricAcid.getFluid(8000), },
ELEMENT.getInstance().SELENIUM.getFluidStack(144 * 1),
- new ItemStack[] {
- ELEMENT.getInstance().SELENIUM.getIngot(1),
- ELEMENT.getInstance().SELENIUM.getIngot(1),
- },
- new int[] {10000, 2000, 2000},
+ new ItemStack[] { ELEMENT.getInstance().SELENIUM.getIngot(1),
+ ELEMENT.getInstance().SELENIUM.getIngot(1), },
+ new int[] { 10000, 2000, 2000 },
20 * 300,
7200);
- /*// Old recipes for Selenium Roasting
- CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(16),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
- Materials.SulfuricAcid.getFluid(4000),
- ELEMENT.getInstance().SELENIUM.getFluid(144),
- 0,
- 20 * 300,
- 2000);
- CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(17),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedChalcopyrite", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
- Materials.SulfuricAcid.getFluid(4000),
- ELEMENT.getInstance().SELENIUM.getFluid(144),
- 0,
- 20 * 300,
- 2000);
- CORE.RA.addBlastSmelterRecipe(
- new ItemStack[] {
- ItemUtils.getGregtechCircuit(18),
- ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedGalena", 8),
- ELEMENT.getInstance().CARBON.getDust(32),
- },
- Materials.SulfuricAcid.getFluid(4000),
- ELEMENT.getInstance().SELENIUM.getFluid(144),
- 0,
- 20 * 300,
- 2000);*/
+ /*
+ * // Old recipes for Selenium Roasting CORE.RA.addBlastSmelterRecipe( new ItemStack[] {
+ * ItemUtils.getGregtechCircuit(16), ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 8),
+ * ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(4000),
+ * ELEMENT.getInstance().SELENIUM.getFluid(144), 0, 20 * 300, 2000); CORE.RA.addBlastSmelterRecipe( new
+ * ItemStack[] { ItemUtils.getGregtechCircuit(17),
+ * ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedChalcopyrite", 8),
+ * ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(4000),
+ * ELEMENT.getInstance().SELENIUM.getFluid(144), 0, 20 * 300, 2000); CORE.RA.addBlastSmelterRecipe( new
+ * ItemStack[] { ItemUtils.getGregtechCircuit(18),
+ * ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedGalena", 8),
+ * ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(4000),
+ * ELEMENT.getInstance().SELENIUM.getFluid(144), 0, 20 * 300, 2000);
+ */
}
public static void processCopperRecipes() {
// Copper
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(23),
- ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1), // Item Input
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(23),
+ ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1), // Item Input
},
FluidUtils.getHotWater(1000), // Fluid
MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(20), // Fluid
- new ItemStack[] {
- ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- }, // Output
- new int[] {10000, 100, 100, 500, 500, 500, 1000, 1000, 1000},
+ new ItemStack[] { ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), }, // Output
+ new int[] { 10000, 100, 100, 500, 500, 500, 1000, 1000, 1000 },
40 * 20, // Time in ticks
1024); // EU
// Tetra
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(23),
- ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1), // Item Input
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(23),
+ ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1), // Item
+ // Input
},
FluidUtils.getHotWater(1000), // Fluid
MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid
new ItemStack[] {
- ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- }, // Output
- new int[] {10000, 100, 100, 300, 300, 300, 800, 800, 800},
+ ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), }, // Output
+ new int[] { 10000, 100, 100, 300, 300, 300, 800, 800, 800 },
40 * 20, // Time in ticks
1024); // EU
// Chalco
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(23),
- ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), // Item Input
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(23),
+ ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), // Item
+ // Input
},
FluidUtils.getHotWater(1000), // Fluid
MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid
new ItemStack[] {
- ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- }, // Output
- new int[] {10000, 100, 100, 300, 300, 300, 800, 800, 800},
+ ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), }, // Output
+ new int[] { 10000, 100, 100, 300, 300, 300, 800, 800, 800 },
40 * 20, // Time in ticks
1024); // EU
// Malachite
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(23),
- ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1), // Item Input
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(23),
+ ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1), // Item Input
},
FluidUtils.getHotWater(1000), // Fluid
MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid
- new ItemStack[] {
- ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
- }, // Output
- new int[] {10000, 100, 100, 300, 300, 300, 800, 800, 800},
+ new ItemStack[] { ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1),
+ MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), }, // Output
+ new int[] { 10000, 100, 100, 300, 300, 300, 800, 800, 800 },
40 * 20, // Time in ticks
1024); // EU
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
index b561de2e43..0bfd3605b9 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.recipe;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.LoadedMods;
-import net.minecraft.item.ItemStack;
public class RECIPES_Shapeless {
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java
index 38832b07fe..54deeab3a8 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java
@@ -1,8 +1,5 @@
package gtPlusPlus.core.recipe;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -10,6 +7,10 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.RecipeUtils;
+
public class RECIPES_Tools {
// Outputs
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
index 62cd9f3800..44ae76b363 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.recipe;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.ItemList;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import net.minecraft.item.ItemStack;
public class RECIPE_Batteries {
diff --git a/src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java b/src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
index 67cf787b13..e805e97a64 100644
--- a/src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
+++ b/src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.recipe;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import net.minecraft.item.ItemStack;
public class ShapedRecipeObject {
@@ -17,17 +18,9 @@ public class ShapedRecipeObject {
public Object object_I;
public ItemStack object_OUTPUT;
- public ShapedRecipeObject(
- final Object input_A,
- final Object input_B,
- final Object input_C,
- final Object input_D,
- final Object input_E,
- final Object input_F,
- final Object input_G,
- final Object input_H,
- final Object input_I,
- final ItemStack input_Output) {
+ public ShapedRecipeObject(final Object input_A, final Object input_B, final Object input_C, final Object input_D,
+ final Object input_E, final Object input_F, final Object input_G, final Object input_H,
+ final Object input_I, final ItemStack input_Output) {
this.object_A = input_A;
this.object_B = input_B;
this.object_C = input_C;
diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
index 8718cd05fd..486cbd97ca 100644
--- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
@@ -1,5 +1,10 @@
package gtPlusPlus.core.recipe.common;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -19,10 +24,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
import ic2.core.Ic2Items;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class CI {
@@ -30,11 +31,9 @@ public class CI {
public static ItemStack _NULL = ItemUtils.getErrorStack(1);
// bits
- public static long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
+ public static long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED;
- public static long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ public static long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED;
@@ -193,59 +192,34 @@ public class CI {
public static ItemStack explosiveTNT;
public static ItemStack explosiveITNT;
- public static Materials[] tieredMaterials = new Materials[] {
- Materials.Iron, Materials.Steel, Materials.Aluminium,
- Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel,
- Materials.Chrome, Materials.Iridium, Materials.Osmium,
- Materials.Neutronium
- };
- ;
+ public static Materials[] tieredMaterials = new Materials[] { Materials.Iron, Materials.Steel, Materials.Aluminium,
+ Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel, Materials.Chrome, Materials.Iridium,
+ Materials.Osmium, Materials.Neutronium };;
public static void preInit() {
// Tiered Components
- component_Plate = new String[] {
- getTieredComponent(OrePrefixes.plate, 0),
- getTieredComponent(OrePrefixes.plate, 1),
- getTieredComponent(OrePrefixes.plate, 2),
- getTieredComponent(OrePrefixes.plate, 3),
- getTieredComponent(OrePrefixes.plate, 4),
- getTieredComponent(OrePrefixes.plate, 5),
- getTieredComponent(OrePrefixes.plate, 6),
- getTieredComponent(OrePrefixes.plate, 7),
- getTieredComponent(OrePrefixes.plate, 8),
- getTieredComponent(OrePrefixes.plate, 9),
- getTieredComponent(OrePrefixes.plate, 10),
- getTieredComponent(OrePrefixes.plate, 11)
- };
- component_Rod = new String[] {
- getTieredComponent(OrePrefixes.stick, 0),
- getTieredComponent(OrePrefixes.stick, 1),
- getTieredComponent(OrePrefixes.stick, 2),
- getTieredComponent(OrePrefixes.stick, 3),
- getTieredComponent(OrePrefixes.stick, 4),
- getTieredComponent(OrePrefixes.stick, 5),
- getTieredComponent(OrePrefixes.stick, 6),
- getTieredComponent(OrePrefixes.stick, 7),
- getTieredComponent(OrePrefixes.stick, 8),
- getTieredComponent(OrePrefixes.stick, 9),
- getTieredComponent(OrePrefixes.stick, 10),
- getTieredComponent(OrePrefixes.stick, 11)
- };
- component_Ingot = new String[] {
- getTieredComponent(OrePrefixes.ingot, 0),
- getTieredComponent(OrePrefixes.ingot, 1),
- getTieredComponent(OrePrefixes.ingot, 2),
- getTieredComponent(OrePrefixes.ingot, 3),
- getTieredComponent(OrePrefixes.ingot, 4),
- getTieredComponent(OrePrefixes.ingot, 5),
- getTieredComponent(OrePrefixes.ingot, 6),
- getTieredComponent(OrePrefixes.ingot, 7),
- getTieredComponent(OrePrefixes.ingot, 8),
- getTieredComponent(OrePrefixes.ingot, 9),
- getTieredComponent(OrePrefixes.ingot, 10),
- getTieredComponent(OrePrefixes.ingot, 11)
- };
+ component_Plate = new String[] { getTieredComponent(OrePrefixes.plate, 0),
+ getTieredComponent(OrePrefixes.plate, 1), getTieredComponent(OrePrefixes.plate, 2),
+ getTieredComponent(OrePrefixes.plate, 3), getTieredComponent(OrePrefixes.plate, 4),
+ getTieredComponent(OrePrefixes.plate, 5), getTieredComponent(OrePrefixes.plate, 6),
+ getTieredComponent(OrePrefixes.plate, 7), getTieredComponent(OrePrefixes.plate, 8),
+ getTieredComponent(OrePrefixes.plate, 9), getTieredComponent(OrePrefixes.plate, 10),
+ getTieredComponent(OrePrefixes.plate, 11) };
+ component_Rod = new String[] { getTieredComponent(OrePrefixes.stick, 0),
+ getTieredComponent(OrePrefixes.stick, 1), getTieredComponent(OrePrefixes.stick, 2),
+ getTieredComponent(OrePrefixes.stick, 3), getTieredComponent(OrePrefixes.stick, 4),
+ getTieredComponent(OrePrefixes.stick, 5), getTieredComponent(OrePrefixes.stick, 6),
+ getTieredComponent(OrePrefixes.stick, 7), getTieredComponent(OrePrefixes.stick, 8),
+ getTieredComponent(OrePrefixes.stick, 9), getTieredComponent(OrePrefixes.stick, 10),
+ getTieredComponent(OrePrefixes.stick, 11) };
+ component_Ingot = new String[] { getTieredComponent(OrePrefixes.ingot, 0),
+ getTieredComponent(OrePrefixes.ingot, 1), getTieredComponent(OrePrefixes.ingot, 2),
+ getTieredComponent(OrePrefixes.ingot, 3), getTieredComponent(OrePrefixes.ingot, 4),
+ getTieredComponent(OrePrefixes.ingot, 5), getTieredComponent(OrePrefixes.ingot, 6),
+ getTieredComponent(OrePrefixes.ingot, 7), getTieredComponent(OrePrefixes.ingot, 8),
+ getTieredComponent(OrePrefixes.ingot, 9), getTieredComponent(OrePrefixes.ingot, 10),
+ getTieredComponent(OrePrefixes.ingot, 11) };
// Circuits
circuitPrimitive = getTieredCircuit(0);
@@ -450,8 +424,8 @@ public class CI {
public static void init() {
// Set Explosives
- explosivePowderKeg =
- ItemUtils.getValueOfItemList("Block_Powderbarrel", 1, ItemUtils.getSimpleStack(Items.gunpowder, 16));
+ explosivePowderKeg = ItemUtils
+ .getValueOfItemList("Block_Powderbarrel", 1, ItemUtils.getSimpleStack(Items.gunpowder, 16));
explosiveTNT = ItemUtils.getSimpleStack(Blocks.tnt).copy();
explosiveITNT = Ic2Items.industrialTnt.copy();
@@ -493,81 +467,31 @@ public class CI {
return ItemUtils.getEmptyCell(i);
}
- private static final Material[] aMaterial_Main = new Material[] {
- ALLOY.POTIN,
- ALLOY.TUMBAGA,
- ALLOY.EGLIN_STEEL,
- ALLOY.INCONEL_625,
- ALLOY.INCOLOY_DS,
- ALLOY.NITINOL_60,
- ALLOY.ZERON_100,
- ALLOY.PIKYONIUM,
- ELEMENT.STANDALONE.ADVANCED_NITINOL,
- ALLOY.ABYSSAL,
- ALLOY.QUANTUM,
- ELEMENT.STANDALONE.HYPOGEN
- };
-
- private static final Material[] aMaterial_Secondary = new Material[] {
- ALLOY.STEEL,
- ALLOY.SILICON_CARBIDE,
- ALLOY.BLOODSTEEL,
- ALLOY.TANTALUM_CARBIDE,
- ALLOY.INCONEL_792,
- ALLOY.ARCANITE,
- ALLOY.LAFIUM,
- ALLOY.CINOBITE,
- ALLOY.TITANSTEEL,
- ALLOY.OCTIRON,
- ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN,
- ELEMENT.STANDALONE.HYPOGEN
- };
-
- private static final Material[] aMaterial_Tertiary = new Material[] {
- ELEMENT.getInstance().LEAD,
- ELEMENT.getInstance().ALUMINIUM,
- ELEMENT.STANDALONE.BLACK_METAL,
- ELEMENT.getInstance().TITANIUM,
- ALLOY.HASTELLOY_N,
- ALLOY.ENERGYCRYSTAL,
- ALLOY.TRINIUM_NAQUADAH_CARBON,
- ALLOY.TRINIUM_REINFORCED_STEEL, // Arceus
- ALLOY.TITANSTEEL,
- ELEMENT.STANDALONE.ASTRAL_TITANIUM,
- ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN,
- ELEMENT.STANDALONE.HYPOGEN
- };
-
- private static final Materials[] aMaterial_Cables = new Materials[] {
- !CORE.GTNH ? Materials.Lead : Materials.Tin,
- Materials.Cobalt,
- Materials.AnnealedCopper,
- Materials.Gold,
- Materials.Titanium,
- Materials.Nichrome,
- Materials.Platinum,
- Materials.YttriumBariumCuprate,
- Materials.Naquadah,
- Materials.Duranium,
- Materials.Superconductor,
- };
-
- private static final Materials[] aMaterial_Circuits = new Materials[] {
- Materials.Primitive,
- Materials.Basic,
- Materials.Good,
- Materials.Advanced,
- Materials.Data,
- Materials.Data,
- Materials.Elite,
- Materials.Master,
- Materials.Ultimate,
- Materials.Superconductor,
- Materials.Infinite,
- };
-
- private static final Material[][] aMaster =
- new Material[][] {aMaterial_Main, aMaterial_Secondary, aMaterial_Tertiary};
+ private static final Material[] aMaterial_Main = new Material[] { ALLOY.POTIN, ALLOY.TUMBAGA, ALLOY.EGLIN_STEEL,
+ ALLOY.INCONEL_625, ALLOY.INCOLOY_DS, ALLOY.NITINOL_60, ALLOY.ZERON_100, ALLOY.PIKYONIUM,
+ ELEMENT.STANDALONE.ADVANCED_NITINOL, ALLOY.ABYSSAL, ALLOY.QUANTUM, ELEMENT.STANDALONE.HYPOGEN };
+
+ private static final Material[] aMaterial_Secondary = new Material[] { ALLOY.STEEL, ALLOY.SILICON_CARBIDE,
+ ALLOY.BLOODSTEEL, ALLOY.TANTALUM_CARBIDE, ALLOY.INCONEL_792, ALLOY.ARCANITE, ALLOY.LAFIUM, ALLOY.CINOBITE,
+ ALLOY.TITANSTEEL, ALLOY.OCTIRON, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN, ELEMENT.STANDALONE.HYPOGEN };
+
+ private static final Material[] aMaterial_Tertiary = new Material[] { ELEMENT.getInstance().LEAD,
+ ELEMENT.getInstance().ALUMINIUM, ELEMENT.STANDALONE.BLACK_METAL, ELEMENT.getInstance().TITANIUM,
+ ALLOY.HASTELLOY_N, ALLOY.ENERGYCRYSTAL, ALLOY.TRINIUM_NAQUADAH_CARBON, ALLOY.TRINIUM_REINFORCED_STEEL, // Arceus
+ ALLOY.TITANSTEEL, ELEMENT.STANDALONE.ASTRAL_TITANIUM, ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN,
+ ELEMENT.STANDALONE.HYPOGEN };
+
+ private static final Materials[] aMaterial_Cables = new Materials[] { !CORE.GTNH ? Materials.Lead : Materials.Tin,
+ Materials.Cobalt, Materials.AnnealedCopper, Materials.Gold, Materials.Titanium, Materials.Nichrome,
+ Materials.Platinum, Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium,
+ Materials.Superconductor, };
+
+ private static final Materials[] aMaterial_Circuits = new Materials[] { Materials.Primitive, Materials.Basic,
+ Materials.Good, Materials.Advanced, Materials.Data, Materials.Data, Materials.Elite, Materials.Master,
+ Materials.Ultimate, Materials.Superconductor, Materials.Infinite, };
+
+ private static final Material[][] aMaster = new Material[][] { aMaterial_Main, aMaterial_Secondary,
+ aMaterial_Tertiary };
public static FluidStack getTieredFluid(int aTier, int aAmount) {
return getTieredFluid(aTier, aAmount, 0);
@@ -583,11 +507,11 @@ public class CI {
public static FluidStack getTieredFluid(int aTier, int aAmount, int aType) {
// Weird Legacy handling
- /*ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1);
- FluidStack a = GT_Utility.getFluidForFilledItem(aCell, true);
- if (a == null) {
- a = aMaster[aType][aTier].getFluid(aAmount);
- }*/
+ /*
+ * ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1); FluidStack a =
+ * GT_Utility.getFluidForFilledItem(aCell, true); if (a == null) { a = aMaster[aType][aTier].getFluid(aAmount);
+ * }
+ */
// Modern Handling
FluidStack a = aMaster[aType][aTier].getFluidStack(aAmount);
@@ -603,17 +527,16 @@ public class CI {
public static ItemStack getEnergyCore(int aTier, int aAmount) {
ItemStack[] aOutput = new ItemStack[] {
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "1", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "2", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "3", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "4", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "5", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "6", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "7", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "8", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "9", 1),
- ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "10", 1)
- };
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "1", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "2", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "3", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "4", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "5", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "6", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "7", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "8", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "9", 1),
+ ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + "10", 1) };
return ItemUtils.getSimpleStack(aOutput[MathUtils.balance(aTier, 0, 9)], aAmount);
}
@@ -651,26 +574,22 @@ public class CI {
Material m = null;
if (aPrefix == OrePrefixes.liquid) {
- int aMatID = (aTier == 0 || aTier == 2 || aTier == 5 || aTier == 8
- ? 0
+ int aMatID = (aTier == 0 || aTier == 2 || aTier == 5 || aTier == 8 ? 0
: (aTier == 1 || aTier == 3 || aTier == 6 || aTier == 9 ? 1 : 2));
ItemStack aCell = aMaster[aMatID][aTier].getCell(aAmount);
return aCell;
}
if (aPrefix == OrePrefixes.circuit) {
- /*if (aTier == 4) {
- return ItemUtils.getSimpleStack(CI.getDataStick(), aAmount);
- }
- else if (aTier == 5) {
- return ItemUtils.getSimpleStack(CI.getDataOrb(), aAmount);
- }*/
+ /*
+ * if (aTier == 4) { return ItemUtils.getSimpleStack(CI.getDataStick(), aAmount); } else if (aTier == 5) {
+ * return ItemUtils.getSimpleStack(CI.getDataOrb(), aAmount); }
+ */
return ItemUtils.getOrePrefixStack(OrePrefixes.circuit, aMaterial_Circuits[aTier], aAmount);
}
// Check for Cables first, catch SuperConductor case and swap to wire.
- if (aPrefix == OrePrefixes.cableGt01
- || aPrefix == OrePrefixes.cableGt02
+ if (aPrefix == OrePrefixes.cableGt01 || aPrefix == OrePrefixes.cableGt02
|| aPrefix == OrePrefixes.cableGt04
|| aPrefix == OrePrefixes.cableGt08
|| aPrefix == OrePrefixes.cableGt12) {
@@ -691,8 +610,7 @@ public class CI {
return ItemUtils.getOrePrefixStack(aPrefix, aMaterial_Cables[aTier], aAmount);
}
}
- if (aPrefix == OrePrefixes.wireGt01
- || aPrefix == OrePrefixes.wireGt02
+ if (aPrefix == OrePrefixes.wireGt01 || aPrefix == OrePrefixes.wireGt02
|| aPrefix == OrePrefixes.wireGt04
|| aPrefix == OrePrefixes.wireGt08
|| aPrefix == OrePrefixes.wireGt12
@@ -700,8 +618,7 @@ public class CI {
return ItemUtils.getOrePrefixStack(aPrefix, aMaterial_Cables[aTier], aAmount);
}
- if (aPrefix == OrePrefixes.pipeTiny
- || aPrefix == OrePrefixes.pipeSmall
+ if (aPrefix == OrePrefixes.pipeTiny || aPrefix == OrePrefixes.pipeSmall
|| aPrefix == OrePrefixes.pipe
|| aPrefix == OrePrefixes.pipeMedium
|| aPrefix == OrePrefixes.pipeLarge
@@ -790,8 +707,8 @@ public class CI {
// All Invalid? Ok, shit.
// Let's add a special error ingot.
if (!ItemUtils.checkForInvalidItems(aReturn)) {
- aReturn = ItemUtils.getErrorStack(
- 1, (aPrefix.toString() + m.getLocalizedName() + " x" + aAmount));
+ aReturn = ItemUtils
+ .getErrorStack(1, (aPrefix.toString() + m.getLocalizedName() + " x" + aAmount));
}
}
}
@@ -1125,18 +1042,10 @@ public class CI {
}
public static ItemStack getTieredGTPPMachineCasing(int aTier, int aAmount) {
- GregtechItemList[] aHulls = new GregtechItemList[] {
- GregtechItemList.GTPP_Casing_ULV,
- GregtechItemList.GTPP_Casing_LV,
- GregtechItemList.GTPP_Casing_MV,
- GregtechItemList.GTPP_Casing_HV,
- GregtechItemList.GTPP_Casing_EV,
- GregtechItemList.GTPP_Casing_IV,
- GregtechItemList.GTPP_Casing_LuV,
- GregtechItemList.GTPP_Casing_ZPM,
- GregtechItemList.GTPP_Casing_UV,
- GregtechItemList.GTPP_Casing_MAX
- };
+ GregtechItemList[] aHulls = new GregtechItemList[] { GregtechItemList.GTPP_Casing_ULV,
+ GregtechItemList.GTPP_Casing_LV, GregtechItemList.GTPP_Casing_MV, GregtechItemList.GTPP_Casing_HV,
+ GregtechItemList.GTPP_Casing_EV, GregtechItemList.GTPP_Casing_IV, GregtechItemList.GTPP_Casing_LuV,
+ GregtechItemList.GTPP_Casing_ZPM, GregtechItemList.GTPP_Casing_UV, GregtechItemList.GTPP_Casing_MAX };
return aHulls[aTier].get(aAmount);
}
@@ -1145,18 +1054,12 @@ public class CI {
}
public static ItemStack getTransmissionComponent(int aTier, int aAmount) {
- GregtechItemList[] aTransParts = new GregtechItemList[] {
- GregtechItemList.TransmissionComponent_ULV,
- GregtechItemList.TransmissionComponent_LV,
- GregtechItemList.TransmissionComponent_MV,
- GregtechItemList.TransmissionComponent_HV,
- GregtechItemList.TransmissionComponent_EV,
- GregtechItemList.TransmissionComponent_IV,
- GregtechItemList.TransmissionComponent_LuV,
- GregtechItemList.TransmissionComponent_ZPM,
- GregtechItemList.TransmissionComponent_UV,
- GregtechItemList.TransmissionComponent_MAX,
- };
+ GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV,
+ GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV,
+ GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV,
+ GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV,
+ GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV,
+ GregtechItemList.TransmissionComponent_MAX, };
return aTransParts[aTier].get(aAmount);
}
@@ -1166,6 +1069,7 @@ public class CI {
/**
* Aluminium + Silver Catalyst
+ *
* @param aAmount - Stacksize
* @return - A Catalyst stack of given size
*/
@@ -1175,6 +1079,7 @@ public class CI {
/**
* Iron + Copper Catalyst
+ *
* @param aAmount - Stacksize
* @return - A Catalyst stack of given size
*/
@@ -1184,6 +1089,7 @@ public class CI {
/**
* Tungsten + Nickel Catalyst
+ *
* @param aAmount - Stacksize
* @return - A Catalyst stack of given size
*/
@@ -1193,6 +1099,7 @@ public class CI {
/**
* Cobalt + Titanium Catalyst
+ *
* @param aAmount - Stacksize
* @return - A Catalyst stack of given size
*/
@@ -1202,6 +1109,7 @@ public class CI {
/**
* Vanadium + Palladium Catalyst
+ *
* @param aAmount - Stacksize
* @return - A Catalyst stack of given size
*/
@@ -1211,6 +1119,7 @@ public class CI {
/**
* Iridium + Ruthenium Catalyst
+ *
* @param aAmount - Stacksize
* @return - A Catalyst stack of given size
*/
@@ -1220,6 +1129,7 @@ public class CI {
/**
* Aluminium + Nickel Catalyst
+ *
* @param aAmount - Stacksize
* @return - A Catalyst stack of given size
*/
@@ -1229,6 +1139,7 @@ public class CI {
/**
* Platinum + Rhodium Catalyst
+ *
* @param aAmount - Stacksize
* @return - A Catalyst stack of given size
*/
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java b/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java
index 0caee5e6d0..588f17c92a 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.slots;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.GT_MetaGenerated_Item_02;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.items.GT_MetaGenerated_Item_02;
+
public class SlotBuzzSaw extends Slot {
public SAWTOOL currentTool = SAWTOOL.NONE;
@@ -24,8 +25,7 @@ public class SlotBuzzSaw extends Slot {
|| (itemstack.getItem() instanceof GT_MetaGenerated_Tool)) {
// Buzzsaw Blade //TODO
/*
- * if (OrePrefixes.toolHeadBuzzSaw.contains(itemstack)){ isValid
- * = false; }
+ * if (OrePrefixes.toolHeadBuzzSaw.contains(itemstack)){ isValid = false; }
*/
if (OrePrefixes.craftingTool.contains(itemstack)) {
if (itemstack.getDisplayName().toLowerCase().contains("saw")
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java b/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
index 4bfda45170..246e7f7495 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
@@ -1,13 +1,14 @@
package gtPlusPlus.core.slots;
-import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
-import gregtech.api.util.GT_Recipe;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
+import gregtech.api.util.GT_Recipe;
+
public class SlotChemicalPlantInput extends Slot {
public SlotChemicalPlantInput(final IInventory inventory, final int index, final int x, final int y) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java b/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java
index 8d7c0946ec..edcb3baf3b 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.slots;
-import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -11,34 +10,28 @@ import net.minecraft.stats.AchievementList;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
+import cpw.mods.fml.common.FMLCommonHandler;
+
public class SlotCrafting extends Slot {
+
/** The craft matrix inventory linked to this result slot. */
private final IInventory craftMatrix;
/** The player that is using the GUI where this slot resides. */
private final EntityPlayer thePlayer;
/**
- * The number of items that have been crafted so far. Gets passed to
- * ItemStack.onCrafting before being reset.
+ * The number of items that have been crafted so far. Gets passed to ItemStack.onCrafting before being reset.
*/
private int amountCrafted;
- private static final String __OBFID = "CL_00001761";
-
- public SlotCrafting(
- final EntityPlayer p_i1823_1_,
- final IInventory p_i1823_2_,
- final IInventory p_i1823_3_,
- final int p_i1823_4_,
- final int p_i1823_5_,
- final int p_i1823_6_) {
+ public SlotCrafting(final EntityPlayer p_i1823_1_, final IInventory p_i1823_2_, final IInventory p_i1823_3_,
+ final int p_i1823_4_, final int p_i1823_5_, final int p_i1823_6_) {
super(p_i1823_3_, p_i1823_4_, p_i1823_5_, p_i1823_6_);
this.thePlayer = p_i1823_1_;
this.craftMatrix = p_i1823_2_;
}
/**
- * Check if the stack is a valid item for this slot. Always true beside for
- * the armor slots.
+ * Check if the stack is a valid item for this slot. Always true beside for the armor slots.
*/
@Override
public boolean isItemValid(final ItemStack p_75214_1_) {
@@ -46,8 +39,8 @@ public class SlotCrafting extends Slot {
}
/**
- * Decrease the size of the stack in slot (first int arg) by the amount of
- * the second int arg. Returns the new stack.
+ * Decrease the size of the stack in slot (first int arg) by the amount of the second int arg. Returns the new
+ * stack.
*/
@Override
public ItemStack decrStackSize(final int p_75209_1_) {
@@ -59,9 +52,8 @@ public class SlotCrafting extends Slot {
}
/**
- * the itemStack passed in is the output - ie, iron ingots, and pickaxes,
- * not ore and wood. Typically increases an internal count then calls
- * onCrafting(item).
+ * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an
+ * internal count then calls onCrafting(item).
*/
@Override
protected void onCrafting(final ItemStack p_75210_1_, final int p_75210_2_) {
@@ -70,8 +62,7 @@ public class SlotCrafting extends Slot {
}
/**
- * the itemStack passed in is the output - ie, iron ingots, and pickaxes,
- * not ore and wood.
+ * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood.
*/
@Override
protected void onCrafting(final ItemStack p_75208_1_) {
@@ -134,8 +125,7 @@ public class SlotCrafting extends Slot {
if (itemstack1.getItem().hasContainerItem(itemstack1)) {
final ItemStack itemstack2 = itemstack1.getItem().getContainerItem(itemstack1);
- if ((itemstack2 != null)
- && itemstack2.isItemStackDamageable()
+ if ((itemstack2 != null) && itemstack2.isItemStackDamageable()
&& (itemstack2.getItemDamage() > itemstack2.getMaxDamage())) {
MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(this.thePlayer, itemstack2));
continue;
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java b/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java
index cf96dd69e2..119cd250bf 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.slots;
-import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -8,27 +7,28 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.*;
import net.minecraft.stats.AchievementList;
+import cpw.mods.fml.common.FMLCommonHandler;
+
public class SlotCraftingNoCollect extends SlotCrafting {
+
/** The craft matrix inventory linked to this result slot. */
private final IInventory craftMatrix;
/** The player that is using the GUI where this slot resides. */
private EntityPlayer thePlayer;
/**
- * The number of items that have been crafted so far. Gets passed to
- * ItemStack.onCrafting before being reset.
+ * The number of items that have been crafted so far. Gets passed to ItemStack.onCrafting before being reset.
*/
private int amountCrafted;
- public SlotCraftingNoCollect(
- EntityPlayer player, IInventory inventory, IInventory inventory2, int x, int y, int z) {
+ public SlotCraftingNoCollect(EntityPlayer player, IInventory inventory, IInventory inventory2, int x, int y,
+ int z) {
super(player, inventory, inventory2, x, y, z);
this.thePlayer = player;
this.craftMatrix = inventory;
}
/**
- * Check if the stack is a valid item for this slot. Always true beside for
- * the armor slots.
+ * Check if the stack is a valid item for this slot. Always true beside for the armor slots.
*/
@Override
public boolean isItemValid(ItemStack p_75214_1_) {
@@ -36,8 +36,8 @@ public class SlotCraftingNoCollect extends SlotCrafting {
}
/**
- * Decrease the size of the stack in slot (first int arg) by the amount of
- * the second int arg. Returns the new stack.
+ * Decrease the size of the stack in slot (first int arg) by the amount of the second int arg. Returns the new
+ * stack.
*/
@Override
public ItemStack decrStackSize(int amount) {
@@ -49,9 +49,8 @@ public class SlotCraftingNoCollect extends SlotCrafting {
}
/**
- * the itemStack passed in is the output - ie, iron ingots, and pickaxes,
- * not ore and wood. Typically increases an internal count then calls
- * onCrafting(item).
+ * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an
+ * internal count then calls onCrafting(item).
*/
@Override
protected void onCrafting(ItemStack output, int amount) {
@@ -60,8 +59,7 @@ public class SlotCraftingNoCollect extends SlotCrafting {
}
/**
- * the itemStack passed in is the output - ie, iron ingots, and pickaxes,
- * not ore and wood.
+ * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood.
*/
@Override
protected void onCrafting(ItemStack output) {
@@ -116,26 +114,16 @@ public class SlotCraftingNoCollect extends SlotCrafting {
this.onCrafting(output);
/*
- * for (int i = 0; i < this.craftMatrix.getSizeInventory(); ++i) {
- * ItemStack itemstack1 = this.craftMatrix.getStackInSlot(i);
- *
- * if (itemstack1 != null) { this.craftMatrix.decrStackSize(i, 1);
- *
- * if (itemstack1.getItem().hasContainerItem(itemstack1)) { ItemStack
- * itemstack2 = itemstack1.getItem().getContainerItem(itemstack1);
- *
- * if (itemstack2 != null && itemstack2.isItemStackDamageable() &&
- * itemstack2.getItemDamage() > itemstack2.getMaxDamage()) {
- * MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thePlayer,
- * itemstack2)); continue; }
- *
- * if
- * (!itemstack1.getItem().doesContainerItemLeaveCraftingGrid(itemstack1)
- * || !this.thePlayer.inventory.addItemStackToInventory(itemstack2)) {
- * if (this.craftMatrix.getStackInSlot(i) == null) {
- * this.craftMatrix.setInventorySlotContents(i, itemstack2); } else {
- * this.thePlayer.dropPlayerItemWithRandomChoice(itemstack2, false); } }
- * } } }
+ * for (int i = 0; i < this.craftMatrix.getSizeInventory(); ++i) { ItemStack itemstack1 =
+ * this.craftMatrix.getStackInSlot(i); if (itemstack1 != null) { this.craftMatrix.decrStackSize(i, 1); if
+ * (itemstack1.getItem().hasContainerItem(itemstack1)) { ItemStack itemstack2 =
+ * itemstack1.getItem().getContainerItem(itemstack1); if (itemstack2 != null &&
+ * itemstack2.isItemStackDamageable() && itemstack2.getItemDamage() > itemstack2.getMaxDamage()) {
+ * MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thePlayer, itemstack2)); continue; } if
+ * (!itemstack1.getItem().doesContainerItemLeaveCraftingGrid(itemstack1) ||
+ * !this.thePlayer.inventory.addItemStackToInventory(itemstack2)) { if (this.craftMatrix.getStackInSlot(i) ==
+ * null) { this.craftMatrix.setInventorySlotContents(i, itemstack2); } else {
+ * this.thePlayer.dropPlayerItemWithRandomChoice(itemstack2, false); } } } } }
*/
}
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java b/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java
index 69feaa3384..9de2622253 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.slots;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.recipe.common.CI;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.recipe.common.CI;
+
public class SlotDataStick extends Slot {
public SlotDataStick(final IInventory inventory, final int slot, final int x, final int y) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotFrame.java b/src/main/java/gtPlusPlus/core/slots/SlotFrame.java
index 593ec747e8..9ee2a0d341 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotFrame.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotFrame.java
@@ -1,10 +1,11 @@
package gtPlusPlus.core.slots;
-import forestry.api.apiculture.IHiveFrame;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import forestry.api.apiculture.IHiveFrame;
+
public class SlotFrame extends Slot {
public SlotFrame(final IInventory inventory, final int x, final int y, final int z) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java b/src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java
index 18c5878e35..0dd050b5aa 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.slots;
-import gregtech.api.enums.ItemList;
-import ic2.core.Ic2Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import gregtech.api.enums.ItemList;
+import ic2.core.Ic2Items;
+
public class SlotFuelRod extends Slot {
public SlotFuelRod(final IInventory inventory, final int index, final int x, final int y) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotGtTool.java b/src/main/java/gtPlusPlus/core/slots/SlotGtTool.java
index ea2d8f3a93..4047c4e62c 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotGtTool.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotGtTool.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.slots;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gtPlusPlus.api.objects.Logger;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gtPlusPlus.api.objects.Logger;
+
public class SlotGtTool extends Slot {
public SlotGtTool(final IInventory inventory, final int x, final int y, final int z) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java b/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java
index c7013660dc..8b57926193 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java
@@ -1,24 +1,21 @@
package gtPlusPlus.core.slots;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.items.GT_MetaGenerated_Tool;
import gtPlusPlus.api.objects.Logger;
import ic2.api.info.Info;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
public class SlotGtToolElectric extends SlotGtTool {
+
public int tier;
private ItemStack content;
- public SlotGtToolElectric(
- final IInventory base,
- final int x,
- final int y,
- final int z,
- final int tier,
+ public SlotGtToolElectric(final IInventory base, final int x, final int y, final int z, final int tier,
final boolean allowRedstoneDust) {
super(base, x, y, z);
this.tier = tier;
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java b/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java
index 702f678804..99e59380dc 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.slots;
-import gtPlusPlus.core.recipe.common.CI;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.recipe.common.CI;
+
public class SlotIntegratedCircuit extends Slot {
public static Item mCircuitItem;
@@ -48,8 +49,7 @@ public class SlotIntegratedCircuit extends Slot {
}
if (mCircuitItem != null && mCircuitItem2 != null && mCircuitItem3 != null) {
if (itemstack != null) {
- if (itemstack.getItem() == mCircuitItem
- || itemstack.getItem() == mCircuitItem2
+ if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2
|| itemstack.getItem() == mCircuitItem3) {
if (aLockedCircuitNumber == -1) {
isValid = true;
@@ -66,6 +66,7 @@ public class SlotIntegratedCircuit extends Slot {
/**
* Returns the circuit type. -1 is invalid, 0 is standard, 1 is GT++ bio.
+ *
* @param itemstack - the Circuit Stack.
* @return
*/
@@ -81,8 +82,7 @@ public class SlotIntegratedCircuit extends Slot {
}
if (mCircuitItem != null && mCircuitItem2 != null && mCircuitItem3 != null) {
if (itemstack != null) {
- if (itemstack.getItem() == mCircuitItem
- || itemstack.getItem() == mCircuitItem2
+ if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2
|| itemstack.getItem() == mCircuitItem3) {
if (itemstack.getItem() == mCircuitItem) {
return 0;
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java b/src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java
index 7711858dae..cf13bab8c9 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java
@@ -1,11 +1,13 @@
package gtPlusPlus.core.slots;
-import gtPlusPlus.core.item.base.BaseItemBackpack;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.item.base.BaseItemBackpack;
+
public class SlotItemBackpackInv extends Slot {
+
public SlotItemBackpackInv(final IInventory inv, final int index, final int xPos, final int yPos) {
super(inv, index, xPos, yPos);
}
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java b/src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java
index 341921814f..ffd9f6dcae 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.slots;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.minecraft.FoodUtils;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.minecraft.FoodUtils;
+
public class SlotLunchBox extends SlotGtTool {
public SlotLunchBox(final IInventory base, final int x, final int y, final int z) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java b/src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java
index 6427dccc69..7c13dd1c7a 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.slots;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.minecraft.FoodUtils;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.minecraft.FoodUtils;
+
public class SlotMagicToolBag extends SlotGtTool {
public SlotMagicToolBag(final IInventory base, final int x, final int y, final int z) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java b/src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java
index 47a3beb393..7d91852e80 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java
@@ -1,10 +1,11 @@
package gtPlusPlus.core.slots;
-import gtPlusPlus.core.item.bauble.ModularBauble;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.item.bauble.ModularBauble;
+
public class SlotModularBauble extends Slot {
public SlotModularBauble(final IInventory inventory, final int slot, final int x, final int y) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java b/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
index f73f27b788..63a337cbb8 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java
@@ -2,16 +2,18 @@ package gtPlusPlus.core.slots;
import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.*;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT;
-import gtPlusPlus.core.util.minecraft.ModularArmourUtils.Modifiers;
import java.util.Iterator;
import java.util.Map.Entry;
+
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT;
+import gtPlusPlus.core.util.minecraft.ModularArmourUtils.Modifiers;
+
public class SlotModularBaubleUpgrades extends Slot {
public SlotModularBaubleUpgrades(final IInventory inventory, final int slot, final int x, final int y) {
@@ -25,8 +27,7 @@ public class SlotModularBaubleUpgrades extends Slot {
Logger.INFO("trying to insert " + itemstack.getDisplayName());
Logger.INFO("Valid Upgrade count: " + mValidUpgradeList.size());
- Iterator<Entry<ItemStack, BT>> it =
- mValidUpgradeListFormChange.entrySet().iterator();
+ Iterator<Entry<ItemStack, BT>> it = mValidUpgradeListFormChange.entrySet().iterator();
while (it.hasNext()) {
Entry<ItemStack, BT> pair = it.next();
if (pair.getKey().getItem() == itemstack.getItem()
@@ -35,8 +36,7 @@ public class SlotModularBaubleUpgrades extends Slot {
}
}
- Iterator<Entry<ItemStack, Pair<Modifiers, Integer>>> it2 =
- mValidUpgradeList.entrySet().iterator();
+ Iterator<Entry<ItemStack, Pair<Modifiers, Integer>>> it2 = mValidUpgradeList.entrySet().iterator();
while (it2.hasNext()) {
Entry<ItemStack, Pair<Modifiers, Integer>> pair = it2.next();
if (pair.getKey().getItem() == itemstack.getItem()
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotOutput.java b/src/main/java/gtPlusPlus/core/slots/SlotOutput.java
index dc469b32a4..1948b9aa17 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotOutput.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotOutput.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.slots;
-import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
@@ -8,27 +7,23 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
+import cpw.mods.fml.common.FMLCommonHandler;
+
public class SlotOutput extends SlotCrafting {
private final IInventory craftMatrix;
private final EntityPlayer thePlayer;
private int amountCrafted;
- public SlotOutput(
- final EntityPlayer player,
- final InventoryCrafting craftingInventory,
- final IInventory p_i45790_3_,
- final int slotIndex,
- final int xPosition,
- final int yPosition) {
+ public SlotOutput(final EntityPlayer player, final InventoryCrafting craftingInventory,
+ final IInventory p_i45790_3_, final int slotIndex, final int xPosition, final int yPosition) {
super(player, craftingInventory, p_i45790_3_, slotIndex, xPosition, yPosition);
this.thePlayer = player;
this.craftMatrix = craftingInventory;
}
/**
- * Check if the stack is a valid item for this slot. Always true beside for
- * the armor slots.
+ * Check if the stack is a valid item for this slot. Always true beside for the armor slots.
*/
@Override
public boolean isItemValid(final ItemStack par1ItemStack) {
@@ -36,8 +31,8 @@ public class SlotOutput extends SlotCrafting {
}
/**
- * Decrease the size of the stack in slot (first int arg) by the amount of
- * the second int arg. Returns the new stack.
+ * Decrease the size of the stack in slot (first int arg) by the amount of the second int arg. Returns the new
+ * stack.
*/
@Override
public ItemStack decrStackSize(final int par1) {
@@ -48,9 +43,8 @@ public class SlotOutput extends SlotCrafting {
}
/**
- * the itemStack passed in is the output - ie, iron ingots, and pickaxes,
- * not ore and wood. Typically increases an internal count then calls
- * onCrafting(item).
+ * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an
+ * internal count then calls onCrafting(item).
*/
@Override
protected void onCrafting(final ItemStack par1ItemStack, final int par2) {
@@ -59,8 +53,7 @@ public class SlotOutput extends SlotCrafting {
}
/**
- * the itemStack passed in is the output - ie, iron ingots, and pickaxes,
- * not ore and wood.
+ * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood.
*/
@Override
protected void onCrafting(final ItemStack stack) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotRTG.java b/src/main/java/gtPlusPlus/core/slots/SlotRTG.java
index f07fdd2894..ef226e99ca 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotRTG.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotRTG.java
@@ -1,10 +1,11 @@
package gtPlusPlus.core.slots;
-import ic2.core.Ic2Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import ic2.core.Ic2Items;
+
public class SlotRTG extends Slot {
public SlotRTG(final IInventory inventory, final int x, final int y, final int z) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java b/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java
index 54b8f0bd92..f4741c4800 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java
@@ -1,12 +1,13 @@
package gtPlusPlus.core.slots;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemTool;
+
import gregtech.api.items.GT_MetaGenerated_Tool;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemTool;
public class SlotToolBox extends SlotGtTool {
@@ -51,12 +52,9 @@ public class SlotToolBox extends SlotGtTool {
}
// OpenMods
- String[] OpenModsContent = new String[] {
- "openblocks.common.item.ItemDevNull",
- "openblocks.common.item.ItemHangGlider",
- "openblocks.common.item.ItemWrench",
- "openblocks.common.item.ItemSleepingBag"
- };
+ String[] OpenModsContent = new String[] { "openblocks.common.item.ItemDevNull",
+ "openblocks.common.item.ItemHangGlider", "openblocks.common.item.ItemWrench",
+ "openblocks.common.item.ItemSleepingBag" };
for (String t : OpenModsContent) {
temp = ReflectionUtils.getClass(t);
if (temp != null) {
@@ -73,11 +71,8 @@ public class SlotToolBox extends SlotGtTool {
}
// EIO
- String[] EioContent = new String[] {
- "crazypants.enderio.api.tool.ITool",
- "crazypants.enderio.item.ItemMagnet",
- "crazypants.enderio.item.ItemConduitProbe"
- };
+ String[] EioContent = new String[] { "crazypants.enderio.api.tool.ITool", "crazypants.enderio.item.ItemMagnet",
+ "crazypants.enderio.item.ItemConduitProbe" };
for (String t : EioContent) {
temp = ReflectionUtils.getClass(t);
if (temp != null) {
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java b/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java
index 0decde112d..3d365c08b7 100644
--- a/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java
+++ b/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.slots;
-import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
+
public class SlotVolumetricFlask extends Slot {
public static Item mFlask;
diff --git a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
index 1ec58b0813..921415ee5d 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -62,7 +62,7 @@ public class ModTileEntities {
"gtPlusPlus.core.tileentities.general.TileEntityFishTrap");
Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator(
"gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest");
- Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator(
- "gtPlusPlus.core.tileentities.general.TileEggBox");
+ Meta_GT_Proxy
+ .setTileEntityClassAsBlacklistedInWorldAccelerator("gtPlusPlus.core.tileentities.general.TileEggBox");
}
}
diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java
index 32a39a7096..650d11f172 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.tileentities.base;
-import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -8,6 +7,8 @@ import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
+import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
+
public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFluidTank {
public final BTF_FluidTank mTank;
@@ -21,8 +22,7 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu
public boolean onPreTick(long aTick) {
if (this.isServerSide()) {
- if (mTank.isFluidChangingAllowed()
- && mTank.getFillableStack() != null
+ if (mTank.isFluidChangingAllowed() && mTank.getFillableStack() != null
&& mTank.getFillableStack().amount <= 0) {
mTank.setFillableStack((FluidStack) null);
}
@@ -40,7 +40,7 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu
}
private final FluidTankInfo[] getTankInfoEx(ForgeDirection aSide) {
- return mTank.getCapacity() <= 0 ? new FluidTankInfo[0] : new FluidTankInfo[] {mTank.getInfo()};
+ return mTank.getCapacity() <= 0 ? new FluidTankInfo[0] : new FluidTankInfo[] { mTank.getInfo() };
}
private final int fill_default(ForgeDirection aSide, FluidStack aFluid, boolean doFill) {
@@ -71,111 +71,97 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu
@Override
public int fill(ForgeDirection aSide, FluidStack aFluid, boolean doFill) {
- if (mTickTimer > 5
- && canAccessData()
+ if (mTickTimer > 5 && canAccessData()
&& (mRunningThroughTick || !mInputDisabled)
- && (aSide == ForgeDirection.UNKNOWN
- || (this.isLiquidInput((byte) aSide.ordinal())
- && getCoverBehaviorAtSide((byte) aSide.ordinal())
- .letsFluidIn(
- (byte) aSide.ordinal(),
- getCoverIDAtSide((byte) aSide.ordinal()),
- getCoverDataAtSide((byte) aSide.ordinal()),
- aFluid == null ? null : aFluid.getFluid(),
- this)))) return this.fillEx(aSide, aFluid, doFill);
+ && (aSide == ForgeDirection.UNKNOWN || (this.isLiquidInput((byte) aSide.ordinal())
+ && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn(
+ (byte) aSide.ordinal(),
+ getCoverIDAtSide((byte) aSide.ordinal()),
+ getCoverDataAtSide((byte) aSide.ordinal()),
+ aFluid == null ? null : aFluid.getFluid(),
+ this))))
+ return this.fillEx(aSide, aFluid, doFill);
return 0;
}
@Override
public FluidStack drain(ForgeDirection aSide, int maxDrain, boolean doDrain) {
- if (mTickTimer > 5
- && canAccessData()
+ if (mTickTimer > 5 && canAccessData()
&& (mRunningThroughTick || !mOutputDisabled)
- && (aSide == ForgeDirection.UNKNOWN
- || (this.isLiquidOutput((byte) aSide.ordinal())
- && getCoverBehaviorAtSide((byte) aSide.ordinal())
- .letsFluidOut(
- (byte) aSide.ordinal(),
- getCoverIDAtSide((byte) aSide.ordinal()),
- getCoverDataAtSide((byte) aSide.ordinal()),
- this.getFluid() == null
- ? null
- : this.getFluid().getFluid(),
- this)))) return this.drainEx(aSide, maxDrain, doDrain);
+ && (aSide == ForgeDirection.UNKNOWN || (this.isLiquidOutput((byte) aSide.ordinal())
+ && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut(
+ (byte) aSide.ordinal(),
+ getCoverIDAtSide((byte) aSide.ordinal()),
+ getCoverDataAtSide((byte) aSide.ordinal()),
+ this.getFluid() == null ? null : this.getFluid().getFluid(),
+ this))))
+ return this.drainEx(aSide, maxDrain, doDrain);
return null;
}
@Override
public FluidStack drain(ForgeDirection aSide, FluidStack aFluid, boolean doDrain) {
- if (mTickTimer > 5
- && canAccessData()
+ if (mTickTimer > 5 && canAccessData()
&& (mRunningThroughTick || !mOutputDisabled)
- && (aSide == ForgeDirection.UNKNOWN
- || (this.isLiquidOutput((byte) aSide.ordinal())
- && getCoverBehaviorAtSide((byte) aSide.ordinal())
- .letsFluidOut(
- (byte) aSide.ordinal(),
- getCoverIDAtSide((byte) aSide.ordinal()),
- getCoverDataAtSide((byte) aSide.ordinal()),
- aFluid == null ? null : aFluid.getFluid(),
- this)))) return this.drainEx(aSide, aFluid, doDrain);
+ && (aSide == ForgeDirection.UNKNOWN || (this.isLiquidOutput((byte) aSide.ordinal())
+ && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut(
+ (byte) aSide.ordinal(),
+ getCoverIDAtSide((byte) aSide.ordinal()),
+ getCoverDataAtSide((byte) aSide.ordinal()),
+ aFluid == null ? null : aFluid.getFluid(),
+ this))))
+ return this.drainEx(aSide, aFluid, doDrain);
return null;
}
@Override
public boolean canFill(ForgeDirection aSide, Fluid aFluid) {
- if (mTickTimer > 5
- && canAccessData()
+ if (mTickTimer > 5 && canAccessData()
&& (mRunningThroughTick || !mInputDisabled)
- && (aSide == ForgeDirection.UNKNOWN
- || (this.isLiquidInput((byte) aSide.ordinal())
- && getCoverBehaviorAtSide((byte) aSide.ordinal())
- .letsFluidIn(
- (byte) aSide.ordinal(),
- getCoverIDAtSide((byte) aSide.ordinal()),
- getCoverDataAtSide((byte) aSide.ordinal()),
- aFluid,
- this)))) return this.canFillEx(aSide, aFluid);
+ && (aSide == ForgeDirection.UNKNOWN || (this.isLiquidInput((byte) aSide.ordinal())
+ && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn(
+ (byte) aSide.ordinal(),
+ getCoverIDAtSide((byte) aSide.ordinal()),
+ getCoverDataAtSide((byte) aSide.ordinal()),
+ aFluid,
+ this))))
+ return this.canFillEx(aSide, aFluid);
return false;
}
@Override
public boolean canDrain(ForgeDirection aSide, Fluid aFluid) {
- if (mTickTimer > 5
- && canAccessData()
+ if (mTickTimer > 5 && canAccessData()
&& (mRunningThroughTick || !mOutputDisabled)
- && (aSide == ForgeDirection.UNKNOWN
- || (this.isLiquidOutput((byte) aSide.ordinal())
- && getCoverBehaviorAtSide((byte) aSide.ordinal())
- .letsFluidOut(
- (byte) aSide.ordinal(),
- getCoverIDAtSide((byte) aSide.ordinal()),
- getCoverDataAtSide((byte) aSide.ordinal()),
- aFluid,
- this)))) return this.canDrainEx(aSide, aFluid);
+ && (aSide == ForgeDirection.UNKNOWN || (this.isLiquidOutput((byte) aSide.ordinal())
+ && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut(
+ (byte) aSide.ordinal(),
+ getCoverIDAtSide((byte) aSide.ordinal()),
+ getCoverDataAtSide((byte) aSide.ordinal()),
+ aFluid,
+ this))))
+ return this.canDrainEx(aSide, aFluid);
return false;
}
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection aSide) {
- if (canAccessData()
- && (aSide == ForgeDirection.UNKNOWN
- || (this.isLiquidInput((byte) aSide.ordinal())
- && getCoverBehaviorAtSide((byte) aSide.ordinal())
- .letsFluidIn(
- (byte) aSide.ordinal(),
- getCoverIDAtSide((byte) aSide.ordinal()),
- getCoverDataAtSide((byte) aSide.ordinal()),
- null,
- this))
- || (this.isLiquidOutput((byte) aSide.ordinal())
- && getCoverBehaviorAtSide((byte) aSide.ordinal())
- .letsFluidOut(
- (byte) aSide.ordinal(),
- getCoverIDAtSide((byte) aSide.ordinal()),
- getCoverDataAtSide((byte) aSide.ordinal()),
- null,
- this)))) return this.getTankInfoEx(aSide);
+ if (canAccessData() && (aSide == ForgeDirection.UNKNOWN
+ || (this.isLiquidInput((byte) aSide.ordinal())
+ && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn(
+ (byte) aSide.ordinal(),
+ getCoverIDAtSide((byte) aSide.ordinal()),
+ getCoverDataAtSide((byte) aSide.ordinal()),
+ null,
+ this))
+ || (this.isLiquidOutput((byte) aSide.ordinal())
+ && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut(
+ (byte) aSide.ordinal(),
+ getCoverIDAtSide((byte) aSide.ordinal()),
+ getCoverDataAtSide((byte) aSide.ordinal()),
+ null,
+ this))))
+ return this.getTankInfoEx(aSide);
return new FluidTankInfo[] {};
}
diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
index 59516e4231..164c42cc3f 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
@@ -1,5 +1,20 @@
package gtPlusPlus.core.tileentities.base;
+import java.util.UUID;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.IFluidHandler;
+
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
@@ -17,19 +32,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.minecraft.BTF_Inventory;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import ic2.api.Direction;
-import java.util.UUID;
-import net.minecraft.block.Block;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.IFluidHandler;
public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregTechDeviceInformation, IDescribable {
@@ -155,8 +157,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
public void setOwnerInformation(String mName, String mUUID, boolean mOP) {
if (isServerSide()) {
- if (this.mOwnerName == null
- || this.mOwnerUUID == null
+ if (this.mOwnerName == null || this.mOwnerUUID == null
|| this.mOwnerName.equals("null")
|| this.mOwnerUUID.equals("null")) {
this.mOwnerName = mName;
@@ -255,26 +256,20 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
}
/**
- * returns all valid Inventory Slots, no matter which Side (Unless it's covered).
- * The Side Stuff is done in the following two Functions.
+ * returns all valid Inventory Slots, no matter which Side (Unless it's covered). The Side Stuff is done in the
+ * following two Functions.
*/
@Override
public int[] getAccessibleSlotsFromSide(int aSide) {
- if (canAccessData()
- && (getCoverBehaviorAtSide((byte) aSide)
- .letsItemsOut(
- (byte) aSide,
- getCoverIDAtSide((byte) aSide),
- getCoverDataAtSide((byte) aSide),
- -1,
- this)
- || getCoverBehaviorAtSide((byte) aSide)
- .letsItemsIn(
- (byte) aSide,
- getCoverIDAtSide((byte) aSide),
- getCoverDataAtSide((byte) aSide),
- -1,
- this))) return mInventory.getAccessibleSlotsFromSide(aSide);
+ if (canAccessData() && (getCoverBehaviorAtSide((byte) aSide)
+ .letsItemsOut((byte) aSide, getCoverIDAtSide((byte) aSide), getCoverDataAtSide((byte) aSide), -1, this)
+ || getCoverBehaviorAtSide((byte) aSide).letsItemsIn(
+ (byte) aSide,
+ getCoverIDAtSide((byte) aSide),
+ getCoverDataAtSide((byte) aSide),
+ -1,
+ this)))
+ return mInventory.getAccessibleSlotsFromSide(aSide);
return new int[0];
}
@@ -283,15 +278,13 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
*/
@Override
public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) {
- return canAccessData()
- && (mRunningThroughTick || !mInputDisabled)
- && getCoverBehaviorAtSide((byte) aSide)
- .letsItemsIn(
- (byte) aSide,
- getCoverIDAtSide((byte) aSide),
- getCoverDataAtSide((byte) aSide),
- aIndex,
- this)
+ return canAccessData() && (mRunningThroughTick || !mInputDisabled)
+ && getCoverBehaviorAtSide((byte) aSide).letsItemsIn(
+ (byte) aSide,
+ getCoverIDAtSide((byte) aSide),
+ getCoverDataAtSide((byte) aSide),
+ aIndex,
+ this)
&& mInventory.canInsertItem(aIndex, aStack, aSide);
}
@@ -300,15 +293,13 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
*/
@Override
public boolean canExtractItem(int aIndex, ItemStack aStack, int aSide) {
- return canAccessData()
- && (mRunningThroughTick || !mOutputDisabled)
- && getCoverBehaviorAtSide((byte) aSide)
- .letsItemsOut(
- (byte) aSide,
- getCoverIDAtSide((byte) aSide),
- getCoverDataAtSide((byte) aSide),
- aIndex,
- this)
+ return canAccessData() && (mRunningThroughTick || !mOutputDisabled)
+ && getCoverBehaviorAtSide((byte) aSide).letsItemsOut(
+ (byte) aSide,
+ getCoverIDAtSide((byte) aSide),
+ getCoverDataAtSide((byte) aSide),
+ aIndex,
+ this)
&& mInventory.canExtractItem(aIndex, aStack, aSide);
}
@@ -317,24 +308,18 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
return this.canAccessData() ? this.mInventory.isValidSlot(aIndex) : false;
}
- private final GT_CoverBehavior[] mCoverBehaviors = new GT_CoverBehavior[] {
- GregTech_API.sNoBehavior,
- GregTech_API.sNoBehavior,
- GregTech_API.sNoBehavior,
- GregTech_API.sNoBehavior,
- GregTech_API.sNoBehavior,
- GregTech_API.sNoBehavior
- };
+ private final GT_CoverBehavior[] mCoverBehaviors = new GT_CoverBehavior[] { GregTech_API.sNoBehavior,
+ GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior,
+ GregTech_API.sNoBehavior };
protected TileEntityBase mMetaTileEntity;
protected long mStoredEnergy = 0;
protected int mAverageEUInputIndex = 0, mAverageEUOutputIndex = 0;
protected boolean mReleaseEnergy = false;
protected int[] mAverageEUInput = new int[11], mAverageEUOutput = new int[11];
- private boolean[] mActiveEUInputs = new boolean[] {false, false, false, false, false, false},
- mActiveEUOutputs = new boolean[] {false, false, false, false, false, false};
- private byte[] mSidedRedstone = new byte[] {15, 15, 15, 15, 15, 15};
- private int[] mCoverSides = new int[] {0, 0, 0, 0, 0, 0},
- mCoverData = new int[] {0, 0, 0, 0, 0, 0},
+ private boolean[] mActiveEUInputs = new boolean[] { false, false, false, false, false, false },
+ mActiveEUOutputs = new boolean[] { false, false, false, false, false, false };
+ private byte[] mSidedRedstone = new byte[] { 15, 15, 15, 15, 15, 15 };
+ private int[] mCoverSides = new int[] { 0, 0, 0, 0, 0, 0 }, mCoverData = new int[] { 0, 0, 0, 0, 0, 0 },
mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING];
private boolean mHasEnoughEnergy = true;
protected boolean mRunningThroughTick = false;
@@ -353,20 +338,9 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
private boolean mSendClientData = false;
private boolean oRedstone = false;
private boolean mEnergyStateReady = false;
- private byte mColor = 0,
- oColor = 0,
- mStrongRedstone = 0,
- oRedstoneData = 63,
- oTextureData = 0,
- oUpdateData = 0,
- oTexturePage = 0,
- oLightValueClient = -1,
- oLightValue = -1,
- mLightValue = 0,
- mOtherUpgrades = 0,
- mFacing = 0,
- oFacing = 0,
- mWorkData = 0;
+ private byte mColor = 0, oColor = 0, mStrongRedstone = 0, oRedstoneData = 63, oTextureData = 0, oUpdateData = 0,
+ oTexturePage = 0, oLightValueClient = -1, oLightValue = -1, mLightValue = 0, mOtherUpgrades = 0,
+ mFacing = 0, oFacing = 0, mWorkData = 0;
private int mDisplayErrorCode = 0, oX = 0, oY = 0, oZ = 0, mTimeStatisticsIndex = 0, mLagWarningCount = 0;
private short mID = 0;
protected long mTickTimer = 0;
@@ -420,15 +394,13 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
}
public long getInputVoltage() {
- return this.canAccessData() && this.mMetaTileEntity.isElectric()
- ? this.mMetaTileEntity.maxEUInput()
+ return this.canAccessData() && this.mMetaTileEntity.isElectric() ? this.mMetaTileEntity.maxEUInput()
: 2147483647L;
}
@Override
public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy) {
- return !this.canAccessData()
- ? false
+ return !this.canAccessData() ? false
: (this.mHasEnoughEnergy = this.decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy));
}
@@ -446,19 +418,15 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
@Override
public boolean inputEnergyFrom(byte aSide) {
- return aSide == 6
- ? true
- : (!this.isServerSide()
- ? this.isEnergyInputSide(aSide)
+ return aSide == 6 ? true
+ : (!this.isServerSide() ? this.isEnergyInputSide(aSide)
: aSide >= 0 && aSide < 6 && this.mActiveEUInputs[aSide] && !this.mReleaseEnergy);
}
@Override
public boolean outputsEnergyTo(byte aSide) {
- return aSide == 6
- ? true
- : (!this.isServerSide()
- ? this.isEnergyOutputSide(aSide)
+ return aSide == 6 ? true
+ : (!this.isServerSide() ? this.isEnergyOutputSide(aSide)
: aSide >= 0 && aSide < 6 && this.mActiveEUOutputs[aSide] || this.mReleaseEnergy);
}
@@ -661,8 +629,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
}
public final TileEntity getTileEntityAtSideAndDistance(byte aSide, int aDistance) {
- return aDistance == 1
- ? this.getTileEntityAtSide(aSide)
+ return aDistance == 1 ? this.getTileEntityAtSide(aSide)
: this.getTileEntity(
this.getOffsetX(aSide, aDistance),
this.getOffsetY(aSide, aDistance),
@@ -795,11 +762,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
this.mBufferedTileEntities[aSide] = null;
return this.getTileEntityAtSide(aSide);
} else {
- return this.mBufferedTileEntities[aSide].xCoord == tX
- && this.mBufferedTileEntities[aSide].yCoord == tY
- && this.mBufferedTileEntities[aSide].zCoord == tZ
- ? this.mBufferedTileEntities[aSide]
- : null;
+ return this.mBufferedTileEntities[aSide].xCoord == tX && this.mBufferedTileEntities[aSide].yCoord == tY
+ && this.mBufferedTileEntities[aSide].zCoord == tZ ? this.mBufferedTileEntities[aSide] : null;
}
} else {
return null;
@@ -856,29 +820,26 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
@Override
public byte getInternalInputRedstoneSignal(byte aSide) {
- return (byte) (getCoverBehaviorAtSide(aSide)
- .getRedstoneInput(
- aSide,
- getInputRedstoneSignal(aSide),
- getCoverIDAtSide(aSide),
- getCoverDataAtSide(aSide),
- this)
- & 15);
+ return (byte) (getCoverBehaviorAtSide(aSide).getRedstoneInput(
+ aSide,
+ getInputRedstoneSignal(aSide),
+ getCoverIDAtSide(aSide),
+ getCoverDataAtSide(aSide),
+ this) & 15);
}
@Override
public byte getInputRedstoneSignal(byte aSide) {
- return (byte) (worldObj.getIndirectPowerLevelTo(
- getOffsetX(aSide, 1), getOffsetY(aSide, 1), getOffsetZ(aSide, 1), aSide)
- & 15);
+ return (byte) (worldObj
+ .getIndirectPowerLevelTo(getOffsetX(aSide, 1), getOffsetY(aSide, 1), getOffsetZ(aSide, 1), aSide) & 15);
}
@Override
public byte getOutputRedstoneSignal(byte aSide) {
return getCoverBehaviorAtSide(aSide)
- .manipulatesSidedRedstoneOutput(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this)
- ? mSidedRedstone[aSide]
- : getGeneralRS(aSide);
+ .manipulatesSidedRedstoneOutput(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this)
+ ? mSidedRedstone[aSide]
+ : getGeneralRS(aSide);
}
public boolean allowGeneralRedstoneOutput() {
@@ -1016,8 +977,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
@Override
public boolean dropCover(byte aSide, byte aDroppedSide, boolean aForced) {
if (getCoverBehaviorAtSide(aSide)
- .onCoverRemoval(aSide, getCoverIDAtSide(aSide), mCoverData[aSide], this, aForced)
- || aForced) {
+ .onCoverRemoval(aSide, getCoverIDAtSide(aSide), mCoverData[aSide], this, aForced) || aForced) {
ItemStack tStack = getCoverBehaviorAtSide(aSide)
.getDrop(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this);
if (tStack != null) {
@@ -1061,8 +1021,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
@Override
public byte getStrongOutputRedstoneSignal(byte aSide) {
- return aSide >= 0 && aSide < 6 && (mStrongRedstone & (1 << aSide)) != 0
- ? (byte) (mSidedRedstone[aSide] & 15)
+ return aSide >= 0 && aSide < 6 && (mStrongRedstone & (1 << aSide)) != 0 ? (byte) (mSidedRedstone[aSide] & 15)
: 0;
}
@@ -1074,24 +1033,23 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
@Override
public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage) {
- if (!canAccessData()
- || !mMetaTileEntity.isElectric()
+ if (!canAccessData() || !mMetaTileEntity.isElectric()
|| !inputEnergyFrom(aSide)
|| aAmperage <= 0
|| aVoltage <= 0
|| getStoredEU() >= getEUCapacity()
- || mMetaTileEntity.maxAmperesIn() <= mAcceptedAmperes) return 0;
+ || mMetaTileEntity.maxAmperesIn() <= mAcceptedAmperes)
+ return 0;
if (aVoltage > getInputVoltage()) {
doExplosion(aVoltage);
return 0;
}
if (increaseStoredEnergyUnits(
- aVoltage
- * (aAmperage = Math.min(
- aAmperage,
- Math.min(
- mMetaTileEntity.maxAmperesIn() - mAcceptedAmperes,
- 1 + ((getEUCapacity() - getStoredEU()) / aVoltage)))),
+ aVoltage * (aAmperage = Math.min(
+ aAmperage,
+ Math.min(
+ mMetaTileEntity.maxAmperesIn() - mAcceptedAmperes,
+ 1 + ((getEUCapacity() - getStoredEU()) / aVoltage)))),
true)) {
mAverageEUInput[mAverageEUInputIndex] += aVoltage * aAmperage;
mAcceptedAmperes += aAmperage;
@@ -1102,10 +1060,10 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
@Override
public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) {
- if (!canAccessData()
- || !mMetaTileEntity.isElectric()
+ if (!canAccessData() || !mMetaTileEntity.isElectric()
|| !outputsEnergyTo(aSide)
- || getStoredEU() - (aVoltage * aAmperage) < mMetaTileEntity.getMinimumStoredEU()) return false;
+ || getStoredEU() - (aVoltage * aAmperage) < mMetaTileEntity.getMinimumStoredEU())
+ return false;
if (decreaseStoredEU(aVoltage * aAmperage, false)) {
mAverageEUOutput[mAverageEUOutputIndex] += aVoltage * aAmperage;
return true;
@@ -1221,9 +1179,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
return true;
}
aStack = GT_OreDictUnificator.get(aStack);
- if (GT_Utility.areStacksEqual(tStack, aStack)
- && tStack.stackSize + aStack.stackSize
- <= Math.min(aStack.getMaxStackSize(), getInventoryStackLimit())) {
+ if (GT_Utility.areStacksEqual(tStack, aStack) && tStack.stackSize + aStack.stackSize
+ <= Math.min(aStack.getMaxStackSize(), getInventoryStackLimit())) {
tStack.stackSize += aStack.stackSize;
return true;
}
@@ -1279,16 +1236,12 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
public void doEnergyExplosion() {
if (this.getUniversalEnergyCapacity() > 0L
&& this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 5L) {
- this.doExplosion(this.oOutput
- * (long)
- (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity()
- ? 4
- : (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 2L
- ? 2
- : 1)));
+ this.doExplosion(
+ this.oOutput * (long) (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() ? 4
+ : (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 2L ? 2 : 1)));
GT_Mod arg9999 = GT_Mod.instance;
- GT_Mod.achievements.issueAchievement(
- this.getWorldObj().getPlayerEntityByName(this.mOwnerName), "electricproblems");
+ GT_Mod.achievements
+ .issueAchievement(this.getWorldObj().getPlayerEntityByName(this.mOwnerName), "electricproblems");
}
}
@@ -1298,8 +1251,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
try {
this.mReleaseEnergy = true;
Util.emitEnergyToNetwork(GT_Values.V[5], Math.max(1L, this.getStoredEU() / GT_Values.V[5]), this);
- } catch (Exception arg4) {
- }
+ } catch (Exception arg4) {}
}
this.mReleaseEnergy = false;
this.onExplosion();
@@ -1393,7 +1345,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
}
/**
- * Adds support for the newer function added by https://github.com/Blood-Asp/GT5-Unofficial/commit/73ee102b63efd92c0f164a7ed7a79ebcd2619617#diff-3051838621d8ae87aa5ccd1345e1f07d
+ * Adds support for the newer function added by
+ * https://github.com/Blood-Asp/GT5-Unofficial/commit/73ee102b63efd92c0f164a7ed7a79ebcd2619617#diff-3051838621d8ae87aa5ccd1345e1f07d
*/
public boolean inputEnergyFrom(byte arg0, boolean arg1) {
// TODO Auto-generated method stub
@@ -1401,7 +1354,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
}
/**
- * Adds support for the newer function added by https://github.com/Blood-Asp/GT5-Unofficial/commit/73ee102b63efd92c0f164a7ed7a79ebcd2619617#diff-3051838621d8ae87aa5ccd1345e1f07d
+ * Adds support for the newer function added by
+ * https://github.com/Blood-Asp/GT5-Unofficial/commit/73ee102b63efd92c0f164a7ed7a79ebcd2619617#diff-3051838621d8ae87aa5ccd1345e1f07d
*/
public boolean outputsEnergyTo(byte arg0, boolean arg1) {
// TODO Auto-generated method stub
diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java b/src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java
index 257dc740ea..1bbf7aa302 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java
@@ -1,1147 +1,289 @@
-/*package gtPlusPlus.core.tileentities.base;
-
-
-public abstract class TilePoweredGT extends TileEntityBase implements IGregtechPower {
-
- public static AutoMap<TilePoweredGT> mPoweredEntities = new AutoMap<TilePoweredGT>();
-
- //Base Tile Fields
- public boolean ignoreUnloadedChunks;
- public boolean isDead;
- //Meta Tile Fields
- private long mAcceptedAmperes;
-
- private boolean[] mActiveEUInputs;
- private boolean[] mActiveEUOutputs;
- protected int[] mAverageEUInput;
- protected int mAverageEUInputIndex;
- protected int[] mAverageEUOutput;
- protected int mAverageEUOutputIndex;
- private final TileEntity[] mBufferedTileEntities;
- private byte mFacing = 0;
- private boolean mHasEnoughEnergy;
- private boolean mNeedsUpdate;
- private boolean mNeedsBlockUpdate;
- private boolean mRunningThroughTick;
- private boolean mSendClientData;
- protected boolean mReleaseEnergy;
- private long mTickTimer;
- protected long mStoredEnergy;
- protected long mStoredSteam;
-
- public TilePoweredGT() {
- super();
- this.mBufferedTileEntities = new TileEntity[6];
- this.ignoreUnloadedChunks = true;
- this.isDead = false;
- mPoweredEntities.put(this);
- }
-
- @Override
- public boolean acceptsRotationalEnergy(byte p0) {
- return false;
- }
-
- private boolean canAccessData() {
- return this.isInvalid() ? false : true;
- }
-
- private final void clearNullMarkersFromTileEntityBuffer() {
- for (int i = 0; i < this.mBufferedTileEntities.length; ++i) {
- if (this.mBufferedTileEntities[i] == this) {
- this.mBufferedTileEntities[i] = null;
- }
- }
- }
-
- protected final void clearTileEntityBuffer() {
- for (int i = 0; i < this.mBufferedTileEntities.length; ++i) {
- this.mBufferedTileEntities[i] = null;
- }
- }
-
- private boolean crossedChunkBorder(final int aX, final int aZ) {
- return aX >> 4 != this.xCoord >> 4 || aZ >> 4 != this.zCoord >> 4;
- }
-
- @Override
- public boolean decreaseStoredEnergyUnits(final long aEnergy, final boolean aIgnoreTooLessEnergy) {
- return this.canAccessData() && (this.mHasEnoughEnergy = (this.decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy)
- || this.decreaseStoredSteam(aEnergy, false)
- || (aIgnoreTooLessEnergy && this.decreaseStoredSteam(aEnergy, true))));
- }
-
- public boolean decreaseStoredEU(final long aEnergy, final boolean aIgnoreTooLessEnergy) {
- if (!this.canAccessData()) {
- return false;
- }
- if (this.getEUVar() - aEnergy < 0L && !aIgnoreTooLessEnergy) {
- return false;
- }
- this.setStoredEU(this.getEUVar() - aEnergy);
- if (this.getEUVar() < 0L) {
- this.setStoredEU(0L);
- return false;
- }
- return true;
- }
-
- public boolean decreaseStoredSteam(final long aEnergy, final boolean aIgnoreTooLessEnergy) {
- if (!this.canAccessData()) {
- return false;
- }
- if (this.getSteamVar() - aEnergy < 0L && !aIgnoreTooLessEnergy) {
- return false;
- }
- this.setStoredSteam(this.getSteamVar() - aEnergy);
- if (this.getSteamVar() < 0L) {
- this.setStoredSteam(0L);
- return false;
- }
- return true;
- }
-
- public void doExplosion(final long aExplosionPower) {
- final float tStrength = (aExplosionPower < GT_Values.V[0])
- ? 1.0f
- : ((aExplosionPower < GT_Values.V[1])
- ? 2.0f
- : ((aExplosionPower < GT_Values.V[2])
- ? 3.0f
- : ((aExplosionPower < GT_Values.V[3])
- ? 4.0f
- : ((aExplosionPower < GT_Values.V[4])
- ? 5.0f
- : ((aExplosionPower < GT_Values.V[4] * 2L)
- ? 6.0f
- : ((aExplosionPower < GT_Values.V[5])
- ? 7.0f
- : ((aExplosionPower < GT_Values.V[6])
- ? 8.0f
- : ((aExplosionPower < GT_Values.V[7])
- ? 9.0f
- : 10.0f))))))));
- final int tX = this.getXCoord();
- final int tY = this.getYCoord();
- final int tZ = this.getZCoord();
- final World tWorld = this.getWorld();
- GT_Utility.sendSoundToPlayers(tWorld, (String) GregTech_API.sSoundList.get(209), 1.0f, -1.0f, tX, tY, tZ);
- tWorld.setBlock(tX, tY, tZ, Blocks.air);
- if (GregTech_API.sMachineExplosions) {
- tWorld.createExplosion((Entity) null, tX + 0.5, tY + 0.5, tZ + 0.5, tStrength, true);
- }
- }
-
- public boolean drainEnergyUnits(final byte aSide, final long aVoltage, final long aAmperage) {
- if (!this.canAccessData() || !this.isElectric() || !this.outputsEnergyTo(aSide)
- || this.getStoredEU() - aVoltage * aAmperage < this.getMinimumStoredEU()) {
- return false;
- }
- if (this.decreaseStoredEU(aVoltage * aAmperage, false)) {
- final int[] mAverageEUOutput = this.mAverageEUOutput;
- final int mAverageEUOutputIndex = this.mAverageEUOutputIndex;
- mAverageEUOutput[mAverageEUOutputIndex] += (int) (aVoltage * aAmperage);
- return true;
- }
- return false;
- }
-
- @Override
- public final boolean getAir(final int aX, final int aY, final int aZ) {
- return (this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ))
- || GT_Utility.isBlockAir(this.worldObj, aX, aY, aZ);
- }
-
- @Override
- public final boolean getAirAtSide(final byte aSide) {
- return this.getAirAtSideAndDistance(aSide, 1);
- }
-
- @Override
- public final boolean getAirAtSideAndDistance(final byte aSide, final int aDistance) {
- return this.getAir(this.getOffsetX(aSide, aDistance), this.getOffsetY(aSide, aDistance),
- this.getOffsetZ(aSide, aDistance));
- }
-
- @Override
- public final boolean getAirOffset(final int aX, final int aY, final int aZ) {
- return this.getAir(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ);
- }
-
- @Override
- public long getAverageElectricInput() {
- int rEU = 0;
- for (int i = 0; i < this.mAverageEUInput.length; ++i) {
- if (i != this.mAverageEUInputIndex) {
- rEU += this.mAverageEUInput[i];
- }
- }
- return rEU / (this.mAverageEUInput.length - 1);
- }
-
- public long getAverageElectricOutput() {
- int rEU = 0;
- for (int i = 0; i < this.mAverageEUOutput.length; ++i) {
- if (i != this.mAverageEUOutputIndex) {
- rEU += this.mAverageEUOutput[i];
- }
- }
- return rEU / (this.mAverageEUOutput.length - 1);
- }
-
- @Override
- public byte getBackFacing() {
- return GT_Utility.getOppositeSide((int) this.mFacing);
- }
-
- @Override
- public final Block getBlock(final int aX, final int aY, final int aZ) {
- if (this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)) {
- return Blocks.air;
- }
- return this.worldObj.getBlock(aX, aY, aZ);
- }
-
-
- @Override
- public final Block getBlockAtSide(final byte aSide) {
- return this.getBlockAtSideAndDistance(aSide, 1);
- }
-
- @Override
- public final Block getBlockAtSideAndDistance(final byte aSide, final int aDistance) {
- return this.getBlock(this.getOffsetX(aSide, aDistance), this.getOffsetY(aSide, aDistance),
- this.getOffsetZ(aSide, aDistance));
- }
-
- @Override
- public final Block getBlockOffset(final int aX, final int aY, final int aZ) {
- return this.getBlock(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ);
- }
-
- @Override
- public String[] getDescription() {
- // TODO Auto-generated method stub
- return null;
- }
-
-
-
-
-
-
-
-
- @Override
- public long getEUCapacity() {
- if (this.canAccessData()) {
- return this.maxEUStore();
- }
- return 0L;
- }
-
- public long getEUVar() {
- return mStoredEnergy;
- }
-
- @Override
- public byte getFrontFacing() {
- return this.mFacing;
- }
-
- @Override
- public final IGregTechTileEntity getIGregTechTileEntity(final int aX, final int aY, final int aZ) {
- final TileEntity tTileEntity = this.getTileEntity(aX, aY, aZ);
- if (tTileEntity instanceof IGregTechTileEntity) {
- return (IGregTechTileEntity) tTileEntity;
- }
- return null;
- }
-
- @Override
- public final IGregTechTileEntity getIGregTechTileEntityAtSide(final byte aSide) {
- final TileEntity tTileEntity = this.getTileEntityAtSide(aSide);
- if (tTileEntity instanceof IGregTechTileEntity) {
- return (IGregTechTileEntity) tTileEntity;
- }
- return null;
- }
-
- @Override
- public final IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(final byte aSide, final int aDistance) {
- final TileEntity tTileEntity = this.getTileEntityAtSideAndDistance(aSide, aDistance);
- if (tTileEntity instanceof IGregTechTileEntity) {
- return (IGregTechTileEntity) tTileEntity;
- }
- return null;
- }
-
- @Override
- public final IGregTechTileEntity getIGregTechTileEntityOffset(final int aX, final int aY, final int aZ) {
- final TileEntity tTileEntity = this.getTileEntityOffset(aX, aY, aZ);
- if (tTileEntity instanceof IGregTechTileEntity) {
- return (IGregTechTileEntity) tTileEntity;
- }
- return null;
- }
-
- @Override
- public final IInventory getIInventory(final int aX, final int aY, final int aZ) {
- final TileEntity tTileEntity = this.getTileEntity(aX, aY, aZ);
- if (tTileEntity instanceof IInventory) {
- return (IInventory) tTileEntity;
- }
- return null;
- }
-
- @Override
- public final IInventory getIInventoryAtSide(final byte aSide) {
- final TileEntity tTileEntity = this.getTileEntityAtSide(aSide);
- if (tTileEntity instanceof IInventory) {
- return (IInventory) tTileEntity;
- }
- return null;
- }
-
- @Override
- public final IInventory getIInventoryAtSideAndDistance(final byte aSide, final int aDistance) {
- final TileEntity tTileEntity = this.getTileEntityAtSideAndDistance(aSide, aDistance);
- if (tTileEntity instanceof IInventory) {
- return (IInventory) tTileEntity;
- }
- return null;
- }
-
- @Override
- public final IInventory getIInventoryOffset(final int aX, final int aY, final int aZ) {
- final TileEntity tTileEntity = this.getTileEntityOffset(aX, aY, aZ);
- if (tTileEntity instanceof IInventory) {
- return (IInventory) tTileEntity;
- }
- return null;
- }
-
- @Override
- public String[] getInfoData() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public long getInputAmperage() {
- if (this.canAccessData() && this.isElectric()) {
- return this.maxAmperesIn();
- }
- return 0L;
- }
-
- public long getInputTier() {
- return GT_Utility.getTier(this.getInputVoltage());
- }
-
- @Override
- public long getInputVoltage() {
- if (this.canAccessData() && this.isElectric()) {
- return this.maxEUInput();
- }
- return 2147483647L;
- }
-
- private long getMinimumStoredEU() {
- return 0;
- }
-
- @Override
- public final int getOffsetX(final byte aSide, final int aMultiplier) {
- return this.xCoord + ForgeDirection.getOrientation((int) aSide).offsetX * aMultiplier;
- }
-
- public final short getOffsetY(final byte aSide, final int aMultiplier) {
- return (short) (this.yCoord + ForgeDirection.getOrientation((int) aSide).offsetY * aMultiplier);
- }
-
- public final int getOffsetZ(final byte aSide, final int aMultiplier) {
- return this.zCoord + ForgeDirection.getOrientation((int) aSide).offsetZ * aMultiplier;
- }
-
- @Override
- public long getOutputAmperage() {
- if (this.canAccessData() && this.isElectric()) {
- return this.maxAmperesOut();
- }
- return 0L;
- }
-
- public long getOutputTier() {
- return GT_Utility.getTier(this.getOutputVoltage());
- }
-
- @Override
- public long getOutputVoltage() {
- if (this.canAccessData() && this.isElectric() && this.isEnetOutput()) {
- return this.maxEUOutput();
- }
- return 0L;
- }
-
- @Override
- public int getRandomNumber(int p0) {
- return CORE.RANDOM.nextInt();
- }
-
- @Override
- public long getSteamCapacity() {
- if (this.canAccessData()) {
- return this.maxSteamStore();
- }
- return 0L;
- }
-
- public long getSteamVar() {
- return mStoredSteam;
- }
-
- @Override
- public long getStoredEU() {
- if (this.canAccessData()) {
- return Math.min(this.getEUVar(), this.getEUCapacity());
- }
- return 0L;
- }
-
-
-
-
-
-
-
-
-
- @Override
- public long getStoredSteam() {
- if (this.canAccessData()) {
- return Math.min(this.getSteamVar(), this.getSteamCapacity());
- }
- return 0L;
- }
-
- @Override
- public final TileEntity getTileEntity(final int aX, final int aY, final int aZ) {
- if (this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)) {
- return null;
- }
- return this.worldObj.getTileEntity(aX, aY, aZ);
- }
-
- public final TileEntity getTileEntityAtSide(final byte aSide) {
- if (aSide < 0 || aSide >= 6 || this.mBufferedTileEntities[aSide] == this) {
- return null;
- }
- final int tX = this.getOffsetX(aSide, 1);
- final int tY = this.getOffsetY(aSide, 1);
- final int tZ = this.getOffsetZ(aSide, 1);
- if (this.crossedChunkBorder(tX, tZ)) {
- this.mBufferedTileEntities[aSide] = null;
- if (this.ignoreUnloadedChunks && !this.worldObj.blockExists(tX, tY, tZ)) {
- return null;
- }
- }
- if (this.mBufferedTileEntities[aSide] == null) {
- this.mBufferedTileEntities[aSide] = this.worldObj.getTileEntity(tX, tY, tZ);
- if (this.mBufferedTileEntities[aSide] == null) {
- this.mBufferedTileEntities[aSide] = this;
- return null;
- }
- return this.mBufferedTileEntities[aSide];
- } else {
- if (this.mBufferedTileEntities[aSide].isInvalid()) {
- this.mBufferedTileEntities[aSide] = null;
- return this.getTileEntityAtSide(aSide);
- }
- if (this.mBufferedTileEntities[aSide].xCoord == tX && this.mBufferedTileEntities[aSide].yCoord == tY
- && this.mBufferedTileEntities[aSide].zCoord == tZ) {
- return this.mBufferedTileEntities[aSide];
- }
- return null;
- }
- }
-
- @Override
- public final TileEntity getTileEntityAtSideAndDistance(final byte aSide, final int aDistance) {
- if (aDistance == 1) {
- return this.getTileEntityAtSide(aSide);
- }
- return this.getTileEntity(this.getOffsetX(aSide, aDistance), this.getOffsetY(aSide, aDistance),
- this.getOffsetZ(aSide, aDistance));
- }
-
-
-
-
-
-
-
-
-
-
- @Override
- public final TileEntity getTileEntityOffset(final int aX, final int aY, final int aZ) {
- return this.getTileEntity(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ);
- }
-
- @Override
- public long getUniversalEnergyCapacity() {
- return 0;
- }
-
- @Override
- public long getUniversalEnergyStored() {
- return 0;
- }
-
- @Override
- public World getWorld() {
- return this.getWorldObj();
- }
-
-
-
-
-
-
- @Override
- public int getXCoord() {
- return this.xCoord;
- }
-
-
-
-
-
- @Override
- public short getYCoord() {
- return (short) this.yCoord;
- }
-
- @Override
- public int getZCoord() {
- return this.zCoord;
- }
-
- public boolean hasEnoughEnergy() {
- return (this.getStoredEU() > 0 ? (mHasEnoughEnergy = true) : (mHasEnoughEnergy = false));
- }
-
-
-
-
- @Override
- public boolean increaseStoredEnergyUnits(final long aEnergy, final boolean aIgnoreTooMuchEnergy) {
- if (!this.canAccessData()) {
- return false;
- }
- if (this.getStoredEU() < this.getEUCapacity() || aIgnoreTooMuchEnergy) {
- this.setStoredEU(this.getEUVar() + aEnergy);
- return true;
- }
- return false;
- }
-
- @Override
- public boolean increaseStoredSteam(final long aEnergy, final boolean aIgnoreTooMuchEnergy) {
- if (!this.canAccessData()) {
- return false;
- }
- if (this.getSteamVar() < this.getSteamCapacity() || aIgnoreTooMuchEnergy) {
- this.setStoredSteam(this.getSteamVar() + aEnergy);
- return true;
- }
- return false;
- }
-
- public long injectEnergyUnits(final byte aSide, final long aVoltage, long aAmperage) {
- if (!this.canAccessData() || !this.isElectric() || !this.inputEnergyFrom(aSide)
- || aAmperage <= 0L || aVoltage <= 0L || this.getStoredEU() >= this.getEUCapacity()
- || this.maxAmperesIn() <= this.mAcceptedAmperes) {
- return 0L;
- }
- if (aVoltage > this.getInputVoltage()) {
- this.doExplosion(aVoltage);
- return 0L;
- }
- if (this.increaseStoredEnergyUnits(aVoltage
- * (aAmperage = Math.min(aAmperage, Math.min(this.maxAmperesIn() - this.mAcceptedAmperes,
- 1L + (this.getEUCapacity() - this.getStoredEU()) / aVoltage))),
- true)) {
- final int[] mAverageEUInput = this.mAverageEUInput;
- final int mAverageEUInputIndex = this.mAverageEUInputIndex;
- mAverageEUInput[mAverageEUInputIndex] += (int) (aVoltage * aAmperage);
- this.mAcceptedAmperes += aAmperage;
- return aAmperage;
- }
- return 0L;
- }
-
- @Override
- public boolean injectRotationalEnergy(byte p0, long p1, long p2) {
- return false;
- }
-
- @Override
- public boolean inputEnergyFrom(final byte aSide) {
- if (aSide == 6) {
- return true;
- }
- if (this.isServerSide()) {
- return aSide >= 0 && aSide < 6 && this.mActiveEUInputs[aSide] && !this.mReleaseEnergy;
- }
- return this.isEnergyInputSide(aSide);
- }
-
-
- public final boolean isClientSide() {
- return this.worldObj.isRemote;
- }
-
- @Override
- public boolean isDead() {
- return this.isDead;
- }
-
- private boolean isElectric() {
- return true;
- }
-
- private boolean isEnergyInputSide(final byte aSide) {
- if (aSide >= 0 && aSide < 6) {
- if (this.isInvalid() || this.mReleaseEnergy) {
- return false;
- }
- if (this.canAccessData() && this.isElectric() && this.isEnetInput()) {
- return this.isInputFacing(aSide);
- }
- }
- return false;
- }
-
- private boolean isEnergyOutputSide(final byte aSide) {
- if (aSide >= 0 && aSide < 6) {
- if (this.isInvalid() || this.mReleaseEnergy) {
- return this.mReleaseEnergy;
- }
- if (this.canAccessData() && this.isElectric() && this.isEnetOutput()) {
- return this.isOutputFacing(aSide);
- }
- }
- return false;
- }
-
- public boolean isEnetInput() {
- return false;
- }
-
- public boolean isEnetOutput() {
- return false;
- }
-
- @Override
- public boolean isGivingInformation() {
- return this.canAccessData() && this.isGivingInformation();
- }
-
- public boolean isInputFacing(final byte aSide) {
- return false;
- }
-
-
-
-
- @Override
- public boolean isInvalidTileEntity() {
- return isDead() ? true : false;
- }
-
- public boolean isOutputFacing(final byte aSide) {
- return false;
- }
-
- public final boolean isServerSide() {
- return !this.worldObj.isRemote;
- }
-
- public boolean isUniversalEnergyStored(final long aEnergyAmount) {
- return this.getUniversalEnergyStored() >= aEnergyAmount || (this.mHasEnoughEnergy = false);
- }
-
- @Override
- public boolean isValidFacing(final byte aSide) {
- return this.canAccessData();
- }
-
- public long maxAmperesIn() {
- return 1L;
- }
-
- public long maxAmperesOut() {
- return 1L;
- }
-
- public long maxEUInput() {
- return 0L;
- }
-
- public long maxEUOutput() {
- return 0L;
- }
-
- public long maxEUStore() {
- return 0L;
- }
-
- public long maxSteamStore() {
- return 256000L;
- }
-
- public final void onAdjacentBlockChange(final int aX, final int aY, final int aZ) {
- this.clearNullMarkersFromTileEntityBuffer();
- }
-
- @Override
- public boolean outputsEnergyTo(final byte aSide) {
- if (aSide == 6) {
- return true;
- }
- if (this.isServerSide()) {
- if (aSide < 0 || aSide >= 6 || !this.mActiveEUOutputs[aSide]) {
- if (!this.mReleaseEnergy) {
- return false;
- }
- }
- return true;
- }
- return this.isEnergyOutputSide(aSide);
- }
-
- public final void sendBlockEvent(final byte aID, final byte aValue) {
- GT_Values.NW.sendPacketToAllPlayersInRange(this.worldObj,
- (GT_Packet) new GT_Packet_Block_Event(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue),
- this.xCoord, this.zCoord);
- }
-
- public void setEUVar(final long aEnergy) {
- mStoredEnergy = aEnergy;
- }
-
- @Override
- public void setFrontFacing(byte aFacing) {
- if (this.isValidFacing(aFacing)) {
- this.mFacing = aFacing;
- //this.onFacingChange();
- //this.onMachineBlockUpdate();
- }
- }
-
- public void setSteamVar(final long aSteam) {
- mStoredSteam = aSteam;
- }
-
- public boolean setStoredEU(long aEnergy) {
- if (!this.canAccessData()) {
- return false;
- }
- if (aEnergy < 0L) {
- aEnergy = 0L;
- }
- this.setEUVar(aEnergy);
- return true;
- }
-
- public boolean setStoredSteam(long aEnergy) {
- if (!this.canAccessData()) {
- return false;
- }
- if (aEnergy < 0L) {
- aEnergy = 0L;
- }
- this.setSteamVar(aEnergy);
- return true;
- }
-
- @Override
- public void writeToNBT(NBTTagCompound nbt) {
- // TODO Auto-generated method stub
- super.writeToNBT(nbt);
- }
-
- @Override
- public void readFromNBT(NBTTagCompound nbt) {
- // TODO Auto-generated method stub
- super.readFromNBT(nbt);
- }
-
-
-
-
- @Override
- public boolean onPreTick(long aTick) {
- return onPreTick(this, this.mTickTimer);
- }
-
- @Override
- public boolean onTick(long aTick) {
- return onTick(this, this.mTickTimer);
- }
-
- @Override
- public boolean onPostTick(long aTick) {
- return onPostTick(this, this.mTickTimer);
- }
-
- @Override
- public boolean onPreTick(TilePoweredGT tilePoweredGT, long mTickTimer2) {
- return super.onPreTick(mTickTimer2);
- }
-
- @Override
- public boolean onTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2) {
- return super.onTick(mTickTimer2);
- }
-
- @Override
- public boolean onPostTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2) {
- return super.onPostTick(mTickTimer2);
- }
-
- @Override
- public void markDirty() {
- super.markDirty();
- }
-
- @Override
- public boolean receiveClientEvent(int p_145842_1_, int p_145842_2_) {
- // TODO Auto-generated method stub
- return super.receiveClientEvent(p_145842_1_, p_145842_2_);
- }
-
- @Override
- public void onChunkUnload() {
- this.clearNullMarkersFromTileEntityBuffer();
- super.onChunkUnload();
- this.isDead = true;
- }
-
-
- public void updateEntity() {
- super.updateEntity();
- this.isDead = false;
-
- this.mRunningThroughTick = true;
- long tTime = System.currentTimeMillis();
- int tCode = 0;
- final boolean aSideServer = this.isServerSide();
- final boolean aSideClient = this.isClientSide();
- try {
- for (tCode = 0; this.hasValidMetaTileEntity() && tCode >= 0; tCode = -1) {
- Label_1743 : {
- switch (tCode) {
- case 0 : {
- ++tCode;
- if (this.mTickTimer++ != 0L) {
- break Label_1743;
- }
- this.oX = this.xCoord;
- this.oY = this.yCoord;
- this.oZ = this.zCoord;
-
- this.worldObj.markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord,
- (TileEntity) this);
- this.onFirstTick(this);
- if (!this.hasValidMetaTileEntity()) {
- this.mRunningThroughTick = false;
- return;
- }
- break Label_1743;
- }
- case 1 : {
- ++tCode;
- if (!aSideClient) {
- break Label_1743;
- }
- if (this.mNeedsUpdate) {
- this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
- this.mNeedsUpdate = false;
- }
- break Label_1743;
- }
- case 2 :
- case 3 :
- case 4 :
- case 5 :
- case 6 :
- case 7 : {
- if (aSideServer && this.mTickTimer > 10L) {
- for (byte i = (byte) (tCode - 2); i < 6; ++i) {
-
- }
- }
- }
- case 8 : {
- tCode = 9;
- if (aSideServer) {
- if (++this.mAverageEUInputIndex >= this.mAverageEUInput.length) {
- this.mAverageEUInputIndex = 0;
- }
- if (++this.mAverageEUOutputIndex >= this.mAverageEUOutput.length) {
- this.mAverageEUOutputIndex = 0;
- }
- this.mAverageEUInput[this.mAverageEUInputIndex] = 0;
- this.mAverageEUOutput[this.mAverageEUOutputIndex] = 0;
- }
- }
- case 9 : {
- ++tCode;
- this.onPreTick(this, this.mTickTimer);
- if (!this.hasValidMetaTileEntity()) {
- this.mRunningThroughTick = false;
- return;
- }
- }
- case 10 : {
- ++tCode;
- if (!aSideServer) {
- break Label_1743;
- }
-
- if (this.xCoord != this.oX || this.yCoord != this.oY || this.zCoord != this.oZ) {
- this.oX = this.xCoord;
- this.oY = this.yCoord;
- this.oZ = this.zCoord;
- this.issueClientUpdate();
- this.clearTileEntityBuffer();
- }
- if (this.mFacing != this.oFacing) {
- this.oFacing = this.mFacing;
- this.issueBlockUpdate();
- }
- if (this.mTickTimer > 20L && this.isElectric()) {
- this.mAcceptedAmperes = 0L;
- if (this.getOutputVoltage() != this.oOutput) {
- this.oOutput = this.getOutputVoltage();
- }
- if (this.isEnetOutput() || this.isEnetInput()) {
- for (byte i = 0; i < 6; ++i) {
- boolean temp = this.isEnergyInputSide(i);
- if (temp != this.mActiveEUInputs[i]) {
- this.mActiveEUInputs[i] = temp;
- }
- temp = this.isEnergyOutputSide(i);
- if (temp != this.mActiveEUOutputs[i]) {
- this.mActiveEUOutputs[i] = temp;
- }
- }
- }
- if (this.isEnetOutput() && this.oOutput > 0L) {
- final long tOutputVoltage = Math.max(this.oOutput,
- this.oOutput + (1 << GT_Utility.getTier(this.oOutput)));
- final long tUsableAmperage = Math.min(this.getOutputAmperage(),
- (this.getStoredEU() - this.getMinimumStoredEU())
- / tOutputVoltage);
- if (tUsableAmperage > 0L) {
- final long tEU = tOutputVoltage * IEnergyConnected.Util.emitEnergyToNetwork(
- this.oOutput, tUsableAmperage, (IEnergyConnected) this);
- final int[] mAverageEUOutput = this.mAverageEUOutput;
- final int mAverageEUOutputIndex = this.mAverageEUOutputIndex;
- mAverageEUOutput[mAverageEUOutputIndex] += (int) tEU;
- this.decreaseStoredEU(tEU, true);
- }
- }
- if (this.getEUCapacity() > 0L) {
- if (GregTech_API.sMachineFireExplosions && this.getRandomNumber(1000) == 0) {
- final Block tBlock = this.getBlockAtSide((byte) this.getRandomNumber(6));
- if (tBlock instanceof BlockFire) {
- this.doEnergyExplosion();
- }
- }
- if (!this.hasValidMetaTileEntity()) {
- this.mRunningThroughTick = false;
- return;
- }
- }
- }
- if (!this.hasValidMetaTileEntity()) {
- this.mRunningThroughTick = false;
- return;
- }
- break Label_1743;
- }
- case 13 : {
- ++tCode;
- this.updateStatus();
- if (!this.hasValidMetaTileEntity()) {
- this.mRunningThroughTick = false;
- return;
- }
- }
- case 14 : {
- ++tCode;
- this.onPostTick((IGregTechTileEntity) this, this.mTickTimer);
- if (!this.hasValidMetaTileEntity()) {
- this.mRunningThroughTick = false;
- return;
- }
- }
- case 15 : {
- ++tCode;
- if (!aSideServer) {
- break;
- }
- if (this.mTickTimer % 10L == 0L && this.mSendClientData) {
- final IGT_NetworkHandler nw = GT_Values.NW;
- final World worldObj = this.worldObj;
- final int xCoord = this.xCoord;
- final short n = (short) this.yCoord;
- final int zCoord = this.zCoord;
- final short mid = this.mID;
- final int n2 = this.mCoverSides[0];
- final int n3 = this.mCoverSides[1];
- final int n4 = this.mCoverSides[2];
- final int n5 = this.mCoverSides[3];
- final int n6 = this.mCoverSides[4];
- final int n7 = this.mCoverSides[5];
- final byte oTextureData = (byte) ((this.mFacing & 0x7) | (this.mActive ? 8 : 0)
- | (this.mRedstone ? 16 : 0) | (this.mLockUpgrade ? 32 : 0));
- this.oTextureData = oTextureData;
- final byte oTexturePage = (byte) ((this.hasValidMetaTileEntity()
- && this.mMetaTileEntity instanceof GT_MetaTileEntity_Hatch)
- ? ((GT_MetaTileEntity_Hatch) this.mMetaTileEntity).getTexturePage()
- : 0);
- this.oTexturePage = oTexturePage;
- final byte oUpdateData = (byte) (this.hasValidMetaTileEntity()
- ? this.mMetaTileEntity.getUpdateData()
- : 0);
- this.oUpdateData = oUpdateData;
- final byte oRedstoneData = (byte) (((this.mSidedRedstone[0] > 0) ? 1 : 0)
- | ((this.mSidedRedstone[1] > 0) ? 2 : 0)
- | ((this.mSidedRedstone[2] > 0) ? 4 : 0)
- | ((this.mSidedRedstone[3] > 0) ? 8 : 0)
- | ((this.mSidedRedstone[4] > 0) ? 16 : 0)
- | ((this.mSidedRedstone[5] > 0) ? 32 : 0));
- this.oRedstoneData = oRedstoneData;
- final byte mColor = this.mColor;
- this.oColor = mColor;
- nw.sendPacketToAllPlayersInRange(worldObj,
- (GT_Packet) new GT_Packet_TileEntity(xCoord, n, zCoord, mid, n2, n3, n4, n5, n6,
- n7, oTextureData, oTexturePage, oUpdateData, oRedstoneData, mColor),
- this.xCoord, this.zCoord);
- this.mSendClientData = false;
- }
- if (this.mTickTimer > 10L) {
- byte tData = (byte) ((this.mFacing & 0x7) | (this.mActive ? 8 : 0)
- | (this.mRedstone ? 16 : 0) | (this.mLockUpgrade ? 32 : 0));
- if (tData != this.oTextureData) {
- this.sendBlockEvent((byte) 0, this.oTextureData = tData);
- }
- tData = this.mMetaTileEntity.getUpdateData();
- if (tData != this.oUpdateData) {
- this.sendBlockEvent((byte) 1, this.oUpdateData = tData);
- }
- if (this.mMetaTileEntity instanceof GT_MetaTileEntity_Hatch) {
- tData = ((GT_MetaTileEntity_Hatch) this.mMetaTileEntity).getTexturePage();
- if (tData != this.oTexturePage) {
- final byte b = 1;
- final byte oTexturePage2 = tData;
- this.oTexturePage = oTexturePage2;
- this.sendBlockEvent(b, (byte) (oTexturePage2 | 0x80));
- }
- }
- if (this.mColor != this.oColor) {
- this.sendBlockEvent((byte) 2, this.oColor = this.mColor);
- }
- tData = (byte) (((this.mSidedRedstone[0] > 0) ? 1 : 0)
- | ((this.mSidedRedstone[1] > 0) ? 2 : 0)
- | ((this.mSidedRedstone[2] > 0) ? 4 : 0)
- | ((this.mSidedRedstone[3] > 0) ? 8 : 0)
- | ((this.mSidedRedstone[4] > 0) ? 16 : 0)
- | ((this.mSidedRedstone[5] > 0) ? 32 : 0));
- if (tData != this.oRedstoneData) {
- this.sendBlockEvent((byte) 3, this.oRedstoneData = tData);
- }
- if (this.mLightValue != this.oLightValue) {
- this.worldObj.setLightValue(EnumSkyBlock.Block, this.xCoord, this.yCoord,
- this.zCoord, (int) this.mLightValue);
- this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord,
- this.zCoord);
- this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord + 1, this.yCoord,
- this.zCoord);
- this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord - 1, this.yCoord,
- this.zCoord);
- this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord + 1,
- this.zCoord);
- this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord - 1,
- this.zCoord);
- this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord,
- this.zCoord + 1);
- this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord,
- this.zCoord - 1);
- this.issueTextureUpdate();
- this.sendBlockEvent((byte) 7, this.oLightValue = this.mLightValue);
- }
- }
- if (this.mNeedsBlockUpdate) {
- this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord,
- this.getBlockOffset(0, 0, 0));
- this.mNeedsBlockUpdate = false;
- break;
- }
- break;
- }
- }
- }
- }
- } catch (Throwable e) {
- e.printStackTrace(GT_Log.err);
- }
- if (aSideServer && this.hasValidMetaTileEntity()) {
- tTime = System.currentTimeMillis() - tTime;
- if (this.mTimeStatistics.length > 0) {
- this.mTimeStatistics[this.mTimeStatisticsIndex = (this.mTimeStatisticsIndex + 1)
- % this.mTimeStatistics.length] = (int) tTime;
- }
- if (tTime > 0L && tTime > GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING && this.mTickTimer > 1000L
- && this.getMetaTileEntity().doTickProfilingMessageDuringThisTick()
- && this.mLagWarningCount++ < 10) {
- System.out.println("WARNING: Possible Lag Source at [" + this.xCoord + ", " + this.yCoord + ", "
- + this.zCoord + "] in Dimension " + this.worldObj.provider.dimensionId + " with " + tTime
- + "ms caused by an instance of " + this.getMetaTileEntity().getClass());
- }
- }
- final boolean mWorkUpdate = false;
- this.mRunningThroughTick = mWorkUpdate;
- this.mInventoryChanged = mWorkUpdate;
- this.mWorkUpdate = mWorkUpdate;
- }
-
- private void onFirstTick(TilePoweredGT tilePoweredGT) {
- // TODO Auto-generated method stub
-
- }
-
- private boolean hasValidMetaTileEntity() {
- return Utils.invertBoolean(isDead());
- }
-
- public void issueBlockUpdate() {
- this.mNeedsBlockUpdate = true;
- }
-
- public void issueClientUpdate() {
- this.mSendClientData = true;
- }
-
- public Packet getDescriptionPacket() {
- this.issueClientUpdate();
- return null;
- }
-
-}
-*/
+/*
+ * package gtPlusPlus.core.tileentities.base; public abstract class TilePoweredGT extends TileEntityBase implements
+ * IGregtechPower { public static AutoMap<TilePoweredGT> mPoweredEntities = new AutoMap<TilePoweredGT>(); //Base Tile
+ * Fields public boolean ignoreUnloadedChunks; public boolean isDead; //Meta Tile Fields private long mAcceptedAmperes;
+ * private boolean[] mActiveEUInputs; private boolean[] mActiveEUOutputs; protected int[] mAverageEUInput; protected int
+ * mAverageEUInputIndex; protected int[] mAverageEUOutput; protected int mAverageEUOutputIndex; private final
+ * TileEntity[] mBufferedTileEntities; private byte mFacing = 0; private boolean mHasEnoughEnergy; private boolean
+ * mNeedsUpdate; private boolean mNeedsBlockUpdate; private boolean mRunningThroughTick; private boolean
+ * mSendClientData; protected boolean mReleaseEnergy; private long mTickTimer; protected long mStoredEnergy; protected
+ * long mStoredSteam; public TilePoweredGT() { super(); this.mBufferedTileEntities = new TileEntity[6];
+ * this.ignoreUnloadedChunks = true; this.isDead = false; mPoweredEntities.put(this); }
+ * @Override public boolean acceptsRotationalEnergy(byte p0) { return false; } private boolean canAccessData() { return
+ * this.isInvalid() ? false : true; } private final void clearNullMarkersFromTileEntityBuffer() { for (int i = 0; i <
+ * this.mBufferedTileEntities.length; ++i) { if (this.mBufferedTileEntities[i] == this) { this.mBufferedTileEntities[i]
+ * = null; } } } protected final void clearTileEntityBuffer() { for (int i = 0; i < this.mBufferedTileEntities.length;
+ * ++i) { this.mBufferedTileEntities[i] = null; } } private boolean crossedChunkBorder(final int aX, final int aZ) {
+ * return aX >> 4 != this.xCoord >> 4 || aZ >> 4 != this.zCoord >> 4; }
+ * @Override public boolean decreaseStoredEnergyUnits(final long aEnergy, final boolean aIgnoreTooLessEnergy) { return
+ * this.canAccessData() && (this.mHasEnoughEnergy = (this.decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy) ||
+ * this.decreaseStoredSteam(aEnergy, false) || (aIgnoreTooLessEnergy && this.decreaseStoredSteam(aEnergy, true)))); }
+ * public boolean decreaseStoredEU(final long aEnergy, final boolean aIgnoreTooLessEnergy) { if (!this.canAccessData())
+ * { return false; } if (this.getEUVar() - aEnergy < 0L && !aIgnoreTooLessEnergy) { return false; }
+ * this.setStoredEU(this.getEUVar() - aEnergy); if (this.getEUVar() < 0L) { this.setStoredEU(0L); return false; } return
+ * true; } public boolean decreaseStoredSteam(final long aEnergy, final boolean aIgnoreTooLessEnergy) { if
+ * (!this.canAccessData()) { return false; } if (this.getSteamVar() - aEnergy < 0L && !aIgnoreTooLessEnergy) { return
+ * false; } this.setStoredSteam(this.getSteamVar() - aEnergy); if (this.getSteamVar() < 0L) { this.setStoredSteam(0L);
+ * return false; } return true; } public void doExplosion(final long aExplosionPower) { final float tStrength =
+ * (aExplosionPower < GT_Values.V[0]) ? 1.0f : ((aExplosionPower < GT_Values.V[1]) ? 2.0f : ((aExplosionPower <
+ * GT_Values.V[2]) ? 3.0f : ((aExplosionPower < GT_Values.V[3]) ? 4.0f : ((aExplosionPower < GT_Values.V[4]) ? 5.0f :
+ * ((aExplosionPower < GT_Values.V[4] * 2L) ? 6.0f : ((aExplosionPower < GT_Values.V[5]) ? 7.0f : ((aExplosionPower <
+ * GT_Values.V[6]) ? 8.0f : ((aExplosionPower < GT_Values.V[7]) ? 9.0f : 10.0f)))))))); final int tX = this.getXCoord();
+ * final int tY = this.getYCoord(); final int tZ = this.getZCoord(); final World tWorld = this.getWorld();
+ * GT_Utility.sendSoundToPlayers(tWorld, (String) GregTech_API.sSoundList.get(209), 1.0f, -1.0f, tX, tY, tZ);
+ * tWorld.setBlock(tX, tY, tZ, Blocks.air); if (GregTech_API.sMachineExplosions) { tWorld.createExplosion((Entity) null,
+ * tX + 0.5, tY + 0.5, tZ + 0.5, tStrength, true); } } public boolean drainEnergyUnits(final byte aSide, final long
+ * aVoltage, final long aAmperage) { if (!this.canAccessData() || !this.isElectric() || !this.outputsEnergyTo(aSide) ||
+ * this.getStoredEU() - aVoltage * aAmperage < this.getMinimumStoredEU()) { return false; } if
+ * (this.decreaseStoredEU(aVoltage * aAmperage, false)) { final int[] mAverageEUOutput = this.mAverageEUOutput; final
+ * int mAverageEUOutputIndex = this.mAverageEUOutputIndex; mAverageEUOutput[mAverageEUOutputIndex] += (int) (aVoltage *
+ * aAmperage); return true; } return false; }
+ * @Override public final boolean getAir(final int aX, final int aY, final int aZ) { return (this.ignoreUnloadedChunks
+ * && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)) || GT_Utility.isBlockAir(this.worldObj,
+ * aX, aY, aZ); }
+ * @Override public final boolean getAirAtSide(final byte aSide) { return this.getAirAtSideAndDistance(aSide, 1); }
+ * @Override public final boolean getAirAtSideAndDistance(final byte aSide, final int aDistance) { return
+ * this.getAir(this.getOffsetX(aSide, aDistance), this.getOffsetY(aSide, aDistance), this.getOffsetZ(aSide, aDistance));
+ * }
+ * @Override public final boolean getAirOffset(final int aX, final int aY, final int aZ) { return
+ * this.getAir(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); }
+ * @Override public long getAverageElectricInput() { int rEU = 0; for (int i = 0; i < this.mAverageEUInput.length; ++i)
+ * { if (i != this.mAverageEUInputIndex) { rEU += this.mAverageEUInput[i]; } } return rEU / (this.mAverageEUInput.length
+ * - 1); } public long getAverageElectricOutput() { int rEU = 0; for (int i = 0; i < this.mAverageEUOutput.length; ++i)
+ * { if (i != this.mAverageEUOutputIndex) { rEU += this.mAverageEUOutput[i]; } } return rEU /
+ * (this.mAverageEUOutput.length - 1); }
+ * @Override public byte getBackFacing() { return GT_Utility.getOppositeSide((int) this.mFacing); }
+ * @Override public final Block getBlock(final int aX, final int aY, final int aZ) { if (this.ignoreUnloadedChunks &&
+ * this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)) { return Blocks.air; } return
+ * this.worldObj.getBlock(aX, aY, aZ); }
+ * @Override public final Block getBlockAtSide(final byte aSide) { return this.getBlockAtSideAndDistance(aSide, 1); }
+ * @Override public final Block getBlockAtSideAndDistance(final byte aSide, final int aDistance) { return
+ * this.getBlock(this.getOffsetX(aSide, aDistance), this.getOffsetY(aSide, aDistance), this.getOffsetZ(aSide,
+ * aDistance)); }
+ * @Override public final Block getBlockOffset(final int aX, final int aY, final int aZ) { return
+ * this.getBlock(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); }
+ * @Override public String[] getDescription() { // TODO Auto-generated method stub return null; }
+ * @Override public long getEUCapacity() { if (this.canAccessData()) { return this.maxEUStore(); } return 0L; } public
+ * long getEUVar() { return mStoredEnergy; }
+ * @Override public byte getFrontFacing() { return this.mFacing; }
+ * @Override public final IGregTechTileEntity getIGregTechTileEntity(final int aX, final int aY, final int aZ) { final
+ * TileEntity tTileEntity = this.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity) { return
+ * (IGregTechTileEntity) tTileEntity; } return null; }
+ * @Override public final IGregTechTileEntity getIGregTechTileEntityAtSide(final byte aSide) { final TileEntity
+ * tTileEntity = this.getTileEntityAtSide(aSide); if (tTileEntity instanceof IGregTechTileEntity) { return
+ * (IGregTechTileEntity) tTileEntity; } return null; }
+ * @Override public final IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(final byte aSide, final int
+ * aDistance) { final TileEntity tTileEntity = this.getTileEntityAtSideAndDistance(aSide, aDistance); if (tTileEntity
+ * instanceof IGregTechTileEntity) { return (IGregTechTileEntity) tTileEntity; } return null; }
+ * @Override public final IGregTechTileEntity getIGregTechTileEntityOffset(final int aX, final int aY, final int aZ) {
+ * final TileEntity tTileEntity = this.getTileEntityOffset(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity)
+ * { return (IGregTechTileEntity) tTileEntity; } return null; }
+ * @Override public final IInventory getIInventory(final int aX, final int aY, final int aZ) { final TileEntity
+ * tTileEntity = this.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IInventory) { return (IInventory)
+ * tTileEntity; } return null; }
+ * @Override public final IInventory getIInventoryAtSide(final byte aSide) { final TileEntity tTileEntity =
+ * this.getTileEntityAtSide(aSide); if (tTileEntity instanceof IInventory) { return (IInventory) tTileEntity; } return
+ * null; }
+ * @Override public final IInventory getIInventoryAtSideAndDistance(final byte aSide, final int aDistance) { final
+ * TileEntity tTileEntity = this.getTileEntityAtSideAndDistance(aSide, aDistance); if (tTileEntity instanceof
+ * IInventory) { return (IInventory) tTileEntity; } return null; }
+ * @Override public final IInventory getIInventoryOffset(final int aX, final int aY, final int aZ) { final TileEntity
+ * tTileEntity = this.getTileEntityOffset(aX, aY, aZ); if (tTileEntity instanceof IInventory) { return (IInventory)
+ * tTileEntity; } return null; }
+ * @Override public String[] getInfoData() { // TODO Auto-generated method stub return null; }
+ * @Override public long getInputAmperage() { if (this.canAccessData() && this.isElectric()) { return
+ * this.maxAmperesIn(); } return 0L; } public long getInputTier() { return GT_Utility.getTier(this.getInputVoltage()); }
+ * @Override public long getInputVoltage() { if (this.canAccessData() && this.isElectric()) { return this.maxEUInput();
+ * } return 2147483647L; } private long getMinimumStoredEU() { return 0; }
+ * @Override public final int getOffsetX(final byte aSide, final int aMultiplier) { return this.xCoord +
+ * ForgeDirection.getOrientation((int) aSide).offsetX * aMultiplier; } public final short getOffsetY(final byte aSide,
+ * final int aMultiplier) { return (short) (this.yCoord + ForgeDirection.getOrientation((int) aSide).offsetY *
+ * aMultiplier); } public final int getOffsetZ(final byte aSide, final int aMultiplier) { return this.zCoord +
+ * ForgeDirection.getOrientation((int) aSide).offsetZ * aMultiplier; }
+ * @Override public long getOutputAmperage() { if (this.canAccessData() && this.isElectric()) { return
+ * this.maxAmperesOut(); } return 0L; } public long getOutputTier() { return
+ * GT_Utility.getTier(this.getOutputVoltage()); }
+ * @Override public long getOutputVoltage() { if (this.canAccessData() && this.isElectric() && this.isEnetOutput()) {
+ * return this.maxEUOutput(); } return 0L; }
+ * @Override public int getRandomNumber(int p0) { return CORE.RANDOM.nextInt(); }
+ * @Override public long getSteamCapacity() { if (this.canAccessData()) { return this.maxSteamStore(); } return 0L; }
+ * public long getSteamVar() { return mStoredSteam; }
+ * @Override public long getStoredEU() { if (this.canAccessData()) { return Math.min(this.getEUVar(),
+ * this.getEUCapacity()); } return 0L; }
+ * @Override public long getStoredSteam() { if (this.canAccessData()) { return Math.min(this.getSteamVar(),
+ * this.getSteamCapacity()); } return 0L; }
+ * @Override public final TileEntity getTileEntity(final int aX, final int aY, final int aZ) { if
+ * (this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ)) { return
+ * null; } return this.worldObj.getTileEntity(aX, aY, aZ); } public final TileEntity getTileEntityAtSide(final byte
+ * aSide) { if (aSide < 0 || aSide >= 6 || this.mBufferedTileEntities[aSide] == this) { return null; } final int tX =
+ * this.getOffsetX(aSide, 1); final int tY = this.getOffsetY(aSide, 1); final int tZ = this.getOffsetZ(aSide, 1); if
+ * (this.crossedChunkBorder(tX, tZ)) { this.mBufferedTileEntities[aSide] = null; if (this.ignoreUnloadedChunks &&
+ * !this.worldObj.blockExists(tX, tY, tZ)) { return null; } } if (this.mBufferedTileEntities[aSide] == null) {
+ * this.mBufferedTileEntities[aSide] = this.worldObj.getTileEntity(tX, tY, tZ); if (this.mBufferedTileEntities[aSide] ==
+ * null) { this.mBufferedTileEntities[aSide] = this; return null; } return this.mBufferedTileEntities[aSide]; } else {
+ * if (this.mBufferedTileEntities[aSide].isInvalid()) { this.mBufferedTileEntities[aSide] = null; return
+ * this.getTileEntityAtSide(aSide); } if (this.mBufferedTileEntities[aSide].xCoord == tX &&
+ * this.mBufferedTileEntities[aSide].yCoord == tY && this.mBufferedTileEntities[aSide].zCoord == tZ) { return
+ * this.mBufferedTileEntities[aSide]; } return null; } }
+ * @Override public final TileEntity getTileEntityAtSideAndDistance(final byte aSide, final int aDistance) { if
+ * (aDistance == 1) { return this.getTileEntityAtSide(aSide); } return this.getTileEntity(this.getOffsetX(aSide,
+ * aDistance), this.getOffsetY(aSide, aDistance), this.getOffsetZ(aSide, aDistance)); }
+ * @Override public final TileEntity getTileEntityOffset(final int aX, final int aY, final int aZ) { return
+ * this.getTileEntity(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); }
+ * @Override public long getUniversalEnergyCapacity() { return 0; }
+ * @Override public long getUniversalEnergyStored() { return 0; }
+ * @Override public World getWorld() { return this.getWorldObj(); }
+ * @Override public int getXCoord() { return this.xCoord; }
+ * @Override public short getYCoord() { return (short) this.yCoord; }
+ * @Override public int getZCoord() { return this.zCoord; } public boolean hasEnoughEnergy() { return
+ * (this.getStoredEU() > 0 ? (mHasEnoughEnergy = true) : (mHasEnoughEnergy = false)); }
+ * @Override public boolean increaseStoredEnergyUnits(final long aEnergy, final boolean aIgnoreTooMuchEnergy) { if
+ * (!this.canAccessData()) { return false; } if (this.getStoredEU() < this.getEUCapacity() || aIgnoreTooMuchEnergy) {
+ * this.setStoredEU(this.getEUVar() + aEnergy); return true; } return false; }
+ * @Override public boolean increaseStoredSteam(final long aEnergy, final boolean aIgnoreTooMuchEnergy) { if
+ * (!this.canAccessData()) { return false; } if (this.getSteamVar() < this.getSteamCapacity() || aIgnoreTooMuchEnergy) {
+ * this.setStoredSteam(this.getSteamVar() + aEnergy); return true; } return false; } public long injectEnergyUnits(final
+ * byte aSide, final long aVoltage, long aAmperage) { if (!this.canAccessData() || !this.isElectric() ||
+ * !this.inputEnergyFrom(aSide) || aAmperage <= 0L || aVoltage <= 0L || this.getStoredEU() >= this.getEUCapacity() ||
+ * this.maxAmperesIn() <= this.mAcceptedAmperes) { return 0L; } if (aVoltage > this.getInputVoltage()) {
+ * this.doExplosion(aVoltage); return 0L; } if (this.increaseStoredEnergyUnits(aVoltage (aAmperage = Math.min(aAmperage,
+ * Math.min(this.maxAmperesIn() - this.mAcceptedAmperes, 1L + (this.getEUCapacity() - this.getStoredEU()) / aVoltage))),
+ * true)) { final int[] mAverageEUInput = this.mAverageEUInput; final int mAverageEUInputIndex =
+ * this.mAverageEUInputIndex; mAverageEUInput[mAverageEUInputIndex] += (int) (aVoltage * aAmperage);
+ * this.mAcceptedAmperes += aAmperage; return aAmperage; } return 0L; }
+ * @Override public boolean injectRotationalEnergy(byte p0, long p1, long p2) { return false; }
+ * @Override public boolean inputEnergyFrom(final byte aSide) { if (aSide == 6) { return true; } if
+ * (this.isServerSide()) { return aSide >= 0 && aSide < 6 && this.mActiveEUInputs[aSide] && !this.mReleaseEnergy; }
+ * return this.isEnergyInputSide(aSide); } public final boolean isClientSide() { return this.worldObj.isRemote; }
+ * @Override public boolean isDead() { return this.isDead; } private boolean isElectric() { return true; } private
+ * boolean isEnergyInputSide(final byte aSide) { if (aSide >= 0 && aSide < 6) { if (this.isInvalid() ||
+ * this.mReleaseEnergy) { return false; } if (this.canAccessData() && this.isElectric() && this.isEnetInput()) { return
+ * this.isInputFacing(aSide); } } return false; } private boolean isEnergyOutputSide(final byte aSide) { if (aSide >= 0
+ * && aSide < 6) { if (this.isInvalid() || this.mReleaseEnergy) { return this.mReleaseEnergy; } if (this.canAccessData()
+ * && this.isElectric() && this.isEnetOutput()) { return this.isOutputFacing(aSide); } } return false; } public boolean
+ * isEnetInput() { return false; } public boolean isEnetOutput() { return false; }
+ * @Override public boolean isGivingInformation() { return this.canAccessData() && this.isGivingInformation(); } public
+ * boolean isInputFacing(final byte aSide) { return false; }
+ * @Override public boolean isInvalidTileEntity() { return isDead() ? true : false; } public boolean
+ * isOutputFacing(final byte aSide) { return false; } public final boolean isServerSide() { return
+ * !this.worldObj.isRemote; } public boolean isUniversalEnergyStored(final long aEnergyAmount) { return
+ * this.getUniversalEnergyStored() >= aEnergyAmount || (this.mHasEnoughEnergy = false); }
+ * @Override public boolean isValidFacing(final byte aSide) { return this.canAccessData(); } public long maxAmperesIn()
+ * { return 1L; } public long maxAmperesOut() { return 1L; } public long maxEUInput() { return 0L; } public long
+ * maxEUOutput() { return 0L; } public long maxEUStore() { return 0L; } public long maxSteamStore() { return 256000L; }
+ * public final void onAdjacentBlockChange(final int aX, final int aY, final int aZ) {
+ * this.clearNullMarkersFromTileEntityBuffer(); }
+ * @Override public boolean outputsEnergyTo(final byte aSide) { if (aSide == 6) { return true; } if
+ * (this.isServerSide()) { if (aSide < 0 || aSide >= 6 || !this.mActiveEUOutputs[aSide]) { if (!this.mReleaseEnergy) {
+ * return false; } } return true; } return this.isEnergyOutputSide(aSide); } public final void sendBlockEvent(final byte
+ * aID, final byte aValue) { GT_Values.NW.sendPacketToAllPlayersInRange(this.worldObj, (GT_Packet) new
+ * GT_Packet_Block_Event(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue), this.xCoord, this.zCoord); }
+ * public void setEUVar(final long aEnergy) { mStoredEnergy = aEnergy; }
+ * @Override public void setFrontFacing(byte aFacing) { if (this.isValidFacing(aFacing)) { this.mFacing = aFacing;
+ * //this.onFacingChange(); //this.onMachineBlockUpdate(); } } public void setSteamVar(final long aSteam) { mStoredSteam
+ * = aSteam; } public boolean setStoredEU(long aEnergy) { if (!this.canAccessData()) { return false; } if (aEnergy < 0L)
+ * { aEnergy = 0L; } this.setEUVar(aEnergy); return true; } public boolean setStoredSteam(long aEnergy) { if
+ * (!this.canAccessData()) { return false; } if (aEnergy < 0L) { aEnergy = 0L; } this.setSteamVar(aEnergy); return true;
+ * }
+ * @Override public void writeToNBT(NBTTagCompound nbt) { // TODO Auto-generated method stub super.writeToNBT(nbt); }
+ * @Override public void readFromNBT(NBTTagCompound nbt) { // TODO Auto-generated method stub super.readFromNBT(nbt); }
+ * @Override public boolean onPreTick(long aTick) { return onPreTick(this, this.mTickTimer); }
+ * @Override public boolean onTick(long aTick) { return onTick(this, this.mTickTimer); }
+ * @Override public boolean onPostTick(long aTick) { return onPostTick(this, this.mTickTimer); }
+ * @Override public boolean onPreTick(TilePoweredGT tilePoweredGT, long mTickTimer2) { return
+ * super.onPreTick(mTickTimer2); }
+ * @Override public boolean onTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2) { return
+ * super.onTick(mTickTimer2); }
+ * @Override public boolean onPostTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2) { return
+ * super.onPostTick(mTickTimer2); }
+ * @Override public void markDirty() { super.markDirty(); }
+ * @Override public boolean receiveClientEvent(int p_145842_1_, int p_145842_2_) { // TODO Auto-generated method stub
+ * return super.receiveClientEvent(p_145842_1_, p_145842_2_); }
+ * @Override public void onChunkUnload() { this.clearNullMarkersFromTileEntityBuffer(); super.onChunkUnload();
+ * this.isDead = true; } public void updateEntity() { super.updateEntity(); this.isDead = false;
+ * this.mRunningThroughTick = true; long tTime = System.currentTimeMillis(); int tCode = 0; final boolean aSideServer =
+ * this.isServerSide(); final boolean aSideClient = this.isClientSide(); try { for (tCode = 0;
+ * this.hasValidMetaTileEntity() && tCode >= 0; tCode = -1) { Label_1743 : { switch (tCode) { case 0 : { ++tCode; if
+ * (this.mTickTimer++ != 0L) { break Label_1743; } this.oX = this.xCoord; this.oY = this.yCoord; this.oZ = this.zCoord;
+ * this.worldObj.markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, (TileEntity) this);
+ * this.onFirstTick(this); if (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick = false; return; } break
+ * Label_1743; } case 1 : { ++tCode; if (!aSideClient) { break Label_1743; } if (this.mNeedsUpdate) {
+ * this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); this.mNeedsUpdate = false; } break
+ * Label_1743; } case 2 : case 3 : case 4 : case 5 : case 6 : case 7 : { if (aSideServer && this.mTickTimer > 10L) { for
+ * (byte i = (byte) (tCode - 2); i < 6; ++i) { } } } case 8 : { tCode = 9; if (aSideServer) { if
+ * (++this.mAverageEUInputIndex >= this.mAverageEUInput.length) { this.mAverageEUInputIndex = 0; } if
+ * (++this.mAverageEUOutputIndex >= this.mAverageEUOutput.length) { this.mAverageEUOutputIndex = 0; }
+ * this.mAverageEUInput[this.mAverageEUInputIndex] = 0; this.mAverageEUOutput[this.mAverageEUOutputIndex] = 0; } } case
+ * 9 : { ++tCode; this.onPreTick(this, this.mTickTimer); if (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick
+ * = false; return; } } case 10 : { ++tCode; if (!aSideServer) { break Label_1743; } if (this.xCoord != this.oX ||
+ * this.yCoord != this.oY || this.zCoord != this.oZ) { this.oX = this.xCoord; this.oY = this.yCoord; this.oZ =
+ * this.zCoord; this.issueClientUpdate(); this.clearTileEntityBuffer(); } if (this.mFacing != this.oFacing) {
+ * this.oFacing = this.mFacing; this.issueBlockUpdate(); } if (this.mTickTimer > 20L && this.isElectric()) {
+ * this.mAcceptedAmperes = 0L; if (this.getOutputVoltage() != this.oOutput) { this.oOutput = this.getOutputVoltage(); }
+ * if (this.isEnetOutput() || this.isEnetInput()) { for (byte i = 0; i < 6; ++i) { boolean temp =
+ * this.isEnergyInputSide(i); if (temp != this.mActiveEUInputs[i]) { this.mActiveEUInputs[i] = temp; } temp =
+ * this.isEnergyOutputSide(i); if (temp != this.mActiveEUOutputs[i]) { this.mActiveEUOutputs[i] = temp; } } } if
+ * (this.isEnetOutput() && this.oOutput > 0L) { final long tOutputVoltage = Math.max(this.oOutput, this.oOutput + (1 <<
+ * GT_Utility.getTier(this.oOutput))); final long tUsableAmperage = Math.min(this.getOutputAmperage(),
+ * (this.getStoredEU() - this.getMinimumStoredEU()) / tOutputVoltage); if (tUsableAmperage > 0L) { final long tEU =
+ * tOutputVoltage * IEnergyConnected.Util.emitEnergyToNetwork( this.oOutput, tUsableAmperage, (IEnergyConnected) this);
+ * final int[] mAverageEUOutput = this.mAverageEUOutput; final int mAverageEUOutputIndex = this.mAverageEUOutputIndex;
+ * mAverageEUOutput[mAverageEUOutputIndex] += (int) tEU; this.decreaseStoredEU(tEU, true); } } if (this.getEUCapacity()
+ * > 0L) { if (GregTech_API.sMachineFireExplosions && this.getRandomNumber(1000) == 0) { final Block tBlock =
+ * this.getBlockAtSide((byte) this.getRandomNumber(6)); if (tBlock instanceof BlockFire) { this.doEnergyExplosion(); } }
+ * if (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick = false; return; } } } if
+ * (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick = false; return; } break Label_1743; } case 13 : {
+ * ++tCode; this.updateStatus(); if (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick = false; return; } }
+ * case 14 : { ++tCode; this.onPostTick((IGregTechTileEntity) this, this.mTickTimer); if
+ * (!this.hasValidMetaTileEntity()) { this.mRunningThroughTick = false; return; } } case 15 : { ++tCode; if
+ * (!aSideServer) { break; } if (this.mTickTimer % 10L == 0L && this.mSendClientData) { final IGT_NetworkHandler nw =
+ * GT_Values.NW; final World worldObj = this.worldObj; final int xCoord = this.xCoord; final short n = (short)
+ * this.yCoord; final int zCoord = this.zCoord; final short mid = this.mID; final int n2 = this.mCoverSides[0]; final
+ * int n3 = this.mCoverSides[1]; final int n4 = this.mCoverSides[2]; final int n5 = this.mCoverSides[3]; final int n6 =
+ * this.mCoverSides[4]; final int n7 = this.mCoverSides[5]; final byte oTextureData = (byte) ((this.mFacing & 0x7) |
+ * (this.mActive ? 8 : 0) | (this.mRedstone ? 16 : 0) | (this.mLockUpgrade ? 32 : 0)); this.oTextureData = oTextureData;
+ * final byte oTexturePage = (byte) ((this.hasValidMetaTileEntity() && this.mMetaTileEntity instanceof
+ * GT_MetaTileEntity_Hatch) ? ((GT_MetaTileEntity_Hatch) this.mMetaTileEntity).getTexturePage() : 0); this.oTexturePage
+ * = oTexturePage; final byte oUpdateData = (byte) (this.hasValidMetaTileEntity() ? this.mMetaTileEntity.getUpdateData()
+ * : 0); this.oUpdateData = oUpdateData; final byte oRedstoneData = (byte) (((this.mSidedRedstone[0] > 0) ? 1 : 0) |
+ * ((this.mSidedRedstone[1] > 0) ? 2 : 0) | ((this.mSidedRedstone[2] > 0) ? 4 : 0) | ((this.mSidedRedstone[3] > 0) ? 8 :
+ * 0) | ((this.mSidedRedstone[4] > 0) ? 16 : 0) | ((this.mSidedRedstone[5] > 0) ? 32 : 0)); this.oRedstoneData =
+ * oRedstoneData; final byte mColor = this.mColor; this.oColor = mColor; nw.sendPacketToAllPlayersInRange(worldObj,
+ * (GT_Packet) new GT_Packet_TileEntity(xCoord, n, zCoord, mid, n2, n3, n4, n5, n6, n7, oTextureData, oTexturePage,
+ * oUpdateData, oRedstoneData, mColor), this.xCoord, this.zCoord); this.mSendClientData = false; } if (this.mTickTimer >
+ * 10L) { byte tData = (byte) ((this.mFacing & 0x7) | (this.mActive ? 8 : 0) | (this.mRedstone ? 16 : 0) |
+ * (this.mLockUpgrade ? 32 : 0)); if (tData != this.oTextureData) { this.sendBlockEvent((byte) 0, this.oTextureData =
+ * tData); } tData = this.mMetaTileEntity.getUpdateData(); if (tData != this.oUpdateData) { this.sendBlockEvent((byte)
+ * 1, this.oUpdateData = tData); } if (this.mMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { tData =
+ * ((GT_MetaTileEntity_Hatch) this.mMetaTileEntity).getTexturePage(); if (tData != this.oTexturePage) { final byte b =
+ * 1; final byte oTexturePage2 = tData; this.oTexturePage = oTexturePage2; this.sendBlockEvent(b, (byte) (oTexturePage2
+ * | 0x80)); } } if (this.mColor != this.oColor) { this.sendBlockEvent((byte) 2, this.oColor = this.mColor); } tData =
+ * (byte) (((this.mSidedRedstone[0] > 0) ? 1 : 0) | ((this.mSidedRedstone[1] > 0) ? 2 : 0) | ((this.mSidedRedstone[2] >
+ * 0) ? 4 : 0) | ((this.mSidedRedstone[3] > 0) ? 8 : 0) | ((this.mSidedRedstone[4] > 0) ? 16 : 0) |
+ * ((this.mSidedRedstone[5] > 0) ? 32 : 0)); if (tData != this.oRedstoneData) { this.sendBlockEvent((byte) 3,
+ * this.oRedstoneData = tData); } if (this.mLightValue != this.oLightValue) {
+ * this.worldObj.setLightValue(EnumSkyBlock.Block, this.xCoord, this.yCoord, this.zCoord, (int) this.mLightValue);
+ * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord, this.zCoord);
+ * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord + 1, this.yCoord, this.zCoord);
+ * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord - 1, this.yCoord, this.zCoord);
+ * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord + 1, this.zCoord);
+ * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord - 1, this.zCoord);
+ * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord, this.zCoord + 1);
+ * this.worldObj.updateLightByType(EnumSkyBlock.Block, this.xCoord, this.yCoord, this.zCoord - 1);
+ * this.issueTextureUpdate(); this.sendBlockEvent((byte) 7, this.oLightValue = this.mLightValue); } } if
+ * (this.mNeedsBlockUpdate) { this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord,
+ * this.getBlockOffset(0, 0, 0)); this.mNeedsBlockUpdate = false; break; } break; } } } } } catch (Throwable e) {
+ * e.printStackTrace(GT_Log.err); } if (aSideServer && this.hasValidMetaTileEntity()) { tTime =
+ * System.currentTimeMillis() - tTime; if (this.mTimeStatistics.length > 0) {
+ * this.mTimeStatistics[this.mTimeStatisticsIndex = (this.mTimeStatisticsIndex + 1) % this.mTimeStatistics.length] =
+ * (int) tTime; } if (tTime > 0L && tTime > GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING && this.mTickTimer >
+ * 1000L && this.getMetaTileEntity().doTickProfilingMessageDuringThisTick() && this.mLagWarningCount++ < 10) {
+ * System.out.println("WARNING: Possible Lag Source at [" + this.xCoord + ", " + this.yCoord + ", " + this.zCoord +
+ * "] in Dimension " + this.worldObj.provider.dimensionId + " with " + tTime + "ms caused by an instance of " +
+ * this.getMetaTileEntity().getClass()); } } final boolean mWorkUpdate = false; this.mRunningThroughTick = mWorkUpdate;
+ * this.mInventoryChanged = mWorkUpdate; this.mWorkUpdate = mWorkUpdate; } private void onFirstTick(TilePoweredGT
+ * tilePoweredGT) { // TODO Auto-generated method stub } private boolean hasValidMetaTileEntity() { return
+ * Utils.invertBoolean(isDead()); } public void issueBlockUpdate() { this.mNeedsBlockUpdate = true; } public void
+ * issueClientUpdate() { this.mSendClientData = true; } public Packet getDescriptionPacket() { this.issueClientUpdate();
+ * return null; } }
+ */
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
index 63cda85458..a170f71af3 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
@@ -1,10 +1,5 @@
package gtPlusPlus.core.tileentities.general;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.inventories.InventoryCircuitProgrammer;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.slots.SlotIntegratedCircuit;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
@@ -14,6 +9,12 @@ import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.inventories.InventoryCircuitProgrammer;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.slots.SlotIntegratedCircuit;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInventory {
private int tickCount = 0;
@@ -138,8 +139,7 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv
}
this.tickCount++;
}
- } catch (final Throwable t) {
- }
+ } catch (final Throwable t) {}
}
public boolean anyPlayerInRange() {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
index aaf95a3291..d47f30121e 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.tileentities.general;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.inventories.Inventory_DecayablesChest;
-import gtPlusPlus.core.item.materials.DustDecayable;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
@@ -11,6 +7,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.inventories.Inventory_DecayablesChest;
+import gtPlusPlus.core.item.materials.DustDecayable;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class TileEntityDecayablesChest extends TileEntity implements ISidedInventory {
private final Inventory_DecayablesChest inventoryContents;
@@ -75,8 +76,7 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
}
updateSlots();
}
- } catch (final Throwable t) {
- }
+ } catch (final Throwable t) {}
}
public void tryUpdateDecayable(final DustDecayable b, ItemStack iStack, final World world) {
@@ -194,8 +194,8 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
this.numPlayersUsing++;
cachedChestType = 1;
}
- this.worldObj.addBlockEvent(
- this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
+ this.worldObj
+ .addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType());
this.getInventory().openInventory();
@@ -207,8 +207,8 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
this.numPlayersUsing--;
cachedChestType = 1;
}
- this.worldObj.addBlockEvent(
- this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
+ this.worldObj
+ .addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType());
this.getInventory().closeInventory();
@@ -257,8 +257,8 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
}
/**
- * Causes the TileEntity to reset all it's cached values for it's container
- * Block, metadata and in the case of chests, the adjacent chest check
+ * Causes the TileEntity to reset all it's cached values for it's container Block, metadata and in the case of
+ * chests, the adjacent chest check
*/
public void updateContainingBlockInfo() {
super.updateContainingBlockInfo();
@@ -266,8 +266,7 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
}
/**
- * Performs the check for adjacent chests to determine if this chest is double
- * or not.
+ * Performs the check for adjacent chests to determine if this chest is double or not.
*/
public void checkForAdjacentChests() {
if (!this.adjacentChestChecked) {
@@ -284,8 +283,7 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
this.prevLidAngle = this.lidAngle;
f = 0.04F;
double d2;
- if (this.numPlayersUsing > 0
- && this.lidAngle == 0.0F
+ if (this.numPlayersUsing > 0 && this.lidAngle == 0.0F
&& this.adjacentChestZNeg == null
&& this.adjacentChestXNeg == null) {
double d1 = (double) this.xCoord + 0.5D;
@@ -331,8 +329,7 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
}
/**
- * Called when a client event is received with the event number and argument,
- * see World.sendClientEvent
+ * Called when a client event is received with the event number and argument, see World.sendClientEvent
*/
public boolean receiveClientEvent(int p_145842_1_, int p_145842_2_) {
if (p_145842_1_ == 1) {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java
index c47a6fa092..df2b94fc6f 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.tileentities.general;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.inventories.Inventory_EggBox;
-import gtPlusPlus.core.item.general.ItemGiantEgg;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
@@ -11,6 +7,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.inventories.Inventory_EggBox;
+import gtPlusPlus.core.item.general.ItemGiantEgg;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class TileEntityEggBox extends TileEntity implements ISidedInventory {
private final Inventory_EggBox inventoryContents;
@@ -75,8 +76,7 @@ public class TileEntityEggBox extends TileEntity implements ISidedInventory {
}
updateSlots();
}
- } catch (final Throwable t) {
- }
+ } catch (final Throwable t) {}
}
public void tryUpdateDecayable(final ItemGiantEgg d, ItemStack iStack, final World world) {
@@ -194,8 +194,8 @@ public class TileEntityEggBox extends TileEntity implements ISidedInventory {
this.numPlayersUsing++;
cachedChestType = 1;
}
- this.worldObj.addBlockEvent(
- this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
+ this.worldObj
+ .addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType());
this.getInventory().openInventory();
@@ -207,8 +207,8 @@ public class TileEntityEggBox extends TileEntity implements ISidedInventory {
this.numPlayersUsing--;
cachedChestType = 1;
}
- this.worldObj.addBlockEvent(
- this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
+ this.worldObj
+ .addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, this.numPlayersUsing);
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType());
this.getInventory().closeInventory();
@@ -257,8 +257,8 @@ public class TileEntityEggBox extends TileEntity implements ISidedInventory {
}
/**
- * Causes the TileEntity to reset all it's cached values for it's container
- * Block, metadata and in the case of chests, the adjacent chest check
+ * Causes the TileEntity to reset all it's cached values for it's container Block, metadata and in the case of
+ * chests, the adjacent chest check
*/
public void updateContainingBlockInfo() {
super.updateContainingBlockInfo();
@@ -266,8 +266,7 @@ public class TileEntityEggBox extends TileEntity implements ISidedInventory {
}
/**
- * Performs the check for adjacent chests to determine if this chest is double
- * or not.
+ * Performs the check for adjacent chests to determine if this chest is double or not.
*/
public void checkForAdjacentChests() {
if (!this.adjacentChestChecked) {
@@ -284,8 +283,7 @@ public class TileEntityEggBox extends TileEntity implements ISidedInventory {
this.prevLidAngle = this.lidAngle;
f = 0.04F;
double d2;
- if (this.numPlayersUsing > 0
- && this.lidAngle == 0.0F
+ if (this.numPlayersUsing > 0 && this.lidAngle == 0.0F
&& this.adjacentChestZNeg == null
&& this.adjacentChestXNeg == null) {
double d1 = (double) this.xCoord + 0.5D;
@@ -331,8 +329,7 @@ public class TileEntityEggBox extends TileEntity implements ISidedInventory {
}
/**
- * Called when a client event is received with the event number and argument,
- * see World.sendClientEvent
+ * Called when a client event is received with the event number and argument, see World.sendClientEvent
*/
public boolean receiveClientEvent(int p_145842_1_, int p_145842_2_) {
if (p_145842_1_ == 1) {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java
index 67e044fc36..08feceb192 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java
@@ -1,6 +1,7 @@
package gtPlusPlus.core.tileentities.general;
import java.util.UUID;
+
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
index bd49b67f73..2f672491f4 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
@@ -1,13 +1,7 @@
package gtPlusPlus.core.tileentities.general;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.inventories.InventoryFishTrap;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -18,6 +12,14 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.FishingHooks;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.inventories.InventoryFishTrap;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
private int tickCount = 0;
@@ -54,10 +56,8 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
final Block[] surroundingBlocks = new Block[6];
if (this.hasWorldObj()) {
if (!this.getWorldObj().isRemote) {
- surroundingBlocks[0] =
- this.worldObj.getBlock(this.locationX, this.locationY + 1, this.locationZ); // Above
- surroundingBlocks[1] =
- this.worldObj.getBlock(this.locationX, this.locationY - 1, this.locationZ); // Below
+ surroundingBlocks[0] = this.worldObj.getBlock(this.locationX, this.locationY + 1, this.locationZ); // Above
+ surroundingBlocks[1] = this.worldObj.getBlock(this.locationX, this.locationY - 1, this.locationZ); // Below
surroundingBlocks[2] = this.worldObj.getBlock(this.locationX + 1, this.locationY, this.locationZ);
surroundingBlocks[3] = this.worldObj.getBlock(this.locationX - 1, this.locationY, this.locationZ);
surroundingBlocks[4] = this.worldObj.getBlock(this.locationX, this.locationY, this.locationZ + 1);
@@ -65,8 +65,7 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
int waterCount = 0;
int trapCount = 0;
for (final Block checkBlock : surroundingBlocks) {
- if ((checkBlock == Blocks.water)
- || (checkBlock == Blocks.flowing_water)
+ if ((checkBlock == Blocks.water) || (checkBlock == Blocks.flowing_water)
|| checkBlock.getUnlocalizedName().toLowerCase().contains("water")
|| (checkBlock == ModBlocks.blockFishTrap)) {
if (checkBlock != ModBlocks.blockFishTrap) {
@@ -80,14 +79,24 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
if ((waterCount >= 2) && (trapCount <= 4)) {
int aCheck = trapCount + waterCount;
this.waterSides = MathUtils.balance(aCheck, 0, 6);
- Logger.MACHINE_INFO("Valid Trap. " + waterCount + " | " + (this.tickCount / 20) + "/"
- + (this.baseTickRate / 20));
+ Logger.MACHINE_INFO(
+ "Valid Trap. " + waterCount
+ + " | "
+ + (this.tickCount / 20)
+ + "/"
+ + (this.baseTickRate / 20));
return true;
} else if ((waterCount >= 2) && (trapCount > 4)) {
Logger.MACHINE_INFO("Too many fish traps surrounding this one.");
Logger.MACHINE_INFO(
- "Not adding Loot to the fishtrap at x[" + this.locationX + "] y[" + this.locationY + "] z["
- + this.locationZ + "] (Ticking for loot every " + this.baseTickRate + " ticks)");
+ "Not adding Loot to the fishtrap at x[" + this.locationX
+ + "] y["
+ + this.locationY
+ + "] z["
+ + this.locationZ
+ + "] (Ticking for loot every "
+ + this.baseTickRate
+ + " ticks)");
}
}
}
@@ -130,8 +139,7 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
}
checkingSlot++;
}
- } catch (final NullPointerException n) {
- }
+ } catch (final NullPointerException n) {}
}
this.markDirty();
return false;
@@ -205,9 +213,15 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
if (this.tickCount >= this.baseTickRate) {
if (this.isInWater) {
// Add loot
- Logger.MACHINE_INFO("Adding Loot to the fishtrap at x[" + this.locationX + "] y["
- + this.locationY + "] z[" + this.locationZ + "] (Ticking for loot every "
- + this.baseTickRate + " ticks)");
+ Logger.MACHINE_INFO(
+ "Adding Loot to the fishtrap at x[" + this.locationX
+ + "] y["
+ + this.locationY
+ + "] z["
+ + this.locationZ
+ + "] (Ticking for loot every "
+ + this.baseTickRate
+ + " ticks)");
int aExtraLootChance = MathUtils.randInt(1, 1000);
if (aExtraLootChance >= 999) {
@@ -230,8 +244,7 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
this.tickCount = 0;
}
}
- } catch (final Throwable t) {
- }
+ } catch (final Throwable t) {}
}
public void calculateTickrate() {
@@ -292,33 +305,9 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
static final String suffix = "raw";
static final String seaweed = "cropSeaweed";
static final String greenheartFish = "Greenheartfish";
- private static final String[] harvestcraftFish = {
- "Anchovy",
- "Bass",
- "Carp",
- "Catfish",
- "Charr",
- "Clam",
- "Crab",
- "Crayfish",
- "Eel",
- "Frog",
- "Grouper",
- "Herring",
- "Jellyfish",
- "Mudfish",
- "Octopus",
- "Perch",
- "Scallop",
- "Shrimp",
- "Snail",
- "Snapper",
- "Tilapia",
- "Trout",
- "Tuna",
- "Turtle",
- "Walleye"
- };
+ private static final String[] harvestcraftFish = { "Anchovy", "Bass", "Carp", "Catfish", "Charr", "Clam", "Crab",
+ "Crayfish", "Eel", "Frog", "Grouper", "Herring", "Jellyfish", "Mudfish", "Octopus", "Perch", "Scallop",
+ "Shrimp", "Snail", "Snapper", "Tilapia", "Trout", "Tuna", "Turtle", "Walleye" };
public static void pamsHarvestCraftCompat() {
for (int i = 0; i < harvestcraftFish.length; i++) {}
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java
index d45ebd77f7..3e24c7fe96 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java
@@ -1,14 +1,15 @@
package gtPlusPlus.core.tileentities.general;
-import gregtech.api.enums.GT_Values;
-import gtPlusPlus.core.inventories.InventoryHeliumGenerator;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.core.inventories.InventoryHeliumGenerator;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class TileEntityHeliumGenerator extends TileEntity {
private int tickCount = 0;
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java
index a21448bce7..6cf5507188 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java
@@ -50,8 +50,15 @@ public class TileEntityInfiniteFluid extends TileEntity implements IFluidHandler
}
if (this != null) {
- FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(
- fluid, this.getWorldObj(), this.xCoord, this.yCoord, this.zCoord, this.tank, 0));
+ FluidEvent.fireEvent(
+ new FluidEvent.FluidDrainingEvent(
+ fluid,
+ this.getWorldObj(),
+ this.xCoord,
+ this.yCoord,
+ this.zCoord,
+ this.tank,
+ 0));
}
}
return stack;
@@ -69,7 +76,7 @@ public class TileEntityInfiniteFluid extends TileEntity implements IFluidHandler
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection from) {
- return new FluidTankInfo[] {this.tank.getInfo()};
+ return new FluidTankInfo[] { this.tank.getInfo() };
}
public float getAdjustedVolume() {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java
index a9ac7683d4..86e5454b80 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java
@@ -1,10 +1,8 @@
package gtPlusPlus.core.tileentities.general;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
import java.util.ArrayList;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockDoor;
import net.minecraft.entity.Entity;
@@ -14,6 +12,10 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
public class TileEntityPlayerDoorBase extends TileEntity {
public boolean mIsOpen = false;
@@ -61,7 +63,10 @@ public class TileEntityPlayerDoorBase extends TileEntity {
BlockDoor aDoor = (aBlock instanceof BlockDoor ? (BlockDoor) aBlock : null);
if (aDoor != null) {
int i1 = aDoor.func_150012_g(
- mNeighbourDoor.world, mNeighbourDoor.xPos, mNeighbourDoor.yPos, mNeighbourDoor.zPos);
+ mNeighbourDoor.world,
+ mNeighbourDoor.xPos,
+ mNeighbourDoor.yPos,
+ mNeighbourDoor.zPos);
if ((i1 & 4) != 0) {
return 100;
} else {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java
index bfb56180d2..afc7ee130c 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java
@@ -1,12 +1,15 @@
package gtPlusPlus.core.tileentities.general;
-import gtPlusPlus.core.block.ModBlocks;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.tileentity.TileEntity;
+import gtPlusPlus.core.block.ModBlocks;
+
public class TileEntityReverter extends TileEntity {
+
private static final int REVERT_CHANCE = 10;
public int radius = 16;
public int diameter = (8 * this.radius) + 4;
@@ -162,13 +165,8 @@ public class TileEntityReverter extends TileEntity {
this.drawParticleLine(sx, sy, sz, dx, dy, dz);
}
- protected void drawParticleLine(
- final double srcX,
- final double srcY,
- final double srcZ,
- final double destX,
- final double destY,
- final double destZ) {
+ protected void drawParticleLine(final double srcX, final double srcY, final double srcZ, final double destX,
+ final double destY, final double destZ) {
final int particles = 16;
for (int i = 0; i < particles; i++) {
final double trailFactor = i / (particles - 1.0D);
@@ -187,8 +185,8 @@ public class TileEntityReverter extends TileEntity {
for (int y = -this.radius; y <= this.radius; y++) {
for (int z = -this.radius; z <= this.radius; z++) {
final Block blockID = this.worldObj.getBlock(this.xCoord + x, this.yCoord + y, this.zCoord + z);
- final byte meta =
- (byte) this.worldObj.getBlockMetadata(this.xCoord + x, this.yCoord + y, this.zCoord + z);
+ final byte meta = (byte) this.worldObj
+ .getBlockMetadata(this.xCoord + x, this.yCoord + y, this.zCoord + z);
if (this.blockData[index] != blockID) {
if (this.revertBlock(
this.xCoord + x,
@@ -211,20 +209,13 @@ public class TileEntityReverter extends TileEntity {
return reverted;
}
- private boolean revertBlock(
- final int x,
- final int y,
- final int z,
- final Block thereBlockID,
- final byte thereMeta,
- final Block replaceBlockID,
- byte replaceMeta) {
- /*if ((thereBlockID == Blocks.air) && (!replaceBlockID.getMaterial().blocksMovement()))
- {
- System.out.println("Not replacing block " + replaceBlockID + " because it doesn't block movement");
-
- return false;
- }*/
+ private boolean revertBlock(final int x, final int y, final int z, final Block thereBlockID, final byte thereMeta,
+ final Block replaceBlockID, byte replaceMeta) {
+ /*
+ * if ((thereBlockID == Blocks.air) && (!replaceBlockID.getMaterial().blocksMovement())) {
+ * System.out.println("Not replacing block " + replaceBlockID + " because it doesn't block movement"); return
+ * false; }
+ */
if (this.isUnrevertable(thereBlockID, thereMeta, replaceBlockID, replaceMeta)) {
return false;
}
@@ -244,26 +235,25 @@ public class TileEntityReverter extends TileEntity {
return true;
}
- private boolean isUnrevertable(
- final Block thereBlockID, final byte thereMeta, final Block replaceBlockID, final byte replaceMeta) {
+ private boolean isUnrevertable(final Block thereBlockID, final byte thereMeta, final Block replaceBlockID,
+ final byte replaceMeta) {
if ((thereBlockID == ModBlocks.blockGriefSaver) || (replaceBlockID == ModBlocks.blockGriefSaver)) {
return true;
}
- /*if (((thereBlockID == towerTranslucent) && (thereMeta != 4)) || ((replaceBlockID == towerTranslucent) && (replaceMeta != 4))) {
- return true;
- }*/
+ /*
+ * if (((thereBlockID == towerTranslucent) && (thereMeta != 4)) || ((replaceBlockID == towerTranslucent) &&
+ * (replaceMeta != 4))) { return true; }
+ */
if ((thereBlockID == Blocks.redstone_lamp) && (replaceBlockID == Blocks.lit_redstone_lamp)) {
return true;
}
if ((thereBlockID == Blocks.lit_redstone_lamp) && (replaceBlockID == Blocks.redstone_lamp)) {
return true;
}
- /*if ((thereBlockID == Blocks.water) || (replaceBlockID == Blocks.flowing_water)) {
- return true;
- }
- if ((thereBlockID == Blocks.flowing_water) || (replaceBlockID == Blocks.water)) {
- return true;
- }*/
+ /*
+ * if ((thereBlockID == Blocks.water) || (replaceBlockID == Blocks.flowing_water)) { return true; } if
+ * ((thereBlockID == Blocks.flowing_water) || (replaceBlockID == Blocks.water)) { return true; }
+ */
if (replaceBlockID == Blocks.tnt) {
return true;
}
@@ -291,8 +281,8 @@ public class TileEntityReverter extends TileEntity {
}
public boolean anyPlayerInRange() {
- return this.worldObj.getClosestPlayer(
- this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, this.requiredPlayerRange)
+ return this.worldObj
+ .getClosestPlayer(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, this.requiredPlayerRange)
!= null;
}
}
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
index f063abb53c..9e829e0c16 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
@@ -1,12 +1,5 @@
package gtPlusPlus.core.tileentities.general;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.container.Container_VolumetricFlaskSetter;
-import gtPlusPlus.core.inventories.Inventory_VolumetricFlaskSetter;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
@@ -17,6 +10,14 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.container.Container_VolumetricFlaskSetter;
+import gtPlusPlus.core.inventories.Inventory_VolumetricFlaskSetter;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
+
public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISidedInventory {
private int tickCount = 0;
@@ -167,10 +168,14 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
&& VolumetricFlaskHelper.getFlaskCapacity(f) == getCapacityForSlot(e)
&& ((aInputFluidStack == null && aFluidInCheckedSlot == null)
|| aInputFluidStack.isFluidEqual(aFluidInCheckedSlot))) {
- log("Input Slot Flask Contains: "
- + (aInputFluidStack != null ? aInputFluidStack.getLocalizedName() : "Empty"));
- log("Output Slot Flask Contains: "
- + (aFluidInCheckedSlot != null ? aFluidInCheckedSlot.getLocalizedName() : "Empty"));
+ log(
+ "Input Slot Flask Contains: "
+ + (aInputFluidStack != null ? aInputFluidStack.getLocalizedName()
+ : "Empty"));
+ log(
+ "Output Slot Flask Contains: "
+ + (aFluidInCheckedSlot != null ? aFluidInCheckedSlot.getLocalizedName()
+ : "Empty"));
aSize = f.stackSize + g.stackSize;
if (aSize > 16) {
aInputStack = g.copy();
@@ -229,8 +234,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
}
this.tickCount++;
}
- } catch (final Throwable t) {
- }
+ } catch (final Throwable t) {}
}
public boolean anyPlayerInRange() {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
index 8b72ca911f..990fef0652 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.tileentities.general;
-import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
-import gtPlusPlus.core.tileentities.base.TileBasicTank;
-import gtPlusPlus.core.util.minecraft.EnchantingUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
@@ -11,12 +7,18 @@ import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.*;
+
import org.lwjgl.input.Keyboard;
+import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
+import gtPlusPlus.core.tileentities.base.TileBasicTank;
+import gtPlusPlus.core.util.minecraft.EnchantingUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class TileEntityXpConverter extends TileBasicTank {
- public BTF_FluidTank tankEssence =
- new BTF_FluidTank((int) (64000 * EnchantingUtils.RATIO_MOB_ESSENCE_TO_LIQUID_XP));
+ public BTF_FluidTank tankEssence = new BTF_FluidTank(
+ (int) (64000 * EnchantingUtils.RATIO_MOB_ESSENCE_TO_LIQUID_XP));
public BTF_FluidTank tankLiquidXp = new BTF_FluidTank(64000);
private boolean mConvertToEssence = true;
@@ -36,11 +38,9 @@ public class TileEntityXpConverter extends TileBasicTank {
public float getAdjustedVolume() {
if (this.mConvertToEssence) {
- if ((this.tankLiquidXp.getFluid() != null)
- && (this.tankLiquidXp.getFluidAmount() >= 100)
- && (this.tankEssence.getFluidAmount()
- <= (this.tankEssence.getCapacity()
- - (100 * EnchantingUtils.RATIO_MOB_ESSENCE_TO_LIQUID_XP)))) {
+ if ((this.tankLiquidXp.getFluid() != null) && (this.tankLiquidXp.getFluidAmount() >= 100)
+ && (this.tankEssence.getFluidAmount() <= (this.tankEssence.getCapacity()
+ - (100 * EnchantingUtils.RATIO_MOB_ESSENCE_TO_LIQUID_XP)))) {
final FluidStack bigStorage = EnchantingUtils.getEssenceFromLiquidXp(100);
this.tankEssence.fill(bigStorage, true);
this.tankLiquidXp.drain(100, true);
@@ -48,8 +48,7 @@ public class TileEntityXpConverter extends TileBasicTank {
}
} else {
final double rm = EnchantingUtils.RATIO_MOB_ESSENCE_TO_LIQUID_XP;
- if ((this.tankEssence.getFluid() != null)
- && (this.tankEssence.getFluidAmount() >= rm)
+ if ((this.tankEssence.getFluid() != null) && (this.tankEssence.getFluidAmount() >= rm)
&& (this.tankLiquidXp.getFluidAmount() <= (this.tankLiquidXp.getCapacity() - rm))) {
final FluidStack bigStorage = EnchantingUtils.getLiquidXP(1);
this.tankLiquidXp.fill(bigStorage, true);
@@ -89,8 +88,8 @@ public class TileEntityXpConverter extends TileBasicTank {
this.readFromNBT(tag);
}
- public void onScrewdriverRightClick(
- final byte aSide, final EntityPlayer aPlayer, final float aX, final float aY, final float aZ) {
+ public void onScrewdriverRightClick(final byte aSide, final EntityPlayer aPlayer, final float aX, final float aY,
+ final float aZ) {
if (this.isServerSide()) {
if (this.mConvertToEssence) {
PlayerUtils.messagePlayer(aPlayer, "Converting from Mob Essence to Liquid Xp.");
@@ -243,9 +242,9 @@ public class TileEntityXpConverter extends TileBasicTank {
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection aSide) {
if (aSide == ForgeDirection.UP || aSide == ForgeDirection.DOWN) {
- return new FluidTankInfo[] {this.tankEssence.getInfo()};
+ return new FluidTankInfo[] { this.tankEssence.getInfo() };
} else {
- return new FluidTankInfo[] {this.tankLiquidXp.getInfo()};
+ return new FluidTankInfo[] { this.tankLiquidXp.getInfo() };
}
}
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java b/src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java
index 32401bf0ec..6e27dbafef 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java
@@ -1,11 +1,5 @@
package gtPlusPlus.core.tileentities.general.redstone;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.api.interfaces.IToolable;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound;
@@ -14,6 +8,13 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.api.interfaces.IToolable;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
public abstract class TileEntityRedstoneHandler extends TileEntity implements IToolable {
private final int mTileType;
@@ -27,7 +28,9 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT
/**
* Sets the Redstone Handler Type.
- * @param aTileType - A type of the handler designated by an int. 0 = receiver, 1 = emitter, 2 = both, anything else = nothing.
+ *
+ * @param aTileType - A type of the handler designated by an int. 0 = receiver, 1 = emitter, 2 = both, anything else
+ * = nothing.
*/
public TileEntityRedstoneHandler(int aTileType) {
mTileType = aTileType;
@@ -117,7 +120,11 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT
if (mTilePos.world.getBlockLightValue(xCoord, yCoord, zCoord) != getLightBrightness() / 0.0625f) {
mTilePos.getBlockAtPos().setLightLevel(getLightBrightness() / 0.0625f);
mTilePos.world.setLightValue(
- EnumSkyBlock.Block, xCoord, yCoord, zCoord, (int) (getLightBrightness() / 0.0625f));
+ EnumSkyBlock.Block,
+ xCoord,
+ yCoord,
+ zCoord,
+ (int) (getLightBrightness() / 0.0625f));
mTilePos.world.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord);
Logger.INFO("Updating Light");
}
@@ -165,7 +172,7 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT
/**
* Used to see if one of the blocks next to you or your block is getting power from a neighboring block. Used by
- * items like TNT or Doors so they don't have redstone going straight into them. Args: x, y, z
+ * items like TNT or Doors so they don't have redstone going straight into them. Args: x, y, z
*/
public boolean isGettingIndirectlyPowered() {
if (mTilePos == null) {
@@ -182,7 +189,7 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT
}
/**
- * Gets the power level from a certain block face. Args: x, y, z, direction
+ * Gets the power level from a certain block face. Args: x, y, z, direction
*/
public int getIndirectPowerForSide(int aSide) {
if (mTilePos == null || aSide < 0 || aSide > 5) {
@@ -202,21 +209,16 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT
}
/**
- * Determine if this block can make a redstone connection on the side provided,
- * Useful to control which sides are inputs and outputs for redstone wires.
+ * Determine if this block can make a redstone connection on the side provided, Useful to control which sides are
+ * inputs and outputs for redstone wires.
*
- * Side:
- * -1: UP
- * 0: NORTH
- * 1: EAST
- * 2: SOUTH
- * 3: WEST
+ * Side: -1: UP 0: NORTH 1: EAST 2: SOUTH 3: WEST
*
* @param world The current world
- * @param x X Position
- * @param y Y Position
- * @param z Z Position
- * @param side The side that is trying to make the connection
+ * @param x X Position
+ * @param y Y Position
+ * @param z Z Position
+ * @param side The side that is trying to make the connection
* @return True to make the connection
*/
public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side) {
@@ -227,12 +229,14 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT
}
/**
- * Called to determine whether to allow the a block to handle its own indirect power rather than using the default rules.
+ * Called to determine whether to allow the a block to handle its own indirect power rather than using the default
+ * rules.
+ *
* @param world The world
- * @param x The x position of this block instance
- * @param y The y position of this block instance
- * @param z The z position of this block instance
- * @param side The INPUT side of the block to be powered - ie the opposite of this block's output side
+ * @param x The x position of this block instance
+ * @param y The y position of this block instance
+ * @param z The z position of this block instance
+ * @param side The INPUT side of the block to be powered - ie the opposite of this block's output side
* @return Whether Block#isProvidingWeakPower should be called when determining indirect power
*/
public boolean shouldCheckWeakPower(IBlockAccess world, int x, int y, int z, int side) {
@@ -243,15 +247,14 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT
}
/**
- * If this block should be notified of weak changes.
- * Weak changes are changes 1 block away through a solid block.
+ * If this block should be notified of weak changes. Weak changes are changes 1 block away through a solid block.
* Similar to comparators.
*
* @param world The current world
- * @param x X Position
- * @param y Y position
- * @param z Z position
- * @param side The side to check
+ * @param x X Position
+ * @param y Y position
+ * @param z Z position
+ * @param side The side to check
* @return true To be notified of changes
*/
public boolean getWeakChanges(IBlockAccess world, int x, int y, int z) {
@@ -263,6 +266,7 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT
/**
* Override this to change the level of redstone output.
+ *
* @return
*/
public int getRedstoneLevel() {
@@ -290,6 +294,7 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT
/**
* Returns the amount of week power this block is providing to a side.
+ *
* @param world
* @param x
* @param y
@@ -303,8 +308,10 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT
}
return getOutputPowerLevel();
}
+
/**
* Returns the amount of strong power this block is providing to a side.
+ *
* @param world
* @param x
* @param y
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
index 258e0e88e6..4e9866a7b8 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.tileentities.machines;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.item.chemistry.AgriculturalChem;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityChicken;
@@ -18,6 +14,11 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class TileEntityAdvPooCollector extends TileEntityBaseFluidCollector {
public TileEntityAdvPooCollector() {
@@ -100,12 +101,13 @@ public class TileEntityAdvPooCollector extends TileEntityBaseFluidCollector {
}
}
aPooAmount = Math.max(Math.min(this.tank.getCapacity() - this.tank.getFluidAmount(), aPooAmount), 1);
- return Math.max(
- 1,
- (aPooAmount
- * MathUtils.getRandomFromArray(
- new int[] {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 4})
- / 10));
+ return Math
+ .max(
+ 1,
+ (aPooAmount
+ * MathUtils.getRandomFromArray(
+ new int[] { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 4 })
+ / 10));
} else {
return 0;
}
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
index b7985b5b7f..487d3d90eb 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
@@ -1,13 +1,7 @@
package gtPlusPlus.core.tileentities.machines;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.tileentities.base.TileEntityBase;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
+
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -25,6 +19,14 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.tileentities.base.TileEntityBase;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public abstract class TileEntityBaseFluidCollector extends TileEntityBase implements IFluidHandler {
public final FluidTank tank;
@@ -72,8 +74,15 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
}
if (this != null) {
- FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(
- fluid, this.getWorldObj(), this.xCoord, this.yCoord, this.zCoord, this.tank, 0));
+ FluidEvent.fireEvent(
+ new FluidEvent.FluidDrainingEvent(
+ fluid,
+ this.getWorldObj(),
+ this.xCoord,
+ this.yCoord,
+ this.zCoord,
+ this.tank,
+ 0));
}
}
return stack;
@@ -91,7 +100,7 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
@Override
public final FluidTankInfo[] getTankInfo(ForgeDirection from) {
- return new FluidTankInfo[] {this.tank.getInfo()};
+ return new FluidTankInfo[] { this.tank.getInfo() };
}
@Override
@@ -200,8 +209,8 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
addDrop(aEntity);
if (this.tank.getFluidAmount() < this.tank.getCapacity()) {
int aFluidAmount = onPostTick(aEntity);
- aFluidAmount =
- Math.max(Math.min(this.tank.getCapacity() - this.tank.getFluidAmount(), aFluidAmount), 1);
+ aFluidAmount = Math
+ .max(Math.min(this.tank.getCapacity() - this.tank.getFluidAmount(), aFluidAmount), 1);
this.tank.fill(FluidUtils.getFluidStack(fluidToProvide(), aFluidAmount), true);
} else {
ItemStack aDirtStack = ItemUtils.getSimpleStack(itemToSpawnInWorldIfTankIsFull(), 1);
@@ -218,6 +227,7 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
/**
* Return the amount of fluid for this entity type
+ *
* @param aEntity
* @return
*/
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
index 0e8000ebb3..45c20ce07d 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java
@@ -1,5 +1,16 @@
package gtPlusPlus.core.tileentities.machines;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.ItemList;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.Pair;
@@ -12,15 +23,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.ModularArmourUtils;
import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT;
import gtPlusPlus.core.util.minecraft.ModularArmourUtils.Modifiers;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.ISidedInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class TileEntityModularityTable extends TileEntityBase implements ISidedInventory {
@@ -97,7 +99,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
if (this.mRecipeTimeRemaining < 0) {
return null;
} else {
- return new ItemStack[] {this.mInputstackA, this.mInputstackB};
+ return new ItemStack[] { this.mInputstackA, this.mInputstackB };
}
}
@@ -140,8 +142,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
return true;
}
- public static Map<ItemStack, Pair<Modifiers, Integer>> mValidUpgradeList =
- new HashMap<ItemStack, Pair<Modifiers, Integer>>();
+ public static Map<ItemStack, Pair<Modifiers, Integer>> mValidUpgradeList = new HashMap<ItemStack, Pair<Modifiers, Integer>>();
public static Map<ItemStack, BT> mValidUpgradeListFormChange = new HashMap<ItemStack, BT>();
private static boolean generateAllValidUpgrades() {
@@ -160,24 +161,38 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
// Defence Boost
generateUpgradeData(
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateAluminium", 1), Modifiers.BOOST_DEF, 1);
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateAluminium", 1),
+ Modifiers.BOOST_DEF,
+ 1);
generateUpgradeData(
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateStainlessSteel", 1), Modifiers.BOOST_DEF, 2);
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateStainlessSteel", 1),
+ Modifiers.BOOST_DEF,
+ 2);
generateUpgradeData(
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateTungsten", 1), Modifiers.BOOST_DEF, 3);
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateTungsten", 1),
+ Modifiers.BOOST_DEF,
+ 3);
generateUpgradeData(
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateTungstenSteel", 1), Modifiers.BOOST_DEF, 4);
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateTungstenSteel", 1),
+ Modifiers.BOOST_DEF,
+ 4);
generateUpgradeData(
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateNaquadah", 1), Modifiers.BOOST_DEF, 5);
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateNaquadah", 1),
+ Modifiers.BOOST_DEF,
+ 5);
// Hp Boost
generateUpgradeData(ItemUtils.simpleMetaStack(Items.golden_apple, 0, 1), Modifiers.BOOST_HP, 1);
generateUpgradeData(ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1), Modifiers.BOOST_HP, 2);
generateUpgradeData(ItemUtils.simpleMetaStack(Items.nether_star, 0, 1), Modifiers.BOOST_HP, 3);
generateUpgradeData(
- ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32725", 32725, 1), Modifiers.BOOST_HP, 4);
+ ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32725", 32725, 1),
+ Modifiers.BOOST_HP,
+ 4);
generateUpgradeData(
- ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32726", 32726, 1), Modifiers.BOOST_HP, 5);
+ ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01:32726", 32726, 1),
+ Modifiers.BOOST_HP,
+ 5);
return true;
}
@@ -200,8 +215,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
public static boolean addUpgrade(ItemStack tStack, ItemStack tBauble) {
try {
- Iterator<Entry<ItemStack, BT>> it =
- mValidUpgradeListFormChange.entrySet().iterator();
+ Iterator<Entry<ItemStack, BT>> it = mValidUpgradeListFormChange.entrySet().iterator();
while (it.hasNext()) {
Entry<ItemStack, BT> pair = it.next();
if (pair.getKey().getItem() == tStack.getItem()
@@ -215,8 +229,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
}
try {
- Iterator<Entry<ItemStack, Pair<Modifiers, Integer>>> it2 =
- mValidUpgradeList.entrySet().iterator();
+ Iterator<Entry<ItemStack, Pair<Modifiers, Integer>>> it2 = mValidUpgradeList.entrySet().iterator();
while (it2.hasNext()) {
Entry<ItemStack, Pair<Modifiers, Integer>> pair = it2.next();
if (pair.getKey().getItem() == tStack.getItem()
@@ -325,9 +338,9 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
public boolean canInsertItem(int slot, ItemStack item, int side) {
Logger.INFO("Slot:" + slot + " | side? " + side);
- /*if (side == 1){
- return this.inventoryOutputs.isItemValidForSlot(slot-9, item);
- } */
+ /*
+ * if (side == 1){ return this.inventoryOutputs.isItemValidForSlot(slot-9, item); }
+ */
if (slot >= 9) {
return this.inventoryOutputs.isItemValidForSlot(slot - 9, item);
} else {
@@ -415,8 +428,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
try {
removeInputB = addUpgrade(tUpgrade, tBauble);
if (!removeInputB) {}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
if (removeInputA && removeInputB) {
if (this.setOutputStack(tBauble)) {
if (this.inventoryOutputs.getStackInSlot(1).stackSize > 1) {
@@ -448,8 +460,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
public static boolean isValidUpgrade(final ItemStack itemstack) {
boolean isValid = false;
if (itemstack != null) {
- Iterator<Entry<ItemStack, BT>> it =
- mValidUpgradeListFormChange.entrySet().iterator();
+ Iterator<Entry<ItemStack, BT>> it = mValidUpgradeListFormChange.entrySet().iterator();
while (it.hasNext()) {
Entry<ItemStack, BT> pair = it.next();
if (pair.getKey().getItem() == itemstack.getItem()
@@ -457,8 +468,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI
isValid = true;
}
}
- Iterator<Entry<ItemStack, Pair<Modifiers, Integer>>> it2 =
- mValidUpgradeList.entrySet().iterator();
+ Iterator<Entry<ItemStack, Pair<Modifiers, Integer>>> it2 = mValidUpgradeList.entrySet().iterator();
while (it2.hasNext()) {
Entry<ItemStack, Pair<Modifiers, Integer>> pair = it2.next();
if (pair.getKey().getItem() == itemstack.getItem()
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
index df50bd98a9..a1fc69a357 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
@@ -1,18 +1,8 @@
package gtPlusPlus.core.tileentities.machines;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
-import gtPlusPlus.core.inventories.InventoryPestKiller;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.MISC_MATERIALS;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.util.ArrayList;
import java.util.List;
+
import net.minecraft.entity.Entity;
import net.minecraft.entity.passive.EntityBat;
import net.minecraft.entity.player.EntityPlayer;
@@ -35,6 +25,18 @@ import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.oredict.OreDictionary;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
+import gtPlusPlus.core.inventories.InventoryPestKiller;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class TileEntityPestKiller extends TileEntity implements ISidedInventory, IFluidHandler {
private final int mBaseTickRate = 20 * 30;
@@ -384,8 +386,15 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
}
if (this != null) {
- FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(
- fluid, this.getWorldObj(), this.xCoord, this.yCoord, this.zCoord, this.mTank, 0));
+ FluidEvent.fireEvent(
+ new FluidEvent.FluidDrainingEvent(
+ fluid,
+ this.getWorldObj(),
+ this.xCoord,
+ this.yCoord,
+ this.zCoord,
+ this.mTank,
+ 0));
}
}
updateTileEntity();
@@ -404,7 +413,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
@Override
public final FluidTankInfo[] getTankInfo(ForgeDirection from) {
- return new FluidTankInfo[] {this.mTank.getInfo()};
+ return new FluidTankInfo[] { this.mTank.getInfo() };
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
index 4087472ce3..77a83d90fe 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.tileentities.machines;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.item.chemistry.AgriculturalChem;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityChicken;
@@ -16,6 +12,11 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class TileEntityPooCollector extends TileEntityBaseFluidCollector {
public TileEntityPooCollector() {
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
index 0ca1b24ef4..0d74b69fb2 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java
@@ -1,5 +1,16 @@
package gtPlusPlus.core.tileentities.machines;
+import java.util.List;
+import java.util.Vector;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+
import gregtech.api.enums.ItemList;
import gregtech.common.items.GT_MetaGenerated_Item_01;
import gtPlusPlus.api.objects.Logger;
@@ -18,15 +29,6 @@ import ic2.api.network.INetworkDataProvider;
import ic2.api.network.INetworkUpdateListener;
import ic2.api.tile.IWrenchable;
import ic2.core.IC2;
-import java.util.List;
-import java.util.Vector;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
public class TileEntityProjectTable extends TileEntity
implements INetworkDataProvider, INetworkUpdateListener, IWrenchable {
@@ -142,8 +144,8 @@ public class TileEntityProjectTable extends TileEntity
ItemStack outputComponent = container.getOutputContent();
ItemStack[] craftInputComponent = container.getInputComponents();
- ItemStack newStick =
- NBTUtils.writeItemsToNBT(dataStick, new ItemStack[] {outputComponent}, "Output");
+ ItemStack newStick = NBTUtils
+ .writeItemsToNBT(dataStick, new ItemStack[] { outputComponent }, "Output");
newStick = NBTUtils.writeItemsToNBT(newStick, craftInputComponent);
NBTUtils.setBookTitle(newStick, "Encrypted Project Data");
NBTUtils.setBoolean(newStick, "mEncrypted", true);
@@ -164,143 +166,135 @@ public class TileEntityProjectTable extends TileEntity
}
// Utils.LOG_INFO("Doing thing 1");
- if (dataStick != null)
- if (dataStick.getItem() instanceof ModularBauble) {
- Logger.INFO("Doing thing 2");
- ItemStack tBauble = dataStick;
- dataStick = null;
- this.inventoryOutputs.setInventorySlotContents(0, dataStick);
- if (this.inventoryGrid != null) {
- Logger.INFO("Doing things");
- ItemStack[] tStack = container.getInputComponents();
- if (tStack != null) {
- // Utils.LOG_INFO(""+tStack.length);
- if (tBauble != null) {
- for (int i = 0; i < tStack.length; i++) {
-
- ItemStack testStack;
- if ((testStack = container.inventoryGrid.getStackInSlot(i)) != null) {
- Logger.INFO("FOUND: " + testStack.getDisplayName());
- }
+ if (dataStick != null) if (dataStick.getItem() instanceof ModularBauble) {
+ Logger.INFO("Doing thing 2");
+ ItemStack tBauble = dataStick;
+ dataStick = null;
+ this.inventoryOutputs.setInventorySlotContents(0, dataStick);
+ if (this.inventoryGrid != null) {
+ Logger.INFO("Doing things");
+ ItemStack[] tStack = container.getInputComponents();
+ if (tStack != null) {
+ // Utils.LOG_INFO(""+tStack.length);
+ if (tBauble != null) {
+ for (int i = 0; i < tStack.length; i++) {
+
+ ItemStack testStack;
+ if ((testStack = container.inventoryGrid.getStackInSlot(i)) != null) {
+ Logger.INFO("FOUND: " + testStack.getDisplayName());
+ }
- if (tStack[i] != null) {
- Logger.INFO("found " + tStack[i].getDisplayName());
- try {
- if (tStack[i].getItem() == Items.feather) {
- ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_BELT);
- Logger.INFO("buffed Modular bauble");
- tStack[i] = null;
- container.inventoryGrid.setInventorySlotContents(i, null);
- this.inventoryGrid.setInventorySlotContents(i, null);
- }
- if (tStack[i].getItem() == Items.bed) {
- ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_RING);
- Logger.INFO("buffed Modular bauble");
- tStack[i] = null;
- container.inventoryGrid.setInventorySlotContents(i, null);
- this.inventoryGrid.setInventorySlotContents(i, null);
- }
- if (tStack[i].getItem() == Items.boat) {
- ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_AMULET);
- Logger.INFO("buffed Modular bauble");
- tStack[i] = null;
- container.inventoryGrid.setInventorySlotContents(i, null);
- this.inventoryGrid.setInventorySlotContents(i, null);
- }
-
- if (tStack[i].getItem() == Items.egg) {
- ModularArmourUtils.setModifierLevel(
- tBauble,
- Modifiers.BOOST_HOLY,
- ModularArmourUtils.getModifierLevel(
- tBauble, Modifiers.BOOST_HOLY)
- + 1);
- Logger.INFO("buffed Modular bauble");
- tStack[i] = null;
- container.inventoryGrid.setInventorySlotContents(i, null);
- this.inventoryGrid.setInventorySlotContents(i, null);
- }
-
- if (tStack[i].getItem() == Items.baked_potato) {
- ModularArmourUtils.setModifierLevel(
- tBauble,
- Modifiers.BOOST_DEF,
- ModularArmourUtils.getModifierLevel(
- tBauble, Modifiers.BOOST_DEF)
- + 1);
- Logger.INFO("buffed Modular bauble");
- tStack[i] = null;
- container.inventoryGrid.setInventorySlotContents(i, null);
- this.inventoryGrid.setInventorySlotContents(i, null);
- }
-
- if (tStack[i].getItem() == Items.cooked_beef) {
- ModularArmourUtils.setModifierLevel(
- tBauble,
- Modifiers.BOOST_HP,
- ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_HP)
- + 1);
- Logger.INFO("buffed Modular bauble");
- tStack[i] = null;
- container.inventoryGrid.setInventorySlotContents(i, null);
- this.inventoryGrid.setInventorySlotContents(i, null);
- }
-
- if (tStack[i]
- == ItemUtils.simpleMetaStack(
- "gregtech:gt.metaitem.01:17019", 17019, 1)) {
- ModularArmourUtils.setModifierLevel(
- tBauble,
- Modifiers.BOOST_DEF,
- ModularArmourUtils.getModifierLevel(
- tBauble, Modifiers.BOOST_DEF)
- + 1);
- Logger.INFO("buffed Modular bauble");
- tStack[i] = null;
- container.inventoryGrid.setInventorySlotContents(i, null);
- }
- if (tStack[i] == ItemList.Electric_Motor_LV.get(1)) {
- ModularArmourUtils.setModifierLevel(
- tBauble,
- Modifiers.BOOST_DAMAGE,
- ModularArmourUtils.getModifierLevel(
- tBauble, Modifiers.BOOST_DAMAGE)
- + 1);
- Logger.INFO("buffed Modular bauble");
- tStack[i] = null;
- container.inventoryGrid.setInventorySlotContents(i, null);
- } else if (tStack[i] == ItemList.Electric_Motor_MV.get(1)) {
- ModularArmourUtils.setModifierLevel(
- tBauble,
- Modifiers.BOOST_DAMAGE,
- ModularArmourUtils.getModifierLevel(
- tBauble, Modifiers.BOOST_DAMAGE)
- + 2);
- Logger.INFO("buffed Modular bauble");
- tStack[i] = null;
- container.inventoryGrid.setInventorySlotContents(i, null);
- } else if (tStack[i] == ItemList.Electric_Motor_HV.get(1)) {
- ModularArmourUtils.setModifierLevel(
- tBauble,
- Modifiers.BOOST_DAMAGE,
- ModularArmourUtils.getModifierLevel(
- tBauble, Modifiers.BOOST_DAMAGE)
- + 3);
- Logger.INFO("buffed Modular bauble");
- tStack[i] = null;
- container.inventoryGrid.setInventorySlotContents(i, null);
- }
- } catch (Throwable t) {
+ if (tStack[i] != null) {
+ Logger.INFO("found " + tStack[i].getDisplayName());
+ try {
+ if (tStack[i].getItem() == Items.feather) {
+ ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_BELT);
+ Logger.INFO("buffed Modular bauble");
+ tStack[i] = null;
+ container.inventoryGrid.setInventorySlotContents(i, null);
+ this.inventoryGrid.setInventorySlotContents(i, null);
+ }
+ if (tStack[i].getItem() == Items.bed) {
+ ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_RING);
+ Logger.INFO("buffed Modular bauble");
+ tStack[i] = null;
+ container.inventoryGrid.setInventorySlotContents(i, null);
+ this.inventoryGrid.setInventorySlotContents(i, null);
+ }
+ if (tStack[i].getItem() == Items.boat) {
+ ModularArmourUtils.setBaubleType(tBauble, BT.TYPE_AMULET);
+ Logger.INFO("buffed Modular bauble");
+ tStack[i] = null;
+ container.inventoryGrid.setInventorySlotContents(i, null);
+ this.inventoryGrid.setInventorySlotContents(i, null);
+ }
+ if (tStack[i].getItem() == Items.egg) {
+ ModularArmourUtils.setModifierLevel(
+ tBauble,
+ Modifiers.BOOST_HOLY,
+ ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_HOLY)
+ + 1);
+ Logger.INFO("buffed Modular bauble");
+ tStack[i] = null;
+ container.inventoryGrid.setInventorySlotContents(i, null);
+ this.inventoryGrid.setInventorySlotContents(i, null);
}
+
+ if (tStack[i].getItem() == Items.baked_potato) {
+ ModularArmourUtils.setModifierLevel(
+ tBauble,
+ Modifiers.BOOST_DEF,
+ ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DEF)
+ + 1);
+ Logger.INFO("buffed Modular bauble");
+ tStack[i] = null;
+ container.inventoryGrid.setInventorySlotContents(i, null);
+ this.inventoryGrid.setInventorySlotContents(i, null);
+ }
+
+ if (tStack[i].getItem() == Items.cooked_beef) {
+ ModularArmourUtils.setModifierLevel(
+ tBauble,
+ Modifiers.BOOST_HP,
+ ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_HP)
+ + 1);
+ Logger.INFO("buffed Modular bauble");
+ tStack[i] = null;
+ container.inventoryGrid.setInventorySlotContents(i, null);
+ this.inventoryGrid.setInventorySlotContents(i, null);
+ }
+
+ if (tStack[i] == ItemUtils
+ .simpleMetaStack("gregtech:gt.metaitem.01:17019", 17019, 1)) {
+ ModularArmourUtils.setModifierLevel(
+ tBauble,
+ Modifiers.BOOST_DEF,
+ ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DEF)
+ + 1);
+ Logger.INFO("buffed Modular bauble");
+ tStack[i] = null;
+ container.inventoryGrid.setInventorySlotContents(i, null);
+ }
+ if (tStack[i] == ItemList.Electric_Motor_LV.get(1)) {
+ ModularArmourUtils.setModifierLevel(
+ tBauble,
+ Modifiers.BOOST_DAMAGE,
+ ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DAMAGE)
+ + 1);
+ Logger.INFO("buffed Modular bauble");
+ tStack[i] = null;
+ container.inventoryGrid.setInventorySlotContents(i, null);
+ } else if (tStack[i] == ItemList.Electric_Motor_MV.get(1)) {
+ ModularArmourUtils.setModifierLevel(
+ tBauble,
+ Modifiers.BOOST_DAMAGE,
+ ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DAMAGE)
+ + 2);
+ Logger.INFO("buffed Modular bauble");
+ tStack[i] = null;
+ container.inventoryGrid.setInventorySlotContents(i, null);
+ } else if (tStack[i] == ItemList.Electric_Motor_HV.get(1)) {
+ ModularArmourUtils.setModifierLevel(
+ tBauble,
+ Modifiers.BOOST_DAMAGE,
+ ModularArmourUtils.getModifierLevel(tBauble, Modifiers.BOOST_DAMAGE)
+ + 3);
+ Logger.INFO("buffed Modular bauble");
+ tStack[i] = null;
+ container.inventoryGrid.setInventorySlotContents(i, null);
+ }
+ } catch (Throwable t) {
+
}
}
- Logger.INFO("set new Modular bauble");
- this.inventoryOutputs.setInventorySlotContents(1, tBauble);
}
+ Logger.INFO("set new Modular bauble");
+ this.inventoryOutputs.setInventorySlotContents(1, tBauble);
}
}
}
+ }
}
super.updateEntity();
}
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java
index 840893703a..c070353a98 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java
@@ -1,13 +1,7 @@
package gtPlusPlus.core.tileentities.machines;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.inventories.Inventory_RoundRobinator;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.core.util.sys.KeyboardUtils;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockChest;
import net.minecraft.command.IEntitySelector;
@@ -29,6 +23,14 @@ import net.minecraft.util.Facing;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.inventories.Inventory_RoundRobinator;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
+
public class TileEntityRoundRobinator extends TileEntity implements ISidedInventory, IHopper {
private int tickCount = 0;
@@ -186,7 +188,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
@Override
public int[] getAccessibleSlotsFromSide(final int aSide) {
- return new int[] {0, 1, 2, 3, 4};
+ return new int[] { 0, 1, 2, 3, 4 };
}
@Override
@@ -287,6 +289,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
/**
* Toggle active state of side
+ *
* @param aSide - Forge Direction / Side
* @return - True if the side is now Active, false if now disabled.
*/
@@ -297,8 +300,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
public void setSideActive(boolean aActive, int aSide) {
try {
- if (aSide < 2) {
- } else {
+ if (aSide < 2) {} else {
if (aData < 1111) {
aData = 1111;
} else if (aData > 2222) {
@@ -445,6 +447,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
/**
* Is Empty
+ *
* @return
*/
private boolean isEmpty() {
@@ -557,8 +560,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
}
private static boolean canInsertItemIntoNeighbour(IInventory aNeighbour, ItemStack aStack, int aSlot, int aSide) {
- return !aNeighbour.isItemValidForSlot(aSlot, aStack)
- ? false
+ return !aNeighbour.isItemValidForSlot(aSlot, aStack) ? false
: !(aNeighbour instanceof ISidedInventory)
|| ((ISidedInventory) aNeighbour).canInsertItem(aSlot, aStack, aSide);
}
@@ -637,12 +639,9 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
}
private static boolean areItemStacksEqual(ItemStack aStack, ItemStack aStack2) {
- return aStack.getItem() != aStack2.getItem()
- ? false
- : (aStack.getItemDamage() != aStack2.getItemDamage()
- ? false
- : (aStack.stackSize > aStack.getMaxStackSize()
- ? false
+ return aStack.getItem() != aStack2.getItem() ? false
+ : (aStack.getItemDamage() != aStack2.getItemDamage() ? false
+ : (aStack.stackSize > aStack.getMaxStackSize() ? false
: ItemStack.areItemStackTagsEqual(aStack, aStack2)));
}
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
index 260e559c09..3a39639f62 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
@@ -1,13 +1,14 @@
package gtPlusPlus.core.tileentities.machines;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import gtPlusPlus.core.container.Container_TradeTable;
import gtPlusPlus.core.inventories.tradetable.InventoryTradeMain;
import gtPlusPlus.core.inventories.tradetable.InventoryTradeOutput;
import gtPlusPlus.core.tileentities.base.TileEntityBase;
import gtPlusPlus.core.util.minecraft.NBTUtils;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class TileEntityTradeTable extends TileEntityBase {
diff --git a/src/main/java/gtPlusPlus/core/util/MovingAverageLong.java b/src/main/java/gtPlusPlus/core/util/MovingAverageLong.java
index fee1fe84bc..202f10072a 100644
--- a/src/main/java/gtPlusPlus/core/util/MovingAverageLong.java
+++ b/src/main/java/gtPlusPlus/core/util/MovingAverageLong.java
@@ -4,9 +4,11 @@ import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Arrays;
+
import net.minecraft.nbt.NBTTagCompound;
public class MovingAverageLong {
+
private final long[] storage;
private int ptr;
@@ -39,6 +41,7 @@ public class MovingAverageLong {
/**
* if read failed, the internal states would not be changed.
+ *
* @return true if successful, false otherwise.
*/
public boolean read(NBTTagCompound tagCompound, String key) {
diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java
index 2242b7e673..b95574fc60 100644
--- a/src/main/java/gtPlusPlus/core/util/Utils.java
+++ b/src/main/java/gtPlusPlus/core/util/Utils.java
@@ -1,35 +1,5 @@
package gtPlusPlus.core.util;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.GTplusplus;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.NBTUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.core.util.sys.SystemUtils;
-import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
-import ic2.core.Ic2Items;
-import ic2.core.init.InternalName;
-import ic2.core.item.resources.ItemCell;
import java.awt.Color;
import java.awt.Graphics;
import java.io.ByteArrayOutputStream;
@@ -49,7 +19,9 @@ import java.util.List;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
+
import javax.xml.bind.DatatypeConverter;
+
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
@@ -68,8 +40,40 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
+
import org.apache.commons.lang3.EnumUtils;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.registry.EntityRegistry;
+import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
+import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.TC_Aspects;
+import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.NBTUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.core.util.sys.SystemUtils;
+import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
+import ic2.core.Ic2Items;
+import ic2.core.init.InternalName;
+import ic2.core.item.resources.ItemCell;
+
public class Utils {
public static final int WILDCARD_VALUE = Short.MAX_VALUE;
@@ -83,6 +87,7 @@ public class Utils {
}
static class ShortTimerTask extends TimerTask {
+
@Override
public void run() {
Logger.WARNING("Timer expired.");
@@ -174,9 +179,8 @@ public class Utils {
if ((input == null) || (target == null)) {
return false;
}
- return ((target.getItem() == input.getItem())
- && (((target.getItemDamage() == WILDCARD_VALUE) && !strict)
- || (target.getItemDamage() == input.getItemDamage())));
+ return ((target.getItem() == input.getItem()) && (((target.getItemDamage() == WILDCARD_VALUE) && !strict)
+ || (target.getItemDamage() == input.getItemDamage())));
}
// Register an event to both busses.
@@ -217,12 +221,10 @@ public class Utils {
}
/*
- * public static void recipeBuilderBlock(ItemStack slot_1, ItemStack slot_2,
- * ItemStack slot_3, ItemStack slot_4, ItemStack slot_5, ItemStack slot_6,
- * ItemStack slot_7, ItemStack slot_8, ItemStack slot_9, Block resultBlock){
- * GameRegistry.addRecipe(new ItemStack(resultBlock), new Object[] {"ABC",
- * "DEF", "GHI", 'A',slot_1,'B',slot_2,'C',slot_3,
- * 'D',slot_4,'E',slot_5,'F',slot_6, 'G',slot_7,'H',slot_8,'I',slot_9 }); }
+ * public static void recipeBuilderBlock(ItemStack slot_1, ItemStack slot_2, ItemStack slot_3, ItemStack slot_4,
+ * ItemStack slot_5, ItemStack slot_6, ItemStack slot_7, ItemStack slot_8, ItemStack slot_9, Block resultBlock){
+ * GameRegistry.addRecipe(new ItemStack(resultBlock), new Object[] {"ABC", "DEF", "GHI",
+ * 'A',slot_1,'B',slot_2,'C',slot_3, 'D',slot_4,'E',slot_5,'F',slot_6, 'G',slot_7,'H',slot_8,'I',slot_9 }); }
*/
public static String checkCorrectMiningToolForBlock(final Block currentBlock, final World currentWorld) {
@@ -242,8 +244,7 @@ public class Utils {
/**
*
- * @param colourStr
- * e.g. "#FFFFFF"
+ * @param colourStr e.g. "#FFFFFF"
* @return String - formatted "rgb(0,0,0)"
*/
public static String hex2RgbFormatted(final String hexString) {
@@ -265,8 +266,7 @@ public class Utils {
/**
*
- * @param colourStr
- * e.g. "#FFFFFF"
+ * @param colourStr e.g. "#FFFFFF"
* @return
*/
public static Color hex2Rgb(final String colorStr) {
@@ -278,8 +278,7 @@ public class Utils {
/**
*
- * @param colourInt
- * e.g. 0XFFFFFF
+ * @param colourInt e.g. 0XFFFFFF
* @return Colour
*/
public static Color hex2Rgb(final int colourInt) {
@@ -288,15 +287,13 @@ public class Utils {
/**
*
- * @param colourInt
- * e.g. 0XFFFFFF
+ * @param colourInt e.g. 0XFFFFFF
* @return short[]
*/
public static short[] hex2RgbShort(final int colourInt) {
final Color rgb = Color.decode(String.valueOf(colourInt));
- final short[] rgba = {
- (short) rgb.getRed(), (short) rgb.getGreen(), (short) rgb.getBlue(), (short) rgb.getAlpha()
- };
+ final short[] rgba = { (short) rgb.getRed(), (short) rgb.getGreen(), (short) rgb.getBlue(),
+ (short) rgb.getAlpha() };
return rgba;
}
@@ -336,8 +333,8 @@ public class Utils {
GTplusplus.proxy.generateMysteriousParticles(entity);
}
- public static void spawnFX(
- final World world, final int x, final int y, final int z, final String particleName, Object particleName2) {
+ public static void spawnFX(final World world, final int x, final int y, final int z, final String particleName,
+ Object particleName2) {
if (!world.isRemote) {
if ((particleName2 == null) || particleName2.equals("")) {
particleName2 = particleName;
@@ -404,8 +401,7 @@ public class Utils {
}
/*
- * Original Code by Chandana Napagoda -
- * https://cnapagoda.blogspot.com.au/2011/03/java-hex-color-code-generator.
+ * Original Code by Chandana Napagoda - https://cnapagoda.blogspot.com.au/2011/03/java-hex-color-code-generator.
* html
*/
public static Map<Integer, String> hexColourGenerator(final int colorCount) {
@@ -417,21 +413,16 @@ public class Utils {
for (int a = 0; (a < colorCount) && (maxColorValue >= countValue); a++) {
if (a != 0) {
countValue += devidedvalue;
- hexColorMap.put(
- a,
- Integer.toHexString(0x10000 | countValue).substring(1).toUpperCase());
+ hexColorMap.put(a, Integer.toHexString(0x10000 | countValue).substring(1).toUpperCase());
} else {
- hexColorMap.put(
- a,
- Integer.toHexString(0x10000 | countValue).substring(1).toUpperCase());
+ hexColorMap.put(a, Integer.toHexString(0x10000 | countValue).substring(1).toUpperCase());
}
}
return hexColorMap;
}
/*
- * Original Code by Chandana Napagoda -
- * https://cnapagoda.blogspot.com.au/2011/03/java-hex-color-code-generator.
+ * Original Code by Chandana Napagoda - https://cnapagoda.blogspot.com.au/2011/03/java-hex-color-code-generator.
* html
*/
public static Map<Integer, String> hexColourGeneratorRandom(final int colorCount) {
@@ -521,7 +512,9 @@ public class Utils {
final ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]);
Logger.WARNING("Successfully created " + temp.getDisplayName() + "s.");
FluidContainerRegistry.registerFluidContainer(
- FluidUtils.getFluidStack(s.toLowerCase(), 1000), temp.copy(), Ic2Items.cell.copy());
+ FluidUtils.getFluidStack(s.toLowerCase(), 1000),
+ temp.copy(),
+ Ic2Items.cell.copy());
ItemUtils.addItemToOreDictionary(temp.copy(), "cell" + s);
return temp;
} catch (final Exception e) {
@@ -547,7 +540,9 @@ public class Utils {
final ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]);
Logger.WARNING("Successfully created " + temp.getDisplayName() + "s.");
FluidContainerRegistry.registerFluidContainer(
- FluidUtils.getFluidStack(s.toLowerCase(), 1000), temp.copy(), Ic2Items.cell.copy());
+ FluidUtils.getFluidStack(s.toLowerCase(), 1000),
+ temp.copy(),
+ Ic2Items.cell.copy());
// ItemUtils.addItemToOreDictionary(temp.copy(), "cell"+s);
return temp;
} catch (final Exception e) {
@@ -647,8 +642,8 @@ public class Utils {
return compareModVersion(currentVersion, expectedVersion, "//.");
}
- public static Versioning compareModVersion(
- final String currentVersion, final String expectedVersion, final String delimiter) {
+ public static Versioning compareModVersion(final String currentVersion, final String expectedVersion,
+ final String delimiter) {
final String[] a = parseVersion(currentVersion, delimiter);
final String[] b = parseVersion(expectedVersion, delimiter);
final int[] c = new int[a.length];
@@ -693,8 +688,8 @@ public class Utils {
final float damage = gtMaterial.mToolQuality;
final int efficiency = (int) gtMaterial.mToolSpeed;
final int enchantability = gtMaterial.mEnchantmentToolsLevel;
- final ToolMaterial temp =
- EnumHelper.addToolMaterial(name, harvestLevel, durability, efficiency, damage, enchantability);
+ final ToolMaterial temp = EnumHelper
+ .addToolMaterial(name, harvestLevel, durability, efficiency, damage, enchantability);
return temp;
}
@@ -705,16 +700,26 @@ public class Utils {
final float damage = material.vToolQuality;
final int efficiency = material.vToolQuality;
// int enchantability = material.mEnchantmentToolsLevel;
- Logger.INFO("ToolMaterial stats for " + material.getLocalizedName() + " | harvestLevel:" + harvestLevel
- + " | durability:" + durability + " | toolQuality:" + damage + " | toolSpeed:" + damage);
+ Logger.INFO(
+ "ToolMaterial stats for " + material.getLocalizedName()
+ + " | harvestLevel:"
+ + harvestLevel
+ + " | durability:"
+ + durability
+ + " | toolQuality:"
+ + damage
+ + " | toolSpeed:"
+ + damage);
final ToolMaterial temp = EnumHelper.addToolMaterial(name, harvestLevel, durability, efficiency, damage, 0);
return temp;
}
public static enum Versioning {
+
EQUAL(0),
NEWER(1),
OLDER(-1);
+
private final int versioningInfo;
private Versioning(final int versionStatus) {
@@ -728,11 +733,7 @@ public class Utils {
public static String addBookTitleLocalization(final String aTitle) {
return GT_LanguageManager.addStringLocalization(
- new StringBuilder()
- .append("Book.")
- .append(aTitle)
- .append(".Name")
- .toString(),
+ new StringBuilder().append("Book.").append(aTitle).append(".Name").toString(),
aTitle,
!GregTech_API.sPostloadFinished);
}
@@ -741,17 +742,8 @@ public class Utils {
String[] aLocalizationPages = new String[aPages.length];
for (byte i = 0; i < aPages.length; i = (byte) (i + 1)) {
aLocalizationPages[i] = GT_LanguageManager.addStringLocalization(
- new StringBuilder()
- .append("Book.")
- .append(aTitle)
- .append(".Page")
- .append(
- (i < 10)
- ? new StringBuilder()
- .append("0")
- .append(i)
- .toString()
- : Byte.valueOf(i))
+ new StringBuilder().append("Book.").append(aTitle).append(".Page")
+ .append((i < 10) ? new StringBuilder().append("0").append(i).toString() : Byte.valueOf(i))
.toString(),
aPages[i],
!GregTech_API.sPostloadFinished);
@@ -759,19 +751,14 @@ public class Utils {
return aLocalizationPages;
}
- public static ItemStack getWrittenBook(
- final ItemStack aBook,
- final int aID,
- final String aMapping,
- final String aTitle,
- final String aAuthor,
- final String[] aPages) {
+ public static ItemStack getWrittenBook(final ItemStack aBook, final int aID, final String aMapping,
+ final String aTitle, final String aAuthor, final String[] aPages) {
if (GT_Utility.isStringInvalid(aMapping)) {
return null;
}
ItemStack rStack = CORE.sBookList.get(aMapping);
if (rStack != null) {
- return GT_Utility.copyAmount(1L, new Object[] {rStack});
+ return GT_Utility.copyAmount(1L, new Object[] { rStack });
}
if ((GT_Utility.isStringInvalid(aTitle)) || (GT_Utility.isStringInvalid(aAuthor)) || (aPages.length <= 0)) {
return null;
@@ -791,45 +778,36 @@ public class Utils {
tNBTList.appendTag(new NBTTagString(aPages[i]));
} else {
Logger.INFO("WARNING: String for written Book too long! -> " + aPages[i]);
- GT_Log.err.println(new StringBuilder()
- .append("WARNING: String for written Book too long! -> ")
- .append(aPages[i])
- .toString());
+ GT_Log.err.println(
+ new StringBuilder().append("WARNING: String for written Book too long! -> ")
+ .append(aPages[i]).toString());
}
} else {
Logger.INFO("WARNING: Too much Pages for written Book! -> " + aTitle);
- GT_Log.err.println(new StringBuilder()
- .append("WARNING: Too much Pages for written Book! -> ")
- .append(aTitle)
- .toString());
+ GT_Log.err.println(
+ new StringBuilder().append("WARNING: Too much Pages for written Book! -> ").append(aTitle)
+ .toString());
break;
}
}
- tNBTList.appendTag(new NBTTagString(new StringBuilder()
- .append("Credits to ")
- .append(aAuthor)
- .append(" for writing this Book. This was Book Nr. ")
- .append(aID)
- .append(" at its creation. Gotta get 'em all!")
- .toString()));
+ tNBTList.appendTag(
+ new NBTTagString(
+ new StringBuilder().append("Credits to ").append(aAuthor)
+ .append(" for writing this Book. This was Book Nr. ").append(aID)
+ .append(" at its creation. Gotta get 'em all!").toString()));
tNBT.setTag("pages", tNBTList);
rStack.setTagCompound(tNBT);
- GT_Log.out.println(new StringBuilder()
- .append("GT++_Mod: Added Book to Book++ List - Mapping: '")
- .append(aMapping)
- .append("' - Name: '")
- .append(aTitle)
- .append("' - Author: '")
- .append(aAuthor)
- .append("'")
- .toString());
+ GT_Log.out.println(
+ new StringBuilder().append("GT++_Mod: Added Book to Book++ List - Mapping: '").append(aMapping)
+ .append("' - Name: '").append(aTitle).append("' - Author: '").append(aAuthor).append("'")
+ .toString());
NBTUtils.createIntegerTagCompound(rStack, "stats", "mMeta", vMeta);
CORE.sBookList.put(aMapping, rStack);
Logger.INFO("Creating book: " + aTitle + " by " + aAuthor + ". Using Meta " + vMeta + ".");
- return GT_Utility.copy(new Object[] {rStack});
+ return GT_Utility.copy(new Object[] { rStack });
}
- @SuppressWarnings({"unused", "unchecked"})
+ @SuppressWarnings({ "unused", "unchecked" })
public static Pair<Integer, Integer> getGregtechVersion() {
Pair<Integer, Integer> version;
if (GT_Mod.VERSION == 509) {
@@ -915,12 +893,10 @@ public class Utils {
out.writeObject(bytes);
out.flush();
result = bos.toByteArray();
- } catch (IOException e) {
- } finally {
+ } catch (IOException e) {} finally {
try {
bos.close();
- } catch (IOException e) {
- }
+ } catch (IOException e) {}
}
return calculateChecksumMD5(result);
}
diff --git a/src/main/java/gtPlusPlus/core/util/data/AES.java b/src/main/java/gtPlusPlus/core/util/data/AES.java
index e782a48148..8f9580c760 100644
--- a/src/main/java/gtPlusPlus/core/util/data/AES.java
+++ b/src/main/java/gtPlusPlus/core/util/data/AES.java
@@ -7,13 +7,13 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Base64;
+
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
public class AES {
- private final String secret;
- ;
+ private final String secret;;
private final SecretKeySpec secretKey;
diff --git a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java
index 8630ac5abf..75a3daacad 100644
--- a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java
@@ -1,15 +1,17 @@
package gtPlusPlus.core.util.data;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
import net.minecraft.item.ItemStack;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class ArrayUtils {
public static <V> V[] expandArray(final V[] someArray, final V newValueToAdd) {
@@ -36,10 +38,12 @@ public class ArrayUtils {
return newArray;
}
- /*public static <V> Object getMostCommonElement(List<V> list) {
- Optional r = list.stream().map(V::getTextureSet).collect(Collectors.groupingBy(Function.identity(), Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey);
- return r.get();
- }*/
+ /*
+ * public static <V> Object getMostCommonElement(List<V> list) { Optional r =
+ * list.stream().map(V::getTextureSet).collect(Collectors.groupingBy(Function.identity(),
+ * Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey); return
+ * r.get(); }
+ */
public static Object[] removeNulls(final Object[] v) {
List<Object> list = new ArrayList<Object>(Arrays.asList(v));
diff --git a/src/main/java/gtPlusPlus/core/util/data/EnumUtils.java b/src/main/java/gtPlusPlus/core/util/data/EnumUtils.java
index 2a74edb5aa..71d0c16e14 100644
--- a/src/main/java/gtPlusPlus/core/util/data/EnumUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/data/EnumUtils.java
@@ -6,9 +6,8 @@ import com.google.common.base.Optional;
public class EnumUtils {
/**
- * Returns the value of an Enum if it exists.
- * If value is not found, case-insensitive search will occur.
- * If value still not found, an IllegalArgumentException is thrown.
+ * Returns the value of an Enum if it exists. If value is not found, case-insensitive search will occur. If value
+ * still not found, an IllegalArgumentException is thrown.
**/
public static <T extends Enum<T>> T getValue(Class<T> enumeration, String name) {
Optional<T> j = Enums.getIfPresent(enumeration, name);
@@ -22,8 +21,8 @@ public class EnumUtils {
}
/**
- * Finds the value of the given enumeration by name, case-insensitive.
- * Throws an IllegalArgumentException if no match is found.
+ * Finds the value of the given enumeration by name, case-insensitive. Throws an IllegalArgumentException if no
+ * match is found.
**/
private static <T extends Enum<T>> T valueOfIgnoreCase(Class<T> enumeration, String name) {
diff --git a/src/main/java/gtPlusPlus/core/util/data/FileUtils.java b/src/main/java/gtPlusPlus/core/util/data/FileUtils.java
index 19f868c2a9..cec639a76c 100644
--- a/src/main/java/gtPlusPlus/core/util/data/FileUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/data/FileUtils.java
@@ -1,7 +1,5 @@
package gtPlusPlus.core.util.data;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.Utils;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -13,6 +11,9 @@ import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.List;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.Utils;
+
public class FileUtils {
private static final Charset utf8 = StandardCharsets.UTF_8;
@@ -90,16 +91,15 @@ public class FileUtils {
return newSize > oldSize;
}
}
- } catch (IOException e) {
- }
+ } catch (IOException e) {}
return false;
}
/**
- * Reads the contents of a file line by line to a List of Strings using the default encoding for the VM.
- * The file is always closed.
+ * Reads the contents of a file line by line to a List of Strings using the default encoding for the VM. The file is
+ * always closed.
*
- * @param file the file to read, must not be {@code null}
+ * @param file the file to read, must not be {@code null}
* @return the list of Strings representing each line in the file, never {@code null}
* @throws IOException in case of an I/O error
* @since 1.3
diff --git a/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java b/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java
index a67262c4bd..2ad38d1de5 100644
--- a/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java
@@ -1,14 +1,16 @@
package gtPlusPlus.core.util.data;
+import java.io.*;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.registry.GameData;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.io.*;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
public class LocaleUtils {
@@ -41,8 +43,7 @@ public class LocaleUtils {
}
}
- } catch (Throwable T) {
- }
+ } catch (Throwable T) {}
}
writeToFile("Dumping Blocks from " + mod.getModId() + ".");
for (Object B : GameData.getBlockRegistry()) {
@@ -61,8 +62,7 @@ public class LocaleUtils {
}
}
- } catch (Throwable T) {
- }
+ } catch (Throwable T) {}
}
return true;
@@ -76,7 +76,6 @@ public class LocaleUtils {
writer.write(S);
writer.newLine();
writer.close();
- } catch (IOException e) {
- }
+ } catch (IOException e) {}
}
}
diff --git a/src/main/java/gtPlusPlus/core/util/data/StringUtils.java b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java
index af40dbae41..d837901ea8 100644
--- a/src/main/java/gtPlusPlus/core/util/data/StringUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java
@@ -82,6 +82,7 @@ public class StringUtils {
// Can call this Enum for formatting.
public static enum TextUtils {
+
blue('1'),
green('2'),
teal('3'),
@@ -136,12 +137,12 @@ public class StringUtils {
/**
* Is this a special regex character for delimination? (.$|()[]{}^?*+\\)
+ *
* @param aChar - The char to test
* @return - Is this a special character?
*/
public static boolean isSpecialCharacter(char aChar) {
- if (aChar == '"'
- || aChar == '.'
+ if (aChar == '"' || aChar == '.'
|| aChar == '$'
|| aChar == '|'
|| aChar == '('
diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
index a6441ee558..56c93d4a4d 100644
--- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
+++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
@@ -10,12 +10,14 @@ public class DEBUG_INIT {
}
public static void registerItems() {
- /*ModItems.itemDebugShapeSpawner = new DEBUG_ITEM_ShapeSpawner("itemDebugShapeSpawner", AddToCreativeTab.tabMisc, 1, 500);
- GameRegistry.registerItem(ModItems.itemDebugShapeSpawner, "itemDebugShapeSpawner");
- ModItems.itemBedLocator_Base = new BedLocator_Base("itemBedLocator_Base");
- GameRegistry.registerItem(ModItems.itemBedLocator_Base, "itemBedLocator_Base");
- ModItems.itemBaseItemWithCharge = new BaseItemWithCharge("itemBaseItemWithCharge", 0, 1000);
- GameRegistry.registerItem(ModItems.itemBaseItemWithCharge, "itemBaseItemWithCharge");*/
+ /*
+ * ModItems.itemDebugShapeSpawner = new DEBUG_ITEM_ShapeSpawner("itemDebugShapeSpawner",
+ * AddToCreativeTab.tabMisc, 1, 500); GameRegistry.registerItem(ModItems.itemDebugShapeSpawner,
+ * "itemDebugShapeSpawner"); ModItems.itemBedLocator_Base = new BedLocator_Base("itemBedLocator_Base");
+ * GameRegistry.registerItem(ModItems.itemBedLocator_Base, "itemBedLocator_Base");
+ * ModItems.itemBaseItemWithCharge = new BaseItemWithCharge("itemBaseItemWithCharge", 0, 1000);
+ * GameRegistry.registerItem(ModItems.itemBaseItemWithCharge, "itemBaseItemWithCharge");
+ */
}
public static void registerTEs() {}
diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java
index cd8ca0e536..07f8d6385a 100644
--- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java
+++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java
@@ -2,11 +2,8 @@ package gtPlusPlus.core.util.debug;
import static net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.BaseItemGeneric;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -14,6 +11,11 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.BaseItemGeneric;
+
public class DEBUG_ITEM_ShapeSpawner extends BaseItemGeneric {
public DEBUG_ITEM_ShapeSpawner(String s, CreativeTabs c, int stackSize, int maxDmg) {
@@ -42,7 +44,7 @@ public class DEBUG_ITEM_ShapeSpawner extends BaseItemGeneric {
}
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add(EnumChatFormatting.GOLD + "For Testing Gregtech Shapes!");
diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java
index 9cff0758a7..53159a9412 100644
--- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java
+++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java
@@ -2,6 +2,13 @@ package gtPlusPlus.core.util.debug;
import static gregtech.api.enums.GT_Values.V;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
@@ -19,32 +26,14 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
public static boolean disableMaintenance;
- public boolean mMachine = false,
- mWrench = false,
- mScrewdriver = false,
- mSoftHammer = false,
- mHardHammer = false,
- mSolderingTool = false,
- mCrowbar = false,
- mRunningOnLoad = false;
- public int mPollution = 0,
- mProgresstime = 0,
- mMaxProgresstime = 0,
- mEUt = 0,
- mEfficiencyIncrease = 0,
- mUpdate = 0,
- mStartUpCheck = 100,
- mRuntime = 0,
- mEfficiency = 0;
+ public boolean mMachine = false, mWrench = false, mScrewdriver = false, mSoftHammer = false, mHardHammer = false,
+ mSolderingTool = false, mCrowbar = false, mRunningOnLoad = false;
+ public int mPollution = 0, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mEfficiencyIncrease = 0, mUpdate = 0,
+ mStartUpCheck = 100, mRuntime = 0, mEfficiency = 0;
public ItemStack[] mOutputItems = null;
public FluidStack[] mOutputFluids = null;
public ArrayList<GT_MetaTileEntity_Hatch_Input> mInputHatches = new ArrayList<>();
@@ -58,14 +47,14 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
public DEBUG_MULTIBLOCK_ShapeSpawner(final int aID, final String aName, final String aNameRegional) {
super(aID, aName, aNameRegional, 2);
- DEBUG_MULTIBLOCK_ShapeSpawner.disableMaintenance = GregTech_API.sMachineFile.get(
- ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false);
+ DEBUG_MULTIBLOCK_ShapeSpawner.disableMaintenance = GregTech_API.sMachineFile
+ .get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false);
}
public DEBUG_MULTIBLOCK_ShapeSpawner(final String aName) {
super(aName, 2);
- DEBUG_MULTIBLOCK_ShapeSpawner.disableMaintenance = GregTech_API.sMachineFile.get(
- ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false);
+ DEBUG_MULTIBLOCK_ShapeSpawner.disableMaintenance = GregTech_API.sMachineFile
+ .get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false);
}
public static boolean isValidMetaTileEntity(final MetaTileEntity aMetaTileEntity) {
@@ -264,13 +253,10 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
if (tStack != null) {
try {
GT_Mod.achievements.issueAchivementHatch(
- aBaseMetaTileEntity
- .getWorld()
- .getPlayerEntityByName(
- aBaseMetaTileEntity.getOwnerName()),
+ aBaseMetaTileEntity.getWorld().getPlayerEntityByName(
+ aBaseMetaTileEntity.getOwnerName()),
tStack);
- } catch (final Exception e) {
- }
+ } catch (final Exception e) {}
this.addOutput(tStack);
}
}
@@ -301,8 +287,7 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
if ((this.mOutputFluids != null) && (this.mOutputFluids.length > 0)) {
if (this.mOutputFluids.length > 1) {
GT_Mod.achievements.issueAchievement(
- aBaseMetaTileEntity
- .getWorld()
+ aBaseMetaTileEntity.getWorld()
.getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()),
"oilplant");
}
@@ -310,8 +295,7 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
}
}
} else {
- if (((aTick % 100) == 0)
- || aBaseMetaTileEntity.hasWorkJustBeenEnabled()
+ if (((aTick % 100) == 0) || aBaseMetaTileEntity.hasWorkJustBeenEnabled()
|| aBaseMetaTileEntity.hasInventoryBeenModified()) {
if (aBaseMetaTileEntity.isAllowedToWork()) {
@@ -329,14 +313,14 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
this.stopMachine();
}
}
- aBaseMetaTileEntity.setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127)
- | (this.mWrench ? 0 : 1)
- | (this.mScrewdriver ? 0 : 2)
- | (this.mSoftHammer ? 0 : 4)
- | (this.mHardHammer ? 0 : 8)
- | (this.mSolderingTool ? 0 : 16)
- | (this.mCrowbar ? 0 : 32)
- | (this.mMachine ? 0 : 64));
+ aBaseMetaTileEntity.setErrorDisplayID(
+ (aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (this.mWrench ? 0 : 1)
+ | (this.mScrewdriver ? 0 : 2)
+ | (this.mSoftHammer ? 0 : 4)
+ | (this.mHardHammer ? 0 : 8)
+ | (this.mSolderingTool ? 0 : 16)
+ | (this.mCrowbar ? 0 : 32)
+ | (this.mMachine ? 0 : 64));
aBaseMetaTileEntity.setActive(this.mMaxProgresstime > 0);
}
}
@@ -405,8 +389,8 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
public abstract int getDamageToComponent(ItemStack aStack);
/**
- * Gets the Amount of possibly outputted Items for loading the Output Stack Array from NBT.
- * This should be the largest Amount that can ever happen legitimately.
+ * Gets the Amount of possibly outputted Items for loading the Output Stack Array from NBT. This should be the
+ * largest Amount that can ever happen legitimately.
*/
public abstract int getAmountOfOutputs();
@@ -426,8 +410,7 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
}
public int getRepairStatus() {
- return (this.mWrench ? 1 : 0)
- + (this.mScrewdriver ? 1 : 0)
+ return (this.mWrench ? 1 : 0) + (this.mScrewdriver ? 1 : 0)
+ (this.mSoftHammer ? 1 : 0)
+ (this.mHardHammer ? 1 : 0)
+ (this.mSolderingTool ? 1 : 0)
@@ -467,8 +450,7 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
break;
}
}
- if ((this.mInventory[1] != null)
- && (this.getBaseMetaTileEntity().getRandomNumber(2) == 0)
+ if ((this.mInventory[1] != null) && (this.getBaseMetaTileEntity().getRandomNumber(2) == 0)
&& !this.mInventory[1].getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.")) {
if (this.mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) {
final NBTTagCompound tNBT = this.mInventory[1].getTagCompound();
@@ -612,8 +594,7 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
}
final FluidStack tLiquid = aLiquid.copy();
for (final GT_MetaTileEntity_Hatch_Output tHatch : this.mOutputHatches) {
- if (isValidMetaTileEntity(tHatch) && GT_ModHandler.isSteam(aLiquid)
- ? tHatch.outputsSteam()
+ if (isValidMetaTileEntity(tHatch) && GT_ModHandler.isSteam(aLiquid) ? tHatch.outputsSteam()
: tHatch.outputsLiquids()) {
final int tAmount = tHatch.fill(tLiquid, false);
if (tAmount >= tLiquid.amount) {
@@ -628,8 +609,7 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
private void addFluidOutputs(final FluidStack[] mOutputFluids2) {
for (int i = 0; i < mOutputFluids2.length; i++) {
- if ((this.mOutputHatches.size() > i)
- && (this.mOutputHatches.get(i) != null)
+ if ((this.mOutputHatches.size() > i) && (this.mOutputHatches.get(i) != null)
&& (mOutputFluids2[i] != null)
&& isValidMetaTileEntity(this.mOutputHatches.get(i))) {
this.mOutputHatches.get(i).fill(mOutputFluids2[i], true);
@@ -662,8 +642,8 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
return false;
}
aStack = GT_Utility.copy(aStack);
- // FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true);
- // if (aLiquid == null) {
+ // FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true);
+ // if (aLiquid == null) {
for (final GT_MetaTileEntity_Hatch_OutputBus tHatch : this.mOutputBusses) {
if (isValidMetaTileEntity(tHatch)) {
for (int i = tHatch.getSizeInventory() - 1; i >= 0; i--) {
@@ -680,17 +660,17 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
}
}
}
- // }else {
- // for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) {
- // if (isValidMetaTileEntity(tHatch) &&
+ // }else {
+ // for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) {
+ // if (isValidMetaTileEntity(tHatch) &&
// GT_ModHandler.isSteam(aLiquid)?tHatch.outputsSteam():tHatch.outputsLiquids()) {
- // int tAmount = tHatch.fill(aLiquid, false);
- // if (tAmount >= aLiquid.amount) {
- // return tHatch.fill(aLiquid, true) >= aLiquid.amount;
- // }
- // }
- // }
- // }
+ // int tAmount = tHatch.fill(aLiquid, false);
+ // if (tAmount >= aLiquid.amount) {
+ // return tHatch.fill(aLiquid, true) >= aLiquid.amount;
+ // }
+ // }
+ // }
+ // }
return false;
}
@@ -705,8 +685,7 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
for (final GT_MetaTileEntity_Hatch_Input tHatch : this.mInputHatches) {
tHatch.mRecipeMap = this.getRecipeMap();
if (isValidMetaTileEntity(tHatch)) {
- if (GT_Utility.areStacksEqual(
- aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(0))) {
+ if (GT_Utility.areStacksEqual(aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(0))) {
if (tHatch.getBaseMetaTileEntity().getStackInSlot(0).stackSize >= aStack.stackSize) {
tHatch.getBaseMetaTileEntity().decrStackSize(0, aStack.stackSize);
return true;
@@ -718,8 +697,7 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
tHatch.mRecipeMap = this.getRecipeMap();
if (isValidMetaTileEntity(tHatch)) {
for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) {
- if (GT_Utility.areStacksEqual(
- aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(i))) {
+ if (GT_Utility.areStacksEqual(aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(i))) {
if (tHatch.getBaseMetaTileEntity().getStackInSlot(0).stackSize >= aStack.stackSize) {
tHatch.getBaseMetaTileEntity().decrStackSize(0, aStack.stackSize);
return true;
@@ -937,15 +915,9 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
@Override
public String[] getInfoData() {
- return new String[] {
- "Progress:",
- (this.mProgresstime / 20) + "secs",
- (this.mMaxProgresstime / 20) + "secs",
- "Efficiency:",
- (this.mEfficiency / 100.0F) + "%",
- "Problems:",
- "" + (this.getIdealStatus() - this.getRepairStatus())
- };
+ return new String[] { "Progress:", (this.mProgresstime / 20) + "secs", (this.mMaxProgresstime / 20) + "secs",
+ "Efficiency:", (this.mEfficiency / 100.0F) + "%", "Problems:",
+ "" + (this.getIdealStatus() - this.getRepairStatus()) };
}
@Override
@@ -954,14 +926,14 @@ public abstract class DEBUG_MULTIBLOCK_ShapeSpawner extends MetaTileEntity {
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java
index de29c35820..16b6979dcb 100644
--- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java
+++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.util.debug;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
@@ -8,6 +7,8 @@ import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.item.Item;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+
public class DEBUG_ScreenOverlay extends Gui {
int width, height;
@@ -29,17 +30,16 @@ public class DEBUG_ScreenOverlay extends Gui {
heldItem = this.mc.thePlayer.getHeldItem().getItem();
if (heldItem != null) {
- /*if (heldItem instanceof StaballoyPickaxe){
-
- int dmg =((StaballoyPickaxe) heldItem).getDamage(((StaballoyPickaxe) heldItem).thisPickaxe);
-
- ((StaballoyPickaxe) heldItem).checkFacing(((StaballoyPickaxe) heldItem).localWorld);
- str = "DAMAGE: "+ dmg +" | FACING: "+((StaballoyPickaxe) heldItem).FACING+" | FACING_HORIZONTAL: "+((StaballoyPickaxe) heldItem).FACING_HORIZONTAL+" | LOOKING DIRECTION: "+((StaballoyPickaxe) heldItem).lookingDirection;
-
- drawString(fontRender, str, (this.width - fontRender.getStringWidth(str)) / 2, this.height / 10, 0xFFAA00);
- }*/
+ /*
+ * if (heldItem instanceof StaballoyPickaxe){ int dmg =((StaballoyPickaxe)
+ * heldItem).getDamage(((StaballoyPickaxe) heldItem).thisPickaxe); ((StaballoyPickaxe)
+ * heldItem).checkFacing(((StaballoyPickaxe) heldItem).localWorld); str = "DAMAGE: "+ dmg
+ * +" | FACING: "+((StaballoyPickaxe) heldItem).FACING+" | FACING_HORIZONTAL: "+((StaballoyPickaxe)
+ * heldItem).FACING_HORIZONTAL+" | LOOKING DIRECTION: "+((StaballoyPickaxe) heldItem).lookingDirection;
+ * drawString(fontRender, str, (this.width - fontRender.getStringWidth(str)) / 2, this.height / 10,
+ * 0xFFAA00); }
+ */
}
- } catch (final NullPointerException e) {
- }
+ } catch (final NullPointerException e) {}
}
}
diff --git a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java
index 004657ebcc..fa53c290fc 100644
--- a/src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java
+++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java
@@ -1,13 +1,15 @@
package gtPlusPlus.core.util.debug;
-import gtPlusPlus.api.objects.Logger;
import java.util.concurrent.TimeUnit;
+
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import gtPlusPlus.api.objects.Logger;
+
public class DEBUG_TimerThread implements Runnable {
private final World world;
@@ -26,8 +28,18 @@ public class DEBUG_TimerThread implements Runnable {
final int stepX = Minecraft.getMinecraft().objectMouseOver.blockX;
final int stepY = Minecraft.getMinecraft().objectMouseOver.blockY;
final int stepZ = Minecraft.getMinecraft().objectMouseOver.blockZ;
- Logger.INFO("Clicked on a Block @ " + "[X:" + stepX + "][Y:" + stepY + "][Z:" + stepZ + "]" + " with xDir:"
- + xDir + " zDir:" + zDir);
+ Logger.INFO(
+ "Clicked on a Block @ " + "[X:"
+ + stepX
+ + "][Y:"
+ + stepY
+ + "][Z:"
+ + stepZ
+ + "]"
+ + " with xDir:"
+ + xDir
+ + " zDir:"
+ + zDir);
this.world.setBlock(stepX, stepY, stepZ, Blocks.bedrock, 0, 3);
Logger.INFO("Makng it Bedrock for future investment.");
// for (int i = -1; i <= 1; i++) {
@@ -43,8 +55,18 @@ public class DEBUG_TimerThread implements Runnable {
// stepZ = stepZ+j;
// for (int h = -1; h <= 1; h++) {
// stepY = stepY+h;
- Logger.INFO("Placing Block @ " + "[X:" + i + "][Y:" + h + "][Z:" + j + "]" + " with xDir:" + xDir
- + " zDir:" + zDir);
+ Logger.INFO(
+ "Placing Block @ " + "[X:"
+ + i
+ + "][Y:"
+ + h
+ + "][Z:"
+ + j
+ + "]"
+ + " with xDir:"
+ + xDir
+ + " zDir:"
+ + zDir);
if ((h != 0) || ((((xDir + i) != 0) || ((zDir + j) != 0)) && ((i != 0) || (j != 0)))) {
this.world.setBlock(i, h, j, Blocks.stone, 0, 3);
} else {
diff --git a/src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java b/src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java
index cf3580f5b7..e774824fbf 100644
--- a/src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java
+++ b/src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java
@@ -1,21 +1,19 @@
package gtPlusPlus.core.util.debug;
import java.nio.ByteBuffer;
+
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
/**
- * User: The Grey Ghost
- * Date: 9/02/14
+ * User: The Grey Ghost Date: 9/02/14
*/
public class UtilityGL11Debug {
+
public class GLproperty {
- public GLproperty(
- final int init_gLconstant,
- final String init_name,
- final String init_description,
- final String init_category,
- final String init_fetchCommand) {
+
+ public GLproperty(final int init_gLconstant, final String init_name, final String init_description,
+ final String init_category, final String init_fetchCommand) {
this.gLconstant = init_gLconstant;
this.name = init_name;
this.description = init_description;
@@ -33,1064 +31,1265 @@ public class UtilityGL11Debug {
public static UtilityGL11Debug instance = new UtilityGL11Debug();
public GLproperty[] propertyList = {
- new GLproperty(GL11.GL_CURRENT_COLOR, "GL_CURRENT_COLOR", "Current color", "current", "glGetFloatv()"),
- new GLproperty(GL11.GL_CURRENT_INDEX, "GL_CURRENT_INDEX", "Current color index", "current", "glGetFloatv()"),
- new GLproperty(
- GL11.GL_CURRENT_TEXTURE_COORDS,
- "GL_CURRENT_TEXTURE_COORDS",
- "Current texture coordinates",
- "current",
- "glGetFloatv()"),
- new GLproperty(GL11.GL_CURRENT_NORMAL, "GL_CURRENT_NORMAL", "Current normal", "current", "glGetFloatv()"),
- new GLproperty(
- GL11.GL_CURRENT_RASTER_POSITION,
- "GL_CURRENT_RASTER_POSITION",
- "Current raster position",
- "current",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_CURRENT_RASTER_DISTANCE,
- "GL_CURRENT_RASTER_DISTANCE",
- "Current raster distance",
- "current",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_CURRENT_RASTER_COLOR,
- "GL_CURRENT_RASTER_COLOR",
- "Color associated with raster position",
- "current",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_CURRENT_RASTER_INDEX,
- "GL_CURRENT_RASTER_INDEX",
- "Color index associated with raster position",
- "current",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_CURRENT_RASTER_TEXTURE_COORDS,
- "GL_CURRENT_RASTER_TEXTURE_COORDS",
- "Texture coordinates associated with raster position",
- "current",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_CURRENT_RASTER_POSITION_VALID,
- "GL_CURRENT_RASTER_POSITION_VALID",
- "Raster position valid bit",
- "current",
- "glGetBooleanv()"),
- new GLproperty(GL11.GL_EDGE_FLAG, "GL_EDGE_FLAG", "Edge flag", "current", "glGetBooleanv()"),
- new GLproperty(GL11.GL_VERTEX_ARRAY, "GL_VERTEX_ARRAY", "Vertex array enable", "vertex-array", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_VERTEX_ARRAY_SIZE,
- "GL_VERTEX_ARRAY_SIZE",
- "Coordinates per vertex",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_VERTEX_ARRAY_TYPE,
- "GL_VERTEX_ARRAY_TYPE",
- "Type of vertex coordinates",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_VERTEX_ARRAY_STRIDE,
- "GL_VERTEX_ARRAY_STRIDE",
- "Stride between vertices",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_VERTEX_ARRAY_POINTER,
- "GL_VERTEX_ARRAY_POINTER",
- "Pointer to the vertex array",
- "vertex-array",
- "glGetPointerv()"),
- new GLproperty(GL11.GL_NORMAL_ARRAY, "GL_NORMAL_ARRAY", "Normal array enable", "vertex-array", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_NORMAL_ARRAY_TYPE,
- "GL_NORMAL_ARRAY_TYPE",
- "Type of normal coordinates",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_NORMAL_ARRAY_STRIDE,
- "GL_NORMAL_ARRAY_STRIDE",
- "Stride between normals",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_NORMAL_ARRAY_POINTER,
- "GL_NORMAL_ARRAY_POINTER",
- "Pointer to the normal array",
- "vertex-array",
- "glGetPointerv()"),
- new GLproperty(
- GL11.GL_COLOR_ARRAY, "GL_COLOR_ARRAY", "RGBA color array enable", "vertex-array", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_COLOR_ARRAY_SIZE,
- "GL_COLOR_ARRAY_SIZE",
- "Colors per vertex",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_COLOR_ARRAY_TYPE,
- "GL_COLOR_ARRAY_TYPE",
- "Type of color components",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_COLOR_ARRAY_STRIDE,
- "GL_COLOR_ARRAY_STRIDE",
- "Stride between colors",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_COLOR_ARRAY_POINTER,
- "GL_COLOR_ARRAY_POINTER",
- "Pointer to the color array",
- "vertex-array",
- "glGetPointerv()"),
- new GLproperty(
- GL11.GL_INDEX_ARRAY, "GL_INDEX_ARRAY", "Color-index array enable", "vertex-array", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_INDEX_ARRAY_TYPE,
- "GL_INDEX_ARRAY_TYPE",
- "Type of color indices",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_INDEX_ARRAY_STRIDE,
- "GL_INDEX_ARRAY_STRIDE",
- "Stride between color indices",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_INDEX_ARRAY_POINTER,
- "GL_INDEX_ARRAY_POINTER",
- "Pointer to the index array",
- "vertex-array",
- "glGetPointerv()"),
- new GLproperty(
- GL11.GL_TEXTURE_COORD_ARRAY,
- "GL_TEXTURE_COORD_ARRAY",
- "Texture coordinate array enable",
- "vertex-array",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_TEXTURE_COORD_ARRAY_SIZE,
- "GL_TEXTURE_COORD_ARRAY_SIZE",
- "Texture coordinates per element",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_TEXTURE_COORD_ARRAY_TYPE,
- "GL_TEXTURE_COORD_ARRAY_TYPE",
- "Type of texture coordinates",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_TEXTURE_COORD_ARRAY_STRIDE,
- "GL_TEXTURE_COORD_ARRAY_STRIDE",
- "Stride between texture coordinates",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_TEXTURE_COORD_ARRAY_POINTER,
- "GL_TEXTURE_COORD_ARRAY_POINTER",
- "Pointer to the texture coordinate array",
- "vertex-array",
- "glGetPointerv()"),
- new GLproperty(
- GL11.GL_EDGE_FLAG_ARRAY,
- "GL_EDGE_FLAG_ARRAY",
- "Edge flag array enable",
- "vertex-array",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_EDGE_FLAG_ARRAY_STRIDE,
- "GL_EDGE_FLAG_ARRAY_STRIDE",
- "Stride between edge flags",
- "vertex-array",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_EDGE_FLAG_ARRAY_POINTER,
- "GL_EDGE_FLAG_ARRAY_POINTER",
- "Pointer to the edge flag array",
- "vertex-array",
- "glGetPointerv()"),
- new GLproperty(
- GL11.GL_MODELVIEW_MATRIX, "GL_MODELVIEW_MATRIX", "Modelview matrix stack", "matrix", "glGetFloatv()"),
- new GLproperty(
- GL11.GL_PROJECTION_MATRIX,
- "GL_PROJECTION_MATRIX",
- "Projection matrix stack",
- "matrix",
- "glGetFloatv()"),
- new GLproperty(GL11.GL_TEXTURE_MATRIX, "GL_TEXTURE_MATRIX", "Texture matrix stack", "matrix", "glGetFloatv()"),
- new GLproperty(GL11.GL_VIEWPORT, "GL_VIEWPORT", "Viewport origin and extent", "viewport", "glGetIntegerv()"),
- new GLproperty(GL11.GL_DEPTH_RANGE, "GL_DEPTH_RANGE", "Depth range near and far", "viewport", "glGetFloatv()"),
- new GLproperty(
- GL11.GL_MODELVIEW_STACK_DEPTH,
- "GL_MODELVIEW_STACK_DEPTH",
- "Modelview matrix stack pointer",
- "matrix",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_PROJECTION_STACK_DEPTH,
- "GL_PROJECTION_STACK_DEPTH",
- "Projection matrix stack pointer",
- "matrix",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_TEXTURE_STACK_DEPTH,
- "GL_TEXTURE_STACK_DEPTH",
- "Texture matrix stack pointer",
- "matrix",
- "glGetIntegerv()"),
- new GLproperty(GL11.GL_MATRIX_MODE, "GL_MATRIX_MODE", "Current matrix mode", "transform", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_NORMALIZE,
- "GL_NORMALIZE",
- "Current normal normalization on/off",
- "transform/ enable",
- "glIsEnabled()"),
- new GLproperty(GL11.GL_FOG_COLOR, "GL_FOG_COLOR", "Fog color", "fog", "glGetFloatv()"),
- new GLproperty(GL11.GL_FOG_INDEX, "GL_FOG_INDEX", "Fog index", "fog", "glGetFloatv()"),
- new GLproperty(GL11.GL_FOG_DENSITY, "GL_FOG_DENSITY", "Exponential fog density", "fog", "glGetFloatv()"),
- new GLproperty(GL11.GL_FOG_START, "GL_FOG_START", "Linear fog start", "fog", "glGetFloatv()"),
- new GLproperty(GL11.GL_FOG_END, "GL_FOG_END", "Linear fog end", "fog", "glGetFloatv()"),
- new GLproperty(GL11.GL_FOG_MODE, "GL_FOG_MODE", "Fog mode", "fog", "glGetIntegerv()"),
- new GLproperty(GL11.GL_FOG, "GL_FOG", "True if fog enabled", "fog/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_SHADE_MODEL, "GL_SHADE_MODEL", "glShadeModel() setting", "lighting", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_LIGHTING, "GL_LIGHTING", "True if lighting is enabled", "lighting/e nable", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_COLOR_MATERIAL,
- "GL_COLOR_MATERIAL",
- "True if color tracking is enabled",
- "lighting",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_COLOR_MATERIAL_PARAMETER,
- "GL_COLOR_MATERIAL_PARAMETER",
- "Material properties tracking current color",
- "lighting",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_COLOR_MATERIAL_FACE,
- "GL_COLOR_MATERIAL_FACE",
- "Face(s) affected by color tracking",
- "lighting",
- "glGetIntegerv()"),
- new GLproperty(GL11.GL_AMBIENT, "GL_AMBIENT", "Ambient material color", "lighting", "glGetMaterialfv()"),
- new GLproperty(GL11.GL_DIFFUSE, "GL_DIFFUSE", "Diffuse material color", "lighting", "glGetMaterialfv()"),
- new GLproperty(GL11.GL_SPECULAR, "GL_SPECULAR", "Specular material color", "lighting", "glGetMaterialfv()"),
- new GLproperty(GL11.GL_EMISSION, "GL_EMISSION", "Emissive material color", "lighting", "glGetMaterialfv()"),
- new GLproperty(
- GL11.GL_SHININESS, "GL_SHININESS", "Specular exponent of material", "lighting", "glGetMaterialfv()"),
- new GLproperty(
- GL11.GL_LIGHT_MODEL_AMBIENT,
- "GL_LIGHT_MODEL_AMBIENT",
- "Ambient scene color",
- "lighting",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_LIGHT_MODEL_LOCAL_VIEWER,
- "GL_LIGHT_MODEL_LOCAL_VIEWER",
- "Viewer is local",
- "lighting",
- "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_LIGHT_MODEL_TWO_SIDE,
- "GL_LIGHT_MODEL_TWO_SIDE",
- "Use two-sided lighting",
- "lighting",
- "glGetBooleanv()"),
- new GLproperty(GL11.GL_AMBIENT, "GL_AMBIENT", "Ambient intensity of light i", "lighting", "glGetLightfv()"),
- new GLproperty(GL11.GL_DIFFUSE, "GL_DIFFUSE", "Diffuse intensity of light i", "lighting", "glGetLightfv()"),
- new GLproperty(GL11.GL_SPECULAR, "GL_SPECULAR", "Specular intensity of light i", "lighting", "glGetLightfv()"),
- new GLproperty(GL11.GL_POSITION, "GL_POSITION", "Position of light i", "lighting", "glGetLightfv()"),
- new GLproperty(
- GL11.GL_CONSTANT_ATTENUATION,
- "GL_CONSTANT_ATTENUATION",
- "Constant attenuation factor",
- "lighting",
- "glGetLightfv()"),
- new GLproperty(
- GL11.GL_LINEAR_ATTENUATION,
- "GL_LINEAR_ATTENUATION",
- "Linear attenuation factor",
- "lighting",
- "glGetLightfv()"),
- new GLproperty(
- GL11.GL_QUADRATIC_ATTENUATION,
- "GL_QUADRATIC_ATTENUATION",
- "Quadratic attenuation factor",
- "lighting",
- "glGetLightfv()"),
- new GLproperty(
- GL11.GL_SPOT_DIRECTION,
- "GL_SPOT_DIRECTION",
- "Spotlight direction of light i",
- "lighting",
- "glGetLightfv()"),
- new GLproperty(
- GL11.GL_SPOT_EXPONENT,
- "GL_SPOT_EXPONENT",
- "Spotlight exponent of light i",
- "lighting",
- "glGetLightfv()"),
- new GLproperty(
- GL11.GL_SPOT_CUTOFF, "GL_SPOT_CUTOFF", "Spotlight angle of light i", "lighting", "glGetLightfv()"),
- new GLproperty(GL11.GL_LIGHT0, "GL_LIGHT0", "True if light 0 enabled", "lighting/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_LIGHT1, "GL_LIGHT1", "True if light 1 enabled", "lighting/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_LIGHT2, "GL_LIGHT2", "True if light 2 enabled", "lighting/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_LIGHT3, "GL_LIGHT3", "True if light 3 enabled", "lighting/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_LIGHT4, "GL_LIGHT4", "True if light 4 enabled", "lighting/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_LIGHT5, "GL_LIGHT5", "True if light 5 enabled", "lighting/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_LIGHT6, "GL_LIGHT6", "True if light 6 enabled", "lighting/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_LIGHT7, "GL_LIGHT7", "True if light 7 enabled", "lighting/enable", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_COLOR_INDEXES,
- "GL_COLOR_INDEXES",
- "ca, cd, and cs for color-index lighting",
- "lighting/e nable",
- "glGetMaterialfv()"),
- new GLproperty(GL11.GL_POINT_SIZE, "GL_POINT_SIZE", "Point size", "point", "glGetFloatv()"),
- new GLproperty(
- GL11.GL_POINT_SMOOTH, "GL_POINT_SMOOTH", "Point antialiasing on", "point/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_LINE_WIDTH, "GL_LINE_WIDTH", "Line width", "line", "glGetFloatv()"),
- new GLproperty(GL11.GL_LINE_SMOOTH, "GL_LINE_SMOOTH", "Line antialiasing on", "line/enable", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_LINE_STIPPLE_PATTERN, "GL_LINE_STIPPLE_PATTERN", "Line stipple", "line", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_LINE_STIPPLE_REPEAT,
- "GL_LINE_STIPPLE_REPEAT",
- "Line stipple repeat",
- "line",
- "glGetIntegerv()"),
- new GLproperty(GL11.GL_LINE_STIPPLE, "GL_LINE_STIPPLE", "Line stipple enable", "line/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_CULL_FACE, "GL_CULL_FACE", "Polygon culling enabled", "polygon/enable", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_CULL_FACE_MODE,
- "GL_CULL_FACE_MODE",
- "Cull front-/back-facing polygons",
- "polygon",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_FRONT_FACE,
- "GL_FRONT_FACE",
- "Polygon front-face CW/CCW indicator",
- "polygon",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_POLYGON_SMOOTH,
- "GL_POLYGON_SMOOTH",
- "Polygon antialiasing on",
- "polygon/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_POLYGON_MODE,
- "GL_POLYGON_MODE",
- "Polygon rasterization mode (front and back)",
- "polygon",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_POLYGON_OFFSET_FACTOR,
- "GL_POLYGON_OFFSET_FACTOR",
- "Polygon offset factor",
- "polygon",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_POLYGON_OFFSET_POINT,
- "GL_POLYGON_OFFSET_POINT",
- "Polygon offset enable for GL_POINT mode rasterization",
- "polygon/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_POLYGON_OFFSET_LINE,
- "GL_POLYGON_OFFSET_LINE",
- "Polygon offset enable for GL_LINE mode rasterization",
- "polygon/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_POLYGON_OFFSET_FILL,
- "GL_POLYGON_OFFSET_FILL",
- "Polygon offset enable for GL_FILL mode rasterization",
- "polygon/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_POLYGON_STIPPLE,
- "GL_POLYGON_STIPPLE",
- "Polygon stipple enable",
- "polygon/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_TEXTURE_1D,
- "GL_TEXTURE_1D",
- "True if 1-D texturing enabled ",
- "texture/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_TEXTURE_2D,
- "GL_TEXTURE_2D",
- "True if 2-D texturing enabled ",
- "texture/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_TEXTURE_BINDING_1D,
- "GL_TEXTURE_BINDING_1D",
- "Texture object bound to GL_TEXTURE_1D",
- "texture",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_TEXTURE_BINDING_2D,
- "GL_TEXTURE_BINDING_2D",
- "Texture object bound to GL_TEXTURE_2D",
- "texture",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_TEXTURE, "GL_TEXTURE", "x-D texture image at level of detail i", "UNUSED", "glGetTexImage()"),
- new GLproperty(
- GL11.GL_TEXTURE_WIDTH,
- "GL_TEXTURE_WIDTH",
- "x-D texture image i's width",
- "UNUSED",
- "glGetTexLevelParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_HEIGHT,
- "GL_TEXTURE_HEIGHT",
- "x-D texture image i's height",
- "UNUSED",
- "glGetTexLevelParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_BORDER,
- "GL_TEXTURE_BORDER",
- "x-D texture image i's border width",
- "UNUSED",
- "glGetTexLevelParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_RED_SIZE,
- "GL_TEXTURE_RED_SIZE",
- "x-D texture image i's red resolution",
- "UNUSED",
- "glGetTexLevelParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_GREEN_SIZE,
- "GL_TEXTURE_GREEN_SIZE",
- "x-D texture image i's green resolution",
- "UNUSED",
- "glGetTexLevelParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_BLUE_SIZE,
- "GL_TEXTURE_BLUE_SIZE",
- "x-D texture image i's blue resolution",
- "UNUSED",
- "glGetTexLevelParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_ALPHA_SIZE,
- "GL_TEXTURE_ALPHA_SIZE",
- "x-D texture image i's alpha resolution",
- "UNUSED",
- "glGetTexLevelParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_LUMINANCE_SIZE,
- "GL_TEXTURE_LUMINANCE_SIZE",
- "x-D texture image i's luminance resolution",
- "UNUSED",
- "glGetTexLevelParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_INTENSITY_SIZE,
- "GL_TEXTURE_INTENSITY_SIZE",
- "x-D texture image i's intensity resolution",
- "UNUSED",
- "glGetTexLevelParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_BORDER_COLOR,
- "GL_TEXTURE_BORDER_COLOR",
- "Texture border color",
- "texture",
- "glGetTexParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_MIN_FILTER,
- "GL_TEXTURE_MIN_FILTER",
- "Texture minification function",
- "texture",
- "glGetTexParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_MAG_FILTER,
- "GL_TEXTURE_MAG_FILTER",
- "Texture magnification function",
- "texture",
- "glGetTexParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_WRAP_S,
- "GL_TEXTURE_WRAP_S",
- "Texture wrap mode (x is S or T)",
- "texture",
- "glGetTexParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_WRAP_T,
- "GL_TEXTURE_WRAP_T",
- "Texture wrap mode (x is S or T)",
- "texture",
- "glGetTexParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_PRIORITY,
- "GL_TEXTURE_PRIORITY",
- "Texture object priority",
- "texture",
- "glGetTexParameter*()"),
- new GLproperty(
- GL11.GL_TEXTURE_ENV_MODE,
- "GL_TEXTURE_ENV_MODE",
- "Texture application function",
- "texture",
- "glGetTexEnviv()"),
- new GLproperty(
- GL11.GL_TEXTURE_ENV_COLOR,
- "GL_TEXTURE_ENV_COLOR",
- "Texture environment color",
- "texture",
- "glGetTexEnvfv()"),
- new GLproperty(
- GL11.GL_TEXTURE_GEN_S,
- "GL_TEXTURE_GEN_S",
- "Texgen enabled (x is S, T, R, or Q)",
- "texture/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_TEXTURE_GEN_T,
- "GL_TEXTURE_GEN_T",
- "Texgen enabled (x is S, T, R, or Q)",
- "texture/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_TEXTURE_GEN_R,
- "GL_TEXTURE_GEN_R",
- "Texgen enabled (x is S, T, R, or Q)",
- "texture/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_TEXTURE_GEN_Q,
- "GL_TEXTURE_GEN_Q",
- "Texgen enabled (x is S, T, R, or Q)",
- "texture/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_EYE_PLANE, "GL_EYE_PLANE", "Texgen plane equation coefficients", "texture", "glGetTexGenfv()"),
- new GLproperty(
- GL11.GL_OBJECT_PLANE,
- "GL_OBJECT_PLANE",
- "Texgen object linear coefficients",
- "texture",
- "glGetTexGenfv()"),
- new GLproperty(
- GL11.GL_TEXTURE_GEN_MODE,
- "GL_TEXTURE_GEN_MODE",
- "Function used for texgen",
- "texture",
- "glGetTexGeniv()"),
- new GLproperty(
- GL11.GL_SCISSOR_TEST, "GL_SCISSOR_TEST", "Scissoring enabled", "scissor/enable", "glIsEnabled()"),
- new GLproperty(GL11.GL_SCISSOR_BOX, "GL_SCISSOR_BOX", "Scissor box", "scissor", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_ALPHA_TEST, "GL_ALPHA_TEST", "Alpha test enabled", "color-buffer/enable", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_ALPHA_TEST_FUNC,
- "GL_ALPHA_TEST_FUNC",
- "Alpha test function",
- "color-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_ALPHA_TEST_REF,
- "GL_ALPHA_TEST_REF",
- "Alpha test reference value",
- "color-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_STENCIL_TEST,
- "GL_STENCIL_TEST",
- "Stenciling enabled",
- "stencil-buffer/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_STENCIL_FUNC, "GL_STENCIL_FUNC", "Stencil function", "stencil-buffer", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_STENCIL_VALUE_MASK,
- "GL_STENCIL_VALUE_MASK",
- "Stencil mask",
- "stencil-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_STENCIL_REF, "GL_STENCIL_REF", "Stencil reference value", "stencil-buffer", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_STENCIL_FAIL, "GL_STENCIL_FAIL", "Stencil fail action", "stencil-buffer", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_STENCIL_PASS_DEPTH_FAIL,
- "GL_STENCIL_PASS_DEPTH_FAIL",
- "Stencil depth buffer fail action",
- "stencil-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_STENCIL_PASS_DEPTH_PASS,
- "GL_STENCIL_PASS_DEPTH_PASS",
- "Stencil depth buffer pass action",
- "stencil-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_DEPTH_TEST, "GL_DEPTH_TEST", "Depth buffer enabled", "depth-buffer/ena ble", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_DEPTH_FUNC, "GL_DEPTH_FUNC", "Depth buffer test function", "depth-buffer", "glGetIntegerv()"),
- new GLproperty(GL11.GL_BLEND, "GL_BLEND", "Blending enabled", "color-buffer/enable", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_BLEND_SRC, "GL_BLEND_SRC", "Blending source function", "color-buffer", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_BLEND_DST, "GL_BLEND_DST", "Blending destination function", "color-buffer", "glGetIntegerv()"),
- new GLproperty(GL11.GL_DITHER, "GL_DITHER", "Dithering enabled", "color-buffer/enable", "glIsEnabled()"),
- new GLproperty(
- GL11.GL_INDEX_LOGIC_OP,
- "GL_INDEX_LOGIC_OP",
- "Color index logical operation enabled",
- "color-buffer/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_COLOR_LOGIC_OP,
- "GL_COLOR_LOGIC_OP",
- "RGBA color logical operation enabled",
- "color-buffer/enable",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_LOGIC_OP_MODE,
- "GL_LOGIC_OP_MODE",
- "Logical operation function",
- "color-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_DRAW_BUFFER,
- "GL_DRAW_BUFFER",
- "Buffers selected for drawing",
- "color-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_INDEX_WRITEMASK,
- "GL_INDEX_WRITEMASK",
- "Color-index writemask",
- "color-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_COLOR_WRITEMASK,
- "GL_COLOR_WRITEMASK",
- "Color write enables; R, G, B, or A",
- "color-buffer",
- "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_DEPTH_WRITEMASK,
- "GL_DEPTH_WRITEMASK",
- "Depth buffer enabled for writing",
- "depth-buffer",
- "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_STENCIL_WRITEMASK,
- "GL_STENCIL_WRITEMASK",
- "Stencil-buffer writemask",
- "stencil-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_COLOR_CLEAR_VALUE,
- "GL_COLOR_CLEAR_VALUE",
- "Color-buffer clear value (RGBA mode)",
- "color-buffer",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_INDEX_CLEAR_VALUE,
- "GL_INDEX_CLEAR_VALUE",
- "Color-buffer clear value (color-index mode)",
- "color-buffer",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_DEPTH_CLEAR_VALUE,
- "GL_DEPTH_CLEAR_VALUE",
- "Depth-buffer clear value",
- "depth-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_STENCIL_CLEAR_VALUE,
- "GL_STENCIL_CLEAR_VALUE",
- "Stencil-buffer clear value",
- "stencil-buffer",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_ACCUM_CLEAR_VALUE,
- "GL_ACCUM_CLEAR_VALUE",
- "Accumulation-buffer clear value",
- "accum-buffer",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_UNPACK_SWAP_BYTES,
- "GL_UNPACK_SWAP_BYTES",
- "Value of GL_UNPACK_SWAP_BYTES",
- "pixel-store",
- "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_UNPACK_LSB_FIRST,
- "GL_UNPACK_LSB_FIRST",
- "Value of GL_UNPACK_LSB_FIRST",
- "pixel-store",
- "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_UNPACK_ROW_LENGTH,
- "GL_UNPACK_ROW_LENGTH",
- "Value of GL_UNPACK_ROW_LENGTH",
- "pixel-store",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_UNPACK_SKIP_ROWS,
- "GL_UNPACK_SKIP_ROWS",
- "Value of GL_UNPACK_SKIP_ROWS",
- "pixel-store",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_UNPACK_SKIP_PIXELS,
- "GL_UNPACK_SKIP_PIXELS",
- "Value of GL_UNPACK_SKIP_PIXELS",
- "pixel-store",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_UNPACK_ALIGNMENT,
- "GL_UNPACK_ALIGNMENT",
- "Value of GL_UNPACK_ALIGNMENT",
- "pixel-store",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_PACK_SWAP_BYTES,
- "GL_PACK_SWAP_BYTES",
- "Value of GL_PACK_SWAP_BYTES",
- "pixel-store",
- "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_PACK_LSB_FIRST,
- "GL_PACK_LSB_FIRST",
- "Value of GL_PACK_LSB_FIRST",
- "pixel-store",
- "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_PACK_ROW_LENGTH,
- "GL_PACK_ROW_LENGTH",
- "Value of GL_PACK_ROW_LENGTH",
- "pixel-store",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_PACK_SKIP_ROWS,
- "GL_PACK_SKIP_ROWS",
- "Value of GL_PACK_SKIP_ROWS",
- "pixel-store",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_PACK_SKIP_PIXELS,
- "GL_PACK_SKIP_PIXELS",
- "Value of GL_PACK_SKIP_PIXELS",
- "pixel-store",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_PACK_ALIGNMENT,
- "GL_PACK_ALIGNMENT",
- "Value of GL_PACK_ALIGNMENT",
- "pixel-store",
- "glGetIntegerv()"),
- new GLproperty(GL11.GL_MAP_COLOR, "GL_MAP_COLOR", "True if colors are mapped", "pixel", "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_MAP_STENCIL, "GL_MAP_STENCIL", "True if stencil values are mapped", "pixel", "glGetBooleanv()"),
- new GLproperty(GL11.GL_INDEX_SHIFT, "GL_INDEX_SHIFT", "Value of GL_INDEX_SHIFT", "pixel", "glGetIntegerv()"),
- new GLproperty(GL11.GL_INDEX_OFFSET, "GL_INDEX_OFFSET", "Value of GL_INDEX_OFFSET", "pixel", "glGetIntegerv()"),
- new GLproperty(GL11.GL_ZOOM_X, "GL_ZOOM_X", "x zoom factor", "pixel", "glGetFloatv()"),
- new GLproperty(GL11.GL_ZOOM_Y, "GL_ZOOM_Y", "y zoom factor", "pixel", "glGetFloatv()"),
- new GLproperty(GL11.GL_READ_BUFFER, "GL_READ_BUFFER", "Read source buffer", "pixel", "glGetIntegerv()"),
- new GLproperty(GL11.GL_ORDER, "GL_ORDER", "1D map order", "capability", "glGetMapiv()"),
- new GLproperty(GL11.GL_ORDER, "GL_ORDER", "2D map orders", "capability", "glGetMapiv()"),
- new GLproperty(GL11.GL_COEFF, "GL_COEFF", "1D control points", "capability", "glGetMapfv()"),
- new GLproperty(GL11.GL_COEFF, "GL_COEFF", "2D control points", "capability", "glGetMapfv()"),
- new GLproperty(GL11.GL_DOMAIN, "GL_DOMAIN", "1D domain endpoints", "capability", "glGetMapfv()"),
- new GLproperty(GL11.GL_DOMAIN, "GL_DOMAIN", "2D domain endpoints", "capability", "glGetMapfv()"),
- new GLproperty(GL11.GL_MAP1_GRID_DOMAIN, "GL_MAP1_GRID_DOMAIN", "1D grid endpoints", "eval", "glGetFloatv()"),
- new GLproperty(GL11.GL_MAP2_GRID_DOMAIN, "GL_MAP2_GRID_DOMAIN", "2D grid endpoints", "eval", "glGetFloatv()"),
- new GLproperty(
- GL11.GL_MAP1_GRID_SEGMENTS, "GL_MAP1_GRID_SEGMENTS", "1D grid divisions", "eval", "glGetFloatv()"),
- new GLproperty(
- GL11.GL_MAP2_GRID_SEGMENTS, "GL_MAP2_GRID_SEGMENTS", "2D grid divisions", "eval", "glGetFloatv()"),
- new GLproperty(
- GL11.GL_AUTO_NORMAL,
- "GL_AUTO_NORMAL",
- "True if automatic normal generation enabled",
- "eval",
- "glIsEnabled()"),
- new GLproperty(
- GL11.GL_PERSPECTIVE_CORRECTION_HINT,
- "GL_PERSPECTIVE_CORRECTION_HINT",
- "Perspective correction hint",
- "hint",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_POINT_SMOOTH_HINT, "GL_POINT_SMOOTH_HINT", "Point smooth hint", "hint", "glGetIntegerv()"),
- new GLproperty(GL11.GL_LINE_SMOOTH_HINT, "GL_LINE_SMOOTH_HINT", "Line smooth hint", "hint", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_POLYGON_SMOOTH_HINT,
- "GL_POLYGON_SMOOTH_HINT",
- "Polygon smooth hint",
- "hint",
- "glGetIntegerv()"),
- new GLproperty(GL11.GL_FOG_HINT, "GL_FOG_HINT", "Fog hint", "hint", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_LIGHTS, "GL_MAX_LIGHTS", "Maximum number of lights", "capability", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_CLIP_PLANES,
- "GL_MAX_CLIP_PLANES",
- "Maximum number of user clipping planes",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_MODELVIEW_STACK_DEPTH,
- "GL_MAX_MODELVIEW_STACK_DEPTH",
- "Maximum modelview-matrix stack depth",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_PROJECTION_STACK_DEPTH,
- "GL_MAX_PROJECTION_STACK_DEPTH",
- "Maximum projection-matrix stack depth",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_TEXTURE_STACK_DEPTH,
- "GL_MAX_TEXTURE_STACK_DEPTH",
- "Maximum depth of texture matrix stack",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_SUBPIXEL_BITS,
- "GL_SUBPIXEL_BITS",
- "Number of bits of subpixel precision in x and y",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_TEXTURE_SIZE,
- "GL_MAX_TEXTURE_SIZE",
- "See discussion in Texture Proxy in Chapter 9",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_PIXEL_MAP_TABLE,
- "GL_MAX_PIXEL_MAP_TABLE",
- "Maximum size of a glPixelMap() translation table",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_NAME_STACK_DEPTH,
- "GL_MAX_NAME_STACK_DEPTH",
- "Maximum selection-name stack depth",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_LIST_NESTING,
- "GL_MAX_LIST_NESTING",
- "Maximum display-list call nesting",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_EVAL_ORDER,
- "GL_MAX_EVAL_ORDER",
- "Maximum evaluator polynomial order",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_VIEWPORT_DIMS,
- "GL_MAX_VIEWPORT_DIMS",
- "Maximum viewport dimensions",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_ATTRIB_STACK_DEPTH,
- "GL_MAX_ATTRIB_STACK_DEPTH",
- "Maximum depth of the attribute stack",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_MAX_CLIENT_ATTRIB_STACK_DEPTH,
- "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH",
- "Maximum depth of the client attribute stack",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_AUX_BUFFERS, "GL_AUX_BUFFERS", "Number of auxiliary buffers", "capability", "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_RGBA_MODE, "GL_RGBA_MODE", "True if color buffers store RGBA", "capability", "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_INDEX_MODE,
- "GL_INDEX_MODE",
- "True if color buffers store indices",
- "capability",
- "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_DOUBLEBUFFER,
- "GL_DOUBLEBUFFER",
- "True if front and back buffers exist",
- "capability",
- "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_STEREO, "GL_STEREO", "True if left and right buffers exist", "capability", "glGetBooleanv()"),
- new GLproperty(
- GL11.GL_POINT_SIZE_RANGE,
- "GL_POINT_SIZE_RANGE",
- "Range (low to high) of antialiased point sizes",
- "capability",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_POINT_SIZE_GRANULARITY,
- "GL_POINT_SIZE_GRANULARITY",
- "Antialiased point-size granularity",
- "capability",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_LINE_WIDTH_RANGE,
- "GL_LINE_WIDTH_RANGE",
- "Range (low to high) of antialiased line widths",
- "capability",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_LINE_WIDTH_GRANULARITY,
- "GL_LINE_WIDTH_GRANULARITY",
- "Antialiased line-width granularity",
- "capability",
- "glGetFloatv()"),
- new GLproperty(
- GL11.GL_RED_BITS,
- "GL_RED_BITS",
- "Number of bits per red component in color buffers",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_GREEN_BITS,
- "GL_GREEN_BITS",
- "Number of bits per green component in color buffers",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_BLUE_BITS,
- "GL_BLUE_BITS",
- "Number of bits per blue component in color buffers",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_ALPHA_BITS,
- "GL_ALPHA_BITS",
- "Number of bits per alpha component in color buffers",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_INDEX_BITS,
- "GL_INDEX_BITS",
- "Number of bits per index in color buffers",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_DEPTH_BITS,
- "GL_DEPTH_BITS",
- "Number of depth-buffer bitplanes",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_STENCIL_BITS,
- "GL_STENCIL_BITS",
- "Number of stencil bitplanes",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_ACCUM_RED_BITS,
- "GL_ACCUM_RED_BITS",
- "Number of bits per red component in the accumulation buffer",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_ACCUM_GREEN_BITS,
- "GL_ACCUM_GREEN_BITS",
- "Number of bits per green component in the accumulation buffer",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_ACCUM_BLUE_BITS,
- "GL_ACCUM_BLUE_BITS",
- "Number of bits per blue component in the accumulation buffer",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_ACCUM_ALPHA_BITS,
- "GL_ACCUM_ALPHA_BITS",
- "Number of bits per alpha component in the accumulation buffer",
- "capability",
- "glGetIntegerv()"),
- new GLproperty(GL11.GL_LIST_BASE, "GL_LIST_BASE", "Setting of glListBase()", "list", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_LIST_INDEX,
- "GL_LIST_INDEX",
- "Number of display list under construction; 0 if none",
- "current",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_LIST_MODE,
- "GL_LIST_MODE",
- "Mode of display list under construction; undefined if none",
- "current",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_ATTRIB_STACK_DEPTH,
- "GL_ATTRIB_STACK_DEPTH",
- "Attribute stack pointer",
- "current",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_CLIENT_ATTRIB_STACK_DEPTH,
- "GL_CLIENT_ATTRIB_STACK_DEPTH",
- "Client attribute stack pointer",
- "current",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_NAME_STACK_DEPTH, "GL_NAME_STACK_DEPTH", "Name stack depth", "current", "glGetIntegerv()"),
- new GLproperty(GL11.GL_RENDER_MODE, "GL_RENDER_MODE", "glRenderMode() setting", "current", "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_SELECTION_BUFFER_POINTER,
- "GL_SELECTION_BUFFER_POINTER",
- "Pointer to selection buffer",
- "select",
- "glGetPointerv()"),
- new GLproperty(
- GL11.GL_SELECTION_BUFFER_SIZE,
- "GL_SELECTION_BUFFER_SIZE",
- "Size of selection buffer",
- "select",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_FEEDBACK_BUFFER_POINTER,
- "GL_FEEDBACK_BUFFER_POINTER",
- "Pointer to feedback buffer",
- "feedback",
- "glGetPointerv()"),
- new GLproperty(
- GL11.GL_FEEDBACK_BUFFER_SIZE,
- "GL_FEEDBACK_BUFFER_SIZE",
- "Size of feedback buffer",
- "feedback",
- "glGetIntegerv()"),
- new GLproperty(
- GL11.GL_FEEDBACK_BUFFER_TYPE,
- "GL_FEEDBACK_BUFFER_TYPE",
- "Type of feedback buffer",
- "feedback",
- "glGetIntegerv()"),
- };
+ new GLproperty(GL11.GL_CURRENT_COLOR, "GL_CURRENT_COLOR", "Current color", "current", "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_CURRENT_INDEX,
+ "GL_CURRENT_INDEX",
+ "Current color index",
+ "current",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_CURRENT_TEXTURE_COORDS,
+ "GL_CURRENT_TEXTURE_COORDS",
+ "Current texture coordinates",
+ "current",
+ "glGetFloatv()"),
+ new GLproperty(GL11.GL_CURRENT_NORMAL, "GL_CURRENT_NORMAL", "Current normal", "current", "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_CURRENT_RASTER_POSITION,
+ "GL_CURRENT_RASTER_POSITION",
+ "Current raster position",
+ "current",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_CURRENT_RASTER_DISTANCE,
+ "GL_CURRENT_RASTER_DISTANCE",
+ "Current raster distance",
+ "current",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_CURRENT_RASTER_COLOR,
+ "GL_CURRENT_RASTER_COLOR",
+ "Color associated with raster position",
+ "current",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_CURRENT_RASTER_INDEX,
+ "GL_CURRENT_RASTER_INDEX",
+ "Color index associated with raster position",
+ "current",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_CURRENT_RASTER_TEXTURE_COORDS,
+ "GL_CURRENT_RASTER_TEXTURE_COORDS",
+ "Texture coordinates associated with raster position",
+ "current",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_CURRENT_RASTER_POSITION_VALID,
+ "GL_CURRENT_RASTER_POSITION_VALID",
+ "Raster position valid bit",
+ "current",
+ "glGetBooleanv()"),
+ new GLproperty(GL11.GL_EDGE_FLAG, "GL_EDGE_FLAG", "Edge flag", "current", "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_VERTEX_ARRAY,
+ "GL_VERTEX_ARRAY",
+ "Vertex array enable",
+ "vertex-array",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_VERTEX_ARRAY_SIZE,
+ "GL_VERTEX_ARRAY_SIZE",
+ "Coordinates per vertex",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_VERTEX_ARRAY_TYPE,
+ "GL_VERTEX_ARRAY_TYPE",
+ "Type of vertex coordinates",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_VERTEX_ARRAY_STRIDE,
+ "GL_VERTEX_ARRAY_STRIDE",
+ "Stride between vertices",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_VERTEX_ARRAY_POINTER,
+ "GL_VERTEX_ARRAY_POINTER",
+ "Pointer to the vertex array",
+ "vertex-array",
+ "glGetPointerv()"),
+ new GLproperty(
+ GL11.GL_NORMAL_ARRAY,
+ "GL_NORMAL_ARRAY",
+ "Normal array enable",
+ "vertex-array",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_NORMAL_ARRAY_TYPE,
+ "GL_NORMAL_ARRAY_TYPE",
+ "Type of normal coordinates",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_NORMAL_ARRAY_STRIDE,
+ "GL_NORMAL_ARRAY_STRIDE",
+ "Stride between normals",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_NORMAL_ARRAY_POINTER,
+ "GL_NORMAL_ARRAY_POINTER",
+ "Pointer to the normal array",
+ "vertex-array",
+ "glGetPointerv()"),
+ new GLproperty(
+ GL11.GL_COLOR_ARRAY,
+ "GL_COLOR_ARRAY",
+ "RGBA color array enable",
+ "vertex-array",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_COLOR_ARRAY_SIZE,
+ "GL_COLOR_ARRAY_SIZE",
+ "Colors per vertex",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_COLOR_ARRAY_TYPE,
+ "GL_COLOR_ARRAY_TYPE",
+ "Type of color components",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_COLOR_ARRAY_STRIDE,
+ "GL_COLOR_ARRAY_STRIDE",
+ "Stride between colors",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_COLOR_ARRAY_POINTER,
+ "GL_COLOR_ARRAY_POINTER",
+ "Pointer to the color array",
+ "vertex-array",
+ "glGetPointerv()"),
+ new GLproperty(
+ GL11.GL_INDEX_ARRAY,
+ "GL_INDEX_ARRAY",
+ "Color-index array enable",
+ "vertex-array",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_INDEX_ARRAY_TYPE,
+ "GL_INDEX_ARRAY_TYPE",
+ "Type of color indices",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_INDEX_ARRAY_STRIDE,
+ "GL_INDEX_ARRAY_STRIDE",
+ "Stride between color indices",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_INDEX_ARRAY_POINTER,
+ "GL_INDEX_ARRAY_POINTER",
+ "Pointer to the index array",
+ "vertex-array",
+ "glGetPointerv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_COORD_ARRAY,
+ "GL_TEXTURE_COORD_ARRAY",
+ "Texture coordinate array enable",
+ "vertex-array",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_COORD_ARRAY_SIZE,
+ "GL_TEXTURE_COORD_ARRAY_SIZE",
+ "Texture coordinates per element",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_COORD_ARRAY_TYPE,
+ "GL_TEXTURE_COORD_ARRAY_TYPE",
+ "Type of texture coordinates",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_COORD_ARRAY_STRIDE,
+ "GL_TEXTURE_COORD_ARRAY_STRIDE",
+ "Stride between texture coordinates",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_COORD_ARRAY_POINTER,
+ "GL_TEXTURE_COORD_ARRAY_POINTER",
+ "Pointer to the texture coordinate array",
+ "vertex-array",
+ "glGetPointerv()"),
+ new GLproperty(
+ GL11.GL_EDGE_FLAG_ARRAY,
+ "GL_EDGE_FLAG_ARRAY",
+ "Edge flag array enable",
+ "vertex-array",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_EDGE_FLAG_ARRAY_STRIDE,
+ "GL_EDGE_FLAG_ARRAY_STRIDE",
+ "Stride between edge flags",
+ "vertex-array",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_EDGE_FLAG_ARRAY_POINTER,
+ "GL_EDGE_FLAG_ARRAY_POINTER",
+ "Pointer to the edge flag array",
+ "vertex-array",
+ "glGetPointerv()"),
+ new GLproperty(
+ GL11.GL_MODELVIEW_MATRIX,
+ "GL_MODELVIEW_MATRIX",
+ "Modelview matrix stack",
+ "matrix",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_PROJECTION_MATRIX,
+ "GL_PROJECTION_MATRIX",
+ "Projection matrix stack",
+ "matrix",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_MATRIX,
+ "GL_TEXTURE_MATRIX",
+ "Texture matrix stack",
+ "matrix",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_VIEWPORT,
+ "GL_VIEWPORT",
+ "Viewport origin and extent",
+ "viewport",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_DEPTH_RANGE,
+ "GL_DEPTH_RANGE",
+ "Depth range near and far",
+ "viewport",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_MODELVIEW_STACK_DEPTH,
+ "GL_MODELVIEW_STACK_DEPTH",
+ "Modelview matrix stack pointer",
+ "matrix",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_PROJECTION_STACK_DEPTH,
+ "GL_PROJECTION_STACK_DEPTH",
+ "Projection matrix stack pointer",
+ "matrix",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_STACK_DEPTH,
+ "GL_TEXTURE_STACK_DEPTH",
+ "Texture matrix stack pointer",
+ "matrix",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MATRIX_MODE,
+ "GL_MATRIX_MODE",
+ "Current matrix mode",
+ "transform",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_NORMALIZE,
+ "GL_NORMALIZE",
+ "Current normal normalization on/off",
+ "transform/ enable",
+ "glIsEnabled()"),
+ new GLproperty(GL11.GL_FOG_COLOR, "GL_FOG_COLOR", "Fog color", "fog", "glGetFloatv()"),
+ new GLproperty(GL11.GL_FOG_INDEX, "GL_FOG_INDEX", "Fog index", "fog", "glGetFloatv()"),
+ new GLproperty(GL11.GL_FOG_DENSITY, "GL_FOG_DENSITY", "Exponential fog density", "fog", "glGetFloatv()"),
+ new GLproperty(GL11.GL_FOG_START, "GL_FOG_START", "Linear fog start", "fog", "glGetFloatv()"),
+ new GLproperty(GL11.GL_FOG_END, "GL_FOG_END", "Linear fog end", "fog", "glGetFloatv()"),
+ new GLproperty(GL11.GL_FOG_MODE, "GL_FOG_MODE", "Fog mode", "fog", "glGetIntegerv()"),
+ new GLproperty(GL11.GL_FOG, "GL_FOG", "True if fog enabled", "fog/enable", "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_SHADE_MODEL,
+ "GL_SHADE_MODEL",
+ "glShadeModel() setting",
+ "lighting",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_LIGHTING,
+ "GL_LIGHTING",
+ "True if lighting is enabled",
+ "lighting/e nable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_COLOR_MATERIAL,
+ "GL_COLOR_MATERIAL",
+ "True if color tracking is enabled",
+ "lighting",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_COLOR_MATERIAL_PARAMETER,
+ "GL_COLOR_MATERIAL_PARAMETER",
+ "Material properties tracking current color",
+ "lighting",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_COLOR_MATERIAL_FACE,
+ "GL_COLOR_MATERIAL_FACE",
+ "Face(s) affected by color tracking",
+ "lighting",
+ "glGetIntegerv()"),
+ new GLproperty(GL11.GL_AMBIENT, "GL_AMBIENT", "Ambient material color", "lighting", "glGetMaterialfv()"),
+ new GLproperty(GL11.GL_DIFFUSE, "GL_DIFFUSE", "Diffuse material color", "lighting", "glGetMaterialfv()"),
+ new GLproperty(GL11.GL_SPECULAR, "GL_SPECULAR", "Specular material color", "lighting", "glGetMaterialfv()"),
+ new GLproperty(GL11.GL_EMISSION, "GL_EMISSION", "Emissive material color", "lighting", "glGetMaterialfv()"),
+ new GLproperty(
+ GL11.GL_SHININESS,
+ "GL_SHININESS",
+ "Specular exponent of material",
+ "lighting",
+ "glGetMaterialfv()"),
+ new GLproperty(
+ GL11.GL_LIGHT_MODEL_AMBIENT,
+ "GL_LIGHT_MODEL_AMBIENT",
+ "Ambient scene color",
+ "lighting",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_LIGHT_MODEL_LOCAL_VIEWER,
+ "GL_LIGHT_MODEL_LOCAL_VIEWER",
+ "Viewer is local",
+ "lighting",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_LIGHT_MODEL_TWO_SIDE,
+ "GL_LIGHT_MODEL_TWO_SIDE",
+ "Use two-sided lighting",
+ "lighting",
+ "glGetBooleanv()"),
+ new GLproperty(GL11.GL_AMBIENT, "GL_AMBIENT", "Ambient intensity of light i", "lighting", "glGetLightfv()"),
+ new GLproperty(GL11.GL_DIFFUSE, "GL_DIFFUSE", "Diffuse intensity of light i", "lighting", "glGetLightfv()"),
+ new GLproperty(
+ GL11.GL_SPECULAR,
+ "GL_SPECULAR",
+ "Specular intensity of light i",
+ "lighting",
+ "glGetLightfv()"),
+ new GLproperty(GL11.GL_POSITION, "GL_POSITION", "Position of light i", "lighting", "glGetLightfv()"),
+ new GLproperty(
+ GL11.GL_CONSTANT_ATTENUATION,
+ "GL_CONSTANT_ATTENUATION",
+ "Constant attenuation factor",
+ "lighting",
+ "glGetLightfv()"),
+ new GLproperty(
+ GL11.GL_LINEAR_ATTENUATION,
+ "GL_LINEAR_ATTENUATION",
+ "Linear attenuation factor",
+ "lighting",
+ "glGetLightfv()"),
+ new GLproperty(
+ GL11.GL_QUADRATIC_ATTENUATION,
+ "GL_QUADRATIC_ATTENUATION",
+ "Quadratic attenuation factor",
+ "lighting",
+ "glGetLightfv()"),
+ new GLproperty(
+ GL11.GL_SPOT_DIRECTION,
+ "GL_SPOT_DIRECTION",
+ "Spotlight direction of light i",
+ "lighting",
+ "glGetLightfv()"),
+ new GLproperty(
+ GL11.GL_SPOT_EXPONENT,
+ "GL_SPOT_EXPONENT",
+ "Spotlight exponent of light i",
+ "lighting",
+ "glGetLightfv()"),
+ new GLproperty(
+ GL11.GL_SPOT_CUTOFF,
+ "GL_SPOT_CUTOFF",
+ "Spotlight angle of light i",
+ "lighting",
+ "glGetLightfv()"),
+ new GLproperty(GL11.GL_LIGHT0, "GL_LIGHT0", "True if light 0 enabled", "lighting/enable", "glIsEnabled()"),
+ new GLproperty(GL11.GL_LIGHT1, "GL_LIGHT1", "True if light 1 enabled", "lighting/enable", "glIsEnabled()"),
+ new GLproperty(GL11.GL_LIGHT2, "GL_LIGHT2", "True if light 2 enabled", "lighting/enable", "glIsEnabled()"),
+ new GLproperty(GL11.GL_LIGHT3, "GL_LIGHT3", "True if light 3 enabled", "lighting/enable", "glIsEnabled()"),
+ new GLproperty(GL11.GL_LIGHT4, "GL_LIGHT4", "True if light 4 enabled", "lighting/enable", "glIsEnabled()"),
+ new GLproperty(GL11.GL_LIGHT5, "GL_LIGHT5", "True if light 5 enabled", "lighting/enable", "glIsEnabled()"),
+ new GLproperty(GL11.GL_LIGHT6, "GL_LIGHT6", "True if light 6 enabled", "lighting/enable", "glIsEnabled()"),
+ new GLproperty(GL11.GL_LIGHT7, "GL_LIGHT7", "True if light 7 enabled", "lighting/enable", "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_COLOR_INDEXES,
+ "GL_COLOR_INDEXES",
+ "ca, cd, and cs for color-index lighting",
+ "lighting/e nable",
+ "glGetMaterialfv()"),
+ new GLproperty(GL11.GL_POINT_SIZE, "GL_POINT_SIZE", "Point size", "point", "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_POINT_SMOOTH,
+ "GL_POINT_SMOOTH",
+ "Point antialiasing on",
+ "point/enable",
+ "glIsEnabled()"),
+ new GLproperty(GL11.GL_LINE_WIDTH, "GL_LINE_WIDTH", "Line width", "line", "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_LINE_SMOOTH,
+ "GL_LINE_SMOOTH",
+ "Line antialiasing on",
+ "line/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_LINE_STIPPLE_PATTERN,
+ "GL_LINE_STIPPLE_PATTERN",
+ "Line stipple",
+ "line",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_LINE_STIPPLE_REPEAT,
+ "GL_LINE_STIPPLE_REPEAT",
+ "Line stipple repeat",
+ "line",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_LINE_STIPPLE,
+ "GL_LINE_STIPPLE",
+ "Line stipple enable",
+ "line/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_CULL_FACE,
+ "GL_CULL_FACE",
+ "Polygon culling enabled",
+ "polygon/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_CULL_FACE_MODE,
+ "GL_CULL_FACE_MODE",
+ "Cull front-/back-facing polygons",
+ "polygon",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_FRONT_FACE,
+ "GL_FRONT_FACE",
+ "Polygon front-face CW/CCW indicator",
+ "polygon",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_POLYGON_SMOOTH,
+ "GL_POLYGON_SMOOTH",
+ "Polygon antialiasing on",
+ "polygon/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_POLYGON_MODE,
+ "GL_POLYGON_MODE",
+ "Polygon rasterization mode (front and back)",
+ "polygon",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_POLYGON_OFFSET_FACTOR,
+ "GL_POLYGON_OFFSET_FACTOR",
+ "Polygon offset factor",
+ "polygon",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_POLYGON_OFFSET_POINT,
+ "GL_POLYGON_OFFSET_POINT",
+ "Polygon offset enable for GL_POINT mode rasterization",
+ "polygon/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_POLYGON_OFFSET_LINE,
+ "GL_POLYGON_OFFSET_LINE",
+ "Polygon offset enable for GL_LINE mode rasterization",
+ "polygon/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_POLYGON_OFFSET_FILL,
+ "GL_POLYGON_OFFSET_FILL",
+ "Polygon offset enable for GL_FILL mode rasterization",
+ "polygon/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_POLYGON_STIPPLE,
+ "GL_POLYGON_STIPPLE",
+ "Polygon stipple enable",
+ "polygon/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_1D,
+ "GL_TEXTURE_1D",
+ "True if 1-D texturing enabled ",
+ "texture/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_2D,
+ "GL_TEXTURE_2D",
+ "True if 2-D texturing enabled ",
+ "texture/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_BINDING_1D,
+ "GL_TEXTURE_BINDING_1D",
+ "Texture object bound to GL_TEXTURE_1D",
+ "texture",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_BINDING_2D,
+ "GL_TEXTURE_BINDING_2D",
+ "Texture object bound to GL_TEXTURE_2D",
+ "texture",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE,
+ "GL_TEXTURE",
+ "x-D texture image at level of detail i",
+ "UNUSED",
+ "glGetTexImage()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_WIDTH,
+ "GL_TEXTURE_WIDTH",
+ "x-D texture image i's width",
+ "UNUSED",
+ "glGetTexLevelParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_HEIGHT,
+ "GL_TEXTURE_HEIGHT",
+ "x-D texture image i's height",
+ "UNUSED",
+ "glGetTexLevelParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_BORDER,
+ "GL_TEXTURE_BORDER",
+ "x-D texture image i's border width",
+ "UNUSED",
+ "glGetTexLevelParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_RED_SIZE,
+ "GL_TEXTURE_RED_SIZE",
+ "x-D texture image i's red resolution",
+ "UNUSED",
+ "glGetTexLevelParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_GREEN_SIZE,
+ "GL_TEXTURE_GREEN_SIZE",
+ "x-D texture image i's green resolution",
+ "UNUSED",
+ "glGetTexLevelParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_BLUE_SIZE,
+ "GL_TEXTURE_BLUE_SIZE",
+ "x-D texture image i's blue resolution",
+ "UNUSED",
+ "glGetTexLevelParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_ALPHA_SIZE,
+ "GL_TEXTURE_ALPHA_SIZE",
+ "x-D texture image i's alpha resolution",
+ "UNUSED",
+ "glGetTexLevelParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_LUMINANCE_SIZE,
+ "GL_TEXTURE_LUMINANCE_SIZE",
+ "x-D texture image i's luminance resolution",
+ "UNUSED",
+ "glGetTexLevelParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_INTENSITY_SIZE,
+ "GL_TEXTURE_INTENSITY_SIZE",
+ "x-D texture image i's intensity resolution",
+ "UNUSED",
+ "glGetTexLevelParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_BORDER_COLOR,
+ "GL_TEXTURE_BORDER_COLOR",
+ "Texture border color",
+ "texture",
+ "glGetTexParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_MIN_FILTER,
+ "GL_TEXTURE_MIN_FILTER",
+ "Texture minification function",
+ "texture",
+ "glGetTexParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_MAG_FILTER,
+ "GL_TEXTURE_MAG_FILTER",
+ "Texture magnification function",
+ "texture",
+ "glGetTexParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_WRAP_S,
+ "GL_TEXTURE_WRAP_S",
+ "Texture wrap mode (x is S or T)",
+ "texture",
+ "glGetTexParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_WRAP_T,
+ "GL_TEXTURE_WRAP_T",
+ "Texture wrap mode (x is S or T)",
+ "texture",
+ "glGetTexParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_PRIORITY,
+ "GL_TEXTURE_PRIORITY",
+ "Texture object priority",
+ "texture",
+ "glGetTexParameter*()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_ENV_MODE,
+ "GL_TEXTURE_ENV_MODE",
+ "Texture application function",
+ "texture",
+ "glGetTexEnviv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_ENV_COLOR,
+ "GL_TEXTURE_ENV_COLOR",
+ "Texture environment color",
+ "texture",
+ "glGetTexEnvfv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_GEN_S,
+ "GL_TEXTURE_GEN_S",
+ "Texgen enabled (x is S, T, R, or Q)",
+ "texture/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_GEN_T,
+ "GL_TEXTURE_GEN_T",
+ "Texgen enabled (x is S, T, R, or Q)",
+ "texture/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_GEN_R,
+ "GL_TEXTURE_GEN_R",
+ "Texgen enabled (x is S, T, R, or Q)",
+ "texture/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_GEN_Q,
+ "GL_TEXTURE_GEN_Q",
+ "Texgen enabled (x is S, T, R, or Q)",
+ "texture/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_EYE_PLANE,
+ "GL_EYE_PLANE",
+ "Texgen plane equation coefficients",
+ "texture",
+ "glGetTexGenfv()"),
+ new GLproperty(
+ GL11.GL_OBJECT_PLANE,
+ "GL_OBJECT_PLANE",
+ "Texgen object linear coefficients",
+ "texture",
+ "glGetTexGenfv()"),
+ new GLproperty(
+ GL11.GL_TEXTURE_GEN_MODE,
+ "GL_TEXTURE_GEN_MODE",
+ "Function used for texgen",
+ "texture",
+ "glGetTexGeniv()"),
+ new GLproperty(
+ GL11.GL_SCISSOR_TEST,
+ "GL_SCISSOR_TEST",
+ "Scissoring enabled",
+ "scissor/enable",
+ "glIsEnabled()"),
+ new GLproperty(GL11.GL_SCISSOR_BOX, "GL_SCISSOR_BOX", "Scissor box", "scissor", "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_ALPHA_TEST,
+ "GL_ALPHA_TEST",
+ "Alpha test enabled",
+ "color-buffer/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_ALPHA_TEST_FUNC,
+ "GL_ALPHA_TEST_FUNC",
+ "Alpha test function",
+ "color-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_ALPHA_TEST_REF,
+ "GL_ALPHA_TEST_REF",
+ "Alpha test reference value",
+ "color-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_STENCIL_TEST,
+ "GL_STENCIL_TEST",
+ "Stenciling enabled",
+ "stencil-buffer/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_STENCIL_FUNC,
+ "GL_STENCIL_FUNC",
+ "Stencil function",
+ "stencil-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_STENCIL_VALUE_MASK,
+ "GL_STENCIL_VALUE_MASK",
+ "Stencil mask",
+ "stencil-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_STENCIL_REF,
+ "GL_STENCIL_REF",
+ "Stencil reference value",
+ "stencil-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_STENCIL_FAIL,
+ "GL_STENCIL_FAIL",
+ "Stencil fail action",
+ "stencil-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_STENCIL_PASS_DEPTH_FAIL,
+ "GL_STENCIL_PASS_DEPTH_FAIL",
+ "Stencil depth buffer fail action",
+ "stencil-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_STENCIL_PASS_DEPTH_PASS,
+ "GL_STENCIL_PASS_DEPTH_PASS",
+ "Stencil depth buffer pass action",
+ "stencil-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_DEPTH_TEST,
+ "GL_DEPTH_TEST",
+ "Depth buffer enabled",
+ "depth-buffer/ena ble",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_DEPTH_FUNC,
+ "GL_DEPTH_FUNC",
+ "Depth buffer test function",
+ "depth-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(GL11.GL_BLEND, "GL_BLEND", "Blending enabled", "color-buffer/enable", "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_BLEND_SRC,
+ "GL_BLEND_SRC",
+ "Blending source function",
+ "color-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_BLEND_DST,
+ "GL_BLEND_DST",
+ "Blending destination function",
+ "color-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(GL11.GL_DITHER, "GL_DITHER", "Dithering enabled", "color-buffer/enable", "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_INDEX_LOGIC_OP,
+ "GL_INDEX_LOGIC_OP",
+ "Color index logical operation enabled",
+ "color-buffer/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_COLOR_LOGIC_OP,
+ "GL_COLOR_LOGIC_OP",
+ "RGBA color logical operation enabled",
+ "color-buffer/enable",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_LOGIC_OP_MODE,
+ "GL_LOGIC_OP_MODE",
+ "Logical operation function",
+ "color-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_DRAW_BUFFER,
+ "GL_DRAW_BUFFER",
+ "Buffers selected for drawing",
+ "color-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_INDEX_WRITEMASK,
+ "GL_INDEX_WRITEMASK",
+ "Color-index writemask",
+ "color-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_COLOR_WRITEMASK,
+ "GL_COLOR_WRITEMASK",
+ "Color write enables; R, G, B, or A",
+ "color-buffer",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_DEPTH_WRITEMASK,
+ "GL_DEPTH_WRITEMASK",
+ "Depth buffer enabled for writing",
+ "depth-buffer",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_STENCIL_WRITEMASK,
+ "GL_STENCIL_WRITEMASK",
+ "Stencil-buffer writemask",
+ "stencil-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_COLOR_CLEAR_VALUE,
+ "GL_COLOR_CLEAR_VALUE",
+ "Color-buffer clear value (RGBA mode)",
+ "color-buffer",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_INDEX_CLEAR_VALUE,
+ "GL_INDEX_CLEAR_VALUE",
+ "Color-buffer clear value (color-index mode)",
+ "color-buffer",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_DEPTH_CLEAR_VALUE,
+ "GL_DEPTH_CLEAR_VALUE",
+ "Depth-buffer clear value",
+ "depth-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_STENCIL_CLEAR_VALUE,
+ "GL_STENCIL_CLEAR_VALUE",
+ "Stencil-buffer clear value",
+ "stencil-buffer",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_ACCUM_CLEAR_VALUE,
+ "GL_ACCUM_CLEAR_VALUE",
+ "Accumulation-buffer clear value",
+ "accum-buffer",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_UNPACK_SWAP_BYTES,
+ "GL_UNPACK_SWAP_BYTES",
+ "Value of GL_UNPACK_SWAP_BYTES",
+ "pixel-store",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_UNPACK_LSB_FIRST,
+ "GL_UNPACK_LSB_FIRST",
+ "Value of GL_UNPACK_LSB_FIRST",
+ "pixel-store",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_UNPACK_ROW_LENGTH,
+ "GL_UNPACK_ROW_LENGTH",
+ "Value of GL_UNPACK_ROW_LENGTH",
+ "pixel-store",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_UNPACK_SKIP_ROWS,
+ "GL_UNPACK_SKIP_ROWS",
+ "Value of GL_UNPACK_SKIP_ROWS",
+ "pixel-store",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_UNPACK_SKIP_PIXELS,
+ "GL_UNPACK_SKIP_PIXELS",
+ "Value of GL_UNPACK_SKIP_PIXELS",
+ "pixel-store",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_UNPACK_ALIGNMENT,
+ "GL_UNPACK_ALIGNMENT",
+ "Value of GL_UNPACK_ALIGNMENT",
+ "pixel-store",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_PACK_SWAP_BYTES,
+ "GL_PACK_SWAP_BYTES",
+ "Value of GL_PACK_SWAP_BYTES",
+ "pixel-store",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_PACK_LSB_FIRST,
+ "GL_PACK_LSB_FIRST",
+ "Value of GL_PACK_LSB_FIRST",
+ "pixel-store",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_PACK_ROW_LENGTH,
+ "GL_PACK_ROW_LENGTH",
+ "Value of GL_PACK_ROW_LENGTH",
+ "pixel-store",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_PACK_SKIP_ROWS,
+ "GL_PACK_SKIP_ROWS",
+ "Value of GL_PACK_SKIP_ROWS",
+ "pixel-store",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_PACK_SKIP_PIXELS,
+ "GL_PACK_SKIP_PIXELS",
+ "Value of GL_PACK_SKIP_PIXELS",
+ "pixel-store",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_PACK_ALIGNMENT,
+ "GL_PACK_ALIGNMENT",
+ "Value of GL_PACK_ALIGNMENT",
+ "pixel-store",
+ "glGetIntegerv()"),
+ new GLproperty(GL11.GL_MAP_COLOR, "GL_MAP_COLOR", "True if colors are mapped", "pixel", "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_MAP_STENCIL,
+ "GL_MAP_STENCIL",
+ "True if stencil values are mapped",
+ "pixel",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_INDEX_SHIFT,
+ "GL_INDEX_SHIFT",
+ "Value of GL_INDEX_SHIFT",
+ "pixel",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_INDEX_OFFSET,
+ "GL_INDEX_OFFSET",
+ "Value of GL_INDEX_OFFSET",
+ "pixel",
+ "glGetIntegerv()"),
+ new GLproperty(GL11.GL_ZOOM_X, "GL_ZOOM_X", "x zoom factor", "pixel", "glGetFloatv()"),
+ new GLproperty(GL11.GL_ZOOM_Y, "GL_ZOOM_Y", "y zoom factor", "pixel", "glGetFloatv()"),
+ new GLproperty(GL11.GL_READ_BUFFER, "GL_READ_BUFFER", "Read source buffer", "pixel", "glGetIntegerv()"),
+ new GLproperty(GL11.GL_ORDER, "GL_ORDER", "1D map order", "capability", "glGetMapiv()"),
+ new GLproperty(GL11.GL_ORDER, "GL_ORDER", "2D map orders", "capability", "glGetMapiv()"),
+ new GLproperty(GL11.GL_COEFF, "GL_COEFF", "1D control points", "capability", "glGetMapfv()"),
+ new GLproperty(GL11.GL_COEFF, "GL_COEFF", "2D control points", "capability", "glGetMapfv()"),
+ new GLproperty(GL11.GL_DOMAIN, "GL_DOMAIN", "1D domain endpoints", "capability", "glGetMapfv()"),
+ new GLproperty(GL11.GL_DOMAIN, "GL_DOMAIN", "2D domain endpoints", "capability", "glGetMapfv()"),
+ new GLproperty(
+ GL11.GL_MAP1_GRID_DOMAIN,
+ "GL_MAP1_GRID_DOMAIN",
+ "1D grid endpoints",
+ "eval",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_MAP2_GRID_DOMAIN,
+ "GL_MAP2_GRID_DOMAIN",
+ "2D grid endpoints",
+ "eval",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_MAP1_GRID_SEGMENTS,
+ "GL_MAP1_GRID_SEGMENTS",
+ "1D grid divisions",
+ "eval",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_MAP2_GRID_SEGMENTS,
+ "GL_MAP2_GRID_SEGMENTS",
+ "2D grid divisions",
+ "eval",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_AUTO_NORMAL,
+ "GL_AUTO_NORMAL",
+ "True if automatic normal generation enabled",
+ "eval",
+ "glIsEnabled()"),
+ new GLproperty(
+ GL11.GL_PERSPECTIVE_CORRECTION_HINT,
+ "GL_PERSPECTIVE_CORRECTION_HINT",
+ "Perspective correction hint",
+ "hint",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_POINT_SMOOTH_HINT,
+ "GL_POINT_SMOOTH_HINT",
+ "Point smooth hint",
+ "hint",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_LINE_SMOOTH_HINT,
+ "GL_LINE_SMOOTH_HINT",
+ "Line smooth hint",
+ "hint",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_POLYGON_SMOOTH_HINT,
+ "GL_POLYGON_SMOOTH_HINT",
+ "Polygon smooth hint",
+ "hint",
+ "glGetIntegerv()"),
+ new GLproperty(GL11.GL_FOG_HINT, "GL_FOG_HINT", "Fog hint", "hint", "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_LIGHTS,
+ "GL_MAX_LIGHTS",
+ "Maximum number of lights",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_CLIP_PLANES,
+ "GL_MAX_CLIP_PLANES",
+ "Maximum number of user clipping planes",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_MODELVIEW_STACK_DEPTH,
+ "GL_MAX_MODELVIEW_STACK_DEPTH",
+ "Maximum modelview-matrix stack depth",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_PROJECTION_STACK_DEPTH,
+ "GL_MAX_PROJECTION_STACK_DEPTH",
+ "Maximum projection-matrix stack depth",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_TEXTURE_STACK_DEPTH,
+ "GL_MAX_TEXTURE_STACK_DEPTH",
+ "Maximum depth of texture matrix stack",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_SUBPIXEL_BITS,
+ "GL_SUBPIXEL_BITS",
+ "Number of bits of subpixel precision in x and y",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_TEXTURE_SIZE,
+ "GL_MAX_TEXTURE_SIZE",
+ "See discussion in Texture Proxy in Chapter 9",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_PIXEL_MAP_TABLE,
+ "GL_MAX_PIXEL_MAP_TABLE",
+ "Maximum size of a glPixelMap() translation table",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_NAME_STACK_DEPTH,
+ "GL_MAX_NAME_STACK_DEPTH",
+ "Maximum selection-name stack depth",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_LIST_NESTING,
+ "GL_MAX_LIST_NESTING",
+ "Maximum display-list call nesting",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_EVAL_ORDER,
+ "GL_MAX_EVAL_ORDER",
+ "Maximum evaluator polynomial order",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_VIEWPORT_DIMS,
+ "GL_MAX_VIEWPORT_DIMS",
+ "Maximum viewport dimensions",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_ATTRIB_STACK_DEPTH,
+ "GL_MAX_ATTRIB_STACK_DEPTH",
+ "Maximum depth of the attribute stack",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_MAX_CLIENT_ATTRIB_STACK_DEPTH,
+ "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH",
+ "Maximum depth of the client attribute stack",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_AUX_BUFFERS,
+ "GL_AUX_BUFFERS",
+ "Number of auxiliary buffers",
+ "capability",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_RGBA_MODE,
+ "GL_RGBA_MODE",
+ "True if color buffers store RGBA",
+ "capability",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_INDEX_MODE,
+ "GL_INDEX_MODE",
+ "True if color buffers store indices",
+ "capability",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_DOUBLEBUFFER,
+ "GL_DOUBLEBUFFER",
+ "True if front and back buffers exist",
+ "capability",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_STEREO,
+ "GL_STEREO",
+ "True if left and right buffers exist",
+ "capability",
+ "glGetBooleanv()"),
+ new GLproperty(
+ GL11.GL_POINT_SIZE_RANGE,
+ "GL_POINT_SIZE_RANGE",
+ "Range (low to high) of antialiased point sizes",
+ "capability",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_POINT_SIZE_GRANULARITY,
+ "GL_POINT_SIZE_GRANULARITY",
+ "Antialiased point-size granularity",
+ "capability",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_LINE_WIDTH_RANGE,
+ "GL_LINE_WIDTH_RANGE",
+ "Range (low to high) of antialiased line widths",
+ "capability",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_LINE_WIDTH_GRANULARITY,
+ "GL_LINE_WIDTH_GRANULARITY",
+ "Antialiased line-width granularity",
+ "capability",
+ "glGetFloatv()"),
+ new GLproperty(
+ GL11.GL_RED_BITS,
+ "GL_RED_BITS",
+ "Number of bits per red component in color buffers",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_GREEN_BITS,
+ "GL_GREEN_BITS",
+ "Number of bits per green component in color buffers",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_BLUE_BITS,
+ "GL_BLUE_BITS",
+ "Number of bits per blue component in color buffers",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_ALPHA_BITS,
+ "GL_ALPHA_BITS",
+ "Number of bits per alpha component in color buffers",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_INDEX_BITS,
+ "GL_INDEX_BITS",
+ "Number of bits per index in color buffers",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_DEPTH_BITS,
+ "GL_DEPTH_BITS",
+ "Number of depth-buffer bitplanes",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_STENCIL_BITS,
+ "GL_STENCIL_BITS",
+ "Number of stencil bitplanes",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_ACCUM_RED_BITS,
+ "GL_ACCUM_RED_BITS",
+ "Number of bits per red component in the accumulation buffer",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_ACCUM_GREEN_BITS,
+ "GL_ACCUM_GREEN_BITS",
+ "Number of bits per green component in the accumulation buffer",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_ACCUM_BLUE_BITS,
+ "GL_ACCUM_BLUE_BITS",
+ "Number of bits per blue component in the accumulation buffer",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_ACCUM_ALPHA_BITS,
+ "GL_ACCUM_ALPHA_BITS",
+ "Number of bits per alpha component in the accumulation buffer",
+ "capability",
+ "glGetIntegerv()"),
+ new GLproperty(GL11.GL_LIST_BASE, "GL_LIST_BASE", "Setting of glListBase()", "list", "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_LIST_INDEX,
+ "GL_LIST_INDEX",
+ "Number of display list under construction; 0 if none",
+ "current",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_LIST_MODE,
+ "GL_LIST_MODE",
+ "Mode of display list under construction; undefined if none",
+ "current",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_ATTRIB_STACK_DEPTH,
+ "GL_ATTRIB_STACK_DEPTH",
+ "Attribute stack pointer",
+ "current",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_CLIENT_ATTRIB_STACK_DEPTH,
+ "GL_CLIENT_ATTRIB_STACK_DEPTH",
+ "Client attribute stack pointer",
+ "current",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_NAME_STACK_DEPTH,
+ "GL_NAME_STACK_DEPTH",
+ "Name stack depth",
+ "current",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_RENDER_MODE,
+ "GL_RENDER_MODE",
+ "glRenderMode() setting",
+ "current",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_SELECTION_BUFFER_POINTER,
+ "GL_SELECTION_BUFFER_POINTER",
+ "Pointer to selection buffer",
+ "select",
+ "glGetPointerv()"),
+ new GLproperty(
+ GL11.GL_SELECTION_BUFFER_SIZE,
+ "GL_SELECTION_BUFFER_SIZE",
+ "Size of selection buffer",
+ "select",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_FEEDBACK_BUFFER_POINTER,
+ "GL_FEEDBACK_BUFFER_POINTER",
+ "Pointer to feedback buffer",
+ "feedback",
+ "glGetPointerv()"),
+ new GLproperty(
+ GL11.GL_FEEDBACK_BUFFER_SIZE,
+ "GL_FEEDBACK_BUFFER_SIZE",
+ "Size of feedback buffer",
+ "feedback",
+ "glGetIntegerv()"),
+ new GLproperty(
+ GL11.GL_FEEDBACK_BUFFER_TYPE,
+ "GL_FEEDBACK_BUFFER_TYPE",
+ "Type of feedback buffer",
+ "feedback",
+ "glGetIntegerv()"), };
public static void dumpOpenGLstate() {}
public static void dumpAllIsEnabled() // Call This
- {
+ {
for (int i = 0; i < instance.propertyList.length; ++i) {
if (instance.propertyList[i].fetchCommand == "glIsEnabled()") {
diff --git a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
index 98032fc43f..5a04502ae8 100644
--- a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
@@ -1,14 +1,15 @@
package gtPlusPlus.core.util.math;
+import java.text.NumberFormat;
+import java.util.Map;
+import java.util.Random;
+
import gregtech.api.enums.GT_Values;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import java.text.NumberFormat;
-import java.util.Map;
-import java.util.Random;
public class MathUtils {
@@ -22,12 +23,11 @@ public class MathUtils {
}
/**
- * Returns a psuedo-random number between min and max, inclusive.
- * The difference between min and max can be at most
+ * Returns a psuedo-random number between min and max, inclusive. The difference between min and max can be at most
* Integer.MAX_VALUE - 1.
*
* @param min Minimim value
- * @param max Maximim value. Must be greater than min.
+ * @param max Maximim value. Must be greater than min.
* @return Integer between min and max, inclusive.
* @see java.util.Random#nextInt(int)
*/
@@ -42,12 +42,11 @@ public class MathUtils {
}
/**
- * Returns a psuedo-random number between min and max, inclusive.
- * The difference between min and max can be at most
+ * Returns a psuedo-random number between min and max, inclusive. The difference between min and max can be at most
* Long.MAX_VALUE - 1.
*
* @param min Minimim value
- * @param max Maximim value. Must be greater than min.
+ * @param max Maximim value. Must be greater than min.
* @return Long between min and max, inclusive.
* @see java.util.Random#nextLong(long)
*/
@@ -68,12 +67,11 @@ public class MathUtils {
}
/**
- * Returns a psuedo-random number between min and max, inclusive.
- * The difference between min and max can be at most
+ * Returns a psuedo-random number between min and max, inclusive. The difference between min and max can be at most
* Double.MAX_VALUE - 1.
*
* @param min Minimim value
- * @param max Maximim value. Must be greater than min.
+ * @param max Maximim value. Must be greater than min.
* @return Double between min and max, inclusive.
* @see java.util.Random#nextDouble(double)
*/
@@ -94,12 +92,11 @@ public class MathUtils {
}
/**
- * Returns a psuedo-random number between min and max, inclusive.
- * The difference between min and max can be at most
+ * Returns a psuedo-random number between min and max, inclusive. The difference between min and max can be at most
* Float.MAX_VALUE - 1.
*
* @param min Minimim value
- * @param max Maximim value. Must be greater than min.
+ * @param max Maximim value. Must be greater than min.
* @return Float between min and max, inclusive.
* @see java.util.Random#nextFloat(float)
*/
@@ -120,12 +117,10 @@ public class MathUtils {
}
/**
- * Returns a percentage.
- * The returned number is the % of X in Y.
- * Supports Doubles.
+ * Returns a percentage. The returned number is the % of X in Y. Supports Doubles.
*
* @param current Current value.
- * @param max Maximim value. Must be greater than min.
+ * @param max Maximim value. Must be greater than min.
* @return double between min and max, inclusive.
*/
public static double findPercentage(final double current, final double max) {
@@ -133,12 +128,10 @@ public class MathUtils {
}
/**
- * Returns a percentage.
- * The returned number is the % of X in Y.
- * Supports Floats.
+ * Returns a percentage. The returned number is the % of X in Y. Supports Floats.
*
* @param current Current value.
- * @param max Maximim value. Must be greater than min.
+ * @param max Maximim value. Must be greater than min.
* @return double between min and max, inclusive.
*/
public static float findPercentage(final float current, final float max) {
@@ -151,9 +144,7 @@ public class MathUtils {
// Smooth Rounding Function
/**
- * Returns a double.
- * The returned number is d rounded to the nearest d.01.
- * Supports Doubles.
+ * Returns a double. The returned number is d rounded to the nearest d.01. Supports Doubles.
*
* @param current Current value.
* @return double Rounded value.
@@ -164,9 +155,7 @@ public class MathUtils {
// Smooth Rounding Function (Nearest 5)
/**
- * Returns a double.
- * The returned number is d rounded to the nearest d.5.
- * Supports Doubles.
+ * Returns a double. The returned number is d rounded to the nearest d.5. Supports Doubles.
*
* @param current Current value.
* @return double Rounded value.
@@ -177,9 +166,7 @@ public class MathUtils {
// Smooth Rounding Function
/**
- * Returns a integer.
- * The returned number is d rounded to the nearest flat integer.
- * Supports Doubles as input.
+ * Returns a integer. The returned number is d rounded to the nearest flat integer. Supports Doubles as input.
*
* @param current Current value.
* @return integer Rounded value.
@@ -203,9 +190,7 @@ public class MathUtils {
// Smooth Rounding Function
/**
- * Returns a long.
- * The returned number is d rounded to the nearest flat long.
- * Supports Doubles as input.
+ * Returns a long. The returned number is d rounded to the nearest flat long. Supports Doubles as input.
*
* @param current Current value.
* @return long Rounded value.
@@ -215,12 +200,10 @@ public class MathUtils {
}
/**
- * Returns a boolean.
- * The returned boolean is wether or not X evenly fits in to Y.
- * Supports ints.
+ * Returns a boolean. The returned boolean is wether or not X evenly fits in to Y. Supports ints.
*
* @param x Value A.
- * @param y Value B. Must be greater than min.
+ * @param y Value B. Must be greater than min.
* @return boolean Whether or not it divides evenly.
*/
public static boolean divideXintoY(final int x, final int y) {
@@ -231,9 +214,7 @@ public class MathUtils {
}
/**
- * Returns a boolean.
- * The returned boolean is based on the odd/eveness of the input.
- * Supports ints.
+ * Returns a boolean. The returned boolean is based on the odd/eveness of the input. Supports ints.
*
* @param x Value A.
* @return boolean Whether or not it divides evenly.
@@ -246,9 +227,7 @@ public class MathUtils {
}
/**
- * Returns an int.
- * The returned number is the value on i + 273.15F.
- * Supports ints.
+ * Returns an int. The returned number is the value on i + 273.15F. Supports ints.
*
* @param i Temp in Celcius.
* @return int The celcius temp returned as Kelvin, rounded to the readest whole.
@@ -259,9 +238,7 @@ public class MathUtils {
}
/**
- * Returns a hexInteger.
- * The returned number is the hex value of the input.
- * Supports ints.
+ * Returns a hexInteger. The returned number is the hex value of the input. Supports ints.
*
* @param input Current value.
* @return hexInteger.
@@ -273,12 +250,10 @@ public class MathUtils {
}
/**
- * Returns a hexInteger.
- * The returned value is between min and max.
- * Supports ints.
+ * Returns a hexInteger. The returned value is between min and max. Supports ints.
*
* @param min Minimum value.
- * @param max Maximium value. Must be greater than min.
+ * @param max Maximium value. Must be greater than min.
* @return hexInteger between min and max, inclusive.
*/
public static int generateRandomHexValue(final int min, final int max) {
@@ -286,8 +261,7 @@ public class MathUtils {
}
/**
- * Returns a random hex value.
- * The returned value is between 000000-ffffff.
+ * Returns a random hex value. The returned value is between 000000-ffffff.
*
* @return hexInteger between min and max, inclusive.
*/
@@ -370,8 +344,7 @@ public class MathUtils {
}
public static int safeInt(long number) {
- return number > GT_Values.V[GT_Values.V.length - 1]
- ? safeInt(GT_Values.V[GT_Values.V.length - 1], 1)
+ return number > GT_Values.V[GT_Values.V.length - 1] ? safeInt(GT_Values.V[GT_Values.V.length - 1], 1)
: number < Integer.MIN_VALUE ? Integer.MIN_VALUE : (int) number;
}
@@ -534,6 +507,7 @@ public class MathUtils {
/**
* Inverts the value, making Positives into Negatives and vice versa.
+ *
* @param aPositive - An int value, either positive or negative.
* @return - Inverted int Value.
*/
@@ -669,9 +643,10 @@ public class MathUtils {
/**
* Balances a number within a range.
+ *
* @param aInput - The number to balance
- * @param aMin - The minimum bounds
- * @param aMax - The maximum bounds
+ * @param aMin - The minimum bounds
+ * @param aMax - The maximum bounds
* @return - An Integer which will be between the bounds, or a boundary value.
*/
public static int balance(int aInput, int aMin, int aMax) {
@@ -680,9 +655,10 @@ public class MathUtils {
/**
* Balances a number within a range.
+ *
* @param aInput - The number to balance
- * @param aMin - The minimum bounds
- * @param aMax - The maximum bounds
+ * @param aMin - The minimum bounds
+ * @param aMax - The maximum bounds
* @return - A Number which will be between the bounds, or a boundary value.
*/
public static Number balance(Number aInput, Number aMin, Number aMax) {
@@ -691,21 +667,23 @@ public class MathUtils {
/**
* Balances a number within a range.
+ *
* @param aInput - The number to balance
- * @param aMin - The minimum bounds
- * @param aMax - The maximum bounds
+ * @param aMin - The minimum bounds
+ * @param aMax - The maximum bounds
* @return - An Integer which will be between the bounds, or a boundary value.
*/
public static int balanceInt(Number aInput, Number aMin, Number aMax) {
- return MathUtils.safeCast_LongToInt(
- (long) balance(max(min(aInput, aMax), aMin), Integer.MIN_VALUE, Integer.MAX_VALUE));
+ return MathUtils
+ .safeCast_LongToInt((long) balance(max(min(aInput, aMax), aMin), Integer.MIN_VALUE, Integer.MAX_VALUE));
}
/**
* Balances a number within a range.
+ *
* @param aInput - The number to balance
- * @param aMin - The minimum bounds
- * @param aMax - The maximum bounds
+ * @param aMin - The minimum bounds
+ * @param aMax - The maximum bounds
* @return - A Long which will be between the bounds, or a boundary value.
*/
public static long balanceLong(Number aInput, Number aMin, Number aMax) {
@@ -724,28 +702,24 @@ public class MathUtils {
}
/**
- * Returns the smaller of two {@code Number}s. That is,
- * the result the argument closer to the value of
- * {@link Long#MIN_VALUE}. If the arguments have the same
- * value, the result is that same value.
+ * Returns the smaller of two {@code Number}s. That is, the result the argument closer to the value of
+ * {@link Long#MIN_VALUE}. If the arguments have the same value, the result is that same value.
*
- * @param a an argument.
- * @param b another argument.
- * @return the smaller of {@code a} and {@code b}.
+ * @param a an argument.
+ * @param b another argument.
+ * @return the smaller of {@code a} and {@code b}.
*/
public static Number min(Number a, Number b) {
return (a.longValue() <= b.longValue()) ? a : b;
}
/**
- * Returns the greater of two {@code Number}s. That is, the
- * result is the argument closer to the value of
- * {@link Long#MAX_VALUE}. If the arguments have the same value,
- * the result is that same value.
+ * Returns the greater of two {@code Number}s. That is, the result is the argument closer to the value of
+ * {@link Long#MAX_VALUE}. If the arguments have the same value, the result is that same value.
*
- * @param a an argument.
- * @param b another argument.
- * @return the larger of {@code a} and {@code b}.
+ * @param a an argument.
+ * @param b another argument.
+ * @return the larger of {@code a} and {@code b}.
*/
public static Number max(Number a, Number b) {
return (a.longValue() >= b.longValue()) ? a : b;
@@ -759,7 +733,7 @@ public class MathUtils {
public static int[] splitLongIntoTwoIntegers(long aNum) {
int a = (int) (aNum >> 32);
int b = (int) aNum;
- return new int[] {a, b};
+ return new int[] { a, b };
}
public static String formatNumbers(long aNumber) {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java
index 3871d11941..e3219369e8 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java
@@ -1,9 +1,10 @@
package gtPlusPlus.core.util.minecraft;
-import gtPlusPlus.api.objects.Logger;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.api.objects.Logger;
+
public class EnchantingUtils {
public static final int XP_PER_BOTTLE = 8;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java
index 207faeefce..1d86a7482f 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.util.minecraft;
+import net.minecraft.item.ItemRedstone;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_ModHandler;
import ic2.api.item.IElectricItem;
import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem;
-import net.minecraft.item.ItemRedstone;
-import net.minecraft.item.ItemStack;
public class EnergyUtils {
@@ -37,8 +38,8 @@ public class EnergyUtils {
public static boolean discharge(ItemStack aStack, int aEnergyToDrain, int aTier) {
if (isElectricItem(aStack)) {
int tTier = ((IElectricItem) aStack.getItem()).getTier(aStack);
- int aDischargeValue =
- GT_ModHandler.dischargeElectricItem(aStack, aEnergyToDrain, tTier, true, false, false);
+ int aDischargeValue = GT_ModHandler
+ .dischargeElectricItem(aStack, aEnergyToDrain, tTier, true, false, false);
// Logger.INFO("Trying to drain "+aDischargeValue);
return aDischargeValue > 0;
} else {
@@ -119,5 +120,6 @@ public class EnergyUtils {
}
}
- public static class RF {}
+ public static class RF {
+ }
}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java
index 9c6fab90cd..e154a059e2 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java
@@ -1,19 +1,11 @@
package gtPlusPlus.core.util.minecraft;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.minecraft.AABB;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.handler.events.EntityDeathHandler;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import ic2.core.IC2Potion;
-import ic2.core.item.armor.ItemArmorHazmat;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
+
import net.minecraft.block.Block;
import net.minecraft.entity.*;
import net.minecraft.entity.player.EntityPlayer;
@@ -25,6 +17,16 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
+import cpw.mods.fml.common.registry.EntityRegistry;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.AABB;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.handler.events.EntityDeathHandler;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import ic2.core.IC2Potion;
+import ic2.core.item.armor.ItemArmorHazmat;
+
public class EntityUtils {
public static void setEntityOnFire(final Entity aEntity, final int length) {
@@ -81,14 +83,14 @@ public class EntityUtils {
}
// TODO
- public static void registerEntityToBiomeSpawns(
- final Class<EntityLiving> classy, final EnumCreatureType EntityType, final BiomeGenBase baseBiomeGen) {
- EntityRegistry.addSpawn(
- classy, 6, 1, 5, EntityType, baseBiomeGen); // change the values to vary the spawn rarity, biome, etc.
+ public static void registerEntityToBiomeSpawns(final Class<EntityLiving> classy, final EnumCreatureType EntityType,
+ final BiomeGenBase baseBiomeGen) {
+ EntityRegistry.addSpawn(classy, 6, 1, 5, EntityType, baseBiomeGen); // change the values to vary the spawn
+ // rarity, biome, etc.
}
- public static boolean applyRadiationDamageToEntity(
- final int stackSize, final int radiationLevel, final World world, final Entity entityHolding) {
+ public static boolean applyRadiationDamageToEntity(final int stackSize, final int radiationLevel, final World world,
+ final Entity entityHolding) {
if (!world.isRemote) {
if ((radiationLevel > 0) && (entityHolding instanceof EntityLivingBase)) {
final EntityLivingBase entityLiving = (EntityLivingBase) entityHolding;
@@ -99,9 +101,7 @@ public class EntityUtils {
if (entityLiving.getActivePotionEffect(IC2Potion.radiation) != null) {
// Utils.LOG_INFO("t");
duration = (radiationLevel * 5)
- + entityLiving
- .getActivePotionEffect(IC2Potion.radiation)
- .getDuration();
+ + entityLiving.getActivePotionEffect(IC2Potion.radiation).getDuration();
} else {
// Utils.LOG_INFO("f");
duration = radiationLevel * 30;
@@ -117,114 +117,101 @@ public class EntityUtils {
}
public static boolean isWearingFullFrostHazmat(EntityLivingBase aEntity) {
- for (byte i = 1; i < 5; i++)
- if (!HazmatUtils.providesProtetion_Frost(aEntity.getEquipmentInSlot(i))) {
- return false;
- }
+ for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Frost(aEntity.getEquipmentInSlot(i))) {
+ return false;
+ }
return true;
}
public static boolean isWearingFullHeatHazmat(EntityLivingBase aEntity) {
- for (byte i = 1; i < 5; i++)
- if (!HazmatUtils.providesProtetion_Fire(aEntity.getEquipmentInSlot(i))) {
- return false;
- }
+ for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Fire(aEntity.getEquipmentInSlot(i))) {
+ return false;
+ }
return true;
}
public static boolean isWearingFullBioHazmat(EntityLivingBase aEntity) {
- for (byte i = 1; i < 5; i++)
- if (!HazmatUtils.providesProtetion_Biohazard(aEntity.getEquipmentInSlot(i))) {
- return false;
- }
+ for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Biohazard(aEntity.getEquipmentInSlot(i))) {
+ return false;
+ }
return true;
}
public static boolean isWearingFullRadioHazmat(EntityLivingBase aEntity) {
- for (byte i = 1; i < 5; i++)
- if (!HazmatUtils.providesProtetion_Radiation(aEntity.getEquipmentInSlot(i))) {
- return false;
- }
+ for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Radiation(aEntity.getEquipmentInSlot(i))) {
+ return false;
+ }
return true;
}
public static boolean isWearingFullElectroHazmat(EntityLivingBase aEntity) {
- for (byte i = 1; i < 5; i++)
- if (!HazmatUtils.providesProtetion_Electricity(aEntity.getEquipmentInSlot(i))) {
- return false;
- }
+ for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Electricity(aEntity.getEquipmentInSlot(i))) {
+ return false;
+ }
return true;
}
public static boolean isWearingFullGasHazmat(EntityLivingBase aEntity) {
- for (byte i = 1; i < 5; i++)
- if (!HazmatUtils.providesProtetion_Gas(aEntity.getEquipmentInSlot(i))) {
- return false;
- }
+ for (byte i = 1; i < 5; i++) if (!HazmatUtils.providesProtetion_Gas(aEntity.getEquipmentInSlot(i))) {
+ return false;
+ }
return true;
}
public static boolean applyRadioactivity(EntityLivingBase aEntity, int aLevel, int aAmountOfItems) {
- if (aLevel > 0
- && aEntity != null
+ if (aLevel > 0 && aEntity != null
&& aEntity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD
&& aEntity.getCreatureAttribute() != EnumCreatureAttribute.ARTHROPOD
&& !ItemArmorHazmat.hasCompleteHazmat(aEntity)) {
PotionEffect tEffect = null;
- aEntity.addPotionEffect(new PotionEffect(
- Potion.moveSlowdown.id,
- aLevel * 140 * aAmountOfItems
- + Math.max(
+ aEntity.addPotionEffect(
+ new PotionEffect(
+ Potion.moveSlowdown.id,
+ aLevel * 140 * aAmountOfItems + Math.max(
0,
- ((tEffect = aEntity.getActivePotionEffect(Potion.moveSlowdown)) == null
- ? 0
+ ((tEffect = aEntity.getActivePotionEffect(Potion.moveSlowdown)) == null ? 0
: tEffect.getDuration())),
- Math.max(0, (5 * aLevel) / 7)));
- aEntity.addPotionEffect(new PotionEffect(
- Potion.digSlowdown.id,
- aLevel * 150 * aAmountOfItems
- + Math.max(
+ Math.max(0, (5 * aLevel) / 7)));
+ aEntity.addPotionEffect(
+ new PotionEffect(
+ Potion.digSlowdown.id,
+ aLevel * 150 * aAmountOfItems + Math.max(
0,
- ((tEffect = aEntity.getActivePotionEffect(Potion.digSlowdown)) == null
- ? 0
+ ((tEffect = aEntity.getActivePotionEffect(Potion.digSlowdown)) == null ? 0
: tEffect.getDuration())),
- Math.max(0, (5 * aLevel) / 7)));
- aEntity.addPotionEffect(new PotionEffect(
- Potion.confusion.id,
- aLevel * 130 * aAmountOfItems
- + Math.max(
+ Math.max(0, (5 * aLevel) / 7)));
+ aEntity.addPotionEffect(
+ new PotionEffect(
+ Potion.confusion.id,
+ aLevel * 130 * aAmountOfItems + Math.max(
0,
- ((tEffect = aEntity.getActivePotionEffect(Potion.confusion)) == null
- ? 0
+ ((tEffect = aEntity.getActivePotionEffect(Potion.confusion)) == null ? 0
: tEffect.getDuration())),
- Math.max(0, (5 * aLevel) / 7)));
- aEntity.addPotionEffect(new PotionEffect(
- Potion.weakness.id,
- aLevel * 150 * aAmountOfItems
- + Math.max(
+ Math.max(0, (5 * aLevel) / 7)));
+ aEntity.addPotionEffect(
+ new PotionEffect(
+ Potion.weakness.id,
+ aLevel * 150 * aAmountOfItems + Math.max(
0,
- ((tEffect = aEntity.getActivePotionEffect(Potion.weakness)) == null
- ? 0
+ ((tEffect = aEntity.getActivePotionEffect(Potion.weakness)) == null ? 0
: tEffect.getDuration())),
- Math.max(0, (5 * aLevel) / 7)));
- aEntity.addPotionEffect(new PotionEffect(
- Potion.hunger.id,
- aLevel * 130 * aAmountOfItems
- + Math.max(
+ Math.max(0, (5 * aLevel) / 7)));
+ aEntity.addPotionEffect(
+ new PotionEffect(
+ Potion.hunger.id,
+ aLevel * 130 * aAmountOfItems + Math.max(
0,
- ((tEffect = aEntity.getActivePotionEffect(Potion.hunger)) == null
- ? 0
+ ((tEffect = aEntity.getActivePotionEffect(Potion.hunger)) == null ? 0
: tEffect.getDuration())),
- Math.max(0, (5 * aLevel) / 7)));
- aEntity.addPotionEffect(new PotionEffect(
- IC2Potion.radiation.id,
- aLevel * 180 * aAmountOfItems
- + Math.max(
+ Math.max(0, (5 * aLevel) / 7)));
+ aEntity.addPotionEffect(
+ new PotionEffect(
+ IC2Potion.radiation.id,
+ aLevel * 180 * aAmountOfItems + Math.max(
0,
- ((tEffect = aEntity.getActivePotionEffect(Potion.potionTypes[24])) == null
- ? 0
+ ((tEffect = aEntity.getActivePotionEffect(Potion.potionTypes[24])) == null ? 0
: tEffect.getDuration())),
- Math.max(0, (5 * aLevel) / 7)));
+ Math.max(0, (5 * aLevel) / 7)));
return true;
}
return false;
@@ -258,8 +245,7 @@ public class EntityUtils {
} else {
try {
dealFireDamage.invoke(entity, amount);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
}
return false;
}
@@ -269,10 +255,10 @@ public class EntityUtils {
}
public static boolean isTileEntityRegistered(Class aTileClass, String aTileName) {
- Field aRegistry = ReflectionUtils.getField(
- ReflectionUtils.getClass("net.minecraft.tileentity.TileEntity"), "nameToClassMap");
- Field aRegistry2 = ReflectionUtils.getField(
- ReflectionUtils.getClass("net.minecraft.tileentity.TileEntity"), "classToNameMap");
+ Field aRegistry = ReflectionUtils
+ .getField(ReflectionUtils.getClass("net.minecraft.tileentity.TileEntity"), "nameToClassMap");
+ Field aRegistry2 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("net.minecraft.tileentity.TileEntity"), "classToNameMap");
try {
Object o = aRegistry.get(null);
if (o != null) {
@@ -298,16 +284,16 @@ public class EntityUtils {
}
public static double getDistance(Entity p1, Entity p2) {
- return Math.sqrt(
- Math.pow(p1.posX - p2.posX, 2) + Math.pow(p1.posY - p2.posY, 2) + Math.pow(p1.posZ - p2.posZ, 2));
+ return Math
+ .sqrt(Math.pow(p1.posX - p2.posX, 2) + Math.pow(p1.posY - p2.posY, 2) + Math.pow(p1.posZ - p2.posZ, 2));
}
public static AutoMap<Entity> getEntitiesWithinBoundingBoxExcluding(Entity aExclusion, AABB aBoundingBox) {
if (aExclusion == null) {
return new AutoMap<Entity>();
} else {
- List<Entity> aEntities =
- aBoundingBox.world().getEntitiesWithinAABBExcludingEntity(aExclusion, aBoundingBox.get());
+ List<Entity> aEntities = aBoundingBox.world()
+ .getEntitiesWithinAABBExcludingEntity(aExclusion, aBoundingBox.get());
return new AutoMap<Entity>(aEntities);
}
}
@@ -322,10 +308,12 @@ public class EntityUtils {
}
/**
- * Provides the ability to provide custom drops upon the death of EntityLivingBase objects. Simplified function with static Max drop size of 1.
+ * Provides the ability to provide custom drops upon the death of EntityLivingBase objects. Simplified function with
+ * static Max drop size of 1.
+ *
* @param aMobClass - The Base Class you want to drop this item.
- * @param aStack - The ItemStack, stack size is not respected.
- * @param aChance - Chance out of 10000, where 100 is 1%. (1 = 0.01% - this is ok)
+ * @param aStack - The ItemStack, stack size is not respected.
+ * @param aChance - Chance out of 10000, where 100 is 1%. (1 = 0.01% - this is ok)
*/
public static void registerDropsForMob(Class aMobClass, ItemStack aStack, int aChance) {
registerDropsForMob(aMobClass, aStack, 1, aChance);
@@ -333,10 +321,11 @@ public class EntityUtils {
/**
* Provides the ability to provide custom drops upon the death of EntityLivingBase objects.
- * @param aMobClass - The Base Class you want to drop this item.
- * @param aStack - The ItemStack, stack size is not respected.
+ *
+ * @param aMobClass - The Base Class you want to drop this item.
+ * @param aStack - The ItemStack, stack size is not respected.
* @param aMaxAmount - The maximum size of the ItemStack which drops.
- * @param aChance - Chance out of 10000, where 100 is 1%. (1 = 0.01% - this is ok)
+ * @param aChance - Chance out of 10000, where 100 is 1%. (1 = 0.01% - this is ok)
*/
public static void registerDropsForMob(Class aMobClass, ItemStack aStack, int aMaxAmount, int aChance) {
EntityDeathHandler.registerDropsForMob(aMobClass, aStack, aMaxAmount, aChance);
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index 2125eff0e5..f5920b5549 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -1,5 +1,16 @@
package gtPlusPlus.core.util.minecraft;
+import java.util.HashMap;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidContainerItem;
+
import gregtech.api.enums.Dyes;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -14,15 +25,6 @@ import gtPlusPlus.core.material.MaterialStack;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import java.util.HashMap;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidContainerItem;
public class FluidUtils {
@@ -75,6 +77,7 @@ public class FluidUtils {
@Deprecated
/**
* Do not use - Gives third tier steam - Not implemented
+ *
* @param amount
* @return
*/
@@ -99,8 +102,7 @@ public class FluidUtils {
public static FluidStack getHydrofluoricAcidGT(int amount) {
if (sGregtechHydrofluoricAcid == null) {
FluidStack aGTHF = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1);
- sGregtechHydrofluoricAcid =
- aGTHF != null ? aGTHF.getFluid() : getHydrofluoricAcid(1).getFluid();
+ sGregtechHydrofluoricAcid = aGTHF != null ? aGTHF.getFluid() : getHydrofluoricAcid(1).getFluid();
}
return FluidUtils.getFluidStack(sGregtechHydrofluoricAcid, amount);
}
@@ -109,8 +111,7 @@ public class FluidUtils {
if (sGregtechHydrofluoricAcid == null) {
getHydrofluoricAcidGT(1);
}
- return sGregtechHydrofluoricAcid != null
- && sGregtechHydrofluoricAcid != getHydrofluoricAcid(1).getFluid();
+ return sGregtechHydrofluoricAcid != null && sGregtechHydrofluoricAcid != getHydrofluoricAcid(1).getFluid();
}
private static FluidStack createFluidStack(Fluid aFluid, int aAmount) {
@@ -151,7 +152,7 @@ public class FluidUtils {
public static FluidStack[] getFluidStackArray(final String fluidName, final int amount) {
Logger.WARNING("Trying to get a fluid stack of " + fluidName);
try {
- final FluidStack[] singleFluid = {getFluidStack(fluidName, amount)};
+ final FluidStack[] singleFluid = { getFluidStack(fluidName, amount) };
return singleFluid;
} catch (final Throwable e) {
return null;
@@ -161,21 +162,15 @@ public class FluidUtils {
public static FluidStack[] getFluidStackArray(final FluidStack fluidName, final int amount) {
Logger.WARNING("Trying to get a fluid stack of " + fluidName);
try {
- final FluidStack[] singleFluid = {getFluidStack(fluidName, amount)};
+ final FluidStack[] singleFluid = { getFluidStack(fluidName, amount) };
return singleFluid;
} catch (final Throwable e) {
return null;
}
}
- public static Fluid addGtFluid(
- final String aName,
- final String aLocalized,
- final GT_Materials aMaterial,
- final int aState,
- final long aTemperatureK,
- final ItemStack aFullContainer,
- final ItemStack aEmptyContainer,
+ public static Fluid addGtFluid(final String aName, final String aLocalized, final GT_Materials aMaterial,
+ final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer,
final int aFluidAmount) {
return addGtFluid(
aName,
@@ -189,21 +184,14 @@ public class FluidUtils {
true);
}
- public static Fluid addGtFluid(
- final String aName,
- final String aLocalized,
- final GT_Materials aMaterial,
- final int aState,
- final long aTemperatureK,
- final ItemStack aFullContainer,
- final ItemStack aEmptyContainer,
- final int aFluidAmount,
- final boolean aGenerateCell) {
+ public static Fluid addGtFluid(final String aName, final String aLocalized, final GT_Materials aMaterial,
+ final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer,
+ final int aFluidAmount, final boolean aGenerateCell) {
Fluid g = addGTFluid(
aName,
"fluid.autogenerated",
aLocalized,
- aMaterial != null ? aMaterial.mRGBa : new short[] {255, 255, 255, 0},
+ aMaterial != null ? aMaterial.mRGBa : new short[] { 255, 255, 255, 0 },
aState,
aTemperatureK,
aFullContainer,
@@ -232,16 +220,9 @@ public class FluidUtils {
return null;
}
- public static Fluid addGTFluid(
- final String aName,
- final String aLocalized,
- final short[] aRGBa,
- final int aState,
- final long aTemperatureK,
- final ItemStack aFullContainer,
- final ItemStack aEmptyContainer,
- final int aFluidAmount,
- final boolean aGenerateCell) {
+ public static Fluid addGTFluid(final String aName, final String aLocalized, final short[] aRGBa, final int aState,
+ final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer,
+ final int aFluidAmount, final boolean aGenerateCell) {
return addGTFluid(
"molten." + aName,
"molten.autogenerated",
@@ -255,16 +236,9 @@ public class FluidUtils {
aGenerateCell);
}
- public static Fluid addGTFluidNonMolten(
- final String aName,
- final String aLocalized,
- final short[] aRGBa,
- final int aState,
- final long aTemperatureK,
- final ItemStack aFullContainer,
- final ItemStack aEmptyContainer,
- final int aFluidAmount,
- final boolean aGenerateCell) {
+ public static Fluid addGTFluidNonMolten(final String aName, final String aLocalized, final short[] aRGBa,
+ final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer,
+ final int aFluidAmount, final boolean aGenerateCell) {
return addGTFluid(
"fluid." + aName,
"fluid.autogenerated",
@@ -278,16 +252,9 @@ public class FluidUtils {
aGenerateCell);
}
- public static Fluid addGTFluidNoPrefix(
- final String aName,
- final String aLocalized,
- final short[] aRGBa,
- final int aState,
- final long aTemperatureK,
- final ItemStack aFullContainer,
- final ItemStack aEmptyContainer,
- final int aFluidAmount,
- final boolean aGenerateCell) {
+ public static Fluid addGTFluidNoPrefix(final String aName, final String aLocalized, final short[] aRGBa,
+ final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer,
+ final int aFluidAmount, final boolean aGenerateCell) {
return addGTFluid(
aName,
"fluid.autogenerated",
@@ -300,17 +267,11 @@ public class FluidUtils {
aFluidAmount,
aGenerateCell);
}
+
// Gass
- public static Fluid addGtGas(
- final String aName,
- final String aLocalized,
- final short[] aRGBa,
- final int aState,
- final long aTemperatureK,
- final ItemStack aFullContainer,
- final ItemStack aEmptyContainer,
- final int aFluidAmount,
- final boolean aGenerateCell) {
+ public static Fluid addGtGas(final String aName, final String aLocalized, final short[] aRGBa, final int aState,
+ final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer,
+ final int aFluidAmount, final boolean aGenerateCell) {
return addGTFluid(
aName,
"fluid.autogenerated",
@@ -325,8 +286,7 @@ public class FluidUtils {
}
public static Fluid addGTPlasma(final Material aMaterial) {
- if (aMaterial.getLocalizedName().toLowerCase().contains("clay")
- || (aMaterial.getComposites().size() > 1)
+ if (aMaterial.getLocalizedName().toLowerCase().contains("clay") || (aMaterial.getComposites().size() > 1)
|| aMaterial.getLocalizedName().toLowerCase().contains("wrought")) {
return null;
}
@@ -351,8 +311,7 @@ public class FluidUtils {
}
if (temp != null) {
return addGTFluid(
- "plasma."
- + Utils.sanitizeString(aMaterial.getLocalizedName().toLowerCase()),
+ "plasma." + Utils.sanitizeString(aMaterial.getLocalizedName().toLowerCase()),
"plasma.autogenerated",
aMaterial.getLocalizedName() + " Plasma",
aMaterial.getRGBA(),
@@ -366,17 +325,9 @@ public class FluidUtils {
return null;
}
- public static Fluid addGTFluid(
- String aName,
- final String aTexture,
- final String aLocalized,
- final short[] aRGBa,
- final int aState,
- final long aTemperatureK,
- ItemStack aFullContainer,
- final ItemStack aEmptyContainer,
- final int aFluidAmount,
- final boolean aGenerateFilledCell) {
+ public static Fluid addGTFluid(String aName, final String aTexture, final String aLocalized, final short[] aRGBa,
+ final int aState, final long aTemperatureK, ItemStack aFullContainer, final ItemStack aEmptyContainer,
+ final int aFluidAmount, final boolean aGenerateFilledCell) {
String aNameOriginal = aName;
Logger.INFO("Generating Fluid for " + aName);
@@ -472,10 +423,11 @@ public class FluidUtils {
if ((rFluid.getTemperature() == new Fluid("test").getTemperature()) || (rFluid.getTemperature() <= 0)) {
rFluid.setTemperature((int) (aTemperatureK));
}
- if ((aFullContainer != null)
- && (aEmptyContainer != null)
+ if ((aFullContainer != null) && (aEmptyContainer != null)
&& !FluidContainerRegistry.registerFluidContainer(
- new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
+ new FluidStack(rFluid, aFluidAmount),
+ aFullContainer,
+ aEmptyContainer)) {
CORE.RA.addFluidCannerRecipe(CI.emptyCells(1), aFullContainer, new FluidStack(rFluid, aFluidAmount));
} else {
// Utils.LOG_INFO("Failed creating recipes to fill/empty cells of "+aName+".");
@@ -484,15 +436,13 @@ public class FluidUtils {
}
public static boolean valid(final Object aStack) {
- return (aStack != null)
- && (aStack instanceof ItemStack)
+ return (aStack != null) && (aStack instanceof ItemStack)
&& (((ItemStack) aStack).getItem() != null)
&& (((ItemStack) aStack).stackSize >= 0);
}
public static boolean invalid(final Object aStack) {
- return (aStack == null)
- || !(aStack instanceof ItemStack)
+ return (aStack == null) || !(aStack instanceof ItemStack)
|| (((ItemStack) aStack).getItem() == null)
|| (((ItemStack) aStack).stackSize < 0);
}
@@ -507,10 +457,9 @@ public class FluidUtils {
public static boolean equal_(final ItemStack aStack1, final ItemStack aStack2, final boolean aIgnoreNBT) {
return (aStack1.getItem() == aStack2.getItem())
- && (aIgnoreNBT
- || ((aStack1.getTagCompound() == null == (aStack2.getTagCompound() == null))
- && ((aStack1.getTagCompound() == null)
- || aStack1.getTagCompound().equals(aStack2.getTagCompound()))))
+ && (aIgnoreNBT || ((aStack1.getTagCompound() == null == (aStack2.getTagCompound() == null))
+ && ((aStack1.getTagCompound() == null)
+ || aStack1.getTagCompound().equals(aStack2.getTagCompound()))))
&& ((meta(aStack1) == meta(aStack2)) || (meta(aStack1) == 32767) || (meta(aStack2) == 32767));
}
@@ -559,8 +508,7 @@ public class FluidUtils {
if (equal(aStack, ItemUtils.getEmptyCell(), true)) {
return null;
}
- if (aCheckIFluidContainerItems
- && (aStack.getItem() instanceof IFluidContainerItem)
+ if (aCheckIFluidContainerItems && (aStack.getItem() instanceof IFluidContainerItem)
&& (((IFluidContainerItem) aStack.getItem()).getCapacity(aStack) > 0)) {
final ItemStack tStack = amount(1L, aStack);
((IFluidContainerItem) aStack.getItem()).drain(tStack, Integer.MAX_VALUE, true);
@@ -575,25 +523,21 @@ public class FluidUtils {
return null;
}
- public static ItemStack container(
- final ItemStack aStack, final boolean aCheckIFluidContainerItems, final int aStacksize) {
+ public static ItemStack container(final ItemStack aStack, final boolean aCheckIFluidContainerItems,
+ final int aStacksize) {
return amount(aStacksize, container(aStack, aCheckIFluidContainerItems));
}
- public static final Fluid generateFluid(
- final String unlocalizedName,
- final String localizedName,
- final int MeltingPoint,
- final short[] RGBA,
- boolean aGenerateCell) {
+ public static final Fluid generateFluid(final String unlocalizedName, final String localizedName,
+ final int MeltingPoint, final short[] RGBA, boolean aGenerateCell) {
FluidStack aFStack = (FluidUtils.getFluidStack("molten" + "." + unlocalizedName.toLowerCase(), 1));
if (aFStack == null) {
Logger.WARNING("Generating our own fluid.");
- /* ItemStack cell = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1);
- if (cell == null){
- final Item temp = new BaseItemComponent(unlocalizedName, localizedName, RGBA);
- cell = ItemUtils.getSimpleStack(temp);
- }*/
+ /*
+ * ItemStack cell = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1); if (cell
+ * == null){ final Item temp = new BaseItemComponent(unlocalizedName, localizedName, RGBA); cell =
+ * ItemUtils.getSimpleStack(temp); }
+ */
final Fluid gtFluid = FluidUtils.addGTFluid(
unlocalizedName,
"Molten " + localizedName,
@@ -612,50 +556,44 @@ public class FluidUtils {
}
}
- public static final Fluid generateFluidNonMolten(
- final String unlocalizedName,
- final String localizedName,
- final int MeltingPoint,
- final short[] RGBA,
- final boolean aGenerateCell) {
+ public static final Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName,
+ final int MeltingPoint, final short[] RGBA, final boolean aGenerateCell) {
return generateFluidNonMolten(unlocalizedName, localizedName, MeltingPoint, RGBA, null, null, 0, aGenerateCell);
}
- public static final Fluid generateFluidNonMolten(
- final String unlocalizedName,
- final String localizedName,
- final int MeltingPoint,
- final short[] RGBA,
- final ItemStack dustStack,
- final ItemStack dustStack2) {
+ public static final Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName,
+ final int MeltingPoint, final short[] RGBA, final ItemStack dustStack, final ItemStack dustStack2) {
return generateFluidNonMolten(
- unlocalizedName, localizedName, MeltingPoint, RGBA, dustStack, dustStack2, 144, true);
+ unlocalizedName,
+ localizedName,
+ MeltingPoint,
+ RGBA,
+ dustStack,
+ dustStack2,
+ 144,
+ true);
}
- public static final Fluid generateFluidNonMolten(
- final String unlocalizedName,
- final String localizedName,
- final int MeltingPoint,
- final short[] RGBA,
- final ItemStack dustStack,
- final ItemStack dustStack2,
+ public static final Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName,
+ final int MeltingPoint, final short[] RGBA, final ItemStack dustStack, final ItemStack dustStack2,
final boolean aGenerateCell) {
return generateFluidNonMolten(
- unlocalizedName, localizedName, MeltingPoint, RGBA, dustStack, dustStack2, 144, aGenerateCell);
+ unlocalizedName,
+ localizedName,
+ MeltingPoint,
+ RGBA,
+ dustStack,
+ dustStack2,
+ 144,
+ aGenerateCell);
}
- public static final Fluid generateFluidNonMolten(
- final String unlocalizedName,
- final String localizedName,
- final int MeltingPoint,
- final short[] RGBA,
- ItemStack dustStack,
- final ItemStack dustStack2,
- final int amountPerItem,
- final boolean aGenerateCell) {
+ public static final Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName,
+ final int MeltingPoint, final short[] RGBA, ItemStack dustStack, final ItemStack dustStack2,
+ final int amountPerItem, final boolean aGenerateCell) {
if (dustStack == null) {
- dustStack =
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust" + Utils.sanitizeString(localizedName), 1);
+ dustStack = ItemUtils
+ .getItemStackOfAmountFromOreDictNoBroken("dust" + Utils.sanitizeString(localizedName), 1);
}
FluidStack aFStack = (FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1));
if (aFStack == null) {
@@ -678,7 +616,7 @@ public class FluidUtils {
FluidUtils.getFluidStack(gtFluid, amountPerItem), // Fluid Output
1 * 20, // Duration
16 // Eu Tick
- );
+ );
}
if (dustStack2 != null) {
CORE.RA.addFluidExtractionRecipe(
@@ -686,7 +624,7 @@ public class FluidUtils {
FluidUtils.getFluidStack(gtFluid, amountPerItem), // Fluid Output
1 * 20, // Duration
16 // Eu Tick
- );
+ );
}
return gtFluid;
@@ -696,17 +634,13 @@ public class FluidUtils {
}
}
- public static final Fluid generateFluidNoPrefix(
- final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA) {
+ public static final Fluid generateFluidNoPrefix(final String unlocalizedName, final String localizedName,
+ final int MeltingPoint, final short[] RGBA) {
return generateFluidNoPrefix(unlocalizedName, localizedName, MeltingPoint, RGBA, true);
}
- public static final Fluid generateFluidNoPrefix(
- final String unlocalizedName,
- final String localizedName,
- final int MeltingPoint,
- final short[] RGBA,
- final boolean aGenerateCell) {
+ public static final Fluid generateFluidNoPrefix(final String unlocalizedName, final String localizedName,
+ final int MeltingPoint, final short[] RGBA, final boolean aGenerateCell) {
Fluid gtFluid;
if (FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null) {
Logger.WARNING("Generating our own fluid.");
@@ -724,18 +658,14 @@ public class FluidUtils {
gtFluid = FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1).getFluid();
}
// Generate a Cell if we need to
- // if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){
- // new BaseItemCell(unlocalizedName, localizedName, RGBA, gtFluid);
- // }
+ // if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){
+ // new BaseItemCell(unlocalizedName, localizedName, RGBA, gtFluid);
+ // }
return gtFluid;
}
- public static final Fluid generateGas(
- final String unlocalizedName,
- final String localizedName,
- final int MeltingPoint,
- final short[] RGBA,
- final boolean aGenerateCell) {
+ public static final Fluid generateGas(final String unlocalizedName, final String localizedName,
+ final int MeltingPoint, final short[] RGBA, final boolean aGenerateCell) {
Fluid gtFluid;
if (FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null) {
Logger.WARNING("Generating our own gas.");
@@ -753,9 +683,10 @@ public class FluidUtils {
gtFluid = FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1).getFluid();
}
// Generate a Cell if we need to
- /* if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){
- new BaseItemCell(unlocalizedName, localizedName, RGBA, gtFluid);
- }*/
+ /*
+ * if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){ new
+ * BaseItemCell(unlocalizedName, localizedName, RGBA, gtFluid); }
+ */
return gtFluid;
}
@@ -774,8 +705,7 @@ public class FluidUtils {
FluidStack aFStack4 = (FluidUtils.getFluidStack(aFluidName, 1));
FluidStack aFStack5 = (FluidUtils.getFluidStack("liquid_" + aFluidName.toLowerCase(), 1));
FluidStack aFStack6 = (FluidUtils.getFluidStack("liquid" + "." + aFluidName.toLowerCase(), 1));
- return aFStack1 != null
- || aFStack2 != null
+ return aFStack1 != null || aFStack2 != null
|| aFStack3 != null
|| aFStack4 != null
|| aFStack5 != null
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FoodUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FoodUtils.java
index 129548d1db..2825ac80fd 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/FoodUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/FoodUtils.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.util.minecraft;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import net.minecraft.init.Items;
import net.minecraft.item.EnumAction;
import net.minecraft.item.Item;
@@ -8,6 +7,8 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class FoodUtils {
public static final Class IEdibleClass;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
index 6c1442cb0d..80536189ce 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
@@ -2,6 +2,15 @@ package gtPlusPlus.core.util.minecraft;
import static gregtech.api.GregTech_API.*;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import gregtech.api.objects.GT_HashSet;
import gregtech.api.objects.GT_ItemStack;
@@ -17,13 +26,6 @@ import ic2.core.Ic2Items;
import ic2.core.item.armor.ItemArmorHazmat;
import ic2.core.item.armor.ItemArmorNanoSuit;
import ic2.core.item.armor.ItemArmorQuantumSuit;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
public class HazmatUtils {
@@ -204,38 +206,28 @@ public class HazmatUtils {
if (LoadedMods.isModLoaded("ThaumicTinkerer")) {
/*
- AutoMap<Item> aItems = new AutoMap<Item>();
- Class aMainTT = ReflectionUtils.getClass("thaumic.tinkerer.common.ThaumicTinkerer");
- Class aItemRegistryTT = ReflectionUtils.getClass("thaumic.tinkerer.common.registry.TTRegistry");
- Field aRegistryInstance = ReflectionUtils.getField(aMainTT, "registry");
- Object aRegistry = ReflectionUtils.getFieldValue(aRegistryInstance);
- Method aFuckingStupidMethodHandlingMethod = ReflectionUtils.getMethod(aItemRegistryTT, "getFirstItemFromClass", new Class[] {Class.class});
- Item aIchorHelm = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemHelm")});
- Item aIchorChest = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemChest")});
- Item aIchorLegs = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemLegs")});
- Item aIchorBoots = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemBoots")});
- aItems.add(aIchorHelm);
- aItems.add(aIchorChest);
- aItems.add(aIchorLegs);
- aItems.add(aIchorBoots);
- AutoMap<ItemStack> aItemMap = new AutoMap<ItemStack>();
- int aIndex = 0;
- for (Item aItem : aItems) {
- Item aItemObject = null;
- if (aItem != null) {
- aItemMap.add(ItemUtils.getSimpleStack(aItemObject));
- }
- else {
- Logger.INFO("[Hazmat] Could not get item "+aIndex+" from "+aItemRegistryTT.getName());
- }
- aIndex++;
- }
- Logger.INFO("[Hazmat] Registering "+aItemMap.size()+" Thaumic Tinkerer Items as hazmat gear.");
- for (ItemStack aItem : aItemMap) {
- addProtection(aItem);
- }
- Logger.INFO("[Hazmat] Registered Thaumic Tinkerer Items as hazmat gear.");
- */
+ * AutoMap<Item> aItems = new AutoMap<Item>(); Class aMainTT =
+ * ReflectionUtils.getClass("thaumic.tinkerer.common.ThaumicTinkerer"); Class aItemRegistryTT =
+ * ReflectionUtils.getClass("thaumic.tinkerer.common.registry.TTRegistry"); Field aRegistryInstance =
+ * ReflectionUtils.getField(aMainTT, "registry"); Object aRegistry =
+ * ReflectionUtils.getFieldValue(aRegistryInstance); Method aFuckingStupidMethodHandlingMethod =
+ * ReflectionUtils.getMethod(aItemRegistryTT, "getFirstItemFromClass", new Class[] {Class.class}); Item
+ * aIchorHelm = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new
+ * Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemHelm")}); Item
+ * aIchorChest = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new
+ * Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemChest")}); Item
+ * aIchorLegs = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new
+ * Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemLegs")}); Item
+ * aIchorBoots = (Item) ReflectionUtils.invokeNonBool(aRegistry, aFuckingStupidMethodHandlingMethod, new
+ * Object[] {ReflectionUtils.getClass("thaumic.tinkerer.common.item.kami.armor.ItemGemBoots")});
+ * aItems.add(aIchorHelm); aItems.add(aIchorChest); aItems.add(aIchorLegs); aItems.add(aIchorBoots);
+ * AutoMap<ItemStack> aItemMap = new AutoMap<ItemStack>(); int aIndex = 0; for (Item aItem : aItems) { Item
+ * aItemObject = null; if (aItem != null) { aItemMap.add(ItemUtils.getSimpleStack(aItemObject)); } else {
+ * Logger.INFO("[Hazmat] Could not get item "+aIndex+" from "+aItemRegistryTT.getName()); } aIndex++; }
+ * Logger.INFO("[Hazmat] Registering "+aItemMap.size()+" Thaumic Tinkerer Items as hazmat gear."); for
+ * (ItemStack aItem : aItemMap) { addProtection(aItem); }
+ * Logger.INFO("[Hazmat] Registered Thaumic Tinkerer Items as hazmat gear.");
+ */
Logger.INFO("[Hazmat] Did not register Thaumic Tinkerer Items as hazmat gear.");
}
@@ -321,10 +313,8 @@ public class HazmatUtils {
}
/**
- * Static function to replace
- * {@link #ic2.core.item.armor.ItemArmorHazmat.hasCompleteHazmat(EntityLivingBase)}.
- * Because IC2 doesn't let us register things ourself, anything registered via
- * GT/GT++ will return true.
+ * Static function to replace {@link #ic2.core.item.armor.ItemArmorHazmat.hasCompleteHazmat(EntityLivingBase)}.
+ * Because IC2 doesn't let us register things ourself, anything registered via GT/GT++ will return true.
*
* @param living - Entity Wearing Armour
* @return - Does {@link EntityLivingBase} have a full hazmat suit on?
@@ -403,8 +393,8 @@ public class HazmatUtils {
}
/**
- * Registers the {@link ItemStack} to all types of protection. Provides full
- * hazmat protection. Frost, Fire, Bio, Gas, Radioaton & Electricity.
+ * Registers the {@link ItemStack} to all types of protection. Provides full hazmat protection. Frost, Fire, Bio,
+ * Gas, Radioaton & Electricity.
*
* @param aStack - The Armour to provide protection.
* @return - Did we register this ItemStack properly?
@@ -478,10 +468,9 @@ public class HazmatUtils {
}
/**
- * Does this item provide hazmat protection? (Protection against Frost, Heat,
- * Bio, Gas, Rads, Elec) An item may return false even if it protects against
- * all six damage types. This is because it's not actually registered as hazmat
- * correct.
+ * Does this item provide hazmat protection? (Protection against Frost, Heat, Bio, Gas, Rads, Elec) An item may
+ * return false even if it protects against all six damage types. This is because it's not actually registered as
+ * hazmat correct.
*
* @param aStack - The item to check for protection
* @return
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java
index 8fc5b90b62..c4a0cf411a 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java
@@ -1,10 +1,7 @@
package gtPlusPlus.core.util.minecraft;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.data.AutoMap;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.inventory.IInventory;
@@ -13,6 +10,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class InventoryUtils {
private static final Random mRandom = new Random();
@@ -20,8 +22,7 @@ public class InventoryUtils {
public static void dropInventoryItems(World world, int x, int y, int z, Block block) {
TileEntity tileentity = world.getTileEntity(x, y, z);
- if (tileentity != null
- && tileentity instanceof IInventory
+ if (tileentity != null && tileentity instanceof IInventory
&& ((IInventory) tileentity).getSizeInventory() > 0) {
IInventory aTileInv = (IInventory) tileentity;
@@ -36,9 +37,8 @@ public class InventoryUtils {
float f1 = mRandom.nextFloat() * 0.8F + 0.1F;
EntityItem entityitem;
- for (float f2 = mRandom.nextFloat() * 0.8F + 0.1F;
- itemstack.stackSize > 0;
- world.spawnEntityInWorld(entityitem)) {
+ for (float f2 = mRandom.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world
+ .spawnEntityInWorld(entityitem)) {
int j1 = mRandom.nextInt(21) + 10;
if (j1 > itemstack.stackSize) {
@@ -58,8 +58,8 @@ public class InventoryUtils {
entityitem.motionZ = (float) mRandom.nextGaussian() * f3;
if (itemstack.hasTagCompound()) {
- entityitem.getEntityItem().setTagCompound((NBTTagCompound)
- itemstack.getTagCompound().copy());
+ entityitem.getEntityItem()
+ .setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy());
}
}
}
@@ -75,7 +75,9 @@ public class InventoryUtils {
public static void sortInventoryItems(IGregTechTileEntity aBaseMetaTileEntity) {
IInventory mInv = aBaseMetaTileEntity.getIInventory(
- aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord());
+ aBaseMetaTileEntity.getXCoord(),
+ aBaseMetaTileEntity.getYCoord(),
+ aBaseMetaTileEntity.getZCoord());
AutoMap<ItemStack> aInvContents = new AutoMap<ItemStack>();
int aSize = mInv.getSizeInventory();
for (int slot = 0; slot < aSize; slot++) {
@@ -87,7 +89,14 @@ public class InventoryUtils {
if (mInventory[j] != null
&& (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) {
GT_Utility.moveStackFromSlotAToSlotB(
- aBaseMetaTileEntity, aBaseMetaTileEntity, j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1);
+ aBaseMetaTileEntity,
+ aBaseMetaTileEntity,
+ j,
+ i,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index cb79bf12dd..13e88ab30f 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1,5 +1,25 @@
package gtPlusPlus.core.util.minecraft;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.block.Block;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentData;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.Item.ToolMaterial;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
import gregtech.api.enums.GT_Values;
@@ -35,24 +55,6 @@ import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import net.minecraft.block.Block;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.EnchantmentData;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.Item;
-import net.minecraft.item.Item.ToolMaterial;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
public class ItemUtils {
@@ -136,8 +138,8 @@ public class ItemUtils {
return temp != null ? temp : null;
}
- public static void getItemForOreDict(
- final String FQRN, final String oreDictName, final String itemName, final int meta) {
+ public static void getItemForOreDict(final String FQRN, final String oreDictName, final String itemName,
+ final int meta) {
try {
Item em = null;
final Item em1 = getItemFromFQRN(FQRN);
@@ -151,9 +153,8 @@ public class ItemUtils {
GT_OreDictUnificator.registerOre(oreDictName, metaStack);
/*
- * ItemStack itemStackWithMeta = new ItemStack(em,1,meta);
- * GT_OreDictUnificator.registerOre(oreDictName, new
- * ItemStack(itemStackWithMeta.getItem()));
+ * ItemStack itemStackWithMeta = new ItemStack(em,1,meta); GT_OreDictUnificator.registerOre(oreDictName,
+ * new ItemStack(itemStackWithMeta.getItem()));
*/
}
} catch (final NullPointerException e) {
@@ -176,8 +177,8 @@ public class ItemUtils {
addItemToOreDictionary(stack, oreDictName, false);
}
- public static ItemStack getItemStackWithMeta(
- final boolean MOD, final String FQRN, final String itemName, final int meta, final int itemstackSize) {
+ public static ItemStack getItemStackWithMeta(final boolean MOD, final String FQRN, final String itemName,
+ final int meta, final int itemstackSize) {
if (MOD) {
try {
Item em = null;
@@ -281,14 +282,14 @@ public class ItemUtils {
}
public static Item getItemFromFQRN(final String fqrn) // fqrn = fully qualified resource name
- {
+ {
final String[] fqrnSplit = fqrn.split(":");
return GameRegistry.findItem(fqrnSplit[0], fqrnSplit[1]);
}
- public static ItemStack getItemStackFromFQRN(
- final String fqrn, final int Size) // fqrn = fully qualified resource name
- {
+ public static ItemStack getItemStackFromFQRN(final String fqrn, final int Size) // fqrn = fully qualified resource
+ // name
+ {
Logger.INFO("Trying to split string '" + fqrn + "'.");
final String[] fqrnSplit = fqrn.split(":");
if (fqrnSplit.length < 2) {
@@ -311,8 +312,8 @@ public class ItemUtils {
return null;
}
- public static void generateSpawnEgg(
- final String entityModID, final String parSpawnName, final int colourEgg, final int colourOverlay) {
+ public static void generateSpawnEgg(final String entityModID, final String parSpawnName, final int colourEgg,
+ final int colourOverlay) {
final Item itemSpawnEgg = new BasicSpawnEgg(entityModID, parSpawnName, colourEgg, colourOverlay)
.setUnlocalizedName("spawn_egg_" + parSpawnName.toLowerCase())
.setTextureName(CORE.MODID + ":spawn_egg");
@@ -332,7 +333,7 @@ public class ItemUtils {
String mTemp = oredictName;
if (oredictName.contains("-") || oredictName.contains("_")) {
- mTemp = Utils.sanitizeString(mTemp, new char[] {'-', '_'});
+ mTemp = Utils.sanitizeString(mTemp, new char[] { '-', '_' });
} else {
mTemp = Utils.sanitizeString(mTemp);
}
@@ -379,7 +380,7 @@ public class ItemUtils {
try {
if (oredictName.contains("-") || oredictName.contains("_")) {
- oredictName = Utils.sanitizeString(oredictName, new char[] {'-', '_'});
+ oredictName = Utils.sanitizeString(oredictName, new char[] { '-', '_' });
} else {
oredictName = Utils.sanitizeString(oredictName);
}
@@ -422,18 +423,17 @@ public class ItemUtils {
}
// NullFormula
- public static Item[] generateSpecialUseDusts(
- final String unlocalizedName, final String materialName, final int Colour) {
+ public static Item[] generateSpecialUseDusts(final String unlocalizedName, final String materialName,
+ final int Colour) {
return generateSpecialUseDusts(unlocalizedName, materialName, "NullFormula", Colour);
}
- public static Item[] generateSpecialUseDusts(
- final String unlocalizedName, final String materialName, String mChemForm, final int Colour) {
+ public static Item[] generateSpecialUseDusts(final String unlocalizedName, final String materialName,
+ String mChemForm, final int Colour) {
final Item[] output = {
- new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, mChemForm, Colour, "Dust"),
- new BaseItemDustUnique("itemDustSmall" + unlocalizedName, materialName, mChemForm, Colour, "Small"),
- new BaseItemDustUnique("itemDustTiny" + unlocalizedName, materialName, mChemForm, Colour, "Tiny")
- };
+ new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, mChemForm, Colour, "Dust"),
+ new BaseItemDustUnique("itemDustSmall" + unlocalizedName, materialName, mChemForm, Colour, "Small"),
+ new BaseItemDustUnique("itemDustTiny" + unlocalizedName, materialName, mChemForm, Colour, "Tiny") };
// Generate Shaped/Shapeless Recipes
@@ -479,7 +479,16 @@ public class ItemUtils {
if (ItemUtils.checkForInvalidItems(smallDust) && ItemUtils.checkForInvalidItems(normalDust)) {
if (RecipeUtils.addShapedRecipe(
- smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, normalDust)) {
+ smallDust,
+ smallDust,
+ null,
+ smallDust,
+ smallDust,
+ null,
+ null,
+ null,
+ null,
+ normalDust)) {
Logger.WARNING("4 Small dust to 1 Dust Recipe: " + materialName + " - Success");
} else {
Logger.WARNING("4 Small dust to 1 Dust Recipe: " + materialName + " - Failed");
@@ -504,33 +513,32 @@ public class ItemUtils {
return output;
}
- public static Item generateSpecialUsePlate(
- final String internalName, final String displayName, final short[] rgb, final int radioactivity) {
+ public static Item generateSpecialUsePlate(final String internalName, final String displayName, final short[] rgb,
+ final int radioactivity) {
return generateSpecialUsePlate(
- internalName, displayName, Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]), radioactivity);
+ internalName,
+ displayName,
+ Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]),
+ radioactivity);
}
- public static Item generateSpecialUsePlate(
- final String internalName,
- final String displayName,
- final String mFormula,
- final short[] rgb,
- final int radioactivity) {
+ public static Item generateSpecialUsePlate(final String internalName, final String displayName,
+ final String mFormula, final short[] rgb, final int radioactivity) {
return generateSpecialUsePlate(
- internalName, displayName, mFormula, Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]), radioactivity);
+ internalName,
+ displayName,
+ mFormula,
+ Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]),
+ radioactivity);
}
- public static Item generateSpecialUsePlate(
- final String internalName, final String displayName, final int rgb, final int radioactivity) {
+ public static Item generateSpecialUsePlate(final String internalName, final String displayName, final int rgb,
+ final int radioactivity) {
return new BaseItemPlate_OLD(internalName, displayName, rgb, radioactivity);
}
- public static Item generateSpecialUsePlate(
- final String internalName,
- final String displayName,
- final String mFormula,
- final int rgb,
- final int radioactivity) {
+ public static Item generateSpecialUsePlate(final String internalName, final String displayName,
+ final String mFormula, final int rgb, final int radioactivity) {
return new BaseItemPlate_OLD(internalName, displayName, mFormula, rgb, radioactivity);
}
@@ -538,8 +546,8 @@ public class ItemUtils {
return generateSpecialUseDusts(material, onlyLargeDust, false);
}
- public static Item[] generateSpecialUseDusts(
- final Material material, final boolean onlyLargeDust, final boolean disableExtraRecipes) {
+ public static Item[] generateSpecialUseDusts(final Material material, final boolean onlyLargeDust,
+ final boolean disableExtraRecipes) {
final String materialName = material.getLocalizedName();
final String unlocalizedName = Utils.sanitizeString(materialName);
final int Colour = material.getRgbAsHex();
@@ -548,23 +556,26 @@ public class ItemUtils {
Item[] output = null;
if (onlyLargeDust == false) {
output = new Item[] {
- new BaseItemDustUnique(
- "itemDust" + unlocalizedName, materialName, isChemFormvalid ? aChemForm : "", Colour, "Dust"),
- new BaseItemDustUnique(
- "itemDustSmall" + unlocalizedName,
- materialName,
- isChemFormvalid ? aChemForm : "",
- Colour,
- "Small"),
- new BaseItemDustUnique(
- "itemDustTiny" + unlocalizedName,
- materialName,
- isChemFormvalid ? aChemForm : "",
- Colour,
- "Tiny")
- };
+ new BaseItemDustUnique(
+ "itemDust" + unlocalizedName,
+ materialName,
+ isChemFormvalid ? aChemForm : "",
+ Colour,
+ "Dust"),
+ new BaseItemDustUnique(
+ "itemDustSmall" + unlocalizedName,
+ materialName,
+ isChemFormvalid ? aChemForm : "",
+ Colour,
+ "Small"),
+ new BaseItemDustUnique(
+ "itemDustTiny" + unlocalizedName,
+ materialName,
+ isChemFormvalid ? aChemForm : "",
+ Colour,
+ "Tiny") };
} else {
- output = new Item[] {new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, Colour, "Dust")};
+ output = new Item[] { new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, Colour, "Dust") };
}
new RecipeGen_DustGeneration(material, disableExtraRecipes);
@@ -596,13 +607,8 @@ public class ItemUtils {
null);
}
- public static MultiPickaxeBase generateMultiPick(
- final boolean GT_Durability,
- final ToolMaterial customMaterial,
- final String name,
- final int durability,
- final short[] rgba,
- final Object enchantment) {
+ public static MultiPickaxeBase generateMultiPick(final boolean GT_Durability, final ToolMaterial customMaterial,
+ final String name, final int durability, final short[] rgba, final Object enchantment) {
Logger.WARNING("Generating a Multi-Pick out of " + name);
final short[] rgb = rgba;
int dur = customMaterial.getMaxUses();
@@ -612,8 +618,11 @@ public class ItemUtils {
Logger.WARNING("Using gregtech durability value, " + name + " is now " + dur + ".");
} else if (dur <= 0) {
dur = durability;
- Logger.WARNING("Determined durability too low, " + name + " is now " + dur
- + " based on the GT material durability.");
+ Logger.WARNING(
+ "Determined durability too low, " + name
+ + " is now "
+ + dur
+ + " based on the GT material durability.");
}
if (dur <= 0) {
Logger.WARNING("Still too low, " + name + " will now go unused.");
@@ -630,7 +639,11 @@ public class ItemUtils {
}
final MultiPickaxeBase MP_Redstone = new MultiPickaxeBase(
- name + " Multipick", (customMaterial), dur, Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]), enchantment);
+ name + " Multipick",
+ (customMaterial),
+ dur,
+ Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]),
+ enchantment);
if (MP_Redstone.isValid) {
return MP_Redstone;
@@ -642,21 +655,25 @@ public class ItemUtils {
public static MultiSpadeBase generateMultiShovel(final boolean GT_Durability, final Materials material) {
final ToolMaterial customMaterial = Utils.generateToolMaterialFromGT(material);
return generateMultiShovel(
- GT_Durability, customMaterial, material.mDefaultLocalName, material.mDurability, material.mRGBa);
+ GT_Durability,
+ customMaterial,
+ material.mDefaultLocalName,
+ material.mDurability,
+ material.mRGBa);
}
public static MultiSpadeBase generateMultiShovel(final Material material) {
final ToolMaterial customMaterial = Utils.generateToolMaterial(material);
return generateMultiShovel(
- true, customMaterial, material.getLocalizedName(), (int) material.vDurability, material.getRGBA());
+ true,
+ customMaterial,
+ material.getLocalizedName(),
+ (int) material.vDurability,
+ material.getRGBA());
}
- public static MultiSpadeBase generateMultiShovel(
- final boolean GT_Durability,
- final ToolMaterial customMaterial,
- final String name,
- final int durability,
- final short[] rgba) {
+ public static MultiSpadeBase generateMultiShovel(final boolean GT_Durability, final ToolMaterial customMaterial,
+ final String name, final int durability, final short[] rgba) {
Logger.WARNING("Generating a Multi-Spade out of " + name);
final short[] rgb = rgba;
int dur = customMaterial.getMaxUses();
@@ -666,15 +683,21 @@ public class ItemUtils {
Logger.WARNING("Using gregtech durability value, " + name + " is now " + dur + ".");
} else if (dur <= 0) {
dur = durability;
- Logger.WARNING("Determined durability too low, " + name + " is now " + dur
- + " based on the GT material durability.");
+ Logger.WARNING(
+ "Determined durability too low, " + name
+ + " is now "
+ + dur
+ + " based on the GT material durability.");
}
if (dur <= 0) {
Logger.WARNING("Still too low, " + name + " will now go unused.");
return null;
}
final MultiSpadeBase MP_Redstone = new MultiSpadeBase(
- name + " Multispade", (customMaterial), dur, Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]));
+ name + " Multispade",
+ (customMaterial),
+ dur,
+ Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]));
if (MP_Redstone.isValid) {
return MP_Redstone;
@@ -849,7 +872,11 @@ public class ItemUtils {
public static ItemStack getGregtechCircuit(final int Meta) {
return ItemUtils.getItemStackWithMeta(
- LoadedMods.Gregtech, "gregtech:gt.integrated_circuit", "Gregtech Circuit", Meta, 0);
+ LoadedMods.Gregtech,
+ "gregtech:gt.integrated_circuit",
+ "Gregtech Circuit",
+ Meta,
+ 0);
}
public static ItemStack[] getBlockDrops(final ArrayList<ItemStack> blockDrops) {
@@ -1024,7 +1051,7 @@ public class ItemUtils {
}
public static boolean checkForInvalidItems(ItemStack mInput) {
- return checkForInvalidItems(new ItemStack[] {mInput});
+ return checkForInvalidItems(new ItemStack[] { mInput });
}
public static boolean checkForInvalidItems(ItemStack[] mInput) {
@@ -1034,8 +1061,7 @@ public class ItemUtils {
/**
*
* @param mInputs
- * @return {@link Boolean} - True if {@link ItemStack}[] only contains valid
- * items.
+ * @return {@link Boolean} - True if {@link ItemStack}[] only contains valid items.
*/
public static boolean checkForInvalidItems(ItemStack[] mInputs, ItemStack[] mOutputs) {
if (mInputs == null || mOutputs == null) {
@@ -1051,10 +1077,10 @@ public class ItemUtils {
return false;
} else if (stack.getItem() == ModItems.ZZZ_Empty
|| stack.getItem().getClass() == ModItems.ZZZ_Empty.getClass()) {
- return false;
- } else {
- continue;
- }
+ return false;
+ } else {
+ continue;
+ }
} else {
continue;
}
@@ -1072,10 +1098,10 @@ public class ItemUtils {
return false;
} else if (stack.getItem() == ModItems.ZZZ_Empty
|| stack.getItem().getClass() == ModItems.ZZZ_Empty.getClass()) {
- return false;
- } else {
- continue;
- }
+ return false;
+ } else {
+ continue;
+ }
} else {
continue;
}
@@ -1105,9 +1131,8 @@ public class ItemUtils {
}
/*
- for (int o = 0; o < aInputInventory.getSizeInventory(); o++) {
- aTemp.setInventorySlotContents(o, g[o]);
- }*/
+ * for (int o = 0; o < aInputInventory.getSizeInventory(); o++) { aTemp.setInventorySlotContents(o, g[o]); }
+ */
return aTemp;
}
@@ -1121,7 +1146,7 @@ public class ItemUtils {
for (int i = 0; i < aInvSize; i++) {
for (int i2 = 0; i2 < aInvSize; i2++) {
if (i != i2) {
- ItemStack[] t1 = new ItemStack[] {aInputs[i], aInputs[i2]};
+ ItemStack[] t1 = new ItemStack[] { aInputs[i], aInputs[i2] };
if (t1[0] == null || t1[1] == null) {
continue;
} else if (!GT_Utility.areStacksEqual(t1[0], t1[1])) {
@@ -1174,10 +1199,8 @@ public class ItemUtils {
}
String aDisplay = null;
try {
- aDisplay = (""
- + StatCollector.translateToLocal(
- aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name"))
- .trim();
+ aDisplay = ("" + StatCollector
+ .translateToLocal(aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name")).trim();
if (aStack.hasTagCompound()) {
if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("display", 10)) {
NBTTagCompound nbttagcompound = aStack.stackTagCompound.getCompoundTag("display");
@@ -1221,8 +1244,7 @@ public class ItemUtils {
final Item mItem = aStack.getItem();
final Item aSkookum = ItemUtils.getItemFromFQRN("miscutils:gt.plusplus.metatool.01");
final Class aSkookClass = aSkookum.getClass();
- if (aSkookClass.isInstance(mItem)
- || mItem instanceof GT_MetaGenerated_Tool_01
+ if (aSkookClass.isInstance(mItem) || mItem instanceof GT_MetaGenerated_Tool_01
|| mItem instanceof MetaGeneratedGregtechTools
|| mItem instanceof Gregtech_MetaTool
|| mItem == aSkookum) {
@@ -1232,12 +1254,10 @@ public class ItemUtils {
}
public static boolean isToolWrench(ItemStack aWrench) {
- if (isItemGregtechTool(aWrench)
- && (aWrench.getItemDamage() == 16
- || aWrench.getItemDamage() == 120
- || aWrench.getItemDamage() == 122
- || aWrench.getItemDamage() == 124
- || aWrench.getItemDamage() == 7734)) {
+ if (isItemGregtechTool(aWrench) && (aWrench.getItemDamage() == 16 || aWrench.getItemDamage() == 120
+ || aWrench.getItemDamage() == 122
+ || aWrench.getItemDamage() == 124
+ || aWrench.getItemDamage() == 7734)) {
return true;
}
return false;
@@ -1344,8 +1364,7 @@ public class ItemUtils {
public static boolean isControlCircuit(ItemStack aStack) {
if (aStack != null) {
Item aItem = aStack.getItem();
- if (aItem == CI.getNumberedBioCircuit(0).getItem()
- || aItem == CI.getNumberedCircuit(0).getItem()
+ if (aItem == CI.getNumberedBioCircuit(0).getItem() || aItem == CI.getNumberedCircuit(0).getItem()
|| aItem == CI.getNumberedAdvancedCircuit(0).getItem()) {
return true;
}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java
index 8517d129b2..fc728960fd 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java
@@ -1,19 +1,21 @@
package gtPlusPlus.core.util.minecraft;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import gregtech.api.util.GT_LanguageManager;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class LangUtils {
public static boolean rewriteEntryForLanguageRegistry(String aKey, String aNewValue) {
@@ -89,10 +91,9 @@ public class LangUtils {
mLocaleCache.remove(mCacheKey);
String mNew;
try {
- mNew = (""
- + StatCollector.translateToLocal(
- aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name"))
- .trim();
+ mNew = ("" + StatCollector
+ .translateToLocal(aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name"))
+ .trim();
if (aStack.hasTagCompound()) {
if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("display", 10)) {
NBTTagCompound nbttagcompound = aStack.stackTagCompound.getCompoundTag("display");
@@ -115,13 +116,11 @@ public class LangUtils {
Logger.INFO("Cached New Value. UnlocalName: " + unlocalizedName);
String blockName = StatCollector.translateToLocal(unlocalizedName + ".name");
Logger.INFO("Cached New Value. TranslatedName: " + unlocalizedName);
- if (blockName.toLowerCase().contains(".name")
- || blockName.toLowerCase().contains("|")) {
+ if (blockName.toLowerCase().contains(".name") || blockName.toLowerCase().contains("|")) {
try {
- blockName = (""
- + StatCollector.translateToLocal(
- aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name"))
- .trim();
+ blockName = ("" + StatCollector
+ .translateToLocal(aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name"))
+ .trim();
if (aStack.hasTagCompound()) {
if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("display", 10)) {
NBTTagCompound nbttagcompound = aStack.stackTagCompound.getCompoundTag("display");
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 3d42bcda84..daabb97b69 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -1,5 +1,10 @@
package gtPlusPlus.core.util.minecraft;
+import java.util.*;
+
+import net.minecraft.item.*;
+import net.minecraftforge.oredict.OreDictionary;
+
import gregtech.api.enums.*;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
@@ -17,44 +22,16 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.data.*;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.util.*;
-import net.minecraft.item.*;
-import net.minecraftforge.oredict.OreDictionary;
public class MaterialUtils {
public static short firstID = 791;
- @SuppressWarnings({"rawtypes", "unused"})
- private static Class[][] commonTypes = {
- {
- Materials.class,
- int.class,
- TextureSet.class,
- float.class,
- int.class,
- int.class,
- int.class,
- int.class,
- int.class,
- int.class,
- int.class,
- String.class,
- int.class,
- int.class,
- int.class,
- int.class,
- boolean.class,
- boolean.class,
- int.class,
- int.class,
- int.class,
- Dyes.class,
- int.class,
- List.class,
- List.class
- }
- };
+ @SuppressWarnings({ "rawtypes", "unused" })
+ private static Class[][] commonTypes = { { Materials.class, int.class, TextureSet.class, float.class, int.class,
+ int.class, int.class, int.class, int.class, int.class, int.class, String.class, int.class, int.class,
+ int.class, int.class, boolean.class, boolean.class, int.class, int.class, int.class, Dyes.class, int.class,
+ List.class, List.class } };
public static List<?> oreDictValuesForEntry(final String oredictName) {
List<?> oredictItemNames;
@@ -80,8 +57,8 @@ public class MaterialUtils {
return generateMaterialFromGtENUM(material, customRGB, null);
}
- public static Material generateMaterialFromGtENUM(
- final Materials material, short[] customRGB, TextureSet aCustomTextures) {
+ public static Material generateMaterialFromGtENUM(final Materials material, short[] customRGB,
+ TextureSet aCustomTextures) {
String aMaterialKey = getMaterialName(material).toLowerCase();
if (mGeneratedMaterialMap.containsKey(aMaterialKey)) {
return mGeneratedMaterialMap.get(aMaterialKey);
@@ -153,10 +130,9 @@ public class MaterialUtils {
Logger.MATERIALS("[Debug] State set as gas.");
materialState = MaterialState.GAS;
} /*
- else if (material.getPlasma(1) != null){
- Logger.MATERIALS("[Debug] State set as plasma.");
- materialState = MaterialState.PLASMA;
- }*/ else {
+ * else if (material.getPlasma(1) != null){ Logger.MATERIALS("[Debug] State set as plasma.");
+ * materialState = MaterialState.PLASMA; }
+ */ else {
Logger.MATERIALS(
"[Debug] State set as solid. This material has no alternative states, so for safety we wont generate anything.");
materialState = MaterialState.SOLID;
@@ -167,10 +143,8 @@ public class MaterialUtils {
final String tempname = name.substring(7, name.length());
name = "Infused " + tempname;
}
- if (hasValidRGBA(rgba)
- || (element == Element.H)
- || ((material == Materials.InfusedAir)
- || (material == Materials.InfusedFire)
+ if (hasValidRGBA(rgba) || (element == Element.H)
+ || ((material == Materials.InfusedAir) || (material == Materials.InfusedFire)
|| (material == Materials.InfusedEarth)
|| (material == Materials.InfusedWater))) {
// ModItems.itemBaseDecidust = UtilsItems.generateDecidust(material);
@@ -193,8 +167,10 @@ public class MaterialUtils {
mGeneratedMaterialMap.put(aMaterialKey, M);
return M;
} else {
- Logger.DEBUG_MATERIALS("Failed to generate GT++ material instance for " + material.name()
- + " | Valid RGB? " + (hasValidRGBA(rgba)));
+ Logger.DEBUG_MATERIALS(
+ "Failed to generate GT++ material instance for " + material.name()
+ + " | Valid RGB? "
+ + (hasValidRGBA(rgba)));
}
} catch (Throwable t) {
Logger.DEBUG_MATERIALS("Failed to generate GT++ material instance for " + material.name());
@@ -203,11 +179,8 @@ public class MaterialUtils {
return null;
}
- public static Material generateQuickMaterial(
- final String materialName,
- final MaterialState defaultState,
- final short[] colour,
- final int sRadioactivity) {
+ public static Material generateQuickMaterial(final String materialName, final MaterialState defaultState,
+ final short[] colour, final int sRadioactivity) {
String aMaterialKey = materialName.toLowerCase();
if (mGeneratedMaterialMap.containsKey(aMaterialKey)) {
return mGeneratedMaterialMap.get(aMaterialKey);
@@ -239,39 +212,15 @@ public class MaterialUtils {
return aMeltingPoint < 1000 ? 0 : (MathUtils.roundToClosestInt(aMeltingPoint / 1000f));
- /*if ((aMeltingPoint >= 0) && (aMeltingPoint <= 1000)){
- return 1;
- }
- else if((aMeltingPoint >= 1001) && (aMeltingPoint <= 2000)){
- return 2;
- }
- else if((aMeltingPoint >= 2001) && (aMeltingPoint <= 3000)){
- return 3;
- }
- else if((aMeltingPoint >= 3001) && (aMeltingPoint <= 4000)){
- return 4;
- }
- else if((aMeltingPoint >= 4001) && (aMeltingPoint <= 5000)){
- return 5;
- }
- else if((aMeltingPoint >= 5001) && (aMeltingPoint <= 6000)){
- return 6;
- }
- else if((aMeltingPoint >= 6001) && (aMeltingPoint <= 7000)){
- return 7;
- }
- else if((aMeltingPoint >= 7001) && (aMeltingPoint <= 8000)){
- return 8;
- }
- else if((aMeltingPoint >= 8001) && (aMeltingPoint <= 9000)){
- return 9;
- }
- else if((aMeltingPoint >= 9001) && (aMeltingPoint <= 9999)){
- return 10;
- }
- else {
- return 0;
- }*/
+ /*
+ * if ((aMeltingPoint >= 0) && (aMeltingPoint <= 1000)){ return 1; } else if((aMeltingPoint >= 1001) &&
+ * (aMeltingPoint <= 2000)){ return 2; } else if((aMeltingPoint >= 2001) && (aMeltingPoint <= 3000)){ return 3;
+ * } else if((aMeltingPoint >= 3001) && (aMeltingPoint <= 4000)){ return 4; } else if((aMeltingPoint >= 4001) &&
+ * (aMeltingPoint <= 5000)){ return 5; } else if((aMeltingPoint >= 5001) && (aMeltingPoint <= 6000)){ return 6;
+ * } else if((aMeltingPoint >= 6001) && (aMeltingPoint <= 7000)){ return 7; } else if((aMeltingPoint >= 7001) &&
+ * (aMeltingPoint <= 8000)){ return 8; } else if((aMeltingPoint >= 8001) && (aMeltingPoint <= 9000)){ return 9;
+ * } else if((aMeltingPoint >= 9001) && (aMeltingPoint <= 9999)){ return 10; } else { return 0; }
+ */
}
public static int getVoltageForTier(int aTier) {
@@ -312,10 +261,9 @@ public class MaterialUtils {
return Integer.MAX_VALUE;
}
- /*else {
- int newTier = aTier - 1;
- return (int) ((4*(Math.pow(4, newTier)))*7.5);
- }*/
+ /*
+ * else { int newTier = aTier - 1; return (int) ((4*(Math.pow(4, newTier)))*7.5); }
+ */
}
private static Materials getMaterialByName(String materialName) {
@@ -338,14 +286,11 @@ public class MaterialUtils {
String mName = null;
try {
- mName = (String) ReflectionUtils.getField(Materials.class, "mDefaultLocalName")
- .get(mat);
+ mName = (String) ReflectionUtils.getField(Materials.class, "mDefaultLocalName").get(mat);
if (mName == null) {
- mName = (String)
- ReflectionUtils.getField(Materials.class, "mName").get(mat);
+ mName = (String) ReflectionUtils.getField(Materials.class, "mName").get(mat);
}
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
if (mName == null || mName.equals("")) {
mName = mat.name();
@@ -365,9 +310,12 @@ public class MaterialUtils {
}
}
return aCounter.getResults();
- /*Optional<TextureSet> r = list.stream().map(Material::getTextureSet).collect(Collectors.groupingBy(Function.identity(), Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey);
- TextureSet o = (r != null && r.isPresent() && r.get() != null) ? r.get() : null;
- return o;*/
+ /*
+ * Optional<TextureSet> r =
+ * list.stream().map(Material::getTextureSet).collect(Collectors.groupingBy(Function.identity(),
+ * Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey);
+ * TextureSet o = (r != null && r.isPresent() && r.get() != null) ? r.get() : null; return o;
+ */
}
public static Materials getMaterial(String aMaterialName, String aFallbackMaterialName) {
@@ -376,8 +324,11 @@ public class MaterialUtils {
g = getMaterial(aFallbackMaterialName);
}
if (g == null) {
- Logger.INFO("Failed finding material '" + aMaterialName + "' & fallback '" + aFallbackMaterialName
- + "', returning _NULL.");
+ Logger.INFO(
+ "Failed finding material '" + aMaterialName
+ + "' & fallback '"
+ + aFallbackMaterialName
+ + "', returning _NULL.");
CORE.crash();
// g = Materials._NULL;
}
@@ -399,49 +350,14 @@ public class MaterialUtils {
public static AutoMap<Material> getCompoundMaterialsRecursively(Material aMat) {
return getCompoundMaterialsRecursively_Speiger(aMat);
/*
- AutoMap<Material> aDataSet = new AutoMap<Material>();
- final int HARD_LIMIT = 1000;
- int mLoopCounter = 0;
- if (aMat.getComposites().size() > 0) {
- try {
- List<Material> xList = Lists.newLinkedList();
- for (MaterialStack kj : aMat.getComposites()) {
- xList.add(kj.getStackMaterial());
- }
- if (xList.isEmpty()) {
- aDataSet.put(aMat);
- return aDataSet;
- }
- ListIterator<Material> listIterator = xList.listIterator();
- while(listIterator.hasNext()){
- Material e = listIterator.next();
- listIterator.remove();
- if (mLoopCounter > HARD_LIMIT) {
- break;
- }
-
- if (e.getComposites().isEmpty()) {
- aDataSet.put(e);
- }
- else {
- for (MaterialStack x : e.getComposites()) {
- listIterator.add(x.getStackMaterial());
- }
- }
- mLoopCounter++;
-
-
- }}
- catch (Throwable t) {
- aDataSet.put(aMat);
- t.printStackTrace();
- }
- }
- if (aDataSet.isEmpty()) {
- aDataSet.put(aMat);
- return aDataSet;
- }
- return aDataSet;
+ * AutoMap<Material> aDataSet = new AutoMap<Material>(); final int HARD_LIMIT = 1000; int mLoopCounter = 0; if
+ * (aMat.getComposites().size() > 0) { try { List<Material> xList = Lists.newLinkedList(); for (MaterialStack kj
+ * : aMat.getComposites()) { xList.add(kj.getStackMaterial()); } if (xList.isEmpty()) { aDataSet.put(aMat);
+ * return aDataSet; } ListIterator<Material> listIterator = xList.listIterator(); while(listIterator.hasNext()){
+ * Material e = listIterator.next(); listIterator.remove(); if (mLoopCounter > HARD_LIMIT) { break; } if
+ * (e.getComposites().isEmpty()) { aDataSet.put(e); } else { for (MaterialStack x : e.getComposites()) {
+ * listIterator.add(x.getStackMaterial()); } } mLoopCounter++; }} catch (Throwable t) { aDataSet.put(aMat);
+ * t.printStackTrace(); } } if (aDataSet.isEmpty()) { aDataSet.put(aMat); return aDataSet; } return aDataSet;
*/ }
public static AutoMap<Material> getCompoundMaterialsRecursively_Speiger(Material toSearch) {
@@ -476,8 +392,8 @@ public class MaterialUtils {
generateComponentAndAssignToAMaterial(aType, aMaterial, true);
}
- public static void generateComponentAndAssignToAMaterial(
- ComponentTypes aType, Material aMaterial, boolean generateRecipes) {
+ public static void generateComponentAndAssignToAMaterial(ComponentTypes aType, Material aMaterial,
+ boolean generateRecipes) {
Item aGC;
if (aType == ComponentTypes.PLATEHEAVY) {
aGC = new BaseItemPlateHeavy(aMaterial);
@@ -530,8 +446,7 @@ public class MaterialUtils {
}
public static boolean isNullGregtechMaterial(Materials aGregtechMaterial) {
- if (aGregtechMaterial == Materials._NULL
- || aGregtechMaterial.equals(Materials._NULL)
+ if (aGregtechMaterial == Materials._NULL || aGregtechMaterial.equals(Materials._NULL)
|| aGregtechMaterial.name().equals(Materials._NULL.name())) {
return true;
}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
index cdfe1e5076..22469c0387 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
@@ -1,14 +1,16 @@
package gtPlusPlus.core.util.minecraft;
-import gregtech.common.GT_Worldgen_GT_Ore_Layer;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.util.HashMap;
+
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
+import gregtech.common.GT_Worldgen_GT_Ore_Layer;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class MiningUtils {
public static Boolean canPickaxeBlock(final Block currentBlock, final World currentWorld) {
@@ -31,8 +33,7 @@ public class MiningUtils {
try {
final Block block = world.getBlock(X, Y, Z);
if (canPickaxeBlock(block, world)) {
- if ((block != Blocks.bedrock)
- && (block.getBlockHardness(world, X, Y, Z) != -1)
+ if ((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) != -1)
&& (block.getBlockHardness(world, X, Y, Z) <= 100)
&& (block != Blocks.water)
&& (block != Blocks.lava)) {
@@ -140,9 +141,8 @@ public class MiningUtils {
for (GT_Worldgen_GT_Ore_Layer h : g) {
try {
- aTextWorldGen =
- (String) ReflectionUtils.getField(GT_Worldgen_GT_Ore_Layer.class, "aTextWorldgen")
- .get(h);
+ aTextWorldGen = (String) ReflectionUtils
+ .getField(GT_Worldgen_GT_Ore_Layer.class, "aTextWorldgen").get(h);
} catch (IllegalArgumentException | IllegalAccessException e) {
aTextWorldGen = h.mWorldGenName;
}
@@ -174,38 +174,31 @@ public class MiningUtils {
if (ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore") != null
&& mMoonID == -99) {
mMoonID = ReflectionUtils.getField(
- ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore"),
- "idDimensionMoon")
- .getInt(null);
+ ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore"),
+ "idDimensionMoon").getInt(null);
}
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
// Gets Mars ID
try {
if (ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars") != null
&& mMarsID == -99) {
mMarsID = ReflectionUtils.getField(
- ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars"),
- "dimensionIDMars")
- .getInt(null);
+ ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars"),
+ "dimensionIDMars").getInt(null);
}
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
// Get Comets ID
try {
if (ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids")
- != null
- && mCometsID == -99) {
+ != null && mCometsID == -99) {
mCometsID = ReflectionUtils.getField(
- ReflectionUtils.getClass(
- "micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids"),
- "dimensionIDAsteroids")
- .getInt(null);
+ ReflectionUtils
+ .getClass("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids"),
+ "dimensionIDAsteroids").getInt(null);
}
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
// Clear Cache
Ores_Overworld.clear();
@@ -235,18 +228,10 @@ public class MiningUtils {
if (x.mOverworld || x.mNether || (x.mEnd || aEndAsteroids)) {
continue;
}
- /*if (x.mMoon) {
- Ores_Moon.put(x);
- continue;
- }
- if (x.mMars) {
- Ores_Mars.put(x);
- continue;
- }
- if (x.mAsteroid) {
- Ores_Comets.put(x);
- continue;
- }*/
+ /*
+ * if (x.mMoon) { Ores_Moon.put(x); continue; } if (x.mMars) { Ores_Mars.put(x); continue; } if
+ * (x.mAsteroid) { Ores_Comets.put(x); continue; }
+ */
Ores_Misc.put(x);
continue;
} else {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java
index c4eb8cff64..a806a9a80c 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.util.minecraft;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import baubles.api.BaubleType;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.Pair;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class ModularArmourUtils {
@@ -18,12 +19,14 @@ public class ModularArmourUtils {
}
public static enum Modifiers {
+
BOOST_HP("skill.hpboost"),
BOOST_DEF("skill.defenceboost"),
BOOST_SPEED("skill.speedboost"),
BOOST_MINING("skill.miningboost"),
BOOST_DAMAGE("skill.damageboost"),
BOOST_HOLY("skill.holyboost");
+
private String MODIFIER_NAME;
private Modifiers(final String mModifier) {
@@ -43,9 +46,11 @@ public class ModularArmourUtils {
}
public static enum BT {
+
TYPE_AMULET(BaubleType.AMULET, 0),
TYPE_RING(BaubleType.RING, 1),
TYPE_BELT(BaubleType.BELT, 2);
+
private final BaubleType mType;
private final int mID;
private final String mBaubleType;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java
index c235cd0e0b..9bedcf1539 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java
@@ -2,18 +2,20 @@ package gtPlusPlus.core.util.minecraft;
import static gtPlusPlus.core.item.ModItems.ZZZ_Empty;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.util.HashMap;
import java.util.Map;
+
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class NBTUtils {
public static NBTTagCompound getNBT(ItemStack aStack) {
@@ -120,8 +122,7 @@ public class NBTUtils {
if (copyTags) {
for (int i = 0; i < stored.length; i++) {
if (stored[i] != null && stored[i].hasTagCompound()) {
- rStack.setTagCompound(
- (NBTTagCompound) stored[i].getTagCompound().copy());
+ rStack.setTagCompound((NBTTagCompound) stored[i].getTagCompound().copy());
break;
}
}
@@ -131,13 +132,12 @@ public class NBTUtils {
if (rNBT == null) rNBT = new NBTTagCompound();
for (int i = 0; i < 9; i++) {
ItemStack tStack = stored[i];
- if (tStack != null
- && GT_Utility.getContainerItem(tStack, true) == null
+ if (tStack != null && GT_Utility.getContainerItem(tStack, true) == null
&& !(tStack.getItem() instanceof GT_MetaGenerated_Tool)) {
tStack = GT_Utility.copyAmount(1, tStack);
if (GT_Utility.isStackValid(tStack)) {
- GT_ModHandler.dischargeElectricItem(
- tStack, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false, true);
+ GT_ModHandler
+ .dischargeElectricItem(tStack, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false, true);
tNBT.setTag("Ingredient." + i, tStack.writeToNBT(new NBTTagCompound()));
}
}
@@ -227,8 +227,7 @@ public class NBTUtils {
}
}
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return false;
}
@@ -518,32 +517,53 @@ public class NBTUtils {
Map<?, ?> mInternalMap = ReflectionUtils.getField(aNBT, "tagMap");
if (mInternalMap != null) {
for (Map.Entry<?, ?> e : mInternalMap.entrySet()) {
- Logger.INFO("Key: " + e.getKey().toString() + " | Value: "
- + e.getValue().toString());
+ Logger.INFO("Key: " + e.getKey().toString() + " | Value: " + e.getValue().toString());
if (e.getValue().getClass() == String.class) {
createStringTagCompound(
- aStack, "mEntityTag", (String) e.getKey(), (String) e.getValue());
+ aStack,
+ "mEntityTag",
+ (String) e.getKey(),
+ (String) e.getValue());
} else if (e.getValue().getClass() == Boolean.class
|| e.getValue().getClass() == boolean.class) {
- createBooleanTagCompound(
- aStack, "mEntityTag", (String) e.getKey(), (Boolean) e.getValue());
- } else if (e.getValue().getClass() == Integer.class
- || e.getValue().getClass() == int.class) {
- createIntegerTagCompound(
- aStack, "mEntityTag", (String) e.getKey(), (Integer) e.getValue());
- } else if (e.getValue().getClass() == Double.class
- || e.getValue().getClass() == double.class) {
- createDoubleTagCompound(
- aStack, "mEntityTag", (String) e.getKey(), (Double) e.getValue());
- } else if (e.getValue().getClass() == Long.class
- || e.getValue().getClass() == long.class) {
- createLongTagCompound(aStack, "mEntityTag", (String) e.getKey(), (Long) e.getValue());
- } else if (e.getValue().getClass() == Float.class
- || e.getValue().getClass() == float.class) {
- createFloatTagCompound(aStack, "mEntityTag", (String) e.getKey(), (Float) e.getValue());
- } else {
-
- }
+ createBooleanTagCompound(
+ aStack,
+ "mEntityTag",
+ (String) e.getKey(),
+ (Boolean) e.getValue());
+ } else
+ if (e.getValue().getClass() == Integer.class || e.getValue().getClass() == int.class) {
+ createIntegerTagCompound(
+ aStack,
+ "mEntityTag",
+ (String) e.getKey(),
+ (Integer) e.getValue());
+ } else if (e.getValue().getClass() == Double.class
+ || e.getValue().getClass() == double.class) {
+ createDoubleTagCompound(
+ aStack,
+ "mEntityTag",
+ (String) e.getKey(),
+ (Double) e.getValue());
+ } else
+ if (e.getValue().getClass() == Long.class
+ || e.getValue().getClass() == long.class) {
+ createLongTagCompound(
+ aStack,
+ "mEntityTag",
+ (String) e.getKey(),
+ (Long) e.getValue());
+ } else
+ if (e.getValue().getClass() == Float.class
+ || e.getValue().getClass() == float.class) {
+ createFloatTagCompound(
+ aStack,
+ "mEntityTag",
+ (String) e.getKey(),
+ (Float) e.getValue());
+ } else {
+
+ }
}
return true;
}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java
index 359b336889..59f231b486 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java
@@ -1,6 +1,7 @@
package gtPlusPlus.core.util.minecraft;
import java.util.List;
+
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
index 038672c259..4ce4af0922 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
@@ -1,10 +1,7 @@
package gtPlusPlus.core.util.minecraft;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.util.*;
+
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -17,6 +14,11 @@ import net.minecraft.util.IChatComponent;
import net.minecraft.world.World;
import net.minecraftforge.common.util.FakePlayer;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class PlayerUtils {
public static final Map<String, EntityPlayer> mCachedFakePlayers = new WeakHashMap<String, EntityPlayer>();
@@ -42,9 +44,7 @@ public class PlayerUtils {
try {
final List<EntityPlayer> i = new ArrayList<>();
final Iterator<EntityPlayerMP> iterator = MinecraftServer.getServer()
- .getConfigurationManager()
- .playerEntityList
- .iterator();
+ .getConfigurationManager().playerEntityList.iterator();
while (iterator.hasNext()) {
i.add((iterator.next()));
}
@@ -53,8 +53,7 @@ public class PlayerUtils {
return temp;
}
}
- } catch (final Throwable e) {
- }
+ } catch (final Throwable e) {}
return null;
}
@@ -81,8 +80,7 @@ public class PlayerUtils {
return temp;
}
}
- } catch (final NullPointerException e) {
- }
+ } catch (final NullPointerException e) {}
return null;
}
@@ -226,11 +224,9 @@ public class PlayerUtils {
// Cache Fake Player
if (aPlayer instanceof FakePlayer
|| (mThaumcraftFakePlayer != null && mThaumcraftFakePlayer.isInstance(aPlayer))
- || (aPlayer.getCommandSenderName() == null
- || aPlayer.getCommandSenderName().length() <= 0)
- || (aPlayer.isEntityInvulnerable()
- && !aPlayer.canCommandSenderUseCommand(0, "")
- && (aChunkLocation == null)
+ || (aPlayer.getCommandSenderName() == null || aPlayer.getCommandSenderName().length() <= 0)
+ || (aPlayer.isEntityInvulnerable() && !aPlayer.canCommandSenderUseCommand(0, "")
+ && (aChunkLocation == null)
|| (aChunkLocation.posX == 0 && aChunkLocation.posY == 0 && aChunkLocation.posZ == 0))) {
mCachedFakePlayers.put(aPlayer.getUniqueID().toString(), aPlayer);
}
@@ -260,8 +256,7 @@ public class PlayerUtils {
cacheFakePlayer(p);
return false;
}
- if (p.isEntityInvulnerable()
- && !p.canCommandSenderUseCommand(0, "")
+ if (p.isEntityInvulnerable() && !p.canCommandSenderUseCommand(0, "")
&& (aChunkLocation.posX == 0 && aChunkLocation.posY == 0 && aChunkLocation.posZ == 0)) {
cacheFakePlayer(p);
return false;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index ba55ce262a..294fea996e 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -1,5 +1,20 @@
package gtPlusPlus.core.util.minecraft;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.item.crafting.ShapelessRecipes;
+import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.ShapedOreRecipe;
+import net.minecraftforge.oredict.ShapelessOreRecipe;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.Materials;
import gregtech.api.objects.ItemData;
@@ -19,48 +34,24 @@ import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.data.ArrayUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.ShapelessRecipes;
-import net.minecraftforge.oredict.OreDictionary;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-import net.minecraftforge.oredict.ShapelessOreRecipe;
public class RecipeUtils {
+
public static int mInvalidID = 1;
- public static boolean recipeBuilder(
- final Object slot_1,
- final Object slot_2,
- final Object slot_3,
- final Object slot_4,
- final Object slot_5,
- final Object slot_6,
- final Object slot_7,
- final Object slot_8,
- final Object slot_9,
- ItemStack resultItem) {
+ public static boolean recipeBuilder(final Object slot_1, final Object slot_2, final Object slot_3,
+ final Object slot_4, final Object slot_5, final Object slot_6, final Object slot_7, final Object slot_8,
+ final Object slot_9, ItemStack resultItem) {
// Old Debug Code, useful for finding recipes loading too early.
- /*if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) {
- Logger.RECIPE(ReflectionUtils.getMethodName(1));
- Logger.RECIPE(ReflectionUtils.getMethodName(2));
- Logger.RECIPE(ReflectionUtils.getMethodName(3));
- Logger.RECIPE(ReflectionUtils.getMethodName(4));
- Logger.RECIPE(ReflectionUtils.getMethodName(5));
- Logger.RECIPE(ReflectionUtils.getMethodName(6));
- Logger.RECIPE(ReflectionUtils.getMethodName(7));
- Logger.RECIPE(ReflectionUtils.getMethodName(8));
- Logger.RECIPE(ReflectionUtils.getMethodName(9));
- FMLCommonHandler.instance().exitJava(1, true);
- }*/
+ /*
+ * if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) {
+ * Logger.RECIPE(ReflectionUtils.getMethodName(1)); Logger.RECIPE(ReflectionUtils.getMethodName(2));
+ * Logger.RECIPE(ReflectionUtils.getMethodName(3)); Logger.RECIPE(ReflectionUtils.getMethodName(4));
+ * Logger.RECIPE(ReflectionUtils.getMethodName(5)); Logger.RECIPE(ReflectionUtils.getMethodName(6));
+ * Logger.RECIPE(ReflectionUtils.getMethodName(7)); Logger.RECIPE(ReflectionUtils.getMethodName(8));
+ * Logger.RECIPE(ReflectionUtils.getMethodName(9)); FMLCommonHandler.instance().exitJava(1, true); }
+ */
if (resultItem == null) {
Logger.RECIPE(
@@ -69,8 +60,7 @@ public class RecipeUtils {
resultItem.setItemDamage(mInvalidID++);
RegistrationHandler.recipesFailed++;
// return false;
- } else if ((slot_1 == null)
- && (slot_2 == null)
+ } else if ((slot_1 == null) && (slot_2 == null)
&& (slot_3 == null)
&& (slot_4 == null)
&& (slot_5 == null)
@@ -78,16 +68,16 @@ public class RecipeUtils {
&& (slot_7 == null)
&& (slot_8 == null)
&& (slot_9 == null)) {
- Logger.RECIPE("[Fix] Found a recipe with 0 inputs, yet had a valid output.");
- Logger.RECIPE(
- "[Fix] Error found while adding a recipe for: " + resultItem != null
- ? resultItem.getDisplayName()
- : "Bad Output Item" + " | Please report this issue on Github.");
- RegistrationHandler.recipesFailed++;
- return false;
- }
+ Logger.RECIPE("[Fix] Found a recipe with 0 inputs, yet had a valid output.");
+ Logger.RECIPE(
+ "[Fix] Error found while adding a recipe for: " + resultItem != null
+ ? resultItem.getDisplayName()
+ : "Bad Output Item" + " | Please report this issue on Github.");
+ RegistrationHandler.recipesFailed++;
+ return false;
+ }
- Object[] o = new Object[] {slot_1, slot_2, slot_3, slot_4, slot_5, slot_6, slot_7, slot_8, slot_9};
+ Object[] o = new Object[] { slot_1, slot_2, slot_3, slot_4, slot_5, slot_6, slot_7, slot_8, slot_9 };
try {
int size = COMPAT_HANDLER.mRecipesToGenerate.size();
@@ -108,8 +98,7 @@ public class RecipeUtils {
// k.printStackTrace();
// k.getLocalizedMessage();
Logger.RECIPE(
- "[Fix] Invalid Recipe detected for: " + resultItem != null
- ? resultItem.getUnlocalizedName()
+ "[Fix] Invalid Recipe detected for: " + resultItem != null ? resultItem.getUnlocalizedName()
: "INVALID OUTPUT ITEM");
if (!COMPAT_HANDLER.areInitItemsLoaded) {
RegistrationHandler.recipesFailed++;
@@ -120,17 +109,9 @@ public class RecipeUtils {
}
}
- public static void shapelessBuilder(
- final ItemStack Output,
- final Object slot_1,
- final Object slot_2,
- final Object slot_3,
- final Object slot_4,
- final Object slot_5,
- final Object slot_6,
- final Object slot_7,
- final Object slot_8,
- final Object slot_9) {
+ public static void shapelessBuilder(final ItemStack Output, final Object slot_1, final Object slot_2,
+ final Object slot_3, final Object slot_4, final Object slot_5, final Object slot_6, final Object slot_7,
+ final Object slot_8, final Object slot_9) {
// Item output_ITEM = Output.getItem();
final ArrayList<Object> validSlots = new ArrayList<>();
@@ -367,28 +348,17 @@ public class RecipeUtils {
return false;
}
- public static boolean addShapedGregtechRecipeForTypes(
- final Object InputItem1,
- final Object InputItem2,
- final Object InputItem3,
- final Object InputItem4,
- final Object InputItem5,
- final Object InputItem6,
- final Object InputItem7,
- final Object InputItem8,
- final Object InputItem9,
- final ItemStack OutputItem) {
+ public static boolean addShapedGregtechRecipeForTypes(final Object InputItem1, final Object InputItem2,
+ final Object InputItem3, final Object InputItem4, final Object InputItem5, final Object InputItem6,
+ final Object InputItem7, final Object InputItem8, final Object InputItem9, final ItemStack OutputItem) {
int using = 0, recipeSlotCurrent = 0;
boolean[] hasMultiStack = new boolean[9];
- boolean inUse[] = {false, false, false};
+ boolean inUse[] = { false, false, false };
ItemStack array[][] = new ItemStack[3][9];
- Object[] inputs = {
- InputItem1, InputItem2, InputItem3,
- InputItem4, InputItem5, InputItem6,
- InputItem7, InputItem8, InputItem9
- };
+ Object[] inputs = { InputItem1, InputItem2, InputItem3, InputItem4, InputItem5, InputItem6, InputItem7,
+ InputItem8, InputItem9 };
for (Object o : inputs) {
if (o.getClass().isArray()) {
@@ -418,27 +388,19 @@ public class RecipeUtils {
return false;
}
- public static boolean addShapedGregtechRecipe(
- final Object InputItem1,
- final Object InputItem2,
- final Object InputItem3,
- final Object InputItem4,
- final Object InputItem5,
- final Object InputItem6,
- final Object InputItem7,
- final Object InputItem8,
- final Object InputItem9,
- final ItemStack OutputItem) {
-
- Object[] o = {
- InputItem1, InputItem2, InputItem3,
- InputItem4, InputItem5, InputItem6,
- InputItem7, InputItem8, InputItem9
- };
+ public static boolean addShapedGregtechRecipe(final Object InputItem1, final Object InputItem2,
+ final Object InputItem3, final Object InputItem4, final Object InputItem5, final Object InputItem6,
+ final Object InputItem7, final Object InputItem8, final Object InputItem9, final ItemStack OutputItem) {
+
+ Object[] o = { InputItem1, InputItem2, InputItem3, InputItem4, InputItem5, InputItem6, InputItem7, InputItem8,
+ InputItem9 };
if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) {
- CORE.crash("Load Phase " + gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE + " should be "
- + GTplusplus.INIT_PHASE.POST_INIT + ". Unable to register recipe.");
+ CORE.crash(
+ "Load Phase " + gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE
+ + " should be "
+ + GTplusplus.INIT_PHASE.POST_INIT
+ + ". Unable to register recipe.");
}
int size = COMPAT_HANDLER.mGtRecipesToGenerate.size();
@@ -458,8 +420,11 @@ public class RecipeUtils {
public static boolean addShapedGregtechRecipe(final Object[] inputs, ItemStack output) {
if (inputs.length != 9) {
- Logger.RECIPE("[Fix] Input array for " + output.getDisplayName() + " does not equal 9. " + inputs.length
- + " is the actual size.");
+ Logger.RECIPE(
+ "[Fix] Input array for " + output.getDisplayName()
+ + " does not equal 9. "
+ + inputs.length
+ + " is the actual size.");
RegistrationHandler.recipesFailed++;
return false;
}
@@ -468,20 +433,20 @@ public class RecipeUtils {
if (inputs[x] == null) {
inputs[x] = " ";
Logger.WARNING("Input slot " + x + " changed from NULL to a blank space.");
- } else if (!(inputs[x] instanceof ItemStack)
- && !(inputs[x] instanceof String)
+ } else if (!(inputs[x] instanceof ItemStack) && !(inputs[x] instanceof String)
&& !(inputs[x] instanceof Item)) {
- if (output != null) {
- Logger.RECIPE("[Fix] Invalid Item inserted into inputArray. Item:" + output.getDisplayName()
- + " has a bad recipe. Please report to Alkalus.");
- RegistrationHandler.recipesFailed++;
- return false;
- } else {
- Logger.RECIPE("[Fix] Output is Null for a recipe. Report to Alkalus.");
- output = ItemUtils.getItemStackOfAmountFromOreDict("sadibasdkjnad", 1);
- RegistrationHandler.recipesFailed++;
- }
- }
+ if (output != null) {
+ Logger.RECIPE(
+ "[Fix] Invalid Item inserted into inputArray. Item:" + output.getDisplayName()
+ + " has a bad recipe. Please report to Alkalus.");
+ RegistrationHandler.recipesFailed++;
+ return false;
+ } else {
+ Logger.RECIPE("[Fix] Output is Null for a recipe. Report to Alkalus.");
+ output = ItemUtils.getItemStackOfAmountFromOreDict("sadibasdkjnad", 1);
+ RegistrationHandler.recipesFailed++;
+ }
+ }
}
int size = COMPAT_HANDLER.mGtRecipesToGenerate.size();
@@ -498,23 +463,12 @@ public class RecipeUtils {
return false;
}
- public static boolean addShapelessGregtechRecipe(
- final Object InputItem1,
- final Object InputItem2,
- final Object InputItem3,
- final Object InputItem4,
- final Object InputItem5,
- final Object InputItem6,
- final Object InputItem7,
- final Object InputItem8,
- final Object InputItem9,
- final ItemStack OutputItem) {
-
- Object[] inputItems = {
- InputItem1, InputItem2, InputItem3,
- InputItem4, InputItem5, InputItem6,
- InputItem7, InputItem8, InputItem9
- };
+ public static boolean addShapelessGregtechRecipe(final Object InputItem1, final Object InputItem2,
+ final Object InputItem3, final Object InputItem4, final Object InputItem5, final Object InputItem6,
+ final Object InputItem7, final Object InputItem8, final Object InputItem9, final ItemStack OutputItem) {
+
+ Object[] inputItems = { InputItem1, InputItem2, InputItem3, InputItem4, InputItem5, InputItem6, InputItem7,
+ InputItem8, InputItem9 };
return addShapelessGregtechRecipe(inputItems, OutputItem);
}
@@ -522,8 +476,9 @@ public class RecipeUtils {
// Catch Invalid Recipes
if (inputItems.length > 9 || inputItems.length < 1) {
if (OutputItem != null) {
- Logger.RECIPE("[Fix] Invalid input array for shapeless recipe, which should output "
- + OutputItem.getDisplayName());
+ Logger.RECIPE(
+ "[Fix] Invalid input array for shapeless recipe, which should output "
+ + OutputItem.getDisplayName());
}
return false;
}
@@ -545,7 +500,16 @@ public class RecipeUtils {
public static boolean generateMortarRecipe(ItemStack aStack, ItemStack aOutput) {
return RecipeUtils.addShapedGregtechRecipe(
- aStack, null, null, CI.craftingToolMortar, null, null, null, null, null, aOutput);
+ aStack,
+ null,
+ null,
+ CI.craftingToolMortar,
+ null,
+ null,
+ null,
+ null,
+ null,
+ aOutput);
}
public static boolean doesGregtechRecipeHaveEqualCells(GT_Recipe x) {
@@ -591,6 +555,7 @@ public class RecipeUtils {
}
public static class InternalRecipeObject implements RunnableWithInfo<String> {
+
final ItemStack mOutput;
final ShapedOreRecipe mRecipe;
public final boolean isValid;
@@ -649,8 +614,7 @@ public class RecipeUtils {
GameRegistry.addRecipe(mRecipe);
} else {
Logger.RECIPE(
- "[Fix] Invalid shapped recipe outputting " + mOutput != null
- ? mOutput.getDisplayName()
+ "[Fix] Invalid shapped recipe outputting " + mOutput != null ? mOutput.getDisplayName()
: "Bad Output Item");
}
}
@@ -682,11 +646,8 @@ public class RecipeUtils {
return removeRecipeByOutput(aOutput, true, false, false);
}
- public static boolean removeRecipeByOutput(
- ItemStack aOutput,
- boolean aIgnoreNBT,
- boolean aNotRemoveShapelessRecipes,
- boolean aOnlyRemoveNativeHandlers) {
+ public static boolean removeRecipeByOutput(ItemStack aOutput, boolean aIgnoreNBT,
+ boolean aNotRemoveShapelessRecipes, boolean aOnlyRemoveNativeHandlers) {
if (aOutput == null) {
return false;
} else {
@@ -700,14 +661,14 @@ public class RecipeUtils {
if (!aNotRemoveShapelessRecipes
|| !(tRecipe instanceof ShapelessRecipes) && !(tRecipe instanceof ShapelessOreRecipe)) {
if (aOnlyRemoveNativeHandlers) {
- if (!gregtech.api.util.GT_ModHandler.sNativeRecipeClasses.contains(
- tRecipe.getClass().getName())) {
+ if (!gregtech.api.util.GT_ModHandler.sNativeRecipeClasses
+ .contains(tRecipe.getClass().getName())) {
continue;
}
- } else if (gregtech.api.util.GT_ModHandler.sSpecialRecipeClasses.contains(
- tRecipe.getClass().getName())) {
- continue;
- }
+ } else if (gregtech.api.util.GT_ModHandler.sSpecialRecipeClasses
+ .contains(tRecipe.getClass().getName())) {
+ continue;
+ }
ItemStack tStack = tRecipe.getRecipeOutput();
if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(tStack), aOutput, aIgnoreNBT)) {
@@ -731,19 +692,10 @@ public class RecipeUtils {
GameRegistry.addSmelting(aStackInput, aStackOutput, aXpGained);
}
- public static boolean addShapedRecipe(
- Object Input_1,
- Object Input_2,
- Object Input_3,
- Object Input_4,
- Object Input_5,
- Object Input_6,
- Object Input_7,
- Object Input_8,
- Object Input_9,
- ItemStack aOutputStack) {
+ public static boolean addShapedRecipe(Object Input_1, Object Input_2, Object Input_3, Object Input_4,
+ Object Input_5, Object Input_6, Object Input_7, Object Input_8, Object Input_9, ItemStack aOutputStack) {
return addShapedRecipe(
- new Object[] {Input_1, Input_2, Input_3, Input_4, Input_5, Input_6, Input_7, Input_8, Input_9},
+ new Object[] { Input_1, Input_2, Input_3, Input_4, Input_5, Input_6, Input_7, Input_8, Input_9 },
aOutputStack);
}
@@ -792,7 +744,7 @@ public class RecipeUtils {
Logger.RECIPE("" + aRow2);
Logger.RECIPE("" + aRow3);
- String[] aStringData = new String[] {aRow1, aRow2, aRow3};
+ String[] aStringData = new String[] { aRow1, aRow2, aRow3 };
Object[] aDataObject = new Object[19];
aDataObject[0] = aStringData;
int aIndex = 0;
@@ -804,10 +756,13 @@ public class RecipeUtils {
if (aFullString.charAt(aIndex) != (' ')) {
aDataObject[u] = aFullString.charAt(aIndex);
aDataObject[u + 1] = Slots[aIndex];
- Logger.INFO("(" + aIndex + ") " + aFullString.charAt(aIndex) + " | "
- + (Slots[aIndex] instanceof ItemStack
- ? ItemUtils.getItemName((ItemStack) Slots[aIndex])
- : Slots[aIndex] instanceof String ? (String) Slots[aIndex] : "Unknown"));
+ Logger.INFO(
+ "(" + aIndex
+ + ") "
+ + aFullString.charAt(aIndex)
+ + " | "
+ + (Slots[aIndex] instanceof ItemStack ? ItemUtils.getItemName((ItemStack) Slots[aIndex])
+ : Slots[aIndex] instanceof String ? (String) Slots[aIndex] : "Unknown"));
}
aIndex++;
}
@@ -819,17 +774,10 @@ public class RecipeUtils {
ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack, aDataObject);
- /*ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack,
- aStringData,
- 'a', Slots[0],
- 'b', Slots[1],
- 'c', Slots[2],
- 'd', Slots[3],
- 'e', Slots[4],
- 'f', Slots[5],
- 'g', Slots[6],
- 'h', Slots[7],
- 'i', Slots[8]);*/
+ /*
+ * ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack, aStringData, 'a', Slots[0], 'b', Slots[1], 'c',
+ * Slots[2], 'd', Slots[3], 'e', Slots[4], 'f', Slots[5], 'g', Slots[6], 'h', Slots[7], 'i', Slots[8]);
+ */
int size = COMPAT_HANDLER.mRecipesToGenerate.size();
COMPAT_HANDLER.mRecipesToGenerate.put(new InternalRecipeObject2(aRecipe));
@@ -866,8 +814,7 @@ public class RecipeUtils {
GameRegistry.addRecipe(mRecipe);
} else {
Logger.INFO(
- "[Fix] Invalid shapped recipe outputting " + mOutput != null
- ? mOutput.getDisplayName()
+ "[Fix] Invalid shapped recipe outputting " + mOutput != null ? mOutput.getDisplayName()
: "Bad Output Item");
}
}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java
index 5994bf5f67..b2a705481b 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java
@@ -1,13 +1,15 @@
package gtPlusPlus.core.util.minecraft;
-import gtPlusPlus.api.objects.Logger;
import java.util.ArrayList;
+
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.ShapelessRecipes;
+import gtPlusPlus.api.objects.Logger;
+
public class ShapelessUtils {
public static boolean addShapelessRecipe(final ItemStack output, final Object... params) {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index 33ef1b89e3..639cd37f76 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -2,6 +2,12 @@ package gtPlusPlus.core.util.minecraft.gregtech;
import static gtPlusPlus.core.lib.CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.apache.commons.lang3.ArrayUtils;
+
import gregtech.GT_Mod;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -15,10 +21,6 @@ import gtPlusPlus.core.material.MISC_MATERIALS;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraftforge.fluids.FluidStack;
-import org.apache.commons.lang3.ArrayUtils;
public class PollutionUtils {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java
index 1b35ead9f1..ecabeaa294 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java
@@ -1,244 +1,55 @@
package gtPlusPlus.core.util.minecraft.gregtech.material;
public class MaterialBuilder {
- /*public static final int DIESEL = 0, GAS = 1, THERMAL = 2, SEMIFLUID = 3, PLASMA = 4, MAGIC = 5;
-
- private int metaItemSubID;
- private TextureSet iconSet;
- private float toolSpeed = 1.0f;
- private int durability = 0;
- private int toolQuality = 0;
- private int types = 0;
- private int r = 255, g = 255, b = 255, a = 0;
- private String name;
- private String defaultLocalName;
- private int fuelType = 0;
- private int fuelPower = 0;
- private int meltingPoint = 0;
- private int blastFurnaceTemp = 0;
- private boolean blastFurnaceRequired = false;
- private boolean transparent = false;
- private int oreValue = 1;
- private int densityMultiplier = 1;
- private int densityDivider = 1;
- private Dyes color = Dyes._NULL;
- private int extraData = 0;
- private List<MaterialStack> materialList = new ArrayList<MaterialStack>();
- private List<TC_Aspects.TC_AspectStack> aspects = new ArrayList<TC_Aspects.TC_AspectStack>();
- private boolean canBeCracked = false;
- private int liquidTemperature = 300;
- private int gasTemperature = 300;
-
- public MaterialBuilder(int metaItemSubID, TextureSet iconSet, String defaultLocalName) {
- this.metaItemSubID = metaItemSubID;
- this.iconSet = iconSet;
- this.name = defaultLocalName.replace(" ", "").replace("-", "");
- this.defaultLocalName = defaultLocalName;
- }
-
- public Materials constructMaterial() {
- return new Materials(
- metaItemSubID, iconSet, toolSpeed, durability, toolQuality, types, r, g, b, a, name, defaultLocalName, fuelType, fuelPower, meltingPoint, blastFurnaceTemp,
- blastFurnaceRequired, transparent, oreValue, densityMultiplier, densityDivider, color, extraData, materialList, aspects);
-
- }
-
- public MaterialBuilder setName(String name){
- this.name = name;
- return this;
- }
-
- public MaterialBuilder setTypes(int types){
- this.types = types;
- return this;
- }
-
- public MaterialBuilder addDustItems(){
- types = types | 1;
- return this;
- }
-
- public MaterialBuilder addMetalItems(){
- types = types | 2;
- return this;
- }
-
- public MaterialBuilder addGemItems(){
- types = types | 4;
- return this;
- }
-
- public MaterialBuilder addOreItems(){
- types = types | 8;
- return this;
- }
-
- public MaterialBuilder addCell(){
- types = types | 16;
- return this;
- }
-
- public MaterialBuilder addPlasma(){
- types = types | 32;
- return this;
- }
-
- public MaterialBuilder addToolHeadItems(){
- types = types | 64;
- return this;
- }
-
- public MaterialBuilder addGearItems(){
- types = types | 128;
- return this;
- }
-
- public MaterialBuilder addFluid(){
- return this;
- }
-
- public MaterialBuilder addGas(){
- return this;
- }
-
-
- public MaterialBuilder setRGBA(int r, int g, int b, int a){
- this.r = r;
- this.g = g;
- this.b = b;
- this.a = a;
- return this;
- }
-
- public MaterialBuilder setRGB(int r, int g, int b){
- this.r = r;
- this.g = g;
- this.b = b;
- return this;
- }
-
- public MaterialBuilder setTransparent(boolean transparent){
- this.transparent = transparent;
- return this;
- }
-
- public MaterialBuilder setColor(Dyes color){
- this.color = color;
- return this;
- }
-
-
- public MaterialBuilder setToolSpeed(float toolSpeed) {
- this.toolSpeed = toolSpeed;
- return this;
- }
-
- public MaterialBuilder setDurability(int durability) {
- this.durability = durability;
- return this;
- }
-
- public MaterialBuilder setToolQuality(int toolQuality) {
- this.toolQuality = toolQuality;
- return this;
- }
-
-
- public MaterialBuilder setFuelType(int fuelType) {
- this.fuelType = fuelType;
- return this;
- }
-
- public MaterialBuilder setFuelPower(int fuelPower) {
- this.fuelPower = fuelPower;
- return this;
- }
-
- public MaterialBuilder setMeltingPoint(int meltingPoint) {
- this.meltingPoint = meltingPoint;
- return this;
- }
-
- public MaterialBuilder setBlastFurnaceTemp(int blastFurnaceTemp) {
- this.blastFurnaceTemp = blastFurnaceTemp;
- return this;
- }
-
- public MaterialBuilder setBlastFurnaceRequired(boolean blastFurnaceRequired) {
- this.blastFurnaceRequired = blastFurnaceRequired;
- return this;
- }
-
- public MaterialBuilder setOreValue(int oreValue) {
- this.oreValue = oreValue;
- return this;
- }
-
- public MaterialBuilder setDensityMultiplier(int densityMultiplier) {
- this.densityMultiplier = densityMultiplier;
- return this;
- }
-
- public MaterialBuilder setDensityDivider(int densityDivider) {
- this.densityDivider = densityDivider;
- return this;
- }
-
- public MaterialBuilder setExtraData(int extraData) {
- this.extraData = extraData;
- return this;
- }
-
- public MaterialBuilder addElectrolyzerRecipe(){
- extraData = extraData | 1;
- return this;
- }
-
- public MaterialBuilder addCentrifugeRecipe(){
- extraData = extraData | 2;
- return this;
- }
-
- public MaterialBuilder setMaterialList(List<MaterialStack> materialList) {
- this.materialList = materialList;
- return this;
- }
-
- public MaterialBuilder setMaterialList(MaterialStack ... materials) {
- this.materialList = Arrays.asList(materials);
- return this;
- }
-
- public MaterialBuilder setAspects(List<TC_Aspects.TC_AspectStack> aspects) {
- this.aspects = aspects;
- return this;
- }
-
- public int getLiquidTemperature() {
- return liquidTemperature;
- }
-
- public MaterialBuilder setLiquidTemperature(int liquidTemperature) {
- this.liquidTemperature = liquidTemperature;
- return this;
- }
-
- public int getGasTemperature() {
- return gasTemperature;
- }
-
- public MaterialBuilder setGasTemperature(int gasTemperature) {
- this.gasTemperature = gasTemperature;
- return this;
- }
-
- public boolean canBeCracked() {
- return canBeCracked;
- }
-
- public MaterialBuilder setCanBeCracked(boolean canBeCracked) {
- this.canBeCracked = canBeCracked;
- return this;
- }
- */
+ /*
+ * public static final int DIESEL = 0, GAS = 1, THERMAL = 2, SEMIFLUID = 3, PLASMA = 4, MAGIC = 5; private int
+ * metaItemSubID; private TextureSet iconSet; private float toolSpeed = 1.0f; private int durability = 0; private
+ * int toolQuality = 0; private int types = 0; private int r = 255, g = 255, b = 255, a = 0; private String name;
+ * private String defaultLocalName; private int fuelType = 0; private int fuelPower = 0; private int meltingPoint =
+ * 0; private int blastFurnaceTemp = 0; private boolean blastFurnaceRequired = false; private boolean transparent =
+ * false; private int oreValue = 1; private int densityMultiplier = 1; private int densityDivider = 1; private Dyes
+ * color = Dyes._NULL; private int extraData = 0; private List<MaterialStack> materialList = new
+ * ArrayList<MaterialStack>(); private List<TC_Aspects.TC_AspectStack> aspects = new
+ * ArrayList<TC_Aspects.TC_AspectStack>(); private boolean canBeCracked = false; private int liquidTemperature =
+ * 300; private int gasTemperature = 300; public MaterialBuilder(int metaItemSubID, TextureSet iconSet, String
+ * defaultLocalName) { this.metaItemSubID = metaItemSubID; this.iconSet = iconSet; this.name =
+ * defaultLocalName.replace(" ", "").replace("-", ""); this.defaultLocalName = defaultLocalName; } public Materials
+ * constructMaterial() { return new Materials( metaItemSubID, iconSet, toolSpeed, durability, toolQuality, types, r,
+ * g, b, a, name, defaultLocalName, fuelType, fuelPower, meltingPoint, blastFurnaceTemp, blastFurnaceRequired,
+ * transparent, oreValue, densityMultiplier, densityDivider, color, extraData, materialList, aspects); } public
+ * MaterialBuilder setName(String name){ this.name = name; return this; } public MaterialBuilder setTypes(int
+ * types){ this.types = types; return this; } public MaterialBuilder addDustItems(){ types = types | 1; return this;
+ * } public MaterialBuilder addMetalItems(){ types = types | 2; return this; } public MaterialBuilder addGemItems(){
+ * types = types | 4; return this; } public MaterialBuilder addOreItems(){ types = types | 8; return this; } public
+ * MaterialBuilder addCell(){ types = types | 16; return this; } public MaterialBuilder addPlasma(){ types = types |
+ * 32; return this; } public MaterialBuilder addToolHeadItems(){ types = types | 64; return this; } public
+ * MaterialBuilder addGearItems(){ types = types | 128; return this; } public MaterialBuilder addFluid(){ return
+ * this; } public MaterialBuilder addGas(){ return this; } public MaterialBuilder setRGBA(int r, int g, int b, int
+ * a){ this.r = r; this.g = g; this.b = b; this.a = a; return this; } public MaterialBuilder setRGB(int r, int g,
+ * int b){ this.r = r; this.g = g; this.b = b; return this; } public MaterialBuilder setTransparent(boolean
+ * transparent){ this.transparent = transparent; return this; } public MaterialBuilder setColor(Dyes color){
+ * this.color = color; return this; } public MaterialBuilder setToolSpeed(float toolSpeed) { this.toolSpeed =
+ * toolSpeed; return this; } public MaterialBuilder setDurability(int durability) { this.durability = durability;
+ * return this; } public MaterialBuilder setToolQuality(int toolQuality) { this.toolQuality = toolQuality; return
+ * this; } public MaterialBuilder setFuelType(int fuelType) { this.fuelType = fuelType; return this; } public
+ * MaterialBuilder setFuelPower(int fuelPower) { this.fuelPower = fuelPower; return this; } public MaterialBuilder
+ * setMeltingPoint(int meltingPoint) { this.meltingPoint = meltingPoint; return this; } public MaterialBuilder
+ * setBlastFurnaceTemp(int blastFurnaceTemp) { this.blastFurnaceTemp = blastFurnaceTemp; return this; } public
+ * MaterialBuilder setBlastFurnaceRequired(boolean blastFurnaceRequired) { this.blastFurnaceRequired =
+ * blastFurnaceRequired; return this; } public MaterialBuilder setOreValue(int oreValue) { this.oreValue = oreValue;
+ * return this; } public MaterialBuilder setDensityMultiplier(int densityMultiplier) { this.densityMultiplier =
+ * densityMultiplier; return this; } public MaterialBuilder setDensityDivider(int densityDivider) {
+ * this.densityDivider = densityDivider; return this; } public MaterialBuilder setExtraData(int extraData) {
+ * this.extraData = extraData; return this; } public MaterialBuilder addElectrolyzerRecipe(){ extraData = extraData
+ * | 1; return this; } public MaterialBuilder addCentrifugeRecipe(){ extraData = extraData | 2; return this; }
+ * public MaterialBuilder setMaterialList(List<MaterialStack> materialList) { this.materialList = materialList;
+ * return this; } public MaterialBuilder setMaterialList(MaterialStack ... materials) { this.materialList =
+ * Arrays.asList(materials); return this; } public MaterialBuilder setAspects(List<TC_Aspects.TC_AspectStack>
+ * aspects) { this.aspects = aspects; return this; } public int getLiquidTemperature() { return liquidTemperature; }
+ * public MaterialBuilder setLiquidTemperature(int liquidTemperature) { this.liquidTemperature = liquidTemperature;
+ * return this; } public int getGasTemperature() { return gasTemperature; } public MaterialBuilder
+ * setGasTemperature(int gasTemperature) { this.gasTemperature = gasTemperature; return this; } public boolean
+ * canBeCracked() { return canBeCracked; } public MaterialBuilder setCanBeCracked(boolean canBeCracked) {
+ * this.canBeCracked = canBeCracked; return this; }
+ */
}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java
index cbd92c3f4e..58045150f1 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java
@@ -1,3 +1,4 @@
package gtPlusPlus.core.util.minecraft.gregtech.recipehandlers;
-public final class GregtechRecipe {}
+public final class GregtechRecipe {
+}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java
index 6a7a33bd8e..cb75d78bfc 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java
@@ -1,14 +1,16 @@
package gtPlusPlus.core.util.minecraft.network;
-import cpw.mods.fml.common.network.internal.FMLProxyPacket;
-import io.netty.buffer.Unpooled;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
+
import mods.railcraft.common.util.misc.Game;
+import cpw.mods.fml.common.network.internal.FMLProxyPacket;
+import io.netty.buffer.Unpooled;
public abstract class CustomPacket {
+
public static final String CHANNEL_NAME = "GTPP";
public enum PacketType {
@@ -22,7 +24,7 @@ public abstract class CustomPacket {
data.writeByte(this.getID());
this.writeData(data);
} catch (IOException var4) {
- Game.logThrowable("Error constructing packet: {0}", var4, new Object[] {this.getClass()});
+ Game.logThrowable("Error constructing packet: {0}", var4, new Object[] { this.getClass() });
}
return new FMLProxyPacket(Unpooled.wrappedBuffer(bytes.toByteArray()), "GTPP");
}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java
index 30e981b1a0..d9b565591c 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.util.minecraft.network;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import net.minecraft.world.WorldServer;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
public class PacketBuilder {
private static PacketBuilder instance;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java
index 4b6fc5aa85..69d94a4f13 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java
@@ -1,17 +1,20 @@
package gtPlusPlus.core.util.minecraft.network;
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
-import cpw.mods.fml.relauncher.ReflectionHelper;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.preloader.DevHelper;
import java.lang.reflect.Method;
+
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.Packet;
import net.minecraft.server.management.PlayerManager;
import net.minecraft.world.WorldServer;
+import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
+import cpw.mods.fml.relauncher.ReflectionHelper;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.preloader.DevHelper;
+
@SuppressWarnings("unchecked")
public class PacketDispatcher {
+
private static final Class playerInstanceClass;
private static final Method getOrCreateChunkWatcher;
private static final Method sendToAllPlayersWatchingChunk;
@@ -38,15 +41,18 @@ public class PacketDispatcher {
public static void sendToWatchers(CustomPacket packet, WorldServer world, int worldX, int worldZ) {
try {
- Object playerInstance =
- getOrCreateChunkWatcher.invoke(world.getPlayerManager(), worldX >> 4, worldZ >> 4, false);
+ Object playerInstance = getOrCreateChunkWatcher
+ .invoke(world.getPlayerManager(), worldX >> 4, worldZ >> 4, false);
if (playerInstance != null) {
sendToAllPlayersWatchingChunk.invoke(playerInstance, packet.getPacket());
}
} catch (Exception var5) {
- Logger.ERROR("Reflection Failure in PacketDispatcher.sendToWatchers() {0} {1}" + 20 + var5
- + new Object[] {getOrCreateChunkWatcher.getName() + sendToAllPlayersWatchingChunk.getName()});
+ Logger.ERROR(
+ "Reflection Failure in PacketDispatcher.sendToWatchers() {0} {1}" + 20
+ + var5
+ + new Object[] {
+ getOrCreateChunkWatcher.getName() + sendToAllPlayersWatchingChunk.getName() });
throw new RuntimeException(var5);
}
}
@@ -59,13 +65,17 @@ public class PacketDispatcher {
try {
a = DevHelper.getForgeMethod(
- PlayerManager.class, "getOrCreateChunkWatcher", int.class, int.class, boolean.class);
+ PlayerManager.class,
+ "getOrCreateChunkWatcher",
+ int.class,
+ int.class,
+ boolean.class);
} catch (Throwable t) {
a = ReflectionHelper.findMethod(
playerInstanceClass,
(Object) null,
- new String[] {"func_72690_a", "getOrCreateChunkWatcher"},
- new Class[] {Integer.TYPE, Integer.TYPE, Boolean.TYPE});
+ new String[] { "func_72690_a", "getOrCreateChunkWatcher" },
+ new Class[] { Integer.TYPE, Integer.TYPE, Boolean.TYPE });
}
try {
b = DevHelper.getForgeMethod(PlayerManager.class, "sendToAllPlayersWatchingChunk", Packet.class);
@@ -73,8 +83,8 @@ public class PacketDispatcher {
b = ReflectionHelper.findMethod(
playerInstanceClass,
(Object) null,
- new String[] {"func_151251_a", "sendToAllPlayersWatchingChunk"},
- new Class[] {Packet.class});
+ new String[] { "func_151251_a", "sendToAllPlayersWatchingChunk" },
+ new Class[] { Packet.class });
}
getOrCreateChunkWatcher = a;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java
index bd7e1fbcb8..535c192bbe 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java
@@ -1,5 +1,13 @@
package gtPlusPlus.core.util.minecraft.network;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.network.FMLEventChannel;
import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent;
@@ -7,14 +15,9 @@ import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.network.CustomPacket.PacketType;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.NetHandlerPlayServer;
public class PacketHandler {
+
public static final PacketHandler INSTANCE = new PacketHandler();
private static final PacketType[] packetTypes = PacketType.values();
final FMLEventChannel channel;
@@ -63,7 +66,8 @@ public class PacketHandler {
((CustomPacket) pkt).readData(data);
}
} catch (IOException var7) {
- Logger.ERROR("Exception in PacketHandler.onPacketData: {0}" + var7 + new Object[] {Arrays.toString(bData)});
+ Logger.ERROR(
+ "Exception in PacketHandler.onPacketData: {0}" + var7 + new Object[] { Arrays.toString(bData) });
}
}
}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java
index 265d78a7f4..03a1251053 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java
@@ -1,19 +1,23 @@
package gtPlusPlus.core.util.minecraft.network;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gtPlusPlus.api.interfaces.IGregtechPacketEntity;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
+
import mods.railcraft.common.util.misc.Game;
+
import net.minecraft.client.Minecraft;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.api.interfaces.IGregtechPacketEntity;
+
public class PacketTileEntity extends CustomPacket {
+
private IGregTechTileEntity tile;
private IGregtechPacketEntity ptile;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java b/src/main/java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java
index f848ea49be..ff28f59eb2 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java
@@ -1,9 +1,10 @@
package gtPlusPlus.core.util.minecraft.particles;
-import gtPlusPlus.xmod.forestry.HANDLER_FR;
import net.minecraft.block.Block;
import net.minecraft.world.World;
+import gtPlusPlus.xmod.forestry.HANDLER_FR;
+
public class BlockBreakParticles {
public BlockBreakParticles(final World world, final int x, final int y, final int z, final Block block) {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java b/src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java
index 6c21e8addf..ad7e407c57 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java
@@ -4,14 +4,9 @@ import net.minecraft.client.particle.EntityAuraFX;
import net.minecraft.world.World;
public class EntityParticleFXMysterious extends EntityAuraFX {
- public EntityParticleFXMysterious(
- final World parWorld,
- final double parX,
- final double parY,
- final double parZ,
- final double parMotionX,
- final double parMotionY,
- final double parMotionZ) {
+
+ public EntityParticleFXMysterious(final World parWorld, final double parX, final double parY, final double parZ,
+ final double parMotionX, final double parMotionY, final double parMotionZ) {
super(parWorld, parX, parY, parZ, parMotionX, parMotionY, parMotionZ);
this.setParticleTextureIndex(82); // same as happy villager
this.particleScale = 2.0F;
diff --git a/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java
index 7159345d86..1ce69a51fd 100644
--- a/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java
+++ b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java
@@ -1,12 +1,14 @@
package gtPlusPlus.core.util.player;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
import java.io.*;
import java.util.*;
+
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.server.MinecraftServer;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+
public class PlayerCache {
private static final File cache = new File("PlayerCache.dat");
@@ -45,21 +47,12 @@ public class PlayerCache {
final HashMap<String, UUID> playerInfo = new HashMap<>();
playerInfo.put(playerName, UUID.fromString(playerUUIDasString));
- /*try {
- Utils.LOG_INFO("Attempting to load "+cache.getName());
- properties.load(new FileInputStream(cache));
- if (properties == null || properties.equals(null)){
- Utils.LOG_INFO("Please wait.");
- }
- else {
- Utils.LOG_INFO("Loaded PlayerCache.dat");
- properties.setProperty(playerName+"_", playerUUIDasString);
- FileOutputStream fr=new FileOutputStream(cache);
- properties.store(fr, "Player Cache.");
- fr.close();
- }
-
- } */
+ /*
+ * try { Utils.LOG_INFO("Attempting to load "+cache.getName()); properties.load(new FileInputStream(cache)); if
+ * (properties == null || properties.equals(null)){ Utils.LOG_INFO("Please wait."); } else {
+ * Utils.LOG_INFO("Loaded PlayerCache.dat"); properties.setProperty(playerName+"_", playerUUIDasString);
+ * FileOutputStream fr=new FileOutputStream(cache); properties.store(fr, "Player Cache."); fr.close(); } }
+ */
try {
final FileOutputStream fos = new FileOutputStream("PlayerCache.dat");
@@ -75,22 +68,21 @@ public class PlayerCache {
}
/**
- * Reads a "properties" file, and returns it as a Map
- * (a collection of key/value pairs).
+ * Reads a "properties" file, and returns it as a Map (a collection of key/value pairs).
*
- * Credit due to Alvin Alexander - http://alvinalexander.com/java/java-properties-file-map-example?nocache=1#comment-8215
- * Changed slightly as the filename and delimiter are constant in my case.
+ * Credit due to Alvin Alexander -
+ * http://alvinalexander.com/java/java-properties-file-map-example?nocache=1#comment-8215 Changed slightly as the
+ * filename and delimiter are constant in my case.
*
* @param filename The properties filename to read.
- * @param delimiter The string (or character) that separates the key
- * from the value in the properties file.
+ * @param delimiter The string (or character) that separates the key from the value in the properties file.
* @return The Map that contains the key/value pairs.
* @throws Exception
*/
@Deprecated
public static Map<String, String> readPropertiesFileAsMapOld() throws Exception {
final String delimiter = "=";
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
final Map<String, String> map = new HashMap<>();
final BufferedReader reader = new BufferedReader(new FileReader(cache));
String line;
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
index 9aafe15528..11217e1e47 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
@@ -1,16 +1,18 @@
package gtPlusPlus.core.util.reflect;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.interfaces.internal.IGT_RecipeAdder;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.FluidUtils;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public final class AddGregtechRecipe {
@@ -18,14 +20,12 @@ public final class AddGregtechRecipe {
int aModifiedTime = (int) (aRecipe.mDuration * 0.8);
- if (aRecipe.mInputs == null
- || aRecipe.mFluidInputs == null
+ if (aRecipe.mInputs == null || aRecipe.mFluidInputs == null
|| aRecipe.mFluidOutputs == null
|| aRecipe.mOutputs == null) {
return false;
}
- if (aRecipe.mInputs.length > 2
- || aRecipe.mFluidInputs.length > 1
+ if (aRecipe.mInputs.length > 2 || aRecipe.mFluidInputs.length > 1
|| aRecipe.mFluidOutputs.length > 1
|| aRecipe.mOutputs.length > 9) {
return false;
@@ -67,14 +67,8 @@ public final class AddGregtechRecipe {
aRecipe.mEUt);
}
- public static boolean addCokeAndPyrolyseRecipes(
- ItemStack input1,
- int circuitNumber,
- FluidStack inputFluid1,
- ItemStack output1,
- FluidStack outputFluid1,
- int timeInSeconds,
- int euTick) {
+ public static boolean addCokeAndPyrolyseRecipes(ItemStack input1, int circuitNumber, FluidStack inputFluid1,
+ ItemStack output1, FluidStack outputFluid1, int timeInSeconds, int euTick) {
// Seconds Conversion
int TIME = timeInSeconds * 20;
int TIMEPYRO = TIME + (TIME / 5);
@@ -84,14 +78,8 @@ public final class AddGregtechRecipe {
return false;
}
- public static boolean PyrolyseOven(
- final ItemStack p0,
- final FluidStack p1,
- final int p2,
- final ItemStack p3,
- final FluidStack p4,
- final int p5,
- final int p6) {
+ public static boolean PyrolyseOven(final ItemStack p0, final FluidStack p1, final int p2, final ItemStack p3,
+ final FluidStack p4, final int p5, final int p6) {
try {
IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
@@ -110,76 +98,40 @@ public final class AddGregtechRecipe {
return (boolean) addRecipe.invoke(IGT_RecipeAdder, p0, p1, p2, p3, p4, p5, p6);
}
}
- } catch (SecurityException
- | NoSuchMethodException
- | IllegalAccessException
- | IllegalArgumentException
+ } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
return false;
}
return false;
}
- public static boolean addAssemblylineRecipe(
- ItemStack aResearchItem,
- int aResearchTime,
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- ItemStack aOutput,
- int aDuration,
- int aEUt) {
+ public static boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
+ FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
/*
- try {
- IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
- if (IGT_RecipeAdder != null){
- Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
-
- for(Method current : classRA.getDeclaredMethods()){
- //Utils.LOG_INFO("-----------------------------------------------");
- ////Utils.LOG_INFO("Found method: "+current.getName());
- //Utils.LOG_INFO("With Parameters: ");
- //Utils.LOG_INFO("===============================================");
- for (Class<?> P : current.getParameterTypes()){
- //Utils.LOG_INFO(""+P.getName());
- //Utils.LOG_INFO(""+P.getClass().getName());
- }
- //Utils.LOG_INFO("===============================================");
- }
-
- try {
- Method testRA = GT_Values.RA.getClass().getMethod("addAssemblylineRecipe", GT_Values.RA.getClass(), aResearchItem.getClass(), int.class, aInputs.getClass(), aFluidInputs.getClass(), aOutput.getClass(), int.class, int.class);
- testRA.invoke(aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt);
- }
- catch (Throwable masndj){
- masndj.printStackTrace();
- }
-
-
- Method addRecipe = classRA.getDeclaredMethod(
- "addAssemblylineRecipe",
- ItemStack.class,
- int.class,
- ItemStack.class,
- FluidStack.class,
- ItemStack.class,
- int.class,
- int.class);
- if (addRecipe != null){
- return (boolean) addRecipe.invoke(aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt);
- }
- }
- }
- catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- Utils.LOG_INFO("[Assembly Line] - Failed to add recipe, due to GT not being .09 branch. Research: "+aResearchItem.getDisplayName()+" | Result: "+aOutput.getDisplayName());
- e.printStackTrace();
- return false;
- }
- Utils.LOG_INFO("[Assembly Line] - Failed to add recipe. Research: "+aResearchItem.getDisplayName()+" | Result: "+aOutput.getDisplayName());
+ * try { IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA; if (IGT_RecipeAdder != null){ Class<? extends
+ * IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass(); for(Method current : classRA.getDeclaredMethods()){
+ * //Utils.LOG_INFO("-----------------------------------------------");
+ * ////Utils.LOG_INFO("Found method: "+current.getName()); //Utils.LOG_INFO("With Parameters: ");
+ * //Utils.LOG_INFO("==============================================="); for (Class<?> P :
+ * current.getParameterTypes()){ //Utils.LOG_INFO(""+P.getName()); //Utils.LOG_INFO(""+P.getClass().getName());
+ * } //Utils.LOG_INFO("==============================================="); } try { Method testRA =
+ * GT_Values.RA.getClass().getMethod("addAssemblylineRecipe", GT_Values.RA.getClass(), aResearchItem.getClass(),
+ * int.class, aInputs.getClass(), aFluidInputs.getClass(), aOutput.getClass(), int.class, int.class);
+ * testRA.invoke(aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt); } catch
+ * (Throwable masndj){ masndj.printStackTrace(); } Method addRecipe = classRA.getDeclaredMethod(
+ * "addAssemblylineRecipe", ItemStack.class, int.class, ItemStack.class, FluidStack.class, ItemStack.class,
+ * int.class, int.class); if (addRecipe != null){ return (boolean) addRecipe.invoke(aResearchItem,
+ * aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt); } } } catch (SecurityException |
+ * NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ * Utils.LOG_INFO("[Assembly Line] - Failed to add recipe, due to GT not being .09 branch. Research: "
+ * +aResearchItem.getDisplayName()+" | Result: "+aOutput.getDisplayName()); e.printStackTrace(); return false; }
+ * Utils.LOG_INFO("[Assembly Line] - Failed to add recipe. Research: "+aResearchItem.getDisplayName()
+ * +" | Result: "+aOutput.getDisplayName());
*/ return false;
}
- public static boolean addCircuitAssemblerRecipe(
- ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput, int aDuration, int aEUt) {
+ public static boolean addCircuitAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput,
+ int aDuration, int aEUt) {
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
try {
IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
@@ -197,16 +149,16 @@ public final class AddGregtechRecipe {
boolean[] didAdd = new boolean[3];
FluidStack moltenMetal = FluidUtils.getFluidStack("molten.tin", 144);
// Tin
- didAdd[0] = (boolean)
- addRecipe.invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
+ didAdd[0] = (boolean) addRecipe
+ .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
moltenMetal = FluidUtils.getFluidStack("molten.lead", 144);
// Lead
- didAdd[1] = (boolean)
- addRecipe.invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
+ didAdd[1] = (boolean) addRecipe
+ .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
moltenMetal = FluidUtils.getFluidStack("molten.solderingalloy", 144 / 2);
// Soldering Alloy
- didAdd[2] = (boolean)
- addRecipe.invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
+ didAdd[2] = (boolean) addRecipe
+ .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
if (didAdd[0] && didAdd[1] && didAdd[2]) {
return true;
@@ -214,15 +166,12 @@ public final class AddGregtechRecipe {
return false;
}
} else {
- return (boolean)
- addRecipe.invoke(IGT_RecipeAdder, aInputs, aFluidInput, aOutput, aDuration, aEUt);
+ return (boolean) addRecipe
+ .invoke(IGT_RecipeAdder, aInputs, aFluidInput, aOutput, aDuration, aEUt);
}
}
}
- } catch (SecurityException
- | NoSuchMethodException
- | IllegalAccessException
- | IllegalArgumentException
+ } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
return false;
}
@@ -230,14 +179,8 @@ public final class AddGregtechRecipe {
return false;
}
- public static boolean addChemicalRecipeForBasicMachineOnly(
- final ItemStack p0,
- final ItemStack p1,
- final FluidStack p2,
- final FluidStack p3,
- final ItemStack p4,
- final ItemStack p5,
- final int p6,
+ public static boolean addChemicalRecipeForBasicMachineOnly(final ItemStack p0, final ItemStack p1,
+ final FluidStack p2, final FluidStack p3, final ItemStack p4, final ItemStack p5, final int p6,
final int p7) {
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
@@ -261,10 +204,7 @@ public final class AddGregtechRecipe {
return (boolean) addRecipe.invoke(IGT_RecipeAdder, p0, p1, p2, p3, p4, p5, p6, p7);
}
}
- } catch (SecurityException
- | NoSuchMethodException
- | IllegalAccessException
- | IllegalArgumentException
+ } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
}
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ProxyFinder.java b/src/main/java/gtPlusPlus/core/util/reflect/ProxyFinder.java
index 6c3be2e6df..6752153bec 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/ProxyFinder.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/ProxyFinder.java
@@ -1,8 +1,9 @@
package gtPlusPlus.core.util.reflect;
-import cpw.mods.fml.common.SidedProxy;
import java.lang.reflect.Field;
+import cpw.mods.fml.common.SidedProxy;
+
public class ProxyFinder {
public static Object getServerProxy(final Object modInstance) throws ReflectiveOperationException {
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index f770cb0e97..1c238691ac 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.util.reflect;
-import com.google.common.reflect.ClassPath;
-import com.gtnewhorizon.gtnhlib.reflect.Fields;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.data.StringUtils;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -19,9 +15,16 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+
import org.apache.commons.lang3.ArrayUtils;
-@SuppressWarnings({"unchecked", "rawtypes"})
+import com.google.common.reflect.ClassPath;
+import com.gtnewhorizon.gtnhlib.reflect.Fields;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.data.StringUtils;
+
+@SuppressWarnings({ "unchecked", "rawtypes" })
public class ReflectionUtils {
public static Map<String, Class<?>> mCachedClasses = new LinkedHashMap<>();
@@ -82,8 +85,10 @@ public class ReflectionUtils {
}
private static Fields.ClassFields.Field cacheAccessor(Field f) {
- return mCachedFieldAccessors.computeIfAbsent(f, (field) -> Fields.ofClass(field.getDeclaringClass())
- .getUntypedField(Fields.LookupType.DECLARED_IN_HIERARCHY, field.getName()));
+ return mCachedFieldAccessors.computeIfAbsent(
+ f,
+ (field) -> Fields.ofClass(field.getDeclaringClass())
+ .getUntypedField(Fields.LookupType.DECLARED_IN_HIERARCHY, field.getName()));
}
private static boolean cacheClass(Class<?> aClass) {
@@ -131,8 +136,8 @@ public class ReflectionUtils {
if (aConstructor == null) {
return false;
}
- CachedConstructor y =
- mCachedConstructors.get(aClass.getName() + "." + ArrayUtils.toString(aConstructor.getParameterTypes()));
+ CachedConstructor y = mCachedConstructors
+ .get(aClass.getName() + "." + ArrayUtils.toString(aConstructor.getParameterTypes()));
if (y == null) {
mCachedConstructors.put(
aClass.getName() + "." + ArrayUtils.toString(aConstructor.getParameterTypes()),
@@ -144,6 +149,7 @@ public class ReflectionUtils {
/**
* Returns a cached {@link Constructor} object.
+ *
* @param aClass - Class containing the Constructor.
* @param aTypes - Varags Class Types for objects constructor.
* @return - Valid, non-final, {@link Method} object, or {@link null}.
@@ -172,6 +178,7 @@ public class ReflectionUtils {
/**
* Returns a cached {@link Class} object.
+ *
* @param aClassCanonicalName - The canonical name of the underlying class.
* @return - Valid, {@link Class} object, or {@link null}.
*/
@@ -192,9 +199,10 @@ public class ReflectionUtils {
/**
* Returns a cached {@link Method} object. Wraps {@link #getMethod(Class, String, Class...)}.
- * @param aObject - Object containing the Method.
+ *
+ * @param aObject - Object containing the Method.
* @param aMethodName - Method's name in {@link String} form.
- * @param aTypes - Class Array of Types for {@link Method}'s constructor.
+ * @param aTypes - Class Array of Types for {@link Method}'s constructor.
* @return - Valid, non-final, {@link Method} object, or {@link null}.
*/
public static Method getMethod(Object aObject, String aMethodName, Class[] aTypes) {
@@ -203,9 +211,10 @@ public class ReflectionUtils {
/**
* Returns a cached {@link Method} object.
- * @param aClass - Class containing the Method.
+ *
+ * @param aClass - Class containing the Method.
* @param aMethodName - Method's name in {@link String} form.
- * @param aTypes - Varags Class Types for {@link Method}'s constructor.
+ * @param aTypes - Varags Class Types for {@link Method}'s constructor.
* @return - Valid, non-final, {@link Method} object, or {@link null}.
*/
public static Method getMethod(Class<?> aClass, String aMethodName, Class<?>... aTypes) {
@@ -242,7 +251,8 @@ public class ReflectionUtils {
/**
* Returns a cached {@link Field} object.
- * @param aClass - Class containing the Method.
+ *
+ * @param aClass - Class containing the Method.
* @param aFieldName - Field name in {@link String} form.
* @return - Valid, non-final, {@link Field} object, or {@link null}.
*/
@@ -260,8 +270,7 @@ public class ReflectionUtils {
cacheField(aClass, u);
return u;
}
- } catch (NoSuchFieldException e) {
- }
+ } catch (NoSuchFieldException e) {}
return null;
} else {
@@ -286,7 +295,8 @@ public class ReflectionUtils {
/**
* Returns a cached {@link Field} object.
- * @param aInstance - {@link Object} to get the field instance from.
+ *
+ * @param aInstance - {@link Object} to get the field instance from.
* @param aFieldName - Field name in {@link String} form.
* @return - Valid, non-final, {@link Field} object, or {@link null}.
*/
@@ -308,6 +318,7 @@ public class ReflectionUtils {
/**
* Returns the class of the objects type parameter
+ *
* @param o - Object to examine paramters on
* @return - a Class<?> or null
*/
@@ -320,15 +331,13 @@ public class ReflectionUtils {
}
public static void makeFieldAccessible(final Field field) {
- if (!Modifier.isPublic(field.getModifiers())
- || !Modifier.isPublic(field.getDeclaringClass().getModifiers())) {
+ if (!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())) {
field.setAccessible(true);
}
}
public static void makeMethodAccessible(final Method field) {
- if (!Modifier.isPublic(field.getModifiers())
- || !Modifier.isPublic(field.getDeclaringClass().getModifiers())) {
+ if (!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())) {
field.setAccessible(true);
}
}
@@ -336,6 +345,7 @@ public class ReflectionUtils {
/**
* Get the method name for a depth in call stack. <br />
* Utility function
+ *
* @param depth depth in the call stack (0 means current method, 1 means call method, ...)
* @return Method name
*/
@@ -468,8 +478,8 @@ public class ReflectionUtils {
if (objectInstance == null || methodName == null || parameters == null || values == null) {
return false;
}
- Class<?> mLocalClass =
- (objectInstance instanceof Class ? (Class<?>) objectInstance : objectInstance.getClass());
+ Class<?> mLocalClass = (objectInstance instanceof Class ? (Class<?>) objectInstance
+ : objectInstance.getClass());
Logger.REFLECTION(
"Trying to invoke " + methodName + " on an instance of " + mLocalClass.getCanonicalName() + ".");
try {
@@ -493,8 +503,7 @@ public class ReflectionUtils {
return false;
}
String methodName = method.getName();
- String classname = objectInstance != null
- ? objectInstance.getClass().getCanonicalName()
+ String classname = objectInstance != null ? objectInstance.getClass().getCanonicalName()
: method.getDeclaringClass().getCanonicalName();
Logger.REFLECTION("Trying to invoke " + methodName + " on an instance of " + classname + ".");
try {
@@ -522,8 +531,7 @@ public class ReflectionUtils {
return false;
}
String methodName = method.getName();
- String classname = objectInstance != null
- ? objectInstance.getClass().getCanonicalName()
+ String classname = objectInstance != null ? objectInstance.getClass().getCanonicalName()
: method.getDeclaringClass().getCanonicalName();
Logger.REFLECTION("Trying to invoke " + methodName + " on an instance of " + classname + ".");
try {
@@ -545,8 +553,8 @@ public class ReflectionUtils {
if (objectInstance == null || methodName == null || parameters == null || values == null) {
return false;
}
- Class<?> mLocalClass =
- (objectInstance instanceof Class ? (Class<?>) objectInstance : objectInstance.getClass());
+ Class<?> mLocalClass = (objectInstance instanceof Class ? (Class<?>) objectInstance
+ : objectInstance.getClass());
Logger.REFLECTION(
"Trying to invoke " + methodName + " on an instance of " + mLocalClass.getCanonicalName() + ".");
try {
@@ -559,10 +567,7 @@ public class ReflectionUtils {
} else {
Logger.REFLECTION(methodName + " is null.");
}
- } catch (NoSuchMethodException
- | SecurityException
- | IllegalAccessException
- | IllegalArgumentException
+ } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
Logger.REFLECTION(
"Failed to Dynamically invoke " + methodName + " on an object of type: " + mLocalClass.getName());
@@ -577,8 +582,7 @@ public class ReflectionUtils {
return false;
}
String methodName = method.getName();
- String classname = objectInstance != null
- ? objectInstance.getClass().getCanonicalName()
+ String classname = objectInstance != null ? objectInstance.getClass().getCanonicalName()
: method.getDeclaringClass().getCanonicalName();
Logger.REFLECTION("Trying to invoke " + methodName + " on an instance of " + classname + ".");
try {
@@ -595,8 +599,8 @@ public class ReflectionUtils {
if (objectInstance == null || methodName == null || parameters == null || values == null) {
return false;
}
- Class<?> mLocalClass =
- (objectInstance instanceof Class ? (Class<?>) objectInstance : objectInstance.getClass());
+ Class<?> mLocalClass = (objectInstance instanceof Class ? (Class<?>) objectInstance
+ : objectInstance.getClass());
Logger.REFLECTION(
"Trying to invoke " + methodName + " on an instance of " + mLocalClass.getCanonicalName() + ".");
try {
@@ -607,10 +611,7 @@ public class ReflectionUtils {
} else {
Logger.REFLECTION(methodName + " is null.");
}
- } catch (NoSuchMethodException
- | SecurityException
- | IllegalAccessException
- | IllegalArgumentException
+ } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
Logger.REFLECTION(
"Failed to Dynamically invoke " + methodName + " on an object of type: " + mLocalClass.getName());
@@ -625,9 +626,7 @@ public class ReflectionUtils {
*/
/*
- *
* Below Code block is used for determining generic types associated with type<E>
- *
*/
// https://xebia.com/blog/acessing-generic-types-at-runtime-in-java/
@@ -692,9 +691,8 @@ public class ReflectionUtils {
private static Class<?> browseNestedTypes(Object instance, TypeVariable<?> actualType) {
Class<?> instanceClass = instance.getClass();
List<Class<?>> nestedOuterTypes = new LinkedList<Class<?>>();
- for (Class<?> enclosingClass = instanceClass.getEnclosingClass();
- enclosingClass != null;
- enclosingClass = enclosingClass.getEnclosingClass()) {
+ for (Class<?> enclosingClass = instanceClass.getEnclosingClass(); enclosingClass
+ != null; enclosingClass = enclosingClass.getEnclosingClass()) {
try {
Field this$0 = instanceClass.getDeclaredField("this$0");
Object outerInstance = this$0.get(instance);
@@ -737,9 +735,7 @@ public class ReflectionUtils {
}
/*
- *
* End of Generics Block
- *
*/
private static Field getField_Internal(final Class<?> clazz, final String fieldName) throws NoSuchFieldException {
@@ -766,9 +762,8 @@ public class ReflectionUtils {
}
/**
- * if (isPresent("com.optionaldependency.DependencyClass")) ||
- * This block will never execute when the dependency is not present. There is
- * therefore no more risk of code throwing NoClassDefFoundException.
+ * if (isPresent("com.optionaldependency.DependencyClass")) || This block will never execute when the dependency is
+ * not present. There is therefore no more risk of code throwing NoClassDefFoundException.
*/
private static boolean isClassPresent(final String className) {
try {
@@ -781,8 +776,8 @@ public class ReflectionUtils {
}
@Deprecated
- public static Method getMethodViaReflection(
- final Class<?> lookupClass, final String methodName, final boolean invoke) throws Exception {
+ public static Method getMethodViaReflection(final Class<?> lookupClass, final String methodName,
+ final boolean invoke) throws Exception {
final Class<? extends Class> lookup = lookupClass.getClass();
final Method m = lookup.getDeclaredMethod(methodName);
m.setAccessible(true); // Abracadabra
@@ -868,8 +863,9 @@ public class ReflectionUtils {
}
private static void dumpClassInfo(Class<?> aClass) {
- Logger.INFO("We ran into an error processing reflection in " + aClass.getName()
- + ", dumping all data for debugging.");
+ Logger.INFO(
+ "We ran into an error processing reflection in " + aClass.getName()
+ + ", dumping all data for debugging.");
// Get the methods
Method[] methods = aClass.getDeclaredMethods();
Field[] fields = aClass.getDeclaredFields();
@@ -877,8 +873,8 @@ public class ReflectionUtils {
Logger.INFO("Dumping all Methods.");
for (Method method : methods) {
- System.out.println(
- method.getName() + " | " + StringUtils.getDataStringFromArray(method.getParameterTypes()));
+ System.out
+ .println(method.getName() + " | " + StringUtils.getDataStringFromArray(method.getParameterTypes()));
}
Logger.INFO("Dumping all Fields.");
for (Field f : fields) {
@@ -886,8 +882,11 @@ public class ReflectionUtils {
}
Logger.INFO("Dumping all Constructors.");
for (Constructor<?> c : consts) {
- System.out.println(c.getName() + " | " + c.getParameterCount() + " | "
- + StringUtils.getDataStringFromArray(c.getParameterTypes()));
+ System.out.println(
+ c.getName() + " | "
+ + c.getParameterCount()
+ + " | "
+ + StringUtils.getDataStringFromArray(c.getParameterTypes()));
}
}
@@ -922,9 +921,7 @@ public class ReflectionUtils {
try {
final Object o = constructor.newInstance();
return (Class<?>) o;
- } catch (InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -966,8 +963,10 @@ public class ReflectionUtils {
for (Class<?> h : y) {
Logger.REFLECTION("Found hidden inner class: " + h.getCanonicalName());
if (h.getSimpleName().toLowerCase().equals(aData[aData.length - 1].toLowerCase())) {
- Logger.REFLECTION("Found correct class. [" + aData[aData.length - 1]
- + "] Caching at correct location: " + string);
+ Logger.REFLECTION(
+ "Found correct class. [" + aData[aData.length - 1]
+ + "] Caching at correct location: "
+ + string);
Logger.REFLECTION("Found at location: " + h.getCanonicalName());
ReflectionUtils.mCachedClasses.put(string, h);
aClass = h;
@@ -1017,8 +1016,7 @@ public class ReflectionUtils {
public static <T> T getFieldValue(Field field, Object instance) {
try {
return (T) field.get(instance);
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
return null;
}
@@ -1029,9 +1027,7 @@ public class ReflectionUtils {
if (aInstance != null) {
return aInstance;
}
- } catch (InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
e.printStackTrace();
}
diff --git a/src/main/java/gtPlusPlus/core/util/sys/KeyboardUtils.java b/src/main/java/gtPlusPlus/core/util/sys/KeyboardUtils.java
index 3e26d8ff35..7b3baffc7e 100644
--- a/src/main/java/gtPlusPlus/core/util/sys/KeyboardUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/sys/KeyboardUtils.java
@@ -1,6 +1,7 @@
package gtPlusPlus.core.util.sys;
import net.minecraft.client.Minecraft;
+
import org.lwjgl.input.Keyboard;
public class KeyboardUtils {
@@ -12,8 +13,8 @@ public class KeyboardUtils {
}
// prioritize CONTROL, but allow OPTION as well on Mac (note: GuiScreen's isCtrlKeyDown only checks for the
// OPTION key on Mac)
- boolean isCtrlKeyDown =
- Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
+ boolean isCtrlKeyDown = Keyboard.isKeyDown(Keyboard.KEY_LCONTROL)
+ || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
if (!isCtrlKeyDown && Minecraft.isRunningOnMac)
isCtrlKeyDown = Keyboard.isKeyDown(Keyboard.KEY_LMETA) || Keyboard.isKeyDown(Keyboard.KEY_RMETA);
diff --git a/src/main/java/gtPlusPlus/core/util/sys/Log.java b/src/main/java/gtPlusPlus/core/util/sys/Log.java
index 026bb533c7..d9ffd5fa42 100644
--- a/src/main/java/gtPlusPlus/core/util/sys/Log.java
+++ b/src/main/java/gtPlusPlus/core/util/sys/Log.java
@@ -4,6 +4,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public final class Log {
+
public static final Logger LOGGER = LogManager.getLogger("MiscUtils");
public static void warn(final String msg) {
diff --git a/src/main/java/gtPlusPlus/core/util/sys/SystemUtils.java b/src/main/java/gtPlusPlus/core/util/sys/SystemUtils.java
index 662a3261c0..71ed513618 100644
--- a/src/main/java/gtPlusPlus/core/util/sys/SystemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/sys/SystemUtils.java
@@ -34,8 +34,7 @@ public class SystemUtils {
}
public static boolean isUnix() {
- return (getOSString().indexOf("nix") >= 0
- || getOSString().indexOf("nux") >= 0
+ return (getOSString().indexOf("nix") >= 0 || getOSString().indexOf("nux") >= 0
|| getOSString().indexOf("aix") > 0);
}
@@ -66,6 +65,7 @@ public class SystemUtils {
}
public static enum OS {
+
MAC(1),
WINDOWS(2),
UNIX(3),
diff --git a/src/main/java/gtPlusPlus/core/world/explosions/ExplosionHandler.java b/src/main/java/gtPlusPlus/core/world/explosions/ExplosionHandler.java
index 7bbc7a7edd..d44689efe6 100644
--- a/src/main/java/gtPlusPlus/core/world/explosions/ExplosionHandler.java
+++ b/src/main/java/gtPlusPlus/core/world/explosions/ExplosionHandler.java
@@ -8,30 +8,16 @@ public class ExplosionHandler {
/**
* Creates an explosion. Args: entity, x, y, z, strength
*/
- public MiningExplosion createExplosion(
- final World world,
- final Entity entityObj,
- final double x,
- final double y,
- final double z,
- final float size,
- final boolean makesFlames,
- final boolean makesSmoke) {
+ public MiningExplosion createExplosion(final World world, final Entity entityObj, final double x, final double y,
+ final double z, final float size, final boolean makesFlames, final boolean makesSmoke) {
return this.newExplosion(world, entityObj, x, y, z, size, makesFlames, makesSmoke);
}
/**
* returns a new explosion.
*/
- public MiningExplosion newExplosion(
- final World world,
- final Entity entityObj,
- final double x,
- final double y,
- final double z,
- final float size,
- final boolean makesFlames,
- final boolean makesSmoke) {
+ public MiningExplosion newExplosion(final World world, final Entity entityObj, final double x, final double y,
+ final double z, final float size, final boolean makesFlames, final boolean makesSmoke) {
final MiningExplosion explosion = new MiningExplosion(world, entityObj, x, y, z, size);
explosion.isFlaming = makesFlames;
explosion.isSmoking = makesSmoke;
diff --git a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java
index d36c75bfa3..8e825c891b 100644
--- a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java
+++ b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java
@@ -1,9 +1,7 @@
package gtPlusPlus.core.world.explosions;
-import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
-import gtPlusPlus.core.util.math.MathUtils;
import java.util.*;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.enchantment.EnchantmentProtection;
@@ -16,19 +14,19 @@ import net.minecraft.world.ChunkPosition;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.random.XSTR;
+import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
+import gtPlusPlus.core.util.math.MathUtils;
+
public class MiningExplosion extends Explosion {
+
private final int field_77289_h = 16;
private final Random explosionRNG = new XSTR();
private final World worldObj;
private final Map<Entity, Vec3> field_77288_k = new HashMap<>();
- public MiningExplosion(
- final World worldObj,
- final Entity entityObj,
- final double x,
- final double y,
- final double z,
+ public MiningExplosion(final World worldObj, final Entity entityObj, final double x, final double y, final double z,
final float size) {
super(worldObj, entityObj, x, y, z, size);
this.worldObj = worldObj;
@@ -57,8 +55,7 @@ public class MiningExplosion extends Explosion {
for (i = 0; i < this.field_77289_h; ++i) {
for (j = 0; j < this.field_77289_h; ++j) {
for (k = 0; k < this.field_77289_h; ++k) {
- if ((i == 0)
- || (i == (this.field_77289_h - 1))
+ if ((i == 0) || (i == (this.field_77289_h - 1))
|| (j == 0)
|| (j == (this.field_77289_h - 1))
|| (k == 0)
@@ -96,10 +93,8 @@ public class MiningExplosion extends Explosion {
f1 -= (f3 + 0.3F) * f2;
}
- if ((f1 > 0.0F)
- && ((this.exploder == null)
- || this.exploder.func_145774_a(
- this, this.worldObj, j1, k1, l1, block, f1))) {
+ if ((f1 > 0.0F) && ((this.exploder == null)
+ || this.exploder.func_145774_a(this, this.worldObj, j1, k1, l1, block, f1))) {
hashset.add(new ChunkPosition(j1, k1, l1));
}
@@ -120,15 +115,15 @@ public class MiningExplosion extends Explosion {
final int i2 = MathHelper.floor_double(this.explosionY + this.explosionSize + 1.0D);
final int l = MathHelper.floor_double(this.explosionZ - this.explosionSize - 1.0D);
final int j2 = MathHelper.floor_double(this.explosionZ + this.explosionSize + 1.0D);
- final List<Entity> list = this.worldObj.getEntitiesWithinAABBExcludingEntity(
- this.exploder, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2));
+ final List<Entity> list = this.worldObj
+ .getEntitiesWithinAABBExcludingEntity(this.exploder, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2));
net.minecraftforge.event.ForgeEventFactory.onExplosionDetonate(this.worldObj, this, list, this.explosionSize);
final Vec3 vec3 = Vec3.createVectorHelper(this.explosionX, this.explosionY, this.explosionZ);
for (int i1 = 0; i1 < list.size(); ++i1) {
final Entity entity = list.get(i1);
- final double d4 =
- entity.getDistance(this.explosionX, this.explosionY, this.explosionZ) / this.explosionSize;
+ final double d4 = entity.getDistance(this.explosionX, this.explosionY, this.explosionZ)
+ / this.explosionSize;
if (d4 <= 1.0D) {
d5 = entity.posX - this.explosionX;
@@ -142,8 +137,9 @@ public class MiningExplosion extends Explosion {
d7 /= d9;
final double d10 = this.worldObj.getBlockDensity(vec3, entity.boundingBox);
final double d11 = (1.0D - d4) * d10;
- entity.attackEntityFrom(DamageSource.setExplosionSource(this), ((int)
- (((((d11 * d11) + d11) / 2.0D) * 8.0D * this.explosionSize) + 1.0D)));
+ entity.attackEntityFrom(
+ DamageSource.setExplosionSource(this),
+ ((int) (((((d11 * d11) + d11) / 2.0D) * 8.0D * this.explosionSize) + 1.0D)));
final double d8 = EnchantmentProtection.func_92092_a(entity, d11);
entity.motionX += d5 * d8;
entity.motionY += d6 * d8;
@@ -174,7 +170,13 @@ public class MiningExplosion extends Explosion {
if ((this.explosionSize >= 2.0F) && this.isSmoking) {
this.worldObj.spawnParticle(
- "hugeexplosion", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D);
+ "hugeexplosion",
+ this.explosionX,
+ this.explosionY,
+ this.explosionZ,
+ 1.0D,
+ 0.0D,
+ 0.0D);
this.worldObj.spawnParticle(
"smoke",
this.explosionX + MathUtils.randDouble(0, 1),
@@ -232,8 +234,8 @@ public class MiningExplosion extends Explosion {
0.0D,
0.0D);
} else {
- this.worldObj.spawnParticle(
- "largeexplode", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D);
+ this.worldObj
+ .spawnParticle("largeexplode", this.explosionX, this.explosionY, this.explosionZ, 1.0D, 0.0D, 0.0D);
this.worldObj.spawnParticle(
"smoke",
this.explosionX + MathUtils.randDouble(0, 1),
@@ -388,7 +390,13 @@ public class MiningExplosion extends Explosion {
if (block.canDropFromExplosion(this)) {
// world, x, y, z, world.getBlockMetadata(x, y, z), dropProb, 0
block.dropBlockAsItemWithChance(
- this.worldObj, i, j, k, this.worldObj.getBlockMetadata(i, j, k), 1F, 0);
+ this.worldObj,
+ i,
+ j,
+ k,
+ this.worldObj.getBlockMetadata(i, j, k),
+ 1F,
+ 0);
}
block.onBlockExploded(this.worldObj, i, j, k, this);
@@ -407,8 +415,7 @@ public class MiningExplosion extends Explosion {
block = this.worldObj.getBlock(i, j, k);
final Block block1 = this.worldObj.getBlock(i, j - 1, k);
- if ((block.getMaterial() == Material.air)
- && block1.func_149730_j()
+ if ((block.getMaterial() == Material.air) && block1.func_149730_j()
&& (this.explosionRNG.nextInt(3) == 0)) {
this.worldObj.setBlock(i, j, k, Blocks.fire);
}
@@ -426,8 +433,7 @@ public class MiningExplosion extends Explosion {
*/
@Override
public EntityLivingBase getExplosivePlacedBy() {
- return this.exploder == null
- ? null
+ return this.exploder == null ? null
: (this.exploder instanceof EntityPrimedMiningExplosive
? ((EntityPrimedMiningExplosive) this.exploder).getTntPlacedBy()
: (this.exploder instanceof EntityLivingBase ? (EntityLivingBase) this.exploder : null));
diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java
index bc137390b6..ac3665e855 100644
--- a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java
+++ b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java
@@ -1,5 +1,12 @@
package gtPlusPlus.everglades;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.common.config.Configuration;
+
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -23,19 +30,13 @@ import gtPlusPlus.everglades.gen.gt.WorldGen_Ores;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.gregtech.HANDLER_GT;
import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.config.Configuration;
@MCVersion(value = "1.7.10")
@Mod(
modid = Everglades.MODID,
name = Everglades.NAME,
version = Everglades.VERSION,
- dependencies =
- "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; required-after:miscutils;")
+ dependencies = "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; required-after:miscutils;")
public class GTplusplus_Everglades implements ActionListener {
// Mod Instance
@@ -64,8 +65,9 @@ public class GTplusplus_Everglades implements ActionListener {
getEvergladesBiome().preInit(event);
// Load/Set Custom Ore Gen
- HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(new Configuration(
- new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
+ HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(
+ new Configuration(
+ new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
}
@EventHandler
@@ -128,14 +130,19 @@ public class GTplusplus_Everglades implements ActionListener {
// Custom Ores
if (LoadedMods.Big_Reactors) {
MaterialGenerator.generateOreMaterial(
- ELEMENT.getInstance().YELLORIUM, false, false, true, new short[] {255, 242, 10});
+ ELEMENT.getInstance().YELLORIUM,
+ false,
+ false,
+ true,
+ new short[] { 255, 242, 10 });
}
}
protected synchronized void setVars(FMLPreInitializationEvent event) {
// Init WorldGen config.
- HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(new Configuration(
- new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
+ HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(
+ new Configuration(
+ new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
if (DimensionManager.isDimensionRegistered(Dimension_Everglades.DIMID)) {
Dimension_Everglades.DIMID = DimensionManager.getNextFreeDimId();
@@ -159,33 +166,19 @@ public class GTplusplus_Everglades implements ActionListener {
getEvergladesBiome().serverLoad(event);
}
- /*@Override
- public int getBurnTime(ItemStack fuel) {
- if (DarkWorld_Biome.addFuel(fuel) != 0)
- return DarkWorld_Biome.addFuel(fuel);
- if (DarkWorld_Dimension.addFuel(fuel) != 0)
- return DarkWorld_Dimension.addFuel(fuel);
- return 0;
- }*/
-
- /*@Override
- public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) {
- chunkX = chunkX * 16;
- chunkZ = chunkZ * 16;
-
- if (world.provider.dimensionId == Dimension_DarkWorld.DIMID) {
- DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ);
- }
-
- //What does this even do?
- if (world.provider.dimensionId == -1) {
- DarkWorld_Biome.generateNether(world, random, chunkX, chunkZ);
- }
- if (world.provider.dimensionId == 0) {
- DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ);
- }
-
- }*/
+ /*
+ * @Override public int getBurnTime(ItemStack fuel) { if (DarkWorld_Biome.addFuel(fuel) != 0) return
+ * DarkWorld_Biome.addFuel(fuel); if (DarkWorld_Dimension.addFuel(fuel) != 0) return
+ * DarkWorld_Dimension.addFuel(fuel); return 0; }
+ */
+
+ /*
+ * @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator,
+ * IChunkProvider chunkProvider) { chunkX = chunkX * 16; chunkZ = chunkZ * 16; if (world.provider.dimensionId ==
+ * Dimension_DarkWorld.DIMID) { DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ); } //What does this
+ * even do? if (world.provider.dimensionId == -1) { DarkWorld_Biome.generateNether(world, random, chunkX, chunkZ); }
+ * if (world.provider.dimensionId == 0) { DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ); } }
+ */
@EventHandler
public static void postInit(final FMLPostInitializationEvent e) {
diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java
index f443a6560d..2ea16a553a 100644
--- a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java
+++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java
@@ -3,9 +3,8 @@ package gtPlusPlus.everglades.biome;
import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.*;
import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.*;
-import gtPlusPlus.everglades.gen.WorldGenDeadLilly;
-import gtPlusPlus.everglades.gen.WorldGenMinable_Custom;
import java.util.Random;
+
import net.minecraft.block.BlockFlower;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
@@ -18,6 +17,9 @@ import net.minecraftforge.event.terraingen.DecorateBiomeEvent;
import net.minecraftforge.event.terraingen.OreGenEvent;
import net.minecraftforge.event.terraingen.TerrainGen;
+import gtPlusPlus.everglades.gen.WorldGenDeadLilly;
+import gtPlusPlus.everglades.gen.WorldGenMinable_Custom;
+
public class BiomeGenerator_Custom extends BiomeDecorator {
public WorldGenerator fluoriteGen;
@@ -57,8 +59,8 @@ public class BiomeGenerator_Custom extends BiomeDecorator {
}
@Override
- public void decorateChunk(
- World p_150512_1_, Random p_150512_2_, BiomeGenBase p_150512_3_, int p_150512_4_, int p_150512_5_) {
+ public void decorateChunk(World p_150512_1_, Random p_150512_2_, BiomeGenBase p_150512_3_, int p_150512_4_,
+ int p_150512_5_) {
if (this.currentWorld != null) {
throw new RuntimeException("Already decorating!!");
} else {
@@ -85,7 +87,11 @@ public class BiomeGenerator_Custom extends BiomeDecorator {
j = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
k = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
this.sandGen.generate(
- this.currentWorld, this.randomGenerator, j, this.currentWorld.getTopSolidOrLiquidBlock(j, k), k);
+ this.currentWorld,
+ this.randomGenerator,
+ j,
+ this.currentWorld.getTopSolidOrLiquidBlock(j, k),
+ k);
}
doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, CLAY);
@@ -93,7 +99,11 @@ public class BiomeGenerator_Custom extends BiomeDecorator {
j = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
k = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
this.clayGen.generate(
- this.currentWorld, this.randomGenerator, j, this.currentWorld.getTopSolidOrLiquidBlock(j, k), k);
+ this.currentWorld,
+ this.randomGenerator,
+ j,
+ this.currentWorld.getTopSolidOrLiquidBlock(j, k),
+ k);
}
doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, SAND_PASS2);
@@ -101,7 +111,11 @@ public class BiomeGenerator_Custom extends BiomeDecorator {
j = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
k = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
this.gravelAsSandGen.generate(
- this.currentWorld, this.randomGenerator, j, this.currentWorld.getTopSolidOrLiquidBlock(j, k), k);
+ this.currentWorld,
+ this.randomGenerator,
+ j,
+ this.currentWorld.getTopSolidOrLiquidBlock(j, k),
+ k);
}
i = this.treesPerChunk;
@@ -130,8 +144,8 @@ public class BiomeGenerator_Custom extends BiomeDecorator {
for (j = 0; doGen && j < this.bigMushroomsPerChunk; ++j) {
k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
- this.bigMushroomGen.generate(
- this.currentWorld, this.randomGenerator, k, this.currentWorld.getHeightValue(k, l), l);
+ this.bigMushroomGen
+ .generate(this.currentWorld, this.randomGenerator, k, this.currentWorld.getHeightValue(k, l), l);
}
doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, FLOWERS);
@@ -170,9 +184,8 @@ public class BiomeGenerator_Custom extends BiomeDecorator {
k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
- for (i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2);
- i1 > 0 && this.currentWorld.isAirBlock(k, i1 - 1, l);
- --i1) {
+ for (i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2); i1 > 0
+ && this.currentWorld.isAirBlock(k, i1 - 1, l); --i1) {
;
}
@@ -252,8 +265,8 @@ public class BiomeGenerator_Custom extends BiomeDecorator {
for (j = 0; j < 20; ++j) {
k = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
- l = this.randomGenerator.nextInt(
- this.randomGenerator.nextInt(this.randomGenerator.nextInt(240) + 8) + 8);
+ l = this.randomGenerator
+ .nextInt(this.randomGenerator.nextInt(this.randomGenerator.nextInt(240) + 8) + 8);
i1 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
(new WorldGenLiquids(Blocks.flowing_lava)).generate(this.currentWorld, this.randomGenerator, k, l, i1);
}
@@ -282,8 +295,7 @@ public class BiomeGenerator_Custom extends BiomeDecorator {
protected void genStandardOre2(int p_76793_1_, WorldGenerator p_76793_2_, int p_76793_3_, int p_76793_4_) {
for (int l = 0; l < p_76793_1_; ++l) {
int i1 = this.chunk_X + this.randomGenerator.nextInt(16);
- int j1 = this.randomGenerator.nextInt(p_76793_4_)
- + this.randomGenerator.nextInt(p_76793_4_)
+ int j1 = this.randomGenerator.nextInt(p_76793_4_) + this.randomGenerator.nextInt(p_76793_4_)
+ (p_76793_3_ - p_76793_4_);
int k1 = this.chunk_Z + this.randomGenerator.nextInt(16);
p_76793_2_.generate(this.currentWorld, this.randomGenerator, i1, j1, k1);
diff --git a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java
index 918393bb8f..940c7b5a34 100644
--- a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java
+++ b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java
@@ -1,17 +1,8 @@
package gtPlusPlus.everglades.biome;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.entity.monster.EntitySickBlaze;
-import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import java.lang.reflect.Field;
import java.util.Random;
+
import net.minecraft.entity.monster.EntityPigZombie;
import net.minecraft.entity.passive.EntityBat;
import net.minecraft.entity.passive.EntitySquid;
@@ -21,6 +12,17 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.BiomeManager;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.entity.monster.EntitySickBlaze;
+import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+
public class Biome_Everglades {
public static BiomeGenEverglades biome = new BiomeGenEverglades();
@@ -49,6 +51,7 @@ public class Biome_Everglades {
public void preInit(FMLPreInitializationEvent event) {}
static class BiomeGenEverglades extends BiomeGenBase {
+
@SuppressWarnings("unchecked")
public BiomeGenEverglades() {
super(CORE.EVERGLADESBIOME_ID);
@@ -115,7 +118,7 @@ public class Biome_Everglades {
return 0xF67A14;
}
- @SuppressWarnings({"unchecked", "unused"})
+ @SuppressWarnings({ "unchecked", "unused" })
private boolean addToMonsterSpawnLists(Class<?> EntityClass, int a, int b, int c) {
// this.spawnableMonsterList.add(new SpawnListEntry(EntityClass, a, b, c));
this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c));
diff --git a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java
index 9a84d6cc99..93c8404bb6 100644
--- a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java
+++ b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java
@@ -6,9 +6,7 @@ import net.minecraft.world.gen.layer.IntCache;
public class GenLayerBiomes extends GenLayer {
- protected BiomeGenBase[] allowedBiomes = {
- Biome_Everglades.biome,
- };
+ protected BiomeGenBase[] allowedBiomes = { Biome_Everglades.biome, };
public GenLayerBiomes(long seed) {
super(seed);
diff --git a/src/main/java/gtPlusPlus/everglades/biome/GenLayerEverglades.java b/src/main/java/gtPlusPlus/everglades/biome/GenLayerEverglades.java
index 59b4924355..dec0ed1429 100644
--- a/src/main/java/gtPlusPlus/everglades/biome/GenLayerEverglades.java
+++ b/src/main/java/gtPlusPlus/everglades/biome/GenLayerEverglades.java
@@ -22,7 +22,7 @@ public class GenLayerEverglades extends GenLayer {
GenLayer genlayervoronoizoom = new GenLayerVoronoiZoom(10L, biomes);
biomes.initWorldGenSeed(seed);
genlayervoronoizoom.initWorldGenSeed(seed);
- return new GenLayer[] {biomes, genlayervoronoizoom};
+ return new GenLayer[] { biomes, genlayervoronoizoom };
}
@Override
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java
index 85154ef1fb..72ab766652 100644
--- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java
+++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java
@@ -1,9 +1,10 @@
package gtPlusPlus.everglades.block;
+import net.minecraft.block.BlockGrass;
+
import cpw.mods.fml.common.registry.LanguageRegistry;
import gtPlusPlus.api.interfaces.ITileTooltip;
import gtPlusPlus.core.creative.AddToCreativeTab;
-import net.minecraft.block.BlockGrass;
public class BlockDarkWorldGround extends BlockGrass implements ITileTooltip {
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java
index 043f632804..8d74fdd087 100644
--- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java
+++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java
@@ -1,13 +1,14 @@
package gtPlusPlus.everglades.block;
+import net.minecraft.block.BlockDirt;
+import net.minecraft.world.ColorizerGrass;
+import net.minecraft.world.IBlockAccess;
+
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.api.interfaces.ITileTooltip;
import gtPlusPlus.core.creative.AddToCreativeTab;
-import net.minecraft.block.BlockDirt;
-import net.minecraft.world.ColorizerGrass;
-import net.minecraft.world.IBlockAccess;
public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileTooltip {
@@ -49,8 +50,7 @@ public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileToolti
for (int k1 = -1; k1 <= 1; ++k1) {
for (int l1 = -1; l1 <= 1; ++l1) {
- int i2 = p_149720_1_
- .getBiomeGenForCoords(p_149720_2_ + l1, p_149720_4_ + k1)
+ int i2 = p_149720_1_.getBiomeGenForCoords(p_149720_2_ + l1, p_149720_4_ + k1)
.getBiomeGrassColor(p_149720_2_ + l1, p_149720_3_, p_149720_4_ + k1);
l += (i2 & 16711680) >> 16;
i1 += (i2 & 65280) >> 8;
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java
index 96f32be8a1..e9cf49b447 100644
--- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java
+++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java
@@ -1,11 +1,12 @@
package gtPlusPlus.everglades.block;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+
import cpw.mods.fml.common.registry.LanguageRegistry;
import gtPlusPlus.api.interfaces.ITileTooltip;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip {
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java
index 155319deaa..e3ee1b91df 100644
--- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java
+++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java
@@ -48,29 +48,13 @@ public class BlockDarkWorldSludgeFluid extends Fluid {
return this;
}
- /*public blockDarkWorldSludgeFluid setEmptySound(SoundEvent parSound)
- {
- emptySound = parSound;
- return this;
- }
-
- public SoundEvent getEmptySound()
- {
- return emptySound;
- }
-
- @Override
- public blockDarkWorldSludgeFluid setFillSound(SoundEvent parSound)
- {
- fillSound = parSound;
- return this;
- }
-
- @Override
- public SoundEvent getFillSound()
- {
- return fillSound;
- }*/
+ /*
+ * public blockDarkWorldSludgeFluid setEmptySound(SoundEvent parSound) { emptySound = parSound; return this; }
+ * public SoundEvent getEmptySound() { return emptySound; }
+ * @Override public blockDarkWorldSludgeFluid setFillSound(SoundEvent parSound) { fillSound = parSound; return this;
+ * }
+ * @Override public SoundEvent getFillSound() { return fillSound; }
+ */
public BlockDarkWorldSludgeFluid setMaterial(Material parMaterial) {
material = parMaterial;
@@ -81,11 +65,8 @@ public class BlockDarkWorldSludgeFluid extends Fluid {
return material;
}
- /*@Override
- public boolean doesVaporize(FluidStack fluidStack)
- {
- if (block == null)
- return false;
- return block.getDefaultState().getMaterial() == getMaterial();
- }*/
+ /*
+ * @Override public boolean doesVaporize(FluidStack fluidStack) { if (block == null) return false; return
+ * block.getDefaultState().getMaterial() == getMaterial(); }
+ */
}
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
index d4385bc701..d90027ea60 100644
--- a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
+++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java
@@ -1,15 +1,7 @@
package gtPlusPlus.everglades.block;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
-import gtPlusPlus.everglades.world.TeleporterDimensionMod;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockBreakable;
import net.minecraft.block.material.Material;
@@ -24,7 +16,18 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+import gtPlusPlus.everglades.world.TeleporterDimensionMod;
+
public class BlockEvergladesPortal extends BlockBreakable implements ITileTooltip {
+
IIcon gor = null, dol = null, st1 = null, st2 = null, st3 = null, st4 = null;
public BlockEvergladesPortal() {
@@ -82,8 +85,8 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
}
/**
- * Returns a bounding box from the pool of bounding boxes (this means
- * this box can change after the pool has been cleared to be reused)
+ * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been
+ * cleared to be reused)
*/
@Override
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) {
@@ -91,8 +94,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
}
/**
- * Updates the blocks bounds based on its current state. Args: world, x,
- * y, z
+ * Updates the blocks bounds based on its current state. Args: world, x, y, z
*/
@Override
public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) {
@@ -111,10 +113,8 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
}
/**
- * Is this block (a) opaque and (B) a full 1m cube? This determines
- * whether or not to render the shared face of two adjacent blocks and
- * also whether the player can attach torches, redstone wire, etc to
- * this block.
+ * Is this block (a) opaque and (B) a full 1m cube? This determines whether or not to render the shared face of two
+ * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
*/
@Override
public boolean isOpaqueCube() {
@@ -122,8 +122,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
}
/**
- * If this block doesn't render as an ordinary block it will return
- * False (examples: signs, buttons, stairs, etc)
+ * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
*/
@Override
public boolean renderAsNormalBlock() {
@@ -131,8 +130,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
}
/**
- * Checks to see if this location is valid to create a portal and will
- * return True if it does. Args: world, x, y, z
+ * Checks to see if this location is valid to create a portal and will return True if it does. Args: world, x, y, z
*/
public boolean tryToCreatePortal(World par1World, int par2, int par3, int par4) {
byte b0 = 0;
@@ -165,8 +163,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
}
}
/*
- * else if (j1 != 0 && j1 !=
- * Main.TutorialFire.blockID) { return false; }
+ * else if (j1 != 0 && j1 != Main.TutorialFire.blockID) { return false; }
*/
}
}
@@ -181,9 +178,8 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
}
/**
- * Lets the block know when one of its neighbor changes. Doesn't know
- * which neighbor changed (coordinates passed are their own) Args: x, y,
- * z, neighbor blockID
+ * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
+ * their own) Args: x, y, z, neighbor blockID
*/
public void onNeighborBlockChange(BlockPos pos) {
int x = pos.xPos, y = pos.yPos, z = pos.zPos;
@@ -226,7 +222,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
par1World.setBlockToAir(x, y, z);
} else {
if ((par1World.getBlock(x + b0, y, z + b1) != Dimension_Everglades.blockPortalFrame
- || par1World.getBlock(x - b0, y, z - b1) != this)
+ || par1World.getBlock(x - b0, y, z - b1) != this)
&& (par1World.getBlock(x - b0, y, z - b1) != Dimension_Everglades.blockPortalFrame
|| par1World.getBlock(x + b0, y, z + b1) != this)) {
par1World.setBlockToAir(x, y, z);
@@ -244,11 +240,11 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
super.onNeighborBlockChange(world, x, y, z, block);
}
- /*@Override
- public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) {
- onNeighborBlockChange(new BlockPos(x, y, z, world.));
- super.onNeighborChange(world, x, y, z, tileX, tileY, tileZ);
- }*/
+ /*
+ * @Override public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ)
+ * { onNeighborBlockChange(new BlockPos(x, y, z, world.)); super.onNeighborChange(world, x, y, z, tileX, tileY,
+ * tileZ); }
+ */
@Override
@SideOnly(Side.CLIENT)
@@ -270,8 +266,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
&& par1IBlockAccess.getBlock(par2, par3, par4 + 2) != this;
boolean flag4 = flag || flag1;
boolean flag5 = flag2 || flag3;
- return flag4 && par5 == 4
- ? true
+ return flag4 && par5 == 4 ? true
: (flag4 && par5 == 5 ? true : (flag5 && par5 == 2 ? true : flag5 && par5 == 3));
}
}
@@ -285,36 +280,28 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti
}
/**
- * Triggered whenever an entity collides with this block (enters into
- * the block). Args: world, x, y, z, entity
+ * Triggered whenever an entity collides with this block (enters into the block). Args: world, x, y, z, entity
*/
@Override
public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) {
- if ((par5Entity.ridingEntity == null)
- && (par5Entity.riddenByEntity == null)
+ if ((par5Entity.ridingEntity == null) && (par5Entity.riddenByEntity == null)
&& ((par5Entity instanceof EntityPlayerMP))) {
EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity;
if (thePlayer.timeUntilPortal > 0) {
thePlayer.timeUntilPortal = 100;
} else if (thePlayer.dimension != Dimension_Everglades.DIMID) {
thePlayer.timeUntilPortal = 100;
- thePlayer
- .mcServer
- .getConfigurationManager()
- .transferPlayerToDimension(
- thePlayer,
- Dimension_Everglades.DIMID,
- new TeleporterDimensionMod(
- thePlayer.mcServer.worldServerForDimension(Dimension_Everglades.DIMID)));
+ thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(
+ thePlayer,
+ Dimension_Everglades.DIMID,
+ new TeleporterDimensionMod(
+ thePlayer.mcServer.worldServerForDimension(Dimension_Everglades.DIMID)));
} else {
thePlayer.timeUntilPortal = 100;
- thePlayer
- .mcServer
- .getConfigurationManager()
- .transferPlayerToDimension(
- thePlayer,
- 0,
- new TeleporterDimensionMod(thePlayer.mcServer.worldServerForDimension(0)));
+ thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(
+ thePlayer,
+ 0,
+ new TeleporterDimensionMod(thePlayer.mcServer.worldServerForDimension(0)));
}
}
}
diff --git a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java
index 86c7053dfc..66e03d8a77 100644
--- a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java
+++ b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java
@@ -2,13 +2,14 @@ package gtPlusPlus.everglades.block;
import static gtPlusPlus.everglades.dimension.Dimension_Everglades.*;
+import net.minecraft.init.Blocks;
+import net.minecraftforge.fluids.FluidRegistry;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gtPlusPlus.core.block.base.BlockBaseFluid;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.everglades.item.ItemBlockToxicEverglades;
import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger;
-import net.minecraft.init.Blocks;
-import net.minecraftforge.fluids.FluidRegistry;
public class DarkWorldContentLoader {
@@ -25,19 +26,15 @@ public class DarkWorldContentLoader {
// Fluids
SLUDGE = (BlockDarkWorldSludgeFluid) new BlockDarkWorldSludgeFluid("sludge", Utils.rgbtoHexValue(30, 130, 30))
- .setDensity(1800)
- .setGaseous(false)
- .setLuminosity(2)
- .setViscosity(25000)
- .setTemperature(300);
+ .setDensity(1800).setGaseous(false).setLuminosity(2).setViscosity(25000).setTemperature(300);
FluidRegistry.registerFluid(SLUDGE);
return true;
}
public static synchronized boolean initItems() {
- portalItem = (ItemEvergladesPortalTrigger)
- (new ItemEvergladesPortalTrigger().setUnlocalizedName("everglades.trigger"));
+ portalItem = (ItemEvergladesPortalTrigger) (new ItemEvergladesPortalTrigger()
+ .setUnlocalizedName("everglades.trigger"));
GameRegistry.registerItem(portalItem, "everglades.trigger");
return true;
}
@@ -45,10 +42,8 @@ public class DarkWorldContentLoader {
public static synchronized boolean initBlocks() {
// Create Block Instances
- blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, BlockDarkWorldSludgeFluid.SLUDGE)
- .setLightLevel(2f)
- .setLightOpacity(1)
- .setBlockName("fluidSludge");
+ blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, BlockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f)
+ .setLightOpacity(1).setBlockName("fluidSludge");
portalBlock = new BlockEvergladesPortal();
blockTopLayer = new BlockDarkWorldGround();
blockSecondLayer = new BlockDarkWorldPollutedDirt();
diff --git a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
index 0ff265a4ae..f9dcba5df4 100644
--- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
+++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
@@ -18,493 +18,536 @@ import net.minecraft.world.gen.feature.WorldGenLakes;
import net.minecraft.world.gen.structure.MapGenMineshaft;
import net.minecraft.world.gen.structure.MapGenScatteredFeature;
import net.minecraft.world.gen.structure.MapGenVillage;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.terraingen.ChunkProviderEvent;
import net.minecraftforge.event.terraingen.PopulateChunkEvent;
import net.minecraftforge.event.terraingen.TerrainGen;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+
public class ChunkProviderModded implements IChunkProvider {
- private Random rand;
- private NoiseGeneratorOctaves field_147431_j;
- private NoiseGeneratorOctaves field_147432_k;
- private NoiseGeneratorOctaves field_147429_l;
- private NoiseGeneratorPerlin field_147430_m;
- /**
- * A NoiseGeneratorOctaves used in generating terrain
- */
- public NoiseGeneratorOctaves noiseGen5;
- /**
- * A NoiseGeneratorOctaves used in generating terrain
- */
- public NoiseGeneratorOctaves noiseGen6;
- public NoiseGeneratorOctaves mobSpawnerNoise;
- /**
- * Reference to the World object.
- */
- private World worldObj;
- private WorldType field_147435_p;
- private final double[] field_147434_q;
- private final float[] parabolicField;
- private double[] stoneNoise = new double[256];
- private MapGenBase caveGenerator = new MapGenCaves();
- /**
- * Holds Stronghold Generator
- */
- // private MapGenStronghold strongholdGenerator = new
- // MapGenStronghold();
- /**
- * Holds Village Generator
- */
- private MapGenVillage villageGenerator = new MapGenVillage();
- /**
- * Holds Mineshaft Generator
- */
- private MapGenMineshaft mineshaftGenerator = new MapGenMineshaft();
- private MapGenScatteredFeature scatteredFeatureGenerator = new MapGenScatteredFeature();
- /**
- * Holds ravine generator
- */
- private MapGenBase ravineGenerator = new MapGenRavine();
- /**
- * The biomes that are used to generate the chunk
- */
- private BiomeGenBase[] biomesForGeneration;
- double[] field_147427_d;
- double[] field_147428_e;
- double[] field_147425_f;
- double[] field_147426_g;
- int[][] field_73219_j = new int[32][32];
- {
- caveGenerator = TerrainGen.getModdedMapGen(caveGenerator,
- net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.CAVE);
- /*
- * strongholdGenerator = (MapGenStronghold)
- * TerrainGen.getModdedMapGen(strongholdGenerator,
- * net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.
- * STRONGHOLD);
- */
- villageGenerator = (MapGenVillage) TerrainGen.getModdedMapGen(villageGenerator,
- net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.VILLAGE);
- mineshaftGenerator = (MapGenMineshaft) TerrainGen.getModdedMapGen(mineshaftGenerator,
- net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.MINESHAFT);
- scatteredFeatureGenerator = (MapGenScatteredFeature) TerrainGen.getModdedMapGen(scatteredFeatureGenerator,
- net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.SCATTERED_FEATURE);
- ravineGenerator = TerrainGen.getModdedMapGen(ravineGenerator,
- net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.RAVINE);
- }
-
- public ChunkProviderModded(World par1World, long par2) {
- this.worldObj = par1World;
- this.field_147435_p = par1World.getWorldInfo().getTerrainType();
- this.rand = new Random(par2);
- this.field_147431_j = new NoiseGeneratorOctaves(this.rand, 16);
- this.field_147432_k = new NoiseGeneratorOctaves(this.rand, 16);
- this.field_147429_l = new NoiseGeneratorOctaves(this.rand, 8);
- this.field_147430_m = new NoiseGeneratorPerlin(this.rand, 4);
- this.noiseGen5 = new NoiseGeneratorOctaves(this.rand, 10);
- this.noiseGen6 = new NoiseGeneratorOctaves(this.rand, 16);
- this.mobSpawnerNoise = new NoiseGeneratorOctaves(this.rand, 8);
- this.field_147434_q = new double[825];
- this.parabolicField = new float[25];
-
- for (int j = -2; j <= 2; ++j) {
- for (int k = -2; k <= 2; ++k) {
- float f = 10.0F / MathHelper.sqrt_float(j * j + k * k + 0.2F);
- this.parabolicField[j + 2 + (k + 2) * 5] = f;
- }
- }
-
- NoiseGenerator[] noiseGens = { field_147431_j, field_147432_k, field_147429_l, field_147430_m, noiseGen5,
- noiseGen6, mobSpawnerNoise };
- noiseGens = TerrainGen.getModdedNoiseGenerators(par1World, this.rand, noiseGens);
- this.field_147431_j = (NoiseGeneratorOctaves) noiseGens[0];
- this.field_147432_k = (NoiseGeneratorOctaves) noiseGens[1];
- this.field_147429_l = (NoiseGeneratorOctaves) noiseGens[2];
- this.field_147430_m = (NoiseGeneratorPerlin) noiseGens[3];
- this.noiseGen5 = (NoiseGeneratorOctaves) noiseGens[4];
- this.noiseGen6 = (NoiseGeneratorOctaves) noiseGens[5];
- this.mobSpawnerNoise = (NoiseGeneratorOctaves) noiseGens[6];
- }
-
- public void func_147424_a(int p_147424_1_, int p_147424_2_, Block[] p_147424_3_) {
- byte b0 = 63;
- this.biomesForGeneration = this.worldObj.getWorldChunkManager()
- .getBiomesForGeneration(this.biomesForGeneration, p_147424_1_ * 4 - 2, p_147424_2_ * 4 - 2, 10, 10);
- this.func_147423_a(p_147424_1_ * 4, 0, p_147424_2_ * 4);
-
- for (int k = 0; k < 4; ++k) {
- int l = k * 5;
- int i1 = (k + 1) * 5;
-
- for (int j1 = 0; j1 < 4; ++j1) {
- int k1 = (l + j1) * 33;
- int l1 = (l + j1 + 1) * 33;
- int i2 = (i1 + j1) * 33;
- int j2 = (i1 + j1 + 1) * 33;
-
- for (int k2 = 0; k2 < 32; ++k2) {
- double d0 = 0.125D;
- double d1 = this.field_147434_q[k1 + k2];
- double d2 = this.field_147434_q[l1 + k2];
- double d3 = this.field_147434_q[i2 + k2];
- double d4 = this.field_147434_q[j2 + k2];
- double d5 = (this.field_147434_q[k1 + k2 + 1] - d1) * d0;
- double d6 = (this.field_147434_q[l1 + k2 + 1] - d2) * d0;
- double d7 = (this.field_147434_q[i2 + k2 + 1] - d3) * d0;
- double d8 = (this.field_147434_q[j2 + k2 + 1] - d4) * d0;
-
- for (int l2 = 0; l2 < 8; ++l2) {
- double d9 = 0.25D;
- double d10 = d1;
- double d11 = d2;
- double d12 = (d3 - d1) * d9;
- double d13 = (d4 - d2) * d9;
-
- for (int i3 = 0; i3 < 4; ++i3) {
- int j3 = i3 + k * 4 << 12 | 0 + j1 * 4 << 8 | k2 * 8 + l2;
- short short1 = 256; //TODO - wots dis do
- j3 -= short1;
- double d14 = 0.25D;
- double d16 = (d11 - d10) * d14;
- double d15 = d10 - d16;
-
- for (int k3 = 0; k3 < 4; ++k3) {
- if ((d15 += d16) > 0.0D) {
- p_147424_3_[j3 += short1] = Dimension_Everglades.blockMainFiller;
- }
- else if (k2 * 8 + l2 < b0) {
- try {
- p_147424_3_[j3 += short1] = Dimension_Everglades.blockFluidLakes; //River Fluid .
- }
- catch (Throwable t){
- p_147424_3_[j3 += short1] = Blocks.water; //River Fluid Fallback
- }
- }
- else {
- p_147424_3_[j3 += short1] = null;
- }
- }
-
- d10 += d12;
- d11 += d13;
- }
-
- d1 += d5;
- d2 += d6;
- d3 += d7;
- d4 += d8;
- }
- }
- }
- }
- }
-
- public void replaceBlocksForBiome(int p_147422_1_, int p_147422_2_, Block[] p_147422_3_, byte[] p_147422_4_, BiomeGenBase[] p_147422_5_) {
- @SuppressWarnings("deprecation")
- ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(this, p_147422_1_,
- p_147422_2_, p_147422_3_, p_147422_5_);
- MinecraftForge.EVENT_BUS.post(event);
- if (event.getResult() == cpw.mods.fml.common.eventhandler.Event.Result.DENY)
- return;
-
- double d0 = 0.03125D;
- this.stoneNoise = this.field_147430_m.func_151599_a(this.stoneNoise, p_147422_1_ * 16, p_147422_2_ * 16, 16,
- 16, d0 * 2.0D, d0 * 2.0D, 1.0D);
-
- for (int k = 0; k < 16; ++k) {
- for (int l = 0; l < 16; ++l) {
- BiomeGenBase biomegenbase = p_147422_5_[l + k * 16];
- biomegenbase.genTerrainBlocks(this.worldObj, this.rand, p_147422_3_, p_147422_4_,
- p_147422_1_ * 16 + k, p_147422_2_ * 16 + l, this.stoneNoise[l + k * 16]);
- }
- }
- }
-
- /**
- * loads or generates the chunk at the chunk location specified
- */
- @Override
- public Chunk loadChunk(int par1, int par2) {
- return this.provideChunk(par1, par2);
- }
-
- /**
- * Will return back a chunk, if it doesn't exist and its not a MP client
- * it will generates all the blocks for the specified chunk from the map
- * seed and chunk seed
- */
- @Override
- public Chunk provideChunk(int par1, int par2) {
- this.rand.setSeed(par1 * 341873128712L + par2 * 132897987541L);
- Block[] ablock = new Block[65536];
- byte[] abyte = new byte[65536];
- this.func_147424_a(par1, par2, ablock);
- this.biomesForGeneration = this.worldObj.getWorldChunkManager()
- .loadBlockGeneratorData(this.biomesForGeneration, par1 * 16, par2 * 16, 16, 16);
- this.replaceBlocksForBiome(par1, par2, ablock, abyte, this.biomesForGeneration);
-
- Chunk chunk = new Chunk(this.worldObj, ablock, abyte, par1, par2);
- byte[] abyte1 = chunk.getBiomeArray();
-
- for (int k = 0; k < abyte1.length; ++k) {
- abyte1[k] = (byte) this.biomesForGeneration[k].biomeID;
- }
-
- chunk.generateSkylightMap();
- return chunk;
- }
-
- private void func_147423_a(int p_147423_1_, int p_147423_2_, int p_147423_3_) {
- this.field_147426_g = this.noiseGen6.generateNoiseOctaves(this.field_147426_g, p_147423_1_, p_147423_3_, 5,
- 5, 200.0D, 200.0D, 0.5D);
- this.field_147427_d = this.field_147429_l.generateNoiseOctaves(this.field_147427_d, p_147423_1_,
- p_147423_2_, p_147423_3_, 5, 33, 5, 8.555150000000001D, 4.277575000000001D, 8.555150000000001D);
- this.field_147428_e = this.field_147431_j.generateNoiseOctaves(this.field_147428_e, p_147423_1_,
- p_147423_2_, p_147423_3_, 5, 33, 5, 684.412D, 684.412D, 684.412D);
- this.field_147425_f = this.field_147432_k.generateNoiseOctaves(this.field_147425_f, p_147423_1_,
- p_147423_2_, p_147423_3_, 5, 33, 5, 684.412D, 684.412D, 684.412D);
- int l = 0;
- int i1 = 0;
- for (int j1 = 0; j1 < 5; ++j1) {
- for (int k1 = 0; k1 < 5; ++k1) {
- float f = 0.0F;
- float f1 = 0.0F;
- float f2 = 0.0F;
- byte b0 = 2;
- BiomeGenBase biomegenbase = this.biomesForGeneration[j1 + 2 + (k1 + 2) * 10];
-
- for (int l1 = -b0; l1 <= b0; ++l1) {
- for (int i2 = -b0; i2 <= b0; ++i2) {
- BiomeGenBase biomegenbase1 = this.biomesForGeneration[j1 + l1 + 2 + (k1 + i2 + 2) * 10];
- float f3 = biomegenbase1.rootHeight;
- float f4 = biomegenbase1.heightVariation;
-
- if (this.field_147435_p == WorldType.AMPLIFIED && f3 > 0.0F) {
- f3 = 1.0F + f3 * 2.0F;
- f4 = 1.0F + f4 * 4.0F;
- }
-
- float f5 = this.parabolicField[l1 + 2 + (i2 + 2) * 5] / (f3 + 2.0F);
-
- if (biomegenbase1.rootHeight > biomegenbase.rootHeight) {
- f5 /= 2.0F;
- }
-
- f += f4 * f5;
- f1 += f3 * f5;
- f2 += f5;
- }
- }
-
- f /= f2;
- f1 /= f2;
- f = f * 0.9F + 0.1F;
- f1 = (f1 * 4.0F - 1.0F) / 8.0F;
- double d13 = this.field_147426_g[i1] / 8000.0D;
-
- if (d13 < 0.0D) {
- d13 = -d13 * 0.3D;
- }
-
- d13 = d13 * 3.0D - 2.0D;
-
- if (d13 < 0.0D) {
- d13 /= 2.0D;
-
- if (d13 < -1.0D) {
- d13 = -1.0D;
- }
-
- d13 /= 1.4D;
- d13 /= 2.0D;
- }
- else {
- if (d13 > 1.0D) {
- d13 = 1.0D;
- }
-
- d13 /= 8.0D;
- }
-
- ++i1;
- double d12 = f1;
- double d14 = f;
- d12 += d13 * 0.2D;
- d12 = d12 * 8.5D / 8.0D;
- double d5 = 8.5D + d12 * 4.0D;
-
- for (int j2 = 0; j2 < 33; ++j2) {
- double d6 = (j2 - d5) * 12.0D * 128.0D / 256.0D / d14;
-
- if (d6 < 0.0D) {
- d6 *= 4.0D;
- }
-
- double d7 = this.field_147428_e[l] / 512.0D;
- double d8 = this.field_147425_f[l] / 512.0D;
- double d9 = (this.field_147427_d[l] / 10.0D + 1.0D) / 2.0D;
- double d10 = MathHelper.denormalizeClamp(d7, d8, d9) - d6;
-
- if (j2 > 29) {
- double d11 = (j2 - 29) / 3.0F;
- d10 = d10 * (1.0D - d11) + -10.0D * d11;
- }
-
- this.field_147434_q[l] = d10;
- ++l;
- }
- }
- }
- }
-
- /**
- * Checks to see if a chunk exists at x, y
- */
- @Override
- public boolean chunkExists(int par1, int par2) {
- return true;
- }
-
- /**
- * Populates chunk with ores etc etc
- */
- @Override
- public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) {
- BlockFalling.fallInstantly = false;
- int k = par2 * 16;
- int l = par3 * 16;
- BiomeGenBase biomegenbase = this.worldObj.getBiomeGenForCoords(k + 16, l + 16);
- this.rand.setSeed(this.worldObj.getSeed());
- long i1 = this.rand.nextLong() / 2L * 2L + 1L;
- long j1 = this.rand.nextLong() / 2L * 2L + 1L;
- this.rand.setSeed(par2 * i1 + par3 * j1 ^ this.worldObj.getSeed());
- boolean flag = false;
-
- MinecraftForge.EVENT_BUS
- .post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, rand, par2, par3, flag));
-
- int k1;
- int l1;
- int i2;
-
- if (biomegenbase != BiomeGenBase.desert && biomegenbase != BiomeGenBase.desertHills && !flag
- && this.rand.nextInt(4) == 0 && TerrainGen.populate(par1IChunkProvider, worldObj, rand, par2, par3,
- flag, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAKE)) {
- k1 = k + this.rand.nextInt(16) + 8;
- l1 = this.rand.nextInt(256);
- i2 = l + this.rand.nextInt(16) + 8;
- try {
- (new WorldGenLakes(Dimension_Everglades.blockFluidLakes)).generate(this.worldObj, this.rand, k1, l1, i2);
- } catch (NullPointerException n){
- n.getStackTrace();
- (new WorldGenLakes(Blocks.lava)).generate(this.worldObj, this.rand, k1, l1, i2);
- Logger.INFO("Error while generating DarkWorld Lake.");
- }
- }
-
- if (TerrainGen.populate(par1IChunkProvider, worldObj, rand, par2, par3, flag,
- net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAVA) && !flag
- && this.rand.nextInt(8) == 0) {
- k1 = k + this.rand.nextInt(16) + 8;
- l1 = this.rand.nextInt(this.rand.nextInt(248) + 8);
- i2 = l + this.rand.nextInt(16) + 8;
-
- if (l1 < 63 || this.rand.nextInt(10) == 0) { //Changes 63 -> 128
- try{
- (new WorldGenLakes(Blocks.lava)).generate(this.worldObj, this.rand, k1, l1, i2);
- } catch (NullPointerException n){
- Logger.INFO("Error while generating DarkWorld Lake. [2]");
- }
- }
- }
- biomegenbase.decorate(this.worldObj, this.rand, k, l);
- SpawnerAnimals.performWorldGenSpawning(this.worldObj, biomegenbase, k + 8, l + 8, 16, 16, this.rand);
- k += 8;
- l += 8;
-
- MinecraftForge.EVENT_BUS
- .post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, par2, par3, flag));
-
- BlockFalling.fallInstantly = false;
- }
-
- /**
- * Two modes of operation: if passed true, save all Chunks in one go. If
- * passed false, save up to two chunks. Return true if all chunks have
- * been saved.
- */
- @Override
- public boolean saveChunks(boolean par1, IProgressUpdate par2IProgressUpdate) {
- return true;
- }
-
- /**
- * Save extra data not associated with any Chunk. Not saved during
- * autosave, only during world unload. Currently unimplemented.
- */
- @Override
- public void saveExtraData() {
- }
-
- /**
- * Unloads chunks that are marked to be unloaded. This is not guaranteed
- * to unload every such chunk.
- */
- @Override
- public boolean unloadQueuedChunks() {
- return false;
- }
-
- /**
- * Returns if the IChunkProvider supports saving.
- */
- @Override
- public boolean canSave() {
- return true;
- }
-
- /**
- * Converts the instance data to a readable string.
- */
- @Override
- public String makeString() {
- return "RandomLevelSource";
- }
-
- /**
- * Returns a list of creatures of the specified type that can spawn at
- * the given location.
- */
- @SuppressWarnings("rawtypes")
- @Override
- public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int par2, int par3, int par4) {
- BiomeGenBase biomegenbase = this.worldObj.getBiomeGenForCoords(par2, par4);
- return par1EnumCreatureType == EnumCreatureType.monster
- && this.scatteredFeatureGenerator.func_143030_a(par2, par3, par4)
- ? this.scatteredFeatureGenerator.getScatteredFeatureSpawnList()
- : biomegenbase.getSpawnableList(par1EnumCreatureType);
- }
-
- @Override
- public ChunkPosition func_147416_a(World p_147416_1_, String p_147416_2_, int p_147416_3_, int p_147416_4_, int p_147416_5_) {
- return
- "Village".equals(p_147416_2_) &&
- this.villageGenerator != null ?
- this.villageGenerator.func_151545_a(p_147416_1_,
- p_147416_3_, p_147416_4_, p_147416_5_) :
- null;
- }
-
- @Override
- public int getLoadedChunkCount() {
- return 0;
- }
-
- @Override
- public void recreateStructures(int par1, int par2) {
-
- }
-} \ No newline at end of file
+
+ private Random rand;
+ private NoiseGeneratorOctaves field_147431_j;
+ private NoiseGeneratorOctaves field_147432_k;
+ private NoiseGeneratorOctaves field_147429_l;
+ private NoiseGeneratorPerlin field_147430_m;
+ /**
+ * A NoiseGeneratorOctaves used in generating terrain
+ */
+ public NoiseGeneratorOctaves noiseGen5;
+ /**
+ * A NoiseGeneratorOctaves used in generating terrain
+ */
+ public NoiseGeneratorOctaves noiseGen6;
+ public NoiseGeneratorOctaves mobSpawnerNoise;
+ /**
+ * Reference to the World object.
+ */
+ private World worldObj;
+ private WorldType field_147435_p;
+ private final double[] field_147434_q;
+ private final float[] parabolicField;
+ private double[] stoneNoise = new double[256];
+ private MapGenBase caveGenerator = new MapGenCaves();
+ /**
+ * Holds Stronghold Generator
+ */
+ // private MapGenStronghold strongholdGenerator = new
+ // MapGenStronghold();
+ /**
+ * Holds Village Generator
+ */
+ private MapGenVillage villageGenerator = new MapGenVillage();
+ /**
+ * Holds Mineshaft Generator
+ */
+ private MapGenMineshaft mineshaftGenerator = new MapGenMineshaft();
+ private MapGenScatteredFeature scatteredFeatureGenerator = new MapGenScatteredFeature();
+ /**
+ * Holds ravine generator
+ */
+ private MapGenBase ravineGenerator = new MapGenRavine();
+ /**
+ * The biomes that are used to generate the chunk
+ */
+ private BiomeGenBase[] biomesForGeneration;
+ double[] field_147427_d;
+ double[] field_147428_e;
+ double[] field_147425_f;
+ double[] field_147426_g;
+ int[][] field_73219_j = new int[32][32];
+ {
+ caveGenerator = TerrainGen
+ .getModdedMapGen(caveGenerator, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.CAVE);
+ /*
+ * strongholdGenerator = (MapGenStronghold) TerrainGen.getModdedMapGen(strongholdGenerator,
+ * net.minecraftforge.event.terraingen.InitMapGenEvent.EventType. STRONGHOLD);
+ */
+ villageGenerator = (MapGenVillage) TerrainGen.getModdedMapGen(
+ villageGenerator,
+ net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.VILLAGE);
+ mineshaftGenerator = (MapGenMineshaft) TerrainGen.getModdedMapGen(
+ mineshaftGenerator,
+ net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.MINESHAFT);
+ scatteredFeatureGenerator = (MapGenScatteredFeature) TerrainGen.getModdedMapGen(
+ scatteredFeatureGenerator,
+ net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.SCATTERED_FEATURE);
+ ravineGenerator = TerrainGen
+ .getModdedMapGen(ravineGenerator, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.RAVINE);
+ }
+
+ public ChunkProviderModded(World par1World, long par2) {
+ this.worldObj = par1World;
+ this.field_147435_p = par1World.getWorldInfo().getTerrainType();
+ this.rand = new Random(par2);
+ this.field_147431_j = new NoiseGeneratorOctaves(this.rand, 16);
+ this.field_147432_k = new NoiseGeneratorOctaves(this.rand, 16);
+ this.field_147429_l = new NoiseGeneratorOctaves(this.rand, 8);
+ this.field_147430_m = new NoiseGeneratorPerlin(this.rand, 4);
+ this.noiseGen5 = new NoiseGeneratorOctaves(this.rand, 10);
+ this.noiseGen6 = new NoiseGeneratorOctaves(this.rand, 16);
+ this.mobSpawnerNoise = new NoiseGeneratorOctaves(this.rand, 8);
+ this.field_147434_q = new double[825];
+ this.parabolicField = new float[25];
+
+ for (int j = -2; j <= 2; ++j) {
+ for (int k = -2; k <= 2; ++k) {
+ float f = 10.0F / MathHelper.sqrt_float(j * j + k * k + 0.2F);
+ this.parabolicField[j + 2 + (k + 2) * 5] = f;
+ }
+ }
+
+ NoiseGenerator[] noiseGens = { field_147431_j, field_147432_k, field_147429_l, field_147430_m, noiseGen5,
+ noiseGen6, mobSpawnerNoise };
+ noiseGens = TerrainGen.getModdedNoiseGenerators(par1World, this.rand, noiseGens);
+ this.field_147431_j = (NoiseGeneratorOctaves) noiseGens[0];
+ this.field_147432_k = (NoiseGeneratorOctaves) noiseGens[1];
+ this.field_147429_l = (NoiseGeneratorOctaves) noiseGens[2];
+ this.field_147430_m = (NoiseGeneratorPerlin) noiseGens[3];
+ this.noiseGen5 = (NoiseGeneratorOctaves) noiseGens[4];
+ this.noiseGen6 = (NoiseGeneratorOctaves) noiseGens[5];
+ this.mobSpawnerNoise = (NoiseGeneratorOctaves) noiseGens[6];
+ }
+
+ public void func_147424_a(int p_147424_1_, int p_147424_2_, Block[] p_147424_3_) {
+ byte b0 = 63;
+ this.biomesForGeneration = this.worldObj.getWorldChunkManager()
+ .getBiomesForGeneration(this.biomesForGeneration, p_147424_1_ * 4 - 2, p_147424_2_ * 4 - 2, 10, 10);
+ this.func_147423_a(p_147424_1_ * 4, 0, p_147424_2_ * 4);
+
+ for (int k = 0; k < 4; ++k) {
+ int l = k * 5;
+ int i1 = (k + 1) * 5;
+
+ for (int j1 = 0; j1 < 4; ++j1) {
+ int k1 = (l + j1) * 33;
+ int l1 = (l + j1 + 1) * 33;
+ int i2 = (i1 + j1) * 33;
+ int j2 = (i1 + j1 + 1) * 33;
+
+ for (int k2 = 0; k2 < 32; ++k2) {
+ double d0 = 0.125D;
+ double d1 = this.field_147434_q[k1 + k2];
+ double d2 = this.field_147434_q[l1 + k2];
+ double d3 = this.field_147434_q[i2 + k2];
+ double d4 = this.field_147434_q[j2 + k2];
+ double d5 = (this.field_147434_q[k1 + k2 + 1] - d1) * d0;
+ double d6 = (this.field_147434_q[l1 + k2 + 1] - d2) * d0;
+ double d7 = (this.field_147434_q[i2 + k2 + 1] - d3) * d0;
+ double d8 = (this.field_147434_q[j2 + k2 + 1] - d4) * d0;
+
+ for (int l2 = 0; l2 < 8; ++l2) {
+ double d9 = 0.25D;
+ double d10 = d1;
+ double d11 = d2;
+ double d12 = (d3 - d1) * d9;
+ double d13 = (d4 - d2) * d9;
+
+ for (int i3 = 0; i3 < 4; ++i3) {
+ int j3 = i3 + k * 4 << 12 | 0 + j1 * 4 << 8 | k2 * 8 + l2;
+ short short1 = 256; // TODO - wots dis do
+ j3 -= short1;
+ double d14 = 0.25D;
+ double d16 = (d11 - d10) * d14;
+ double d15 = d10 - d16;
+
+ for (int k3 = 0; k3 < 4; ++k3) {
+ if ((d15 += d16) > 0.0D) {
+ p_147424_3_[j3 += short1] = Dimension_Everglades.blockMainFiller;
+ } else if (k2 * 8 + l2 < b0) {
+ try {
+ p_147424_3_[j3 += short1] = Dimension_Everglades.blockFluidLakes; // River Fluid
+ // .
+ } catch (Throwable t) {
+ p_147424_3_[j3 += short1] = Blocks.water; // River Fluid Fallback
+ }
+ } else {
+ p_147424_3_[j3 += short1] = null;
+ }
+ }
+
+ d10 += d12;
+ d11 += d13;
+ }
+
+ d1 += d5;
+ d2 += d6;
+ d3 += d7;
+ d4 += d8;
+ }
+ }
+ }
+ }
+ }
+
+ public void replaceBlocksForBiome(int p_147422_1_, int p_147422_2_, Block[] p_147422_3_, byte[] p_147422_4_,
+ BiomeGenBase[] p_147422_5_) {
+ @SuppressWarnings("deprecation")
+ ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(
+ this,
+ p_147422_1_,
+ p_147422_2_,
+ p_147422_3_,
+ p_147422_5_);
+ MinecraftForge.EVENT_BUS.post(event);
+ if (event.getResult() == cpw.mods.fml.common.eventhandler.Event.Result.DENY) return;
+
+ double d0 = 0.03125D;
+ this.stoneNoise = this.field_147430_m
+ .func_151599_a(this.stoneNoise, p_147422_1_ * 16, p_147422_2_ * 16, 16, 16, d0 * 2.0D, d0 * 2.0D, 1.0D);
+
+ for (int k = 0; k < 16; ++k) {
+ for (int l = 0; l < 16; ++l) {
+ BiomeGenBase biomegenbase = p_147422_5_[l + k * 16];
+ biomegenbase.genTerrainBlocks(
+ this.worldObj,
+ this.rand,
+ p_147422_3_,
+ p_147422_4_,
+ p_147422_1_ * 16 + k,
+ p_147422_2_ * 16 + l,
+ this.stoneNoise[l + k * 16]);
+ }
+ }
+ }
+
+ /**
+ * loads or generates the chunk at the chunk location specified
+ */
+ @Override
+ public Chunk loadChunk(int par1, int par2) {
+ return this.provideChunk(par1, par2);
+ }
+
+ /**
+ * Will return back a chunk, if it doesn't exist and its not a MP client it will generates all the blocks for the
+ * specified chunk from the map seed and chunk seed
+ */
+ @Override
+ public Chunk provideChunk(int par1, int par2) {
+ this.rand.setSeed(par1 * 341873128712L + par2 * 132897987541L);
+ Block[] ablock = new Block[65536];
+ byte[] abyte = new byte[65536];
+ this.func_147424_a(par1, par2, ablock);
+ this.biomesForGeneration = this.worldObj.getWorldChunkManager()
+ .loadBlockGeneratorData(this.biomesForGeneration, par1 * 16, par2 * 16, 16, 16);
+ this.replaceBlocksForBiome(par1, par2, ablock, abyte, this.biomesForGeneration);
+
+ Chunk chunk = new Chunk(this.worldObj, ablock, abyte, par1, par2);
+ byte[] abyte1 = chunk.getBiomeArray();
+
+ for (int k = 0; k < abyte1.length; ++k) {
+ abyte1[k] = (byte) this.biomesForGeneration[k].biomeID;
+ }
+
+ chunk.generateSkylightMap();
+ return chunk;
+ }
+
+ private void func_147423_a(int p_147423_1_, int p_147423_2_, int p_147423_3_) {
+ this.field_147426_g = this.noiseGen6
+ .generateNoiseOctaves(this.field_147426_g, p_147423_1_, p_147423_3_, 5, 5, 200.0D, 200.0D, 0.5D);
+ this.field_147427_d = this.field_147429_l.generateNoiseOctaves(
+ this.field_147427_d,
+ p_147423_1_,
+ p_147423_2_,
+ p_147423_3_,
+ 5,
+ 33,
+ 5,
+ 8.555150000000001D,
+ 4.277575000000001D,
+ 8.555150000000001D);
+ this.field_147428_e = this.field_147431_j.generateNoiseOctaves(
+ this.field_147428_e,
+ p_147423_1_,
+ p_147423_2_,
+ p_147423_3_,
+ 5,
+ 33,
+ 5,
+ 684.412D,
+ 684.412D,
+ 684.412D);
+ this.field_147425_f = this.field_147432_k.generateNoiseOctaves(
+ this.field_147425_f,
+ p_147423_1_,
+ p_147423_2_,
+ p_147423_3_,
+ 5,
+ 33,
+ 5,
+ 684.412D,
+ 684.412D,
+ 684.412D);
+ int l = 0;
+ int i1 = 0;
+ for (int j1 = 0; j1 < 5; ++j1) {
+ for (int k1 = 0; k1 < 5; ++k1) {
+ float f = 0.0F;
+ float f1 = 0.0F;
+ float f2 = 0.0F;
+ byte b0 = 2;
+ BiomeGenBase biomegenbase = this.biomesForGeneration[j1 + 2 + (k1 + 2) * 10];
+
+ for (int l1 = -b0; l1 <= b0; ++l1) {
+ for (int i2 = -b0; i2 <= b0; ++i2) {
+ BiomeGenBase biomegenbase1 = this.biomesForGeneration[j1 + l1 + 2 + (k1 + i2 + 2) * 10];
+ float f3 = biomegenbase1.rootHeight;
+ float f4 = biomegenbase1.heightVariation;
+
+ if (this.field_147435_p == WorldType.AMPLIFIED && f3 > 0.0F) {
+ f3 = 1.0F + f3 * 2.0F;
+ f4 = 1.0F + f4 * 4.0F;
+ }
+
+ float f5 = this.parabolicField[l1 + 2 + (i2 + 2) * 5] / (f3 + 2.0F);
+
+ if (biomegenbase1.rootHeight > biomegenbase.rootHeight) {
+ f5 /= 2.0F;
+ }
+
+ f += f4 * f5;
+ f1 += f3 * f5;
+ f2 += f5;
+ }
+ }
+
+ f /= f2;
+ f1 /= f2;
+ f = f * 0.9F + 0.1F;
+ f1 = (f1 * 4.0F - 1.0F) / 8.0F;
+ double d13 = this.field_147426_g[i1] / 8000.0D;
+
+ if (d13 < 0.0D) {
+ d13 = -d13 * 0.3D;
+ }
+
+ d13 = d13 * 3.0D - 2.0D;
+
+ if (d13 < 0.0D) {
+ d13 /= 2.0D;
+
+ if (d13 < -1.0D) {
+ d13 = -1.0D;
+ }
+
+ d13 /= 1.4D;
+ d13 /= 2.0D;
+ } else {
+ if (d13 > 1.0D) {
+ d13 = 1.0D;
+ }
+
+ d13 /= 8.0D;
+ }
+
+ ++i1;
+ double d12 = f1;
+ double d14 = f;
+ d12 += d13 * 0.2D;
+ d12 = d12 * 8.5D / 8.0D;
+ double d5 = 8.5D + d12 * 4.0D;
+
+ for (int j2 = 0; j2 < 33; ++j2) {
+ double d6 = (j2 - d5) * 12.0D * 128.0D / 256.0D / d14;
+
+ if (d6 < 0.0D) {
+ d6 *= 4.0D;
+ }
+
+ double d7 = this.field_147428_e[l] / 512.0D;
+ double d8 = this.field_147425_f[l] / 512.0D;
+ double d9 = (this.field_147427_d[l] / 10.0D + 1.0D) / 2.0D;
+ double d10 = MathHelper.denormalizeClamp(d7, d8, d9) - d6;
+
+ if (j2 > 29) {
+ double d11 = (j2 - 29) / 3.0F;
+ d10 = d10 * (1.0D - d11) + -10.0D * d11;
+ }
+
+ this.field_147434_q[l] = d10;
+ ++l;
+ }
+ }
+ }
+ }
+
+ /**
+ * Checks to see if a chunk exists at x, y
+ */
+ @Override
+ public boolean chunkExists(int par1, int par2) {
+ return true;
+ }
+
+ /**
+ * Populates chunk with ores etc etc
+ */
+ @Override
+ public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) {
+ BlockFalling.fallInstantly = false;
+ int k = par2 * 16;
+ int l = par3 * 16;
+ BiomeGenBase biomegenbase = this.worldObj.getBiomeGenForCoords(k + 16, l + 16);
+ this.rand.setSeed(this.worldObj.getSeed());
+ long i1 = this.rand.nextLong() / 2L * 2L + 1L;
+ long j1 = this.rand.nextLong() / 2L * 2L + 1L;
+ this.rand.setSeed(par2 * i1 + par3 * j1 ^ this.worldObj.getSeed());
+ boolean flag = false;
+
+ MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, rand, par2, par3, flag));
+
+ int k1;
+ int l1;
+ int i2;
+
+ if (biomegenbase != BiomeGenBase.desert && biomegenbase != BiomeGenBase.desertHills
+ && !flag
+ && this.rand.nextInt(4) == 0
+ && TerrainGen.populate(
+ par1IChunkProvider,
+ worldObj,
+ rand,
+ par2,
+ par3,
+ flag,
+ net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAKE)) {
+ k1 = k + this.rand.nextInt(16) + 8;
+ l1 = this.rand.nextInt(256);
+ i2 = l + this.rand.nextInt(16) + 8;
+ try {
+ (new WorldGenLakes(Dimension_Everglades.blockFluidLakes))
+ .generate(this.worldObj, this.rand, k1, l1, i2);
+ } catch (NullPointerException n) {
+ n.getStackTrace();
+ (new WorldGenLakes(Blocks.lava)).generate(this.worldObj, this.rand, k1, l1, i2);
+ Logger.INFO("Error while generating DarkWorld Lake.");
+ }
+ }
+
+ if (TerrainGen.populate(
+ par1IChunkProvider,
+ worldObj,
+ rand,
+ par2,
+ par3,
+ flag,
+ net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAVA) && !flag
+ && this.rand.nextInt(8) == 0) {
+ k1 = k + this.rand.nextInt(16) + 8;
+ l1 = this.rand.nextInt(this.rand.nextInt(248) + 8);
+ i2 = l + this.rand.nextInt(16) + 8;
+
+ if (l1 < 63 || this.rand.nextInt(10) == 0) { // Changes 63 -> 128
+ try {
+ (new WorldGenLakes(Blocks.lava)).generate(this.worldObj, this.rand, k1, l1, i2);
+ } catch (NullPointerException n) {
+ Logger.INFO("Error while generating DarkWorld Lake. [2]");
+ }
+ }
+ }
+ biomegenbase.decorate(this.worldObj, this.rand, k, l);
+ SpawnerAnimals.performWorldGenSpawning(this.worldObj, biomegenbase, k + 8, l + 8, 16, 16, this.rand);
+ k += 8;
+ l += 8;
+
+ MinecraftForge.EVENT_BUS
+ .post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, par2, par3, flag));
+
+ BlockFalling.fallInstantly = false;
+ }
+
+ /**
+ * Two modes of operation: if passed true, save all Chunks in one go. If passed false, save up to two chunks. Return
+ * true if all chunks have been saved.
+ */
+ @Override
+ public boolean saveChunks(boolean par1, IProgressUpdate par2IProgressUpdate) {
+ return true;
+ }
+
+ /**
+ * Save extra data not associated with any Chunk. Not saved during autosave, only during world unload. Currently
+ * unimplemented.
+ */
+ @Override
+ public void saveExtraData() {}
+
+ /**
+ * Unloads chunks that are marked to be unloaded. This is not guaranteed to unload every such chunk.
+ */
+ @Override
+ public boolean unloadQueuedChunks() {
+ return false;
+ }
+
+ /**
+ * Returns if the IChunkProvider supports saving.
+ */
+ @Override
+ public boolean canSave() {
+ return true;
+ }
+
+ /**
+ * Converts the instance data to a readable string.
+ */
+ @Override
+ public String makeString() {
+ return "RandomLevelSource";
+ }
+
+ /**
+ * Returns a list of creatures of the specified type that can spawn at the given location.
+ */
+ @SuppressWarnings("rawtypes")
+ @Override
+ public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int par2, int par3, int par4) {
+ BiomeGenBase biomegenbase = this.worldObj.getBiomeGenForCoords(par2, par4);
+ return par1EnumCreatureType == EnumCreatureType.monster
+ && this.scatteredFeatureGenerator.func_143030_a(par2, par3, par4)
+ ? this.scatteredFeatureGenerator.getScatteredFeatureSpawnList()
+ : biomegenbase.getSpawnableList(par1EnumCreatureType);
+ }
+
+ @Override
+ public ChunkPosition func_147416_a(World p_147416_1_, String p_147416_2_, int p_147416_3_, int p_147416_4_,
+ int p_147416_5_) {
+ return "Village".equals(p_147416_2_) && this.villageGenerator != null
+ ? this.villageGenerator.func_151545_a(p_147416_1_, p_147416_3_, p_147416_4_, p_147416_5_)
+ : null;
+ }
+
+ @Override
+ public int getLoadedChunkCount() {
+ return 0;
+ }
+
+ @Override
+ public void recreateStructures(int par1, int par2) {
+
+ }
+}
diff --git a/src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java b/src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java
index cf53f0f061..0520c5850b 100644
--- a/src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java
+++ b/src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java
@@ -1,12 +1,13 @@
package gtPlusPlus.everglades.dimension;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraftforge.common.DimensionManager;
+
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.everglades.block.BlockEvergladesPortal;
import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger;
import gtPlusPlus.everglades.world.WorldProviderMod;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraftforge.common.DimensionManager;
public class Dimension_Everglades {
diff --git a/src/main/java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java b/src/main/java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java
index ded79aec6a..37947452c5 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java
@@ -1,6 +1,7 @@
package gtPlusPlus.everglades.gen;
import java.util.Random;
+
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenWaterlily;
diff --git a/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java b/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java
index 1480c8651a..2e9d62d99f 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java
@@ -2,15 +2,18 @@ package gtPlusPlus.everglades.gen;
import static gtPlusPlus.core.lib.CORE.PI;
-import gtPlusPlus.api.objects.Logger;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenMinable;
+import gtPlusPlus.api.objects.Logger;
+
public class WorldGenMinable_Custom extends WorldGenMinable {
+
/** The block to generate. */
private Block oreToGenerate;
/** The number of blocks to generate. */
@@ -68,12 +71,17 @@ public class WorldGenMinable_Custom extends WorldGenMinable {
if (((d12 * d12) + (d13 * d13)) < 1.0D) {
for (int i3 = k1; i3 <= j2; ++i3) {
final double d14 = ((i3 + 0.5D) - d8) / (d10 / 2.0D);
- if ((((d12 * d12) + (d13 * d13) + (d14 * d14)) < 1.0D)
- && world.getBlock(k2, l2, i3)
- .isReplaceableOreGen(world, k2, l2, i3, this.blockToReplace)) {
+ if ((((d12 * d12) + (d13 * d13) + (d14 * d14)) < 1.0D) && world.getBlock(k2, l2, i3)
+ .isReplaceableOreGen(world, k2, l2, i3, this.blockToReplace)) {
world.setBlock(k2, l2, i3, this.oreToGenerate, this.mineableBlockMeta, 3);
- Logger.INFO("Generated a " + this.oreToGenerate.getLocalizedName() + " at x: " + k2
- + " | y: " + l2 + " | z: " + i3);
+ Logger.INFO(
+ "Generated a " + this.oreToGenerate.getLocalizedName()
+ + " at x: "
+ + k2
+ + " | y: "
+ + l2
+ + " | z: "
+ + i3);
}
}
}
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
index ae60ca1b4e..70dfd2b35a 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
@@ -1,14 +1,17 @@
package gtPlusPlus.everglades.gen.gt;
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
+
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
+import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+
public abstract class WorldGen_GT {
+
public final String mWorldGenName;
public final boolean mEnabled;
private final Map<String, Boolean> mDimensionMap = new ConcurrentHashMap<String, Boolean>();
@@ -21,27 +24,13 @@ public abstract class WorldGen_GT {
}
}
- public boolean executeWorldgen(
- World aWorld,
- Random aRandom,
- String aBiome,
- int aDimensionType,
- int aChunkX,
- int aChunkZ,
- IChunkProvider aChunkGenerator,
- IChunkProvider aChunkProvider) {
+ public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
return false;
}
- public boolean executeCavegen(
- World aWorld,
- Random aRandom,
- String aBiome,
- int aDimensionType,
- int aChunkX,
- int aChunkZ,
- IChunkProvider aChunkGenerator,
- IChunkProvider aChunkProvider) {
+ public boolean executeCavegen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
return false;
}
@@ -50,7 +39,9 @@ public abstract class WorldGen_GT {
Boolean tAllowed = (Boolean) this.mDimensionMap.get(aDimName);
if (tAllowed == null) {
boolean tValue = HANDLER_GT.sCustomWorldgenFile.get(
- "worldgen.dimensions." + this.mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType);
+ "worldgen.dimensions." + this.mWorldGenName,
+ aDimName,
+ aDimensionType == aAllowedDimensionType);
this.mDimensionMap.put(aDimName, Boolean.valueOf(tValue));
return tValue;
} else {
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
index cbf07372fc..eeb45cee22 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java
@@ -1,5 +1,13 @@
package gtPlusPlus.everglades.gen.gt;
+import java.util.*;
+
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.IChunkProvider;
+import net.minecraft.world.gen.feature.WorldGenMinable;
+
import cpw.mods.fml.common.IWorldGenerator;
import gregtech.api.util.GT_Log;
import gtPlusPlus.api.objects.Logger;
@@ -7,12 +15,6 @@ import gtPlusPlus.api.objects.random.XSTR;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import gtPlusPlus.xmod.gregtech.HANDLER_GT;
-import java.util.*;
-import net.minecraft.block.Block;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.feature.WorldGenMinable;
public class WorldGen_GT_Base implements IWorldGenerator {
@@ -21,29 +23,25 @@ public class WorldGen_GT_Base implements IWorldGenerator {
*/
/**
- * Control percentage of filled 3x3 chunks. Lower number means less oreveins
- * spawn
+ * Control percentage of filled 3x3 chunks. Lower number means less oreveins spawn
*/
public static int oreveinPercentage;
/**
- * Control number of attempts to find a valid orevein. Generally this
- * maximum limit isn't hit, selecting a vein is cheap
+ * Control number of attempts to find a valid orevein. Generally this maximum limit isn't hit, selecting a vein is
+ * cheap
*/
public static int oreveinAttempts;
/**
- * Control number of attempts to place a valid orevein. If a vein wasn't
- * placed due to height restrictions, completely in the water, etc, another
- * attempt is tried.
+ * Control number of attempts to place a valid orevein. If a vein wasn't placed due to height restrictions,
+ * completely in the water, etc, another attempt is tried.
*/
public static int oreveinMaxPlacementAttempts;
/**
- * Debug parameter for world generation. Tracks chunks added/removed from
- * run queue.
+ * Debug parameter for world generation. Tracks chunks added/removed from run queue.
*/
public static boolean debugWorldGen = false;
/**
- * Try re-implement Richard Hendrick's Chunk by Chunk Ore Generation from
- * his GT5u fork.
+ * Try re-implement Richard Hendrick's Chunk by Chunk Ore Generation from his GT5u fork.
*/
public static List<Runnable> mList = new ArrayList<Runnable>();
@@ -62,8 +60,8 @@ public class WorldGen_GT_Base implements IWorldGenerator {
ELEMENT.getInstance().IRON,
ELEMENT.getInstance().IRON);
- public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins =
- new Hashtable<Long, WorldGen_GT_Ore_Layer>(1024);
+ public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<Long, WorldGen_GT_Ore_Layer>(
+ 1024);
public boolean mIsGenerating = false;
public static final Object listLock = new Object();
@@ -76,25 +74,15 @@ public class WorldGen_GT_Base implements IWorldGenerator {
}
@Override
- public void generate(
- Random random,
- int chunkX,
- int chunkZ,
- World world,
- IChunkProvider chunkGenerator,
+ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator,
IChunkProvider chunkProvider) {
if (world.provider.dimensionId == Dimension_Everglades.DIMID) {
generateSafely(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider);
}
}
- public synchronized void generateSafely(
- Random random,
- int chunkX,
- int chunkZ,
- World world,
- IChunkProvider chunkGenerator,
- IChunkProvider chunkProvider) {
+ public synchronized void generateSafely(Random random, int chunkX, int chunkZ, World world,
+ IChunkProvider chunkGenerator, IChunkProvider chunkProvider) {
int xDim = Dimension_Everglades.DIMID;
switch (world.provider.dimensionId) {
case -1: // Nether
@@ -116,32 +104,35 @@ public class WorldGen_GT_Base implements IWorldGenerator {
}
}
- private synchronized void generateEverglades(
- Random aRandom,
- int aX,
- int aZ,
- World aWorld,
- IChunkProvider aChunkGenerator,
- IChunkProvider aChunkProvider) {
+ private synchronized void generateEverglades(Random aRandom, int aX, int aZ, World aWorld,
+ IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
Logger.WORLD("Trying to Generate Dimension.");
synchronized (listLock) {
Logger.WORLD("Locked List addition.");
- if (WorldGen_GT_Base.mList.add(new WorldGenContainer(
- new XSTR(Math.abs(aRandom.nextInt()) + 1),
- aX,
- aZ,
- Dimension_Everglades.DIMID,
- aWorld,
- aChunkGenerator,
- aChunkProvider,
- aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName))) {
+ if (WorldGen_GT_Base.mList.add(
+ new WorldGenContainer(
+ new XSTR(Math.abs(aRandom.nextInt()) + 1),
+ aX,
+ aZ,
+ Dimension_Everglades.DIMID,
+ aWorld,
+ aChunkGenerator,
+ aChunkProvider,
+ aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName))) {
Logger.WORLD("Locked List addition. Success.");
} else {
Logger.WORLD("Locked List addition. Fail.");
}
- if (debugWorldGen)
- GT_Log.out.println("ADD WorldSeed:" + aWorld.getSeed() + " DimId" + aWorld.provider.dimensionId
- + " chunk x:" + aX + " z:" + aZ + " SIZE: " + WorldGen_GT_Base.mList.size());
+ if (debugWorldGen) GT_Log.out.println(
+ "ADD WorldSeed:" + aWorld.getSeed()
+ + " DimId"
+ + aWorld.provider.dimensionId
+ + " chunk x:"
+ + aX
+ + " z:"
+ + aZ
+ + " SIZE: "
+ + WorldGen_GT_Base.mList.size());
}
if (!this.mIsGenerating) {
@@ -154,10 +145,18 @@ public class WorldGen_GT_Base implements IWorldGenerator {
// chunks get done later.
for (int i = 0; i < mList_sS; i++) {
WorldGenContainer toRun = (WorldGenContainer) WorldGen_GT_Base.mList.get(0);
- if (debugWorldGen)
- GT_Log.out.println("RUN WorldSeed:" + aWorld.getSeed() + " DimId" + aWorld.provider.dimensionId
- + " chunk x:" + toRun.mX + " z:" + toRun.mZ + " SIZE: " + WorldGen_GT_Base.mList.size()
- + " i: " + i);
+ if (debugWorldGen) GT_Log.out.println(
+ "RUN WorldSeed:" + aWorld.getSeed()
+ + " DimId"
+ + aWorld.provider.dimensionId
+ + " chunk x:"
+ + toRun.mX
+ + " z:"
+ + toRun.mZ
+ + " SIZE: "
+ + WorldGen_GT_Base.mList.size()
+ + " i: "
+ + i);
synchronized (listLock) {
Logger.WORLD("Locked List Removal.");
WorldGen_GT_Base.mList.remove(0);
@@ -169,19 +168,8 @@ public class WorldGen_GT_Base implements IWorldGenerator {
}
}
- public void generateOre(
- Block block,
- World world,
- Random random,
- int chunk_x,
- int chunk_z,
- int maxX,
- int maxZ,
- int maxVeinSize,
- int chancesToSpawn,
- int minY,
- int maxY,
- Block generateIn) {
+ public void generateOre(Block block, World world, Random random, int chunk_x, int chunk_z, int maxX, int maxZ,
+ int maxVeinSize, int chancesToSpawn, int minY, int maxY, Block generateIn) {
int heightRange = maxY - minY;
WorldGenMinable worldgenminable = new WorldGenMinable(block, maxVeinSize, generateIn);
for (int k1 = 0; k1 < chancesToSpawn; ++k1) {
@@ -193,6 +181,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
}
public static class WorldGenContainer implements Runnable {
+
public final Random mRandom;
public final int mX;
public final int mZ;
@@ -205,6 +194,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
// Local class to track which orevein seeds must be checked when doing
// chunkified worldgen
class NearbySeeds {
+
public int mX;
public int mZ;
@@ -212,21 +202,13 @@ public class WorldGen_GT_Base implements IWorldGenerator {
this.mX = x;
this.mZ = z;
}
- }
- ;
+ };
public static ArrayList<NearbySeeds> seedList = new ArrayList<NearbySeeds>();
// aX and aZ are now the by-chunk X and Z for the chunk of interest
- public WorldGenContainer(
- Random aRandom,
- int aX,
- int aZ,
- int aDimensionType,
- World aWorld,
- IChunkProvider aChunkGenerator,
- IChunkProvider aChunkProvider,
- String aBiome) {
+ public WorldGenContainer(Random aRandom, int aX, int aZ, int aDimensionType, World aWorld,
+ IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider, String aBiome) {
this.mRandom = aRandom;
this.mX = aX;
this.mZ = aZ;
@@ -253,8 +235,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
// bits 0-27. Cuts off the top few bits of the chunk so we have bits
// for dimension.
long oreveinSeed = (this.mWorld.getSeed() << 16)
- ^ ((this.mWorld.provider.dimensionId & 0xffL) << 56
- | ((oreseedX & 0x000000000fffffffL) << 28)
+ ^ ((this.mWorld.provider.dimensionId & 0xffL) << 56 | ((oreseedX & 0x000000000fffffffL) << 28)
| (oreseedZ & 0x000000000fffffffL)); // Use
// an
// RNG
@@ -284,9 +265,18 @@ public class WorldGen_GT_Base implements IWorldGenerator {
}
if (debugWorldGen) {
- GT_Log.out.println(" Finding oreveins for oreveinSeed=" + oreveinSeed + " mX=" + this.mX + " mZ="
- + this.mZ + " oreseedX=" + oreseedX + " oreseedZ=" + oreseedZ + " worldSeed="
- + this.mWorld.getSeed());
+ GT_Log.out.println(
+ " Finding oreveins for oreveinSeed=" + oreveinSeed
+ + " mX="
+ + this.mX
+ + " mZ="
+ + this.mZ
+ + " oreseedX="
+ + oreseedX
+ + " oreseedZ="
+ + oreseedZ
+ + " worldSeed="
+ + this.mWorld.getSeed());
}
Logger.INFO(
@@ -294,33 +284,34 @@ public class WorldGen_GT_Base implements IWorldGenerator {
// Search for a valid orevein for this dimension
if (!validOreveins.containsKey(oreveinSeed)) {
- Logger.INFO("[World Generation Debug] oreveinPercentageRoll < oreveinPercentage? "
- + ((oreveinPercentageRoll < oreveinPercentage)));
- Logger.INFO("[World Generation Debug] WorldGen_GT_Ore_Layer.sWeight > 0? "
- + (WorldGen_GT_Ore_Layer.sWeight > 0));
- Logger.INFO("[World Generation Debug] WorldGen_GT_Ore_Layer.sList.size() > 0? "
- + (WorldGen_GT_Ore_Layer.sList.size() > 0));
- if ((oreveinPercentageRoll < oreveinPercentage)
- && (WorldGen_GT_Ore_Layer.sWeight > 0)
+ Logger.INFO(
+ "[World Generation Debug] oreveinPercentageRoll < oreveinPercentage? "
+ + ((oreveinPercentageRoll < oreveinPercentage)));
+ Logger.INFO(
+ "[World Generation Debug] WorldGen_GT_Ore_Layer.sWeight > 0? "
+ + (WorldGen_GT_Ore_Layer.sWeight > 0));
+ Logger.INFO(
+ "[World Generation Debug] WorldGen_GT_Ore_Layer.sList.size() > 0? "
+ + (WorldGen_GT_Ore_Layer.sList.size() > 0));
+ if ((oreveinPercentageRoll < oreveinPercentage) && (WorldGen_GT_Ore_Layer.sWeight > 0)
&& (WorldGen_GT_Ore_Layer.sList.size() > 0)) {
int placementAttempts = 0;
boolean oreveinFound = false;
int i;
- for (i = 0;
- (i < oreveinAttempts)
- && (!oreveinFound)
- && (placementAttempts < oreveinMaxPlacementAttempts);
- i++) {
+ for (i = 0; (i < oreveinAttempts) && (!oreveinFound)
+ && (placementAttempts < oreveinMaxPlacementAttempts); i++) {
Logger.INFO("[World Generation Debug] i: " + i);
Logger.INFO("[World Generation Debug] placementAttempts: " + placementAttempts);
Logger.INFO("[World Generation Debug] oreveinAttempts: " + oreveinAttempts);
- Logger.INFO("[World Generation Debug] (placementAttempts < oreveinMaxPlacementAttempts): "
- + (placementAttempts < oreveinMaxPlacementAttempts));
+ Logger.INFO(
+ "[World Generation Debug] (placementAttempts < oreveinMaxPlacementAttempts): "
+ + (placementAttempts < oreveinMaxPlacementAttempts));
Logger.INFO("[World Generation Debug] oreveinFound: " + oreveinFound);
int tRandomWeight = oreveinRNG.nextInt(WorldGen_GT_Ore_Layer.sWeight);
for (WorldGen_GT_Ore_Layer tWorldGen : WorldGen_GT_Ore_Layer.sList) {
- Logger.INFO("[World Generation Debug] Iterating sList - Size: "
- + WorldGen_GT_Ore_Layer.sList.size());
+ Logger.INFO(
+ "[World Generation Debug] Iterating sList - Size: "
+ + WorldGen_GT_Ore_Layer.sList.size());
tRandomWeight -= (tWorldGen).mWeight;
if (tRandomWeight <= 0) {
try {
@@ -346,18 +337,23 @@ public class WorldGen_GT_Base implements IWorldGenerator {
this.mChunkProvider);
switch (placementResult) {
case WorldGen_GT_Ore_Layer.ORE_PLACED:
- if (debugWorldGen)
- GT_Log.out.println(" Added oreveinSeed=" + oreveinSeed
- + " tries at oremix=" + i + " placementAttempts="
- + placementAttempts + " dimensionName=" + tDimensionName);
+ if (debugWorldGen) GT_Log.out.println(
+ " Added oreveinSeed=" + oreveinSeed
+ + " tries at oremix="
+ + i
+ + " placementAttempts="
+ + placementAttempts
+ + " dimensionName="
+ + tDimensionName);
validOreveins.put(oreveinSeed, tWorldGen);
oreveinFound = true;
Logger.INFO("[World Generation Debug] ORE_PLACED");
break;
case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER:
placementAttempts++;
- Logger.INFO("[World Generation Debug] NO_ORE_IN_BOTTOM_LAYER | Attempts: "
- + placementAttempts);
+ Logger.INFO(
+ "[World Generation Debug] NO_ORE_IN_BOTTOM_LAYER | Attempts: "
+ + placementAttempts);
// SHould do retry in this case
// until out of chances
break;
@@ -365,24 +361,30 @@ public class WorldGen_GT_Base implements IWorldGenerator {
// Orevein didn't reach this chunk,
// can't add it yet to the hash
Logger.INFO("[World Generation Debug] NO_OVERLAP");
- if (debugWorldGen)
- GT_Log.out.println(" Added far oreveinSeed=" + oreveinSeed + " "
- + (tWorldGen).mWorldGenName
- + " tries at oremix="
- + i + " placementAttempts="
- + placementAttempts + " dimensionName="
- + tDimensionName);
+ if (debugWorldGen) GT_Log.out.println(
+ " Added far oreveinSeed=" + oreveinSeed
+ + " "
+ + (tWorldGen).mWorldGenName
+ + " tries at oremix="
+ + i
+ + " placementAttempts="
+ + placementAttempts
+ + " dimensionName="
+ + tDimensionName);
validOreveins.put(oreveinSeed, tWorldGen);
oreveinFound = true;
break;
case WorldGen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK:
- if (debugWorldGen)
- GT_Log.out.println(" No overlap and air block in test spot="
- + oreveinSeed + " " + (tWorldGen).mWorldGenName
- + " tries at oremix="
- + i + " placementAttempts="
- + placementAttempts + " dimensionName="
- + tDimensionName);
+ if (debugWorldGen) GT_Log.out.println(
+ " No overlap and air block in test spot=" + oreveinSeed
+ + " "
+ + (tWorldGen).mWorldGenName
+ + " tries at oremix="
+ + i
+ + " placementAttempts="
+ + placementAttempts
+ + " dimensionName="
+ + tDimensionName);
// SHould do retry in this case until out of chances
Logger.INFO("[World Generation Debug] NO_OVERLAP_AIR_BLOCK");
placementAttempts++;
@@ -390,10 +392,18 @@ public class WorldGen_GT_Base implements IWorldGenerator {
}
break; // Try the next orevein
} catch (Throwable e) {
- if (debugWorldGen)
- GT_Log.out.println("Exception occurred on oreVein" + tWorldGen + " oreveinSeed="
- + oreveinSeed + " mX=" + this.mX + " mZ=" + this.mZ + " oreseedX="
- + oreseedX + " oreseedZ=" + oreseedZ);
+ if (debugWorldGen) GT_Log.out.println(
+ "Exception occurred on oreVein" + tWorldGen
+ + " oreveinSeed="
+ + oreveinSeed
+ + " mX="
+ + this.mX
+ + " mZ="
+ + this.mZ
+ + " oreseedX="
+ + oreseedX
+ + " oreseedZ="
+ + oreseedZ);
e.printStackTrace(GT_Log.err);
}
}
@@ -402,24 +412,47 @@ public class WorldGen_GT_Base implements IWorldGenerator {
// Only add an empty orevein if are unable to place a vein
// at the oreseed chunk.
if ((!oreveinFound) && (this.mX == oreseedX) && (this.mZ == oreseedZ)) {
- if (debugWorldGen)
- GT_Log.out.println(" Empty oreveinSeed=" + oreveinSeed + " mX=" + this.mX + " mZ=" + this.mZ
- + " oreseedX=" + oreseedX + " oreseedZ=" + oreseedZ + " tries at oremix=" + i
- + " placementAttempts=" + placementAttempts + " dimensionName=" + tDimensionName);
+ if (debugWorldGen) GT_Log.out.println(
+ " Empty oreveinSeed=" + oreveinSeed
+ + " mX="
+ + this.mX
+ + " mZ="
+ + this.mZ
+ + " oreseedX="
+ + oreseedX
+ + " oreseedZ="
+ + oreseedZ
+ + " tries at oremix="
+ + i
+ + " placementAttempts="
+ + placementAttempts
+ + " dimensionName="
+ + tDimensionName);
validOreveins.put(oreveinSeed, noOresInVein);
}
} else if (oreveinPercentageRoll >= oreveinPercentage) {
- if (debugWorldGen)
- GT_Log.out.println(" Skipped oreveinSeed=" + oreveinSeed + " mX=" + this.mX + " mZ=" + this.mZ
- + " oreseedX=" + oreseedX + " oreseedZ=" + oreseedZ + " RNG=" + oreveinPercentageRoll
- + " %=" + oreveinPercentage + " dimensionName=" + tDimensionName);
+ if (debugWorldGen) GT_Log.out.println(
+ " Skipped oreveinSeed=" + oreveinSeed
+ + " mX="
+ + this.mX
+ + " mZ="
+ + this.mZ
+ + " oreseedX="
+ + oreseedX
+ + " oreseedZ="
+ + oreseedZ
+ + " RNG="
+ + oreveinPercentageRoll
+ + " %="
+ + oreveinPercentage
+ + " dimensionName="
+ + tDimensionName);
validOreveins.put(oreveinSeed, noOresInVein);
}
} else {
// oreseed is located in the previously processed table
- if (debugWorldGen)
- GT_Log.out.print(" Valid oreveinSeed=" + oreveinSeed + " validOreveins.size()="
- + validOreveins.size() + " ");
+ if (debugWorldGen) GT_Log.out.print(
+ " Valid oreveinSeed=" + oreveinSeed + " validOreveins.size()=" + validOreveins.size() + " ");
WorldGen_GT_Ore_Layer tWorldGen = validOreveins.get(oreveinSeed);
oreveinRNG.setSeed(oreveinSeed ^ (Block.getIdFromBlock(tWorldGen.mPrimaryMeta))); // Reset
// RNG
@@ -504,8 +537,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
try {
for (WorldGen_GT tWorldGen : HANDLER_GT.sWorldgenListEverglades) {
/*
- * if (debugWorldGen) GT_Log.out.println(
- * "tWorldGen.mWorldGenName="+tWorldGen.mWorldGenName );
+ * if (debugWorldGen) GT_Log.out.println( "tWorldGen.mWorldGenName="+tWorldGen.mWorldGenName );
*/
tWorldGen.executeWorldgen(
this.mWorld,
@@ -530,8 +562,13 @@ public class WorldGen_GT_Base implements IWorldGenerator {
long endTime = System.nanoTime();
long duration = (endTime - startTime);
if (debugWorldGen) {
- GT_Log.out.println(" Oregen took " + (oregenTime - startTime) + " Leftover gen took "
- + (leftOverTime - oregenTime) + " Worldgen took " + duration + " nanoseconds");
+ GT_Log.out.println(
+ " Oregen took " + (oregenTime - startTime)
+ + " Leftover gen took "
+ + (leftOverTime - oregenTime)
+ + " Worldgen took "
+ + duration
+ + " nanoseconds");
}
}
}
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
index ee4dc51461..76948631c1 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
@@ -2,6 +2,17 @@ package gtPlusPlus.everglades.gen.gt;
import static gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base.debugWorldGen;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_Log;
@@ -14,17 +25,9 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import gtPlusPlus.xmod.gregtech.HANDLER_GT;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.IChunkProvider;
public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
+
public static ArrayList<WorldGen_GT_Ore_Layer> sList = new ArrayList<WorldGen_GT_Ore_Layer>();
public static int sWeight = 0;
public final short mMinY;
@@ -67,25 +70,15 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
try {
Field temp = ReflectionUtils.getField(GregTech_API.class, "sBlockStones");
tempBlock = temp.get(null);
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
mStoneTypes = (Block) tempBlock;
} else {
mStoneTypes = null;
}
}
- public WorldGen_GT_Ore_Layer(
- String aName,
- int aMinY,
- int aMaxY,
- int aWeight,
- int aDensity,
- int aSize,
- Material aPrimary,
- Material aSecondary,
- Material aBetween,
- Material aSporadic) {
+ public WorldGen_GT_Ore_Layer(String aName, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize,
+ Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) {
this(
aName,
true,
@@ -106,28 +99,13 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
aSporadic);
}
- public WorldGen_GT_Ore_Layer(
- String aName,
- boolean aDefault,
- int aMinY,
- int aMaxY,
- int aWeight,
- int aDensity,
- int aSize,
- boolean aOverworld,
- boolean aNether,
- boolean aEnd,
- boolean GC_UNUSED1,
- boolean GC_UNUSED2,
- boolean GC_UNUSED3,
- Material aPrimary,
- Material aSecondary,
- Material aBetween,
- Material aSporadic) {
+ public WorldGen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity,
+ int aSize, boolean aOverworld, boolean aNether, boolean aEnd, boolean GC_UNUSED1, boolean GC_UNUSED2,
+ boolean GC_UNUSED3, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) {
super(aName, sList, aDefault);
Logger.WORLD("Creating Ore Layer Object");
- this.mOverworld =
- HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld);
+ this.mOverworld = HANDLER_GT.sCustomWorldgenFile
+ .get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld);
this.mNether = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether);
this.mEnd = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd);
// this.mMoon = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Moon", aMoon);
@@ -141,12 +119,12 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
mMaxY = (short) (this.mMinY + 7);
}
this.mMaxY = mMaxY;
- this.mWeight = ((short)
- HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight));
- this.mDensity =
- ((short) HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Density", aDensity));
- this.mSize = ((short)
- Math.max(1, HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize)));
+ this.mWeight = ((short) HANDLER_GT.sCustomWorldgenFile
+ .get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight));
+ this.mDensity = ((short) HANDLER_GT.sCustomWorldgenFile
+ .get(aTextWorldgen + this.mWorldGenName, "Density", aDensity));
+ this.mSize = ((short) Math
+ .max(1, HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize)));
this.mPrimary = aPrimary;
this.mSecondary = aSecondary;
this.mBetween = aBetween;
@@ -155,8 +133,8 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
this.mSecondaryMeta = aSecondary.getOreBlock(1);
this.mBetweenMeta = aBetween.getOreBlock(1);
this.mSporadicMeta = aSporadic.getOreBlock(1);
- this.mRestrictBiome =
- HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None");
+ this.mRestrictBiome = HANDLER_GT.sCustomWorldgenFile
+ .get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None");
// if (mPrimaryMeta != -1 && GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)] == null) throw new
// IllegalArgumentException("A Material for the supplied ID " + mPrimaryMeta + " for " + mWorldGenName + " does
@@ -184,24 +162,14 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
}
}
- public int executeWorldgenChunkified(
- World aWorld,
- Random aRandom,
- String aBiome,
- int aDimensionType,
- int aChunkX,
- int aChunkZ,
- int aSeedX,
- int aSeedZ,
- IChunkProvider aChunkGenerator,
- IChunkProvider aChunkProvider) {
+ public int executeWorldgenChunkified(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
+ int aChunkZ, int aSeedX, int aSeedZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
// Debug Handler
/**
* This handles Variables that are null during Init
*/
- if (this.mPrimaryMeta == Blocks.stone
- || this.mSecondaryMeta == Blocks.stone
+ if (this.mPrimaryMeta == Blocks.stone || this.mSecondaryMeta == Blocks.stone
|| this.mBetweenMeta == Blocks.stone
|| this.mSporadicMeta == Blocks.stone) {
this.mPrimaryMeta = this.mPrimary.getOreBlock(1);
@@ -219,13 +187,9 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
return ORE_PLACED;
}
if (aDimensionType != Dimension_Everglades.DIMID) {
- /* // Debug code, but spams log
- if (debugWorldGen) {
- GT_Log.out.println(
- "Wrong dimension"
- );
- }
- */
+ /*
+ * // Debug code, but spams log if (debugWorldGen) { GT_Log.out.println( "Wrong dimension" ); }
+ */
Logger.WORLD("[World Generation Debug] Wrong dimension.");
return WRONG_DIMENSION;
}
@@ -243,13 +207,20 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
int eX = Math.min(eXVein, aChunkX + 2 + 16);
if (wX >= eX) { // No overlap between orevein and this chunk exists in X
Block tBlock = aWorld.getBlock(aChunkX + 8, tMinY, aChunkZ + 8);
- if (tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.stone)
- || tBlock.isReplaceableOreGen(
- aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Dimension_Everglades.blockSecondLayer)
+ if (tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.stone) || tBlock
+ .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Dimension_Everglades.blockSecondLayer)
|| tBlock.isReplaceableOreGen(
- aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Dimension_Everglades.blockMainFiller)
+ aWorld,
+ aChunkX + 8,
+ tMinY,
+ aChunkZ + 8,
+ Dimension_Everglades.blockMainFiller)
|| tBlock.isReplaceableOreGen(
- aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Dimension_Everglades.blockSecondaryFiller)
+ aWorld,
+ aChunkX + 8,
+ tMinY,
+ aChunkZ + 8,
+ Dimension_Everglades.blockSecondaryFiller)
|| tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.netherrack)
|| tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.end_stone)
|| tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockGranites)
@@ -284,58 +255,64 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
if (debugWorldGen) {
String tDimensionName = aWorld.provider.getDimensionName();
- GT_Log.out.print("Trying Orevein:" + this.mWorldGenName + " Dimension="
- + tDimensionName + " mX="
- + aChunkX / 16 + " mZ="
- + aChunkZ / 16 + " oreseedX="
- + aSeedX / 16 + " oreseedZ="
- + aSeedZ / 16 + " cY="
- + tMinY);
+ GT_Log.out.print(
+ "Trying Orevein:" + this.mWorldGenName
+ + " Dimension="
+ + tDimensionName
+ + " mX="
+ + aChunkX / 16
+ + " mZ="
+ + aChunkZ / 16
+ + " oreseedX="
+ + aSeedX / 16
+ + " oreseedZ="
+ + aSeedZ / 16
+ + " cY="
+ + tMinY);
}
- // Adjust the density down the more chunks we are away from the oreseed. The 5 chunks surrounding the seed
+ // Adjust the density down the more chunks we are away from the oreseed. The 5 chunks surrounding the seed
// should always be max density due to truncation of Math.sqrt().
int localDensity = (Math.max(
1,
- this.mDensity
- / ((int) Math.sqrt(2
- + Math.pow(aChunkX / 16 - aSeedX / 16, 2)
- + Math.pow(aChunkZ / 16 - aSeedZ / 16, 2)))));
+ this.mDensity / ((int) Math
+ .sqrt(2 + Math.pow(aChunkX / 16 - aSeedX / 16, 2) + Math.pow(aChunkZ / 16 - aSeedZ / 16, 2)))));
// To allow for early exit due to no ore placed in the bottom layer (probably because we are in the sky), unroll
// 1 pass through the loop
// Now we do bottom-level-first oregen, and work our way upwards.
- int level = tMinY - 1; // Dunno why, but the first layer is actually played one below tMinY. Go figure.
+ int level = tMinY - 1; // Dunno why, but the first layer is actually played one below tMinY. Go figure.
for (int tX = wX; tX < eX; tX++) {
- int placeX = Math.max(
- 1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity);
+ int placeX = Math
+ .max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity);
for (int tZ = nZ; tZ < sZ; tZ++) {
int placeZ = Math.max(
- 1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
+ 1,
+ Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
&& (this.mSecondaryMeta != null)) {
if (setOreBlock(aWorld, tX, level, tZ, this.mSecondaryMeta, false, false)) {
placeCount[1]++;
}
- } else if ((aRandom.nextInt(7) == 0)
- && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
- && (this.mSporadicMeta
- != null)) { // Sporadics are only 1 per vertical column normally, reduce by 1/7 to
- // compensate
- if (setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, false)) placeCount[3]++;
- }
+ } else
+ if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
+ && (this.mSporadicMeta != null)) { // Sporadics are only 1 per vertical column normally,
+ // reduce by 1/7 to
+ // compensate
+ if (setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, false))
+ placeCount[3]++;
+ }
}
}
- /*if ((placeCount[1]+placeCount[3])==0) {
- if (debugWorldGen) GT_Log.out.println(
- " No ore in bottom layer"
- );
- return NO_ORE_IN_BOTTOM_LAYER; // Exit early, didn't place anything in the bottom layer
- }*/
+ /*
+ * if ((placeCount[1]+placeCount[3])==0) { if (debugWorldGen) GT_Log.out.println( " No ore in bottom layer" );
+ * return NO_ORE_IN_BOTTOM_LAYER; // Exit early, didn't place anything in the bottom layer }
+ */
Logger.WORLD("[World Generation Debug] Trying to set Ores?");
for (level = tMinY; level < (tMinY - 1 + 3); level++) {
for (int tX = wX; tX < eX; tX++) {
int placeX = Math.max(
- 1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity);
+ 1,
+ Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity);
for (int tZ = nZ; tZ < sZ; tZ++) {
int placeZ = Math.max(
1,
@@ -347,65 +324,68 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
}
} else if ((aRandom.nextInt(7) == 0)
&& ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
- && (this.mSporadicMeta
- != null)) { // Sporadics are only 1 per vertical column normally, reduce by 1/7 to
- // compensate
- if (setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, false)) placeCount[3]++;
- }
+ && (this.mSporadicMeta != null)) { // Sporadics are only 1 per vertical column normally,
+ // reduce by 1/7 to
+ // compensate
+ if (setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, false))
+ placeCount[3]++;
+ }
}
}
}
// Low Middle layer is between + sporadic
// level should be = tMinY-1+3 from end of for loop
for (int tX = wX; tX < eX; tX++) {
- int placeX = Math.max(
- 1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity);
+ int placeX = Math
+ .max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity);
for (int tZ = nZ; tZ < sZ; tZ++) {
int placeZ = Math.max(
- 1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
- if ((aRandom.nextInt(2) == 0)
- && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
- && (this.mBetweenMeta
- != null)) { // Between are only 1 per vertical column, reduce by 1/2 to compensate
+ 1,
+ Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
+ if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
+ && (this.mBetweenMeta != null)) { // Between are only 1 per vertical column, reduce by 1/2 to
+ // compensate
if (setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, false)) {
placeCount[2]++;
}
- } else if ((aRandom.nextInt(7) == 0)
- && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
- && (this.mSporadicMeta
- != null)) { // Sporadics are only 1 per vertical column normally, reduce by 1/7 to
- // compensate
- if (setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, false)) placeCount[3]++;
- }
+ } else
+ if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
+ && (this.mSporadicMeta != null)) { // Sporadics are only 1 per vertical column normally,
+ // reduce by 1/7 to
+ // compensate
+ if (setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, false))
+ placeCount[3]++;
+ }
}
}
// High Middle layer is between + primary + sporadic
level++; // Increment level to next layer
for (int tX = wX; tX < eX; tX++) {
- int placeX = Math.max(
- 1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity);
+ int placeX = Math
+ .max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity);
for (int tZ = nZ; tZ < sZ; tZ++) {
int placeZ = Math.max(
- 1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
- if ((aRandom.nextInt(2) == 0)
- && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
- && (this.mBetweenMeta
- != null)) { // Between are only 1 per vertical column, reduce by 1/2 to compensate
+ 1,
+ Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity);
+ if ((aRandom.nextInt(2) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
+ && (this.mBetweenMeta != null)) { // Between are only 1 per vertical column, reduce by 1/2 to
+ // compensate
if (setOreBlock(aWorld, tX, level, tZ, this.mBetweenMeta, false, false)) {
placeCount[2]++;
}
} else if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
&& (this.mPrimaryMeta != null)) {
- if (setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, false)) {
- placeCount[0]++;
- }
- } else if ((aRandom.nextInt(7) == 0)
- && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
- && (this.mSporadicMeta
- != null)) { // Sporadics are only 1 per vertical column normally, reduce by 1/7 to
- // compensate
- if (setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, false)) placeCount[3]++;
- }
+ if (setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, false)) {
+ placeCount[0]++;
+ }
+ } else
+ if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
+ && (this.mSporadicMeta != null)) { // Sporadics are only 1 per vertical column normally,
+ // reduce by 1/7 to
+ // compensate
+ if (setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, false))
+ placeCount[3]++;
+ }
}
}
// Top two layers are primary + sporadic
@@ -413,7 +393,8 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
for (; level < (tMinY + 6); level++) { // should do two layers
for (int tX = wX; tX < eX; tX++) {
int placeX = Math.max(
- 1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity);
+ 1,
+ Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity);
for (int tZ = nZ; tZ < sZ; tZ++) {
int placeZ = Math.max(
1,
@@ -425,42 +406,57 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
}
} else if ((aRandom.nextInt(7) == 0)
&& ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0))
- && (this.mSporadicMeta
- != null)) { // Sporadics are only 1 per vertical column normally, reduce by 1/7 to
- // compensate
- if (setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, false)) placeCount[3]++;
- }
+ && (this.mSporadicMeta != null)) { // Sporadics are only 1 per vertical column normally,
+ // reduce by 1/7 to
+ // compensate
+ if (setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, false))
+ placeCount[3]++;
+ }
}
}
}
if (debugWorldGen) {
String tDimensionName = aWorld.provider.getDimensionName();
- GT_Log.out.println("Generated Orevein:" + this.mWorldGenName + " Dimension="
- + tDimensionName + " mX="
- + aChunkX / 16 + " mZ="
- + aChunkZ / 16 + " oreseedX="
- + aSeedX / 16 + " oreseedZ="
- + aSeedZ / 16 + " cY="
- + tMinY + " wXVein"
- + wXVein + " eXVein"
- + eXVein + " nZVein"
- + nZVein + " sZVein"
- + sZVein + " locDen="
- + localDensity + " Den="
- + this.mDensity + " Sec="
- + placeCount[1] + " Spo="
- + placeCount[3] + " Bet="
- + placeCount[2] + " Pri="
- + placeCount[0]);
+ GT_Log.out.println(
+ "Generated Orevein:" + this.mWorldGenName
+ + " Dimension="
+ + tDimensionName
+ + " mX="
+ + aChunkX / 16
+ + " mZ="
+ + aChunkZ / 16
+ + " oreseedX="
+ + aSeedX / 16
+ + " oreseedZ="
+ + aSeedZ / 16
+ + " cY="
+ + tMinY
+ + " wXVein"
+ + wXVein
+ + " eXVein"
+ + eXVein
+ + " nZVein"
+ + nZVein
+ + " sZVein"
+ + sZVein
+ + " locDen="
+ + localDensity
+ + " Den="
+ + this.mDensity
+ + " Sec="
+ + placeCount[1]
+ + " Spo="
+ + placeCount[3]
+ + " Bet="
+ + placeCount[2]
+ + " Pri="
+ + placeCount[0]);
}
// Something (at least the bottom layer must have 1 block) must have been placed, return true
return ORE_PLACED;
}
- private String fString = "unset",
- ore1String = "unset",
- ore2String = "unset",
- ore3String = "unset",
+ private String fString = "unset", ore1String = "unset", ore2String = "unset", ore3String = "unset",
ore4String = "unset";
Map<Materials, String> gtOreMap = new HashMap<Materials, String>();
@@ -473,20 +469,16 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
// Set GT ORE
if (aMetaData instanceof GT_Block_Ores) {
if (ore1String.equals("unset")) {
- ore1String =
- Utils.sanitizeString(this.mPrimary.getLocalizedName().toLowerCase());
+ ore1String = Utils.sanitizeString(this.mPrimary.getLocalizedName().toLowerCase());
}
if (ore2String.equals("unset")) {
- ore2String = Utils.sanitizeString(
- this.mSecondaryMeta.getLocalizedName().toLowerCase());
+ ore2String = Utils.sanitizeString(this.mSecondaryMeta.getLocalizedName().toLowerCase());
}
if (ore3String.equals("unset")) {
- ore3String = Utils.sanitizeString(
- this.mBetweenMeta.getLocalizedName().toLowerCase());
+ ore3String = Utils.sanitizeString(this.mBetweenMeta.getLocalizedName().toLowerCase());
}
if (ore4String.equals("unset")) {
- ore4String = Utils.sanitizeString(
- this.mSporadicMeta.getLocalizedName().toLowerCase());
+ ore4String = Utils.sanitizeString(this.mSporadicMeta.getLocalizedName().toLowerCase());
}
if (this.mPrimaryMeta == aMetaData) {
@@ -498,8 +490,14 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
if (fString.contains(ore1String)) {
int r = f.mMetaItemSubID;
if (setOreBlock(aWorld, aX, aY, aZ, r, false)) {
- Logger.WORLD("[World Generation Debug] Set " + f.mDefaultLocalName + " Ore at X: " + aX
- + " | Y: " + aY + " | Z: " + aZ);
+ Logger.WORLD(
+ "[World Generation Debug] Set " + f.mDefaultLocalName
+ + " Ore at X: "
+ + aX
+ + " | Y: "
+ + aY
+ + " | Z: "
+ + aZ);
return true;
}
}
@@ -514,8 +512,14 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
if (fString.contains(ore2String)) {
int r = f.mMetaItemSubID;
if (setOreBlock(aWorld, aX, aY, aZ, r, false)) {
- Logger.WORLD("[World Generation Debug] Set " + f.mDefaultLocalName + " Ore at X: " + aX
- + " | Y: " + aY + " | Z: " + aZ);
+ Logger.WORLD(
+ "[World Generation Debug] Set " + f.mDefaultLocalName
+ + " Ore at X: "
+ + aX
+ + " | Y: "
+ + aY
+ + " | Z: "
+ + aZ);
return true;
}
}
@@ -530,8 +534,14 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
if (fString.contains(ore3String)) {
int r = f.mMetaItemSubID;
if (setOreBlock(aWorld, aX, aY, aZ, r, false)) {
- Logger.WORLD("[World Generation Debug] Set " + f.mDefaultLocalName + " Ore at X: " + aX
- + " | Y: " + aY + " | Z: " + aZ);
+ Logger.WORLD(
+ "[World Generation Debug] Set " + f.mDefaultLocalName
+ + " Ore at X: "
+ + aX
+ + " | Y: "
+ + aY
+ + " | Z: "
+ + aZ);
return true;
}
}
@@ -546,8 +556,14 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
if (fString.contains(ore4String)) {
int r = f.mMetaItemSubID;
if (setOreBlock(aWorld, aX, aY, aZ, r, false)) {
- Logger.WORLD("[World Generation Debug] Set " + f.mDefaultLocalName + " Ore at X: " + aX
- + " | Y: " + aY + " | Z: " + aZ);
+ Logger.WORLD(
+ "[World Generation Debug] Set " + f.mDefaultLocalName
+ + " Ore at X: "
+ + aX
+ + " | Y: "
+ + aY
+ + " | Z: "
+ + aZ);
return true;
}
}
@@ -570,8 +586,9 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
|| tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sandstone)) {
if (aWorld.setBlock(aX, aY, aZ, tOreBlock, 0, 3)) {
- Logger.WORLD("[World Generation Debug] Set " + tOreBlock.getLocalizedName() + " at X: " + aX + " | Y: "
- + aY + " | Z: " + aZ);
+ Logger.WORLD(
+ "[World Generation Debug] Set " + tOreBlock
+ .getLocalizedName() + " at X: " + aX + " | Y: " + aY + " | Z: " + aZ);
return true;
}
}
@@ -587,8 +604,8 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
// GT 5.08
if (is08) {
try {
- setOres = GT_TileEntity_Ores.class.getDeclaredMethod(
- "setOreBlock", World.class, int.class, int.class, int.class, int.class);
+ setOres = GT_TileEntity_Ores.class
+ .getDeclaredMethod("setOreBlock", World.class, int.class, int.class, int.class, int.class);
} catch (NoSuchMethodException | SecurityException e) {
}
@@ -597,7 +614,13 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
else {
try {
setOres = GT_TileEntity_Ores.class.getDeclaredMethod(
- "setOreBlock", World.class, int.class, int.class, int.class, int.class, boolean.class);
+ "setOreBlock",
+ World.class,
+ int.class,
+ int.class,
+ int.class,
+ int.class,
+ boolean.class);
} catch (NoSuchMethodException | SecurityException e) {
}
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java
index 77676d8cfa..5c734f5a5e 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java
@@ -1,9 +1,10 @@
package gtPlusPlus.everglades.gen.gt;
+import java.util.Hashtable;
+
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.ORES;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
-import java.util.Hashtable;
public class WorldGen_Ores {
@@ -23,57 +24,219 @@ public class WorldGen_Ores {
* Custom ore Veins
*/
public static WorldGen_GT_Ore_Layer Vein1 = new WorldGen_GT_Ore_Layer(
- "vein1", 0, 60, 30, 2, 16, ORES.AGARDITE_CD, ORES.AGARDITE_LA, ORES.DEMICHELEITE_BR, ORES.IRARSITE);
+ "vein1",
+ 0,
+ 60,
+ 30,
+ 2,
+ 16,
+ ORES.AGARDITE_CD,
+ ORES.AGARDITE_LA,
+ ORES.DEMICHELEITE_BR,
+ ORES.IRARSITE);
public static WorldGen_GT_Ore_Layer Vein2 = new WorldGen_GT_Ore_Layer(
- "vein2", 0, 60, 30, 2, 16, ORES.AGARDITE_ND, ORES.AGARDITE_Y, ORES.KASHINITE, ORES.CERITE);
+ "vein2",
+ 0,
+ 60,
+ 30,
+ 2,
+ 16,
+ ORES.AGARDITE_ND,
+ ORES.AGARDITE_Y,
+ ORES.KASHINITE,
+ ORES.CERITE);
public static WorldGen_GT_Ore_Layer Vein3 = new WorldGen_GT_Ore_Layer(
- "vein3", 0, 60, 30, 3, 32, ORES.CERITE, ORES.NICHROMITE, ORES.XENOTIME, ORES.HIBONITE);
+ "vein3",
+ 0,
+ 60,
+ 30,
+ 3,
+ 32,
+ ORES.CERITE,
+ ORES.NICHROMITE,
+ ORES.XENOTIME,
+ ORES.HIBONITE);
public static WorldGen_GT_Ore_Layer Vein4 = new WorldGen_GT_Ore_Layer(
- "vein4", 0, 60, 40, 3, 32, ORES.GEIKIELITE, ORES.CRYOLITE, ORES.GADOLINITE_CE, ORES.AGARDITE_ND);
+ "vein4",
+ 0,
+ 60,
+ 40,
+ 3,
+ 32,
+ ORES.GEIKIELITE,
+ ORES.CRYOLITE,
+ ORES.GADOLINITE_CE,
+ ORES.AGARDITE_ND);
public static WorldGen_GT_Ore_Layer Vein5 = new WorldGen_GT_Ore_Layer(
- "vein5", 30, 128, 20, 2, 48, ORES.HIBONITE, ORES.YTTRIALITE, ORES.ZIRCONILITE, ORES.CERITE);
+ "vein5",
+ 30,
+ 128,
+ 20,
+ 2,
+ 48,
+ ORES.HIBONITE,
+ ORES.YTTRIALITE,
+ ORES.ZIRCONILITE,
+ ORES.CERITE);
public static WorldGen_GT_Ore_Layer Vein6 = new WorldGen_GT_Ore_Layer(
- "vein6", 0, 40, 20, 2, 48, ORES.XENOTIME, ORES.ZIRKELITE, ORES.CROCROITE, ORES.IRARSITE);
+ "vein6",
+ 0,
+ 40,
+ 20,
+ 2,
+ 48,
+ ORES.XENOTIME,
+ ORES.ZIRKELITE,
+ ORES.CROCROITE,
+ ORES.IRARSITE);
public static WorldGen_GT_Ore_Layer Vein7 = new WorldGen_GT_Ore_Layer(
- "vein7", 40, 128, 20, 2, 48, ORES.HONEAITE, ORES.MIESSIITE, ORES.SAMARSKITE_Y, ORES.SAMARSKITE_YB);
+ "vein7",
+ 40,
+ 128,
+ 20,
+ 2,
+ 48,
+ ORES.HONEAITE,
+ ORES.MIESSIITE,
+ ORES.SAMARSKITE_Y,
+ ORES.SAMARSKITE_YB);
public static WorldGen_GT_Ore_Layer Vein8 = new WorldGen_GT_Ore_Layer(
- "vein8", 0, 40, 20, 2, 48, ORES.TITANITE, ORES.ZIMBABWEITE, ORES.ZIRCON, ORES.FLORENCITE);
+ "vein8",
+ 0,
+ 40,
+ 20,
+ 2,
+ 48,
+ ORES.TITANITE,
+ ORES.ZIMBABWEITE,
+ ORES.ZIRCON,
+ ORES.FLORENCITE);
public static WorldGen_GT_Ore_Layer Vein9 = new WorldGen_GT_Ore_Layer(
- "vein9", 10, 30, 20, 1, 48, ORES.LANTHANITE_CE, FLUORIDES.FLUORITE, ORES.LAFOSSAITE, ORES.FLORENCITE);
+ "vein9",
+ 10,
+ 30,
+ 20,
+ 1,
+ 48,
+ ORES.LANTHANITE_CE,
+ FLUORIDES.FLUORITE,
+ ORES.LAFOSSAITE,
+ ORES.FLORENCITE);
public static WorldGen_GT_Ore_Layer Vein10 = new WorldGen_GT_Ore_Layer(
- "vein10", 20, 50, 20, 2, 32, ORES.GEIKIELITE, ORES.YTTROCERITE, ORES.LANTHANITE_LA, ORES.RADIOBARITE);
+ "vein10",
+ 20,
+ 50,
+ 20,
+ 2,
+ 32,
+ ORES.GEIKIELITE,
+ ORES.YTTROCERITE,
+ ORES.LANTHANITE_LA,
+ ORES.RADIOBARITE);
public static WorldGen_GT_Ore_Layer Vein11 = new WorldGen_GT_Ore_Layer(
- "vein11", 30, 70, 20, 1, 48, FLUORIDES.FLUORITE, ORES.KASHINITE, ORES.ZIRCON, ORES.CRYOLITE);
+ "vein11",
+ 30,
+ 70,
+ 20,
+ 1,
+ 48,
+ FLUORIDES.FLUORITE,
+ ORES.KASHINITE,
+ ORES.ZIRCON,
+ ORES.CRYOLITE);
public static WorldGen_GT_Ore_Layer Vein12 = new WorldGen_GT_Ore_Layer(
- "vein12", 40, 80, 20, 3, 32, ORES.CERITE, ORES.ALBURNITE, ORES.MIESSIITE, ORES.HIBONITE);
+ "vein12",
+ 40,
+ 80,
+ 20,
+ 3,
+ 32,
+ ORES.CERITE,
+ ORES.ALBURNITE,
+ ORES.MIESSIITE,
+ ORES.HIBONITE);
/**
* Best Rarest Veins 2017
*/
public static WorldGen_GT_Ore_Layer Vein13 = new WorldGen_GT_Ore_Layer(
- "vein13", 5, 15, 5, 1, 16, ORES.CRYOLITE, ORES.RADIOBARITE, ORES.HONEAITE, ORES.FLORENCITE);
+ "vein13",
+ 5,
+ 15,
+ 5,
+ 1,
+ 16,
+ ORES.CRYOLITE,
+ ORES.RADIOBARITE,
+ ORES.HONEAITE,
+ ORES.FLORENCITE);
public static WorldGen_GT_Ore_Layer Vein14 = new WorldGen_GT_Ore_Layer(
- "vein14", 10, 20, 8, 2, 16, ORES.DEMICHELEITE_BR, ORES.PERROUDITE, ORES.IRARSITE, ORES.RADIOBARITE);
+ "vein14",
+ 10,
+ 20,
+ 8,
+ 2,
+ 16,
+ ORES.DEMICHELEITE_BR,
+ ORES.PERROUDITE,
+ ORES.IRARSITE,
+ ORES.RADIOBARITE);
public static WorldGen_GT_Ore_Layer Vein15 = new WorldGen_GT_Ore_Layer(
- "vein15", 5, 25, 5, 3, 24, ORES.FLUORCAPHITE, ORES.LAFOSSAITE, ORES.GADOLINITE_CE, ORES.GADOLINITE_Y);
+ "vein15",
+ 5,
+ 25,
+ 5,
+ 3,
+ 24,
+ ORES.FLUORCAPHITE,
+ ORES.LAFOSSAITE,
+ ORES.GADOLINITE_CE,
+ ORES.GADOLINITE_Y);
public static WorldGen_GT_Ore_Layer Vein16 = new WorldGen_GT_Ore_Layer(
- "vein16", 0, 25, 4, 2, 32, ORES.YTTROCERITE, ORES.LEPERSONNITE, ORES.LAUTARITE, FLUORIDES.FLUORITE);
+ "vein16",
+ 0,
+ 25,
+ 4,
+ 2,
+ 32,
+ ORES.YTTROCERITE,
+ ORES.LEPERSONNITE,
+ ORES.LAUTARITE,
+ FLUORIDES.FLUORITE);
public static WorldGen_GT_Ore_Layer Vein17 = new WorldGen_GT_Ore_Layer(
- "vein17", 10, 35, 4, 1, 32, ORES.FLORENCITE, ORES.LAUTARITE, ORES.SAMARSKITE_YB, ORES.POLYCRASE);
+ "vein17",
+ 10,
+ 35,
+ 4,
+ 1,
+ 32,
+ ORES.FLORENCITE,
+ ORES.LAUTARITE,
+ ORES.SAMARSKITE_YB,
+ ORES.POLYCRASE);
public static WorldGen_GT_Ore_Layer Vein18 = new WorldGen_GT_Ore_Layer(
- "vein18", 15, 40, 4, 1, 48, ORES.GADOLINITE_CE, ORES.GADOLINITE_Y, ORES.AGARDITE_LA, ORES.AGARDITE_CD);
+ "vein18",
+ 15,
+ 40,
+ 4,
+ 1,
+ 48,
+ ORES.GADOLINITE_CE,
+ ORES.GADOLINITE_Y,
+ ORES.AGARDITE_LA,
+ ORES.AGARDITE_CD);
- public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins =
- new Hashtable<Long, WorldGen_GT_Ore_Layer>(1024);
+ public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<Long, WorldGen_GT_Ore_Layer>(
+ 1024);
static long ID = 0;
diff --git a/src/main/java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java b/src/main/java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java
index 51776df839..b5c66ff8b4 100644
--- a/src/main/java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java
+++ b/src/main/java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java
@@ -1,12 +1,14 @@
package gtPlusPlus.everglades.item;
-import gtPlusPlus.api.interfaces.ITileTooltip;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+
public class ItemBlockToxicEverglades extends ItemBlock {
protected final int mID;
diff --git a/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java
index 02e0394760..5e3d82a4b4 100644
--- a/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java
+++ b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java
@@ -1,10 +1,7 @@
package gtPlusPlus.everglades.item;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -15,7 +12,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+
public class ItemEvergladesPortalTrigger extends Item {
+
public ItemEvergladesPortalTrigger() {
super();
this.maxStackSize = 1;
@@ -41,16 +44,20 @@ public class ItemEvergladesPortalTrigger extends Item {
@Override
public String getItemStackDisplayName(final ItemStack p_77653_1_) {
- return EnumChatFormatting.GOLD + "Alkalus Disk [" + EnumChatFormatting.RED + "Activated"
- + EnumChatFormatting.GOLD + "]";
+ return EnumChatFormatting.GOLD + "Alkalus Disk ["
+ + EnumChatFormatting.RED
+ + "Activated"
+ + EnumChatFormatting.GOLD
+ + "]";
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
list.add(EnumChatFormatting.GREEN + "Shines the way, towards the far away Everglades.");
- list.add(EnumChatFormatting.GREEN
- + "This item produces such a temperature, that you'd hate to use it incorrectly.");
+ list.add(
+ EnumChatFormatting.GREEN
+ + "This item produces such a temperature, that you'd hate to use it incorrectly.");
super.addInformation(stack, aPlayer, list, bool);
}
@@ -60,17 +67,8 @@ public class ItemEvergladesPortalTrigger extends Item {
}
@Override
- public boolean onItemUse(
- ItemStack par1ItemStack,
- EntityPlayer par2EntityPlayer,
- World par3World,
- int par4,
- int par5,
- int par6,
- int par7,
- float par8,
- float par9,
- float par10) {
+ public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4,
+ int par5, int par6, int par7, float par8, float par9, float par10) {
if (par7 == 0) {
par5--;
}
@@ -95,7 +93,12 @@ public class ItemEvergladesPortalTrigger extends Item {
Block i1 = par3World.getBlock(par4, par5, par6);
if (i1 == Blocks.air) {
par3World.playSoundEffect(
- par4 + 0.5D, par5 + 0.5D, par6 + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F);
+ par4 + 0.5D,
+ par5 + 0.5D,
+ par6 + 0.5D,
+ "fire.ignite",
+ 1.0F,
+ itemRand.nextFloat() * 0.4F + 0.8F);
if (Dimension_Everglades.portalBlock.tryToCreatePortal(par3World, par4, par5, par6)) {
// Make a Portal
} else {
diff --git a/src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java b/src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java
index d407cd6f21..115697d3af 100644
--- a/src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java
+++ b/src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java
@@ -1,8 +1,9 @@
package gtPlusPlus.everglades.object;
-import gtPlusPlus.api.objects.data.Pair;
import net.minecraft.block.Block;
+import gtPlusPlus.api.objects.data.Pair;
+
public class BoxedQuad<K, V, C, R> {
private final Pair<Block, Integer> key;
@@ -11,16 +12,13 @@ public class BoxedQuad<K, V, C, R> {
private final Pair<Block, Integer> value3;
private final Pair<Block, Integer>[] mInternalPairArray;
- public BoxedQuad(
- final Pair<Block, Integer> key,
- final Pair<Block, Integer> value,
- final Pair<Block, Integer> value2,
- final Pair<Block, Integer> value3) {
+ public BoxedQuad(final Pair<Block, Integer> key, final Pair<Block, Integer> value,
+ final Pair<Block, Integer> value2, final Pair<Block, Integer> value3) {
this.key = key;
this.value = value;
this.value2 = value2;
this.value3 = value3;
- mInternalPairArray = new Pair[] {key, value, value2, value3};
+ mInternalPairArray = new Pair[] { key, value, value2, value3 };
}
public final Pair<Block, Integer> getKey() {
diff --git a/src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java b/src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java
index 95ea14858e..1c0cfb8301 100644
--- a/src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java
+++ b/src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java
@@ -3,6 +3,7 @@ package gtPlusPlus.everglades.world;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
import net.minecraft.world.WorldType;
public class CustomWorldType extends WorldType {
diff --git a/src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java b/src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java
index bfeb8c94ad..21c48ea17d 100644
--- a/src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java
+++ b/src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java
@@ -3,6 +3,7 @@ package gtPlusPlus.everglades.world;
import net.minecraft.util.ChunkCoordinates;
public class EvergladesPortalPosition extends ChunkCoordinates {
+
public long field_85087_d;
final TeleporterDimensionMod field_85088_e;
diff --git a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java
index ee8488ab75..1d700b16b0 100644
--- a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java
+++ b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java
@@ -1,7 +1,7 @@
package gtPlusPlus.everglades.world;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import java.util.*;
+
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.util.*;
@@ -9,6 +9,8 @@ import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.Teleporter;
import net.minecraft.world.WorldServer;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+
public class TeleporterDimensionMod extends Teleporter {
private final WorldServer worldServerInstance;
@@ -21,8 +23,8 @@ public class TeleporterDimensionMod extends Teleporter {
*/
private final LongHashMap destinationCoordinateCache = new LongHashMap();
/**
- * A list of valid keys for the destinationCoordainteCache. These are
- * based on the X & Z of the players initial location.
+ * A list of valid keys for the destinationCoordainteCache. These are based on the X & Z of the players initial
+ * location.
*/
@SuppressWarnings("rawtypes")
private final List destinationCoordinateKeys = new ArrayList();
@@ -57,8 +59,8 @@ public class TeleporterDimensionMod extends Teleporter {
int l1 = j + j1;
int i2 = k + i1 * b1 - l * b0;
boolean flag = j1 < 0;
- this.worldServerInstance.setBlock(
- k1, l1, i2, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air);
+ this.worldServerInstance
+ .setBlock(k1, l1, i2, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air);
}
}
}
@@ -86,8 +88,8 @@ public class TeleporterDimensionMod extends Teleporter {
int l3;
if (this.destinationCoordinateCache.containsItem(j1)) {
- Teleporter.PortalPosition portalposition =
- (Teleporter.PortalPosition) this.destinationCoordinateCache.getValueByKey(j1);
+ Teleporter.PortalPosition portalposition = (Teleporter.PortalPosition) this.destinationCoordinateCache
+ .getValueByKey(j1);
d3 = 0.0D;
i = portalposition.posX;
j = portalposition.posY;
@@ -125,8 +127,8 @@ public class TeleporterDimensionMod extends Teleporter {
if (d3 >= 0.0D) {
if (flag) {
- this.destinationCoordinateCache.add(
- j1, new Teleporter.PortalPosition(i, j, k, this.worldServerInstance.getTotalWorldTime()));
+ this.destinationCoordinateCache
+ .add(j1, new Teleporter.PortalPosition(i, j, k, this.worldServerInstance.getTotalWorldTime()));
this.destinationCoordinateKeys.add(Long.valueOf(j1));
}
@@ -262,8 +264,7 @@ public class TeleporterDimensionMod extends Teleporter {
for (k2 = k - b0; k2 <= k + b0; ++k2) {
d2 = k2 + 0.5D - par1Entity.posZ;
- label274:
- for (i3 = this.worldServerInstance.getActualHeight() - 1; i3 >= 0; --i3) {
+ label274: for (i3 = this.worldServerInstance.getActualHeight() - 1; i3 >= 0; --i3) {
if (this.worldServerInstance.isAirBlock(i2, i3, k2)) {
while (i3 > 0 && this.worldServerInstance.isAirBlock(i2, i3 - 1, k2)) {
--i3;
@@ -286,10 +287,8 @@ public class TeleporterDimensionMod extends Teleporter {
int j5 = k2 + (j4 - 1) * l3 - i4 * k3;
if (k4 < 0
- && !this.worldServerInstance
- .getBlock(l4, i5, j5)
- .getMaterial()
- .isSolid()
+ && !this.worldServerInstance.getBlock(l4, i5, j5).getMaterial()
+ .isSolid()
|| k4 >= 0 && !this.worldServerInstance.isAirBlock(l4, i5, j5)) {
continue label274;
}
@@ -319,8 +318,7 @@ public class TeleporterDimensionMod extends Teleporter {
for (k2 = k - b0; k2 <= k + b0; ++k2) {
d2 = k2 + 0.5D - par1Entity.posZ;
- label222:
- for (i3 = this.worldServerInstance.getActualHeight() - 1; i3 >= 0; --i3) {
+ label222: for (i3 = this.worldServerInstance.getActualHeight() - 1; i3 >= 0; --i3) {
if (this.worldServerInstance.isAirBlock(i2, i3, k2)) {
while (i3 > 0 && this.worldServerInstance.isAirBlock(i2, i3 - 1, k2)) {
--i3;
@@ -337,10 +335,8 @@ public class TeleporterDimensionMod extends Teleporter {
i5 = k2 + (i4 - 1) * l3;
if (j4 < 0
- && !this.worldServerInstance
- .getBlock(k4, l4, i5)
- .getMaterial()
- .isSolid()
+ && !this.worldServerInstance.getBlock(k4, l4, i5).getMaterial()
+ .isSolid()
|| j4 >= 0 && !this.worldServerInstance.isAirBlock(k4, l4, i5)) {
continue label222;
}
@@ -395,8 +391,8 @@ public class TeleporterDimensionMod extends Teleporter {
i4 = j2 + k3;
j4 = k2 + (j3 - 1) * l2 - i3 * l5;
flag = k3 < 0;
- this.worldServerInstance.setBlock(
- l3, i4, j4, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air);
+ this.worldServerInstance
+ .setBlock(l3, i4, j4, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air);
}
}
}
@@ -424,8 +420,8 @@ public class TeleporterDimensionMod extends Teleporter {
l3 = k5 + (j3 - 1) * l5;
i4 = j2 + k3;
j4 = k2 + (j3 - 1) * l2;
- this.worldServerInstance.notifyBlocksOfNeighborChange(
- l3, i4, j4, this.worldServerInstance.getBlock(l3, i4, j4));
+ this.worldServerInstance
+ .notifyBlocksOfNeighborChange(l3, i4, j4, this.worldServerInstance.getBlock(l3, i4, j4));
}
}
}
@@ -434,8 +430,8 @@ public class TeleporterDimensionMod extends Teleporter {
}
/**
- * called periodically to remove out-of-date portal locations from the
- * cache list. Argument par1 is a WorldServer.getTotalWorldTime() value.
+ * called periodically to remove out-of-date portal locations from the cache list. Argument par1 is a
+ * WorldServer.getTotalWorldTime() value.
*/
@Override
public void removeStalePortalLocations(long par1) {
@@ -446,8 +442,8 @@ public class TeleporterDimensionMod extends Teleporter {
while (iterator.hasNext()) {
Long olong = (Long) iterator.next();
- Teleporter.PortalPosition portalposition =
- (Teleporter.PortalPosition) this.destinationCoordinateCache.getValueByKey(olong.longValue());
+ Teleporter.PortalPosition portalposition = (Teleporter.PortalPosition) this.destinationCoordinateCache
+ .getValueByKey(olong.longValue());
if (portalposition == null || portalposition.lastUpdateTime < j) {
iterator.remove();
@@ -458,6 +454,7 @@ public class TeleporterDimensionMod extends Teleporter {
}
public class PortalPosition extends ChunkCoordinates {
+
/**
* The worldtime at which this PortalPosition was last verified
*/
diff --git a/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java
index 7618885d08..6a4ef65f17 100644
--- a/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java
+++ b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java
@@ -1,11 +1,9 @@
package gtPlusPlus.everglades.world;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.everglades.biome.GenLayerEverglades;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+
import net.minecraft.crash.CrashReport;
import net.minecraft.crash.CrashReportCategory;
import net.minecraft.util.ReportedException;
@@ -18,6 +16,10 @@ import net.minecraft.world.biome.WorldChunkManager;
import net.minecraft.world.gen.layer.GenLayer;
import net.minecraft.world.gen.layer.IntCache;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.everglades.biome.GenLayerEverglades;
+
public class WorldChunkManagerCustom extends WorldChunkManager {
private GenLayer genBiomes;
@@ -28,7 +30,7 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
/** A list of biomes that the player can spawn in. */
private List<BiomeGenBase> biomesToSpawnIn;
- @SuppressWarnings({"rawtypes"})
+ @SuppressWarnings({ "rawtypes" })
public WorldChunkManagerCustom() {
this.biomeCache = new BiomeCache(this);
this.biomesToSpawnIn = new ArrayList();
@@ -58,8 +60,7 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
}
/**
- * Returns a list of rainfall values for the specified blocks. Args:
- * listToReuse, x, z, width, length.
+ * Returns a list of rainfall values for the specified blocks. Args: listToReuse, x, z, width, length.
*/
@Override
public float[] getRainfall(float[] listToReuse, int x, int z, int width, int length) {
@@ -97,8 +98,7 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
}
/**
- * Return an adjusted version of a given temperature based on the y
- * height
+ * Return an adjusted version of a given temperature based on the y height
*/
@Override
@SideOnly(Side.CLIENT)
@@ -110,8 +110,8 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
* Returns an array of biomes for the location input.
*/
@Override
- public BiomeGenBase[] getBiomesForGeneration(
- BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, int par5) {
+ public BiomeGenBase[] getBiomesForGeneration(BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4,
+ int par5) {
IntCache.resetIntCache();
if (par1ArrayOfBiomeGenBase == null || par1ArrayOfBiomeGenBase.length < par4 * par5) {
@@ -139,9 +139,8 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
}
/**
- * Returns biomes to use for the blocks and loads the other data like
- * temperature and humidity onto the WorldChunkManager Args:
- * oldBiomeList, x, z, width, depth
+ * Returns biomes to use for the blocks and loads the other data like temperature and humidity onto the
+ * WorldChunkManager Args: oldBiomeList, x, z, width, depth
*/
@Override
public BiomeGenBase[] loadBlockGeneratorData(BiomeGenBase[] oldBiomeList, int x, int z, int width, int depth) {
@@ -149,13 +148,12 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
}
/**
- * Return a list of biomes for the specified blocks. Args: listToReuse,
- * x, y, width, length, cacheFlag (if false, don't check biomeCache to
- * avoid infinite loop in BiomeCacheBlock)
+ * Return a list of biomes for the specified blocks. Args: listToReuse, x, y, width, length, cacheFlag (if false,
+ * don't check biomeCache to avoid infinite loop in BiomeCacheBlock)
*/
@Override
- public BiomeGenBase[] getBiomeGenAt(
- BiomeGenBase[] listToReuse, int x, int y, int width, int length, boolean cacheFlag) {
+ public BiomeGenBase[] getBiomeGenAt(BiomeGenBase[] listToReuse, int x, int y, int width, int length,
+ boolean cacheFlag) {
IntCache.resetIntCache();
if (listToReuse == null || listToReuse.length < width * length) {
@@ -214,14 +212,13 @@ public class WorldChunkManagerCustom extends WorldChunkManager {
}
/**
- * Finds a valid position within a range, that is in one of the listed
- * biomes. Searches {par1,par2} +-par3 blocks. Strongly favors positive
- * y positions.
+ * Finds a valid position within a range, that is in one of the listed biomes. Searches {par1,par2} +-par3 blocks.
+ * Strongly favors positive y positions.
*/
@Override
@SuppressWarnings("rawtypes")
- public ChunkPosition findBiomePosition(
- int p_150795_1_, int p_150795_2_, int p_150795_3_, List p_150795_4_, Random p_150795_5_) {
+ public ChunkPosition findBiomePosition(int p_150795_1_, int p_150795_2_, int p_150795_3_, List p_150795_4_,
+ Random p_150795_5_) {
IntCache.resetIntCache();
int l = p_150795_1_ - p_150795_3_ >> 2;
int i1 = p_150795_2_ - p_150795_3_ >> 2;
diff --git a/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java b/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java
index 1bd026af72..9b25025263 100644
--- a/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java
+++ b/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java
@@ -1,14 +1,15 @@
package gtPlusPlus.everglades.world;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.everglades.chunk.ChunkProviderModded;
-import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import net.minecraft.util.Vec3;
import net.minecraft.world.WorldProvider;
import net.minecraft.world.WorldType;
import net.minecraft.world.chunk.IChunkProvider;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.everglades.chunk.ChunkProviderModded;
+import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+
public class WorldProviderMod extends WorldProvider {
@Override
diff --git a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java
index e84b7a1d03..dc566d9896 100644
--- a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java
+++ b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java
@@ -1,5 +1,15 @@
package gtPlusPlus.nei;
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
+
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler;
@@ -11,14 +21,6 @@ import gtPlusPlus.core.item.materials.DustDecayable;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.VanillaColours;
import gtPlusPlus.nei.handlers.NeiTextureHandler;
-import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
public class DecayableRecipeHandler extends TemplateRecipeHandler {
@@ -45,14 +47,13 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler {
}
public void loadTransferRects() {
- this.transferRects.add(
- new RecipeTransferRect(new Rectangle(6, 3, 16, 16), getOverlayIdentifier(), new Object[0]));
+ this.transferRects
+ .add(new RecipeTransferRect(new Rectangle(6, 3, 16, 16), getOverlayIdentifier(), new Object[0]));
}
public void loadCraftingRecipes(ItemStack result) {
- if (result == null
- || (!DustDecayable.class.isInstance(result.getItem())
- && !BaseItemDustUnique.class.isInstance(result.getItem()))) {
+ if (result == null || (!DustDecayable.class.isInstance(result.getItem())
+ && !BaseItemDustUnique.class.isInstance(result.getItem()))) {
return;
}
if (result != null) {
@@ -131,16 +132,16 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler {
if (cost > 0) {
// NEI Strings
- String s = I18n.format("GTPP.nei.info", new Object[] {cost});
- String s0 = I18n.format("GTPP.nei.timetaken", new Object[] {cost});
+ String s = I18n.format("GTPP.nei.info", new Object[] { cost });
+ String s0 = I18n.format("GTPP.nei.timetaken", new Object[] { cost });
// Time Strings
- String s1 = I18n.format("GTPP.time.ticks", new Object[] {cost});
- String s2 = I18n.format("GTPP.time.seconds", new Object[] {cost});
- String s3 = I18n.format("GTPP.time.minutes", new Object[] {cost});
- String s4 = I18n.format("GTPP.time.hours", new Object[] {cost});
- String s5 = I18n.format("GTPP.time.days", new Object[] {cost});
- String s6 = I18n.format("GTPP.time.months", new Object[] {cost});
+ String s1 = I18n.format("GTPP.time.ticks", new Object[] { cost });
+ String s2 = I18n.format("GTPP.time.seconds", new Object[] { cost });
+ String s3 = I18n.format("GTPP.time.minutes", new Object[] { cost });
+ String s4 = I18n.format("GTPP.time.hours", new Object[] { cost });
+ String s5 = I18n.format("GTPP.time.days", new Object[] { cost });
+ String s6 = I18n.format("GTPP.time.months", new Object[] { cost });
int y = 20;
int secs = cost / 20;
@@ -198,6 +199,7 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler {
}
public class DecayableRecipeNEI extends TemplateRecipeHandler.CachedRecipe implements Comparable<CachedRecipe> {
+
private PositionedStack input;
private PositionedStack output;
public int time;
diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java
index 62d2a26cf5..75f4fa3ba0 100644
--- a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java
+++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java
@@ -1,5 +1,19 @@
package gtPlusPlus.nei;
+import java.awt.Rectangle;
+import java.lang.ref.SoftReference;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.lwjgl.opengl.GL11;
+
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.GuiCraftingRecipe;
@@ -17,17 +31,6 @@ import gregtech.api.util.GasSpargingRecipe;
import gregtech.api.util.GasSpargingRecipeMap;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.awt.Rectangle;
-import java.lang.ref.SoftReference;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-import net.minecraft.client.Minecraft;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import org.lwjgl.opengl.GL11;
public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
@@ -35,8 +38,11 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
private SoftReference<List<GasSpargingRecipeNEI>> mCachedRecipes = null;
public GT_NEI_LFTR_Sparging() {
- this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(
- new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier(), new Object[0]));
+ this.transferRects.add(
+ new TemplateRecipeHandler.RecipeTransferRect(
+ new Rectangle(65, 13, 36, 18),
+ this.getOverlayIdentifier(),
+ new Object[0]));
if (!NEI_GT_Config.sIsAdded) {
FMLInterModComms.sendRuntimeMessage(
GT_Values.GT,
@@ -72,21 +78,16 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
}
public void loadTransferRects() {
- this.transferRects.add(
- new RecipeTransferRect(new Rectangle(72, 14, 22, 16), getOverlayIdentifier(), new Object[0]));
+ this.transferRects
+ .add(new RecipeTransferRect(new Rectangle(72, 14, 22, 16), getOverlayIdentifier(), new Object[0]));
}
public List<GasSpargingRecipeNEI> getCache() {
List<GasSpargingRecipeNEI> cache;
if (mCachedRecipes == null || (cache = mCachedRecipes.get()) == null) {
- cache =
- GasSpargingRecipeMap.mRecipes
- .stream() // do not use parallel stream. This is already parallelized by NEI
- .sorted()
- .map(temp -> {
- return createCachedRecipe(temp);
- })
- .collect(Collectors.toList());
+ cache = GasSpargingRecipeMap.mRecipes.stream() // do not use parallel stream. This is already parallelized
+ // by NEI
+ .sorted().map(temp -> { return createCachedRecipe(temp); }).collect(Collectors.toList());
// while the NEI parallelize handlers, for each individual handler it still uses sequential execution model
// so we do not need any synchronization here
mCachedRecipes = new SoftReference<>(cache);
@@ -112,8 +113,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
ArrayList<ItemStack> tResults = new ArrayList<>();
tResults.add(aResult);
tResults.add(GT_OreDictUnificator.get(true, aResult));
- if ((tPrefixMaterial != null)
- && (!tPrefixMaterial.mBlackListed)
+ if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed)
&& (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
@@ -177,8 +177,8 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
}
@Override
- public List<String> handleItemTooltip(
- final GuiRecipe<?> gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) {
+ public List<String> handleItemTooltip(final GuiRecipe<?> gui, final ItemStack aStack, final List<String> currenttip,
+ final int aRecipeIndex) {
final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex);
if ((tObject instanceof GasSpargingRecipeNEI)) {
final GasSpargingRecipeNEI tRecipe = (GasSpargingRecipeNEI) tObject;
@@ -193,11 +193,13 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
if (GT_Utility.areStacksEqual(aStack, aSpargeInput, true)) {
currenttip.add("The amount returned is the remainder after all other outputs.");
}
- currenttip.add("Maximum Output: " + (((FixedPositionedStack) tStack).mChance / 100) + "."
- + ((((FixedPositionedStack) tStack).mChance % 100) < 10
- ? "0" + (((FixedPositionedStack) tStack).mChance % 100)
- : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100))
- + "L");
+ currenttip.add(
+ "Maximum Output: " + (((FixedPositionedStack) tStack).mChance / 100)
+ + "."
+ + ((((FixedPositionedStack) tStack).mChance % 100) < 10
+ ? "0" + (((FixedPositionedStack) tStack).mChance % 100)
+ : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100))
+ + "L");
break;
}
break;
@@ -220,6 +222,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
}
public class FixedPositionedStack extends PositionedStack {
+
public final int mChance;
public boolean permutated = false;
@@ -244,9 +247,8 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem());
if (!permutations.isEmpty()) {
ItemStack stack;
- for (final Iterator<ItemStack> i$ = permutations.iterator();
- i$.hasNext();
- tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[] {stack}))) {
+ for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks
+ .add(GT_Utility.copyAmount(tStack.stackSize, new Object[] { stack }))) {
stack = i$.next();
}
} else {
@@ -255,13 +257,13 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
tDisplayStacks.add(base);
}
} else {
- tDisplayStacks.add(GT_Utility.copy(new Object[] {tStack}));
+ tDisplayStacks.add(GT_Utility.copy(new Object[] { tStack }));
}
}
}
this.items = (tDisplayStacks.toArray(new ItemStack[0]));
if (this.items.length == 0) {
- this.items = new ItemStack[] {new ItemStack(Blocks.fire)};
+ this.items = new ItemStack[] { new ItemStack(Blocks.fire) };
}
this.permutated = true;
this.setPermutationToRender(0);
@@ -280,139 +282,159 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
int tStartIndex = 0;
if (tRecipe.mFluidInputs.length > 0) {
if ((tRecipe.mFluidInputs[0] != null) && (tRecipe.mFluidInputs[0].getFluid() != null)) {
- this.mInputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[0], true), 30, 5));
+ this.mInputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[0], true),
+ 30,
+ 5));
}
- if ((tRecipe.mFluidInputs.length > 1)
- && (tRecipe.mFluidInputs[1] != null)
+ if ((tRecipe.mFluidInputs.length > 1) && (tRecipe.mFluidInputs[1] != null)
&& (tRecipe.mFluidInputs[1].getFluid() != null)) {
- this.mInputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[1], true), 12, 5));
+ this.mInputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[1], true),
+ 12,
+ 5));
}
- if ((tRecipe.mFluidInputs.length > 2)
- && (tRecipe.mFluidInputs[2] != null)
+ if ((tRecipe.mFluidInputs.length > 2) && (tRecipe.mFluidInputs[2] != null)
&& (tRecipe.mFluidInputs[2].getFluid() != null)) {
- this.mInputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[2], true), 48, 5));
+ this.mInputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[2], true),
+ 48,
+ 5));
}
- if ((tRecipe.mFluidInputs.length > 3)
- && (tRecipe.mFluidInputs[3] != null)
+ if ((tRecipe.mFluidInputs.length > 3) && (tRecipe.mFluidInputs[3] != null)
&& (tRecipe.mFluidInputs[3].getFluid() != null)) {
- this.mInputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[3], true), 12, 23));
+ this.mInputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[3], true),
+ 12,
+ 23));
}
- if ((tRecipe.mFluidInputs.length > 4)
- && (tRecipe.mFluidInputs[4] != null)
+ if ((tRecipe.mFluidInputs.length > 4) && (tRecipe.mFluidInputs[4] != null)
&& (tRecipe.mFluidInputs[4].getFluid() != null)) {
- this.mInputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[4], true), 30, 23));
+ this.mInputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[4], true),
+ 30,
+ 23));
}
- if ((tRecipe.mFluidInputs.length > 5)
- && (tRecipe.mFluidInputs[5] != null)
+ if ((tRecipe.mFluidInputs.length > 5) && (tRecipe.mFluidInputs[5] != null)
&& (tRecipe.mFluidInputs[5].getFluid() != null)) {
- this.mInputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[5], true), 48, 23));
+ this.mInputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[5], true),
+ 48,
+ 23));
}
- if ((tRecipe.mFluidInputs.length > 6)
- && (tRecipe.mFluidInputs[6] != null)
+ if ((tRecipe.mFluidInputs.length > 6) && (tRecipe.mFluidInputs[6] != null)
&& (tRecipe.mFluidInputs[6].getFluid() != null)) {
- this.mInputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[6], true), 12, 41));
+ this.mInputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[6], true),
+ 12,
+ 41));
}
- if ((tRecipe.mFluidInputs.length > 7)
- && (tRecipe.mFluidInputs[7] != null)
+ if ((tRecipe.mFluidInputs.length > 7) && (tRecipe.mFluidInputs[7] != null)
&& (tRecipe.mFluidInputs[7].getFluid() != null)) {
- this.mInputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[7], true), 30, 41));
+ this.mInputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[7], true),
+ 30,
+ 41));
}
- if ((tRecipe.mFluidInputs.length > 8)
- && (tRecipe.mFluidInputs[8] != null)
+ if ((tRecipe.mFluidInputs.length > 8) && (tRecipe.mFluidInputs[8] != null)
&& (tRecipe.mFluidInputs[8].getFluid() != null)) {
- this.mInputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[8], true), 48, 41));
+ this.mInputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[8], true),
+ 48,
+ 41));
}
}
tStartIndex = 0;
if (tRecipe.mFluidOutputs.length > 0) {
if ((tRecipe.mFluidOutputs[0] != null) && (tRecipe.mFluidOutputs[0].getFluid() != null)) {
- this.mOutputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[0], false),
- 120,
- 5,
- tRecipe.getMaxOutput(tStartIndex++)));
+ this.mOutputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[0], false),
+ 120,
+ 5,
+ tRecipe.getMaxOutput(tStartIndex++)));
}
- if ((tRecipe.mFluidOutputs.length > 1)
- && (tRecipe.mFluidOutputs[1] != null)
+ if ((tRecipe.mFluidOutputs.length > 1) && (tRecipe.mFluidOutputs[1] != null)
&& (tRecipe.mFluidOutputs[1].getFluid() != null)) {
- this.mOutputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[1], true),
- 102,
- 5,
- tRecipe.getMaxOutput(tStartIndex++)));
+ this.mOutputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[1], true),
+ 102,
+ 5,
+ tRecipe.getMaxOutput(tStartIndex++)));
}
- if ((tRecipe.mFluidOutputs.length > 2)
- && (tRecipe.mFluidOutputs[2] != null)
+ if ((tRecipe.mFluidOutputs.length > 2) && (tRecipe.mFluidOutputs[2] != null)
&& (tRecipe.mFluidOutputs[2].getFluid() != null)) {
- this.mOutputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[2], false),
- 138,
- 5,
- tRecipe.getMaxOutput(tStartIndex++)));
+ this.mOutputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[2], false),
+ 138,
+ 5,
+ tRecipe.getMaxOutput(tStartIndex++)));
}
- if ((tRecipe.mFluidOutputs.length > 3)
- && (tRecipe.mFluidOutputs[3] != null)
+ if ((tRecipe.mFluidOutputs.length > 3) && (tRecipe.mFluidOutputs[3] != null)
&& (tRecipe.mFluidOutputs[3].getFluid() != null)) {
- this.mOutputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[3], false),
- 102,
- 23,
- tRecipe.getMaxOutput(tStartIndex++)));
+ this.mOutputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[3], false),
+ 102,
+ 23,
+ tRecipe.getMaxOutput(tStartIndex++)));
}
- if ((tRecipe.mFluidOutputs.length > 4)
- && (tRecipe.mFluidOutputs[4] != null)
+ if ((tRecipe.mFluidOutputs.length > 4) && (tRecipe.mFluidOutputs[4] != null)
&& (tRecipe.mFluidOutputs[4].getFluid() != null)) {
- this.mOutputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[4], false),
- 120,
- 23,
- tRecipe.getMaxOutput(tStartIndex++)));
+ this.mOutputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[4], false),
+ 120,
+ 23,
+ tRecipe.getMaxOutput(tStartIndex++)));
}
- if ((tRecipe.mFluidOutputs.length > 5)
- && (tRecipe.mFluidOutputs[5] != null)
+ if ((tRecipe.mFluidOutputs.length > 5) && (tRecipe.mFluidOutputs[5] != null)
&& (tRecipe.mFluidOutputs[5].getFluid() != null)) {
- this.mOutputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[5], false),
- 138,
- 23,
- tRecipe.getMaxOutput(tStartIndex++)));
+ this.mOutputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[5], false),
+ 138,
+ 23,
+ tRecipe.getMaxOutput(tStartIndex++)));
}
- if ((tRecipe.mFluidOutputs.length > 6)
- && (tRecipe.mFluidOutputs[6] != null)
+ if ((tRecipe.mFluidOutputs.length > 6) && (tRecipe.mFluidOutputs[6] != null)
&& (tRecipe.mFluidOutputs[6].getFluid() != null)) {
- this.mOutputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[6], false),
- 102,
- 41,
- tRecipe.getMaxOutput(tStartIndex++)));
+ this.mOutputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[6], false),
+ 102,
+ 41,
+ tRecipe.getMaxOutput(tStartIndex++)));
}
- if ((tRecipe.mFluidOutputs.length > 7)
- && (tRecipe.mFluidOutputs[7] != null)
+ if ((tRecipe.mFluidOutputs.length > 7) && (tRecipe.mFluidOutputs[7] != null)
&& (tRecipe.mFluidOutputs[7].getFluid() != null)) {
- this.mOutputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[7], false),
- 120,
- 41,
- tRecipe.getMaxOutput(tStartIndex++)));
+ this.mOutputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[7], false),
+ 120,
+ 41,
+ tRecipe.getMaxOutput(tStartIndex++)));
}
- if ((tRecipe.mFluidOutputs.length > 8)
- && (tRecipe.mFluidOutputs[8] != null)
+ if ((tRecipe.mFluidOutputs.length > 8) && (tRecipe.mFluidOutputs[8] != null)
&& (tRecipe.mFluidOutputs[8].getFluid() != null)) {
- this.mOutputs.add(new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[8], false),
- 138,
- 41,
- tRecipe.getMaxOutput(tStartIndex++)));
+ this.mOutputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[8], false),
+ 138,
+ 41,
+ tRecipe.getMaxOutput(tStartIndex++)));
}
}
}
diff --git a/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java
index 63b39cb0ee..42238b55bb 100644
--- a/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java
+++ b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java
@@ -1,10 +1,12 @@
package gtPlusPlus.nei;
+import net.minecraft.nbt.NBTTagCompound;
+
import cpw.mods.fml.common.event.FMLInterModComms;
import gtPlusPlus.core.lib.LoadedMods;
-import net.minecraft.nbt.NBTTagCompound;
public class NEI_IMC_Sender {
+
public static void IMCSender() {
// NEI jar is using some outdated handler names
sendHandler("gtpp.recipe.alloyblastsmelter", "gregtech:gt.blockmachines:810", 1);
@@ -80,10 +82,10 @@ public class NEI_IMC_Sender {
sendCatalyst("crafting", "gregtech:gt.blockmachines:31097", -10);
sendCatalyst("crafting", "gregtech:gt.blockmachines:31098", -10);
- // if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- // // Compound Fabricator
- // sendCatalyst("gt.recipe.fakeAssemblylineProcess", "gregtech:gt.blockmachines:31024");
- // }
+ // if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+ // // Compound Fabricator
+ // sendCatalyst("gt.recipe.fakeAssemblylineProcess", "gregtech:gt.blockmachines:31024");
+ // }
sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:965", -1);
diff --git a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java
index 1da2c7145c..bbc3c5b9a2 100644
--- a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java
+++ b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java
@@ -1,6 +1,5 @@
package gtPlusPlus.nei.handlers;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.Tessellator;
@@ -8,40 +7,35 @@ import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
+
import org.lwjgl.opengl.GL11;
+import gtPlusPlus.core.lib.CORE;
+
/**
* Based on crazypants.enderio.gui.IconEIO
*
* @author Original EIO Author
*
- * This is free and unencumbered software released into the public
- * domain.
+ * This is free and unencumbered software released into the public domain.
*
- * Anyone is free to copy, modify, publish, use, compile, sell, or
- * distribute this software, either in source code form or as a compiled
- * binary, for any purpose, commercial or non-commercial, and by any
- * means.
+ * Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source
+ * code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
*
- * In jurisdictions that recognize copyright laws, the author or authors
- * of this software dedicate any and all copyright interest in the
- * software to the public domain. We make this dedication for the
- * benefit of the public at large and to the detriment of our heirs and
- * successors. We intend this dedication to be an overt act of
- * relinquishment in perpetuity of all present and future rights to this
- * software under copyright law.
+ * In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all
+ * copyright interest in the software to the public domain. We make this dedication for the benefit of the
+ * public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt
+ * act of relinquishment in perpetuity of all present and future rights to this software under copyright law.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
*
* For more information, please refer to <http://unlicense.org/>
*
- * https://github.com/SleepyTrousers/EnderIO/blob/release/1.7.10/2.2/src/main/java/crazypants/render/RenderUtil.java
+ * https://github.com/SleepyTrousers/EnderIO/blob/release/1.7.10/2.2/src/main/java/crazypants/render/RenderUtil.java
*
*/
public final class NeiTextureHandler {
@@ -93,8 +87,8 @@ public final class NeiTextureHandler {
this.renderIcon(x, y, width, height, zLevel, doDraw, false);
}
- public void renderIcon(
- double x, double y, double width, double height, double zLevel, boolean doDraw, boolean flipY) {
+ public void renderIcon(double x, double y, double width, double height, double zLevel, boolean doDraw,
+ boolean flipY) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
Tessellator tessellator = Tessellator.instance;
if (doDraw) {
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java
index f83d33ad6c..4eb1b553c1 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java
@@ -3,12 +3,10 @@ package gtPlusPlus.plugin.agrichem;
public enum AlgaeDefinition {
/*
- * In general, the productivity of freshwater algae is primarily limited by
- * the availability of the nutrient phosphate (PO4-3), while that of
- * marine algae is limited by nitrate (NO3-) or ammonium (NH4+).
- * Some algal species, however, may have unusual nutrient requirements,
- * and their productivity may be limited by certain micronutrients,
- * such as silica, in the case of diatoms.
+ * In general, the productivity of freshwater algae is primarily limited by the availability of the nutrient
+ * phosphate (PO4-3), while that of marine algae is limited by nitrate (NO3-) or ammonium (NH4+). Some algal
+ * species, however, may have unusual nutrient requirements, and their productivity may be limited by certain
+ * micronutrients, such as silica, in the case of diatoms.
*/
Euglenophyta("Euglenophyta", "Euglenoids", true, false, getRGB(147, 168, 50)),
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index 9c7e89f1f5..e105ae82f6 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -2,6 +2,21 @@ package gtPlusPlus.plugin.agrichem;
import static gtPlusPlus.core.lib.CORE.GTNH;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -27,19 +42,6 @@ import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils;
import ic2.core.Ic2Items;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
public class BioRecipes {
@@ -111,8 +113,8 @@ public class BioRecipes {
// 5.08 Salt Water Solution ;)
if (!FluidUtils.doesFluidExist("saltwater")) {
- mSalineWater =
- FluidUtils.generateFluidNoPrefix("saltwater", "Salt Water", 200, new short[] {10, 30, 220, 100});
+ mSalineWater = FluidUtils
+ .generateFluidNoPrefix("saltwater", "Salt Water", 200, new short[] { 10, 30, 220, 100 });
} else {
Materials aSaltWater = MaterialUtils.getMaterial("saltwater");
if (aSaltWater != null) {
@@ -125,7 +127,7 @@ public class BioRecipes {
mSalineWater = FluidUtils.getWildcardFluidStack("saltwater", 1).getFluid();
}
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellSaltWater", 1) == null) {
- new BaseItemComponent("saltwater", "Salt Water", new short[] {10, 30, 220});
+ new BaseItemComponent("saltwater", "Salt Water", new short[] { 10, 30, 220 });
}
}
@@ -136,8 +138,7 @@ public class BioRecipes {
mAmmonia = MISC_MATERIALS.AMMONIA.getFluidStack(1).getFluid();
mEthylene = FluidUtils.getFluidStack("ethylene", 1).getFluid();
mEthanol = FluidUtils.getFluidStack("bioethanol", 1).getFluid();
- mDilutedSulfuricAcid =
- FluidUtils.getFluidStack("dilutedsulfuricacid", 1).getFluid();
+ mDilutedSulfuricAcid = FluidUtils.getFluidStack("dilutedsulfuricacid", 1).getFluid();
mSulfuricAcid = FluidUtils.getFluidStack("sulfuricacid", 1).getFluid();
mFormaldehyde = FluidUtils.getFluidStack("fluid.formaldehyde", 1).getFluid();
mMethane = FluidUtils.getFluidStack("methane", 1).getFluid();
@@ -221,9 +222,8 @@ public class BioRecipes {
// Turn into Cellulose
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getGreenAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10)
- },
+ new ItemStack[] { getGreenAlgaeRecipeChip(),
+ ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10) },
GT_Values.NF,
ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 5),
5 * 30,
@@ -274,10 +274,8 @@ public class BioRecipes {
// Turn into Cellulose
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getGoldenBrownAlgaeRecipeChip(),
- ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 10)
- },
+ new ItemStack[] { getGoldenBrownAlgaeRecipeChip(),
+ ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 10) },
GT_Values.NF,
ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 5),
5 * 30,
@@ -292,9 +290,8 @@ public class BioRecipes {
// Turn into Cellulose
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getRedAlgaeRecipeChip(), ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 10)
- },
+ new ItemStack[] { getRedAlgaeRecipeChip(),
+ ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 10) },
GT_Values.NF,
ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 5),
5 * 30,
@@ -314,7 +311,7 @@ public class BioRecipes {
// Craft into Wood Pellets
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)},
+ new ItemStack[] { getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12) },
GT_Values.NF,
ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 24),
12 * 4,
@@ -336,17 +333,11 @@ public class BioRecipes {
// Plastic
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(16), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 500),
- FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 500),
- },
+ new ItemStack[] { getBioChip(16), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4), },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 500),
+ FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 500), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mLiquidPlastic, (1000)),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidPlastic, (1000)), },
10 * 20,
240,
2);
@@ -355,16 +346,14 @@ public class BioRecipes {
private static void recipeWoodPellets() {
// Shapeless Recipe
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {
- ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
- ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
- ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
- ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
- ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
- ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
- ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
- ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1)
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 1) },
ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 2));
// Extruder Recipe
@@ -377,7 +366,7 @@ public class BioRecipes {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 8)},
+ new ItemStack[] { getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 8) },
GT_Values.NF,
ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 2),
20 * 5,
@@ -414,7 +403,7 @@ public class BioRecipes {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {getBioChip(3), ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50)},
+ new ItemStack[] { getBioChip(3), ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50) },
GT_Values.NF,
ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 1),
100 * 20,
@@ -425,7 +414,7 @@ public class BioRecipes {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)},
+ new ItemStack[] { getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4) },
GT_Values.NF,
ItemUtils.getSimpleStack(Items.paper, 4),
2 * 20,
@@ -435,12 +424,9 @@ public class BioRecipes {
private static void recipeCatalystCarrier() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getBioChip(20),
- ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", GTNH ? 8 : 4),
- ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 4 : 2),
- ItemUtils.getItemStackOfAmountFromOreDict("screwTin", GTNH ? 6 : 3)
- },
+ new ItemStack[] { getBioChip(20), ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", GTNH ? 8 : 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 4 : 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("screwTin", GTNH ? 6 : 3) },
GT_Values.NF,
CI.getEmptyCatalyst(1),
300 * 20,
@@ -450,12 +436,9 @@ public class BioRecipes {
private static void recipeAluminiumSilverCatalyst() {
// Assembly Recipe
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- getBioChip(4),
- CI.getEmptyCatalyst(10),
- ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 4)
- },
+ new ItemStack[] { getBioChip(4), CI.getEmptyCatalyst(10),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 4) },
GT_Values.NF,
CI.getGreenCatalyst(10),
20 * 20,
@@ -464,41 +447,29 @@ public class BioRecipes {
private static void recipeAceticAcid() {
- /* GT_Values.RA.addMixerRecipe(
- CI.getGreenCatalyst(10),
- var2,
- var3, var4,
- var5, // Fluid in
- var6, // Fluid out
- var7, // Item Out
- var8, // Time
- var9); // Eu
- */
+ /*
+ * GT_Values.RA.addMixerRecipe( CI.getGreenCatalyst(10), var2, var3, var4, var5, // Fluid in var6, // Fluid out
+ * var7, // Item Out var8, // Time var9); // Eu
+ */
// CH4O + CO = C2H4O2
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getGreenCatalyst(0)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mMethanol, 700),
- FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 700),
- },
+ new ItemStack[] { CI.getGreenCatalyst(0) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethanol, 700),
+ FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 700), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 700),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 700), },
120 * 20,
60,
1);
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedBioCircuit(14), CI.emptyCells(1)},
+ new ItemStack[] { CI.getNumberedBioCircuit(14), CI.emptyCells(1) },
FluidUtils.getFluidStack(mFermentationBase, 1000),
null,
- new ItemStack[] {
- ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 2),
- ItemUtils.getItemStackOfAmountFromOreDict("cellAceticAcid", 1)
- },
- new int[] {10000, 10000},
+ new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellAceticAcid", 1) },
+ new int[] { 10000, 10000 },
60 * 20,
16);
}
@@ -564,14 +535,10 @@ public class BioRecipes {
}
if (ItemUtils.checkForInvalidItems(a)) {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getBioChip(2), ItemUtils.getSimpleStack(a, 10)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000),
- },
+ new ItemStack[] { getBioChip(2), ItemUtils.getSimpleStack(a, 10) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), },
30 * 20,
2,
0);
@@ -580,14 +547,10 @@ public class BioRecipes {
for (ItemStack a : aSeeds) {
if (ItemUtils.checkForInvalidItems(a)) {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getBioChip(3), ItemUtils.getSimpleStack(a, 20)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000),
- },
+ new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(a, 20) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), },
30 * 20,
2,
0);
@@ -596,31 +559,20 @@ public class BioRecipes {
// Sugar Cane
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getBioChip(4), ItemUtils.getSimpleStack(Items.reeds, 32)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000),
- },
+ new ItemStack[] { getBioChip(4), ItemUtils.getSimpleStack(Items.reeds, 32) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), },
30 * 20,
30,
0);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(5),
- ItemUtils.getSimpleStack(Items.reeds, 32),
- ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 2)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000),
- },
+ new ItemStack[] { getBioChip(5), ItemUtils.getSimpleStack(Items.reeds, 32),
+ ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 2) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 2000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 2000), },
10 * 20,
30,
0);
@@ -629,33 +581,20 @@ public class BioRecipes {
if (OreDictUtils.containsValidEntries("cropSugarbeet")) {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(4), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000),
- },
+ new ItemStack[] { getBioChip(4), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4), },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000), },
30 * 20,
30,
0);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(5),
- ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4),
- ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 2)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000),
- },
+ new ItemStack[] { getBioChip(5), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4),
+ ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 2) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 2000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 2000), },
10 * 20,
30,
0);
@@ -663,19 +602,13 @@ public class BioRecipes {
// Produce Acetone, Butanol and Ethanol
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(5),
- ItemUtils.getItemStackOfAmountFromOreDict("cellFermentationBase", 48),
- ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6),
- ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 16),
- },
+ new ItemStack[] { getBioChip(5), ItemUtils.getItemStackOfAmountFromOreDict("cellFermentationBase", 48),
+ ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6),
+ ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 16), },
new FluidStack[] {},
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellButanol", 18),
- ItemUtils.getItemStackOfAmountFromOreDict("cellAcetone", 9),
- ItemUtils.getItemStackOfAmountFromOreDict("cellEthanol", 3),
- CI.emptyCells(18)
- },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellButanol", 18),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellAcetone", 9),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEthanol", 3), CI.emptyCells(18) },
new FluidStack[] {},
100 * 20,
32,
@@ -685,16 +618,12 @@ public class BioRecipes {
private static void recipePropionicAcid() {
// C2H4 + CO + H2O = C3H6O2
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getGreenCatalyst(0)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mEthylene, 1000),
- FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 1000),
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000),
- },
+ new ItemStack[] { CI.getGreenCatalyst(0) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthylene, 1000),
+ FluidUtils.getFluidStack(BioRecipes.mCarbonMonoxide, 1000),
+ FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 1000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 1000), },
10 * 20,
60,
1);
@@ -731,29 +660,21 @@ public class BioRecipes {
private static void recipeSodiumHydroxide() {
// NaCl·H2O = NaOH + Cl + H
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getBioChip(4)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mSalineWater, 1000),
- },
- new ItemStack[] {ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 3)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mChlorine, 1000),
- FluidUtils.getFluidStack(BioRecipes.mHydrogen, 1000),
- },
+ new ItemStack[] { getBioChip(4) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mSalineWater, 1000), },
+ new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 3) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mChlorine, 1000),
+ FluidUtils.getFluidStack(BioRecipes.mHydrogen, 1000), },
300 * 20,
120,
1);
// Na + H2O = NaOH + H
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getBioChip(5), ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 5)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000),
- },
- new ItemStack[] {ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 15)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mHydrogen, 5000),
- },
+ new ItemStack[] { getBioChip(5), ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 5) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000), },
+ new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 15) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mHydrogen, 5000), },
60 * 20,
60,
1);
@@ -764,34 +685,24 @@ public class BioRecipes {
if (OreDictUtils.containsValidEntries("fuelCoke")) {
// Na2CO3 + Al2O3 =C= 2NaAlO2 + CO2
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(18),
- ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 1),
- ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6),
- ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5)
- },
+ new ItemStack[] { getBioChip(18), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 1),
+ ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6),
+ ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5) },
new FluidStack[] {},
- new ItemStack[] {ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1000),
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1000), },
120 * 20,
120,
1);
}
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(18),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 2),
- ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6),
- ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5)
- },
+ new ItemStack[] { getBioChip(18), ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 2),
+ ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6),
+ ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5) },
new FluidStack[] {},
- new ItemStack[] {ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1000),
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 1000), },
180 * 20,
120,
1);
@@ -799,8 +710,8 @@ public class BioRecipes {
private static void recipePelletMold() {
GregtechItemList.Pellet_Mold.set(ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 1));
- GT_Values.RA.addLatheRecipe(
- ALLOY.TUMBAGA.getBlock(1), GregtechItemList.Pellet_Mold.get(1), null, 20 * 30 * 15, 90);
+ GT_Values.RA
+ .addLatheRecipe(ALLOY.TUMBAGA.getBlock(1), GregtechItemList.Pellet_Mold.get(1), null, 20 * 30 * 15, 90);
}
private static void recipeAluminiumPellet() {
@@ -865,19 +776,15 @@ public class BioRecipes {
for (String aOreName : aOreNames) {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(14),
- ItemUtils.getSimpleStack(aOreCache.get(aOreName), aOreData2.get(aOreName))
- },
- new FluidStack[] {FluidUtils.getSteam(2000 * aOreData2.get(aOreName))},
- new ItemStack[] {
- ItemUtils.getSimpleStack(
- AgriculturalChem.mCleanAluminiumMix, (int) (Math.ceil(aOreData3.get(aOreName) * 1.4)))
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(
- AgriculturalChem.RedMud, 100 * (int) (Math.ceil(aOreData3.get(aOreName) * 1.4)))
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(14),
+ ItemUtils.getSimpleStack(aOreCache.get(aOreName), aOreData2.get(aOreName)) },
+ new FluidStack[] { FluidUtils.getSteam(2000 * aOreData2.get(aOreName)) },
+ new ItemStack[] { ItemUtils.getSimpleStack(
+ AgriculturalChem.mCleanAluminiumMix,
+ (int) (Math.ceil(aOreData3.get(aOreName) * 1.4))) },
+ new FluidStack[] { FluidUtils.getFluidStack(
+ AgriculturalChem.RedMud,
+ 100 * (int) (Math.ceil(aOreData3.get(aOreName) * 1.4))) },
20 * 60,
aOreData1.get(aOreName),
aOreName.equals("Bauxite") ? 2 : 1);
@@ -935,7 +842,7 @@ public class BioRecipes {
ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLithium", 5),
ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 2),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallPotassium", 5),
- new int[] {7500, 8000, 8500, 9000, 7500, 8500},
+ new int[] { 7500, 8000, 8500, 9000, 7500, 8500 },
60 * 30,
60);
}
@@ -951,7 +858,7 @@ public class BioRecipes {
ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLithium", 7),
ItemUtils.getItemStackOfAmountFromOreDict("dustAsh", 2),
ItemUtils.getItemStackOfAmountFromOreDict("dustAsh", 2),
- new int[] {7500, 8000, 8500, 9000, 9000, 9000},
+ new int[] { 7500, 8000, 8500, 9000, 9000, 9000 },
45 * 30,
90);
}
@@ -959,50 +866,33 @@ public class BioRecipes {
private static void recipeAlginicAcid() {
- /*// Turn into Cellulose Pulp
- CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
- getBioChip(7),
- ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 20),
- ItemUtils.getSimpleStack(AgriculturalChem.mAlginicAcid, 5)
- },
- GT_Values.NF,
- ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 20),
- 90 * 20,
- 16);*/
+ /*
+ * // Turn into Cellulose Pulp CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { getBioChip(7),
+ * ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 20),
+ * ItemUtils.getSimpleStack(AgriculturalChem.mAlginicAcid, 5) }, GT_Values.NF,
+ * ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 20), 90 * 20, 16);
+ */
}
private static void recipeSulfuricAcid() {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(7),
- ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10),
- ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 6)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000),
- },
+ new ItemStack[] { getBioChip(7), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10),
+ ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 6) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 5000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 5000), },
50 * 20,
60,
1);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(7),
- ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 2),
- ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 10)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000),
- },
+ new ItemStack[] { getBioChip(7),
+ ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 2),
+ ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 10) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 5000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mSulfuricAcid, 5000), },
6 * 20,
180,
3);
@@ -1012,32 +902,22 @@ public class BioRecipes {
// 2NH3 + CO2 = CH4N2O + H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(9),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mAmmonia, 600),
- FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 300),
- },
+ new ItemStack[] { getBioChip(9), },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mAmmonia, 600),
+ FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 300), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mUrea, 300),
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 300),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 300),
+ FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 300), },
5 * 20,
30,
1);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(9),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mUrea, 200),
- FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 200),
- },
+ new ItemStack[] { getBioChip(9), },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 200),
+ FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 200), },
new ItemStack[] {},
- new FluidStack[] {FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 200)},
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 200) },
5 * 20,
30,
1);
@@ -1046,17 +926,10 @@ public class BioRecipes {
private static void recipeRawBioResin() {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(3),
- ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 5),
- ItemUtils.getSimpleStack(Blocks.dirt, 1)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 100),
- },
- new ItemStack[] {
- ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1),
- },
+ new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 5),
+ ItemUtils.getSimpleStack(Blocks.dirt, 1) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 100), },
+ new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1), },
new FluidStack[] {},
1 * 20,
30,
@@ -1066,24 +939,18 @@ public class BioRecipes {
private static void recipeLiquidResin() {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mEthanol, 200),
- },
+ new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthanol, 200), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 500),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 500), },
5 * 20,
30,
1);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 8)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 144),
- },
- new ItemStack[] {ItemUtils.getSimpleStack(Ic2Items.resin, 32)},
+ new ItemStack[] { getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 8) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 144), },
+ new ItemStack[] { ItemUtils.getSimpleStack(Ic2Items.resin, 32) },
new FluidStack[] {},
60 * 20,
30,
@@ -1095,15 +962,11 @@ public class BioRecipes {
if (LoadedMods.Forestry) {
aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertForestry, 32);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(11),
- ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16),
- ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mUrea, 200),
- },
- new ItemStack[] {aFert},
+ new ItemStack[] { getBioChip(11),
+ ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16),
+ ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 200), },
+ new ItemStack[] { aFert },
new FluidStack[] {},
30 * 20,
60,
@@ -1112,15 +975,10 @@ public class BioRecipes {
aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertIC2, 32);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(12),
- ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16),
- ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mUrea, 200),
- },
- new ItemStack[] {aFert},
+ new ItemStack[] { getBioChip(12), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16),
+ ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mUrea, 200), },
+ new ItemStack[] { aFert },
new FluidStack[] {},
30 * 20,
60,
@@ -1130,32 +988,21 @@ public class BioRecipes {
private static void recipeMethane() {
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {getBioChip(12), ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 10)},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 500),
- },
+ new ItemStack[] { getBioChip(12), ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 10) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 500), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mMethane, 500),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethane, 500), },
5 * 20,
64,
1);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(13),
- ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 8),
- ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6),
- ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 4)
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mMethane, 2000),
- },
+ new ItemStack[] { getBioChip(13), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 8),
+ ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6),
+ ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 4) },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethane, 2000), },
new ItemStack[] {},
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mEthylene, 2000),
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthylene, 2000), },
10 * 20,
60,
1);
@@ -1165,15 +1012,11 @@ public class BioRecipes {
// 6CH4 = C6H6 + 18H
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(19), CI.getGreenCatalyst(0),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mMethane, 6000),
- },
+ new ItemStack[] { getBioChip(19), CI.getGreenCatalyst(0), },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mMethane, 6000), },
new ItemStack[] {},
- new FluidStack[] {FluidUtils.getFluidStack(BioRecipes.mBenzene, 1000), Materials.Hydrogen.getGas(18000)
- },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mBenzene, 1000),
+ Materials.Hydrogen.getGas(18000) },
8 * 20,
120,
2);
@@ -1183,14 +1026,10 @@ public class BioRecipes {
// C8H10 = C8H8 + 2H
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- getBioChip(20), CI.getGreenCatalyst(0),
- },
- new FluidStack[] {
- FluidUtils.getFluidStack(BioRecipes.mEthylbenzene, 100),
- },
+ new ItemStack[] { getBioChip(20), CI.getGreenCatalyst(0), },
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mEthylbenzene, 100), },
new ItemStack[] {},
- new FluidStack[] {FluidUtils.getFluidStack(BioRecipes.mStyrene, 100), Materials.Hydrogen.getGas(200)},
+ new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mStyrene, 100), Materials.Hydrogen.getGas(200) },
16 * 20,
480,
2);
@@ -1200,127 +1039,138 @@ public class BioRecipes {
GT_ModHandler.addShapelessCraftingRecipe(
GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 0L),
0,
- new Object[] {OrePrefixes.circuit.get(Materials.Primitive)});
+ new Object[] { OrePrefixes.circuit.get(Materials.Primitive) });
long bits = 0;
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 1L, new Object[0]), bits, new Object[] {
- "d ", " P ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 1L, new Object[0]),
+ bits,
+ new Object[] { "d ", " P ", " ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 2L, new Object[0]), bits, new Object[] {
- " d ", " P ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 2L, new Object[0]),
+ bits,
+ new Object[] { " d ", " P ", " ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 3L, new Object[0]), bits, new Object[] {
- " d", " P ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 3L, new Object[0]),
+ bits,
+ new Object[] { " d", " P ", " ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 4L, new Object[0]), bits, new Object[] {
- " ", " Pd", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 4L, new Object[0]),
+ bits,
+ new Object[] { " ", " Pd", " ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 5L, new Object[0]), bits, new Object[] {
- " ", " P ", " d", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 5L, new Object[0]),
+ bits,
+ new Object[] { " ", " P ", " d", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 6L, new Object[0]), bits, new Object[] {
- " ", " P ", " d ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 6L, new Object[0]),
+ bits,
+ new Object[] { " ", " P ", " d ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 7L, new Object[0]), bits, new Object[] {
- " ", " P ", "d ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 7L, new Object[0]),
+ bits,
+ new Object[] { " ", " P ", "d ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 8L, new Object[0]), bits, new Object[] {
- " ", "dP ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 8L, new Object[0]),
+ bits,
+ new Object[] { " ", "dP ", " ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 9L, new Object[0]), bits, new Object[] {
- "P d", " ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 9L, new Object[0]),
+ bits,
+ new Object[] { "P d", " ", " ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 10L, new Object[0]), bits, new Object[] {
- "P ", " d", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 10L, new Object[0]),
+ bits,
+ new Object[] { "P ", " d", " ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 11L, new Object[0]), bits, new Object[] {
- "P ", " ", " d", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 11L, new Object[0]),
+ bits,
+ new Object[] { "P ", " ", " d", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 12L, new Object[0]), bits, new Object[] {
- "P ", " ", " d ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 12L, new Object[0]),
+ bits,
+ new Object[] { "P ", " ", " d ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 13L, new Object[0]), bits, new Object[] {
- " P", " ", " d", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 13L, new Object[0]),
+ bits,
+ new Object[] { " P", " ", " d", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 14L, new Object[0]), bits, new Object[] {
- " P", " ", " d ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 14L, new Object[0]),
+ bits,
+ new Object[] { " P", " ", " d ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 15L, new Object[0]), bits, new Object[] {
- " P", " ", "d ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 15L, new Object[0]),
+ bits,
+ new Object[] { " P", " ", "d ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 16L, new Object[0]), bits, new Object[] {
- " P", "d ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 16L, new Object[0]),
+ bits,
+ new Object[] { " P", "d ", " ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 17L, new Object[0]), bits, new Object[] {
- " ", " ", "d P", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 17L, new Object[0]),
+ bits,
+ new Object[] { " ", " ", "d P", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 18L, new Object[0]), bits, new Object[] {
- " ", "d ", " P", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 18L, new Object[0]),
+ bits,
+ new Object[] { " ", "d ", " P", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 19L, new Object[0]), bits, new Object[] {
- "d ", " ", " P", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 19L, new Object[0]),
+ bits,
+ new Object[] { "d ", " ", " P", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 20L, new Object[0]), bits, new Object[] {
- " d ", " ", " P", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 20L, new Object[0]),
+ bits,
+ new Object[] { " d ", " ", " P", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 21L, new Object[0]), bits, new Object[] {
- "d ", " ", "P ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 21L, new Object[0]),
+ bits,
+ new Object[] { "d ", " ", "P ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 22L, new Object[0]), bits, new Object[] {
- " d ", " ", "P ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 22L, new Object[0]),
+ bits,
+ new Object[] { " d ", " ", "P ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 23L, new Object[0]), bits, new Object[] {
- " d", " ", "P ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 23L, new Object[0]),
+ bits,
+ new Object[] { " d", " ", "P ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
addCraftingRecipe(
- GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 24L, new Object[0]), bits, new Object[] {
- " ", " d", "P ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])
- });
+ GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 24L, new Object[0]),
+ bits,
+ new Object[] { " ", " d", "P ", 'P',
+ GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0]) });
}
public static boolean addCraftingRecipe(ItemStack aResult, long aBitMask, Object[] aRecipe) {
- Method mAddRecipe = ReflectionUtils.getMethod(GT_ModHandler.class, "addCraftingRecipe", new Class[] {
- ItemStack.class,
- Enchantment[].class,
- int[].class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- Object[].class
- });
+ Method mAddRecipe = ReflectionUtils.getMethod(
+ GT_ModHandler.class,
+ "addCraftingRecipe",
+ new Class[] { ItemStack.class, Enchantment[].class, int[].class, boolean.class, boolean.class,
+ boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class,
+ boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, Object[].class });
boolean didInvoke = false;
if (mAddRecipe != null) {
try {
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java b/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java
index 995734a05b..22f1ef0b34 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java
@@ -1,8 +1,9 @@
package gtPlusPlus.plugin.agrichem;
-import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData;
+
public interface IAlgalItem {
public abstract AlgaeDefinition getAlgaeType(ItemStack aStack);
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java b/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
index 8f3ef7a5e6..8a0ae95061 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
@@ -1,30 +1,17 @@
package gtPlusPlus.plugin.agrichem.block;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+
public class AgrichemFluids {
/*
- * Saline Water - saltwater
- * Sulfuric Waste Water - sulfuricapatite
- * Methanol - methanol
- * Hot Water - ic2hotwater
- * Acetic Acid
- * Propionic Acid
- * Fermentation Base
- * Ethylene - ethylene
- * Ethanol - bioethanol
- * Diluted SA - filutedsulfuricacid
- * Sulfuric Acid - sulfuricacid
- * Urea
- * Formaldehyde - fluid.formaldehyde
- * Liquid Resin
- * Methane - methane
- * Benzene - benzene
- * Ethylbenzene - fluid.ethylbenzene
- * Styrene - styrene
+ * Saline Water - saltwater Sulfuric Waste Water - sulfuricapatite Methanol - methanol Hot Water - ic2hotwater
+ * Acetic Acid Propionic Acid Fermentation Base Ethylene - ethylene Ethanol - bioethanol Diluted SA -
+ * filutedsulfuricacid Sulfuric Acid - sulfuricacid Urea Formaldehyde - fluid.formaldehyde Liquid Resin Methane -
+ * methane Benzene - benzene Ethylbenzene - fluid.ethylbenzene Styrene - styrene
*/
public static Fluid mAceticAcid;
@@ -37,43 +24,52 @@ public class AgrichemFluids {
public static void init() {
if (!FluidRegistry.isFluidRegistered("aceticacid")) {
- mAceticAcid = FluidUtils.generateFluidNoPrefix(
- "aceticacid", "Acetic Acid", 200, new short[] {97, 168, 96, 100}, true);
+ mAceticAcid = FluidUtils
+ .generateFluidNoPrefix("aceticacid", "Acetic Acid", 200, new short[] { 97, 168, 96, 100 }, true);
} else {
mAceticAcid = FluidRegistry.getFluid("aceticacid");
}
if (!FluidRegistry.isFluidRegistered("propionicacid")) {
mPropionicAcid = FluidUtils.generateFluidNoPrefix(
- "propionicacid", "Propionic Acid", 200, new short[] {198, 209, 148, 100}, true);
+ "propionicacid",
+ "Propionic Acid",
+ 200,
+ new short[] { 198, 209, 148, 100 },
+ true);
} else {
mPropionicAcid = FluidRegistry.getFluid("propionicacid");
}
if (!FluidRegistry.isFluidRegistered("fermentation.base")) {
mFermentationBase = FluidUtils.generateFluidNoPrefix(
- "fermentation.base", "Fermentation Base", 200, new short[] {107, 100, 63, 100}, true);
+ "fermentation.base",
+ "Fermentation Base",
+ 200,
+ new short[] { 107, 100, 63, 100 },
+ true);
} else {
mFermentationBase = FluidRegistry.getFluid("fermentation.base");
}
if (!FluidRegistry.isFluidRegistered("ureamix")) {
- mUrea = FluidUtils.generateFluidNoPrefix("ureamix", "Urea Mix", 200, new short[] {71, 55, 12, 100}, true);
+ mUrea = FluidUtils.generateFluidNoPrefix("ureamix", "Urea Mix", 200, new short[] { 71, 55, 12, 100 }, true);
} else {
mUrea = FluidRegistry.getFluid("ureamix");
}
if (!FluidRegistry.isFluidRegistered("liquidresin")) {
- mLiquidResin = FluidUtils.generateFluidNoPrefix(
- "liquidresin", "Liquid Resin", 200, new short[] {59, 58, 56, 100}, true);
+ mLiquidResin = FluidUtils
+ .generateFluidNoPrefix("liquidresin", "Liquid Resin", 200, new short[] { 59, 58, 56, 100 }, true);
} else {
mLiquidResin = FluidRegistry.getFluid("liquidresin");
}
if (!FluidRegistry.isFluidRegistered("acetone")) {
- mAcetone = FluidUtils.generateFluidNoPrefix("acetone", "Acetone", 200, new short[] {59, 58, 56, 100}, true);
+ mAcetone = FluidUtils
+ .generateFluidNoPrefix("acetone", "Acetone", 200, new short[] { 59, 58, 56, 100 }, true);
} else {
mAcetone = FluidRegistry.getFluid("acetone");
}
if (!FluidRegistry.isFluidRegistered("butanol")) {
- mButanol =
- FluidUtils.generateFluidNoPrefix("butanol", "Butanol", 200, new short[] {159, 58, 56, 100}, true);
+ mButanol = FluidUtils
+ .generateFluidNoPrefix("butanol", "Butanol", 200, new short[] { 159, 58, 56, 100 }, true);
} else {
mButanol = FluidRegistry.getFluid("butanol");
}
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java b/src/main/java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java
index 24a0d5fb8f..f8982ffbad 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java
@@ -11,9 +11,9 @@ public class FluidLoader {
public static void generate() {
- FluidFactory.generate(ID_DIRTY_WATER, "dirtywater", new short[] {25, 25, 180});
- FluidFactory.generate(ID_RAW_SEWERAGE, "sewerage", new short[] {100, 45, 25});
- FluidFactory.generate(ID_GUANO, "guano", new short[] {175, 175, 180});
- FluidFactory.generate(ID_POOPJUICE, "poo", new short[] {75, 45, 10});
+ FluidFactory.generate(ID_DIRTY_WATER, "dirtywater", new short[] { 25, 25, 180 });
+ FluidFactory.generate(ID_RAW_SEWERAGE, "sewerage", new short[] { 100, 45, 25 });
+ FluidFactory.generate(ID_GUANO, "guano", new short[] { 175, 175, 180 });
+ FluidFactory.generate(ID_POOPJUICE, "poo", new short[] { 75, 45, 10 });
}
}
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
index cd0007bf02..d7c2b36598 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java
@@ -1,14 +1,9 @@
package gtPlusPlus.plugin.agrichem.item.algae;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.OreDictUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.creativetab.CreativeTabs;
@@ -22,37 +17,24 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.OreDictUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class ItemAgrichemBase extends Item {
protected final IIcon base[];
/*
- * 0 - Algae Biomass
- * 1 - Green Algae Biomass
- * 2 - Brown Algae Biomass
- * 3 - Golden-Brown Algae Biomass
- * 4 - Red Algae Biomass
- * 5 - Cellulose Fiber
- * 6 - Golden-Brown Cellulose Fiber
- * 7 - Red Cellulose Fiber
- * 8 - Compost
- * 9 - Wood Pellet
- * 10 - Wood Brick
- * 11 - Cellulose Pulp
- * 12 - Raw Bio Resin
- * 13 - Catalyst Carrier
- * 14 - Green Metal Catalyst
- * 15 - Alginic Acid
- * 16 - Alumina
- * 17 - Aluminium Pellet
- * 18 - Sodium Aluminate
- * 19 - Sodium Hydroxide // Exists in Newer GT
- * 20 - Sodium Carbonate
- * 21 - Lithium Chloride
- * 22 - Pellet Mold
- * 23 - Clean Aluminium Mix
- * 24 - Pinecone
- * 25 - Crushed Pine
+ * 0 - Algae Biomass 1 - Green Algae Biomass 2 - Brown Algae Biomass 3 - Golden-Brown Algae Biomass 4 - Red Algae
+ * Biomass 5 - Cellulose Fiber 6 - Golden-Brown Cellulose Fiber 7 - Red Cellulose Fiber 8 - Compost 9 - Wood Pellet
+ * 10 - Wood Brick 11 - Cellulose Pulp 12 - Raw Bio Resin 13 - Catalyst Carrier 14 - Green Metal Catalyst 15 -
+ * Alginic Acid 16 - Alumina 17 - Aluminium Pellet 18 - Sodium Aluminate 19 - Sodium Hydroxide // Exists in Newer GT
+ * 20 - Sodium Carbonate 21 - Lithium Chloride 22 - Pellet Mold 23 - Clean Aluminium Mix 24 - Pinecone 25 - Crushed
+ * Pine
*/
public ItemAgrichemBase() {
@@ -76,8 +58,8 @@ public class ItemAgrichemBase extends Item {
}
@Override
- public void onUpdate(
- ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
+ public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_,
+ boolean p_77663_5_) {
super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_);
}
@@ -183,11 +165,8 @@ public class ItemAgrichemBase extends Item {
if (aTestAtlas != null) {
return true;
}
- } catch (InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException e) {
- }
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException e) {}
}
}
return false;
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
index 89c8447b84..6940e0a466 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
@@ -1,14 +1,7 @@
package gtPlusPlus.plugin.agrichem.item.algae;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.plugin.agrichem.AlgaeDefinition;
-import gtPlusPlus.plugin.agrichem.IAlgalItem;
-import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData;
-import gtPlusPlus.plugin.agrichem.logic.AlgaeGrowthRequirement;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
@@ -21,6 +14,15 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.plugin.agrichem.AlgaeDefinition;
+import gtPlusPlus.plugin.agrichem.IAlgalItem;
+import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData;
+import gtPlusPlus.plugin.agrichem.logic.AlgaeGrowthRequirement;
+
public class ItemAlgaeBase extends Item implements IAlgalItem {
protected IIcon base;
@@ -46,8 +48,8 @@ public class ItemAlgaeBase extends Item implements IAlgalItem {
}
@Override
- public void onUpdate(
- ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
+ public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_,
+ boolean p_77663_5_) {
if (!p_77663_1_.hasTagCompound() || p_77663_1_.getTagCompound().hasNoTags()) {
p_77663_1_ = initNBT(p_77663_1_);
}
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
index 3e0bbafeeb..c59076f01d 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
@@ -1,8 +1,9 @@
package gtPlusPlus.plugin.agrichem.logic;
-import gtPlusPlus.api.objects.data.AutoMap;
import net.minecraft.nbt.NBTTagCompound;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class AlgaeGeneticData {
private final int mLifespan;
@@ -29,16 +30,8 @@ public class AlgaeGeneticData {
this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0, new AutoMap<AlgaeGrowthRequirement>());
}
- public AlgaeGeneticData(
- boolean isDominant,
- boolean requiresLight,
- boolean isSalt,
- boolean isFresh,
- byte aTempTolerance,
- float aFertility,
- float aSpeed,
- byte aLifespan,
- int aGeneration,
+ public AlgaeGeneticData(boolean isDominant, boolean requiresLight, boolean isSalt, boolean isFresh,
+ byte aTempTolerance, float aFertility, float aSpeed, byte aLifespan, int aGeneration,
AutoMap<AlgaeGrowthRequirement> aRequirements) {
mIsDominant = isDominant;
mRequiresLight = requiresLight;
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java
index 0c8c0c816f..07b89e5b5e 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java
@@ -1,3 +1,4 @@
package gtPlusPlus.plugin.agrichem.logic;
-public class AlgaeGrowthRequirement {}
+public class AlgaeGrowthRequirement {
+}
diff --git a/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java b/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java
index 7a43e66730..e0af27a504 100644
--- a/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java
+++ b/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java
@@ -1,9 +1,7 @@
package gtPlusPlus.plugin.fishing.item;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.plugin.fishing.misc.BaseFishTypes;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -16,7 +14,12 @@ import net.minecraft.potion.PotionHelper;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.plugin.fishing.misc.BaseFishTypes;
+
public class BaseFish extends ItemFood {
+
private final boolean isCooked;
public BaseFish(boolean cooked) {
@@ -98,7 +101,9 @@ public class BaseFish extends ItemFood {
*/
public String getUnlocalizedName(ItemStack p_77667_1_) {
BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_77667_1_);
- return this.getUnlocalizedName() + "." + fishtype.getFishName() + "."
+ return this.getUnlocalizedName() + "."
+ + fishtype.getFishName()
+ + "."
+ (this.isCooked && fishtype.isCooked() ? "cooked" : "raw");
}
}
diff --git a/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java b/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java
index 70046828b4..04e57e639b 100644
--- a/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java
+++ b/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java
@@ -1,15 +1,19 @@
package gtPlusPlus.plugin.fishing.misc;
-import com.google.common.collect.Maps;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.plugin.fishing.item.BaseFish;
import java.util.Map;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import com.google.common.collect.Maps;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.plugin.fishing.item.BaseFish;
+
public enum BaseFishTypes {
+
COD(0, "cod", 2, 0.1F, 5, 0.6F),
SALMON(1, "salmon", 2, 0.1F, 6, 0.8F),
CLOWNFISH(2, "clownfish", 1, 0.1F),
@@ -31,12 +35,7 @@ public enum BaseFishTypes {
private final float field_150990_m;
private boolean isCooked = false;
- private BaseFishTypes(
- int p_i45336_3_,
- String p_i45336_4_,
- int p_i45336_5_,
- float p_i45336_6_,
- int p_i45336_7_,
+ private BaseFishTypes(int p_i45336_3_, String p_i45336_4_, int p_i45336_5_, float p_i45336_6_, int p_i45336_7_,
float p_i45336_8_) {
this.mID = p_i45336_3_;
this.mFishName = p_i45336_4_;
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java
index 82757a2434..eed695108b 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java
@@ -1,12 +1,13 @@
package gtPlusPlus.plugin.fixes.vanilla;
-import gtPlusPlus.api.interfaces.IPlugin;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.plugin.manager.Core_Manager;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.api.interfaces.IPlugin;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.plugin.manager.Core_Manager;
+
public class Core_VanillaFixes implements IPlugin {
static final Core_VanillaFixes mInstance;
@@ -87,8 +88,11 @@ public class Core_VanillaFixes implements IPlugin {
mInstance.log(
"Registering " + aStack.getDisplayName() + " to OreDictionary under the tag '" + aString + "'.");
} else {
- mInstance.log("Registering " + aStack.getDisplayName() + " to OreDictionary under the tag '" + aString
- + "'. (Added to Forge in 1.8.9)");
+ mInstance.log(
+ "Registering " + aStack.getDisplayName()
+ + " to OreDictionary under the tag '"
+ + aString
+ + "'. (Added to Forge in 1.8.9)");
}
ItemUtils.addItemToOreDictionary(aStack, aString);
}
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
index ebf7729e92..5bf1420c35 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
@@ -1,12 +1,13 @@
package gtPlusPlus.plugin.fixes.vanilla;
+import java.util.Timer;
+import java.util.TimerTask;
+
import gtPlusPlus.api.interfaces.IPlugin;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
import gtPlusPlus.plugin.fixes.vanilla.music.MusicTocker;
import gtPlusPlus.preloader.CORE_Preloader;
-import java.util.Timer;
-import java.util.TimerTask;
public class VanillaBackgroundMusicFix implements IBugFix {
@@ -43,6 +44,7 @@ public class VanillaBackgroundMusicFix implements IBugFix {
}
private static class ManageTask extends TimerTask {
+
private final MusicTocker A;
public ManageTask(MusicTocker a) {
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
index cadb47e50d..5ae6e3e990 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
@@ -1,5 +1,11 @@
package gtPlusPlus.plugin.fixes.vanilla;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
+
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import gtPlusPlus.api.interfaces.IPlugin;
@@ -8,10 +14,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
import gtPlusPlus.preloader.DevHelper;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
public class VanillaBedHeightFix implements IBugFix {
@@ -52,8 +54,7 @@ public class VanillaBedHeightFix implements IBugFix {
* Fix created by deNULL -
* https://github.com/deNULL/BugPatch/blob/master/src/main/java/ru/denull/BugPatch/mod/ClientEvents.java#L45
*
- * @param evt
- * - The event where a player sleeps
+ * @param evt - The event where a player sleeps
*/
@SubscribeEvent(priority = EventPriority.HIGHEST)
public void playerSleepInBed(PlayerSleepInBedEvent evt) {
@@ -62,12 +63,16 @@ public class VanillaBedHeightFix implements IBugFix {
int correctY = 256 + evt.y;
if (correctY <= 0) {
Logger.WARNING(
- "You're trying to sleep at y=" + evt.y + ", which is impossibly low. However, fixed y value is "
- + correctY + ", which is still below 0. Falling back to default behavior.");
+ "You're trying to sleep at y=" + evt.y
+ + ", which is impossibly low. However, fixed y value is "
+ + correctY
+ + ", which is still below 0. Falling back to default behavior.");
} else {
- Logger.WARNING("You're trying to sleep at y=" + evt.y
- + ". This is probably caused by overflow, stopping original event; retrying with y=" + correctY
- + ".");
+ Logger.WARNING(
+ "You're trying to sleep at y=" + evt.y
+ + ". This is probably caused by overflow, stopping original event; retrying with y="
+ + correctY
+ + ".");
evt.result = EntityPlayer.EnumStatus.OTHER_PROBLEM;
try {
mSleepInBedAt.invoke(evt.entityPlayer, evt.x, correctY, evt.z);
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
index 17fbc9ae29..c2af6ea591 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
@@ -1,20 +1,22 @@
package gtPlusPlus.plugin.fixes.vanilla.music;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.interfaces.IPlugin;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
import java.lang.reflect.Field;
import java.util.Random;
+
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.ISound;
import net.minecraft.client.audio.MusicTicker;
import net.minecraft.client.audio.PositionedSoundRecord;
import net.minecraft.util.MathHelper;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.interfaces.IPlugin;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.random.XSTR;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.CORE_Preloader;
+
@SideOnly(Side.CLIENT)
public class MusicTocker extends MusicTicker implements Runnable {
@@ -54,8 +56,7 @@ public class MusicTocker extends MusicTicker implements Runnable {
return true;
}
}
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
mPlugin.log("[BGM] Failed.");
return false;
@@ -112,17 +113,13 @@ public class MusicTocker extends MusicTicker implements Runnable {
}
/*
- * try { // Get Value stored in underlying object. Integer aRealDelay =
+ * try { // Get Value stored in underlying object. Integer aRealDelay = (Integer)
+ * ReflectionUtils.getField(getClass(), "field_147676_d").get(this); if (aRealDelay == null) { return; } else {
+ * if (aRealDelay > getDelay() || aRealDelay <= 0) { this.mTimeUntilNextTrack = getDelay();
+ * updateInternalNumber(); } else { this.mTimeUntilNextTrack -= 5 * 20; updateInternalNumber(); } aRealDelay =
* (Integer) ReflectionUtils.getField(getClass(), "field_147676_d").get(this);
- *
- * if (aRealDelay == null) { return; } else { if (aRealDelay > getDelay() ||
- * aRealDelay <= 0) { this.mTimeUntilNextTrack = getDelay();
- * updateInternalNumber(); } else { this.mTimeUntilNextTrack -= 5 * 20;
- * updateInternalNumber(); } aRealDelay = (Integer)
- * ReflectionUtils.getField(getClass(), "field_147676_d").get(this);
- * Logger.INFO("[BGM] Adjusted BGM - "+aRealDelay); }
- *
- * } catch (IllegalArgumentException | IllegalAccessException e) { }
+ * Logger.INFO("[BGM] Adjusted BGM - "+aRealDelay); } } catch (IllegalArgumentException | IllegalAccessException
+ * e) { }
*/
}
}
diff --git a/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java b/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java
index fd64ed8b24..72ec918d37 100644
--- a/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java
+++ b/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java
@@ -36,8 +36,7 @@ public class Core_Manager {
}
}
return true;
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return false;
}
@@ -51,8 +50,7 @@ public class Core_Manager {
}
}
return true;
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return false;
}
@@ -66,8 +64,7 @@ public class Core_Manager {
}
}
return true;
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return false;
}
@@ -81,8 +78,7 @@ public class Core_Manager {
}
}
return true;
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return false;
}
@@ -96,8 +92,7 @@ public class Core_Manager {
}
}
return true;
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return false;
}
}
diff --git a/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java b/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
index 166261c9cb..782aac0b0a 100644
--- a/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
+++ b/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
@@ -1,5 +1,8 @@
package gtPlusPlus.plugin.sulfurchem;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.api.interfaces.IPlugin;
@@ -12,8 +15,6 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.plugin.manager.Core_Manager;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class Core_SulfuricChemistry implements IPlugin {
@@ -32,8 +33,8 @@ public class Core_SulfuricChemistry implements IPlugin {
@Override
public boolean preInit() {
if (
- /*CORE.ConfigSwitches.enableSulfuricAcidFix || */
- /*CORE.DEVENV*/ false) {
+ /* CORE.ConfigSwitches.enableSulfuricAcidFix || */
+ /* CORE.DEVENV */ false) {
shouldLoad = true;
}
if (shouldLoad) return true;
@@ -186,12 +187,11 @@ public class Core_SulfuricChemistry implements IPlugin {
int mDisabled = 0;
FluidStack mStack = FluidUtils.getFluidStack("sulfurtrioxide", 1);
// Single Block Recipes
- recipe:
- for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList) {
+ recipe: for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList) {
for (ItemStack i : r.mOutputs) {
i.stackSize = 1;
- if (ItemStack.areItemStacksEqual(
- i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
+ if (ItemStack
+ .areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
mRemovedRecipes1.put(r);
r.mEnabled = false;
r.mHidden = true;
@@ -215,12 +215,12 @@ public class Core_SulfuricChemistry implements IPlugin {
// Multi Block Recipes
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- recipe:
- for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
+ recipe: for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
for (ItemStack i : r.mOutputs) {
i.stackSize = 1;
if (ItemStack.areItemStacksEqual(
- i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
+ i,
+ ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
mRemovedRecipes1.put(r);
r.mEnabled = false;
r.mHidden = true;
@@ -251,8 +251,7 @@ public class Core_SulfuricChemistry implements IPlugin {
FluidStack mStack = FluidUtils.getFluidStack("sulfuricacid", 1);
// Single Block Recipes
- recipe:
- for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList) {
+ recipe: for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList) {
for (ItemStack i : r.mOutputs) {
i.stackSize = 1;
if (ItemStack.areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 1))) {
@@ -279,12 +278,11 @@ public class Core_SulfuricChemistry implements IPlugin {
// Multi Block Recipes
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- recipe:
- for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
+ recipe: for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
for (ItemStack i : r.mOutputs) {
i.stackSize = 1;
- if (ItemStack.areItemStacksEqual(
- i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 1))) {
+ if (ItemStack
+ .areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 1))) {
mRemovedRecipes2.put(r);
r.mEnabled = false;
r.mHidden = true;
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java b/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java
index fe588cabbc..9436337d16 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java
@@ -2,6 +2,10 @@ package gtPlusPlus.plugin.villagers;
import static gtPlusPlus.plugin.villagers.VillagerUtils.mVillagerMap;
+import java.util.HashMap;
+
+import net.minecraft.util.ResourceLocation;
+
import cpw.mods.fml.common.registry.VillagerRegistry;
import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
import gtPlusPlus.api.interfaces.IPlugin;
@@ -12,8 +16,6 @@ import gtPlusPlus.plugin.manager.Core_Manager;
import gtPlusPlus.plugin.villagers.trade.TradeHandlerBanker;
import gtPlusPlus.plugin.villagers.trade.TradeHandlerTechnician;
import gtPlusPlus.plugin.villagers.trade.TradeHandlerTrader;
-import java.util.HashMap;
-import net.minecraft.util.ResourceLocation;
public class Core_VillagerAdditions implements IPlugin {
@@ -32,14 +34,19 @@ public class Core_VillagerAdditions implements IPlugin {
@Override
public boolean preInit() {
if (
- /*CORE.ConfigSwitches.enableSulfuricAcidFix || */ CORE.DEVENV) {
+ /* CORE.ConfigSwitches.enableSulfuricAcidFix || */ CORE.DEVENV) {
shouldLoad = true;
}
if (shouldLoad) {
// Register Custom Villager Entity
VillagerUtils.registerNewVillager(0, "Banker", "Banker", "Banker", "banker", new TradeHandlerBanker());
VillagerUtils.registerNewVillager(
- 1, "Technician", "Technician", "Technician", "technician", new TradeHandlerTechnician());
+ 1,
+ "Technician",
+ "Technician",
+ "Technician",
+ "technician",
+ new TradeHandlerTechnician());
VillagerUtils.registerNewVillager(2, "Trader", "Trader", "Trader", "trader", new TradeHandlerTrader());
if (mVillagerMap.size() > 0) {
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java b/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java
index 3c5eccbcc2..a5973701a6 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java
@@ -1,8 +1,9 @@
package gtPlusPlus.plugin.villagers;
-import gtPlusPlus.core.util.math.MathUtils;
import org.apache.commons.lang3.StringUtils;
+import gtPlusPlus.core.util.math.MathUtils;
+
public class NameLists {
public static final String[] mFirstNames;
@@ -16,9747 +17,992 @@ public class NameLists {
}
private static final String[] generateScottishFirstNames() {
- return new String[] {
- "Aadam",
- "Aadit",
- "Aahron",
- "Aaran",
- "Aaren",
- "Aarez",
- "Aarman",
- "Aaron",
- "Aaron-James",
- "Aarron",
- "Aaryan",
- "Aaryn",
- "Aayan",
- "Aazaan",
- "Abaan",
- "Abbas",
- "Abdallah",
- "Abdalroof",
- "Abdihakim",
- "Abdirahman",
- "Abdisalam",
- "Abdul",
- "Abdul-Aziz",
- "Abdulbasir",
- "Abdulkadir",
- "Abdulkarem",
- "Abdulkhader",
- "Abdullah",
- "Abdul-Majeed",
- "Abdulmalik",
- "Abdul-Rehman",
- "Abdur",
- "Abdurraheem",
- "Abdur-Rahman",
- "Abdur-Rehmaan",
- "Abel",
- "Abhinav",
- "Abhisumant",
- "Abid",
- "Abir",
- "Abraham",
- "Abu",
- "Abubakar",
- "Ace",
- "Adain",
- "Adam",
- "Adam-James",
- "Addison",
- "Addisson",
- "Adegbola",
- "Adegbolahan",
- "Aden",
- "Adenn",
- "Adie",
- "Adil",
- "Aditya",
- "Adnan",
- "Adrian",
- "Adrien",
- "Aedan",
- "Aedin",
- "Aedyn",
- "Aeron",
- "Afonso",
- "Ahmad",
- "Ahmed",
- "Ahmed-Aziz",
- "Ahoua",
- "Ahtasham",
- "Aiadan",
- "Aidan",
- "Aiden",
- "Aiden-Jack",
- "Aiden-Vee",
- "Aidian",
- "Aidy",
- "Ailin",
- "Aiman",
- "Ainsley",
- "Ainslie",
- "Airen",
- "Airidas",
- "Airlie",
- "AJ",
- "Ajay",
- "A-Jay",
- "Ajayraj",
- "Akan",
- "Akram",
- "Al",
- "Ala'",
- "Alan",
- "Alanas",
- "Alasdair",
- "Alastair",
- "Alber",
- "Albert",
- "Albie",
- "Aldred",
- "Alec",
- "Aled",
- "Aleem",
- "Aleksandar",
- "Aleksander",
- "Aleksandr",
- "Aleksandrs",
- "Alekzander",
- "Alessandro",
- "Alessio",
- "Alex",
- "Alexander",
- "Alexei",
- "Alexx",
- "Alexzander",
- "Alf",
- "Alfee",
- "Alfie",
- "Alfred",
- "Alfy",
- "Alhaji",
- "Al-Hassan",
- "Ali",
- "Aliekber",
- "Alieu",
- "Alihaider",
- "Alisdair",
- "Alishan",
- "Alistair",
- "Alistar",
- "Alister",
- "Aliyaan",
- "Allan",
- "Allan-Laiton",
- "Allen",
- "Allesandro",
- "Allister",
- "Ally",
- "Alphonse",
- "Altyiab",
- "Alum",
- "Alvern",
- "Alvin",
- "Alyas",
- "Amaan",
- "Aman",
- "Amani",
- "Ambanimoh",
- "Ameer",
- "Amgad",
- "Ami",
- "Amin",
- "Amir",
- "Ammaar",
- "Ammar",
- "Ammer",
- "Amolpreet",
- "Amos",
- "Amrinder",
- "Amrit",
- "Amro",
- "Anay",
- "Andrea",
- "Andreas",
- "Andrei",
- "Andrejs",
- "Andrew",
- "Andy",
- "Anees",
- "Anesu",
- "Angel",
- "Angelo",
- "Angus",
- "Anir",
- "Anis",
- "Anish",
- "Anmolpreet",
- "Annan",
- "Anndra",
- "Anselm",
- "Anthony",
- "Anthony-John",
- "Antoine",
- "Anton",
- "Antoni",
- "Antonio",
- "Antony",
- "Antonyo",
- "Anubhav",
- "Aodhan",
- "Aon",
- "Aonghus",
- "Apisai",
- "Arafat",
- "Aran",
- "Arandeep",
- "Arann",
- "Aray",
- "Arayan",
- "Archibald",
- "Archie",
- "Arda",
- "Ardal",
- "Ardeshir",
- "Areeb",
- "Areez",
- "Aref",
- "Arfin",
- "Argyle",
- "Argyll",
- "Ari",
- "Aria",
- "Arian",
- "Arihant",
- "Aristomenis",
- "Aristotelis",
- "Arjuna",
- "Arlo",
- "Armaan",
- "Arman",
- "Armen",
- "Arnab",
- "Arnav",
- "Arnold",
- "Aron",
- "Aronas",
- "Arran",
- "Arrham",
- "Arron",
- "Arryn",
- "Arsalan",
- "Artem",
- "Arthur",
- "Artur",
- "Arturo",
- "Arun",
- "Arunas",
- "Arved",
- "Arya",
- "Aryan",
- "Aryankhan",
- "Aryian",
- "Aryn",
- "Asa",
- "Asfhan",
- "Ash",
- "Ashlee-jay",
- "Ashley",
- "Ashton",
- "Ashton-Lloyd",
- "Ashtyn",
- "Ashwin",
- "Asif",
- "Asim",
- "Aslam",
- "Asrar",
- "Ata",
- "Atal",
- "Atapattu",
- "Ateeq",
- "Athol",
- "Athon",
- "Athos-Carlos",
- "Atli",
- "Atom",
- "Attila",
- "Aulay",
- "Aun",
- "Austen",
- "Austin",
- "Avani",
- "Averon",
- "Avi",
- "Avinash",
- "Avraham",
- "Awais",
- "Awwal",
- "Axel",
- "Ayaan",
- "Ayan",
- "Aydan",
- "Ayden",
- "Aydin",
- "Aydon",
- "Ayman",
- "Ayomide",
- "Ayren",
- "Ayrton",
- "Aytug",
- "Ayub",
- "Ayyub",
- "Azaan",
- "Azedine",
- "Azeem",
- "Azim",
- "Aziz",
- "Azlan",
- "Azzam",
- "Azzedine",
- "Babatunmise",
- "Babur",
- "Bader",
- "Badr",
- "Badsha",
- "Bailee",
- "Bailey",
- "Bailie",
- "Bailley",
- "Baillie",
- "Baley",
- "Balian",
- "Banan",
- "Barath",
- "Barkley",
- "Barney",
- "Baron",
- "Barrie",
- "Barry",
- "Bartlomiej",
- "Bartosz",
- "Basher",
- "Basile",
- "Baxter",
- "Baye",
- "Bayley",
- "Beau",
- "Beinn",
- "Bekim",
- "Believe",
- "Ben",
- "Bendeguz",
- "Benedict",
- "Benjamin",
- "Benjamyn",
- "Benji",
- "Benn",
- "Bennett",
- "Benny",
- "Benoit",
- "Bentley",
- "Berkay",
- "Bernard",
- "Bertie",
- "Bevin",
- "Bezalel",
- "Bhaaldeen",
- "Bharath",
- "Bilal",
- "Bill",
- "Billy",
- "Binod",
- "Bjorn",
- "Blaike",
- "Blaine",
- "Blair",
- "Blaire",
- "Blake",
- "Blazej",
- "Blazey",
- "Blessing",
- "Blue",
- "Blyth",
- "Bo",
- "Boab",
- "Bob",
- "Bobby",
- "Bobby-Lee",
- "Bodhan",
- "Boedyn",
- "Bogdan",
- "Bohbi",
- "Bony",
- "Bowen",
- "Bowie",
- "Boyd",
- "Bracken",
- "Brad",
- "Bradan",
- "Braden",
- "Bradley",
- "Bradlie",
- "Bradly",
- "Brady",
- "Bradyn",
- "Braeden",
- "Braiden",
- "Brajan",
- "Brandan",
- "Branden",
- "Brandon",
- "Brandonlee",
- "Brandon-Lee",
- "Brandyn",
- "Brannan",
- "Brayden",
- "Braydon",
- "Braydyn",
- "Breandan",
- "Brehme",
- "Brendan",
- "Brendon",
- "Brendyn",
- "Breogan",
- "Bret",
- "Brett",
- "Briaddon",
- "Brian",
- "Brodi",
- "Brodie",
- "Brody",
- "Brogan",
- "Broghan",
- "Brooke",
- "Brooklin",
- "Brooklyn",
- "Bruce",
- "Bruin",
- "Bruno",
- "Brunon",
- "Bryan",
- "Bryce",
- "Bryden",
- "Brydon",
- "Brydon-Craig",
- "Bryn",
- "Brynmor",
- "Bryson",
- "Buddy",
- "Bully",
- "Burak",
- "Burhan",
- "Butali",
- "Butchi",
- "Byron",
- "Cabhan",
- "Cadan",
- "Cade",
- "Caden",
- "Cadon",
- "Cadyn",
- "Caedan",
- "Caedyn",
- "Cael",
- "Caelan",
- "Caelen",
- "Caethan",
- "Cahl",
- "Cahlum",
- "Cai",
- "Caidan",
- "Caiden",
- "Caiden-Paul",
- "Caidyn",
- "Caie",
- "Cailaen",
- "Cailean",
- "Caileb-John",
- "Cailin",
- "Cain",
- "Caine",
- "Cairn",
- "Cal",
- "Calan",
- "Calder",
- "Cale",
- "Calean",
- "Caleb",
- "Calen",
- "Caley",
- "Calib",
- "Calin",
- "Callahan",
- "Callan",
- "Callan-Adam",
- "Calley",
- "Callie",
- "Callin",
- "Callum",
- "Callun",
- "Callyn",
- "Calum",
- "Calum-James",
- "Calvin",
- "Cambell",
- "Camerin",
- "Cameron",
- "Campbel",
- "Campbell",
- "Camron",
- "Caolain",
- "Caolan",
- "Carl",
- "Carlo",
- "Carlos",
- "Carrich",
- "Carrick",
- "Carson",
- "Carter",
- "Carwyn",
- "Casey",
- "Casper",
- "Cassy",
- "Cathal",
- "Cator",
- "Cavan",
- "Cayden",
- "Cayden-Robert",
- "Cayden-Tiamo",
- "Ceejay",
- "Ceilan",
- "Ceiran",
- "Ceirin",
- "Ceiron",
- "Cejay",
- "Celik",
- "Cephas",
- "Cesar",
- "Cesare",
- "Chad",
- "Chaitanya",
- "Chang-Ha",
- "Charles",
- "Charley",
- "Charlie",
- "Charly",
- "Chase",
- "Che",
- "Chester",
- "Chevy",
- "Chi",
- "Chibudom",
- "Chidera",
- "Chimsom",
- "Chin",
- "Chintu",
- "Chiqal",
- "Chiron",
- "Chris",
- "Chris-Daniel",
- "Chrismedi",
- "Christian",
- "Christie",
- "Christoph",
- "Christopher",
- "Christopher-Lee",
- "Christy",
- "Chu",
- "Chukwuemeka",
- "Cian",
- "Ciann",
- "Ciar",
- "Ciaran",
- "Ciarian",
- "Cieran",
- "Cillian",
- "Cillin",
- "Cinar",
- "CJ",
- "C-Jay",
- "Clark",
- "Clarke",
- "Clayton",
- "Clement",
- "Clifford",
- "Clyde",
- "Cobain",
- "Coban",
- "Coben",
- "Cobi",
- "Cobie",
- "Coby",
- "Codey",
- "Codi",
- "Codie",
- "Cody",
- "Cody-Lee",
- "Coel",
- "Cohan",
- "Cohen",
- "Colby",
- "Cole",
- "Colin",
- "Coll",
- "Colm",
- "Colt",
- "Colton",
- "Colum",
- "Colvin",
- "Comghan",
- "Conal",
- "Conall",
- "Conan",
- "Conar",
- "Conghaile",
- "Conlan",
- "Conley",
- "Conli",
- "Conlin",
- "Conlly",
- "Conlon",
- "Conlyn",
- "Connal",
- "Connall",
- "Connan",
- "Connar",
- "Connel",
- "Connell",
- "Conner",
- "Connolly",
- "Connor",
- "Connor-David",
- "Conor",
- "Conrad",
- "Cooper",
- "Copeland",
- "Coray",
- "Corben",
- "Corbin",
- "Corey",
- "Corey-James",
- "Corey-Jay",
- "Cori",
- "Corie",
- "Corin",
- "Cormac",
- "Cormack",
- "Cormak",
- "Corran",
- "Corrie",
- "Cory",
- "Cosmo",
- "Coupar",
- "Craig",
- "Craig-James",
- "Crawford",
- "Creag",
- "Crispin",
- "Cristian",
- "Crombie",
- "Cruiz",
- "Cruz",
- "Cuillin",
- "Cullen",
- "Cullin",
- "Curtis",
- "Cyrus",
- "Daanyaal",
- "Daegan",
- "Daegyu",
- "Dafydd",
- "Dagon",
- "Dailey",
- "Daimhin",
- "Daithi",
- "Dakota",
- "Daksh",
- "Dale",
- "Dalong",
- "Dalton",
- "Damian",
- "Damien",
- "Damon",
- "Dan",
- "Danar",
- "Dane",
- "Danial",
- "Daniel",
- "Daniele",
- "Daniel-James",
- "Daniels",
- "Daniil",
- "Danish",
- "Daniyal",
- "Danniel",
- "Danny",
- "Dante",
- "Danyal",
- "Danyil",
- "Danys",
- "Daood",
- "Dara",
- "Darach",
- "Daragh",
- "Darcy",
- "D'arcy",
- "Dareh",
- "Daren",
- "Darien",
- "Darius",
- "Darl",
- "Darn",
- "Darrach",
- "Darragh",
- "Darrel",
- "Darrell",
- "Darren",
- "Darrie",
- "Darrius",
- "Darroch",
- "Darryl",
- "Darryn",
- "Darwyn",
- "Daryl",
- "Daryn",
- "Daud",
- "Daumantas",
- "Davi",
- "David",
- "David-Jay",
- "David-Lee",
- "Davie",
- "Davis",
- "Davy",
- "Dawid",
- "Dawson",
- "Dawud",
- "Dayem",
- "Daymian",
- "Deacon",
- "Deagan",
- "Dean",
- "Deano",
- "Decklan",
- "Declain",
- "Declan",
- "Declyan",
- "Declyn",
- "Dedeniseoluwa",
- "Deecan",
- "Deegan",
- "Deelan",
- "Deklain-Jaimes",
- "Del",
- "Demetrius",
- "Denis",
- "Deniss",
- "Dennan",
- "Dennin",
- "Dennis",
- "Denny",
- "Dennys",
- "Denon",
- "Denton",
- "Denver",
- "Denzel",
- "Deon",
- "Derek",
- "Derick",
- "Derin",
- "Dermot",
- "Derren",
- "Derrie",
- "Derrin",
- "Derron",
- "Derry",
- "Derryn",
- "Deryn",
- "Deshawn",
- "Desmond",
- "Dev",
- "Devan",
- "Devin",
- "Devlin",
- "Devlyn",
- "Devon",
- "Devrin",
- "Devyn",
- "Dex",
- "Dexter",
- "Dhani",
- "Dharam",
- "Dhavid",
- "Dhyia",
- "Diarmaid",
- "Diarmid",
- "Diarmuid",
- "Didier",
- "Diego",
- "Diesel",
- "Diesil",
- "Digby",
- "Dilan",
- "Dilano",
- "Dillan",
- "Dillon",
- "Dilraj",
- "Dimitri",
- "Dinaras",
- "Dion",
- "Dissanayake",
- "Dmitri",
- "Doire",
- "Dolan",
- "Domanic",
- "Domenico",
- "Domhnall",
- "Dominic",
- "Dominick",
- "Dominik",
- "Donald",
- "Donnacha",
- "Donnie",
- "Dorian",
- "Dougal",
- "Douglas",
- "Dougray",
- "Drakeo",
- "Dre",
- "Dregan",
- "Drew",
- "Dugald",
- "Duncan",
- "Duriel",
- "Dustin",
- "Dylan",
- "Dylan-Jack",
- "Dylan-James",
- "Dylan-John",
- "Dylan-Patrick",
- "Dylin",
- "Dyllan",
- "Dyllan-James",
- "Dyllon",
- "Eadie",
- "Eagann",
- "Eamon",
- "Eamonn",
- "Eason",
- "Eassan",
- "Easton",
- "Ebow",
- "Ed",
- "Eddie",
- "Eden",
- "Ediomi",
- "Edison",
- "Eduardo",
- "Eduards",
- "Edward",
- "Edwin",
- "Edwyn",
- "Eesa",
- "Efan",
- "Efe",
- "Ege",
- "Ehsan",
- "Ehsen",
- "Eiddon",
- "Eidhan",
- "Eihli",
- "Eimantas",
- "Eisa",
- "Eli",
- "Elias",
- "Elijah",
- "Eliot",
- "Elisau",
- "Eljay",
- "Eljon",
- "Elliot",
- "Elliott",
- "Ellis",
- "Ellisandro",
- "Elshan",
- "Elvin",
- "Elyan",
- "Emanuel",
- "Emerson",
- "Emil",
- "Emile",
- "Emir",
- "Emlyn",
- "Emmanuel",
- "Emmet",
- "Eng",
- "Eniola",
- "Enis",
- "Ennis",
- "Enrico",
- "Enrique",
- "Enzo",
- "Eoghain",
- "Eoghan",
- "Eoin",
- "Eonan",
- "Erdehan",
- "Eren",
- "Erencem",
- "Eric",
- "Ericlee",
- "Erik",
- "Eriz",
- "Ernie-Jacks",
- "Eroni",
- "Eryk",
- "Eshan",
- "Essa",
- "Esteban",
- "Ethan",
- "Etienne",
- "Etinosa",
- "Euan",
- "Eugene",
- "Evan",
- "Evann",
- "Ewan",
- "Ewen",
- "Ewing",
- "Exodi",
- "Ezekiel",
- "Ezra",
- "Fabian",
- "Fahad",
- "Faheem",
- "Faisal",
- "Faizaan",
- "Famara",
- "Fares",
- "Farhaan",
- "Farhan",
- "Farren",
- "Farzad",
- "Fauzaan",
- "Favour",
- "Fawaz",
- "Fawkes",
- "Faysal",
- "Fearghus",
- "Feden",
- "Felix",
- "Fergal",
- "Fergie",
- "Fergus",
- "Ferre",
- "Fezaan",
- "Fiachra",
- "Fikret",
- "Filip",
- "Filippo",
- "Finan",
- "Findlay",
- "Findlay-James",
- "Findlie",
- "Finlay",
- "Finley",
- "Finn",
- "Finnan",
- "Finnean",
- "Finnen",
- "Finnlay",
- "Finnley",
- "Fintan",
- "Fionn",
- "Firaaz",
- "Fletcher",
- "Flint",
- "Florin",
- "Flyn",
- "Flynn",
- "Fodeba",
- "Folarinwa",
- "Forbes",
- "Forgan",
- "Forrest",
- "Fox",
- "Francesco",
- "Francis",
- "Francisco",
- "Franciszek",
- "Franco",
- "Frank",
- "Frankie",
- "Franklin",
- "Franko",
- "Fraser",
- "Frazer",
- "Fred",
- "Freddie",
- "Frederick",
- "Fruin",
- "Fyfe",
- "Fyn",
- "Fynlay",
- "Fynn",
- "Gabriel",
- "Gallagher",
- "Gareth",
- "Garren",
- "Garrett",
- "Garry",
- "Gary",
- "Gavin",
- "Gavin-Lee",
- "Gene",
- "Geoff",
- "Geoffrey",
- "Geomer",
- "Geordan",
- "Geordie",
- "George",
- "Georgia",
- "Georgy",
- "Gerard",
- "Ghyll",
- "Giacomo",
- "Gian",
- "Giancarlo",
- "Gianluca",
- "Gianmarco",
- "Gideon",
- "Gil",
- "Gio",
- "Girijan",
- "Girius",
- "Gjan",
- "Glascott",
- "Glen",
- "Glenn",
- "Gordon",
- "Grady",
- "Graeme",
- "Graham",
- "Grahame",
- "Grant",
- "Grayson",
- "Greg",
- "Gregor",
- "Gregory",
- "Greig",
- "Griffin",
- "Griffyn",
- "Grzegorz",
- "Guang",
- "Guerin",
- "Guillaume",
- "Gurardass",
- "Gurdeep",
- "Gursees",
- "Gurthar",
- "Gurveer",
- "Gurwinder",
- "Gus",
- "Gustav",
- "Guthrie",
- "Guy",
- "Gytis",
- "Habeeb",
- "Hadji",
- "Hadyn",
- "Hagun",
- "Haiden",
- "Haider",
- "Hamad",
- "Hamid",
- "Hamish",
- "Hamza",
- "Hamzah",
- "Han",
- "Hansen",
- "Hao",
- "Hareem",
- "Hari",
- "Harikrishna",
- "Haris",
- "Harish",
- "Harjeevan",
- "Harjyot",
- "Harlee",
- "Harleigh",
- "Harley",
- "Harman",
- "Harnek",
- "Harold",
- "Haroon",
- "Harper",
- "Harri",
- "Harrington",
- "Harris",
- "Harrison",
- "Harry",
- "Harvey",
- "Harvie",
- "Harvinder",
- "Hasan",
- "Haseeb",
- "Hashem",
- "Hashim",
- "Hassan",
- "Hassanali",
- "Hately",
- "Havila",
- "Hayden",
- "Haydn",
- "Haydon",
- "Haydyn",
- "Hcen",
- "Hector",
- "Heddle",
- "Heidar",
- "Heini",
- "Hendri",
- "Henri",
- "Henry",
- "Herbert",
- "Heyden",
- "Hiro",
- "Hirvaansh",
- "Hishaam",
- "Hogan",
- "Honey",
- "Hong",
- "Hope",
- "Hopkin",
- "Hosea",
- "Howard",
- "Howie",
- "Hristomir",
- "Hubert",
- "Hugh",
- "Hugo",
- "Humza",
- "Hunter",
- "Husnain",
- "Hussain",
- "Hussan",
- "Hussnain",
- "Hussnan",
- "Hyden",
- "I",
- "Iagan",
- "Iain",
- "Ian",
- "Ibraheem",
- "Ibrahim",
- "Idahosa",
- "Idrees",
- "Idris",
- "Iestyn",
- "Ieuan",
- "Igor",
- "Ihtisham",
- "Ijay",
- "Ikechukwu",
- "Ikemsinachukwu",
- "Ilyaas",
- "Ilyas",
- "Iman",
- "Immanuel",
- "Inan",
- "Indy",
- "Ines",
- "Innes",
- "Ioannis",
- "Ireayomide",
- "Ireoluwa",
- "Irvin",
- "Irvine",
- "Isa",
- "Isaa",
- "Isaac",
- "Isaiah",
- "Isak",
- "Isher",
- "Ishwar",
- "Isimeli",
- "Isira",
- "Ismaeel",
- "Ismail",
- "Israel",
- "Issiaka",
- "Ivan",
- "Ivar",
- "Izaak",
- "J",
- "Jaay",
- "Jac",
- "Jace",
- "Jack",
- "Jacki",
- "Jackie",
- "Jack-James",
- "Jackson",
- "Jacky",
- "Jacob",
- "Jacques",
- "Jad",
- "Jaden",
- "Jadon",
- "Jadyn",
- "Jae",
- "Jagat",
- "Jago",
- "Jaheim",
- "Jahid",
- "Jahy",
- "Jai",
- "Jaida",
- "Jaiden",
- "Jaidyn",
- "Jaii",
- "Jaime",
- "Jai-Rajaram",
- "Jaise",
- "Jak",
- "Jake",
- "Jakey",
- "Jakob",
- "Jaksyn",
- "Jakub",
- "Jamaal",
- "Jamal",
- "Jameel",
- "Jameil",
- "James",
- "James-Paul",
- "Jamey",
- "Jamie",
- "Jan",
- "Jaosha",
- "Jardine",
- "Jared",
- "Jarell",
- "Jarl",
- "Jarno",
- "Jarred",
- "Jarvi",
- "Jasey-Jay",
- "Jasim",
- "Jaskaran",
- "Jason",
- "Jasper",
- "Jaxon",
- "Jaxson",
- "Jay",
- "Jaydan",
- "Jayden",
- "Jayden-James",
- "Jayden-Lee",
- "Jayden-Paul",
- "Jayden-Thomas",
- "Jaydn",
- "Jaydon",
- "Jaydyn",
- "Jayhan",
- "Jay-Jay",
- "Jayke",
- "Jaymie",
- "Jayse",
- "Jayson",
- "Jaz",
- "Jazeb",
- "Jazib",
- "Jazz",
- "Jean",
- "Jean-Lewis",
- "Jean-Pierre",
- "Jebadiah",
- "Jed",
- "Jedd",
- "Jedidiah",
- "Jeemie",
- "Jeevan",
- "Jeffrey",
- "Jensen",
- "Jenson",
- "Jensyn",
- "Jeremy",
- "Jerome",
- "Jeronimo",
- "Jerrick",
- "Jerry",
- "Jesse",
- "Jesuseun",
- "Jeswin",
- "Jevan",
- "Jeyun",
- "Jez",
- "Jia",
- "Jian",
- "Jiao",
- "Jimmy",
- "Jincheng",
- "JJ",
- "Joaquin",
- "Joash",
- "Jock",
- "Jody",
- "Joe",
- "Joeddy",
- "Joel",
- "Joey",
- "Joey-Jack",
- "Johann",
- "Johannes",
- "Johansson",
- "John",
- "Johnathan",
- "Johndean",
- "Johnjay",
- "John-Michael",
- "Johnnie",
- "Johnny",
- "Johnpaul",
- "John-Paul",
- "John-Scott",
- "Johnson",
- "Jole",
- "Jomuel",
- "Jon",
- "Jonah",
- "Jonatan",
- "Jonathan",
- "Jonathon",
- "Jonny",
- "Jonothan",
- "Jon-Paul",
- "Jonson",
- "Joojo",
- "Jordan",
- "Jordi",
- "Jordon",
- "Jordy",
- "Jordyn",
- "Jorge",
- "Joris",
- "Jorryn",
- "Josan",
- "Josef",
- "Joseph",
- "Josese",
- "Josh",
- "Joshiah",
- "Joshua",
- "Josiah",
- "Joss",
- "Jostelle",
- "Joynul",
- "Juan",
- "Jubin",
- "Judah",
- "Jude",
- "Jules",
- "Julian",
- "Julien",
- "Jun",
- "Junior",
- "Jura",
- "Justan",
- "Justin",
- "Justinas",
- "Kaan",
- "Kabeer",
- "Kabir",
- "Kacey",
- "Kacper",
- "Kade",
- "Kaden",
- "Kadin",
- "Kadyn",
- "Kaeden",
- "Kael",
- "Kaelan",
- "Kaelin",
- "Kaelum",
- "Kai",
- "Kaid",
- "Kaidan",
- "Kaiden",
- "Kaidinn",
- "Kaidyn",
- "Kaileb",
- "Kailin",
- "Kain",
- "Kaine",
- "Kainin",
- "Kainui",
- "Kairn",
- "Kaison",
- "Kaiwen",
- "Kajally",
- "Kajetan",
- "Kalani",
- "Kale",
- "Kaleb",
- "Kaleem",
- "Kal-el",
- "Kalen",
- "Kalin",
- "Kallan",
- "Kallin",
- "Kalum",
- "Kalvin",
- "Kalvyn",
- "Kameron",
- "Kames",
- "Kamil",
- "Kamran",
- "Kamron",
- "Kane",
- "Karam",
- "Karamvir",
- "Karandeep",
- "Kareem",
- "Karim",
- "Karimas",
- "Karl",
- "Karol",
- "Karson",
- "Karsyn",
- "Karthikeya",
- "Kasey",
- "Kash",
- "Kashif",
- "Kasim",
- "Kasper",
- "Kasra",
- "Kavin",
- "Kayam",
- "Kaydan",
- "Kayden",
- "Kaydin",
- "Kaydn",
- "Kaydyn",
- "Kaydyne",
- "Kayleb",
- "Kaylem",
- "Kaylum",
- "Kayne",
- "Kaywan",
- "Kealan",
- "Kealon",
- "Kean",
- "Keane",
- "Kearney",
- "Keatin",
- "Keaton",
- "Keavan",
- "Keayn",
- "Kedrick",
- "Keegan",
- "Keelan",
- "Keelin",
- "Keeman",
- "Keenan",
- "Keenan-Lee",
- "Keeton",
- "Kehinde",
- "Keigan",
- "Keilan",
- "Keir",
- "Keiran",
- "Keiren",
- "Keiron",
- "Keiryn",
- "Keison",
- "Keith",
- "Keivlin",
- "Kelam",
- "Kelan",
- "Kellan",
- "Kellen",
- "Kelso",
- "Kelum",
- "Kelvan",
- "Kelvin",
- "Ken",
- "Kenan",
- "Kendall",
- "Kendyn",
- "Kenlin",
- "Kenneth",
- "Kensey",
- "Kenton",
- "Kenyon",
- "Kenzeigh",
- "Kenzi",
- "Kenzie",
- "Kenzo",
- "Kenzy",
- "Keo",
- "Ker",
- "Kern",
- "Kerr",
- "Kevan",
- "Kevin",
- "Kevyn",
- "Kez",
- "Khai",
- "Khalan",
- "Khaleel",
- "Khaya",
- "Khevien",
- "Khizar",
- "Khizer",
- "Kia",
- "Kian",
- "Kian-James",
- "Kiaran",
- "Kiarash",
- "Kie",
- "Kiefer",
- "Kiegan",
- "Kienan",
- "Kier",
- "Kieran",
- "Kieran-Scott",
- "Kieren",
- "Kierin",
- "Kiern",
- "Kieron",
- "Kieryn",
- "Kile",
- "Killian",
- "Kimi",
- "Kingston",
- "Kinneil",
- "Kinnon",
- "Kinsey",
- "Kiran",
- "Kirk",
- "Kirwin",
- "Kit",
- "Kiya",
- "Kiyonari",
- "Kjae",
- "Klein",
- "Klevis",
- "Kobe",
- "Kobi",
- "Koby",
- "Koddi",
- "Koden",
- "Kodi",
- "Kodie",
- "Kody",
- "Kofi",
- "Kogan",
- "Kohen",
- "Kole",
- "Konan",
- "Konar",
- "Konnor",
- "Konrad",
- "Koray",
- "Korben",
- "Korbyn",
- "Korey",
- "Kori",
- "Korrin",
- "Kory",
- "Koushik",
- "Kris",
- "Krish",
- "Krishan",
- "Kriss",
- "Kristian",
- "Kristin",
- "Kristofer",
- "Kristoffer",
- "Kristopher",
- "Kruz",
- "Krzysiek",
- "Krzysztof",
- "Ksawery",
- "Ksawier",
- "Kuba",
- "Kurt",
- "Kurtis",
- "Kurtis-Jae",
- "Kyaan",
- "Kyan",
- "Kyde",
- "Kyden",
- "Kye",
- "Kyel",
- "Kyhran",
- "Kyie",
- "Kylan",
- "Kylar",
- "Kyle",
- "Kyle-Derek",
- "Kylian",
- "Kym",
- "Kynan",
- "Kyral",
- "Kyran",
- "Kyren",
- "Kyrillos",
- "Kyro",
- "Kyron",
- "Kyrran",
- "Lachlainn",
- "Lachlan",
- "Lachlann",
- "Lael",
- "Lagan",
- "Laird",
- "Laison",
- "Lakshya",
- "Lance",
- "Lancelot",
- "Landon",
- "Lang",
- "Lasse",
- "Latif",
- "Lauchlan",
- "Lauchlin",
- "Laughlan",
- "Lauren",
- "Laurence",
- "Laurie",
- "Lawlyn",
- "Lawrence",
- "Lawrie",
- "Lawson",
- "Layne",
- "Layton",
- "Lee",
- "Leigh",
- "Leigham",
- "Leighton",
- "Leilan",
- "Leiten",
- "Leithen",
- "Leland",
- "Lenin",
- "Lennan",
- "Lennen",
- "Lennex",
- "Lennon",
- "Lennox",
- "Lenny",
- "Leno",
- "Lenon",
- "Lenyn",
- "Leo",
- "Leon",
- "Leonard",
- "Leonardas",
- "Leonardo",
- "Lepeng",
- "Leroy",
- "Leven",
- "Levi",
- "Levon",
- "Levy",
- "Lewie",
- "Lewin",
- "Lewis",
- "Lex",
- "Leydon",
- "Leyland",
- "Leylann",
- "Leyton",
- "Liall",
- "Liam",
- "Liam-Stephen",
- "Limo",
- "Lincoln",
- "Lincoln-John",
- "Lincon",
- "Linden",
- "Linton",
- "Lionel",
- "Lisandro",
- "Litrell",
- "Liyonela-Elam",
- "LLeyton",
- "Lliam",
- "Lloyd",
- "Lloyde",
- "Loche",
- "Lochlan",
- "Lochlann",
- "Lochlan-Oliver",
- "Lock",
- "Lockey",
- "Logan",
- "Logann",
- "Logan-Rhys",
- "Loghan",
- "Lokesh",
- "Loki",
- "Lomond",
- "Lorcan",
- "Lorenz",
- "Lorenzo",
- "Lorne",
- "Loudon",
- "Loui",
- "Louie",
- "Louis",
- "Loukas",
- "Lovell",
- "Luc",
- "Luca",
- "Lucais",
- "Lucas",
- "Lucca",
- "Lucian",
- "Luciano",
- "Lucien",
- "Lucus",
- "Luic",
- "Luis",
- "Luk",
- "Luka",
- "Lukas",
- "Lukasz",
- "Luke",
- "Lukmaan",
- "Luqman",
- "Lyall",
- "Lyle",
- "Lyndsay",
- "Lysander",
- "Maanav",
- "Maaz",
- "Mac",
- "Macallum",
- "Macaulay",
- "Macauley",
- "Macaully",
- "Machlan",
- "Maciej",
- "Mack",
- "Mackenzie",
- "Mackenzy",
- "Mackie",
- "Macsen",
- "Macy",
- "Madaki",
- "Maddison",
- "Maddox",
- "Madison",
- "Madison-Jake",
- "Madox",
- "Mael",
- "Magnus",
- "Mahan",
- "Mahdi",
- "Mahmoud",
- "Maias",
- "Maison",
- "Maisum",
- "Maitlind",
- "Majid",
- "Makensie",
- "Makenzie",
- "Makin",
- "Maksim",
- "Maksymilian",
- "Malachai",
- "Malachi",
- "Malachy",
- "Malakai",
- "Malakhy",
- "Malcolm",
- "Malik",
- "Malikye",
- "Malo",
- "Ma'moon",
- "Manas",
- "Maneet",
- "Manmohan",
- "Manolo",
- "Manson",
- "Mantej",
- "Manuel",
- "Manus",
- "Marc",
- "Marc-Anthony",
- "Marcel",
- "Marcello",
- "Marcin",
- "Marco",
- "Marcos",
- "Marcous",
- "Marcquis",
- "Marcus",
- "Mario",
- "Marios",
- "Marius",
- "Mark",
- "Marko",
- "Markus",
- "Marley",
- "Marlin",
- "Marlon",
- "Maros",
- "Marshall",
- "Martin",
- "Marty",
- "Martyn",
- "Marvellous",
- "Marvin",
- "Marwan",
- "Maryk",
- "Marzuq",
- "Mashhood",
- "Mason",
- "Mason-Jay",
- "Masood",
- "Masson",
- "Matas",
- "Matej",
- "Mateusz",
- "Mathew",
- "Mathias",
- "Mathu",
- "Mathuyan",
- "Mati",
- "Matt",
- "Matteo",
- "Matthew",
- "Matthew-William",
- "Matthias",
- "Max",
- "Maxim",
- "Maximilian",
- "Maximillian",
- "Maximus",
- "Maxwell",
- "Maxx",
- "Mayeul",
- "Mayson",
- "Mazin",
- "Mcbride",
- "McCaulley",
- "McKade",
- "McKauley",
- "McKay",
- "McKenzie",
- "McLay",
- "Meftah",
- "Mehmet",
- "Mehraz",
- "Meko",
- "Melville",
- "Meshach",
- "Meyzhward",
- "Micah",
- "Michael",
- "Michael-Alexander",
- "Michael-James",
- "Michal",
- "Michat",
- "Micheal",
- "Michee",
- "Mickey",
- "Miguel",
- "Mika",
- "Mikael",
- "Mi'kael",
- "Mikee",
- "Mikey",
- "Mikhail",
- "Mikolaj",
- "Miles",
- "Millar",
- "Miller",
- "Milo",
- "Milos",
- "Milosz",
- "Mir",
- "Mirza",
- "Mitch",
- "Mitchel",
- "Mitchell",
- "Moad",
- "Moayd",
- "Mobeen",
- "Modoulamin",
- "Modu",
- "Mohamad",
- "Mohamed",
- "Mohammad",
- "Mohammad-Bilal",
- "Mohammed",
- "Mohanad",
- "Mohd",
- "Momin",
- "Momooreoluwa",
- "Montague",
- "Montgomery",
- "Monty",
- "Moore",
- "Moosa",
- "Moray",
- "Morgan",
- "Morgyn",
- "Morris",
- "Morton",
- "Moshy",
- "Motade",
- "Moyes",
- "Msughter",
- "Mueez",
- "Muhamadjavad",
- "Muhammad",
- "Muhammed",
- "Muhsin",
- "Muir",
- "Munachi",
- "Muneeb",
- "Mungo",
- "Munir",
- "Munmair",
- "Munro",
- "Murdo",
- "Murray",
- "Murrough",
- "Murry",
- "Musa",
- "Musse",
- "Mustafa",
- "Mustapha",
- "Muzammil",
- "Muzzammil",
- "Mykie",
- "Myles",
- "Mylo",
- "Nabeel",
- "Nadeem",
- "Nader",
- "Nagib",
- "Naif",
- "Nairn",
- "Narvic",
- "Nash",
- "Nasser",
- "Nassir",
- "Natan",
- "Nate",
- "Nathan",
- "Nathanael",
- "Nathanial",
- "Nathaniel",
- "Nathan-Rae",
- "Nawfal",
- "Nayan",
- "Neco",
- "Neil",
- "Nelson",
- "Neo",
- "Neshawn",
- "Nevan",
- "Nevin",
- "Ngonidzashe",
- "Nial",
- "Niall",
- "Nicholas",
- "Nick",
- "Nickhill",
- "Nicki",
- "Nickson",
- "Nicky",
- "Nico",
- "Nicodemus",
- "Nicol",
- "Nicolae",
- "Nicolas",
- "Nidhish",
- "Nihaal",
- "Nihal",
- "Nikash",
- "Nikhil",
- "Niki",
- "Nikita",
- "Nikodem",
- "Nikolai",
- "Nikos",
- "Nilav",
- "Niraj",
- "Niro",
- "Niven",
- "Noah",
- "Noel",
- "Nolan",
- "Noor",
- "Norman",
- "Norrie",
- "Nuada",
- "Nyah",
- "Oakley",
- "Oban",
- "Obieluem",
- "Obosa",
- "Odhran",
- "Odin",
- "Odynn",
- "Ogheneochuko",
- "Ogheneruno",
- "Ohran",
- "Oilibhear",
- "Oisin",
- "Ojima-Ojo",
- "Okeoghene",
- "Olaf",
- "Ola-Oluwa",
- "Olaoluwapolorimi",
- "Ole",
- "Olie",
- "Oliver",
- "Olivier",
- "Oliwier",
- "Ollie",
- "Olurotimi",
- "Oluwadamilare",
- "Oluwadamiloju",
- "Oluwafemi",
- "Oluwafikunayomi",
- "Oluwalayomi",
- "Oluwatobiloba",
- "Oluwatoni",
- "Omar",
- "Omri",
- "Oran",
- "Orin",
- "Orlando",
- "Orley",
- "Orran",
- "Orrick",
- "Orrin",
- "Orson",
- "Oryn",
- "Oscar",
- "Osesenagha",
- "Oskar",
- "Ossian",
- "Oswald",
- "Otto",
- "Owain",
- "Owais",
- "Owen",
- "Owyn",
- "Oz",
- "Ozzy",
- "Pablo",
- "Pacey",
- "Padraig",
- "Paolo",
- "Pardeepraj",
- "Parkash",
- "Parker",
- "Pascoe",
- "Pasquale",
- "Patrick",
- "Patrick-John",
- "Patrikas",
- "Patryk",
- "Paul",
- "Pavit",
- "Pawel",
- "Pawlo",
- "Pearce",
- "Pearse",
- "Pearsen",
- "Pedram",
- "Pedro",
- "Peirce",
- "Peiyan",
- "Pele",
- "Peni",
- "Peregrine",
- "Peter",
- "Phani",
- "Philip",
- "Philippos",
- "Phinehas",
- "Phoenix",
- "Phoevos",
- "Pierce",
- "Pierre-Antoine",
- "Pieter",
- "Pietro",
- "Piotr",
- "Porter",
- "Prabhjoit",
- "Prabodhan",
- "Praise",
- "Pranav",
- "Pravin",
- "Precious",
- "Prentice",
- "Presley",
- "Preston",
- "Preston-Jay",
- "Prinay",
- "Prince",
- "Prithvi",
- "Promise",
- "Puneetpaul",
- "Pushkar",
- "Qasim",
- "Qirui",
- "Quinlan",
- "Quinn",
- "Radmiras",
- "Raees",
- "Raegan",
- "Rafael",
- "Rafal",
- "Rafferty",
- "Rafi",
- "Raheem",
- "Rahil",
- "Rahim",
- "Rahman",
- "Raith",
- "Raithin",
- "Raja",
- "Rajab-Ali",
- "Rajan",
- "Ralfs",
- "Ralph",
- "Ramanas",
- "Ramit",
- "Ramone",
- "Ramsay",
- "Ramsey",
- "Rana",
- "Ranolph",
- "Raphael",
- "Rasmus",
- "Rasul",
- "Raul",
- "Raunaq",
- "Ravin",
- "Ray",
- "Rayaan",
- "Rayan",
- "Rayane",
- "Rayden",
- "Rayhan",
- "Raymond",
- "Rayne",
- "Rayyan",
- "Raza",
- "Reace",
- "Reagan",
- "Reean",
- "Reece",
- "Reed",
- "Reegan",
- "Rees",
- "Reese",
- "Reeve",
- "Regan",
- "Regean",
- "Reggie",
- "Rehaan",
- "Rehan",
- "Reice",
- "Reid",
- "Reigan",
- "Reilly",
- "Reily",
- "Reis",
- "Reiss",
- "Remigiusz",
- "Remo",
- "Remy",
- "Ren",
- "Renars",
- "Reng",
- "Rennie",
- "Reno",
- "Reo",
- "Reuben",
- "Rexford",
- "Reynold",
- "Rhein",
- "Rheo",
- "Rhett",
- "Rheyden",
- "Rhian",
- "Rhoan",
- "Rholmark",
- "Rhoridh",
- "Rhuairidh",
- "Rhuan",
- "Rhuaridh",
- "Rhudi",
- "Rhy",
- "Rhyan",
- "Rhyley",
- "Rhyon",
- "Rhys",
- "Rhys-Bernard",
- "Rhyse",
- "Riach",
- "Rian",
- "Ricards",
- "Riccardo",
- "Ricco",
- "Rice",
- "Richard",
- "Richey",
- "Richie",
- "Ricky",
- "Rico",
- "Ridley",
- "Ridwan",
- "Rihab",
- "Rihan",
- "Rihards",
- "Rihonn",
- "Rikki",
- "Riley",
- "Rio",
- "Rioden",
- "Rishi",
- "Ritchie",
- "Rivan",
- "Riyadh",
- "Riyaj",
- "Roan",
- "Roark",
- "Roary",
- "Rob",
- "Robbi",
- "Robbie",
- "Robbie-lee",
- "Robby",
- "Robert",
- "Robert-Gordon",
- "Robertjohn",
- "Robi",
- "Robin",
- "Rocco",
- "Roddy",
- "Roderick",
- "Rodrigo",
- "Roen",
- "Rogan",
- "Roger",
- "Rohaan",
- "Rohan",
- "Rohin",
- "Rohit",
- "Rokas",
- "Roman",
- "Ronald",
- "Ronan",
- "Ronan-Benedict",
- "Ronin",
- "Ronnie",
- "Rooke",
- "Roray",
- "Rori",
- "Rorie",
- "Rory",
- "Roshan",
- "Ross",
- "Ross-Andrew",
- "Rossi",
- "Rowan",
- "Rowen",
- "Roy",
- "Ruadhan",
- "Ruaidhri",
- "Ruairi",
- "Ruairidh",
- "Ruan",
- "Ruaraidh",
- "Ruari",
- "Ruaridh",
- "Ruben",
- "Rubhan",
- "Rubin",
- "Rubyn",
- "Rudi",
- "Rudy",
- "Rufus",
- "Rui",
- "Ruo",
- "Rupert",
- "Ruslan",
- "Russel",
- "Russell",
- "Ryaan",
- "Ryan",
- "Ryan-Lee",
- "Ryden",
- "Ryder",
- "Ryese",
- "Ryhs",
- "Rylan",
- "Rylay",
- "Rylee",
- "Ryleigh",
- "Ryley",
- "Rylie",
- "Ryo",
- "Ryszard",
- "Saad",
- "Sabeen",
- "Sachkirat",
- "Saffi",
- "Saghun",
- "Sahaib",
- "Sahbian",
- "Sahil",
- "Saif",
- "Saifaddine",
- "Saim",
- "Sajid",
- "Sajjad",
- "Salahudin",
- "Salman",
- "Salter",
- "Salvador",
- "Sam",
- "Saman",
- "Samar",
- "Samarjit",
- "Samatar",
- "Sambrid",
- "Sameer",
- "Sami",
- "Samir",
- "Sami-Ullah",
- "Samual",
- "Samuel",
- "Samuela",
- "Samy",
- "Sanaullah",
- "Sandro",
- "Sandy",
- "Sanfur",
- "Sanjay",
- "Santiago",
- "Santino",
- "Satveer",
- "Saul",
- "Saunders",
- "Savin",
- "Sayad",
- "Sayeed",
- "Sayf",
- "Scot",
- "Scott",
- "Scott-Alexander",
- "Seaan",
- "Seamas",
- "Seamus",
- "Sean",
- "Seane",
- "Sean-James",
- "Sean-Paul",
- "Sean-Ray",
- "Seb",
- "Sebastian",
- "Sebastien",
- "Selasi",
- "Seonaidh",
- "Sephiroth",
- "Sergei",
- "Sergio",
- "Seth",
- "Sethu",
- "Seumas",
- "Shaarvin",
- "Shadow",
- "Shae",
- "Shahmir",
- "Shai",
- "Shane",
- "Shannon",
- "Sharland",
- "Sharoz",
- "Shaughn",
- "Shaun",
- "Shaunpaul",
- "Shaun-Paul",
- "Shaun-Thomas",
- "Shaurya",
- "Shaw",
- "Shawn",
- "Shawnpaul",
- "Shay",
- "Shayaan",
- "Shayan",
- "Shaye",
- "Shayne",
- "Shazil",
- "Shea",
- "Sheafan",
- "Sheigh",
- "Shenuk",
- "Sher",
- "Shergo",
- "Sheriff",
- "Sherwyn",
- "Shiloh",
- "Shiraz",
- "Shreeram",
- "Shreyas",
- "Shyam",
- "Siddhant",
- "Siddharth",
- "Sidharth",
- "Sidney",
- "Siergiej",
- "Silas",
- "Simon",
- "Sinai",
- "Skye",
- "Sofian",
- "Sohaib",
- "Sohail",
- "Soham",
- "Sohan",
- "Sol",
- "Solomon",
- "Sonneey",
- "Sonni",
- "Sonny",
- "Sorley",
- "Soul",
- "Spencer",
- "Spondon",
- "Stanislaw",
- "Stanley",
- "Stefan",
- "Stefano",
- "Stefin",
- "Stephen",
- "Stephenjunior",
- "Steve",
- "Steven",
- "Steven-lee",
- "Stevie",
- "Stewart",
- "Stewarty",
- "Strachan",
- "Struan",
- "Stuart",
- "Su",
- "Subhaan",
- "Sudais",
- "Suheyb",
- "Suilven",
- "Sukhi",
- "Sukhpal",
- "Sukhvir",
- "Sulayman",
- "Sullivan",
- "Sultan",
- "Sung",
- "Sunny",
- "Suraj",
- "Surien",
- "Sweyn",
- "Syed",
- "Sylvain",
- "Symon",
- "Szymon",
- "Tadd",
- "Taddy",
- "Tadhg",
- "Taegan",
- "Taegen",
- "Tai",
- "Tait",
- "Taiwo",
- "Talha",
- "Taliesin",
- "Talon",
- "Talorcan",
- "Tamar",
- "Tamiem",
- "Tammam",
- "Tanay",
- "Tane",
- "Tanner",
- "Tanvir",
- "Tanzeel",
- "Taonga",
- "Tarik",
- "Tariq-Jay",
- "Tate",
- "Taylan",
- "Taylar",
- "Tayler",
- "Taylor",
- "Taylor-Jay",
- "Taylor-Lee",
- "Tayo",
- "Tayyab",
- "Tayye",
- "Tayyib",
- "Teagan",
- "Tee",
- "Teejay",
- "Tee-jay",
- "Tegan",
- "Teighen",
- "Teiyib",
- "Te-Jay",
- "Temba",
- "Teo",
- "Teodor",
- "Teos",
- "Terry",
- "Teydren",
- "Theo",
- "Theodore",
- "Thiago",
- "Thierry",
- "Thom",
- "Thomas",
- "Thomas-Jay",
- "Thomson",
- "Thorben",
- "Thorfinn",
- "Thrinei",
- "Thumbiko",
- "Tiago",
- "Tian",
- "Tiarnan",
- "Tibet",
- "Tieran",
- "Tiernan",
- "Timothy",
- "Timucin",
- "Tiree",
- "Tisloh",
- "Titi",
- "Titus",
- "Tiylar",
- "TJ",
- "Tjay",
- "T'jay",
- "T-Jay",
- "Tobey",
- "Tobi",
- "Tobias",
- "Tobie",
- "Toby",
- "Todd",
- "Tokinaga",
- "Toluwalase",
- "Tom",
- "Tomas",
- "Tomasz",
- "Tommi-Lee",
- "Tommy",
- "Tomson",
- "Tony",
- "Torin",
- "Torquil",
- "Torran",
- "Torrin",
- "Torsten",
- "Trafford",
- "Trai",
- "Travis",
- "Tre",
- "Trent",
- "Trey",
- "Tristain",
- "Tristan",
- "Troy",
- "Tubagus",
- "Turki",
- "Turner",
- "Ty",
- "Ty-Alexander",
- "Tye",
- "Tyelor",
- "Tylar",
- "Tyler",
- "Tyler-James",
- "Tyler-Jay",
- "Tyllor",
- "Tylor",
- "Tymom",
- "Tymon",
- "Tymoteusz",
- "Tyra",
- "Tyree",
- "Tyrnan",
- "Tyrone",
- "Tyson",
- "Ubaid",
- "Ubayd",
- "Uchenna",
- "Uilleam",
- "Umair",
- "Umar",
- "Umer",
- "Umut",
- "Urban",
- "Uri",
- "Usman",
- "Uzair",
- "Uzayr",
- "Valen",
- "Valentin",
- "Valentino",
- "Valery",
- "Valo",
- "Vasyl",
- "Vedantsinh",
- "Veeran",
- "Victor",
- "Victory",
- "Vinay",
- "Vince",
- "Vincent",
- "Vincenzo",
- "Vinh",
- "Vinnie",
- "Vithujan",
- "Vladimir",
- "Vladislav",
- "Vrishin",
- "Vuyolwethu",
- "Wabuya",
- "Wai",
- "Walid",
- "Wallace",
- "Walter",
- "Waqaas",
- "Warkhas",
- "Warren",
- "Warrick",
- "Wasif",
- "Wayde",
- "Wayne",
- "Wei",
- "Wen",
- "Wesley",
- "Wesley-Scott",
- "Wiktor",
- "Wilkie",
- "Will",
- "William",
- "William-John",
- "Willum",
- "Wilson",
- "Windsor",
- "Wojciech",
- "Woyenbrakemi",
- "Wyatt",
- "Wylie",
- "Wynn",
- "Xabier",
- "Xander",
- "Xavier",
- "Xiao",
- "Xida",
- "Xin",
- "Xue",
- "Yadgor",
- "Yago",
- "Yahya",
- "Yakup",
- "Yang",
- "Yanick",
- "Yann",
- "Yannick",
- "Yaseen",
- "Yasin",
- "Yasir",
- "Yassin",
- "Yoji",
- "Yong",
- "Yoolgeun",
- "Yorgos",
- "Youcef",
- "Yousif",
- "Youssef",
- "Yu",
- "Yuanyu",
- "Yuri",
- "Yusef",
- "Yusuf",
- "Yves",
- "Zaaine",
- "Zaak",
- "Zac",
- "Zach",
- "Zachariah",
- "Zacharias",
- "Zacharie",
- "Zacharius",
- "Zachariya",
- "Zachary",
- "Zachary-Marc",
- "Zachery",
- "Zack",
- "Zackary",
- "Zaid",
- "Zain",
- "Zaine",
- "Zaineddine",
- "Zainedin",
- "Zak",
- "Zakaria",
- "Zakariya",
- "Zakary",
- "Zaki",
- "Zakir",
- "Zakk",
- "Zamaar",
- "Zander",
- "Zane",
- "Zarran",
- "Zayd",
- "Zayn",
- "Zayne",
- "Ze",
- "Zechariah",
- "Zeek",
- "Zeeshan",
- "Zeid",
- "Zein",
- "Zen",
- "Zendel",
- "Zenith",
- "Zennon",
- "Zeph",
- "Zerah",
- "Zhen",
- "Zhi",
- "Zhong",
- "Zhuo",
- "Zi",
- "Zidane",
- "Zijie",
- "Zinedine",
- "Zion",
- "Zishan",
- "Ziya",
- "Ziyaan",
- "Zohaib",
- "Zohair",
- "Zoubaeir",
- "Zubair",
- "Zubayr",
- "Zuriel",
- "Jaime",
- "Jayden",
- "Josie",
- "Juliet",
- "Karys",
- "Kathleen",
- "Kendra",
- "Keri",
- "Keris",
- "Kirstin",
- "Klaudia",
- "Luisa",
- "Lydia",
- "Maeve",
- "Marnie",
- "Miah",
- "Mirrin",
- "Nancy",
- "Nia",
- "Nikki",
- "Oliwia",
- "Paris",
- "Piper",
- "Pippa",
- "Polly",
- "Rhona",
- "Safa",
- "Saira",
- "Sarah-Louise",
- "Shona",
- "Sorcha",
- "Stacey",
- "Tessa",
- "Tiffany",
- "Verity",
- "Zarah",
- "Zoya",
- "Alexandria",
- "Alina",
- "Alison",
- "Angela",
- "Arianna",
- "Chanel",
- "Chelsey",
- "Coral",
- "Corinne",
- "Danni",
- "Darci",
- "Dionne",
- "Eliza",
- "Elsie",
- "Fatima",
- "Freyja",
- "Holli",
- "Jane",
- "Joanne",
- "Karina",
- "Katrina",
- "Kaylah",
- "Kaylee",
- "Lori",
- "Mila",
- "Nikita",
- "Penny",
- "Sylvie",
- "Tammy",
- "Alexa",
- "Brooklyn",
- "Caragh",
- "Codie",
- "Constance",
- "Dana",
- "Demi-Lee",
- "Emilie",
- "Esther",
- "Frankie",
- "Isabelle",
- "Jamie-Leigh",
- "Jessie",
- "Josephine",
- "Kady",
- "Kaila",
- "Kerri",
- "Kirstie",
- "Lyla",
- "Macey",
- "Maisy",
- "Margaret",
- "Marie",
- "Maryam",
- "Mercedes",
- "Mischa",
- "Rosa",
- "Serena",
- "Sian",
- "Tamzin",
- "Vanessa",
- "Violet",
- "Yasmine",
- "Aisha",
- "Aleisha",
- "Ana",
- "Daniella",
- "Elsa",
- "Jodi",
- "Karly",
- "Leigha",
- "Lila",
- "Melanie",
- "Miriam",
- "Regan",
- "Sally",
- "Saskia",
- "Simone",
- "Tess",
- "Thea",
- "Zainab",
- "Arwen",
- "Bonnie",
- "Eloise",
- "Emma-Louise",
- "Halle",
- "Hana",
- "Honey",
- "Jamie-Lee",
- "Karla",
- "Leia",
- "Leila",
- "Madeline",
- "Neave",
- "Orlaith",
- "Rhea",
- "Sarah-Jane",
- "Tara",
- "Adele",
- "Alannah",
- "Alesha",
- "Annabelle",
- "Ayla",
- "Becca",
- "Darcie",
- "Ebony",
- "Erica",
- "Georgie",
- "Hanna",
- "Julie",
- "Kadie",
- "Kelly",
- "Kiara",
- "Lillie",
- "Mariam",
- "Mikayla",
- "Monica",
- "Roisin",
- "Savannah",
- "Sky",
- "Zahra",
- "Alanna",
- "Caoimhe",
- "Chanelle",
- "Elisha",
- "Emilia",
- "Iris",
- "Kacie",
- "Lia",
- "Maja",
- "Mary",
- "Michelle",
- "Tyler",
- "Willow",
- "Yasmin",
- "Becky",
- "Billie",
- "Clara",
- "Claudia",
- "Cody",
- "Elena",
- "Eryn",
- "Georgina",
- "Kayley",
- "Kimberley",
- "Kira",
- "Laila",
- "Lauryn",
- "Murron",
- "Natalia",
- "Ruth",
- "Siobhan",
- "Tiana",
- "Bethan",
- "Brodie",
- "Cameron",
- "Cassie",
- "Harriet",
- "Helen",
- "Kathryn",
- "Kyra",
- "Mairi",
- "Mckenzie",
- "Tilly",
- "Zuzanna",
- "April",
- "Christina",
- "Claire",
- "Darcey",
- "Fern",
- "Fiona",
- "Joanna",
- "Lucia",
- "Charli",
- "Jamie",
- "Karis",
- "Mackenzie",
- "Marissa",
- "Rihanna",
- "Teagan",
- "Tiegan",
- "Kaitlin",
- "Keeley",
- "Leigh",
- "Nadia",
- "Alix",
- "Callie",
- "Carrie",
- "Eden",
- "Esme",
- "Hazel",
- "Miya",
- "Nieve",
- "Sadie",
- "Sasha",
- "Sinead",
- "Stella",
- "Ashleigh",
- "Jade",
- "Jemma",
- "Michaela",
- "Alexis",
- "Aoife",
- "Francesca",
- "Lisa",
- "Matilda",
- "Annabel",
- "Carmen",
- "Eleanor",
- "Faye",
- "Kaci",
- "Kasey",
- "Kerry",
- "Louisa",
- "Macy",
- "Mhairi",
- "Rebekah",
- "Teigan",
- "Amie",
- "Brogan",
- "Catriona",
- "Scarlett",
- "Connie",
- "Katelyn",
- "Kenzie",
- "Lexi",
- "Nicola",
- "Sienna",
- "Abbi",
- "Angel",
- "Martha",
- "Anya",
- "Toni",
- "Chantelle",
- "Gabriella",
- "Lexie",
- "Abbey",
- "Bailey",
- "Isobel",
- "Kelsie",
- "Maia",
- "Nina",
- "Darcy",
- "Lacey",
- "Lana",
- "Sofia",
- "Stephanie",
- "Ellen",
- "Alicia",
- "Gabrielle",
- "Heidi",
- "Jorja",
- "Kyla",
- "Rhiannon",
- "Tegan",
- "Maddison",
- "Madeleine",
- "Morven",
- "Rowan",
- "Lucie",
- "Milly",
- "Annie",
- "Ashley",
- "Ellis",
- "Hope",
- "Mirren",
- "Rose",
- "Alexandra",
- "Jodie",
- "Kacey",
- "Phoebe",
- "Tia",
- "Ailsa",
- "Alana",
- "Kirsten",
- "Charlie",
- "Katy",
- "Lilly",
- "Alyssa",
- "Maria",
- "Naomi",
- "Alisha",
- "Danielle",
- "Lola",
- "Ciara",
- "Elle",
- "Faith",
- "Natasha",
- "Katherine",
- "Lois",
- "Mollie",
- "Carla",
- "Catherine",
- "Cerys",
- "Maisie",
- "Victoria",
- "Amelie",
- "Demi",
- "Gracie",
- "Carys",
- "Isabella",
- "Leona",
- "Alex",
- "Hollie",
- "Sara",
- "Caitlyn",
- "Kiera",
- "Lara",
- "Kate",
- "Louise",
- "Libby",
- "Rhianna",
- "Rosie",
- "Alice",
- "Julia",
- "Maya",
- "Natalie",
- "Chelsea",
- "Layla",
- "Samantha",
- "Heather",
- "Kirsty",
- "Rachael",
- "Charley",
- "Imogen",
- "Elise",
- "Hayley",
- "Kelsey",
- "Kara",
- "Orla",
- "Abi",
- "Gemma",
- "Laura",
- "Mya",
- "Bethany",
- "Jasmine",
- "Melissa",
- "Poppy",
- "Casey",
- "Elizabeth",
- "Kaitlyn",
- "Carly",
- "Abby",
- "Neve",
- "Courtney",
- "Jennifer",
- "Sophia",
- "Shannon",
- "Georgia",
- "Amber",
- "Robyn",
- "Beth",
- "Zara",
- "Amelia",
- "Taylor",
- "Daisy",
- "Paige",
- "Kayleigh",
- "Summer",
- "Madison",
- "Jenna",
- "Morgan",
- "Evie",
- "Nicole",
- "Ella",
- "Cara",
- "Iona",
- "Eve",
- "Zoe",
- "Kayla",
- "Molly",
- "Abigail",
- "Charlotte",
- "Millie",
- "Holly",
- "Leah",
- "Keira",
- "Lily",
- "Freya",
- "Caitlin",
- "Lauren",
- "Rachel",
- "Anna",
- "Sarah",
- "Ruby",
- "Aimee",
- "Mia",
- "Skye",
- "Abbie",
- "Eva",
- "Eilidh",
- "Niamh",
- "Megan",
- "Brooke",
- "Isla",
- "Rebecca",
- "Ava",
- "Grace",
- "Jessica",
- "Hannah",
- "Olivia",
- "Chloe",
- "Emily",
- "Amy",
- "Ellie",
- "Erin",
- "Katie",
- "Lucy",
- "Emma",
- "Sophie"
- };
+ return new String[] { "Aadam", "Aadit", "Aahron", "Aaran", "Aaren", "Aarez", "Aarman", "Aaron", "Aaron-James",
+ "Aarron", "Aaryan", "Aaryn", "Aayan", "Aazaan", "Abaan", "Abbas", "Abdallah", "Abdalroof", "Abdihakim",
+ "Abdirahman", "Abdisalam", "Abdul", "Abdul-Aziz", "Abdulbasir", "Abdulkadir", "Abdulkarem",
+ "Abdulkhader", "Abdullah", "Abdul-Majeed", "Abdulmalik", "Abdul-Rehman", "Abdur", "Abdurraheem",
+ "Abdur-Rahman", "Abdur-Rehmaan", "Abel", "Abhinav", "Abhisumant", "Abid", "Abir", "Abraham", "Abu",
+ "Abubakar", "Ace", "Adain", "Adam", "Adam-James", "Addison", "Addisson", "Adegbola", "Adegbolahan",
+ "Aden", "Adenn", "Adie", "Adil", "Aditya", "Adnan", "Adrian", "Adrien", "Aedan", "Aedin", "Aedyn",
+ "Aeron", "Afonso", "Ahmad", "Ahmed", "Ahmed-Aziz", "Ahoua", "Ahtasham", "Aiadan", "Aidan", "Aiden",
+ "Aiden-Jack", "Aiden-Vee", "Aidian", "Aidy", "Ailin", "Aiman", "Ainsley", "Ainslie", "Airen", "Airidas",
+ "Airlie", "AJ", "Ajay", "A-Jay", "Ajayraj", "Akan", "Akram", "Al", "Ala'", "Alan", "Alanas", "Alasdair",
+ "Alastair", "Alber", "Albert", "Albie", "Aldred", "Alec", "Aled", "Aleem", "Aleksandar", "Aleksander",
+ "Aleksandr", "Aleksandrs", "Alekzander", "Alessandro", "Alessio", "Alex", "Alexander", "Alexei",
+ "Alexx", "Alexzander", "Alf", "Alfee", "Alfie", "Alfred", "Alfy", "Alhaji", "Al-Hassan", "Ali",
+ "Aliekber", "Alieu", "Alihaider", "Alisdair", "Alishan", "Alistair", "Alistar", "Alister", "Aliyaan",
+ "Allan", "Allan-Laiton", "Allen", "Allesandro", "Allister", "Ally", "Alphonse", "Altyiab", "Alum",
+ "Alvern", "Alvin", "Alyas", "Amaan", "Aman", "Amani", "Ambanimoh", "Ameer", "Amgad", "Ami", "Amin",
+ "Amir", "Ammaar", "Ammar", "Ammer", "Amolpreet", "Amos", "Amrinder", "Amrit", "Amro", "Anay", "Andrea",
+ "Andreas", "Andrei", "Andrejs", "Andrew", "Andy", "Anees", "Anesu", "Angel", "Angelo", "Angus", "Anir",
+ "Anis", "Anish", "Anmolpreet", "Annan", "Anndra", "Anselm", "Anthony", "Anthony-John", "Antoine",
+ "Anton", "Antoni", "Antonio", "Antony", "Antonyo", "Anubhav", "Aodhan", "Aon", "Aonghus", "Apisai",
+ "Arafat", "Aran", "Arandeep", "Arann", "Aray", "Arayan", "Archibald", "Archie", "Arda", "Ardal",
+ "Ardeshir", "Areeb", "Areez", "Aref", "Arfin", "Argyle", "Argyll", "Ari", "Aria", "Arian", "Arihant",
+ "Aristomenis", "Aristotelis", "Arjuna", "Arlo", "Armaan", "Arman", "Armen", "Arnab", "Arnav", "Arnold",
+ "Aron", "Aronas", "Arran", "Arrham", "Arron", "Arryn", "Arsalan", "Artem", "Arthur", "Artur", "Arturo",
+ "Arun", "Arunas", "Arved", "Arya", "Aryan", "Aryankhan", "Aryian", "Aryn", "Asa", "Asfhan", "Ash",
+ "Ashlee-jay", "Ashley", "Ashton", "Ashton-Lloyd", "Ashtyn", "Ashwin", "Asif", "Asim", "Aslam", "Asrar",
+ "Ata", "Atal", "Atapattu", "Ateeq", "Athol", "Athon", "Athos-Carlos", "Atli", "Atom", "Attila", "Aulay",
+ "Aun", "Austen", "Austin", "Avani", "Averon", "Avi", "Avinash", "Avraham", "Awais", "Awwal", "Axel",
+ "Ayaan", "Ayan", "Aydan", "Ayden", "Aydin", "Aydon", "Ayman", "Ayomide", "Ayren", "Ayrton", "Aytug",
+ "Ayub", "Ayyub", "Azaan", "Azedine", "Azeem", "Azim", "Aziz", "Azlan", "Azzam", "Azzedine",
+ "Babatunmise", "Babur", "Bader", "Badr", "Badsha", "Bailee", "Bailey", "Bailie", "Bailley", "Baillie",
+ "Baley", "Balian", "Banan", "Barath", "Barkley", "Barney", "Baron", "Barrie", "Barry", "Bartlomiej",
+ "Bartosz", "Basher", "Basile", "Baxter", "Baye", "Bayley", "Beau", "Beinn", "Bekim", "Believe", "Ben",
+ "Bendeguz", "Benedict", "Benjamin", "Benjamyn", "Benji", "Benn", "Bennett", "Benny", "Benoit",
+ "Bentley", "Berkay", "Bernard", "Bertie", "Bevin", "Bezalel", "Bhaaldeen", "Bharath", "Bilal", "Bill",
+ "Billy", "Binod", "Bjorn", "Blaike", "Blaine", "Blair", "Blaire", "Blake", "Blazej", "Blazey",
+ "Blessing", "Blue", "Blyth", "Bo", "Boab", "Bob", "Bobby", "Bobby-Lee", "Bodhan", "Boedyn", "Bogdan",
+ "Bohbi", "Bony", "Bowen", "Bowie", "Boyd", "Bracken", "Brad", "Bradan", "Braden", "Bradley", "Bradlie",
+ "Bradly", "Brady", "Bradyn", "Braeden", "Braiden", "Brajan", "Brandan", "Branden", "Brandon",
+ "Brandonlee", "Brandon-Lee", "Brandyn", "Brannan", "Brayden", "Braydon", "Braydyn", "Breandan",
+ "Brehme", "Brendan", "Brendon", "Brendyn", "Breogan", "Bret", "Brett", "Briaddon", "Brian", "Brodi",
+ "Brodie", "Brody", "Brogan", "Broghan", "Brooke", "Brooklin", "Brooklyn", "Bruce", "Bruin", "Bruno",
+ "Brunon", "Bryan", "Bryce", "Bryden", "Brydon", "Brydon-Craig", "Bryn", "Brynmor", "Bryson", "Buddy",
+ "Bully", "Burak", "Burhan", "Butali", "Butchi", "Byron", "Cabhan", "Cadan", "Cade", "Caden", "Cadon",
+ "Cadyn", "Caedan", "Caedyn", "Cael", "Caelan", "Caelen", "Caethan", "Cahl", "Cahlum", "Cai", "Caidan",
+ "Caiden", "Caiden-Paul", "Caidyn", "Caie", "Cailaen", "Cailean", "Caileb-John", "Cailin", "Cain",
+ "Caine", "Cairn", "Cal", "Calan", "Calder", "Cale", "Calean", "Caleb", "Calen", "Caley", "Calib",
+ "Calin", "Callahan", "Callan", "Callan-Adam", "Calley", "Callie", "Callin", "Callum", "Callun",
+ "Callyn", "Calum", "Calum-James", "Calvin", "Cambell", "Camerin", "Cameron", "Campbel", "Campbell",
+ "Camron", "Caolain", "Caolan", "Carl", "Carlo", "Carlos", "Carrich", "Carrick", "Carson", "Carter",
+ "Carwyn", "Casey", "Casper", "Cassy", "Cathal", "Cator", "Cavan", "Cayden", "Cayden-Robert",
+ "Cayden-Tiamo", "Ceejay", "Ceilan", "Ceiran", "Ceirin", "Ceiron", "Cejay", "Celik", "Cephas", "Cesar",
+ "Cesare", "Chad", "Chaitanya", "Chang-Ha", "Charles", "Charley", "Charlie", "Charly", "Chase", "Che",
+ "Chester", "Chevy", "Chi", "Chibudom", "Chidera", "Chimsom", "Chin", "Chintu", "Chiqal", "Chiron",
+ "Chris", "Chris-Daniel", "Chrismedi", "Christian", "Christie", "Christoph", "Christopher",
+ "Christopher-Lee", "Christy", "Chu", "Chukwuemeka", "Cian", "Ciann", "Ciar", "Ciaran", "Ciarian",
+ "Cieran", "Cillian", "Cillin", "Cinar", "CJ", "C-Jay", "Clark", "Clarke", "Clayton", "Clement",
+ "Clifford", "Clyde", "Cobain", "Coban", "Coben", "Cobi", "Cobie", "Coby", "Codey", "Codi", "Codie",
+ "Cody", "Cody-Lee", "Coel", "Cohan", "Cohen", "Colby", "Cole", "Colin", "Coll", "Colm", "Colt",
+ "Colton", "Colum", "Colvin", "Comghan", "Conal", "Conall", "Conan", "Conar", "Conghaile", "Conlan",
+ "Conley", "Conli", "Conlin", "Conlly", "Conlon", "Conlyn", "Connal", "Connall", "Connan", "Connar",
+ "Connel", "Connell", "Conner", "Connolly", "Connor", "Connor-David", "Conor", "Conrad", "Cooper",
+ "Copeland", "Coray", "Corben", "Corbin", "Corey", "Corey-James", "Corey-Jay", "Cori", "Corie", "Corin",
+ "Cormac", "Cormack", "Cormak", "Corran", "Corrie", "Cory", "Cosmo", "Coupar", "Craig", "Craig-James",
+ "Crawford", "Creag", "Crispin", "Cristian", "Crombie", "Cruiz", "Cruz", "Cuillin", "Cullen", "Cullin",
+ "Curtis", "Cyrus", "Daanyaal", "Daegan", "Daegyu", "Dafydd", "Dagon", "Dailey", "Daimhin", "Daithi",
+ "Dakota", "Daksh", "Dale", "Dalong", "Dalton", "Damian", "Damien", "Damon", "Dan", "Danar", "Dane",
+ "Danial", "Daniel", "Daniele", "Daniel-James", "Daniels", "Daniil", "Danish", "Daniyal", "Danniel",
+ "Danny", "Dante", "Danyal", "Danyil", "Danys", "Daood", "Dara", "Darach", "Daragh", "Darcy", "D'arcy",
+ "Dareh", "Daren", "Darien", "Darius", "Darl", "Darn", "Darrach", "Darragh", "Darrel", "Darrell",
+ "Darren", "Darrie", "Darrius", "Darroch", "Darryl", "Darryn", "Darwyn", "Daryl", "Daryn", "Daud",
+ "Daumantas", "Davi", "David", "David-Jay", "David-Lee", "Davie", "Davis", "Davy", "Dawid", "Dawson",
+ "Dawud", "Dayem", "Daymian", "Deacon", "Deagan", "Dean", "Deano", "Decklan", "Declain", "Declan",
+ "Declyan", "Declyn", "Dedeniseoluwa", "Deecan", "Deegan", "Deelan", "Deklain-Jaimes", "Del",
+ "Demetrius", "Denis", "Deniss", "Dennan", "Dennin", "Dennis", "Denny", "Dennys", "Denon", "Denton",
+ "Denver", "Denzel", "Deon", "Derek", "Derick", "Derin", "Dermot", "Derren", "Derrie", "Derrin",
+ "Derron", "Derry", "Derryn", "Deryn", "Deshawn", "Desmond", "Dev", "Devan", "Devin", "Devlin", "Devlyn",
+ "Devon", "Devrin", "Devyn", "Dex", "Dexter", "Dhani", "Dharam", "Dhavid", "Dhyia", "Diarmaid",
+ "Diarmid", "Diarmuid", "Didier", "Diego", "Diesel", "Diesil", "Digby", "Dilan", "Dilano", "Dillan",
+ "Dillon", "Dilraj", "Dimitri", "Dinaras", "Dion", "Dissanayake", "Dmitri", "Doire", "Dolan", "Domanic",
+ "Domenico", "Domhnall", "Dominic", "Dominick", "Dominik", "Donald", "Donnacha", "Donnie", "Dorian",
+ "Dougal", "Douglas", "Dougray", "Drakeo", "Dre", "Dregan", "Drew", "Dugald", "Duncan", "Duriel",
+ "Dustin", "Dylan", "Dylan-Jack", "Dylan-James", "Dylan-John", "Dylan-Patrick", "Dylin", "Dyllan",
+ "Dyllan-James", "Dyllon", "Eadie", "Eagann", "Eamon", "Eamonn", "Eason", "Eassan", "Easton", "Ebow",
+ "Ed", "Eddie", "Eden", "Ediomi", "Edison", "Eduardo", "Eduards", "Edward", "Edwin", "Edwyn", "Eesa",
+ "Efan", "Efe", "Ege", "Ehsan", "Ehsen", "Eiddon", "Eidhan", "Eihli", "Eimantas", "Eisa", "Eli", "Elias",
+ "Elijah", "Eliot", "Elisau", "Eljay", "Eljon", "Elliot", "Elliott", "Ellis", "Ellisandro", "Elshan",
+ "Elvin", "Elyan", "Emanuel", "Emerson", "Emil", "Emile", "Emir", "Emlyn", "Emmanuel", "Emmet", "Eng",
+ "Eniola", "Enis", "Ennis", "Enrico", "Enrique", "Enzo", "Eoghain", "Eoghan", "Eoin", "Eonan", "Erdehan",
+ "Eren", "Erencem", "Eric", "Ericlee", "Erik", "Eriz", "Ernie-Jacks", "Eroni", "Eryk", "Eshan", "Essa",
+ "Esteban", "Ethan", "Etienne", "Etinosa", "Euan", "Eugene", "Evan", "Evann", "Ewan", "Ewen", "Ewing",
+ "Exodi", "Ezekiel", "Ezra", "Fabian", "Fahad", "Faheem", "Faisal", "Faizaan", "Famara", "Fares",
+ "Farhaan", "Farhan", "Farren", "Farzad", "Fauzaan", "Favour", "Fawaz", "Fawkes", "Faysal", "Fearghus",
+ "Feden", "Felix", "Fergal", "Fergie", "Fergus", "Ferre", "Fezaan", "Fiachra", "Fikret", "Filip",
+ "Filippo", "Finan", "Findlay", "Findlay-James", "Findlie", "Finlay", "Finley", "Finn", "Finnan",
+ "Finnean", "Finnen", "Finnlay", "Finnley", "Fintan", "Fionn", "Firaaz", "Fletcher", "Flint", "Florin",
+ "Flyn", "Flynn", "Fodeba", "Folarinwa", "Forbes", "Forgan", "Forrest", "Fox", "Francesco", "Francis",
+ "Francisco", "Franciszek", "Franco", "Frank", "Frankie", "Franklin", "Franko", "Fraser", "Frazer",
+ "Fred", "Freddie", "Frederick", "Fruin", "Fyfe", "Fyn", "Fynlay", "Fynn", "Gabriel", "Gallagher",
+ "Gareth", "Garren", "Garrett", "Garry", "Gary", "Gavin", "Gavin-Lee", "Gene", "Geoff", "Geoffrey",
+ "Geomer", "Geordan", "Geordie", "George", "Georgia", "Georgy", "Gerard", "Ghyll", "Giacomo", "Gian",
+ "Giancarlo", "Gianluca", "Gianmarco", "Gideon", "Gil", "Gio", "Girijan", "Girius", "Gjan", "Glascott",
+ "Glen", "Glenn", "Gordon", "Grady", "Graeme", "Graham", "Grahame", "Grant", "Grayson", "Greg", "Gregor",
+ "Gregory", "Greig", "Griffin", "Griffyn", "Grzegorz", "Guang", "Guerin", "Guillaume", "Gurardass",
+ "Gurdeep", "Gursees", "Gurthar", "Gurveer", "Gurwinder", "Gus", "Gustav", "Guthrie", "Guy", "Gytis",
+ "Habeeb", "Hadji", "Hadyn", "Hagun", "Haiden", "Haider", "Hamad", "Hamid", "Hamish", "Hamza", "Hamzah",
+ "Han", "Hansen", "Hao", "Hareem", "Hari", "Harikrishna", "Haris", "Harish", "Harjeevan", "Harjyot",
+ "Harlee", "Harleigh", "Harley", "Harman", "Harnek", "Harold", "Haroon", "Harper", "Harri", "Harrington",
+ "Harris", "Harrison", "Harry", "Harvey", "Harvie", "Harvinder", "Hasan", "Haseeb", "Hashem", "Hashim",
+ "Hassan", "Hassanali", "Hately", "Havila", "Hayden", "Haydn", "Haydon", "Haydyn", "Hcen", "Hector",
+ "Heddle", "Heidar", "Heini", "Hendri", "Henri", "Henry", "Herbert", "Heyden", "Hiro", "Hirvaansh",
+ "Hishaam", "Hogan", "Honey", "Hong", "Hope", "Hopkin", "Hosea", "Howard", "Howie", "Hristomir",
+ "Hubert", "Hugh", "Hugo", "Humza", "Hunter", "Husnain", "Hussain", "Hussan", "Hussnain", "Hussnan",
+ "Hyden", "I", "Iagan", "Iain", "Ian", "Ibraheem", "Ibrahim", "Idahosa", "Idrees", "Idris", "Iestyn",
+ "Ieuan", "Igor", "Ihtisham", "Ijay", "Ikechukwu", "Ikemsinachukwu", "Ilyaas", "Ilyas", "Iman",
+ "Immanuel", "Inan", "Indy", "Ines", "Innes", "Ioannis", "Ireayomide", "Ireoluwa", "Irvin", "Irvine",
+ "Isa", "Isaa", "Isaac", "Isaiah", "Isak", "Isher", "Ishwar", "Isimeli", "Isira", "Ismaeel", "Ismail",
+ "Israel", "Issiaka", "Ivan", "Ivar", "Izaak", "J", "Jaay", "Jac", "Jace", "Jack", "Jacki", "Jackie",
+ "Jack-James", "Jackson", "Jacky", "Jacob", "Jacques", "Jad", "Jaden", "Jadon", "Jadyn", "Jae", "Jagat",
+ "Jago", "Jaheim", "Jahid", "Jahy", "Jai", "Jaida", "Jaiden", "Jaidyn", "Jaii", "Jaime", "Jai-Rajaram",
+ "Jaise", "Jak", "Jake", "Jakey", "Jakob", "Jaksyn", "Jakub", "Jamaal", "Jamal", "Jameel", "Jameil",
+ "James", "James-Paul", "Jamey", "Jamie", "Jan", "Jaosha", "Jardine", "Jared", "Jarell", "Jarl", "Jarno",
+ "Jarred", "Jarvi", "Jasey-Jay", "Jasim", "Jaskaran", "Jason", "Jasper", "Jaxon", "Jaxson", "Jay",
+ "Jaydan", "Jayden", "Jayden-James", "Jayden-Lee", "Jayden-Paul", "Jayden-Thomas", "Jaydn", "Jaydon",
+ "Jaydyn", "Jayhan", "Jay-Jay", "Jayke", "Jaymie", "Jayse", "Jayson", "Jaz", "Jazeb", "Jazib", "Jazz",
+ "Jean", "Jean-Lewis", "Jean-Pierre", "Jebadiah", "Jed", "Jedd", "Jedidiah", "Jeemie", "Jeevan",
+ "Jeffrey", "Jensen", "Jenson", "Jensyn", "Jeremy", "Jerome", "Jeronimo", "Jerrick", "Jerry", "Jesse",
+ "Jesuseun", "Jeswin", "Jevan", "Jeyun", "Jez", "Jia", "Jian", "Jiao", "Jimmy", "Jincheng", "JJ",
+ "Joaquin", "Joash", "Jock", "Jody", "Joe", "Joeddy", "Joel", "Joey", "Joey-Jack", "Johann", "Johannes",
+ "Johansson", "John", "Johnathan", "Johndean", "Johnjay", "John-Michael", "Johnnie", "Johnny",
+ "Johnpaul", "John-Paul", "John-Scott", "Johnson", "Jole", "Jomuel", "Jon", "Jonah", "Jonatan",
+ "Jonathan", "Jonathon", "Jonny", "Jonothan", "Jon-Paul", "Jonson", "Joojo", "Jordan", "Jordi", "Jordon",
+ "Jordy", "Jordyn", "Jorge", "Joris", "Jorryn", "Josan", "Josef", "Joseph", "Josese", "Josh", "Joshiah",
+ "Joshua", "Josiah", "Joss", "Jostelle", "Joynul", "Juan", "Jubin", "Judah", "Jude", "Jules", "Julian",
+ "Julien", "Jun", "Junior", "Jura", "Justan", "Justin", "Justinas", "Kaan", "Kabeer", "Kabir", "Kacey",
+ "Kacper", "Kade", "Kaden", "Kadin", "Kadyn", "Kaeden", "Kael", "Kaelan", "Kaelin", "Kaelum", "Kai",
+ "Kaid", "Kaidan", "Kaiden", "Kaidinn", "Kaidyn", "Kaileb", "Kailin", "Kain", "Kaine", "Kainin",
+ "Kainui", "Kairn", "Kaison", "Kaiwen", "Kajally", "Kajetan", "Kalani", "Kale", "Kaleb", "Kaleem",
+ "Kal-el", "Kalen", "Kalin", "Kallan", "Kallin", "Kalum", "Kalvin", "Kalvyn", "Kameron", "Kames",
+ "Kamil", "Kamran", "Kamron", "Kane", "Karam", "Karamvir", "Karandeep", "Kareem", "Karim", "Karimas",
+ "Karl", "Karol", "Karson", "Karsyn", "Karthikeya", "Kasey", "Kash", "Kashif", "Kasim", "Kasper",
+ "Kasra", "Kavin", "Kayam", "Kaydan", "Kayden", "Kaydin", "Kaydn", "Kaydyn", "Kaydyne", "Kayleb",
+ "Kaylem", "Kaylum", "Kayne", "Kaywan", "Kealan", "Kealon", "Kean", "Keane", "Kearney", "Keatin",
+ "Keaton", "Keavan", "Keayn", "Kedrick", "Keegan", "Keelan", "Keelin", "Keeman", "Keenan", "Keenan-Lee",
+ "Keeton", "Kehinde", "Keigan", "Keilan", "Keir", "Keiran", "Keiren", "Keiron", "Keiryn", "Keison",
+ "Keith", "Keivlin", "Kelam", "Kelan", "Kellan", "Kellen", "Kelso", "Kelum", "Kelvan", "Kelvin", "Ken",
+ "Kenan", "Kendall", "Kendyn", "Kenlin", "Kenneth", "Kensey", "Kenton", "Kenyon", "Kenzeigh", "Kenzi",
+ "Kenzie", "Kenzo", "Kenzy", "Keo", "Ker", "Kern", "Kerr", "Kevan", "Kevin", "Kevyn", "Kez", "Khai",
+ "Khalan", "Khaleel", "Khaya", "Khevien", "Khizar", "Khizer", "Kia", "Kian", "Kian-James", "Kiaran",
+ "Kiarash", "Kie", "Kiefer", "Kiegan", "Kienan", "Kier", "Kieran", "Kieran-Scott", "Kieren", "Kierin",
+ "Kiern", "Kieron", "Kieryn", "Kile", "Killian", "Kimi", "Kingston", "Kinneil", "Kinnon", "Kinsey",
+ "Kiran", "Kirk", "Kirwin", "Kit", "Kiya", "Kiyonari", "Kjae", "Klein", "Klevis", "Kobe", "Kobi", "Koby",
+ "Koddi", "Koden", "Kodi", "Kodie", "Kody", "Kofi", "Kogan", "Kohen", "Kole", "Konan", "Konar", "Konnor",
+ "Konrad", "Koray", "Korben", "Korbyn", "Korey", "Kori", "Korrin", "Kory", "Koushik", "Kris", "Krish",
+ "Krishan", "Kriss", "Kristian", "Kristin", "Kristofer", "Kristoffer", "Kristopher", "Kruz", "Krzysiek",
+ "Krzysztof", "Ksawery", "Ksawier", "Kuba", "Kurt", "Kurtis", "Kurtis-Jae", "Kyaan", "Kyan", "Kyde",
+ "Kyden", "Kye", "Kyel", "Kyhran", "Kyie", "Kylan", "Kylar", "Kyle", "Kyle-Derek", "Kylian", "Kym",
+ "Kynan", "Kyral", "Kyran", "Kyren", "Kyrillos", "Kyro", "Kyron", "Kyrran", "Lachlainn", "Lachlan",
+ "Lachlann", "Lael", "Lagan", "Laird", "Laison", "Lakshya", "Lance", "Lancelot", "Landon", "Lang",
+ "Lasse", "Latif", "Lauchlan", "Lauchlin", "Laughlan", "Lauren", "Laurence", "Laurie", "Lawlyn",
+ "Lawrence", "Lawrie", "Lawson", "Layne", "Layton", "Lee", "Leigh", "Leigham", "Leighton", "Leilan",
+ "Leiten", "Leithen", "Leland", "Lenin", "Lennan", "Lennen", "Lennex", "Lennon", "Lennox", "Lenny",
+ "Leno", "Lenon", "Lenyn", "Leo", "Leon", "Leonard", "Leonardas", "Leonardo", "Lepeng", "Leroy", "Leven",
+ "Levi", "Levon", "Levy", "Lewie", "Lewin", "Lewis", "Lex", "Leydon", "Leyland", "Leylann", "Leyton",
+ "Liall", "Liam", "Liam-Stephen", "Limo", "Lincoln", "Lincoln-John", "Lincon", "Linden", "Linton",
+ "Lionel", "Lisandro", "Litrell", "Liyonela-Elam", "LLeyton", "Lliam", "Lloyd", "Lloyde", "Loche",
+ "Lochlan", "Lochlann", "Lochlan-Oliver", "Lock", "Lockey", "Logan", "Logann", "Logan-Rhys", "Loghan",
+ "Lokesh", "Loki", "Lomond", "Lorcan", "Lorenz", "Lorenzo", "Lorne", "Loudon", "Loui", "Louie", "Louis",
+ "Loukas", "Lovell", "Luc", "Luca", "Lucais", "Lucas", "Lucca", "Lucian", "Luciano", "Lucien", "Lucus",
+ "Luic", "Luis", "Luk", "Luka", "Lukas", "Lukasz", "Luke", "Lukmaan", "Luqman", "Lyall", "Lyle",
+ "Lyndsay", "Lysander", "Maanav", "Maaz", "Mac", "Macallum", "Macaulay", "Macauley", "Macaully",
+ "Machlan", "Maciej", "Mack", "Mackenzie", "Mackenzy", "Mackie", "Macsen", "Macy", "Madaki", "Maddison",
+ "Maddox", "Madison", "Madison-Jake", "Madox", "Mael", "Magnus", "Mahan", "Mahdi", "Mahmoud", "Maias",
+ "Maison", "Maisum", "Maitlind", "Majid", "Makensie", "Makenzie", "Makin", "Maksim", "Maksymilian",
+ "Malachai", "Malachi", "Malachy", "Malakai", "Malakhy", "Malcolm", "Malik", "Malikye", "Malo",
+ "Ma'moon", "Manas", "Maneet", "Manmohan", "Manolo", "Manson", "Mantej", "Manuel", "Manus", "Marc",
+ "Marc-Anthony", "Marcel", "Marcello", "Marcin", "Marco", "Marcos", "Marcous", "Marcquis", "Marcus",
+ "Mario", "Marios", "Marius", "Mark", "Marko", "Markus", "Marley", "Marlin", "Marlon", "Maros",
+ "Marshall", "Martin", "Marty", "Martyn", "Marvellous", "Marvin", "Marwan", "Maryk", "Marzuq",
+ "Mashhood", "Mason", "Mason-Jay", "Masood", "Masson", "Matas", "Matej", "Mateusz", "Mathew", "Mathias",
+ "Mathu", "Mathuyan", "Mati", "Matt", "Matteo", "Matthew", "Matthew-William", "Matthias", "Max", "Maxim",
+ "Maximilian", "Maximillian", "Maximus", "Maxwell", "Maxx", "Mayeul", "Mayson", "Mazin", "Mcbride",
+ "McCaulley", "McKade", "McKauley", "McKay", "McKenzie", "McLay", "Meftah", "Mehmet", "Mehraz", "Meko",
+ "Melville", "Meshach", "Meyzhward", "Micah", "Michael", "Michael-Alexander", "Michael-James", "Michal",
+ "Michat", "Micheal", "Michee", "Mickey", "Miguel", "Mika", "Mikael", "Mi'kael", "Mikee", "Mikey",
+ "Mikhail", "Mikolaj", "Miles", "Millar", "Miller", "Milo", "Milos", "Milosz", "Mir", "Mirza", "Mitch",
+ "Mitchel", "Mitchell", "Moad", "Moayd", "Mobeen", "Modoulamin", "Modu", "Mohamad", "Mohamed",
+ "Mohammad", "Mohammad-Bilal", "Mohammed", "Mohanad", "Mohd", "Momin", "Momooreoluwa", "Montague",
+ "Montgomery", "Monty", "Moore", "Moosa", "Moray", "Morgan", "Morgyn", "Morris", "Morton", "Moshy",
+ "Motade", "Moyes", "Msughter", "Mueez", "Muhamadjavad", "Muhammad", "Muhammed", "Muhsin", "Muir",
+ "Munachi", "Muneeb", "Mungo", "Munir", "Munmair", "Munro", "Murdo", "Murray", "Murrough", "Murry",
+ "Musa", "Musse", "Mustafa", "Mustapha", "Muzammil", "Muzzammil", "Mykie", "Myles", "Mylo", "Nabeel",
+ "Nadeem", "Nader", "Nagib", "Naif", "Nairn", "Narvic", "Nash", "Nasser", "Nassir", "Natan", "Nate",
+ "Nathan", "Nathanael", "Nathanial", "Nathaniel", "Nathan-Rae", "Nawfal", "Nayan", "Neco", "Neil",
+ "Nelson", "Neo", "Neshawn", "Nevan", "Nevin", "Ngonidzashe", "Nial", "Niall", "Nicholas", "Nick",
+ "Nickhill", "Nicki", "Nickson", "Nicky", "Nico", "Nicodemus", "Nicol", "Nicolae", "Nicolas", "Nidhish",
+ "Nihaal", "Nihal", "Nikash", "Nikhil", "Niki", "Nikita", "Nikodem", "Nikolai", "Nikos", "Nilav",
+ "Niraj", "Niro", "Niven", "Noah", "Noel", "Nolan", "Noor", "Norman", "Norrie", "Nuada", "Nyah",
+ "Oakley", "Oban", "Obieluem", "Obosa", "Odhran", "Odin", "Odynn", "Ogheneochuko", "Ogheneruno", "Ohran",
+ "Oilibhear", "Oisin", "Ojima-Ojo", "Okeoghene", "Olaf", "Ola-Oluwa", "Olaoluwapolorimi", "Ole", "Olie",
+ "Oliver", "Olivier", "Oliwier", "Ollie", "Olurotimi", "Oluwadamilare", "Oluwadamiloju", "Oluwafemi",
+ "Oluwafikunayomi", "Oluwalayomi", "Oluwatobiloba", "Oluwatoni", "Omar", "Omri", "Oran", "Orin",
+ "Orlando", "Orley", "Orran", "Orrick", "Orrin", "Orson", "Oryn", "Oscar", "Osesenagha", "Oskar",
+ "Ossian", "Oswald", "Otto", "Owain", "Owais", "Owen", "Owyn", "Oz", "Ozzy", "Pablo", "Pacey", "Padraig",
+ "Paolo", "Pardeepraj", "Parkash", "Parker", "Pascoe", "Pasquale", "Patrick", "Patrick-John", "Patrikas",
+ "Patryk", "Paul", "Pavit", "Pawel", "Pawlo", "Pearce", "Pearse", "Pearsen", "Pedram", "Pedro", "Peirce",
+ "Peiyan", "Pele", "Peni", "Peregrine", "Peter", "Phani", "Philip", "Philippos", "Phinehas", "Phoenix",
+ "Phoevos", "Pierce", "Pierre-Antoine", "Pieter", "Pietro", "Piotr", "Porter", "Prabhjoit", "Prabodhan",
+ "Praise", "Pranav", "Pravin", "Precious", "Prentice", "Presley", "Preston", "Preston-Jay", "Prinay",
+ "Prince", "Prithvi", "Promise", "Puneetpaul", "Pushkar", "Qasim", "Qirui", "Quinlan", "Quinn",
+ "Radmiras", "Raees", "Raegan", "Rafael", "Rafal", "Rafferty", "Rafi", "Raheem", "Rahil", "Rahim",
+ "Rahman", "Raith", "Raithin", "Raja", "Rajab-Ali", "Rajan", "Ralfs", "Ralph", "Ramanas", "Ramit",
+ "Ramone", "Ramsay", "Ramsey", "Rana", "Ranolph", "Raphael", "Rasmus", "Rasul", "Raul", "Raunaq",
+ "Ravin", "Ray", "Rayaan", "Rayan", "Rayane", "Rayden", "Rayhan", "Raymond", "Rayne", "Rayyan", "Raza",
+ "Reace", "Reagan", "Reean", "Reece", "Reed", "Reegan", "Rees", "Reese", "Reeve", "Regan", "Regean",
+ "Reggie", "Rehaan", "Rehan", "Reice", "Reid", "Reigan", "Reilly", "Reily", "Reis", "Reiss", "Remigiusz",
+ "Remo", "Remy", "Ren", "Renars", "Reng", "Rennie", "Reno", "Reo", "Reuben", "Rexford", "Reynold",
+ "Rhein", "Rheo", "Rhett", "Rheyden", "Rhian", "Rhoan", "Rholmark", "Rhoridh", "Rhuairidh", "Rhuan",
+ "Rhuaridh", "Rhudi", "Rhy", "Rhyan", "Rhyley", "Rhyon", "Rhys", "Rhys-Bernard", "Rhyse", "Riach",
+ "Rian", "Ricards", "Riccardo", "Ricco", "Rice", "Richard", "Richey", "Richie", "Ricky", "Rico",
+ "Ridley", "Ridwan", "Rihab", "Rihan", "Rihards", "Rihonn", "Rikki", "Riley", "Rio", "Rioden", "Rishi",
+ "Ritchie", "Rivan", "Riyadh", "Riyaj", "Roan", "Roark", "Roary", "Rob", "Robbi", "Robbie", "Robbie-lee",
+ "Robby", "Robert", "Robert-Gordon", "Robertjohn", "Robi", "Robin", "Rocco", "Roddy", "Roderick",
+ "Rodrigo", "Roen", "Rogan", "Roger", "Rohaan", "Rohan", "Rohin", "Rohit", "Rokas", "Roman", "Ronald",
+ "Ronan", "Ronan-Benedict", "Ronin", "Ronnie", "Rooke", "Roray", "Rori", "Rorie", "Rory", "Roshan",
+ "Ross", "Ross-Andrew", "Rossi", "Rowan", "Rowen", "Roy", "Ruadhan", "Ruaidhri", "Ruairi", "Ruairidh",
+ "Ruan", "Ruaraidh", "Ruari", "Ruaridh", "Ruben", "Rubhan", "Rubin", "Rubyn", "Rudi", "Rudy", "Rufus",
+ "Rui", "Ruo", "Rupert", "Ruslan", "Russel", "Russell", "Ryaan", "Ryan", "Ryan-Lee", "Ryden", "Ryder",
+ "Ryese", "Ryhs", "Rylan", "Rylay", "Rylee", "Ryleigh", "Ryley", "Rylie", "Ryo", "Ryszard", "Saad",
+ "Sabeen", "Sachkirat", "Saffi", "Saghun", "Sahaib", "Sahbian", "Sahil", "Saif", "Saifaddine", "Saim",
+ "Sajid", "Sajjad", "Salahudin", "Salman", "Salter", "Salvador", "Sam", "Saman", "Samar", "Samarjit",
+ "Samatar", "Sambrid", "Sameer", "Sami", "Samir", "Sami-Ullah", "Samual", "Samuel", "Samuela", "Samy",
+ "Sanaullah", "Sandro", "Sandy", "Sanfur", "Sanjay", "Santiago", "Santino", "Satveer", "Saul",
+ "Saunders", "Savin", "Sayad", "Sayeed", "Sayf", "Scot", "Scott", "Scott-Alexander", "Seaan", "Seamas",
+ "Seamus", "Sean", "Seane", "Sean-James", "Sean-Paul", "Sean-Ray", "Seb", "Sebastian", "Sebastien",
+ "Selasi", "Seonaidh", "Sephiroth", "Sergei", "Sergio", "Seth", "Sethu", "Seumas", "Shaarvin", "Shadow",
+ "Shae", "Shahmir", "Shai", "Shane", "Shannon", "Sharland", "Sharoz", "Shaughn", "Shaun", "Shaunpaul",
+ "Shaun-Paul", "Shaun-Thomas", "Shaurya", "Shaw", "Shawn", "Shawnpaul", "Shay", "Shayaan", "Shayan",
+ "Shaye", "Shayne", "Shazil", "Shea", "Sheafan", "Sheigh", "Shenuk", "Sher", "Shergo", "Sheriff",
+ "Sherwyn", "Shiloh", "Shiraz", "Shreeram", "Shreyas", "Shyam", "Siddhant", "Siddharth", "Sidharth",
+ "Sidney", "Siergiej", "Silas", "Simon", "Sinai", "Skye", "Sofian", "Sohaib", "Sohail", "Soham", "Sohan",
+ "Sol", "Solomon", "Sonneey", "Sonni", "Sonny", "Sorley", "Soul", "Spencer", "Spondon", "Stanislaw",
+ "Stanley", "Stefan", "Stefano", "Stefin", "Stephen", "Stephenjunior", "Steve", "Steven", "Steven-lee",
+ "Stevie", "Stewart", "Stewarty", "Strachan", "Struan", "Stuart", "Su", "Subhaan", "Sudais", "Suheyb",
+ "Suilven", "Sukhi", "Sukhpal", "Sukhvir", "Sulayman", "Sullivan", "Sultan", "Sung", "Sunny", "Suraj",
+ "Surien", "Sweyn", "Syed", "Sylvain", "Symon", "Szymon", "Tadd", "Taddy", "Tadhg", "Taegan", "Taegen",
+ "Tai", "Tait", "Taiwo", "Talha", "Taliesin", "Talon", "Talorcan", "Tamar", "Tamiem", "Tammam", "Tanay",
+ "Tane", "Tanner", "Tanvir", "Tanzeel", "Taonga", "Tarik", "Tariq-Jay", "Tate", "Taylan", "Taylar",
+ "Tayler", "Taylor", "Taylor-Jay", "Taylor-Lee", "Tayo", "Tayyab", "Tayye", "Tayyib", "Teagan", "Tee",
+ "Teejay", "Tee-jay", "Tegan", "Teighen", "Teiyib", "Te-Jay", "Temba", "Teo", "Teodor", "Teos", "Terry",
+ "Teydren", "Theo", "Theodore", "Thiago", "Thierry", "Thom", "Thomas", "Thomas-Jay", "Thomson",
+ "Thorben", "Thorfinn", "Thrinei", "Thumbiko", "Tiago", "Tian", "Tiarnan", "Tibet", "Tieran", "Tiernan",
+ "Timothy", "Timucin", "Tiree", "Tisloh", "Titi", "Titus", "Tiylar", "TJ", "Tjay", "T'jay", "T-Jay",
+ "Tobey", "Tobi", "Tobias", "Tobie", "Toby", "Todd", "Tokinaga", "Toluwalase", "Tom", "Tomas", "Tomasz",
+ "Tommi-Lee", "Tommy", "Tomson", "Tony", "Torin", "Torquil", "Torran", "Torrin", "Torsten", "Trafford",
+ "Trai", "Travis", "Tre", "Trent", "Trey", "Tristain", "Tristan", "Troy", "Tubagus", "Turki", "Turner",
+ "Ty", "Ty-Alexander", "Tye", "Tyelor", "Tylar", "Tyler", "Tyler-James", "Tyler-Jay", "Tyllor", "Tylor",
+ "Tymom", "Tymon", "Tymoteusz", "Tyra", "Tyree", "Tyrnan", "Tyrone", "Tyson", "Ubaid", "Ubayd",
+ "Uchenna", "Uilleam", "Umair", "Umar", "Umer", "Umut", "Urban", "Uri", "Usman", "Uzair", "Uzayr",
+ "Valen", "Valentin", "Valentino", "Valery", "Valo", "Vasyl", "Vedantsinh", "Veeran", "Victor",
+ "Victory", "Vinay", "Vince", "Vincent", "Vincenzo", "Vinh", "Vinnie", "Vithujan", "Vladimir",
+ "Vladislav", "Vrishin", "Vuyolwethu", "Wabuya", "Wai", "Walid", "Wallace", "Walter", "Waqaas",
+ "Warkhas", "Warren", "Warrick", "Wasif", "Wayde", "Wayne", "Wei", "Wen", "Wesley", "Wesley-Scott",
+ "Wiktor", "Wilkie", "Will", "William", "William-John", "Willum", "Wilson", "Windsor", "Wojciech",
+ "Woyenbrakemi", "Wyatt", "Wylie", "Wynn", "Xabier", "Xander", "Xavier", "Xiao", "Xida", "Xin", "Xue",
+ "Yadgor", "Yago", "Yahya", "Yakup", "Yang", "Yanick", "Yann", "Yannick", "Yaseen", "Yasin", "Yasir",
+ "Yassin", "Yoji", "Yong", "Yoolgeun", "Yorgos", "Youcef", "Yousif", "Youssef", "Yu", "Yuanyu", "Yuri",
+ "Yusef", "Yusuf", "Yves", "Zaaine", "Zaak", "Zac", "Zach", "Zachariah", "Zacharias", "Zacharie",
+ "Zacharius", "Zachariya", "Zachary", "Zachary-Marc", "Zachery", "Zack", "Zackary", "Zaid", "Zain",
+ "Zaine", "Zaineddine", "Zainedin", "Zak", "Zakaria", "Zakariya", "Zakary", "Zaki", "Zakir", "Zakk",
+ "Zamaar", "Zander", "Zane", "Zarran", "Zayd", "Zayn", "Zayne", "Ze", "Zechariah", "Zeek", "Zeeshan",
+ "Zeid", "Zein", "Zen", "Zendel", "Zenith", "Zennon", "Zeph", "Zerah", "Zhen", "Zhi", "Zhong", "Zhuo",
+ "Zi", "Zidane", "Zijie", "Zinedine", "Zion", "Zishan", "Ziya", "Ziyaan", "Zohaib", "Zohair", "Zoubaeir",
+ "Zubair", "Zubayr", "Zuriel", "Jaime", "Jayden", "Josie", "Juliet", "Karys", "Kathleen", "Kendra",
+ "Keri", "Keris", "Kirstin", "Klaudia", "Luisa", "Lydia", "Maeve", "Marnie", "Miah", "Mirrin", "Nancy",
+ "Nia", "Nikki", "Oliwia", "Paris", "Piper", "Pippa", "Polly", "Rhona", "Safa", "Saira", "Sarah-Louise",
+ "Shona", "Sorcha", "Stacey", "Tessa", "Tiffany", "Verity", "Zarah", "Zoya", "Alexandria", "Alina",
+ "Alison", "Angela", "Arianna", "Chanel", "Chelsey", "Coral", "Corinne", "Danni", "Darci", "Dionne",
+ "Eliza", "Elsie", "Fatima", "Freyja", "Holli", "Jane", "Joanne", "Karina", "Katrina", "Kaylah",
+ "Kaylee", "Lori", "Mila", "Nikita", "Penny", "Sylvie", "Tammy", "Alexa", "Brooklyn", "Caragh", "Codie",
+ "Constance", "Dana", "Demi-Lee", "Emilie", "Esther", "Frankie", "Isabelle", "Jamie-Leigh", "Jessie",
+ "Josephine", "Kady", "Kaila", "Kerri", "Kirstie", "Lyla", "Macey", "Maisy", "Margaret", "Marie",
+ "Maryam", "Mercedes", "Mischa", "Rosa", "Serena", "Sian", "Tamzin", "Vanessa", "Violet", "Yasmine",
+ "Aisha", "Aleisha", "Ana", "Daniella", "Elsa", "Jodi", "Karly", "Leigha", "Lila", "Melanie", "Miriam",
+ "Regan", "Sally", "Saskia", "Simone", "Tess", "Thea", "Zainab", "Arwen", "Bonnie", "Eloise",
+ "Emma-Louise", "Halle", "Hana", "Honey", "Jamie-Lee", "Karla", "Leia", "Leila", "Madeline", "Neave",
+ "Orlaith", "Rhea", "Sarah-Jane", "Tara", "Adele", "Alannah", "Alesha", "Annabelle", "Ayla", "Becca",
+ "Darcie", "Ebony", "Erica", "Georgie", "Hanna", "Julie", "Kadie", "Kelly", "Kiara", "Lillie", "Mariam",
+ "Mikayla", "Monica", "Roisin", "Savannah", "Sky", "Zahra", "Alanna", "Caoimhe", "Chanelle", "Elisha",
+ "Emilia", "Iris", "Kacie", "Lia", "Maja", "Mary", "Michelle", "Tyler", "Willow", "Yasmin", "Becky",
+ "Billie", "Clara", "Claudia", "Cody", "Elena", "Eryn", "Georgina", "Kayley", "Kimberley", "Kira",
+ "Laila", "Lauryn", "Murron", "Natalia", "Ruth", "Siobhan", "Tiana", "Bethan", "Brodie", "Cameron",
+ "Cassie", "Harriet", "Helen", "Kathryn", "Kyra", "Mairi", "Mckenzie", "Tilly", "Zuzanna", "April",
+ "Christina", "Claire", "Darcey", "Fern", "Fiona", "Joanna", "Lucia", "Charli", "Jamie", "Karis",
+ "Mackenzie", "Marissa", "Rihanna", "Teagan", "Tiegan", "Kaitlin", "Keeley", "Leigh", "Nadia", "Alix",
+ "Callie", "Carrie", "Eden", "Esme", "Hazel", "Miya", "Nieve", "Sadie", "Sasha", "Sinead", "Stella",
+ "Ashleigh", "Jade", "Jemma", "Michaela", "Alexis", "Aoife", "Francesca", "Lisa", "Matilda", "Annabel",
+ "Carmen", "Eleanor", "Faye", "Kaci", "Kasey", "Kerry", "Louisa", "Macy", "Mhairi", "Rebekah", "Teigan",
+ "Amie", "Brogan", "Catriona", "Scarlett", "Connie", "Katelyn", "Kenzie", "Lexi", "Nicola", "Sienna",
+ "Abbi", "Angel", "Martha", "Anya", "Toni", "Chantelle", "Gabriella", "Lexie", "Abbey", "Bailey",
+ "Isobel", "Kelsie", "Maia", "Nina", "Darcy", "Lacey", "Lana", "Sofia", "Stephanie", "Ellen", "Alicia",
+ "Gabrielle", "Heidi", "Jorja", "Kyla", "Rhiannon", "Tegan", "Maddison", "Madeleine", "Morven", "Rowan",
+ "Lucie", "Milly", "Annie", "Ashley", "Ellis", "Hope", "Mirren", "Rose", "Alexandra", "Jodie", "Kacey",
+ "Phoebe", "Tia", "Ailsa", "Alana", "Kirsten", "Charlie", "Katy", "Lilly", "Alyssa", "Maria", "Naomi",
+ "Alisha", "Danielle", "Lola", "Ciara", "Elle", "Faith", "Natasha", "Katherine", "Lois", "Mollie",
+ "Carla", "Catherine", "Cerys", "Maisie", "Victoria", "Amelie", "Demi", "Gracie", "Carys", "Isabella",
+ "Leona", "Alex", "Hollie", "Sara", "Caitlyn", "Kiera", "Lara", "Kate", "Louise", "Libby", "Rhianna",
+ "Rosie", "Alice", "Julia", "Maya", "Natalie", "Chelsea", "Layla", "Samantha", "Heather", "Kirsty",
+ "Rachael", "Charley", "Imogen", "Elise", "Hayley", "Kelsey", "Kara", "Orla", "Abi", "Gemma", "Laura",
+ "Mya", "Bethany", "Jasmine", "Melissa", "Poppy", "Casey", "Elizabeth", "Kaitlyn", "Carly", "Abby",
+ "Neve", "Courtney", "Jennifer", "Sophia", "Shannon", "Georgia", "Amber", "Robyn", "Beth", "Zara",
+ "Amelia", "Taylor", "Daisy", "Paige", "Kayleigh", "Summer", "Madison", "Jenna", "Morgan", "Evie",
+ "Nicole", "Ella", "Cara", "Iona", "Eve", "Zoe", "Kayla", "Molly", "Abigail", "Charlotte", "Millie",
+ "Holly", "Leah", "Keira", "Lily", "Freya", "Caitlin", "Lauren", "Rachel", "Anna", "Sarah", "Ruby",
+ "Aimee", "Mia", "Skye", "Abbie", "Eva", "Eilidh", "Niamh", "Megan", "Brooke", "Isla", "Rebecca", "Ava",
+ "Grace", "Jessica", "Hannah", "Olivia", "Chloe", "Emily", "Amy", "Ellie", "Erin", "Katie", "Lucy",
+ "Emma", "Sophie" };
}
private static final String[] generateFirstNames() {
- return new String[] {
- "AARON",
- "ABBIE",
- "ABBY",
- "ABEL",
- "ABIGAIL",
- "ABRAHAM",
- "ADA",
- "ADAM",
- "ADAN",
- "ADDIE",
- "ADELA",
- "ADELAIDE",
- "ADELE",
- "ADELINE",
- "ADOLFO",
- "ADOLPH",
- "ADRIAN",
- "ADRIANA",
- "ADRIENNE",
- "AGNES",
- "AGUSTIN",
- "AIDA",
- "AILEEN",
- "AIMEE",
- "AISHA",
- "AL",
- "ALAN",
- "ALANA",
- "ALBA",
- "ALBERT",
- "ALBERTA",
- "ALBERTO",
- "ALEJANDRA",
- "ALEJANDRO",
- "ALEX",
- "ALEXANDER",
- "ALEXANDRA",
- "ALEXANDRIA",
- "ALEXIS",
- "ALFONSO",
- "ALFRED",
- "ALFREDA",
- "ALFREDO",
- "ALI",
- "ALICE",
- "ALICIA",
- "ALINE",
- "ALISA",
- "ALISHA",
- "ALISON",
- "ALISSA",
- "ALLAN",
- "ALLEN",
- "ALLENE",
- "ALLIE",
- "ALLISON",
- "ALLYSON",
- "ALMA",
- "ALONZO",
- "ALPHONSO",
- "ALTA",
- "ALTHEA",
- "ALTON",
- "ALVARO",
- "ALVIN",
- "ALYCE",
- "ALYSON",
- "ALYSSA",
- "AMALIA",
- "AMANDA",
- "AMBER",
- "AMELIA",
- "AMIE",
- "AMOS",
- "AMPARO",
- "AMY",
- "ANA",
- "ANASTASIA",
- "ANDRE",
- "ANDREA",
- "ANDRES",
- "ANDREW",
- "ANDY",
- "ANGEL",
- "ANGELA",
- "ANGELIA",
- "ANGELICA",
- "ANGELINA",
- "ANGELINE",
- "ANGELIQUE",
- "ANGELITA",
- "ANGELO",
- "ANGIE",
- "ANITA",
- "ANN",
- "ANNA",
- "ANNABELLE",
- "ANNE",
- "ANNETTE",
- "ANNIE",
- "ANNMARIE",
- "ANTHONY",
- "ANTIONETTE",
- "ANTOINE",
- "ANTOINETTE",
- "ANTON",
- "ANTONIA",
- "ANTONIO",
- "ANTONY",
- "APRIL",
- "ARACELI",
- "ARCHIE",
- "ARLENE",
- "ARLINE",
- "ARMAND",
- "ARMANDO",
- "ARNOLD",
- "ARRON",
- "ART",
- "ARTHUR",
- "ARTURO",
- "ASHLEE",
- "ASHLEIGH",
- "ASHLEY",
- "AUBREY",
- "AUDRA",
- "AUDREY",
- "AUGUST",
- "AUGUSTA",
- "AURELIA",
- "AURELIO",
- "AURORA",
- "AUSTIN",
- "AUTUMN",
- "AVA",
- "AVERY",
- "AVIS",
- "BARBARA",
- "BARBRA",
- "BARNEY",
- "BARRY",
- "BART",
- "BASIL",
- "BEATRICE",
- "BEATRIZ",
- "BEAU",
- "BECKY",
- "BELINDA",
- "BEN",
- "BENITA",
- "BENITO",
- "BENJAMIN",
- "BENNETT",
- "BENNIE",
- "BENNY",
- "BERNADETTE",
- "BERNADINE",
- "BERNARD",
- "BERNARDO",
- "BERNICE",
- "BERNIE",
- "BERT",
- "BERTA",
- "BERTHA",
- "BERTIE",
- "BERYL",
- "BESSIE",
- "BETH",
- "BETHANY",
- "BETSY",
- "BETTE",
- "BETTIE",
- "BETTY",
- "BETTYE",
- "BEULAH",
- "BEVERLEY",
- "BEVERLY",
- "BIANCA",
- "BILL",
- "BILLIE",
- "BILLY",
- "BLAINE",
- "BLAIR",
- "BLAKE",
- "BLANCA",
- "BLANCHE",
- "BOB",
- "BOBBI",
- "BOBBIE",
- "BOBBY",
- "BONITA",
- "BONNIE",
- "BOOKER",
- "BOYD",
- "BRAD",
- "BRADFORD",
- "BRADLEY",
- "BRADY",
- "BRAIN",
- "BRANDEN",
- "BRANDI",
- "BRANDIE",
- "BRANDON",
- "BRANDY",
- "BRENDA",
- "BRENDAN",
- "BRENT",
- "BRET",
- "BRETT",
- "BRIAN",
- "BRIANA",
- "BRIANNA",
- "BRIDGET",
- "BRIDGETT",
- "BRIDGETTE",
- "BRIGITTE",
- "BRITNEY",
- "BRITTANY",
- "BRITTNEY",
- "BROCK",
- "BROOKE",
- "BRUCE",
- "BRUNO",
- "BRYAN",
- "BRYANT",
- "BRYCE",
- "BRYON",
- "BUDDY",
- "BUFORD",
- "BURTON",
- "BYRON",
- "CAITLIN",
- "CALEB",
- "CALLIE",
- "CALVIN",
- "CAMERON",
- "CAMILLA",
- "CAMILLE",
- "CANDACE",
- "CANDICE",
- "CANDY",
- "CARA",
- "CAREY",
- "CARISSA",
- "CARL",
- "CARLA",
- "CARLENE",
- "CARLO",
- "CARLOS",
- "CARLTON",
- "CARLY",
- "CARMELA",
- "CARMELLA",
- "CARMELO",
- "CARMEN",
- "CAROL",
- "CAROLE",
- "CAROLINA",
- "CAROLINE",
- "CAROLYN",
- "CARRIE",
- "CARROLL",
- "CARSON",
- "CARTER",
- "CARY",
- "CARYN",
- "CASANDRA",
- "CASEY",
- "CASSANDRA",
- "CASSIE",
- "CATALINA",
- "CATHERINE",
- "CATHLEEN",
- "CATHRYN",
- "CATHY",
- "CECELIA",
- "CECIL",
- "CECILE",
- "CECILIA",
- "CEDRIC",
- "CELESTE",
- "CELIA",
- "CELINA",
- "CESAR",
- "CHAD",
- "CHANDRA",
- "CHARITY",
- "CHARLENE",
- "CHARLES",
- "CHARLEY",
- "CHARLIE",
- "CHARLOTTE",
- "CHARMAINE",
- "CHASE",
- "CHASITY",
- "CHELSEA",
- "CHELSEY",
- "CHERI",
- "CHERIE",
- "CHERRY",
- "CHERYL",
- "CHESTER",
- "CHRIS",
- "CHRISTA",
- "CHRISTI",
- "CHRISTIAN",
- "CHRISTIE",
- "CHRISTINA",
- "CHRISTINE",
- "CHRISTOPHER",
- "CHRISTY",
- "CHRYSTAL",
- "CHUCK",
- "CINDY",
- "CLAIR",
- "CLAIRE",
- "CLARA",
- "CLARE",
- "CLARENCE",
- "CLARICE",
- "CLARISSA",
- "CLARK",
- "CLAUDE",
- "CLAUDETTE",
- "CLAUDIA",
- "CLAUDINE",
- "CLAY",
- "CLAYTON",
- "CLEMENT",
- "CLEO",
- "CLEVELAND",
- "CLIFF",
- "CLIFFORD",
- "CLIFTON",
- "CLINT",
- "CLINTON",
- "CLYDE",
- "CODY",
- "COLBY",
- "COLE",
- "COLEEN",
- "COLETTE",
- "COLIN",
- "COLLEEN",
- "COLLIN",
- "CONCEPCION",
- "CONCETTA",
- "CONNIE",
- "CONRAD",
- "CONSTANCE",
- "CONSUELO",
- "CORA",
- "COREY",
- "CORINA",
- "CORINE",
- "CORINNE",
- "CORNELIA",
- "CORNELIUS",
- "CORNELL",
- "CORRINE",
- "CORTNEY",
- "CORY",
- "COURTNEY",
- "COY",
- "CRAIG",
- "CRISTINA",
- "CRUZ",
- "CRYSTAL",
- "CURT",
- "CURTIS",
- "CYNTHIA",
- "DAISY",
- "DALE",
- "DALLAS",
- "DALTON",
- "DAMIAN",
- "DAMIEN",
- "DAMON",
- "DAN",
- "DANA",
- "DANE",
- "DANIAL",
- "DANIEL",
- "DANIELLE",
- "DANNY",
- "DANTE",
- "DAPHNE",
- "DARCY",
- "DAREN",
- "DARIN",
- "DARIUS",
- "DARLA",
- "DARLENE",
- "DARNELL",
- "DARREL",
- "DARRELL",
- "DARREN",
- "DARRIN",
- "DARRYL",
- "DARWIN",
- "DARYL",
- "DAVE",
- "DAVID",
- "DAVIS",
- "DAWN",
- "DAYNA",
- "DEAN",
- "DEANA",
- "DEANN",
- "DEANNA",
- "DEANNE",
- "DEBBIE",
- "DEBORA",
- "DEBORAH",
- "DEBRA",
- "DEE",
- "DEENA",
- "DEIDRA",
- "DEIDRE",
- "DEIRDRE",
- "DELBERT",
- "DELIA",
- "DELLA",
- "DELMAR",
- "DELORES",
- "DELORIS",
- "DEMETRIUS",
- "DENA",
- "DENICE",
- "DENIS",
- "DENISE",
- "DENNIS",
- "DENNY",
- "DENVER",
- "DEREK",
- "DERICK",
- "DERRICK",
- "DESIREE",
- "DESMOND",
- "DESSIE",
- "DEVIN",
- "DEVON",
- "DEWAYNE",
- "DEWEY",
- "DEXTER",
- "DIANA",
- "DIANE",
- "DIANN",
- "DIANNA",
- "DIANNE",
- "DICK",
- "DIEGO",
- "DINA",
- "DION",
- "DIONNE",
- "DIRK",
- "DIXIE",
- "DOLLIE",
- "DOLLY",
- "DOLORES",
- "DOMINGO",
- "DOMINIC",
- "DOMINICK",
- "DOMINIQUE",
- "DON",
- "DONA",
- "DONALD",
- "DONNA",
- "DONNELL",
- "DONNIE",
- "DONNY",
- "DONOVAN",
- "DORA",
- "DOREEN",
- "DORETHA",
- "DORIS",
- "DOROTHEA",
- "DOROTHY",
- "DORTHY",
- "DOUG",
- "DOUGLAS",
- "DOYLE",
- "DREW",
- "DUANE",
- "DUDLEY",
- "DUSTIN",
- "DWAYNE",
- "DWIGHT",
- "DYLAN",
- "EARL",
- "EARLENE",
- "EARLINE",
- "EARNEST",
- "EARNESTINE",
- "EBONY",
- "ED",
- "EDDIE",
- "EDDY",
- "EDGAR",
- "EDITH",
- "EDMOND",
- "EDMUND",
- "EDNA",
- "EDUARDO",
- "EDWARD",
- "EDWARDO",
- "EDWIN",
- "EDWINA",
- "EDYTHE",
- "EFFIE",
- "EFRAIN",
- "EILEEN",
- "ELAINE",
- "ELBA",
- "ELBERT",
- "ELDA",
- "ELDON",
- "ELEANOR",
- "ELENA",
- "ELI",
- "ELIAS",
- "ELIJAH",
- "ELINOR",
- "ELISA",
- "ELISABETH",
- "ELISE",
- "ELISHA",
- "ELIZA",
- "ELIZABETH",
- "ELLA",
- "ELLEN",
- "ELLIOT",
- "ELLIOTT",
- "ELLIS",
- "ELMA",
- "ELMER",
- "ELNORA",
- "ELOISE",
- "ELSA",
- "ELSIE",
- "ELTON",
- "ELVA",
- "ELVIA",
- "ELVIN",
- "ELVIRA",
- "ELVIS",
- "ELWOOD",
- "EMANUEL",
- "EMERSON",
- "EMERY",
- "EMIL",
- "EMILIA",
- "EMILIE",
- "EMILIO",
- "EMILY",
- "EMMA",
- "EMMANUEL",
- "EMMETT",
- "EMORY",
- "ENID",
- "ENRIQUE",
- "ERIC",
- "ERICA",
- "ERICK",
- "ERICKA",
- "ERIK",
- "ERIKA",
- "ERIN",
- "ERMA",
- "ERNA",
- "ERNEST",
- "ERNESTINE",
- "ERNESTO",
- "ERNIE",
- "ERROL",
- "ERVIN",
- "ERWIN",
- "ESMERALDA",
- "ESPERANZA",
- "ESSIE",
- "ESTEBAN",
- "ESTELA",
- "ESTELLA",
- "ESTELLE",
- "ESTER",
- "ESTHER",
- "ETHAN",
- "ETHEL",
- "ETTA",
- "EUGENE",
- "EUGENIA",
- "EULA",
- "EUNICE",
- "EVA",
- "EVAN",
- "EVANGELINA",
- "EVANGELINE",
- "EVE",
- "EVELYN",
- "EVERETT",
- "FABIAN",
- "FAITH",
- "FANNIE",
- "FANNY",
- "FAY",
- "FAYE",
- "FEDERICO",
- "FELECIA",
- "FELICIA",
- "FELIPE",
- "FELIX",
- "FERN",
- "FERNANDO",
- "FIDEL",
- "FLETCHER",
- "FLORA",
- "FLORENCE",
- "FLORINE",
- "FLOSSIE",
- "FLOYD",
- "FORREST",
- "FRAN",
- "FRANCES",
- "FRANCESCA",
- "FRANCINE",
- "FRANCIS",
- "FRANCISCA",
- "FRANCISCO",
- "FRANK",
- "FRANKIE",
- "FRANKLIN",
- "FRED",
- "FREDA",
- "FREDDIE",
- "FREDDY",
- "FREDERIC",
- "FREDERICK",
- "FREDRICK",
- "FREIDA",
- "FRIEDA",
- "GABRIEL",
- "GABRIELA",
- "GABRIELLE",
- "GAIL",
- "GALE",
- "GALEN",
- "GARLAND",
- "GARRETT",
- "GARRY",
- "GARY",
- "GAVIN",
- "GAY",
- "GAYLA",
- "GAYLE",
- "GENA",
- "GENARO",
- "GENE",
- "GENEVA",
- "GENEVIEVE",
- "GEOFFREY",
- "GEORGE",
- "GEORGETTE",
- "GEORGIA",
- "GEORGINA",
- "GERALD",
- "GERALDINE",
- "GERARD",
- "GERARDO",
- "GERI",
- "GERMAINE",
- "GERMAN",
- "GERRY",
- "GERTRUDE",
- "GILBERT",
- "GILBERTO",
- "GILDA",
- "GINA",
- "GINGER",
- "GLADYS",
- "GLEN",
- "GLENDA",
- "GLENN",
- "GLENNA",
- "GLORIA",
- "GOLDIE",
- "GONZALO",
- "GORDON",
- "GRACE",
- "GRACIE",
- "GRACIELA",
- "GRADY",
- "GRAHAM",
- "GRANT",
- "GREG",
- "GREGG",
- "GREGORIO",
- "GREGORY",
- "GRETA",
- "GRETCHEN",
- "GROVER",
- "GUADALUPE",
- "GUILLERMO",
- "GUS",
- "GUSSIE",
- "GUSTAVO",
- "GUY",
- "GWEN",
- "GWENDOLYN",
- "HAL",
- "HALEY",
- "HALLIE",
- "HANNAH",
- "HANS",
- "HARLAN",
- "HARLEY",
- "HAROLD",
- "HARRIET",
- "HARRIETT",
- "HARRIS",
- "HARRISON",
- "HARRY",
- "HARVEY",
- "HATTIE",
- "HAZEL",
- "HEATH",
- "HEATHER",
- "HECTOR",
- "HEIDI",
- "HELEN",
- "HELENA",
- "HELENE",
- "HELGA",
- "HENRIETTA",
- "HENRY",
- "HERBERT",
- "HERIBERTO",
- "HERMAN",
- "HERMINIA",
- "HESTER",
- "HILARY",
- "HILDA",
- "HILLARY",
- "HIRAM",
- "HOLLIE",
- "HOLLIS",
- "HOLLY",
- "HOMER",
- "HOPE",
- "HORACE",
- "HOUSTON",
- "HOWARD",
- "HUBERT",
- "HUGH",
- "HUGO",
- "HUMBERTO",
- "HUNG",
- "HUNTER",
- "IAN",
- "IDA",
- "IGNACIO",
- "ILA",
- "ILENE",
- "IMELDA",
- "IMOGENE",
- "INA",
- "INES",
- "INEZ",
- "INGRID",
- "IRA",
- "IRENE",
- "IRIS",
- "IRMA",
- "IRVIN",
- "IRVING",
- "IRWIN",
- "ISAAC",
- "ISABEL",
- "ISABELLA",
- "ISABELLE",
- "ISAIAH",
- "ISIDRO",
- "ISMAEL",
- "ISRAEL",
- "ISSAC",
- "IVA",
- "IVAN",
- "IVY",
- "JACK",
- "JACKIE",
- "JACKLYN",
- "JACKSON",
- "JACLYN",
- "JACOB",
- "JACQUELINE",
- "JACQUELYN",
- "JACQUES",
- "JADE",
- "JAIME",
- "JAKE",
- "JAMAL",
- "JAME",
- "JAMES",
- "JAMI",
- "JAMIE",
- "JAN",
- "JANA",
- "JANE",
- "JANELL",
- "JANELLE",
- "JANET",
- "JANETTE",
- "JANICE",
- "JANIE",
- "JANINE",
- "JANIS",
- "JANNA",
- "JANNIE",
- "JARED",
- "JARROD",
- "JARVIS",
- "JASMIN",
- "JASMINE",
- "JASON",
- "JASPER",
- "JAVIER",
- "JAY",
- "JAYNE",
- "JAYSON",
- "JEAN",
- "JEANETTE",
- "JEANIE",
- "JEANINE",
- "JEANNE",
- "JEANNETTE",
- "JEANNIE",
- "JEANNINE",
- "JEFF",
- "JEFFERSON",
- "JEFFERY",
- "JEFFREY",
- "JEFFRY",
- "JENIFER",
- "JENNA",
- "JENNIE",
- "JENNIFER",
- "JENNY",
- "JERALD",
- "JEREMIAH",
- "JEREMY",
- "JERI",
- "JERMAINE",
- "JEROME",
- "JERRI",
- "JERRY",
- "JESS",
- "JESSE",
- "JESSICA",
- "JESSIE",
- "JESUS",
- "JEWEL",
- "JEWELL",
- "JILL",
- "JILLIAN",
- "JIM",
- "JIMMIE",
- "JIMMY",
- "JO",
- "JOAN",
- "JOANN",
- "JOANNA",
- "JOANNE",
- "JOAQUIN",
- "JOCELYN",
- "JODI",
- "JODIE",
- "JODY",
- "JOE",
- "JOEL",
- "JOESPH",
- "JOEY",
- "JOHANNA",
- "JOHN",
- "JOHNATHAN",
- "JOHNATHON",
- "JOHNNIE",
- "JOHNNY",
- "JOLENE",
- "JON",
- "JONATHAN",
- "JONATHON",
- "JONI",
- "JORDAN",
- "JORGE",
- "JOSE",
- "JOSEFA",
- "JOSEFINA",
- "JOSEPH",
- "JOSEPHINE",
- "JOSH",
- "JOSHUA",
- "JOSIE",
- "JOSUE",
- "JOY",
- "JOYCE",
- "JUAN",
- "JUANA",
- "JUANITA",
- "JUDI",
- "JUDITH",
- "JUDY",
- "JULIA",
- "JULIAN",
- "JULIANA",
- "JULIANNE",
- "JULIE",
- "JULIET",
- "JULIETTE",
- "JULIO",
- "JULIUS",
- "JUNE",
- "JUNIOR",
- "JUSTIN",
- "JUSTINA",
- "JUSTINE",
- "KAITLIN",
- "KAITLYN",
- "KARA",
- "KAREN",
- "KARI",
- "KARIN",
- "KARINA",
- "KARL",
- "KARLA",
- "KARYN",
- "KASEY",
- "KATE",
- "KATELYN",
- "KATHARINE",
- "KATHERINE",
- "KATHERYN",
- "KATHI",
- "KATHIE",
- "KATHLEEN",
- "KATHRINE",
- "KATHRYN",
- "KATHY",
- "KATIE",
- "KATINA",
- "KATRINA",
- "KATY",
- "KAY",
- "KAYE",
- "KAYLA",
- "KEISHA",
- "KEITH",
- "KELLEY",
- "KELLI",
- "KELLIE",
- "KELLY",
- "KELSEY",
- "KELVIN",
- "KEN",
- "KENDALL",
- "KENDRA",
- "KENDRICK",
- "KENNETH",
- "KENNY",
- "KENT",
- "KENYA",
- "KERI",
- "KERMIT",
- "KERRI",
- "KERRY",
- "KEVIN",
- "KIM",
- "KIMBERLEE",
- "KIMBERLEY",
- "KIMBERLY",
- "KIRBY",
- "KIRK",
- "KIRSTEN",
- "KITTY",
- "KRIS",
- "KRISTA",
- "KRISTEN",
- "KRISTI",
- "KRISTIE",
- "KRISTIN",
- "KRISTINA",
- "KRISTINE",
- "KRISTOPHER",
- "KRISTY",
- "KRYSTAL",
- "KURT",
- "KURTIS",
- "KYLE",
- "LACEY",
- "LACY",
- "LADONNA",
- "LAKEISHA",
- "LAKESHA",
- "LAKISHA",
- "LAMAR",
- "LAMONT",
- "LANA",
- "LANCE",
- "LANDON",
- "LANE",
- "LARA",
- "LARRY",
- "LASHONDA",
- "LATANYA",
- "LATASHA",
- "LATISHA",
- "LATONYA",
- "LATOYA",
- "LAURA",
- "LAUREL",
- "LAUREN",
- "LAURENCE",
- "LAURI",
- "LAURIE",
- "LAVERNE",
- "LAVONNE",
- "LAWANDA",
- "LAWRENCE",
- "LEA",
- "LEAH",
- "LEANN",
- "LEANNA",
- "LEANNE",
- "LEE",
- "LEEANN",
- "LEIGH",
- "LEILA",
- "LELA",
- "LELAND",
- "LELIA",
- "LENA",
- "LENORA",
- "LENORE",
- "LEO",
- "LEOLA",
- "LEON",
- "LEONA",
- "LEONARD",
- "LEONARDO",
- "LEONEL",
- "LEONOR",
- "LEROY",
- "LESA",
- "LESLEY",
- "LESLIE",
- "LESSIE",
- "LESTER",
- "LETA",
- "LETHA",
- "LETICIA",
- "LETITIA",
- "LEVI",
- "LEWIS",
- "LIBBY",
- "LIDIA",
- "LILA",
- "LILIA",
- "LILIAN",
- "LILIANA",
- "LILLIAN",
- "LILLIE",
- "LILLY",
- "LILY",
- "LINA",
- "LINCOLN",
- "LINDA",
- "LINDSAY",
- "LINDSEY",
- "LINWOOD",
- "LIONEL",
- "LISA",
- "LIZ",
- "LIZA",
- "LIZZIE",
- "LLOYD",
- "LOGAN",
- "LOIS",
- "LOLA",
- "LOLITA",
- "LONNIE",
- "LORA",
- "LORAINE",
- "LOREN",
- "LORENA",
- "LORENE",
- "LORENZO",
- "LORETTA",
- "LORI",
- "LORIE",
- "LORNA",
- "LORRAINE",
- "LORRIE",
- "LOTTIE",
- "LOU",
- "LOUELLA",
- "LOUIE",
- "LOUIS",
- "LOUISA",
- "LOUISE",
- "LOURDES",
- "LOWELL",
- "LOYD",
- "LUANN",
- "LUCAS",
- "LUCIA",
- "LUCILE",
- "LUCILLE",
- "LUCINDA",
- "LUCY",
- "LUELLA",
- "LUIS",
- "LUISA",
- "LUKE",
- "LULA",
- "LUPE",
- "LUTHER",
- "LUZ",
- "LYDIA",
- "LYLE",
- "LYNDA",
- "LYNETTE",
- "LYNN",
- "LYNNE",
- "LYNNETTE",
- "MA",
- "MABEL",
- "MABLE",
- "MACK",
- "MADELEINE",
- "MADELINE",
- "MADELYN",
- "MADGE",
- "MAE",
- "MAGDALENA",
- "MAGGIE",
- "MAI",
- "MALCOLM",
- "MALINDA",
- "MALLORY",
- "MAMIE",
- "MANDY",
- "MANUEL",
- "MANUELA",
- "MARA",
- "MARC",
- "MARCEL",
- "MARCELINO",
- "MARCELLA",
- "MARCI",
- "MARCIA",
- "MARCIE",
- "MARCO",
- "MARCOS",
- "MARCUS",
- "MARCY",
- "MARGARET",
- "MARGARITA",
- "MARGERY",
- "MARGIE",
- "MARGO",
- "MARGOT",
- "MARGRET",
- "MARGUERITE",
- "MARI",
- "MARIA",
- "MARIAN",
- "MARIANA",
- "MARIANNE",
- "MARIANO",
- "MARIBEL",
- "MARICELA",
- "MARIE",
- "MARIETTA",
- "MARILYN",
- "MARINA",
- "MARIO",
- "MARION",
- "MARISA",
- "MARISOL",
- "MARISSA",
- "MARITZA",
- "MARJORIE",
- "MARK",
- "MARLA",
- "MARLENE",
- "MARLIN",
- "MARLON",
- "MARQUITA",
- "MARSHA",
- "MARSHALL",
- "MARTA",
- "MARTHA",
- "MARTIN",
- "MARTINA",
- "MARTY",
- "MARVA",
- "MARVIN",
- "MARY",
- "MARYANN",
- "MARYANNE",
- "MARYELLEN",
- "MARYLOU",
- "MASON",
- "MATHEW",
- "MATILDA",
- "MATT",
- "MATTHEW",
- "MATTIE",
- "MAUDE",
- "MAURA",
- "MAUREEN",
- "MAURICE",
- "MAURICIO",
- "MAVIS",
- "MAX",
- "MAXINE",
- "MAXWELL",
- "MAY",
- "MAYNARD",
- "MAYRA",
- "MEAGAN",
- "MEGAN",
- "MEGHAN",
- "MELANIE",
- "MELBA",
- "MELINDA",
- "MELISA",
- "MELISSA",
- "MELLISA",
- "MELODY",
- "MELVA",
- "MELVIN",
- "MERCEDES",
- "MEREDITH",
- "MERLE",
- "MERLIN",
- "MERRILL",
- "MIA",
- "MICAH",
- "MICHAEL",
- "MICHAELA",
- "MICHEAL",
- "MICHEL",
- "MICHELE",
- "MICHELL",
- "MICHELLE",
- "MICKEY",
- "MIGUEL",
- "MIKE",
- "MILAGROS",
- "MILDRED",
- "MILES",
- "MILLARD",
- "MILLICENT",
- "MILLIE",
- "MILTON",
- "MINA",
- "MINDY",
- "MINERVA",
- "MINNIE",
- "MIRANDA",
- "MIRIAM",
- "MISTY",
- "MITCHELL",
- "MITZI",
- "MOHAMMAD",
- "MOISES",
- "MOLLIE",
- "MOLLY",
- "MONA",
- "MONICA",
- "MONIKA",
- "MONIQUE",
- "MONROE",
- "MONTE",
- "MONTY",
- "MORGAN",
- "MORRIS",
- "MOSES",
- "MURIEL",
- "MURRAY",
- "MYRA",
- "MYRNA",
- "MYRON",
- "MYRTLE",
- "NADIA",
- "NADINE",
- "NAN",
- "NANCY",
- "NANETTE",
- "NANNIE",
- "NAOMI",
- "NATALIA",
- "NATALIE",
- "NATASHA",
- "NATHAN",
- "NATHANIEL",
- "NEAL",
- "NED",
- "NEIL",
- "NELDA",
- "NELL",
- "NELLIE",
- "NELLY",
- "NELSON",
- "NESTOR",
- "NETTIE",
- "NEVA",
- "NICHOLAS",
- "NICHOLE",
- "NICK",
- "NICKOLAS",
- "NICOLAS",
- "NICOLE",
- "NIKKI",
- "NINA",
- "NITA",
- "NOAH",
- "NOE",
- "NOEL",
- "NOELLE",
- "NOEMI",
- "NOLA",
- "NOLAN",
- "NONA",
- "NORA",
- "NORBERT",
- "NOREEN",
- "NORMA",
- "NORMAN",
- "NORRIS",
- "NUMBERS",
- "OCTAVIA",
- "OCTAVIO",
- "ODELL",
- "ODESSA",
- "OFELIA",
- "OLA",
- "OLGA",
- "OLIVE",
- "OLIVER",
- "OLIVIA",
- "OLLIE",
- "OMAR",
- "OPAL",
- "OPHELIA",
- "ORA",
- "ORLANDO",
- "ORVILLE",
- "OSCAR",
- "OTIS",
- "OTTO",
- "OWEN",
- "PABLO",
- "PAIGE",
- "PAM",
- "PAMALA",
- "PAMELA",
- "PANSY",
- "PASQUALE",
- "PAT",
- "PATRICA",
- "PATRICE",
- "PATRICIA",
- "PATRICK",
- "PATSY",
- "PATTI",
- "PATTY",
- "PAUL",
- "PAULA",
- "PAULETTE",
- "PAULINE",
- "PEARL",
- "PEARLIE",
- "PEDRO",
- "PEGGY",
- "PENELOPE",
- "PENNY",
- "PERCY",
- "PERRY",
- "PETE",
- "PETER",
- "PETRA",
- "PHIL",
- "PHILIP",
- "PHILLIP",
- "PHOEBE",
- "PHYLLIS",
- "PIERRE",
- "POLLY",
- "PRESTON",
- "PRISCILLA",
- "QUEEN",
- "QUENTIN",
- "QUINCY",
- "QUINTON",
- "RACHAEL",
- "RACHEL",
- "RACHELLE",
- "RAE",
- "RAFAEL",
- "RALPH",
- "RAMIRO",
- "RAMON",
- "RAMONA",
- "RANDAL",
- "RANDALL",
- "RANDI",
- "RANDOLPH",
- "RANDY",
- "RAPHAEL",
- "RAQUEL",
- "RAUL",
- "RAY",
- "RAYMOND",
- "RAYMUNDO",
- "REBA",
- "REBECCA",
- "REBEKAH",
- "REED",
- "REGGIE",
- "REGINA",
- "REGINALD",
- "RENA",
- "RENAE",
- "RENE",
- "RENEE",
- "REUBEN",
- "REVA",
- "REX",
- "REYNA",
- "REYNALDO",
- "RHEA",
- "RHODA",
- "RHONDA",
- "RICARDO",
- "RICHARD",
- "RICK",
- "RICKEY",
- "RICKIE",
- "RICKY",
- "RIGOBERTO",
- "RILEY",
- "RITA",
- "ROB",
- "ROBBIE",
- "ROBBY",
- "ROBERT",
- "ROBERTA",
- "ROBERTO",
- "ROBIN",
- "ROBYN",
- "ROCCO",
- "ROCHELLE",
- "ROCIO",
- "ROCKY",
- "ROD",
- "RODERICK",
- "RODGER",
- "RODNEY",
- "RODOLFO",
- "RODRIGO",
- "ROGELIO",
- "ROGER",
- "ROLAND",
- "ROLANDO",
- "ROMAN",
- "ROMEO",
- "RON",
- "RONALD",
- "RONDA",
- "RONNIE",
- "ROOSEVELT",
- "RORY",
- "ROSA",
- "ROSALIA",
- "ROSALIE",
- "ROSALIND",
- "ROSALINDA",
- "ROSALYN",
- "ROSANNA",
- "ROSANNE",
- "ROSARIO",
- "ROSCOE",
- "ROSE",
- "ROSEANN",
- "ROSELLA",
- "ROSEMARIE",
- "ROSEMARY",
- "ROSETTA",
- "ROSIE",
- "ROSLYN",
- "ROSS",
- "ROWENA",
- "ROXANNE",
- "ROXIE",
- "ROY",
- "ROYCE",
- "RUBEN",
- "RUBY",
- "RUDOLPH",
- "RUDY",
- "RUFUS",
- "RUSSEL",
- "RUSSELL",
- "RUSTY",
- "RUTH",
- "RUTHIE",
- "RYAN",
- "SABRINA",
- "SADIE",
- "SALLIE",
- "SALLY",
- "SALVADOR",
- "SALVATORE",
- "SAM",
- "SAMANTHA",
- "SAMMIE",
- "SAMMY",
- "SAMUEL",
- "SANDRA",
- "SANDY",
- "SANFORD",
- "SANTIAGO",
- "SANTOS",
- "SARA",
- "SARAH",
- "SASHA",
- "SAUL",
- "SAUNDRA",
- "SAVANNAH",
- "SCOT",
- "SCOTT",
- "SCOTTY",
- "SEAN",
- "SEBASTIAN",
- "SELENA",
- "SELINA",
- "SELMA",
- "SERENA",
- "SERGIO",
- "SETH",
- "SHANA",
- "SHANE",
- "SHANNA",
- "SHANNON",
- "SHARI",
- "SHARLENE",
- "SHARON",
- "SHARRON",
- "SHAUN",
- "SHAUNA",
- "SHAWN",
- "SHAWNA",
- "SHEENA",
- "SHEILA",
- "SHELBY",
- "SHELDON",
- "SHELIA",
- "SHELLEY",
- "SHELLY",
- "SHELTON",
- "SHEREE",
- "SHERI",
- "SHERMAN",
- "SHERRI",
- "SHERRIE",
- "SHERRY",
- "SHERYL",
- "SHIRLEY",
- "SIDNEY",
- "SIERRA",
- "SILAS",
- "SILVIA",
- "SIMON",
- "SIMONE",
- "SOCORRO",
- "SOFIA",
- "SOLOMON",
- "SON",
- "SONDRA",
- "SONIA",
- "SONJA",
- "SONNY",
- "SONYA",
- "SOPHIA",
- "SOPHIE",
- "SPENCER",
- "STACEY",
- "STACI",
- "STACIE",
- "STACY",
- "STAN",
- "STANLEY",
- "STEFAN",
- "STEFANIE",
- "STELLA",
- "STEPHAN",
- "STEPHANIE",
- "STEPHEN",
- "STERLING",
- "STEVE",
- "STEVEN",
- "STEWART",
- "STUART",
- "SUE",
- "SUMMER",
- "SUSAN",
- "SUSANA",
- "SUSANNA",
- "SUSANNE",
- "SUSIE",
- "SUZANNE",
- "SUZETTE",
- "SYBIL",
- "SYDNEY",
- "SYLVESTER",
- "SYLVIA",
- "TABATHA",
- "TABITHA",
- "TAMARA",
- "TAMEKA",
- "TAMERA",
- "TAMI",
- "TAMIKA",
- "TAMMI",
- "TAMMIE",
- "TAMMY",
- "TAMRA",
- "TANIA",
- "TANISHA",
- "TANYA",
- "TARA",
- "TASHA",
- "TAYLOR",
- "TED",
- "TEDDY",
- "TERENCE",
- "TERESA",
- "TERI",
- "TERRA",
- "TERRANCE",
- "TERRELL",
- "TERRENCE",
- "TERRI",
- "TERRIE",
- "TERRY",
- "TESSA",
- "THADDEUS",
- "THELMA",
- "THEODORE",
- "THERESA",
- "THERESE",
- "THERON",
- "THOMAS",
- "THURMAN",
- "TIA",
- "TIFFANY",
- "TIM",
- "TIMMY",
- "TIMOTHY",
- "TINA",
- "TISHA",
- "TOBY",
- "TODD",
- "TOM",
- "TOMAS",
- "TOMMIE",
- "TOMMY",
- "TONI",
- "TONIA",
- "TONY",
- "TONYA",
- "TORI",
- "TRACEY",
- "TRACI",
- "TRACIE",
- "TRACY",
- "TRAVIS",
- "TRENT",
- "TRENTON",
- "TREVOR",
- "TRICIA",
- "TRINA",
- "TRISHA",
- "TRISTAN",
- "TROY",
- "TRUDY",
- "TRUMAN",
- "TWILA",
- "TY",
- "TYLER",
- "TYRONE",
- "TYSON",
- "ULYSSES",
- "URSULA",
- "VALARIE",
- "VALERIA",
- "VALERIE",
- "VAN",
- "VANCE",
- "VANESSA",
- "VAUGHN",
- "VELMA",
- "VERA",
- "VERN",
- "VERNA",
- "VERNON",
- "VERONICA",
- "VICENTE",
- "VICKI",
- "VICKIE",
- "VICKY",
- "VICTOR",
- "VICTORIA",
- "VILMA",
- "VINCE",
- "VINCENT",
- "VIOLA",
- "VIOLET",
- "VIRGIE",
- "VIRGIL",
- "VIRGINIA",
- "VITO",
- "VIVIAN",
- "VONDA",
- "WADE",
- "WALLACE",
- "WALTER",
- "WANDA",
- "WARD",
- "WARREN",
- "WAYNE",
- "WELDON",
- "WENDELL",
- "WENDI",
- "WENDY",
- "WESLEY",
- "WHITNEY",
- "WILBERT",
- "WILBUR",
- "WILDA",
- "WILEY",
- "WILFORD",
- "WILFRED",
- "WILFREDO",
- "WILL",
- "WILLA",
- "WILLARD",
- "WILLIAM",
- "WILLIAMS",
- "WILLIE",
- "WILLIS",
- "WILMA",
- "WILMER",
- "WILSON",
- "WINFRED",
- "WINIFRED",
- "WINNIE",
- "WINSTON",
- "WM",
- "WOODROW",
- "XAVIER",
- "YESENIA",
- "YOLANDA",
- "YOUNG",
- "YVETTE",
- "YVONNE",
- "ZACHARY",
- "ZACHERY",
- "ZELDA",
- "ZELMA"
- };
+ return new String[] { "AARON", "ABBIE", "ABBY", "ABEL", "ABIGAIL", "ABRAHAM", "ADA", "ADAM", "ADAN", "ADDIE",
+ "ADELA", "ADELAIDE", "ADELE", "ADELINE", "ADOLFO", "ADOLPH", "ADRIAN", "ADRIANA", "ADRIENNE", "AGNES",
+ "AGUSTIN", "AIDA", "AILEEN", "AIMEE", "AISHA", "AL", "ALAN", "ALANA", "ALBA", "ALBERT", "ALBERTA",
+ "ALBERTO", "ALEJANDRA", "ALEJANDRO", "ALEX", "ALEXANDER", "ALEXANDRA", "ALEXANDRIA", "ALEXIS",
+ "ALFONSO", "ALFRED", "ALFREDA", "ALFREDO", "ALI", "ALICE", "ALICIA", "ALINE", "ALISA", "ALISHA",
+ "ALISON", "ALISSA", "ALLAN", "ALLEN", "ALLENE", "ALLIE", "ALLISON", "ALLYSON", "ALMA", "ALONZO",
+ "ALPHONSO", "ALTA", "ALTHEA", "ALTON", "ALVARO", "ALVIN", "ALYCE", "ALYSON", "ALYSSA", "AMALIA",
+ "AMANDA", "AMBER", "AMELIA", "AMIE", "AMOS", "AMPARO", "AMY", "ANA", "ANASTASIA", "ANDRE", "ANDREA",
+ "ANDRES", "ANDREW", "ANDY", "ANGEL", "ANGELA", "ANGELIA", "ANGELICA", "ANGELINA", "ANGELINE",
+ "ANGELIQUE", "ANGELITA", "ANGELO", "ANGIE", "ANITA", "ANN", "ANNA", "ANNABELLE", "ANNE", "ANNETTE",
+ "ANNIE", "ANNMARIE", "ANTHONY", "ANTIONETTE", "ANTOINE", "ANTOINETTE", "ANTON", "ANTONIA", "ANTONIO",
+ "ANTONY", "APRIL", "ARACELI", "ARCHIE", "ARLENE", "ARLINE", "ARMAND", "ARMANDO", "ARNOLD", "ARRON",
+ "ART", "ARTHUR", "ARTURO", "ASHLEE", "ASHLEIGH", "ASHLEY", "AUBREY", "AUDRA", "AUDREY", "AUGUST",
+ "AUGUSTA", "AURELIA", "AURELIO", "AURORA", "AUSTIN", "AUTUMN", "AVA", "AVERY", "AVIS", "BARBARA",
+ "BARBRA", "BARNEY", "BARRY", "BART", "BASIL", "BEATRICE", "BEATRIZ", "BEAU", "BECKY", "BELINDA", "BEN",
+ "BENITA", "BENITO", "BENJAMIN", "BENNETT", "BENNIE", "BENNY", "BERNADETTE", "BERNADINE", "BERNARD",
+ "BERNARDO", "BERNICE", "BERNIE", "BERT", "BERTA", "BERTHA", "BERTIE", "BERYL", "BESSIE", "BETH",
+ "BETHANY", "BETSY", "BETTE", "BETTIE", "BETTY", "BETTYE", "BEULAH", "BEVERLEY", "BEVERLY", "BIANCA",
+ "BILL", "BILLIE", "BILLY", "BLAINE", "BLAIR", "BLAKE", "BLANCA", "BLANCHE", "BOB", "BOBBI", "BOBBIE",
+ "BOBBY", "BONITA", "BONNIE", "BOOKER", "BOYD", "BRAD", "BRADFORD", "BRADLEY", "BRADY", "BRAIN",
+ "BRANDEN", "BRANDI", "BRANDIE", "BRANDON", "BRANDY", "BRENDA", "BRENDAN", "BRENT", "BRET", "BRETT",
+ "BRIAN", "BRIANA", "BRIANNA", "BRIDGET", "BRIDGETT", "BRIDGETTE", "BRIGITTE", "BRITNEY", "BRITTANY",
+ "BRITTNEY", "BROCK", "BROOKE", "BRUCE", "BRUNO", "BRYAN", "BRYANT", "BRYCE", "BRYON", "BUDDY", "BUFORD",
+ "BURTON", "BYRON", "CAITLIN", "CALEB", "CALLIE", "CALVIN", "CAMERON", "CAMILLA", "CAMILLE", "CANDACE",
+ "CANDICE", "CANDY", "CARA", "CAREY", "CARISSA", "CARL", "CARLA", "CARLENE", "CARLO", "CARLOS",
+ "CARLTON", "CARLY", "CARMELA", "CARMELLA", "CARMELO", "CARMEN", "CAROL", "CAROLE", "CAROLINA",
+ "CAROLINE", "CAROLYN", "CARRIE", "CARROLL", "CARSON", "CARTER", "CARY", "CARYN", "CASANDRA", "CASEY",
+ "CASSANDRA", "CASSIE", "CATALINA", "CATHERINE", "CATHLEEN", "CATHRYN", "CATHY", "CECELIA", "CECIL",
+ "CECILE", "CECILIA", "CEDRIC", "CELESTE", "CELIA", "CELINA", "CESAR", "CHAD", "CHANDRA", "CHARITY",
+ "CHARLENE", "CHARLES", "CHARLEY", "CHARLIE", "CHARLOTTE", "CHARMAINE", "CHASE", "CHASITY", "CHELSEA",
+ "CHELSEY", "CHERI", "CHERIE", "CHERRY", "CHERYL", "CHESTER", "CHRIS", "CHRISTA", "CHRISTI", "CHRISTIAN",
+ "CHRISTIE", "CHRISTINA", "CHRISTINE", "CHRISTOPHER", "CHRISTY", "CHRYSTAL", "CHUCK", "CINDY", "CLAIR",
+ "CLAIRE", "CLARA", "CLARE", "CLARENCE", "CLARICE", "CLARISSA", "CLARK", "CLAUDE", "CLAUDETTE",
+ "CLAUDIA", "CLAUDINE", "CLAY", "CLAYTON", "CLEMENT", "CLEO", "CLEVELAND", "CLIFF", "CLIFFORD",
+ "CLIFTON", "CLINT", "CLINTON", "CLYDE", "CODY", "COLBY", "COLE", "COLEEN", "COLETTE", "COLIN",
+ "COLLEEN", "COLLIN", "CONCEPCION", "CONCETTA", "CONNIE", "CONRAD", "CONSTANCE", "CONSUELO", "CORA",
+ "COREY", "CORINA", "CORINE", "CORINNE", "CORNELIA", "CORNELIUS", "CORNELL", "CORRINE", "CORTNEY",
+ "CORY", "COURTNEY", "COY", "CRAIG", "CRISTINA", "CRUZ", "CRYSTAL", "CURT", "CURTIS", "CYNTHIA", "DAISY",
+ "DALE", "DALLAS", "DALTON", "DAMIAN", "DAMIEN", "DAMON", "DAN", "DANA", "DANE", "DANIAL", "DANIEL",
+ "DANIELLE", "DANNY", "DANTE", "DAPHNE", "DARCY", "DAREN", "DARIN", "DARIUS", "DARLA", "DARLENE",
+ "DARNELL", "DARREL", "DARRELL", "DARREN", "DARRIN", "DARRYL", "DARWIN", "DARYL", "DAVE", "DAVID",
+ "DAVIS", "DAWN", "DAYNA", "DEAN", "DEANA", "DEANN", "DEANNA", "DEANNE", "DEBBIE", "DEBORA", "DEBORAH",
+ "DEBRA", "DEE", "DEENA", "DEIDRA", "DEIDRE", "DEIRDRE", "DELBERT", "DELIA", "DELLA", "DELMAR",
+ "DELORES", "DELORIS", "DEMETRIUS", "DENA", "DENICE", "DENIS", "DENISE", "DENNIS", "DENNY", "DENVER",
+ "DEREK", "DERICK", "DERRICK", "DESIREE", "DESMOND", "DESSIE", "DEVIN", "DEVON", "DEWAYNE", "DEWEY",
+ "DEXTER", "DIANA", "DIANE", "DIANN", "DIANNA", "DIANNE", "DICK", "DIEGO", "DINA", "DION", "DIONNE",
+ "DIRK", "DIXIE", "DOLLIE", "DOLLY", "DOLORES", "DOMINGO", "DOMINIC", "DOMINICK", "DOMINIQUE", "DON",
+ "DONA", "DONALD", "DONNA", "DONNELL", "DONNIE", "DONNY", "DONOVAN", "DORA", "DOREEN", "DORETHA",
+ "DORIS", "DOROTHEA", "DOROTHY", "DORTHY", "DOUG", "DOUGLAS", "DOYLE", "DREW", "DUANE", "DUDLEY",
+ "DUSTIN", "DWAYNE", "DWIGHT", "DYLAN", "EARL", "EARLENE", "EARLINE", "EARNEST", "EARNESTINE", "EBONY",
+ "ED", "EDDIE", "EDDY", "EDGAR", "EDITH", "EDMOND", "EDMUND", "EDNA", "EDUARDO", "EDWARD", "EDWARDO",
+ "EDWIN", "EDWINA", "EDYTHE", "EFFIE", "EFRAIN", "EILEEN", "ELAINE", "ELBA", "ELBERT", "ELDA", "ELDON",
+ "ELEANOR", "ELENA", "ELI", "ELIAS", "ELIJAH", "ELINOR", "ELISA", "ELISABETH", "ELISE", "ELISHA",
+ "ELIZA", "ELIZABETH", "ELLA", "ELLEN", "ELLIOT", "ELLIOTT", "ELLIS", "ELMA", "ELMER", "ELNORA",
+ "ELOISE", "ELSA", "ELSIE", "ELTON", "ELVA", "ELVIA", "ELVIN", "ELVIRA", "ELVIS", "ELWOOD", "EMANUEL",
+ "EMERSON", "EMERY", "EMIL", "EMILIA", "EMILIE", "EMILIO", "EMILY", "EMMA", "EMMANUEL", "EMMETT",
+ "EMORY", "ENID", "ENRIQUE", "ERIC", "ERICA", "ERICK", "ERICKA", "ERIK", "ERIKA", "ERIN", "ERMA", "ERNA",
+ "ERNEST", "ERNESTINE", "ERNESTO", "ERNIE", "ERROL", "ERVIN", "ERWIN", "ESMERALDA", "ESPERANZA", "ESSIE",
+ "ESTEBAN", "ESTELA", "ESTELLA", "ESTELLE", "ESTER", "ESTHER", "ETHAN", "ETHEL", "ETTA", "EUGENE",
+ "EUGENIA", "EULA", "EUNICE", "EVA", "EVAN", "EVANGELINA", "EVANGELINE", "EVE", "EVELYN", "EVERETT",
+ "FABIAN", "FAITH", "FANNIE", "FANNY", "FAY", "FAYE", "FEDERICO", "FELECIA", "FELICIA", "FELIPE",
+ "FELIX", "FERN", "FERNANDO", "FIDEL", "FLETCHER", "FLORA", "FLORENCE", "FLORINE", "FLOSSIE", "FLOYD",
+ "FORREST", "FRAN", "FRANCES", "FRANCESCA", "FRANCINE", "FRANCIS", "FRANCISCA", "FRANCISCO", "FRANK",
+ "FRANKIE", "FRANKLIN", "FRED", "FREDA", "FREDDIE", "FREDDY", "FREDERIC", "FREDERICK", "FREDRICK",
+ "FREIDA", "FRIEDA", "GABRIEL", "GABRIELA", "GABRIELLE", "GAIL", "GALE", "GALEN", "GARLAND", "GARRETT",
+ "GARRY", "GARY", "GAVIN", "GAY", "GAYLA", "GAYLE", "GENA", "GENARO", "GENE", "GENEVA", "GENEVIEVE",
+ "GEOFFREY", "GEORGE", "GEORGETTE", "GEORGIA", "GEORGINA", "GERALD", "GERALDINE", "GERARD", "GERARDO",
+ "GERI", "GERMAINE", "GERMAN", "GERRY", "GERTRUDE", "GILBERT", "GILBERTO", "GILDA", "GINA", "GINGER",
+ "GLADYS", "GLEN", "GLENDA", "GLENN", "GLENNA", "GLORIA", "GOLDIE", "GONZALO", "GORDON", "GRACE",
+ "GRACIE", "GRACIELA", "GRADY", "GRAHAM", "GRANT", "GREG", "GREGG", "GREGORIO", "GREGORY", "GRETA",
+ "GRETCHEN", "GROVER", "GUADALUPE", "GUILLERMO", "GUS", "GUSSIE", "GUSTAVO", "GUY", "GWEN", "GWENDOLYN",
+ "HAL", "HALEY", "HALLIE", "HANNAH", "HANS", "HARLAN", "HARLEY", "HAROLD", "HARRIET", "HARRIETT",
+ "HARRIS", "HARRISON", "HARRY", "HARVEY", "HATTIE", "HAZEL", "HEATH", "HEATHER", "HECTOR", "HEIDI",
+ "HELEN", "HELENA", "HELENE", "HELGA", "HENRIETTA", "HENRY", "HERBERT", "HERIBERTO", "HERMAN",
+ "HERMINIA", "HESTER", "HILARY", "HILDA", "HILLARY", "HIRAM", "HOLLIE", "HOLLIS", "HOLLY", "HOMER",
+ "HOPE", "HORACE", "HOUSTON", "HOWARD", "HUBERT", "HUGH", "HUGO", "HUMBERTO", "HUNG", "HUNTER", "IAN",
+ "IDA", "IGNACIO", "ILA", "ILENE", "IMELDA", "IMOGENE", "INA", "INES", "INEZ", "INGRID", "IRA", "IRENE",
+ "IRIS", "IRMA", "IRVIN", "IRVING", "IRWIN", "ISAAC", "ISABEL", "ISABELLA", "ISABELLE", "ISAIAH",
+ "ISIDRO", "ISMAEL", "ISRAEL", "ISSAC", "IVA", "IVAN", "IVY", "JACK", "JACKIE", "JACKLYN", "JACKSON",
+ "JACLYN", "JACOB", "JACQUELINE", "JACQUELYN", "JACQUES", "JADE", "JAIME", "JAKE", "JAMAL", "JAME",
+ "JAMES", "JAMI", "JAMIE", "JAN", "JANA", "JANE", "JANELL", "JANELLE", "JANET", "JANETTE", "JANICE",
+ "JANIE", "JANINE", "JANIS", "JANNA", "JANNIE", "JARED", "JARROD", "JARVIS", "JASMIN", "JASMINE",
+ "JASON", "JASPER", "JAVIER", "JAY", "JAYNE", "JAYSON", "JEAN", "JEANETTE", "JEANIE", "JEANINE",
+ "JEANNE", "JEANNETTE", "JEANNIE", "JEANNINE", "JEFF", "JEFFERSON", "JEFFERY", "JEFFREY", "JEFFRY",
+ "JENIFER", "JENNA", "JENNIE", "JENNIFER", "JENNY", "JERALD", "JEREMIAH", "JEREMY", "JERI", "JERMAINE",
+ "JEROME", "JERRI", "JERRY", "JESS", "JESSE", "JESSICA", "JESSIE", "JESUS", "JEWEL", "JEWELL", "JILL",
+ "JILLIAN", "JIM", "JIMMIE", "JIMMY", "JO", "JOAN", "JOANN", "JOANNA", "JOANNE", "JOAQUIN", "JOCELYN",
+ "JODI", "JODIE", "JODY", "JOE", "JOEL", "JOESPH", "JOEY", "JOHANNA", "JOHN", "JOHNATHAN", "JOHNATHON",
+ "JOHNNIE", "JOHNNY", "JOLENE", "JON", "JONATHAN", "JONATHON", "JONI", "JORDAN", "JORGE", "JOSE",
+ "JOSEFA", "JOSEFINA", "JOSEPH", "JOSEPHINE", "JOSH", "JOSHUA", "JOSIE", "JOSUE", "JOY", "JOYCE", "JUAN",
+ "JUANA", "JUANITA", "JUDI", "JUDITH", "JUDY", "JULIA", "JULIAN", "JULIANA", "JULIANNE", "JULIE",
+ "JULIET", "JULIETTE", "JULIO", "JULIUS", "JUNE", "JUNIOR", "JUSTIN", "JUSTINA", "JUSTINE", "KAITLIN",
+ "KAITLYN", "KARA", "KAREN", "KARI", "KARIN", "KARINA", "KARL", "KARLA", "KARYN", "KASEY", "KATE",
+ "KATELYN", "KATHARINE", "KATHERINE", "KATHERYN", "KATHI", "KATHIE", "KATHLEEN", "KATHRINE", "KATHRYN",
+ "KATHY", "KATIE", "KATINA", "KATRINA", "KATY", "KAY", "KAYE", "KAYLA", "KEISHA", "KEITH", "KELLEY",
+ "KELLI", "KELLIE", "KELLY", "KELSEY", "KELVIN", "KEN", "KENDALL", "KENDRA", "KENDRICK", "KENNETH",
+ "KENNY", "KENT", "KENYA", "KERI", "KERMIT", "KERRI", "KERRY", "KEVIN", "KIM", "KIMBERLEE", "KIMBERLEY",
+ "KIMBERLY", "KIRBY", "KIRK", "KIRSTEN", "KITTY", "KRIS", "KRISTA", "KRISTEN", "KRISTI", "KRISTIE",
+ "KRISTIN", "KRISTINA", "KRISTINE", "KRISTOPHER", "KRISTY", "KRYSTAL", "KURT", "KURTIS", "KYLE", "LACEY",
+ "LACY", "LADONNA", "LAKEISHA", "LAKESHA", "LAKISHA", "LAMAR", "LAMONT", "LANA", "LANCE", "LANDON",
+ "LANE", "LARA", "LARRY", "LASHONDA", "LATANYA", "LATASHA", "LATISHA", "LATONYA", "LATOYA", "LAURA",
+ "LAUREL", "LAUREN", "LAURENCE", "LAURI", "LAURIE", "LAVERNE", "LAVONNE", "LAWANDA", "LAWRENCE", "LEA",
+ "LEAH", "LEANN", "LEANNA", "LEANNE", "LEE", "LEEANN", "LEIGH", "LEILA", "LELA", "LELAND", "LELIA",
+ "LENA", "LENORA", "LENORE", "LEO", "LEOLA", "LEON", "LEONA", "LEONARD", "LEONARDO", "LEONEL", "LEONOR",
+ "LEROY", "LESA", "LESLEY", "LESLIE", "LESSIE", "LESTER", "LETA", "LETHA", "LETICIA", "LETITIA", "LEVI",
+ "LEWIS", "LIBBY", "LIDIA", "LILA", "LILIA", "LILIAN", "LILIANA", "LILLIAN", "LILLIE", "LILLY", "LILY",
+ "LINA", "LINCOLN", "LINDA", "LINDSAY", "LINDSEY", "LINWOOD", "LIONEL", "LISA", "LIZ", "LIZA", "LIZZIE",
+ "LLOYD", "LOGAN", "LOIS", "LOLA", "LOLITA", "LONNIE", "LORA", "LORAINE", "LOREN", "LORENA", "LORENE",
+ "LORENZO", "LORETTA", "LORI", "LORIE", "LORNA", "LORRAINE", "LORRIE", "LOTTIE", "LOU", "LOUELLA",
+ "LOUIE", "LOUIS", "LOUISA", "LOUISE", "LOURDES", "LOWELL", "LOYD", "LUANN", "LUCAS", "LUCIA", "LUCILE",
+ "LUCILLE", "LUCINDA", "LUCY", "LUELLA", "LUIS", "LUISA", "LUKE", "LULA", "LUPE", "LUTHER", "LUZ",
+ "LYDIA", "LYLE", "LYNDA", "LYNETTE", "LYNN", "LYNNE", "LYNNETTE", "MA", "MABEL", "MABLE", "MACK",
+ "MADELEINE", "MADELINE", "MADELYN", "MADGE", "MAE", "MAGDALENA", "MAGGIE", "MAI", "MALCOLM", "MALINDA",
+ "MALLORY", "MAMIE", "MANDY", "MANUEL", "MANUELA", "MARA", "MARC", "MARCEL", "MARCELINO", "MARCELLA",
+ "MARCI", "MARCIA", "MARCIE", "MARCO", "MARCOS", "MARCUS", "MARCY", "MARGARET", "MARGARITA", "MARGERY",
+ "MARGIE", "MARGO", "MARGOT", "MARGRET", "MARGUERITE", "MARI", "MARIA", "MARIAN", "MARIANA", "MARIANNE",
+ "MARIANO", "MARIBEL", "MARICELA", "MARIE", "MARIETTA", "MARILYN", "MARINA", "MARIO", "MARION", "MARISA",
+ "MARISOL", "MARISSA", "MARITZA", "MARJORIE", "MARK", "MARLA", "MARLENE", "MARLIN", "MARLON", "MARQUITA",
+ "MARSHA", "MARSHALL", "MARTA", "MARTHA", "MARTIN", "MARTINA", "MARTY", "MARVA", "MARVIN", "MARY",
+ "MARYANN", "MARYANNE", "MARYELLEN", "MARYLOU", "MASON", "MATHEW", "MATILDA", "MATT", "MATTHEW",
+ "MATTIE", "MAUDE", "MAURA", "MAUREEN", "MAURICE", "MAURICIO", "MAVIS", "MAX", "MAXINE", "MAXWELL",
+ "MAY", "MAYNARD", "MAYRA", "MEAGAN", "MEGAN", "MEGHAN", "MELANIE", "MELBA", "MELINDA", "MELISA",
+ "MELISSA", "MELLISA", "MELODY", "MELVA", "MELVIN", "MERCEDES", "MEREDITH", "MERLE", "MERLIN", "MERRILL",
+ "MIA", "MICAH", "MICHAEL", "MICHAELA", "MICHEAL", "MICHEL", "MICHELE", "MICHELL", "MICHELLE", "MICKEY",
+ "MIGUEL", "MIKE", "MILAGROS", "MILDRED", "MILES", "MILLARD", "MILLICENT", "MILLIE", "MILTON", "MINA",
+ "MINDY", "MINERVA", "MINNIE", "MIRANDA", "MIRIAM", "MISTY", "MITCHELL", "MITZI", "MOHAMMAD", "MOISES",
+ "MOLLIE", "MOLLY", "MONA", "MONICA", "MONIKA", "MONIQUE", "MONROE", "MONTE", "MONTY", "MORGAN",
+ "MORRIS", "MOSES", "MURIEL", "MURRAY", "MYRA", "MYRNA", "MYRON", "MYRTLE", "NADIA", "NADINE", "NAN",
+ "NANCY", "NANETTE", "NANNIE", "NAOMI", "NATALIA", "NATALIE", "NATASHA", "NATHAN", "NATHANIEL", "NEAL",
+ "NED", "NEIL", "NELDA", "NELL", "NELLIE", "NELLY", "NELSON", "NESTOR", "NETTIE", "NEVA", "NICHOLAS",
+ "NICHOLE", "NICK", "NICKOLAS", "NICOLAS", "NICOLE", "NIKKI", "NINA", "NITA", "NOAH", "NOE", "NOEL",
+ "NOELLE", "NOEMI", "NOLA", "NOLAN", "NONA", "NORA", "NORBERT", "NOREEN", "NORMA", "NORMAN", "NORRIS",
+ "NUMBERS", "OCTAVIA", "OCTAVIO", "ODELL", "ODESSA", "OFELIA", "OLA", "OLGA", "OLIVE", "OLIVER",
+ "OLIVIA", "OLLIE", "OMAR", "OPAL", "OPHELIA", "ORA", "ORLANDO", "ORVILLE", "OSCAR", "OTIS", "OTTO",
+ "OWEN", "PABLO", "PAIGE", "PAM", "PAMALA", "PAMELA", "PANSY", "PASQUALE", "PAT", "PATRICA", "PATRICE",
+ "PATRICIA", "PATRICK", "PATSY", "PATTI", "PATTY", "PAUL", "PAULA", "PAULETTE", "PAULINE", "PEARL",
+ "PEARLIE", "PEDRO", "PEGGY", "PENELOPE", "PENNY", "PERCY", "PERRY", "PETE", "PETER", "PETRA", "PHIL",
+ "PHILIP", "PHILLIP", "PHOEBE", "PHYLLIS", "PIERRE", "POLLY", "PRESTON", "PRISCILLA", "QUEEN", "QUENTIN",
+ "QUINCY", "QUINTON", "RACHAEL", "RACHEL", "RACHELLE", "RAE", "RAFAEL", "RALPH", "RAMIRO", "RAMON",
+ "RAMONA", "RANDAL", "RANDALL", "RANDI", "RANDOLPH", "RANDY", "RAPHAEL", "RAQUEL", "RAUL", "RAY",
+ "RAYMOND", "RAYMUNDO", "REBA", "REBECCA", "REBEKAH", "REED", "REGGIE", "REGINA", "REGINALD", "RENA",
+ "RENAE", "RENE", "RENEE", "REUBEN", "REVA", "REX", "REYNA", "REYNALDO", "RHEA", "RHODA", "RHONDA",
+ "RICARDO", "RICHARD", "RICK", "RICKEY", "RICKIE", "RICKY", "RIGOBERTO", "RILEY", "RITA", "ROB",
+ "ROBBIE", "ROBBY", "ROBERT", "ROBERTA", "ROBERTO", "ROBIN", "ROBYN", "ROCCO", "ROCHELLE", "ROCIO",
+ "ROCKY", "ROD", "RODERICK", "RODGER", "RODNEY", "RODOLFO", "RODRIGO", "ROGELIO", "ROGER", "ROLAND",
+ "ROLANDO", "ROMAN", "ROMEO", "RON", "RONALD", "RONDA", "RONNIE", "ROOSEVELT", "RORY", "ROSA", "ROSALIA",
+ "ROSALIE", "ROSALIND", "ROSALINDA", "ROSALYN", "ROSANNA", "ROSANNE", "ROSARIO", "ROSCOE", "ROSE",
+ "ROSEANN", "ROSELLA", "ROSEMARIE", "ROSEMARY", "ROSETTA", "ROSIE", "ROSLYN", "ROSS", "ROWENA",
+ "ROXANNE", "ROXIE", "ROY", "ROYCE", "RUBEN", "RUBY", "RUDOLPH", "RUDY", "RUFUS", "RUSSEL", "RUSSELL",
+ "RUSTY", "RUTH", "RUTHIE", "RYAN", "SABRINA", "SADIE", "SALLIE", "SALLY", "SALVADOR", "SALVATORE",
+ "SAM", "SAMANTHA", "SAMMIE", "SAMMY", "SAMUEL", "SANDRA", "SANDY", "SANFORD", "SANTIAGO", "SANTOS",
+ "SARA", "SARAH", "SASHA", "SAUL", "SAUNDRA", "SAVANNAH", "SCOT", "SCOTT", "SCOTTY", "SEAN", "SEBASTIAN",
+ "SELENA", "SELINA", "SELMA", "SERENA", "SERGIO", "SETH", "SHANA", "SHANE", "SHANNA", "SHANNON", "SHARI",
+ "SHARLENE", "SHARON", "SHARRON", "SHAUN", "SHAUNA", "SHAWN", "SHAWNA", "SHEENA", "SHEILA", "SHELBY",
+ "SHELDON", "SHELIA", "SHELLEY", "SHELLY", "SHELTON", "SHEREE", "SHERI", "SHERMAN", "SHERRI", "SHERRIE",
+ "SHERRY", "SHERYL", "SHIRLEY", "SIDNEY", "SIERRA", "SILAS", "SILVIA", "SIMON", "SIMONE", "SOCORRO",
+ "SOFIA", "SOLOMON", "SON", "SONDRA", "SONIA", "SONJA", "SONNY", "SONYA", "SOPHIA", "SOPHIE", "SPENCER",
+ "STACEY", "STACI", "STACIE", "STACY", "STAN", "STANLEY", "STEFAN", "STEFANIE", "STELLA", "STEPHAN",
+ "STEPHANIE", "STEPHEN", "STERLING", "STEVE", "STEVEN", "STEWART", "STUART", "SUE", "SUMMER", "SUSAN",
+ "SUSANA", "SUSANNA", "SUSANNE", "SUSIE", "SUZANNE", "SUZETTE", "SYBIL", "SYDNEY", "SYLVESTER", "SYLVIA",
+ "TABATHA", "TABITHA", "TAMARA", "TAMEKA", "TAMERA", "TAMI", "TAMIKA", "TAMMI", "TAMMIE", "TAMMY",
+ "TAMRA", "TANIA", "TANISHA", "TANYA", "TARA", "TASHA", "TAYLOR", "TED", "TEDDY", "TERENCE", "TERESA",
+ "TERI", "TERRA", "TERRANCE", "TERRELL", "TERRENCE", "TERRI", "TERRIE", "TERRY", "TESSA", "THADDEUS",
+ "THELMA", "THEODORE", "THERESA", "THERESE", "THERON", "THOMAS", "THURMAN", "TIA", "TIFFANY", "TIM",
+ "TIMMY", "TIMOTHY", "TINA", "TISHA", "TOBY", "TODD", "TOM", "TOMAS", "TOMMIE", "TOMMY", "TONI", "TONIA",
+ "TONY", "TONYA", "TORI", "TRACEY", "TRACI", "TRACIE", "TRACY", "TRAVIS", "TRENT", "TRENTON", "TREVOR",
+ "TRICIA", "TRINA", "TRISHA", "TRISTAN", "TROY", "TRUDY", "TRUMAN", "TWILA", "TY", "TYLER", "TYRONE",
+ "TYSON", "ULYSSES", "URSULA", "VALARIE", "VALERIA", "VALERIE", "VAN", "VANCE", "VANESSA", "VAUGHN",
+ "VELMA", "VERA", "VERN", "VERNA", "VERNON", "VERONICA", "VICENTE", "VICKI", "VICKIE", "VICKY", "VICTOR",
+ "VICTORIA", "VILMA", "VINCE", "VINCENT", "VIOLA", "VIOLET", "VIRGIE", "VIRGIL", "VIRGINIA", "VITO",
+ "VIVIAN", "VONDA", "WADE", "WALLACE", "WALTER", "WANDA", "WARD", "WARREN", "WAYNE", "WELDON", "WENDELL",
+ "WENDI", "WENDY", "WESLEY", "WHITNEY", "WILBERT", "WILBUR", "WILDA", "WILEY", "WILFORD", "WILFRED",
+ "WILFREDO", "WILL", "WILLA", "WILLARD", "WILLIAM", "WILLIAMS", "WILLIE", "WILLIS", "WILMA", "WILMER",
+ "WILSON", "WINFRED", "WINIFRED", "WINNIE", "WINSTON", "WM", "WOODROW", "XAVIER", "YESENIA", "YOLANDA",
+ "YOUNG", "YVETTE", "YVONNE", "ZACHARY", "ZACHERY", "ZELDA", "ZELMA" };
}
private static final String[] generateLastNames() {
- return new String[] {
- "AARON",
- "ABBOTT",
- "ABEL",
- "ABELL",
- "ABERNATHY",
- "ABNER",
- "ABNEY",
- "ABRAHAM",
- "ABRAMS",
- "ABREU",
- "ACEVEDO",
- "ACKER",
- "ACKERMAN",
- "ACKLEY",
- "ACOSTA",
- "ACUNA",
- "ADAIR",
- "ADAM",
- "ADAME",
- "ADAMS",
- "ADAMSON",
- "ADCOCK",
- "ADDISON",
- "ADKINS",
- "ADLER",
- "AGEE",
- "AGNEW",
- "AGUAYO",
- "AGUIAR",
- "AGUILAR",
- "AGUILERA",
- "AGUIRRE",
- "AHERN",
- "AHMAD",
- "AHMED",
- "AHRENS",
- "AIELLO",
- "AIKEN",
- "AINSWORTH",
- "AKERS",
- "AKIN",
- "AKINS",
- "ALANIZ",
- "ALARCON",
- "ALBA",
- "ALBERS",
- "ALBERT",
- "ALBERTSON",
- "ALBRECHT",
- "ALBRIGHT",
- "ALCALA",
- "ALCORN",
- "ALDERMAN",
- "ALDRICH",
- "ALDRIDGE",
- "ALEMAN",
- "ALEXANDER",
- "ALFARO",
- "ALFONSO",
- "ALFORD",
- "ALFRED",
- "ALGER",
- "ALI",
- "ALICEA",
- "ALLAN",
- "ALLARD",
- "ALLEN",
- "ALLEY",
- "ALLISON",
- "ALLMAN",
- "ALLRED",
- "ALMANZA",
- "ALMEIDA",
- "ALMOND",
- "ALONSO",
- "ALONZO",
- "ALSTON",
- "ALTMAN",
- "ALVARADO",
- "ALVAREZ",
- "ALVES",
- "AMADOR",
- "AMARAL",
- "AMATO",
- "AMAYA",
- "AMBROSE",
- "AMES",
- "AMMONS",
- "AMOS",
- "AMUNDSON",
- "ANAYA",
- "ANDERS",
- "ANDERSEN",
- "ANDERSON",
- "ANDRADE",
- "ANDRE",
- "ANDRES",
- "ANDREW",
- "ANDREWS",
- "ANDRUS",
- "ANGEL",
- "ANGELO",
- "ANGLIN",
- "ANGULO",
- "ANTHONY",
- "ANTOINE",
- "ANTONIO",
- "APODACA",
- "APONTE",
- "APPEL",
- "APPLE",
- "APPLEGATE",
- "APPLETON",
- "AQUINO",
- "ARAGON",
- "ARANDA",
- "ARAUJO",
- "ARCE",
- "ARCHER",
- "ARCHIBALD",
- "ARCHIE",
- "ARCHULETA",
- "ARELLANO",
- "AREVALO",
- "ARIAS",
- "ARMENTA",
- "ARMIJO",
- "ARMSTEAD",
- "ARMSTRONG",
- "ARNDT",
- "ARNETT",
- "ARNOLD",
- "ARREDONDO",
- "ARREOLA",
- "ARRIAGA",
- "ARRINGTON",
- "ARROYO",
- "ARSENAULT",
- "ARTEAGA",
- "ARTHUR",
- "ARTIS",
- "ASBURY",
- "ASH",
- "ASHBY",
- "ASHCRAFT",
- "ASHE",
- "ASHER",
- "ASHFORD",
- "ASHLEY",
- "ASHMORE",
- "ASHTON",
- "ASHWORTH",
- "ASKEW",
- "ATCHISON",
- "ATHERTON",
- "ATKINS",
- "ATKINSON",
- "ATWELL",
- "ATWOOD",
- "AUGUST",
- "AUGUSTINE",
- "AULT",
- "AUSTIN",
- "AUTRY",
- "AVALOS",
- "AVERY",
- "AVILA",
- "AVILES",
- "AYALA",
- "AYERS",
- "AYRES",
- "BABB",
- "BABCOCK",
- "BABIN",
- "BACA",
- "BACH",
- "BACHMAN",
- "BACK",
- "BACON",
- "BADER",
- "BADGER",
- "BADILLO",
- "BAER",
- "BAEZ",
- "BAGGETT",
- "BAGLEY",
- "BAGWELL",
- "BAILEY",
- "BAIN",
- "BAINES",
- "BAIR",
- "BAIRD",
- "BAKER",
- "BALDERAS",
- "BALDWIN",
- "BALES",
- "BALL",
- "BALLARD",
- "BANDA",
- "BANDY",
- "BANKS",
- "BANKSTON",
- "BANNISTER",
- "BANUELOS",
- "BAPTISTE",
- "BARAJAS",
- "BARBA",
- "BARBEE",
- "BARBER",
- "BARBOSA",
- "BARBOUR",
- "BARCLAY",
- "BARDEN",
- "BARELA",
- "BARFIELD",
- "BARGER",
- "BARHAM",
- "BARKER",
- "BARKLEY",
- "BARKSDALE",
- "BARLOW",
- "BARNARD",
- "BARNES",
- "BARNETT",
- "BARNETTE",
- "BARNEY",
- "BARNHART",
- "BARNHILL",
- "BARON",
- "BARONE",
- "BARR",
- "BARRAZA",
- "BARRERA",
- "BARRETO",
- "BARRETT",
- "BARRIENTOS",
- "BARRIOS",
- "BARRON",
- "BARROW",
- "BARROWS",
- "BARRY",
- "BARTELS",
- "BARTH",
- "BARTHOLOMEW",
- "BARTLETT",
- "BARTLEY",
- "BARTON",
- "BASHAM",
- "BASKIN",
- "BASS",
- "BASSETT",
- "BATCHELOR",
- "BATEMAN",
- "BATES",
- "BATISTA",
- "BATISTE",
- "BATSON",
- "BATTAGLIA",
- "BATTEN",
- "BATTLE",
- "BATTLES",
- "BATTS",
- "BAUER",
- "BAUGH",
- "BAUGHMAN",
- "BAUM",
- "BAUMAN",
- "BAUMANN",
- "BAUMGARDNER",
- "BAUMGARTNER",
- "BAUTISTA",
- "BAXLEY",
- "BAXTER",
- "BAYER",
- "BAYLOR",
- "BAYNE",
- "BAYS",
- "BEACH",
- "BEAL",
- "BEALE",
- "BEALL",
- "BEALS",
- "BEAM",
- "BEAMON",
- "BEAN",
- "BEANE",
- "BEAR",
- "BEARD",
- "BEARDEN",
- "BEASLEY",
- "BEATTIE",
- "BEATTY",
- "BEATY",
- "BEAUCHAMP",
- "BEAUDOIN",
- "BEAULIEU",
- "BEAUREGARD",
- "BEAVER",
- "BEAVERS",
- "BECERRA",
- "BECK",
- "BECKER",
- "BECKETT",
- "BECKHAM",
- "BECKMAN",
- "BECKWITH",
- "BECNEL",
- "BEDARD",
- "BEDFORD",
- "BEEBE",
- "BEELER",
- "BEERS",
- "BEESON",
- "BEGAY",
- "BEGLEY",
- "BEHRENS",
- "BELANGER",
- "BELCHER",
- "BELL",
- "BELLAMY",
- "BELLO",
- "BELT",
- "BELTON",
- "BELTRAN",
- "BENAVIDES",
- "BENAVIDEZ",
- "BENDER",
- "BENEDICT",
- "BENEFIELD",
- "BENITEZ",
- "BENJAMIN",
- "BENNER",
- "BENNETT",
- "BENOIT",
- "BENSON",
- "BENTLEY",
- "BENTON",
- "BERG",
- "BERGER",
- "BERGERON",
- "BERGMAN",
- "BERGSTROM",
- "BERLIN",
- "BERMAN",
- "BERMUDEZ",
- "BERNAL",
- "BERNARD",
- "BERNHARDT",
- "BERNIER",
- "BERNSTEIN",
- "BERRIOS",
- "BERRY",
- "BERRYMAN",
- "BERTRAM",
- "BERTRAND",
- "BERUBE",
- "BESS",
- "BEST",
- "BETANCOURT",
- "BETHEA",
- "BETHEL",
- "BETTS",
- "BETZ",
- "BEVERLY",
- "BEVINS",
- "BEYER",
- "BIBLE",
- "BICKFORD",
- "BIDDLE",
- "BIGELOW",
- "BIGGS",
- "BILLINGS",
- "BILLINGSLEY",
- "BILLIOT",
- "BILLS",
- "BILLUPS",
- "BILODEAU",
- "BINDER",
- "BINGHAM",
- "BINKLEY",
- "BIRCH",
- "BIRD",
- "BISHOP",
- "BISSON",
- "BITTNER",
- "BIVENS",
- "BIVINS",
- "BLACK",
- "BLACKBURN",
- "BLACKMAN",
- "BLACKMON",
- "BLACKWELL",
- "BLACKWOOD",
- "BLAINE",
- "BLAIR",
- "BLAIS",
- "BLAKE",
- "BLAKELY",
- "BLALOCK",
- "BLANCHARD",
- "BLANCHETTE",
- "BLANCO",
- "BLAND",
- "BLANK",
- "BLANKENSHIP",
- "BLANTON",
- "BLAYLOCK",
- "BLEDSOE",
- "BLEVINS",
- "BLISS",
- "BLOCK",
- "BLOCKER",
- "BLODGETT",
- "BLOOM",
- "BLOUNT",
- "BLUE",
- "BLUM",
- "BLUNT",
- "BLYTHE",
- "BOATRIGHT",
- "BOATWRIGHT",
- "BOBBITT",
- "BOBO",
- "BOCK",
- "BOEHM",
- "BOETTCHER",
- "BOGAN",
- "BOGGS",
- "BOHANNON",
- "BOHN",
- "BOISVERT",
- "BOLAND",
- "BOLDEN",
- "BOLDUC",
- "BOLEN",
- "BOLES",
- "BOLIN",
- "BOLING",
- "BOLLING",
- "BOLLINGER",
- "BOLT",
- "BOLTON",
- "BOND",
- "BONDS",
- "BONE",
- "BONILLA",
- "BONNER",
- "BOOKER",
- "BOONE",
- "BOOTH",
- "BOOTHE",
- "BORDELON",
- "BORDEN",
- "BORDERS",
- "BOREN",
- "BORGES",
- "BORREGO",
- "BOSS",
- "BOSTIC",
- "BOSTICK",
- "BOSTON",
- "BOSWELL",
- "BOTTOMS",
- "BOUCHARD",
- "BOUCHER",
- "BOUDREAU",
- "BOUDREAUX",
- "BOUNDS",
- "BOURGEOIS",
- "BOURNE",
- "BOURQUE",
- "BOWDEN",
- "BOWEN",
- "BOWENS",
- "BOWER",
- "BOWERS",
- "BOWIE",
- "BOWLES",
- "BOWLIN",
- "BOWLING",
- "BOWMAN",
- "BOWSER",
- "BOX",
- "BOYCE",
- "BOYD",
- "BOYER",
- "BOYKIN",
- "BOYLE",
- "BOYLES",
- "BOYNTON",
- "BOZEMAN",
- "BRACKEN",
- "BRACKETT",
- "BRADBURY",
- "BRADEN",
- "BRADFORD",
- "BRADLEY",
- "BRADSHAW",
- "BRADY",
- "BRAGG",
- "BRANCH",
- "BRAND",
- "BRANDENBURG",
- "BRANDON",
- "BRANDT",
- "BRANHAM",
- "BRANNON",
- "BRANSON",
- "BRANT",
- "BRANTLEY",
- "BRASWELL",
- "BRATCHER",
- "BRATTON",
- "BRAUN",
- "BRAVO",
- "BRAXTON",
- "BRAY",
- "BRAZIL",
- "BREAUX",
- "BREEDEN",
- "BREEDLOVE",
- "BREEN",
- "BRENNAN",
- "BRENNER",
- "BRENT",
- "BREWER",
- "BREWSTER",
- "BRICE",
- "BRIDGES",
- "BRIGGS",
- "BRIGHT",
- "BRILEY",
- "BRILL",
- "BRIM",
- "BRINK",
- "BRINKLEY",
- "BRINKMAN",
- "BRINSON",
- "BRIONES",
- "BRISCOE",
- "BRISENO",
- "BRITO",
- "BRITT",
- "BRITTAIN",
- "BRITTON",
- "BROADNAX",
- "BROADWAY",
- "BROCK",
- "BROCKMAN",
- "BRODERICK",
- "BRODY",
- "BROGAN",
- "BRONSON",
- "BROOKINS",
- "BROOKS",
- "BROOME",
- "BROTHERS",
- "BROUGHTON",
- "BROUSSARD",
- "BROWDER",
- "BROWER",
- "BROWN",
- "BROWNE",
- "BROWNELL",
- "BROWNING",
- "BROWNLEE",
- "BROYLES",
- "BRUBAKER",
- "BRUCE",
- "BRUMFIELD",
- "BRUNER",
- "BRUNNER",
- "BRUNO",
- "BRUNS",
- "BRUNSON",
- "BRUTON",
- "BRYAN",
- "BRYANT",
- "BRYSON",
- "BUCHANAN",
- "BUCHER",
- "BUCK",
- "BUCKINGHAM",
- "BUCKLEY",
- "BUCKNER",
- "BUENO",
- "BUFFINGTON",
- "BUFORD",
- "BUI",
- "BULL",
- "BULLARD",
- "BULLOCK",
- "BUMGARNER",
- "BUNCH",
- "BUNDY",
- "BUNKER",
- "BUNN",
- "BUNNELL",
- "BUNTING",
- "BURCH",
- "BURCHETT",
- "BURCHFIELD",
- "BURDEN",
- "BURDETTE",
- "BURDICK",
- "BURGE",
- "BURGER",
- "BURGESS",
- "BURGOS",
- "BURK",
- "BURKE",
- "BURKETT",
- "BURKHART",
- "BURKHOLDER",
- "BURKS",
- "BURLESON",
- "BURLEY",
- "BURNETT",
- "BURNETTE",
- "BURNEY",
- "BURNHAM",
- "BURNS",
- "BURNSIDE",
- "BURR",
- "BURRELL",
- "BURRIS",
- "BURROUGHS",
- "BURROW",
- "BURROWS",
- "BURT",
- "BURTON",
- "BUSBY",
- "BUSCH",
- "BUSH",
- "BUSS",
- "BUSSEY",
- "BUSTAMANTE",
- "BUSTOS",
- "BUTCHER",
- "BUTLER",
- "BUTTERFIELD",
- "BUTTON",
- "BUTTS",
- "BUXTON",
- "BYARS",
- "BYERS",
- "BYNUM",
- "BYRD",
- "BYRNE",
- "BYRNES",
- "CABALLERO",
- "CABAN",
- "CABLE",
- "CABRAL",
- "CABRERA",
- "CADE",
- "CADY",
- "CAGLE",
- "CAHILL",
- "CAIN",
- "CALABRESE",
- "CALDERON",
- "CALDWELL",
- "CALHOUN",
- "CALKINS",
- "CALL",
- "CALLAGHAN",
- "CALLAHAN",
- "CALLAWAY",
- "CALLENDER",
- "CALLOWAY",
- "CALVERT",
- "CALVIN",
- "CAMACHO",
- "CAMARILLO",
- "CAMBELL",
- "CAMERON",
- "CAMP",
- "CAMPBELL",
- "CAMPOS",
- "CANADA",
- "CANADY",
- "CANALES",
- "CANDELARIA",
- "CANFIELD",
- "CANNON",
- "CANO",
- "CANTRELL",
- "CANTU",
- "CANTWELL",
- "CANTY",
- "CAPPS",
- "CARABALLO",
- "CARAWAY",
- "CARBAJAL",
- "CARBONE",
- "CARD",
- "CARDEN",
- "CARDENAS",
- "CARDER",
- "CARDONA",
- "CARDOZA",
- "CARDWELL",
- "CAREY",
- "CARL",
- "CARLIN",
- "CARLISLE",
- "CARLOS",
- "CARLSON",
- "CARLTON",
- "CARMAN",
- "CARMICHAEL",
- "CARMONA",
- "CARNAHAN",
- "CARNES",
- "CARNEY",
- "CARO",
- "CARON",
- "CARPENTER",
- "CARR",
- "CARRANZA",
- "CARRASCO",
- "CARRERA",
- "CARRICO",
- "CARRIER",
- "CARRILLO",
- "CARRINGTON",
- "CARRION",
- "CARROLL",
- "CARSON",
- "CARSWELL",
- "CARTER",
- "CARTWRIGHT",
- "CARUSO",
- "CARVALHO",
- "CARVER",
- "CARY",
- "CASAS",
- "CASE",
- "CASEY",
- "CASH",
- "CASILLAS",
- "CASKEY",
- "CASON",
- "CASPER",
- "CASS",
- "CASSELL",
- "CASSIDY",
- "CASTANEDA",
- "CASTEEL",
- "CASTELLANO",
- "CASTELLANOS",
- "CASTILLO",
- "CASTLE",
- "CASTLEBERRY",
- "CASTRO",
- "CASWELL",
- "CATALANO",
- "CATES",
- "CATHEY",
- "CATO",
- "CATRON",
- "CAUDILL",
- "CAUDLE",
- "CAUSEY",
- "CAVANAUGH",
- "CAVAZOS",
- "CAVE",
- "CECIL",
- "CENTENO",
- "CERDA",
- "CERVANTES",
- "CHACON",
- "CHADWICK",
- "CHAFFIN",
- "CHALMERS",
- "CHAMBERLAIN",
- "CHAMBERLIN",
- "CHAMBERS",
- "CHAMBLISS",
- "CHAMPAGNE",
- "CHAMPION",
- "CHAN",
- "CHANCE",
- "CHANDLER",
- "CHANEY",
- "CHANG",
- "CHAPA",
- "CHAPIN",
- "CHAPMAN",
- "CHAPPELL",
- "CHARLES",
- "CHARLTON",
- "CHASE",
- "CHASTAIN",
- "CHATMAN",
- "CHAU",
- "CHAVARRIA",
- "CHAVES",
- "CHAVEZ",
- "CHAVIS",
- "CHEATHAM",
- "CHEEK",
- "CHEN",
- "CHENEY",
- "CHENG",
- "CHERRY",
- "CHESSER",
- "CHESTER",
- "CHESTNUT",
- "CHEUNG",
- "CHEW",
- "CHILD",
- "CHILDERS",
- "CHILDRESS",
- "CHILDS",
- "CHILTON",
- "CHIN",
- "CHISHOLM",
- "CHISM",
- "CHISOLM",
- "CHITWOOD",
- "CHO",
- "CHOATE",
- "CHOI",
- "CHONG",
- "CHOW",
- "CHRISTENSEN",
- "CHRISTENSON",
- "CHRISTIAN",
- "CHRISTIANSEN",
- "CHRISTIANSON",
- "CHRISTIE",
- "CHRISTMAN",
- "CHRISTMAS",
- "CHRISTOPHER",
- "CHRISTY",
- "CHU",
- "CHUN",
- "CHUNG",
- "CHURCH",
- "CHURCHILL",
- "CINTRON",
- "CISNEROS",
- "CLANCY",
- "CLANTON",
- "CLAPP",
- "CLARK",
- "CLARKE",
- "CLARKSON",
- "CLARY",
- "CLAUSEN",
- "CLAWSON",
- "CLAY",
- "CLAYTON",
- "CLEARY",
- "CLEGG",
- "CLEM",
- "CLEMENS",
- "CLEMENT",
- "CLEMENTS",
- "CLEMMONS",
- "CLEMONS",
- "CLEVELAND",
- "CLEVENGER",
- "CLICK",
- "CLIFFORD",
- "CLIFTON",
- "CLINE",
- "CLINTON",
- "CLOSE",
- "CLOUD",
- "CLOUGH",
- "CLOUTIER",
- "COATES",
- "COATS",
- "COBB",
- "COBBS",
- "COBLE",
- "COBURN",
- "COCHRAN",
- "COCHRANE",
- "COCKRELL",
- "CODY",
- "COE",
- "COFFEY",
- "COFFIN",
- "COFFMAN",
- "COGGINS",
- "COHEN",
- "COHN",
- "COKER",
- "COLBERT",
- "COLBURN",
- "COLBY",
- "COLE",
- "COLEMAN",
- "COLES",
- "COLEY",
- "COLLADO",
- "COLLAZO",
- "COLLEY",
- "COLLIER",
- "COLLINS",
- "COLON",
- "COLSON",
- "COLVIN",
- "COLWELL",
- "COMBS",
- "COMEAUX",
- "COMER",
- "COMPTON",
- "COMSTOCK",
- "CONAWAY",
- "CONCEPCION",
- "CONDON",
- "CONE",
- "CONGER",
- "CONKLIN",
- "CONLEY",
- "CONN",
- "CONNELL",
- "CONNELLY",
- "CONNER",
- "CONNERS",
- "CONNOLLY",
- "CONNOR",
- "CONNORS",
- "CONOVER",
- "CONRAD",
- "CONROY",
- "CONTE",
- "CONTI",
- "CONTRERAS",
- "CONWAY",
- "CONYERS",
- "COOK",
- "COOKE",
- "COOKS",
- "COOKSEY",
- "COOLEY",
- "COOMBS",
- "COON",
- "COONEY",
- "COONS",
- "COOPER",
- "COPE",
- "COPELAND",
- "COPLEY",
- "COPPOLA",
- "CORBETT",
- "CORBIN",
- "CORBITT",
- "CORCORAN",
- "CORDELL",
- "CORDERO",
- "CORDOVA",
- "COREY",
- "CORLEY",
- "CORMIER",
- "CORNELIUS",
- "CORNELL",
- "CORNETT",
- "CORNISH",
- "CORNWELL",
- "CORONA",
- "CORONADO",
- "CORRAL",
- "CORREA",
- "CORREIA",
- "CORRIGAN",
- "CORTES",
- "CORTEZ",
- "CORWIN",
- "COSBY",
- "COSGROVE",
- "COSTA",
- "COSTELLO",
- "COTA",
- "COTE",
- "COTHRAN",
- "COTTER",
- "COTTON",
- "COTTRELL",
- "COUCH",
- "COUGHLIN",
- "COULTER",
- "COUNCIL",
- "COUNTS",
- "COURTNEY",
- "COUSINS",
- "COUTURE",
- "COVERT",
- "COVEY",
- "COVINGTON",
- "COWAN",
- "COWARD",
- "COWART",
- "COWELL",
- "COWLES",
- "COWLEY",
- "COX",
- "COY",
- "COYLE",
- "COYNE",
- "CRABTREE",
- "CRADDOCK",
- "CRAFT",
- "CRAIG",
- "CRAIN",
- "CRAMER",
- "CRANDALL",
- "CRANE",
- "CRANFORD",
- "CRAVEN",
- "CRAWFORD",
- "CRAWLEY",
- "CRAYTON",
- "CREAMER",
- "CREECH",
- "CREEL",
- "CREIGHTON",
- "CRENSHAW",
- "CRESPO",
- "CREWS",
- "CRIDER",
- "CRISP",
- "CRIST",
- "CRISWELL",
- "CRITTENDEN",
- "CROCKER",
- "CROCKETT",
- "CROFT",
- "CROMER",
- "CROMWELL",
- "CRONIN",
- "CROOK",
- "CROOKS",
- "CROSBY",
- "CROSS",
- "CROTEAU",
- "CROUCH",
- "CROUSE",
- "CROW",
- "CROWDER",
- "CROWE",
- "CROWELL",
- "CROWLEY",
- "CRUM",
- "CRUMP",
- "CRUSE",
- "CRUTCHER",
- "CRUTCHFIELD",
- "CRUZ",
- "CUELLAR",
- "CUEVAS",
- "CULBERTSON",
- "CULLEN",
- "CULP",
- "CULPEPPER",
- "CULVER",
- "CUMMINGS",
- "CUMMINS",
- "CUNNINGHAM",
- "CUPP",
- "CURLEY",
- "CURRAN",
- "CURRIE",
- "CURRIER",
- "CURRY",
- "CURTIN",
- "CURTIS",
- "CUSHMAN",
- "CUSTER",
- "CUTLER",
- "CYR",
- "DABNEY",
- "DAHL",
- "DAIGLE",
- "DAILEY",
- "DAILY",
- "DALE",
- "DALEY",
- "DALLAS",
- "DALTON",
- "DALY",
- "DAMICO",
- "DAMON",
- "DAMRON",
- "DANCY",
- "DANG",
- "DANGELO",
- "DANIEL",
- "DANIELS",
- "DANIELSON",
- "DANNER",
- "DARBY",
- "DARDEN",
- "DARLING",
- "DARNELL",
- "DASILVA",
- "DAUGHERTY",
- "DAUGHTRY",
- "DAVENPORT",
- "DAVID",
- "DAVIDSON",
- "DAVIES",
- "DAVILA",
- "DAVIS",
- "DAVISON",
- "DAWKINS",
- "DAWSON",
- "DAY",
- "DAYTON",
- "DEAL",
- "DEAN",
- "DEATON",
- "DEBERRY",
- "DECKER",
- "DEES",
- "DEHART",
- "DEJESUS",
- "DELACRUZ",
- "DELAGARZA",
- "DELANEY",
- "DELAROSA",
- "DELATORRE",
- "DELEON",
- "DELGADILLO",
- "DELGADO",
- "DELL",
- "DELLINGER",
- "DELOACH",
- "DELONG",
- "DELOSSANTOS",
- "DELUCA",
- "DELVALLE",
- "DEMARCO",
- "DEMERS",
- "DEMPSEY",
- "DENHAM",
- "DENNEY",
- "DENNING",
- "DENNIS",
- "DENNISON",
- "DENNY",
- "DENSON",
- "DENT",
- "DENTON",
- "DEROSA",
- "DERR",
- "DERRICK",
- "DESANTIS",
- "DESIMONE",
- "DEVINE",
- "DEVITO",
- "DEVLIN",
- "DEVORE",
- "DEVRIES",
- "DEW",
- "DEWEY",
- "DEWITT",
- "DEXTER",
- "DIAL",
- "DIAMOND",
- "DIAS",
- "DIAZ",
- "DICK",
- "DICKENS",
- "DICKERSON",
- "DICKEY",
- "DICKINSON",
- "DICKSON",
- "DIEHL",
- "DIETRICH",
- "DIETZ",
- "DIGGS",
- "DILL",
- "DILLARD",
- "DILLON",
- "DINKINS",
- "DION",
- "DIX",
- "DIXON",
- "DO",
- "DOAN",
- "DOBBINS",
- "DOBBS",
- "DOBSON",
- "DOCKERY",
- "DODD",
- "DODDS",
- "DODGE",
- "DODSON",
- "DOE",
- "DOHERTY",
- "DOLAN",
- "DOLL",
- "DOLLAR",
- "DOMINGO",
- "DOMINGUEZ",
- "DOMINQUEZ",
- "DONAHUE",
- "DONALD",
- "DONALDSON",
- "DONATO",
- "DONNELL",
- "DONNELLY",
- "DONOHUE",
- "DONOVAN",
- "DOOLEY",
- "DOOLITTLE",
- "DORAN",
- "DORMAN",
- "DORN",
- "DORRIS",
- "DORSEY",
- "DORTCH",
- "DOSS",
- "DOTSON",
- "DOTY",
- "DOUCETTE",
- "DOUGHERTY",
- "DOUGHTY",
- "DOUGLAS",
- "DOUGLASS",
- "DOVE",
- "DOVER",
- "DOW",
- "DOWD",
- "DOWDY",
- "DOWELL",
- "DOWLING",
- "DOWNEY",
- "DOWNING",
- "DOWNS",
- "DOYLE",
- "DOZIER",
- "DRAKE",
- "DRAPER",
- "DRAYTON",
- "DREW",
- "DRISCOLL",
- "DRIVER",
- "DRUMMOND",
- "DRURY",
- "DUARTE",
- "DUBE",
- "DUBOIS",
- "DUBOSE",
- "DUCKETT",
- "DUCKWORTH",
- "DUDLEY",
- "DUFF",
- "DUFFY",
- "DUGAN",
- "DUGAS",
- "DUGGAN",
- "DUGGER",
- "DUKE",
- "DUKES",
- "DUMAS",
- "DUMONT",
- "DUNAWAY",
- "DUNBAR",
- "DUNCAN",
- "DUNHAM",
- "DUNLAP",
- "DUNN",
- "DUNNE",
- "DUNNING",
- "DUONG",
- "DUPONT",
- "DUPRE",
- "DUPREE",
- "DUPUIS",
- "DURAN",
- "DURAND",
- "DURANT",
- "DURBIN",
- "DURDEN",
- "DURHAM",
- "DURKIN",
- "DURR",
- "DUTTON",
- "DUVAL",
- "DUVALL",
- "DWYER",
- "DYE",
- "DYER",
- "DYKES",
- "DYSON",
- "EAGLE",
- "EARL",
- "EARLE",
- "EARLEY",
- "EARLS",
- "EARLY",
- "EARNEST",
- "EASLEY",
- "EASON",
- "EAST",
- "EASTER",
- "EASTERLING",
- "EASTMAN",
- "EASTON",
- "EATON",
- "EAVES",
- "EBERT",
- "ECHEVARRIA",
- "ECHOLS",
- "ECKERT",
- "EDDY",
- "EDGAR",
- "EDGE",
- "EDMOND",
- "EDMONDS",
- "EDMONDSON",
- "EDWARD",
- "EDWARDS",
- "EGAN",
- "EGGLESTON",
- "ELAM",
- "ELDER",
- "ELDRIDGE",
- "ELIAS",
- "ELIZONDO",
- "ELKINS",
- "ELLER",
- "ELLINGTON",
- "ELLIOT",
- "ELLIOTT",
- "ELLIS",
- "ELLISON",
- "ELLSWORTH",
- "ELMORE",
- "ELROD",
- "ELSTON",
- "ELY",
- "EMANUEL",
- "EMBRY",
- "EMERSON",
- "EMERY",
- "EMMONS",
- "ENG",
- "ENGEL",
- "ENGLAND",
- "ENGLE",
- "ENGLISH",
- "ENNIS",
- "ENOS",
- "ENRIGHT",
- "ENRIQUEZ",
- "EPPERSON",
- "EPPS",
- "EPSTEIN",
- "ERDMANN",
- "ERICKSON",
- "ERNST",
- "ERVIN",
- "ERWIN",
- "ESCALANTE",
- "ESCAMILLA",
- "ESCOBAR",
- "ESCOBEDO",
- "ESPARZA",
- "ESPINAL",
- "ESPINO",
- "ESPINOSA",
- "ESPINOZA",
- "ESPOSITO",
- "ESQUIVEL",
- "ESTEP",
- "ESTES",
- "ESTRADA",
- "ESTRELLA",
- "ETHERIDGE",
- "ETHRIDGE",
- "EUBANKS",
- "EVANS",
- "EVERETT",
- "EVERHART",
- "EVERS",
- "EVERSON",
- "EWING",
- "EZELL",
- "FABER",
- "FABIAN",
- "FAGAN",
- "FAHEY",
- "FAIN",
- "FAIR",
- "FAIRBANKS",
- "FAIRCHILD",
- "FAIRLEY",
- "FAISON",
- "FAJARDO",
- "FALCON",
- "FALK",
- "FALLON",
- "FALLS",
- "FANNING",
- "FARIAS",
- "FARLEY",
- "FARMER",
- "FARNSWORTH",
- "FARR",
- "FARRAR",
- "FARRELL",
- "FARRINGTON",
- "FARRIS",
- "FARROW",
- "FAULK",
- "FAULKNER",
- "FAUST",
- "FAY",
- "FEENEY",
- "FELDER",
- "FELDMAN",
- "FELICIANO",
- "FELIX",
- "FELLOWS",
- "FELTON",
- "FELTS",
- "FENNELL",
- "FENNER",
- "FENTON",
- "FERGUSON",
- "FERNANDES",
- "FERNANDEZ",
- "FERRARA",
- "FERRARI",
- "FERRARO",
- "FERREIRA",
- "FERRELL",
- "FERRER",
- "FERRIS",
- "FERRY",
- "FIELD",
- "FIELDER",
- "FIELDS",
- "FIERRO",
- "FIFE",
- "FIGUEROA",
- "FINCH",
- "FINCHER",
- "FINDLEY",
- "FINE",
- "FINK",
- "FINLEY",
- "FINN",
- "FINNEGAN",
- "FINNEY",
- "FIORE",
- "FISCHER",
- "FISH",
- "FISHER",
- "FISHMAN",
- "FISK",
- "FITCH",
- "FITE",
- "FITTS",
- "FITZGERALD",
- "FITZPATRICK",
- "FITZSIMMONS",
- "FLAGG",
- "FLAHERTY",
- "FLANAGAN",
- "FLANDERS",
- "FLANIGAN",
- "FLANNERY",
- "FLECK",
- "FLEMING",
- "FLEMMING",
- "FLETCHER",
- "FLINT",
- "FLOOD",
- "FLORA",
- "FLORENCE",
- "FLORES",
- "FLOREZ",
- "FLOURNOY",
- "FLOWERS",
- "FLOYD",
- "FLYNN",
- "FOGARTY",
- "FOGG",
- "FOGLE",
- "FOLEY",
- "FOLSE",
- "FOLSOM",
- "FOLTZ",
- "FONG",
- "FONSECA",
- "FONTAINE",
- "FONTENOT",
- "FOOTE",
- "FORBES",
- "FORD",
- "FOREMAN",
- "FOREST",
- "FORET",
- "FORMAN",
- "FORNEY",
- "FORREST",
- "FORRESTER",
- "FORSTER",
- "FORSYTH",
- "FORSYTHE",
- "FORT",
- "FORTE",
- "FORTENBERRY",
- "FORTIER",
- "FORTIN",
- "FORTNER",
- "FORTUNE",
- "FOSS",
- "FOSTER",
- "FOUNTAIN",
- "FOURNIER",
- "FOUST",
- "FOWLER",
- "FOX",
- "FOY",
- "FRALEY",
- "FRAME",
- "FRANCE",
- "FRANCIS",
- "FRANCISCO",
- "FRANCO",
- "FRANCOIS",
- "FRANK",
- "FRANKLIN",
- "FRANKS",
- "FRANTZ",
- "FRANZ",
- "FRASER",
- "FRASIER",
- "FRAZER",
- "FRAZIER",
- "FREDERICK",
- "FREDERICKS",
- "FREDRICK",
- "FREDRICKSON",
- "FREE",
- "FREED",
- "FREEDMAN",
- "FREEMAN",
- "FREESE",
- "FREITAS",
- "FRENCH",
- "FREUND",
- "FREY",
- "FRIAS",
- "FRICK",
- "FRIEDMAN",
- "FRIEND",
- "FRIERSON",
- "FRIES",
- "FRITZ",
- "FRIZZELL",
- "FROST",
- "FRY",
- "FRYE",
- "FRYER",
- "FUCHS",
- "FUENTES",
- "FUGATE",
- "FULCHER",
- "FULLER",
- "FULLERTON",
- "FULMER",
- "FULTON",
- "FULTZ",
- "FUNDERBURK",
- "FUNK",
- "FUQUA",
- "FURMAN",
- "FURR",
- "FUSCO",
- "GABLE",
- "GABRIEL",
- "GADDIS",
- "GADDY",
- "GAFFNEY",
- "GAGE",
- "GAGNE",
- "GAGNON",
- "GAINES",
- "GAINEY",
- "GAITHER",
- "GALARZA",
- "GALBRAITH",
- "GALE",
- "GALINDO",
- "GALLAGHER",
- "GALLANT",
- "GALLARDO",
- "GALLEGOS",
- "GALLO",
- "GALLOWAY",
- "GALVAN",
- "GALVEZ",
- "GALVIN",
- "GAMBLE",
- "GAMBOA",
- "GAMEZ",
- "GANDY",
- "GANN",
- "GANNON",
- "GANT",
- "GANTT",
- "GARAY",
- "GARBER",
- "GARCIA",
- "GARDINER",
- "GARDNER",
- "GARLAND",
- "GARMON",
- "GARNER",
- "GARNETT",
- "GARRETT",
- "GARRIS",
- "GARRISON",
- "GARVEY",
- "GARVIN",
- "GARY",
- "GARZA",
- "GASKIN",
- "GASKINS",
- "GASS",
- "GASTON",
- "GATES",
- "GATEWOOD",
- "GATLIN",
- "GAULT",
- "GAUTHIER",
- "GAVIN",
- "GAY",
- "GAYLORD",
- "GEARY",
- "GEE",
- "GEER",
- "GEIGER",
- "GENTILE",
- "GENTRY",
- "GEORGE",
- "GERALD",
- "GERARD",
- "GERBER",
- "GERMAN",
- "GETZ",
- "GIBBONS",
- "GIBBS",
- "GIBSON",
- "GIFFORD",
- "GIL",
- "GILBERT",
- "GILBERTSON",
- "GILBREATH",
- "GILCHRIST",
- "GILES",
- "GILL",
- "GILLEN",
- "GILLESPIE",
- "GILLETTE",
- "GILLEY",
- "GILLIAM",
- "GILLILAND",
- "GILLIS",
- "GILMAN",
- "GILMER",
- "GILMORE",
- "GILSON",
- "GINN",
- "GIORDANO",
- "GIPSON",
- "GIRARD",
- "GIRON",
- "GIROUX",
- "GIST",
- "GIVENS",
- "GLADDEN",
- "GLADNEY",
- "GLASER",
- "GLASGOW",
- "GLASS",
- "GLAZE",
- "GLEASON",
- "GLENN",
- "GLOVER",
- "GLYNN",
- "GOAD",
- "GOBLE",
- "GODDARD",
- "GODFREY",
- "GODINEZ",
- "GODWIN",
- "GOEBEL",
- "GOETZ",
- "GOFF",
- "GOFORTH",
- "GOINS",
- "GOLD",
- "GOLDBERG",
- "GOLDEN",
- "GOLDMAN",
- "GOLDSMITH",
- "GOLDSTEIN",
- "GOMES",
- "GOMEZ",
- "GONSALVES",
- "GONZALES",
- "GONZALEZ",
- "GOOCH",
- "GOOD",
- "GOODE",
- "GOODEN",
- "GOODIN",
- "GOODING",
- "GOODMAN",
- "GOODRICH",
- "GOODSON",
- "GOODWIN",
- "GOOLSBY",
- "GORDON",
- "GORE",
- "GORHAM",
- "GORMAN",
- "GOSS",
- "GOSSETT",
- "GOUGH",
- "GOULD",
- "GOULET",
- "GRACE",
- "GRACIA",
- "GRADY",
- "GRAF",
- "GRAFF",
- "GRAGG",
- "GRAHAM",
- "GRANADOS",
- "GRANGER",
- "GRANT",
- "GRANTHAM",
- "GRAVES",
- "GRAY",
- "GRAYSON",
- "GREATHOUSE",
- "GRECO",
- "GREEN",
- "GREENBERG",
- "GREENE",
- "GREENFIELD",
- "GREENLEE",
- "GREENWOOD",
- "GREER",
- "GREGG",
- "GREGORY",
- "GREINER",
- "GRENIER",
- "GRESHAM",
- "GREY",
- "GRICE",
- "GRIDER",
- "GRIER",
- "GRIFFIN",
- "GRIFFIS",
- "GRIFFITH",
- "GRIFFITHS",
- "GRIGGS",
- "GRIGSBY",
- "GRIMES",
- "GRIMM",
- "GRISHAM",
- "GRISSOM",
- "GRISWOLD",
- "GROCE",
- "GROGAN",
- "GROOMS",
- "GROSS",
- "GROSSMAN",
- "GROVE",
- "GROVER",
- "GROVES",
- "GRUBB",
- "GRUBBS",
- "GRUBER",
- "GUAJARDO",
- "GUENTHER",
- "GUERIN",
- "GUERRA",
- "GUERRERO",
- "GUESS",
- "GUEST",
- "GUEVARA",
- "GUFFEY",
- "GUIDRY",
- "GUILLEN",
- "GUILLORY",
- "GUINN",
- "GULLEY",
- "GUNDERSON",
- "GUNN",
- "GUNTER",
- "GUNTHER",
- "GURLEY",
- "GUSTAFSON",
- "GUTHRIE",
- "GUTIERREZ",
- "GUY",
- "GUYTON",
- "GUZMAN",
- "HA",
- "HAAG",
- "HAAS",
- "HAASE",
- "HACKER",
- "HACKETT",
- "HACKNEY",
- "HADDEN",
- "HADLEY",
- "HAGAN",
- "HAGEN",
- "HAGER",
- "HAGGARD",
- "HAGGERTY",
- "HAHN",
- "HAIGHT",
- "HAILEY",
- "HAINES",
- "HAIR",
- "HAIRSTON",
- "HALCOMB",
- "HALE",
- "HALES",
- "HALEY",
- "HALL",
- "HALLER",
- "HALLMAN",
- "HALSEY",
- "HALSTEAD",
- "HALVERSON",
- "HAM",
- "HAMBLIN",
- "HAMBY",
- "HAMEL",
- "HAMER",
- "HAMILTON",
- "HAMLIN",
- "HAMM",
- "HAMMER",
- "HAMMETT",
- "HAMMOND",
- "HAMMONDS",
- "HAMMONS",
- "HAMPTON",
- "HAMRICK",
- "HAN",
- "HANCOCK",
- "HAND",
- "HANDLEY",
- "HANDY",
- "HANES",
- "HANEY",
- "HANKINS",
- "HANKS",
- "HANLEY",
- "HANLON",
- "HANNA",
- "HANNAH",
- "HANNAN",
- "HANNON",
- "HANSEN",
- "HANSON",
- "HARBIN",
- "HARDAWAY",
- "HARDEE",
- "HARDEN",
- "HARDER",
- "HARDESTY",
- "HARDIN",
- "HARDING",
- "HARDISON",
- "HARDMAN",
- "HARDWICK",
- "HARDY",
- "HARE",
- "HARGIS",
- "HARGRAVE",
- "HARGROVE",
- "HARKINS",
- "HARLAN",
- "HARLEY",
- "HARLOW",
- "HARMAN",
- "HARMON",
- "HARMS",
- "HARNESS",
- "HARP",
- "HARPER",
- "HARR",
- "HARRELL",
- "HARRINGTON",
- "HARRIS",
- "HARRISON",
- "HARRY",
- "HART",
- "HARTER",
- "HARTLEY",
- "HARTMAN",
- "HARTMANN",
- "HARTWELL",
- "HARVEY",
- "HARWELL",
- "HARWOOD",
- "HASKELL",
- "HASKINS",
- "HASS",
- "HASSELL",
- "HASTINGS",
- "HATCH",
- "HATCHER",
- "HATCHETT",
- "HATFIELD",
- "HATHAWAY",
- "HATLEY",
- "HATTON",
- "HAUGEN",
- "HAUSER",
- "HAVENS",
- "HAWES",
- "HAWK",
- "HAWKINS",
- "HAWKS",
- "HAWLEY",
- "HAWTHORNE",
- "HAY",
- "HAYDEN",
- "HAYES",
- "HAYNES",
- "HAYS",
- "HAYWARD",
- "HAYWOOD",
- "HAZEL",
- "HEAD",
- "HEADLEY",
- "HEADRICK",
- "HEALEY",
- "HEALY",
- "HEARD",
- "HEARN",
- "HEATH",
- "HEATON",
- "HEBERT",
- "HECK",
- "HECKMAN",
- "HEDGES",
- "HEDRICK",
- "HEFFNER",
- "HEFLIN",
- "HEFNER",
- "HEIM",
- "HEIN",
- "HEINRICH",
- "HEINZ",
- "HELD",
- "HELLER",
- "HELM",
- "HELMS",
- "HELTON",
- "HEMBREE",
- "HEMPHILL",
- "HENDERSON",
- "HENDON",
- "HENDRICK",
- "HENDRICKS",
- "HENDRICKSON",
- "HENDRIX",
- "HENKE",
- "HENLEY",
- "HENNESSEY",
- "HENNING",
- "HENRY",
- "HENSLEY",
- "HENSON",
- "HER",
- "HERBERT",
- "HEREDIA",
- "HERMAN",
- "HERMANN",
- "HERNANDEZ",
- "HERNDON",
- "HERR",
- "HERRERA",
- "HERRICK",
- "HERRIN",
- "HERRING",
- "HERRINGTON",
- "HERRMANN",
- "HERRON",
- "HERSHBERGER",
- "HERZOG",
- "HESS",
- "HESTER",
- "HEWITT",
- "HEYWARD",
- "HIATT",
- "HIBBARD",
- "HICKEY",
- "HICKMAN",
- "HICKS",
- "HICKSON",
- "HIDALGO",
- "HIGDON",
- "HIGGINBOTHAM",
- "HIGGINS",
- "HIGGS",
- "HIGH",
- "HIGHTOWER",
- "HILDEBRAND",
- "HILDRETH",
- "HILL",
- "HILLARD",
- "HILLER",
- "HILLIARD",
- "HILLMAN",
- "HILLS",
- "HILTON",
- "HIMES",
- "HINDMAN",
- "HINDS",
- "HINES",
- "HINKLE",
- "HINOJOSA",
- "HINSON",
- "HINTON",
- "HIRSCH",
- "HITCHCOCK",
- "HITE",
- "HITT",
- "HO",
- "HOANG",
- "HOBBS",
- "HOBSON",
- "HODGE",
- "HODGES",
- "HODGSON",
- "HOFF",
- "HOFFMAN",
- "HOFFMANN",
- "HOGAN",
- "HOGG",
- "HOGUE",
- "HOKE",
- "HOLBROOK",
- "HOLCOMB",
- "HOLCOMBE",
- "HOLDEN",
- "HOLDER",
- "HOLGUIN",
- "HOLIDAY",
- "HOLLAND",
- "HOLLENBECK",
- "HOLLEY",
- "HOLLIDAY",
- "HOLLINGSWORTH",
- "HOLLINS",
- "HOLLIS",
- "HOLLOMAN",
- "HOLLOWAY",
- "HOLLY",
- "HOLM",
- "HOLMAN",
- "HOLMES",
- "HOLT",
- "HOLTON",
- "HOLTZ",
- "HOMAN",
- "HOMER",
- "HONEYCUTT",
- "HONG",
- "HOOD",
- "HOOK",
- "HOOKER",
- "HOOKS",
- "HOOPER",
- "HOOVER",
- "HOPE",
- "HOPKINS",
- "HOPPE",
- "HOPPER",
- "HOPSON",
- "HORAN",
- "HORN",
- "HORNE",
- "HORNER",
- "HORNSBY",
- "HOROWITZ",
- "HORSLEY",
- "HORTON",
- "HORVATH",
- "HOSKINS",
- "HOSTETLER",
- "HOUCK",
- "HOUGH",
- "HOUGHTON",
- "HOULE",
- "HOUSE",
- "HOUSER",
- "HOUSTON",
- "HOWARD",
- "HOWE",
- "HOWELL",
- "HOWERTON",
- "HOWES",
- "HOWLAND",
- "HOY",
- "HOYLE",
- "HOYT",
- "HSU",
- "HUANG",
- "HUBBARD",
- "HUBER",
- "HUBERT",
- "HUDDLESTON",
- "HUDGENS",
- "HUDGINS",
- "HUDSON",
- "HUERTA",
- "HUEY",
- "HUFF",
- "HUFFMAN",
- "HUGGINS",
- "HUGHES",
- "HUGHEY",
- "HULL",
- "HULSEY",
- "HUMES",
- "HUMMEL",
- "HUMPHREY",
- "HUMPHREYS",
- "HUMPHRIES",
- "HUNDLEY",
- "HUNT",
- "HUNTER",
- "HUNTINGTON",
- "HUNTLEY",
- "HURD",
- "HURLEY",
- "HURST",
- "HURT",
- "HURTADO",
- "HUSKEY",
- "HUSSEY",
- "HUSTON",
- "HUTCHENS",
- "HUTCHERSON",
- "HUTCHESON",
- "HUTCHINGS",
- "HUTCHINS",
- "HUTCHINSON",
- "HUTCHISON",
- "HUTSON",
- "HUTTO",
- "HUTTON",
- "HUYNH",
- "HWANG",
- "HYATT",
- "HYDE",
- "HYLAND",
- "HYLTON",
- "HYMAN",
- "HYNES",
- "IBARRA",
- "INGLE",
- "INGRAHAM",
- "INGRAM",
- "INMAN",
- "IRBY",
- "IRELAND",
- "IRISH",
- "IRIZARRY",
- "IRONS",
- "IRVIN",
- "IRVINE",
- "IRVING",
- "IRWIN",
- "ISAAC",
- "ISAACS",
- "ISAACSON",
- "ISBELL",
- "ISOM",
- "ISON",
- "ISRAEL",
- "IVERSON",
- "IVES",
- "IVEY",
- "IVORY",
- "IVY",
- "JACK",
- "JACKMAN",
- "JACKS",
- "JACKSON",
- "JACOB",
- "JACOBS",
- "JACOBSEN",
- "JACOBSON",
- "JACOBY",
- "JACQUES",
- "JAEGER",
- "JAMES",
- "JAMESON",
- "JAMISON",
- "JANES",
- "JANKOWSKI",
- "JANSEN",
- "JANSSEN",
- "JARAMILLO",
- "JARRELL",
- "JARRETT",
- "JARVIS",
- "JASPER",
- "JAY",
- "JAYNES",
- "JEAN",
- "JEFFERIES",
- "JEFFERS",
- "JEFFERSON",
- "JEFFERY",
- "JEFFREY",
- "JEFFRIES",
- "JENKINS",
- "JENNINGS",
- "JENSEN",
- "JENSON",
- "JERNIGAN",
- "JESSUP",
- "JETER",
- "JETT",
- "JEWELL",
- "JEWETT",
- "JIMENEZ",
- "JOBE",
- "JOE",
- "JOHANSEN",
- "JOHN",
- "JOHNS",
- "JOHNSON",
- "JOHNSTON",
- "JOINER",
- "JOLLEY",
- "JOLLY",
- "JONES",
- "JORDAN",
- "JORDON",
- "JORGENSEN",
- "JORGENSON",
- "JOSE",
- "JOSEPH",
- "JOY",
- "JOYCE",
- "JOYNER",
- "JUAREZ",
- "JUDD",
- "JUDE",
- "JUDGE",
- "JUDKINS",
- "JULIAN",
- "JUNG",
- "JUSTICE",
- "JUSTUS",
- "KAHN",
- "KAISER",
- "KAMINSKI",
- "KANE",
- "KANG",
- "KAPLAN",
- "KARR",
- "KASPER",
- "KATZ",
- "KAUFFMAN",
- "KAUFMAN",
- "KAY",
- "KAYE",
- "KEANE",
- "KEARNEY",
- "KEARNS",
- "KEATING",
- "KEATON",
- "KECK",
- "KEE",
- "KEEFE",
- "KEEFER",
- "KEEGAN",
- "KEEL",
- "KEELER",
- "KEELING",
- "KEEN",
- "KEENAN",
- "KEENE",
- "KEENER",
- "KEENEY",
- "KEETON",
- "KEITH",
- "KELLEHER",
- "KELLER",
- "KELLEY",
- "KELLOGG",
- "KELLUM",
- "KELLY",
- "KELSEY",
- "KELSO",
- "KEMP",
- "KEMPER",
- "KENDALL",
- "KENDRICK",
- "KENNEDY",
- "KENNEY",
- "KENNY",
- "KENT",
- "KENYON",
- "KERN",
- "KERNS",
- "KERR",
- "KESSLER",
- "KETCHUM",
- "KEY",
- "KEYES",
- "KEYS",
- "KEYSER",
- "KHAN",
- "KIDD",
- "KIDWELL",
- "KIEFER",
- "KILGORE",
- "KILLIAN",
- "KILPATRICK",
- "KIM",
- "KIMBALL",
- "KIMBLE",
- "KIMBRELL",
- "KIMBROUGH",
- "KIMMEL",
- "KINARD",
- "KINCAID",
- "KINDER",
- "KING",
- "KINGSLEY",
- "KINNEY",
- "KINSEY",
- "KIRBY",
- "KIRCHNER",
- "KIRK",
- "KIRKLAND",
- "KIRKPATRICK",
- "KIRKWOOD",
- "KISER",
- "KISH",
- "KITCHEN",
- "KITCHENS",
- "KLEIN",
- "KLINE",
- "KLINGER",
- "KNAPP",
- "KNIGHT",
- "KNOLL",
- "KNOTT",
- "KNOTTS",
- "KNOWLES",
- "KNOWLTON",
- "KNOX",
- "KNUDSEN",
- "KNUDSON",
- "KNUTSON",
- "KOCH",
- "KOEHLER",
- "KOENIG",
- "KOHL",
- "KOHLER",
- "KOHN",
- "KOLB",
- "KONG",
- "KOONCE",
- "KOONTZ",
- "KOPP",
- "KOVACH",
- "KOWALSKI",
- "KOZAK",
- "KOZLOWSKI",
- "KRAFT",
- "KRAMER",
- "KRAUS",
- "KRAUSE",
- "KRAUSS",
- "KREBS",
- "KRIEGER",
- "KROLL",
- "KRUEGER",
- "KRUG",
- "KRUGER",
- "KRUSE",
- "KUHN",
- "KUNKEL",
- "KUNTZ",
- "KUNZ",
- "KURTZ",
- "KUYKENDALL",
- "KYLE",
- "LABBE",
- "LABELLE",
- "LACEY",
- "LACHANCE",
- "LACKEY",
- "LACROIX",
- "LACY",
- "LADD",
- "LADNER",
- "LAFFERTY",
- "LAFLAMME",
- "LAFLEUR",
- "LAI",
- "LAIRD",
- "LAKE",
- "LAM",
- "LAMAR",
- "LAMB",
- "LAMBERT",
- "LAMM",
- "LANCASTER",
- "LANCE",
- "LAND",
- "LANDERS",
- "LANDIS",
- "LANDON",
- "LANDRUM",
- "LANDRY",
- "LANE",
- "LANEY",
- "LANG",
- "LANGDON",
- "LANGE",
- "LANGER",
- "LANGFORD",
- "LANGLEY",
- "LANGLOIS",
- "LANGSTON",
- "LANHAM",
- "LANIER",
- "LANKFORD",
- "LANNING",
- "LANTZ",
- "LAPLANTE",
- "LAPOINTE",
- "LAPORTE",
- "LARA",
- "LARGE",
- "LARKIN",
- "LAROCHE",
- "LAROSE",
- "LARRY",
- "LARSEN",
- "LARSON",
- "LARUE",
- "LASH",
- "LASHLEY",
- "LASSITER",
- "LASTER",
- "LATHAM",
- "LATIMER",
- "LATTIMORE",
- "LAU",
- "LAUER",
- "LAUGHLIN",
- "LAVENDER",
- "LAVIGNE",
- "LAVOIE",
- "LAW",
- "LAWHORN",
- "LAWLER",
- "LAWLESS",
- "LAWRENCE",
- "LAWS",
- "LAWSON",
- "LAWTON",
- "LAY",
- "LAYMAN",
- "LAYNE",
- "LAYTON",
- "LE",
- "LEA",
- "LEACH",
- "LEAHY",
- "LEAK",
- "LEAKE",
- "LEAL",
- "LEAR",
- "LEARY",
- "LEAVITT",
- "LEBLANC",
- "LEBRON",
- "LECLAIR",
- "LEDBETTER",
- "LEDESMA",
- "LEDFORD",
- "LEDOUX",
- "LEE",
- "LEEPER",
- "LEES",
- "LEFEBVRE",
- "LEGER",
- "LEGG",
- "LEGGETT",
- "LEHMAN",
- "LEHMANN",
- "LEIGH",
- "LEIGHTON",
- "LEMASTER",
- "LEMAY",
- "LEMIEUX",
- "LEMKE",
- "LEMMON",
- "LEMON",
- "LEMONS",
- "LEMUS",
- "LENNON",
- "LENTZ",
- "LENZ",
- "LEON",
- "LEONARD",
- "LEONE",
- "LERMA",
- "LERNER",
- "LEROY",
- "LESLIE",
- "LESSARD",
- "LESTER",
- "LEUNG",
- "LEVESQUE",
- "LEVI",
- "LEVIN",
- "LEVINE",
- "LEVY",
- "LEW",
- "LEWANDOWSKI",
- "LEWIS",
- "LEYVA",
- "LI",
- "LIBBY",
- "LIDDELL",
- "LIEBERMAN",
- "LIGHT",
- "LIGHTFOOT",
- "LIGHTNER",
- "LIGON",
- "LILES",
- "LILLEY",
- "LILLY",
- "LIM",
- "LIMA",
- "LIMON",
- "LIN",
- "LINARES",
- "LINCOLN",
- "LIND",
- "LINDBERG",
- "LINDER",
- "LINDGREN",
- "LINDLEY",
- "LINDQUIST",
- "LINDSAY",
- "LINDSEY",
- "LINDSTROM",
- "LINK",
- "LINKOUS",
- "LINN",
- "LINTON",
- "LINVILLE",
- "LIPSCOMB",
- "LIRA",
- "LISTER",
- "LITTLE",
- "LITTLEFIELD",
- "LITTLEJOHN",
- "LITTLETON",
- "LIU",
- "LIVELY",
- "LIVINGSTON",
- "LLOYD",
- "LO",
- "LOCKE",
- "LOCKETT",
- "LOCKHART",
- "LOCKLEAR",
- "LOCKWOOD",
- "LOERA",
- "LOFTIN",
- "LOFTIS",
- "LOFTON",
- "LOGAN",
- "LOGSDON",
- "LOGUE",
- "LOMAX",
- "LOMBARD",
- "LOMBARDI",
- "LOMBARDO",
- "LONDON",
- "LONG",
- "LONGO",
- "LONGORIA",
- "LOOMIS",
- "LOONEY",
- "LOPER",
- "LOPES",
- "LOPEZ",
- "LORD",
- "LORENZ",
- "LORENZO",
- "LOTT",
- "LOUIS",
- "LOVE",
- "LOVEJOY",
- "LOVELACE",
- "LOVELESS",
- "LOVELL",
- "LOVETT",
- "LOVING",
- "LOW",
- "LOWE",
- "LOWELL",
- "LOWERY",
- "LOWMAN",
- "LOWRY",
- "LOY",
- "LOYA",
- "LOYD",
- "LOZANO",
- "LU",
- "LUCAS",
- "LUCE",
- "LUCERO",
- "LUCIANO",
- "LUCKETT",
- "LUDWIG",
- "LUGO",
- "LUIS",
- "LUJAN",
- "LUKE",
- "LUMPKIN",
- "LUNA",
- "LUND",
- "LUNDBERG",
- "LUNDY",
- "LUNSFORD",
- "LUONG",
- "LUSK",
- "LUSTER",
- "LUTHER",
- "LUTTRELL",
- "LUTZ",
- "LY",
- "LYLE",
- "LYLES",
- "LYMAN",
- "LYNCH",
- "LYNN",
- "LYON",
- "LYONS",
- "LYTLE",
- "MA",
- "MAAS",
- "MABE",
- "MABRY",
- "MACDONALD",
- "MACE",
- "MACHADO",
- "MACIAS",
- "MACK",
- "MACKAY",
- "MACKENZIE",
- "MACKEY",
- "MACKIE",
- "MACKLIN",
- "MACLEAN",
- "MACLEOD",
- "MACON",
- "MADDEN",
- "MADDOX",
- "MADERA",
- "MADISON",
- "MADRID",
- "MADRIGAL",
- "MADSEN",
- "MAES",
- "MAESTAS",
- "MAGANA",
- "MAGEE",
- "MAGGARD",
- "MAGNUSON",
- "MAGUIRE",
- "MAHAFFEY",
- "MAHAN",
- "MAHER",
- "MAHON",
- "MAHONEY",
- "MAIER",
- "MAIN",
- "MAJOR",
- "MAJORS",
- "MAKI",
- "MALCOLM",
- "MALDONADO",
- "MALLEY",
- "MALLORY",
- "MALLOY",
- "MALONE",
- "MALONEY",
- "MANCINI",
- "MANCUSO",
- "MANESS",
- "MANGUM",
- "MANLEY",
- "MANN",
- "MANNING",
- "MANNS",
- "MANSFIELD",
- "MANSON",
- "MANUEL",
- "MANZO",
- "MAPLE",
- "MAPLES",
- "MARBLE",
- "MARCH",
- "MARCHAND",
- "MARCOTTE",
- "MARCUM",
- "MARCUS",
- "MARES",
- "MARIN",
- "MARINO",
- "MARION",
- "MARK",
- "MARKHAM",
- "MARKLEY",
- "MARKS",
- "MARLER",
- "MARLOW",
- "MARLOWE",
- "MARQUEZ",
- "MARQUIS",
- "MARR",
- "MARRERO",
- "MARROQUIN",
- "MARSH",
- "MARSHALL",
- "MARTEL",
- "MARTELL",
- "MARTENS",
- "MARTIN",
- "MARTINDALE",
- "MARTINEZ",
- "MARTINO",
- "MARTINS",
- "MARTINSON",
- "MARTZ",
- "MARVIN",
- "MARX",
- "MASON",
- "MASSEY",
- "MASSIE",
- "MAST",
- "MASTERS",
- "MASTERSON",
- "MATA",
- "MATHENY",
- "MATHESON",
- "MATHEWS",
- "MATHIAS",
- "MATHIS",
- "MATLOCK",
- "MATNEY",
- "MATOS",
- "MATSON",
- "MATTESON",
- "MATTHEW",
- "MATTHEWS",
- "MATTINGLY",
- "MATTISON",
- "MATTOS",
- "MATTOX",
- "MATTSON",
- "MAULDIN",
- "MAUPIN",
- "MAURER",
- "MAURO",
- "MAXEY",
- "MAXFIELD",
- "MAXWELL",
- "MAY",
- "MAYBERRY",
- "MAYER",
- "MAYERS",
- "MAYES",
- "MAYFIELD",
- "MAYHEW",
- "MAYNARD",
- "MAYO",
- "MAYS",
- "MAZZA",
- "MCADAMS",
- "MCAFEE",
- "MCALISTER",
- "MCALLISTER",
- "MCARTHUR",
- "MCBEE",
- "MCBRIDE",
- "MCCABE",
- "MCCAFFREY",
- "MCCAIN",
- "MCCALL",
- "MCCALLISTER",
- "MCCALLUM",
- "MCCANN",
- "MCCANTS",
- "MCCARTER",
- "MCCARTHY",
- "MCCARTNEY",
- "MCCARTY",
- "MCCASKILL",
- "MCCAULEY",
- "MCCLAIN",
- "MCCLANAHAN",
- "MCCLARY",
- "MCCLEARY",
- "MCCLELLAN",
- "MCCLELLAND",
- "MCCLENDON",
- "MCCLINTOCK",
- "MCCLINTON",
- "MCCLOSKEY",
- "MCCLOUD",
- "MCCLUNG",
- "MCCLURE",
- "MCCOLLUM",
- "MCCOMBS",
- "MCCONNELL",
- "MCCOOL",
- "MCCORD",
- "MCCORKLE",
- "MCCORMACK",
- "MCCORMICK",
- "MCCOY",
- "MCCRACKEN",
- "MCCRARY",
- "MCCRAY",
- "MCCREARY",
- "MCCUE",
- "MCCULLOCH",
- "MCCULLOUGH",
- "MCCUNE",
- "MCCURDY",
- "MCCURRY",
- "MCCUTCHEON",
- "MCDADE",
- "MCDANIEL",
- "MCDANIELS",
- "MCDERMOTT",
- "MCDONALD",
- "MCDONNELL",
- "MCDONOUGH",
- "MCDOUGAL",
- "MCDOUGALL",
- "MCDOWELL",
- "MCDUFFIE",
- "MCELROY",
- "MCEWEN",
- "MCFADDEN",
- "MCFALL",
- "MCFARLAND",
- "MCFARLANE",
- "MCGEE",
- "MCGEHEE",
- "MCGHEE",
- "MCGILL",
- "MCGINNIS",
- "MCGOVERN",
- "MCGOWAN",
- "MCGRATH",
- "MCGRAW",
- "MCGREGOR",
- "MCGREW",
- "MCGRIFF",
- "MCGUIRE",
- "MCHENRY",
- "MCHUGH",
- "MCINNIS",
- "MCINTIRE",
- "MCINTOSH",
- "MCINTYRE",
- "MCKAY",
- "MCKEE",
- "MCKEEVER",
- "MCKENNA",
- "MCKENNEY",
- "MCKENZIE",
- "MCKEON",
- "MCKEOWN",
- "MCKINLEY",
- "MCKINNEY",
- "MCKINNON",
- "MCKNIGHT",
- "MCLAIN",
- "MCLAUGHLIN",
- "MCLAURIN",
- "MCLEAN",
- "MCLEMORE",
- "MCLENDON",
- "MCLEOD",
- "MCMAHAN",
- "MCMAHON",
- "MCMANUS",
- "MCMASTER",
- "MCMILLAN",
- "MCMILLEN",
- "MCMILLIAN",
- "MCMULLEN",
- "MCMURRAY",
- "MCNABB",
- "MCNAIR",
- "MCNALLY",
- "MCNAMARA",
- "MCNEAL",
- "MCNEELY",
- "MCNEIL",
- "MCNEILL",
- "MCNULTY",
- "MCNUTT",
- "MCPHERSON",
- "MCQUEEN",
- "MCRAE",
- "MCREYNOLDS",
- "MCSWAIN",
- "MCVAY",
- "MCVEY",
- "MCWHORTER",
- "MCWILLIAMS",
- "MEACHAM",
- "MEAD",
- "MEADE",
- "MEADOR",
- "MEADOWS",
- "MEANS",
- "MEARS",
- "MEDEIROS",
- "MEDINA",
- "MEDLEY",
- "MEDLIN",
- "MEDLOCK",
- "MEDRANO",
- "MEEHAN",
- "MEEK",
- "MEEKER",
- "MEEKS",
- "MEIER",
- "MEJIA",
- "MELANCON",
- "MELENDEZ",
- "MELLO",
- "MELTON",
- "MELVIN",
- "MENA",
- "MENARD",
- "MENDENHALL",
- "MENDEZ",
- "MENDOZA",
- "MENENDEZ",
- "MERCADO",
- "MERCER",
- "MERCHANT",
- "MERCIER",
- "MEREDITH",
- "MERRELL",
- "MERRICK",
- "MERRILL",
- "MERRIMAN",
- "MERRITT",
- "MESA",
- "MESSENGER",
- "MESSER",
- "MESSINA",
- "METCALF",
- "METZ",
- "METZGER",
- "METZLER",
- "MEYER",
- "MEYERS",
- "MEZA",
- "MICHAEL",
- "MICHAELS",
- "MICHAUD",
- "MICHEL",
- "MICKENS",
- "MIDDLETON",
- "MILAM",
- "MILBURN",
- "MILES",
- "MILLARD",
- "MILLER",
- "MILLIGAN",
- "MILLIKEN",
- "MILLS",
- "MILNE",
- "MILNER",
- "MILTON",
- "MIMS",
- "MINER",
- "MINNICK",
- "MINOR",
- "MINTER",
- "MINTON",
- "MINTZ",
- "MIRANDA",
- "MIRELES",
- "MITCHELL",
- "MIXON",
- "MIZE",
- "MOBLEY",
- "MOCK",
- "MOE",
- "MOELLER",
- "MOEN",
- "MOFFETT",
- "MOFFITT",
- "MOHR",
- "MOJICA",
- "MOLINA",
- "MOLL",
- "MONACO",
- "MONAGHAN",
- "MONAHAN",
- "MONEY",
- "MONIZ",
- "MONK",
- "MONROE",
- "MONSON",
- "MONTAGUE",
- "MONTALVO",
- "MONTANEZ",
- "MONTANO",
- "MONTEMAYOR",
- "MONTERO",
- "MONTES",
- "MONTEZ",
- "MONTGOMERY",
- "MONTOYA",
- "MOODY",
- "MOON",
- "MOONEY",
- "MOORE",
- "MOORMAN",
- "MORA",
- "MORALES",
- "MORAN",
- "MOREAU",
- "MOREHEAD",
- "MORELAND",
- "MORENO",
- "MOREY",
- "MORGAN",
- "MORIARTY",
- "MORIN",
- "MORLEY",
- "MORRELL",
- "MORRILL",
- "MORRIS",
- "MORRISON",
- "MORRISSEY",
- "MORROW",
- "MORSE",
- "MORTENSEN",
- "MORTON",
- "MOSBY",
- "MOSELEY",
- "MOSER",
- "MOSES",
- "MOSHER",
- "MOSIER",
- "MOSLEY",
- "MOSS",
- "MOTLEY",
- "MOTT",
- "MOULTON",
- "MOULTRIE",
- "MOUNT",
- "MOWERY",
- "MOYA",
- "MOYE",
- "MOYER",
- "MUELLER",
- "MUHAMMAD",
- "MUIR",
- "MULKEY",
- "MULL",
- "MULLEN",
- "MULLER",
- "MULLIGAN",
- "MULLIN",
- "MULLINS",
- "MULLIS",
- "MUNCY",
- "MUNDY",
- "MUNIZ",
- "MUNN",
- "MUNOZ",
- "MUNSON",
- "MURDOCK",
- "MURILLO",
- "MURPHY",
- "MURRAY",
- "MURRELL",
- "MURRY",
- "MUSE",
- "MUSGROVE",
- "MUSSER",
- "MYERS",
- "MYLES",
- "MYRICK",
- "NABORS",
- "NADEAU",
- "NAGEL",
- "NAGLE",
- "NAGY",
- "NAJERA",
- "NAKAMURA",
- "NALL",
- "NANCE",
- "NAPIER",
- "NAQUIN",
- "NARANJO",
- "NARVAEZ",
- "NASH",
- "NATHAN",
- "NATION",
- "NAVA",
- "NAVARRETE",
- "NAVARRO",
- "NAYLOR",
- "NEAL",
- "NEALY",
- "NEEDHAM",
- "NEEL",
- "NEELEY",
- "NEELY",
- "NEFF",
- "NEGRETE",
- "NEGRON",
- "NEIL",
- "NEILL",
- "NELMS",
- "NELSON",
- "NESBITT",
- "NESMITH",
- "NESS",
- "NESTOR",
- "NETTLES",
- "NEUMAN",
- "NEUMANN",
- "NEVAREZ",
- "NEVILLE",
- "NEW",
- "NEWBERRY",
- "NEWBY",
- "NEWCOMB",
- "NEWELL",
- "NEWKIRK",
- "NEWMAN",
- "NEWSOM",
- "NEWSOME",
- "NEWTON",
- "NG",
- "NGO",
- "NGUYEN",
- "NICHOLAS",
- "NICHOLS",
- "NICHOLSON",
- "NICKEL",
- "NICKERSON",
- "NIELSEN",
- "NIELSON",
- "NIETO",
- "NIEVES",
- "NILES",
- "NIX",
- "NIXON",
- "NOBLE",
- "NOBLES",
- "NOE",
- "NOEL",
- "NOLAN",
- "NOLAND",
- "NOLEN",
- "NOLL",
- "NOONAN",
- "NORFLEET",
- "NORIEGA",
- "NORMAN",
- "NORRIS",
- "NORTH",
- "NORTON",
- "NORWOOD",
- "NOVAK",
- "NOVOTNY",
- "NOWAK",
- "NOWLIN",
- "NOYES",
- "NUGENT",
- "NULL",
- "NUMBERS",
- "NUNES",
- "NUNEZ",
- "NUNLEY",
- "NUNN",
- "NUTT",
- "NUTTER",
- "NYE",
- "OAKES",
- "OAKLEY",
- "OAKS",
- "OATES",
- "OBRIEN",
- "OBRYAN",
- "OCAMPO",
- "OCASIO",
- "OCHOA",
- "OCHS",
- "OCONNELL",
- "OCONNER",
- "OCONNOR",
- "ODELL",
- "ODEN",
- "ODOM",
- "ODONNELL",
- "ODUM",
- "OGDEN",
- "OGLE",
- "OGLESBY",
- "OH",
- "OHARA",
- "OJEDA",
- "OKEEFE",
- "OLDHAM",
- "OLDS",
- "OLEARY",
- "OLIPHANT",
- "OLIVA",
- "OLIVARES",
- "OLIVAREZ",
- "OLIVAS",
- "OLIVE",
- "OLIVEIRA",
- "OLIVER",
- "OLIVO",
- "OLMSTEAD",
- "OLSEN",
- "OLSON",
- "OLVERA",
- "OMALLEY",
- "ONEAL",
- "ONEIL",
- "ONEILL",
- "ONTIVEROS",
- "ORDONEZ",
- "OREILLY",
- "ORELLANA",
- "ORLANDO",
- "ORNELAS",
- "OROSCO",
- "OROURKE",
- "OROZCO",
- "ORR",
- "ORTA",
- "ORTEGA",
- "ORTIZ",
- "OSBORN",
- "OSBORNE",
- "OSBURN",
- "OSGOOD",
- "OSHEA",
- "OSORIO",
- "OSTEEN",
- "OSTRANDER",
- "OSULLIVAN",
- "OSWALD",
- "OSWALT",
- "OTERO",
- "OTIS",
- "OTOOLE",
- "OTT",
- "OTTO",
- "OUELLETTE",
- "OUTLAW",
- "OVERBY",
- "OVERSTREET",
- "OVERTON",
- "OWEN",
- "OWENS",
- "PACE",
- "PACHECO",
- "PACK",
- "PACKARD",
- "PACKER",
- "PADGETT",
- "PADILLA",
- "PAGAN",
- "PAGE",
- "PAIGE",
- "PAINE",
- "PAINTER",
- "PAK",
- "PALACIOS",
- "PALMA",
- "PALMER",
- "PALUMBO",
- "PANNELL",
- "PANTOJA",
- "PAPE",
- "PAPPAS",
- "PAQUETTE",
- "PARADIS",
- "PARDO",
- "PAREDES",
- "PARENT",
- "PARHAM",
- "PARIS",
- "PARISH",
- "PARK",
- "PARKER",
- "PARKINSON",
- "PARKS",
- "PARNELL",
- "PARR",
- "PARRA",
- "PARRIS",
- "PARRISH",
- "PARROTT",
- "PARRY",
- "PARSON",
- "PARSONS",
- "PARTIN",
- "PARTRIDGE",
- "PASSMORE",
- "PATE",
- "PATEL",
- "PATERSON",
- "PATINO",
- "PATRICK",
- "PATTEN",
- "PATTERSON",
- "PATTON",
- "PAUL",
- "PAULEY",
- "PAULSEN",
- "PAULSON",
- "PAXTON",
- "PAYNE",
- "PAYTON",
- "PAZ",
- "PEACE",
- "PEACHEY",
- "PEACOCK",
- "PEAK",
- "PEARCE",
- "PEARSON",
- "PEASE",
- "PECK",
- "PEDERSEN",
- "PEDERSON",
- "PEEBLES",
- "PEEK",
- "PEEL",
- "PEELER",
- "PEEPLES",
- "PELLETIER",
- "PELTIER",
- "PEMBERTON",
- "PENA",
- "PENCE",
- "PENDER",
- "PENDERGRASS",
- "PENDLETON",
- "PENN",
- "PENNELL",
- "PENNINGTON",
- "PENNY",
- "PEOPLES",
- "PEPPER",
- "PERALES",
- "PERALTA",
- "PERDUE",
- "PEREA",
- "PEREIRA",
- "PEREZ",
- "PERKINS",
- "PERREAULT",
- "PERRIN",
- "PERRON",
- "PERRY",
- "PERRYMAN",
- "PERSON",
- "PETER",
- "PETERMAN",
- "PETERS",
- "PETERSEN",
- "PETERSON",
- "PETIT",
- "PETRIE",
- "PETTIGREW",
- "PETTIS",
- "PETTIT",
- "PETTWAY",
- "PETTY",
- "PEYTON",
- "PFEIFER",
- "PFEIFFER",
- "PHAM",
- "PHAN",
- "PHELAN",
- "PHELPS",
- "PHIFER",
- "PHILLIPS",
- "PHIPPS",
- "PICARD",
- "PICKARD",
- "PICKENS",
- "PICKERING",
- "PICKETT",
- "PIERCE",
- "PIERRE",
- "PIERSON",
- "PIKE",
- "PILCHER",
- "PIMENTEL",
- "PINA",
- "PINCKNEY",
- "PINEDA",
- "PINKERTON",
- "PINKSTON",
- "PINO",
- "PINSON",
- "PINTO",
- "PIPER",
- "PIPKIN",
- "PIPPIN",
- "PITMAN",
- "PITRE",
- "PITT",
- "PITTMAN",
- "PITTS",
- "PLACE",
- "PLANTE",
- "PLATT",
- "PLEASANT",
- "PLUMMER",
- "PLUNKETT",
- "POE",
- "POGUE",
- "POINDEXTER",
- "POINTER",
- "POIRIER",
- "POLANCO",
- "POLAND",
- "POLING",
- "POLK",
- "POLLACK",
- "POLLARD",
- "POLLOCK",
- "POMEROY",
- "PONCE",
- "POND",
- "PONDER",
- "POOL",
- "POOLE",
- "POORE",
- "POPE",
- "POPP",
- "PORTER",
- "PORTERFIELD",
- "PORTILLO",
- "POSEY",
- "POST",
- "POSTON",
- "POTTER",
- "POTTS",
- "POULIN",
- "POUNDS",
- "POWELL",
- "POWER",
- "POWERS",
- "PRADO",
- "PRATER",
- "PRATHER",
- "PRATT",
- "PRENTICE",
- "PRESCOTT",
- "PRESLEY",
- "PRESSLEY",
- "PRESTON",
- "PREWITT",
- "PRICE",
- "PRICHARD",
- "PRIDE",
- "PRIDGEN",
- "PRIEST",
- "PRIETO",
- "PRINCE",
- "PRINGLE",
- "PRITCHARD",
- "PRITCHETT",
- "PROCTOR",
- "PROFFITT",
- "PROSSER",
- "PROVOST",
- "PRUETT",
- "PRUITT",
- "PRYOR",
- "PUCKETT",
- "PUENTE",
- "PUGH",
- "PULIDO",
- "PULLEN",
- "PULLEY",
- "PULLIAM",
- "PURCELL",
- "PURDY",
- "PURNELL",
- "PURVIS",
- "PUTMAN",
- "PUTNAM",
- "PYLE",
- "QUALLS",
- "QUARLES",
- "QUEEN",
- "QUEZADA",
- "QUICK",
- "QUIGLEY",
- "QUILLEN",
- "QUINLAN",
- "QUINN",
- "QUINONES",
- "QUINONEZ",
- "QUINTANA",
- "QUINTANILLA",
- "QUINTERO",
- "QUIROZ",
- "RADER",
- "RADFORD",
- "RAFFERTY",
- "RAGAN",
- "RAGLAND",
- "RAGSDALE",
- "RAINES",
- "RAINEY",
- "RAINS",
- "RALEY",
- "RALPH",
- "RALSTON",
- "RAMEY",
- "RAMIREZ",
- "RAMON",
- "RAMOS",
- "RAMSAY",
- "RAMSEY",
- "RAND",
- "RANDALL",
- "RANDLE",
- "RANDOLPH",
- "RANEY",
- "RANGEL",
- "RANKIN",
- "RANSOM",
- "RAPP",
- "RASH",
- "RASMUSSEN",
- "RATCLIFF",
- "RATLIFF",
- "RAU",
- "RAUCH",
- "RAWLINGS",
- "RAWLINS",
- "RAWLS",
- "RAY",
- "RAYBURN",
- "RAYFORD",
- "RAYMOND",
- "RAYNOR",
- "RAZO",
- "REA",
- "READ",
- "REAGAN",
- "REARDON",
- "REAVES",
- "RECTOR",
- "REDD",
- "REDDEN",
- "REDDICK",
- "REDDING",
- "REDDY",
- "REDMAN",
- "REDMON",
- "REDMOND",
- "REECE",
- "REED",
- "REEDER",
- "REEDY",
- "REES",
- "REESE",
- "REEVES",
- "REGALADO",
- "REGAN",
- "REGISTER",
- "REICH",
- "REICHERT",
- "REID",
- "REILLY",
- "REINHARDT",
- "REINHART",
- "REIS",
- "REITER",
- "RENDON",
- "RENFRO",
- "RENNER",
- "RENO",
- "RENTERIA",
- "REUTER",
- "REY",
- "REYES",
- "REYNA",
- "REYNOLDS",
- "REYNOSO",
- "RHEA",
- "RHOADES",
- "RHOADS",
- "RHODEN",
- "RHODES",
- "RICCI",
- "RICE",
- "RICH",
- "RICHARD",
- "RICHARDS",
- "RICHARDSON",
- "RICHEY",
- "RICHIE",
- "RICHMOND",
- "RICHTER",
- "RICKARD",
- "RICKER",
- "RICKETTS",
- "RICKMAN",
- "RICKS",
- "RICO",
- "RIDDELL",
- "RIDDICK",
- "RIDDLE",
- "RIDENOUR",
- "RIDER",
- "RIDGEWAY",
- "RIDLEY",
- "RIFE",
- "RIGBY",
- "RIGGINS",
- "RIGGS",
- "RIGSBY",
- "RILEY",
- "RINALDI",
- "RINEHART",
- "RING",
- "RIOS",
- "RIPLEY",
- "RITCHEY",
- "RITCHIE",
- "RITTER",
- "RIVAS",
- "RIVERA",
- "RIVERS",
- "RIZZO",
- "ROACH",
- "ROARK",
- "ROBB",
- "ROBBINS",
- "ROBERGE",
- "ROBERSON",
- "ROBERT",
- "ROBERTS",
- "ROBERTSON",
- "ROBEY",
- "ROBINETTE",
- "ROBINS",
- "ROBINSON",
- "ROBISON",
- "ROBLES",
- "ROBSON",
- "ROBY",
- "ROCHA",
- "ROCHE",
- "ROCK",
- "ROCKWELL",
- "RODEN",
- "RODERICK",
- "RODGERS",
- "RODRIGUE",
- "RODRIGUES",
- "RODRIGUEZ",
- "RODRIQUEZ",
- "ROE",
- "ROGER",
- "ROGERS",
- "ROHR",
- "ROJAS",
- "ROLAND",
- "ROLDAN",
- "ROLLER",
- "ROLLINS",
- "ROMAN",
- "ROMANO",
- "ROMEO",
- "ROMERO",
- "ROMO",
- "RONEY",
- "ROONEY",
- "ROOT",
- "ROPER",
- "ROQUE",
- "ROSA",
- "ROSADO",
- "ROSALES",
- "ROSARIO",
- "ROSAS",
- "ROSE",
- "ROSEN",
- "ROSENBAUM",
- "ROSENBERG",
- "ROSENTHAL",
- "ROSS",
- "ROSSER",
- "ROSSI",
- "ROTH",
- "ROUNDS",
- "ROUNDTREE",
- "ROUNTREE",
- "ROUSE",
- "ROUSH",
- "ROUSSEAU",
- "ROUSSEL",
- "ROWAN",
- "ROWE",
- "ROWELL",
- "ROWLAND",
- "ROWLEY",
- "ROY",
- "ROYAL",
- "ROYBAL",
- "ROYER",
- "ROYSTER",
- "RUBIN",
- "RUBIO",
- "RUBY",
- "RUCKER",
- "RUDD",
- "RUDOLPH",
- "RUFF",
- "RUFFIN",
- "RUIZ",
- "RUNYAN",
- "RUNYON",
- "RUPERT",
- "RUPP",
- "RUSH",
- "RUSHING",
- "RUSS",
- "RUSSELL",
- "RUSSO",
- "RUST",
- "RUTH",
- "RUTHERFORD",
- "RUTLEDGE",
- "RYAN",
- "RYDER",
- "SAAVEDRA",
- "SABO",
- "SACCO",
- "SADLER",
- "SAENZ",
- "SAGE",
- "SAGER",
- "SALAS",
- "SALAZAR",
- "SALCEDO",
- "SALCIDO",
- "SALDANA",
- "SALDIVAR",
- "SALERNO",
- "SALES",
- "SALGADO",
- "SALINAS",
- "SALISBURY",
- "SALLEE",
- "SALLEY",
- "SALMON",
- "SALTER",
- "SAM",
- "SAMMONS",
- "SAMPLE",
- "SAMPLES",
- "SAMPSON",
- "SAMS",
- "SAMSON",
- "SAMUEL",
- "SAMUELS",
- "SANBORN",
- "SANCHES",
- "SANCHEZ",
- "SANDBERG",
- "SANDER",
- "SANDERS",
- "SANDERSON",
- "SANDLIN",
- "SANDOVAL",
- "SANDS",
- "SANFORD",
- "SANTANA",
- "SANTIAGO",
- "SANTOS",
- "SAPP",
- "SARGENT",
- "SASSER",
- "SATTERFIELD",
- "SAUCEDO",
- "SAUCIER",
- "SAUER",
- "SAULS",
- "SAUNDERS",
- "SAVAGE",
- "SAVOY",
- "SAWYER",
- "SAWYERS",
- "SAXON",
- "SAXTON",
- "SAYERS",
- "SAYLOR",
- "SAYRE",
- "SCALES",
- "SCANLON",
- "SCARBOROUGH",
- "SCARBROUGH",
- "SCHAEFER",
- "SCHAEFFER",
- "SCHAFER",
- "SCHAFFER",
- "SCHELL",
- "SCHERER",
- "SCHILLER",
- "SCHILLING",
- "SCHINDLER",
- "SCHMID",
- "SCHMIDT",
- "SCHMITT",
- "SCHMITZ",
- "SCHNEIDER",
- "SCHOFIELD",
- "SCHOLL",
- "SCHOONOVER",
- "SCHOTT",
- "SCHRADER",
- "SCHREIBER",
- "SCHREINER",
- "SCHROEDER",
- "SCHUBERT",
- "SCHULER",
- "SCHULTE",
- "SCHULTZ",
- "SCHULZ",
- "SCHULZE",
- "SCHUMACHER",
- "SCHUSTER",
- "SCHWAB",
- "SCHWARTZ",
- "SCHWARZ",
- "SCHWEITZER",
- "SCOGGINS",
- "SCOTT",
- "SCRIBNER",
- "SCROGGINS",
- "SCRUGGS",
- "SCULLY",
- "SEAL",
- "SEALS",
- "SEAMAN",
- "SEARCY",
- "SEARS",
- "SEATON",
- "SEAY",
- "SEE",
- "SEELEY",
- "SEGURA",
- "SEIBERT",
- "SEIDEL",
- "SEIFERT",
- "SEILER",
- "SEITZ",
- "SELBY",
- "SELF",
- "SELL",
- "SELLERS",
- "SELLS",
- "SENA",
- "SEPULVEDA",
- "SERNA",
- "SERRANO",
- "SESSIONS",
- "SETTLE",
- "SETTLES",
- "SEVERSON",
- "SEWARD",
- "SEWELL",
- "SEXTON",
- "SEYMORE",
- "SEYMOUR",
- "SHACKELFORD",
- "SHADE",
- "SHAFER",
- "SHAFFER",
- "SHAH",
- "SHANK",
- "SHANKS",
- "SHANNON",
- "SHAPIRO",
- "SHARKEY",
- "SHARP",
- "SHARPE",
- "SHAVER",
- "SHAW",
- "SHAY",
- "SHEA",
- "SHEARER",
- "SHEEHAN",
- "SHEETS",
- "SHEFFIELD",
- "SHELBY",
- "SHELDON",
- "SHELL",
- "SHELLEY",
- "SHELLY",
- "SHELTON",
- "SHEPARD",
- "SHEPHARD",
- "SHEPHERD",
- "SHEPPARD",
- "SHERIDAN",
- "SHERMAN",
- "SHERRILL",
- "SHERROD",
- "SHERRY",
- "SHERWOOD",
- "SHIELDS",
- "SHIFFLETT",
- "SHIN",
- "SHINN",
- "SHIPLEY",
- "SHIPMAN",
- "SHIPP",
- "SHIRLEY",
- "SHIVELY",
- "SHIVERS",
- "SHOCKLEY",
- "SHOEMAKER",
- "SHOOK",
- "SHORE",
- "SHORES",
- "SHORT",
- "SHORTER",
- "SHRADER",
- "SHULER",
- "SHULL",
- "SHULTZ",
- "SHUMAKER",
- "SHUMAN",
- "SHUMATE",
- "SIBLEY",
- "SIDES",
- "SIEGEL",
- "SIERRA",
- "SIGLER",
- "SIKES",
- "SILER",
- "SILLS",
- "SILVA",
- "SILVER",
- "SILVERMAN",
- "SILVERS",
- "SILVIA",
- "SIMMONS",
- "SIMMS",
- "SIMON",
- "SIMONE",
- "SIMONS",
- "SIMONSON",
- "SIMPKINS",
- "SIMPSON",
- "SIMS",
- "SINCLAIR",
- "SINGER",
- "SINGH",
- "SINGLETARY",
- "SINGLETON",
- "SIPES",
- "SISCO",
- "SISK",
- "SISSON",
- "SIZEMORE",
- "SKAGGS",
- "SKELTON",
- "SKIDMORE",
- "SKINNER",
- "SKIPPER",
- "SLACK",
- "SLADE",
- "SLAGLE",
- "SLATER",
- "SLATON",
- "SLATTERY",
- "SLAUGHTER",
- "SLAYTON",
- "SLEDGE",
- "SLOAN",
- "SLOCUM",
- "SLONE",
- "SMALL",
- "SMALLEY",
- "SMALLS",
- "SMALLWOOD",
- "SMART",
- "SMILEY",
- "SMITH",
- "SMITHSON",
- "SMOOT",
- "SMOTHERS",
- "SMYTH",
- "SNEAD",
- "SNEED",
- "SNELL",
- "SNIDER",
- "SNIPES",
- "SNODGRASS",
- "SNOW",
- "SNOWDEN",
- "SNYDER",
- "SOARES",
- "SOLANO",
- "SOLIS",
- "SOLIZ",
- "SOLOMON",
- "SOMERS",
- "SOMERVILLE",
- "SOMMER",
- "SOMMERS",
- "SONG",
- "SORENSEN",
- "SORENSON",
- "SORIA",
- "SORIANO",
- "SORRELL",
- "SOSA",
- "SOTELO",
- "SOTO",
- "SOUSA",
- "SOUTH",
- "SOUTHARD",
- "SOUTHERLAND",
- "SOUTHERN",
- "SOUZA",
- "SOWELL",
- "SOWERS",
- "SPAIN",
- "SPALDING",
- "SPANGLER",
- "SPANN",
- "SPARKMAN",
- "SPARKS",
- "SPARROW",
- "SPAULDING",
- "SPEAR",
- "SPEARMAN",
- "SPEARS",
- "SPEED",
- "SPEER",
- "SPEIGHT",
- "SPELLMAN",
- "SPENCE",
- "SPENCER",
- "SPERRY",
- "SPICER",
- "SPILLMAN",
- "SPINKS",
- "SPIVEY",
- "SPOONER",
- "SPRADLIN",
- "SPRAGUE",
- "SPRIGGS",
- "SPRING",
- "SPRINGER",
- "SPROUSE",
- "SPRUILL",
- "SPURGEON",
- "SPURLOCK",
- "SQUIRES",
- "STACEY",
- "STACK",
- "STACKHOUSE",
- "STACY",
- "STAFFORD",
- "STAGGS",
- "STAHL",
- "STALEY",
- "STALLINGS",
- "STALLWORTH",
- "STAMM",
- "STAMPER",
- "STAMPS",
- "STANFIELD",
- "STANFORD",
- "STANLEY",
- "STANTON",
- "STAPLES",
- "STAPLETON",
- "STARK",
- "STARKEY",
- "STARKS",
- "STARLING",
- "STARNES",
- "STARR",
- "STATEN",
- "STATON",
- "STAUFFER",
- "STCLAIR",
- "STEADMAN",
- "STEARNS",
- "STEED",
- "STEEL",
- "STEELE",
- "STEEN",
- "STEFFEN",
- "STEGALL",
- "STEIN",
- "STEINBERG",
- "STEINER",
- "STEPHEN",
- "STEPHENS",
- "STEPHENSON",
- "STEPP",
- "STERLING",
- "STERN",
- "STEVENS",
- "STEVENSON",
- "STEWARD",
- "STEWART",
- "STIDHAM",
- "STILES",
- "STILL",
- "STILLMAN",
- "STILLWELL",
- "STILTNER",
- "STINE",
- "STINNETT",
- "STINSON",
- "STITT",
- "STJOHN",
- "STOCK",
- "STOCKTON",
- "STODDARD",
- "STOKER",
- "STOKES",
- "STOLL",
- "STONE",
- "STONER",
- "STOREY",
- "STORY",
- "STOTT",
- "STOUT",
- "STOVALL",
- "STOVER",
- "STOWE",
- "STPIERRE",
- "STRAIN",
- "STRAND",
- "STRANGE",
- "STRATTON",
- "STRAUB",
- "STRAUSS",
- "STREET",
- "STREETER",
- "STRICKLAND",
- "STRINGER",
- "STRONG",
- "STROTHER",
- "STROUD",
- "STROUP",
- "STRUNK",
- "STUART",
- "STUBBLEFIELD",
- "STUBBS",
- "STUCKEY",
- "STULL",
- "STUMP",
- "STURDIVANT",
- "STURGEON",
- "STURGILL",
- "STURGIS",
- "STURM",
- "STYLES",
- "SUAREZ",
- "SUGGS",
- "SULLIVAN",
- "SUMMERLIN",
- "SUMMERS",
- "SUMNER",
- "SUMPTER",
- "SUN",
- "SUTHERLAND",
- "SUTTER",
- "SUTTON",
- "SWAFFORD",
- "SWAIN",
- "SWAN",
- "SWANK",
- "SWANN",
- "SWANSON",
- "SWARTZ",
- "SWEARINGEN",
- "SWEAT",
- "SWEENEY",
- "SWEET",
- "SWENSON",
- "SWIFT",
- "SWISHER",
- "SWITZER",
- "SWOPE",
- "SYKES",
- "SYLVESTER",
- "TABER",
- "TABOR",
- "TACKETT",
- "TAFT",
- "TAGGART",
- "TALBERT",
- "TALBOT",
- "TALBOTT",
- "TALLENT",
- "TALLEY",
- "TAM",
- "TAMAYO",
- "TAN",
- "TANAKA",
- "TANG",
- "TANNER",
- "TAPIA",
- "TAPP",
- "TARVER",
- "TATE",
- "TATUM",
- "TAVARES",
- "TAYLOR",
- "TEAGUE",
- "TEAL",
- "TEEL",
- "TEETER",
- "TEJADA",
- "TEJEDA",
- "TELLEZ",
- "TEMPLE",
- "TEMPLETON",
- "TENNANT",
- "TENNEY",
- "TERRELL",
- "TERRILL",
- "TERRY",
- "THACKER",
- "THAMES",
- "THAO",
- "THARP",
- "THATCHER",
- "THAYER",
- "THERIAULT",
- "THERIOT",
- "THIBODEAU",
- "THIBODEAUX",
- "THIEL",
- "THIGPEN",
- "THOMAS",
- "THOMASON",
- "THOMPSON",
- "THOMSEN",
- "THOMSON",
- "THORN",
- "THORNBURG",
- "THORNE",
- "THORNHILL",
- "THORNTON",
- "THORP",
- "THORPE",
- "THORTON",
- "THRASH",
- "THRASHER",
- "THURMAN",
- "THURSTON",
- "TIBBETTS",
- "TIBBS",
- "TICE",
- "TIDWELL",
- "TIERNEY",
- "TIJERINA",
- "TILLER",
- "TILLERY",
- "TILLEY",
- "TILLMAN",
- "TILTON",
- "TIMM",
- "TIMMONS",
- "TINKER",
- "TINSLEY",
- "TIPTON",
- "TIRADO",
- "TISDALE",
- "TITUS",
- "TOBIAS",
- "TOBIN",
- "TODD",
- "TOLBERT",
- "TOLEDO",
- "TOLER",
- "TOLIVER",
- "TOLLIVER",
- "TOM",
- "TOMLIN",
- "TOMLINSON",
- "TOMPKINS",
- "TONEY",
- "TONG",
- "TORO",
- "TORRENCE",
- "TORRES",
- "TORREZ",
- "TOTH",
- "TOTTEN",
- "TOVAR",
- "TOWNES",
- "TOWNS",
- "TOWNSEND",
- "TRACY",
- "TRAHAN",
- "TRAMMELL",
- "TRAN",
- "TRAPP",
- "TRASK",
- "TRAVERS",
- "TRAVIS",
- "TRAYLOR",
- "TREADWAY",
- "TREADWELL",
- "TREJO",
- "TREMBLAY",
- "TRENT",
- "TREVINO",
- "TRIBBLE",
- "TRICE",
- "TRIMBLE",
- "TRINIDAD",
- "TRIPLETT",
- "TRIPP",
- "TROTTER",
- "TROUT",
- "TROUTMAN",
- "TROY",
- "TRUDEAU",
- "TRUE",
- "TRUITT",
- "TRUJILLO",
- "TRUONG",
- "TUBBS",
- "TUCK",
- "TUCKER",
- "TUGGLE",
- "TURK",
- "TURLEY",
- "TURMAN",
- "TURNBULL",
- "TURNER",
- "TURNEY",
- "TURPIN",
- "TUTTLE",
- "TYLER",
- "TYNER",
- "TYREE",
- "TYSON",
- "ULRICH",
- "UNDERHILL",
- "UNDERWOOD",
- "UNGER",
- "UPCHURCH",
- "UPSHAW",
- "UPTON",
- "URBAN",
- "URBINA",
- "URIBE",
- "USHER",
- "UTLEY",
- "VAIL",
- "VALADEZ",
- "VALDES",
- "VALDEZ",
- "VALENCIA",
- "VALENTI",
- "VALENTIN",
- "VALENTINE",
- "VALENZUELA",
- "VALERIO",
- "VALLE",
- "VALLEJO",
- "VALLES",
- "VAN",
- "VANBUREN",
- "VANCE",
- "VANDIVER",
- "VANDYKE",
- "VANG",
- "VANHOOSE",
- "VANHORN",
- "VANMETER",
- "VANN",
- "VANOVER",
- "VANWINKLE",
- "VARELA",
- "VARGAS",
- "VARNER",
- "VARNEY",
- "VASQUEZ",
- "VAUGHAN",
- "VAUGHN",
- "VAUGHT",
- "VAZQUEZ",
- "VEAL",
- "VEGA",
- "VELA",
- "VELASCO",
- "VELASQUEZ",
- "VELAZQUEZ",
- "VELEZ",
- "VENABLE",
- "VENEGAS",
- "VENTURA",
- "VERA",
- "VERDIN",
- "VERGARA",
- "VERNON",
- "VEST",
- "VETTER",
- "VICK",
- "VICKERS",
- "VICKERY",
- "VICTOR",
- "VIDAL",
- "VIEIRA",
- "VIERA",
- "VIGIL",
- "VILLA",
- "VILLALOBOS",
- "VILLANUEVA",
- "VILLAREAL",
- "VILLARREAL",
- "VILLASENOR",
- "VILLEGAS",
- "VINCENT",
- "VINES",
- "VINSON",
- "VITALE",
- "VO",
- "VOGEL",
- "VOGT",
- "VOSS",
- "VU",
- "VUE",
- "WADDELL",
- "WADE",
- "WADSWORTH",
- "WAGGONER",
- "WAGNER",
- "WAGONER",
- "WAHL",
- "WAITE",
- "WAKEFIELD",
- "WALDEN",
- "WALDRON",
- "WALDROP",
- "WALKER",
- "WALL",
- "WALLACE",
- "WALLEN",
- "WALLER",
- "WALLING",
- "WALLIS",
- "WALLS",
- "WALSH",
- "WALSTON",
- "WALTER",
- "WALTERS",
- "WALTON",
- "WAMPLER",
- "WANG",
- "WARD",
- "WARDEN",
- "WARE",
- "WARFIELD",
- "WARNER",
- "WARREN",
- "WASHBURN",
- "WASHINGTON",
- "WASSON",
- "WATERMAN",
- "WATERS",
- "WATKINS",
- "WATSON",
- "WATT",
- "WATTERS",
- "WATTS",
- "WAUGH",
- "WAY",
- "WAYNE",
- "WEATHERFORD",
- "WEATHERLY",
- "WEATHERS",
- "WEAVER",
- "WEBB",
- "WEBBER",
- "WEBER",
- "WEBSTER",
- "WEDDLE",
- "WEED",
- "WEEKS",
- "WEEMS",
- "WEINBERG",
- "WEINER",
- "WEINSTEIN",
- "WEIR",
- "WEIS",
- "WEISS",
- "WELCH",
- "WELDON",
- "WELKER",
- "WELLER",
- "WELLMAN",
- "WELLS",
- "WELSH",
- "WENDT",
- "WENGER",
- "WENTWORTH",
- "WENTZ",
- "WENZEL",
- "WERNER",
- "WERTZ",
- "WESLEY",
- "WEST",
- "WESTBROOK",
- "WESTER",
- "WESTFALL",
- "WESTMORELAND",
- "WESTON",
- "WETZEL",
- "WHALEN",
- "WHALEY",
- "WHARTON",
- "WHATLEY",
- "WHEAT",
- "WHEATLEY",
- "WHEATON",
- "WHEELER",
- "WHELAN",
- "WHIPPLE",
- "WHITAKER",
- "WHITCOMB",
- "WHITE",
- "WHITED",
- "WHITEHEAD",
- "WHITEHURST",
- "WHITEMAN",
- "WHITESIDE",
- "WHITFIELD",
- "WHITING",
- "WHITLEY",
- "WHITLOCK",
- "WHITLOW",
- "WHITMAN",
- "WHITMIRE",
- "WHITMORE",
- "WHITNEY",
- "WHITSON",
- "WHITT",
- "WHITTAKER",
- "WHITTEN",
- "WHITTINGTON",
- "WHITTLE",
- "WHITWORTH",
- "WHYTE",
- "WICK",
- "WICKER",
- "WICKHAM",
- "WICKS",
- "WIESE",
- "WIGGINS",
- "WILBANKS",
- "WILBER",
- "WILBUR",
- "WILBURN",
- "WILCOX",
- "WILD",
- "WILDE",
- "WILDER",
- "WILES",
- "WILEY",
- "WILHELM",
- "WILHITE",
- "WILKE",
- "WILKERSON",
- "WILKES",
- "WILKINS",
- "WILKINSON",
- "WILKS",
- "WILL",
- "WILLARD",
- "WILLETT",
- "WILLEY",
- "WILLIAM",
- "WILLIAMS",
- "WILLIAMSON",
- "WILLIFORD",
- "WILLINGHAM",
- "WILLIS",
- "WILLOUGHBY",
- "WILLS",
- "WILLSON",
- "WILMOTH",
- "WILSON",
- "WILT",
- "WIMBERLY",
- "WINCHESTER",
- "WINDHAM",
- "WINFIELD",
- "WINFREY",
- "WING",
- "WINGATE",
- "WINGFIELD",
- "WINKLER",
- "WINN",
- "WINSLOW",
- "WINSTEAD",
- "WINSTON",
- "WINTER",
- "WINTERS",
- "WIRTH",
- "WISE",
- "WISEMAN",
- "WISNIEWSKI",
- "WITCHER",
- "WITHERS",
- "WITHERSPOON",
- "WITHROW",
- "WITT",
- "WITTE",
- "WOFFORD",
- "WOLF",
- "WOLFE",
- "WOLFF",
- "WOLFORD",
- "WOMACK",
- "WONG",
- "WOO",
- "WOOD",
- "WOODALL",
- "WOODARD",
- "WOODBURY",
- "WOODCOCK",
- "WOODEN",
- "WOODLEY",
- "WOODRUFF",
- "WOODS",
- "WOODSON",
- "WOODWARD",
- "WOODWORTH",
- "WOODY",
- "WOOLDRIDGE",
- "WOOLEY",
- "WOOTEN",
- "WORD",
- "WORDEN",
- "WORKMAN",
- "WORLEY",
- "WORRELL",
- "WORSHAM",
- "WORTH",
- "WORTHAM",
- "WORTHINGTON",
- "WORTHY",
- "WRAY",
- "WREN",
- "WRIGHT",
- "WU",
- "WYANT",
- "WYATT",
- "WYLIE",
- "WYMAN",
- "WYNN",
- "WYNNE",
- "XIONG",
- "YAMAMOTO",
- "YANCEY",
- "YANEZ",
- "YANG",
- "YARBROUGH",
- "YATES",
- "YAZZIE",
- "YBARRA",
- "YEAGER",
- "YEE",
- "YI",
- "YOCUM",
- "YODER",
- "YOO",
- "YOON",
- "YORK",
- "YOST",
- "YOUNG",
- "YOUNGBLOOD",
- "YOUNGER",
- "YOUNT",
- "YU",
- "ZAMBRANO",
- "ZAMORA",
- "ZAPATA",
- "ZARAGOZA",
- "ZARATE",
- "ZAVALA",
- "ZEIGLER",
- "ZELLER",
- "ZEPEDA",
- "ZHANG",
- "ZIEGLER",
- "ZIELINSKI",
- "ZIMMER",
- "ZIMMERMAN",
- "ZINK",
- "ZOOK",
- "ZUNIGA"
- };
+ return new String[] { "AARON", "ABBOTT", "ABEL", "ABELL", "ABERNATHY", "ABNER", "ABNEY", "ABRAHAM", "ABRAMS",
+ "ABREU", "ACEVEDO", "ACKER", "ACKERMAN", "ACKLEY", "ACOSTA", "ACUNA", "ADAIR", "ADAM", "ADAME", "ADAMS",
+ "ADAMSON", "ADCOCK", "ADDISON", "ADKINS", "ADLER", "AGEE", "AGNEW", "AGUAYO", "AGUIAR", "AGUILAR",
+ "AGUILERA", "AGUIRRE", "AHERN", "AHMAD", "AHMED", "AHRENS", "AIELLO", "AIKEN", "AINSWORTH", "AKERS",
+ "AKIN", "AKINS", "ALANIZ", "ALARCON", "ALBA", "ALBERS", "ALBERT", "ALBERTSON", "ALBRECHT", "ALBRIGHT",
+ "ALCALA", "ALCORN", "ALDERMAN", "ALDRICH", "ALDRIDGE", "ALEMAN", "ALEXANDER", "ALFARO", "ALFONSO",
+ "ALFORD", "ALFRED", "ALGER", "ALI", "ALICEA", "ALLAN", "ALLARD", "ALLEN", "ALLEY", "ALLISON", "ALLMAN",
+ "ALLRED", "ALMANZA", "ALMEIDA", "ALMOND", "ALONSO", "ALONZO", "ALSTON", "ALTMAN", "ALVARADO", "ALVAREZ",
+ "ALVES", "AMADOR", "AMARAL", "AMATO", "AMAYA", "AMBROSE", "AMES", "AMMONS", "AMOS", "AMUNDSON", "ANAYA",
+ "ANDERS", "ANDERSEN", "ANDERSON", "ANDRADE", "ANDRE", "ANDRES", "ANDREW", "ANDREWS", "ANDRUS", "ANGEL",
+ "ANGELO", "ANGLIN", "ANGULO", "ANTHONY", "ANTOINE", "ANTONIO", "APODACA", "APONTE", "APPEL", "APPLE",
+ "APPLEGATE", "APPLETON", "AQUINO", "ARAGON", "ARANDA", "ARAUJO", "ARCE", "ARCHER", "ARCHIBALD",
+ "ARCHIE", "ARCHULETA", "ARELLANO", "AREVALO", "ARIAS", "ARMENTA", "ARMIJO", "ARMSTEAD", "ARMSTRONG",
+ "ARNDT", "ARNETT", "ARNOLD", "ARREDONDO", "ARREOLA", "ARRIAGA", "ARRINGTON", "ARROYO", "ARSENAULT",
+ "ARTEAGA", "ARTHUR", "ARTIS", "ASBURY", "ASH", "ASHBY", "ASHCRAFT", "ASHE", "ASHER", "ASHFORD",
+ "ASHLEY", "ASHMORE", "ASHTON", "ASHWORTH", "ASKEW", "ATCHISON", "ATHERTON", "ATKINS", "ATKINSON",
+ "ATWELL", "ATWOOD", "AUGUST", "AUGUSTINE", "AULT", "AUSTIN", "AUTRY", "AVALOS", "AVERY", "AVILA",
+ "AVILES", "AYALA", "AYERS", "AYRES", "BABB", "BABCOCK", "BABIN", "BACA", "BACH", "BACHMAN", "BACK",
+ "BACON", "BADER", "BADGER", "BADILLO", "BAER", "BAEZ", "BAGGETT", "BAGLEY", "BAGWELL", "BAILEY", "BAIN",
+ "BAINES", "BAIR", "BAIRD", "BAKER", "BALDERAS", "BALDWIN", "BALES", "BALL", "BALLARD", "BANDA", "BANDY",
+ "BANKS", "BANKSTON", "BANNISTER", "BANUELOS", "BAPTISTE", "BARAJAS", "BARBA", "BARBEE", "BARBER",
+ "BARBOSA", "BARBOUR", "BARCLAY", "BARDEN", "BARELA", "BARFIELD", "BARGER", "BARHAM", "BARKER",
+ "BARKLEY", "BARKSDALE", "BARLOW", "BARNARD", "BARNES", "BARNETT", "BARNETTE", "BARNEY", "BARNHART",
+ "BARNHILL", "BARON", "BARONE", "BARR", "BARRAZA", "BARRERA", "BARRETO", "BARRETT", "BARRIENTOS",
+ "BARRIOS", "BARRON", "BARROW", "BARROWS", "BARRY", "BARTELS", "BARTH", "BARTHOLOMEW", "BARTLETT",
+ "BARTLEY", "BARTON", "BASHAM", "BASKIN", "BASS", "BASSETT", "BATCHELOR", "BATEMAN", "BATES", "BATISTA",
+ "BATISTE", "BATSON", "BATTAGLIA", "BATTEN", "BATTLE", "BATTLES", "BATTS", "BAUER", "BAUGH", "BAUGHMAN",
+ "BAUM", "BAUMAN", "BAUMANN", "BAUMGARDNER", "BAUMGARTNER", "BAUTISTA", "BAXLEY", "BAXTER", "BAYER",
+ "BAYLOR", "BAYNE", "BAYS", "BEACH", "BEAL", "BEALE", "BEALL", "BEALS", "BEAM", "BEAMON", "BEAN",
+ "BEANE", "BEAR", "BEARD", "BEARDEN", "BEASLEY", "BEATTIE", "BEATTY", "BEATY", "BEAUCHAMP", "BEAUDOIN",
+ "BEAULIEU", "BEAUREGARD", "BEAVER", "BEAVERS", "BECERRA", "BECK", "BECKER", "BECKETT", "BECKHAM",
+ "BECKMAN", "BECKWITH", "BECNEL", "BEDARD", "BEDFORD", "BEEBE", "BEELER", "BEERS", "BEESON", "BEGAY",
+ "BEGLEY", "BEHRENS", "BELANGER", "BELCHER", "BELL", "BELLAMY", "BELLO", "BELT", "BELTON", "BELTRAN",
+ "BENAVIDES", "BENAVIDEZ", "BENDER", "BENEDICT", "BENEFIELD", "BENITEZ", "BENJAMIN", "BENNER", "BENNETT",
+ "BENOIT", "BENSON", "BENTLEY", "BENTON", "BERG", "BERGER", "BERGERON", "BERGMAN", "BERGSTROM", "BERLIN",
+ "BERMAN", "BERMUDEZ", "BERNAL", "BERNARD", "BERNHARDT", "BERNIER", "BERNSTEIN", "BERRIOS", "BERRY",
+ "BERRYMAN", "BERTRAM", "BERTRAND", "BERUBE", "BESS", "BEST", "BETANCOURT", "BETHEA", "BETHEL", "BETTS",
+ "BETZ", "BEVERLY", "BEVINS", "BEYER", "BIBLE", "BICKFORD", "BIDDLE", "BIGELOW", "BIGGS", "BILLINGS",
+ "BILLINGSLEY", "BILLIOT", "BILLS", "BILLUPS", "BILODEAU", "BINDER", "BINGHAM", "BINKLEY", "BIRCH",
+ "BIRD", "BISHOP", "BISSON", "BITTNER", "BIVENS", "BIVINS", "BLACK", "BLACKBURN", "BLACKMAN", "BLACKMON",
+ "BLACKWELL", "BLACKWOOD", "BLAINE", "BLAIR", "BLAIS", "BLAKE", "BLAKELY", "BLALOCK", "BLANCHARD",
+ "BLANCHETTE", "BLANCO", "BLAND", "BLANK", "BLANKENSHIP", "BLANTON", "BLAYLOCK", "BLEDSOE", "BLEVINS",
+ "BLISS", "BLOCK", "BLOCKER", "BLODGETT", "BLOOM", "BLOUNT", "BLUE", "BLUM", "BLUNT", "BLYTHE",
+ "BOATRIGHT", "BOATWRIGHT", "BOBBITT", "BOBO", "BOCK", "BOEHM", "BOETTCHER", "BOGAN", "BOGGS",
+ "BOHANNON", "BOHN", "BOISVERT", "BOLAND", "BOLDEN", "BOLDUC", "BOLEN", "BOLES", "BOLIN", "BOLING",
+ "BOLLING", "BOLLINGER", "BOLT", "BOLTON", "BOND", "BONDS", "BONE", "BONILLA", "BONNER", "BOOKER",
+ "BOONE", "BOOTH", "BOOTHE", "BORDELON", "BORDEN", "BORDERS", "BOREN", "BORGES", "BORREGO", "BOSS",
+ "BOSTIC", "BOSTICK", "BOSTON", "BOSWELL", "BOTTOMS", "BOUCHARD", "BOUCHER", "BOUDREAU", "BOUDREAUX",
+ "BOUNDS", "BOURGEOIS", "BOURNE", "BOURQUE", "BOWDEN", "BOWEN", "BOWENS", "BOWER", "BOWERS", "BOWIE",
+ "BOWLES", "BOWLIN", "BOWLING", "BOWMAN", "BOWSER", "BOX", "BOYCE", "BOYD", "BOYER", "BOYKIN", "BOYLE",
+ "BOYLES", "BOYNTON", "BOZEMAN", "BRACKEN", "BRACKETT", "BRADBURY", "BRADEN", "BRADFORD", "BRADLEY",
+ "BRADSHAW", "BRADY", "BRAGG", "BRANCH", "BRAND", "BRANDENBURG", "BRANDON", "BRANDT", "BRANHAM",
+ "BRANNON", "BRANSON", "BRANT", "BRANTLEY", "BRASWELL", "BRATCHER", "BRATTON", "BRAUN", "BRAVO",
+ "BRAXTON", "BRAY", "BRAZIL", "BREAUX", "BREEDEN", "BREEDLOVE", "BREEN", "BRENNAN", "BRENNER", "BRENT",
+ "BREWER", "BREWSTER", "BRICE", "BRIDGES", "BRIGGS", "BRIGHT", "BRILEY", "BRILL", "BRIM", "BRINK",
+ "BRINKLEY", "BRINKMAN", "BRINSON", "BRIONES", "BRISCOE", "BRISENO", "BRITO", "BRITT", "BRITTAIN",
+ "BRITTON", "BROADNAX", "BROADWAY", "BROCK", "BROCKMAN", "BRODERICK", "BRODY", "BROGAN", "BRONSON",
+ "BROOKINS", "BROOKS", "BROOME", "BROTHERS", "BROUGHTON", "BROUSSARD", "BROWDER", "BROWER", "BROWN",
+ "BROWNE", "BROWNELL", "BROWNING", "BROWNLEE", "BROYLES", "BRUBAKER", "BRUCE", "BRUMFIELD", "BRUNER",
+ "BRUNNER", "BRUNO", "BRUNS", "BRUNSON", "BRUTON", "BRYAN", "BRYANT", "BRYSON", "BUCHANAN", "BUCHER",
+ "BUCK", "BUCKINGHAM", "BUCKLEY", "BUCKNER", "BUENO", "BUFFINGTON", "BUFORD", "BUI", "BULL", "BULLARD",
+ "BULLOCK", "BUMGARNER", "BUNCH", "BUNDY", "BUNKER", "BUNN", "BUNNELL", "BUNTING", "BURCH", "BURCHETT",
+ "BURCHFIELD", "BURDEN", "BURDETTE", "BURDICK", "BURGE", "BURGER", "BURGESS", "BURGOS", "BURK", "BURKE",
+ "BURKETT", "BURKHART", "BURKHOLDER", "BURKS", "BURLESON", "BURLEY", "BURNETT", "BURNETTE", "BURNEY",
+ "BURNHAM", "BURNS", "BURNSIDE", "BURR", "BURRELL", "BURRIS", "BURROUGHS", "BURROW", "BURROWS", "BURT",
+ "BURTON", "BUSBY", "BUSCH", "BUSH", "BUSS", "BUSSEY", "BUSTAMANTE", "BUSTOS", "BUTCHER", "BUTLER",
+ "BUTTERFIELD", "BUTTON", "BUTTS", "BUXTON", "BYARS", "BYERS", "BYNUM", "BYRD", "BYRNE", "BYRNES",
+ "CABALLERO", "CABAN", "CABLE", "CABRAL", "CABRERA", "CADE", "CADY", "CAGLE", "CAHILL", "CAIN",
+ "CALABRESE", "CALDERON", "CALDWELL", "CALHOUN", "CALKINS", "CALL", "CALLAGHAN", "CALLAHAN", "CALLAWAY",
+ "CALLENDER", "CALLOWAY", "CALVERT", "CALVIN", "CAMACHO", "CAMARILLO", "CAMBELL", "CAMERON", "CAMP",
+ "CAMPBELL", "CAMPOS", "CANADA", "CANADY", "CANALES", "CANDELARIA", "CANFIELD", "CANNON", "CANO",
+ "CANTRELL", "CANTU", "CANTWELL", "CANTY", "CAPPS", "CARABALLO", "CARAWAY", "CARBAJAL", "CARBONE",
+ "CARD", "CARDEN", "CARDENAS", "CARDER", "CARDONA", "CARDOZA", "CARDWELL", "CAREY", "CARL", "CARLIN",
+ "CARLISLE", "CARLOS", "CARLSON", "CARLTON", "CARMAN", "CARMICHAEL", "CARMONA", "CARNAHAN", "CARNES",
+ "CARNEY", "CARO", "CARON", "CARPENTER", "CARR", "CARRANZA", "CARRASCO", "CARRERA", "CARRICO", "CARRIER",
+ "CARRILLO", "CARRINGTON", "CARRION", "CARROLL", "CARSON", "CARSWELL", "CARTER", "CARTWRIGHT", "CARUSO",
+ "CARVALHO", "CARVER", "CARY", "CASAS", "CASE", "CASEY", "CASH", "CASILLAS", "CASKEY", "CASON", "CASPER",
+ "CASS", "CASSELL", "CASSIDY", "CASTANEDA", "CASTEEL", "CASTELLANO", "CASTELLANOS", "CASTILLO", "CASTLE",
+ "CASTLEBERRY", "CASTRO", "CASWELL", "CATALANO", "CATES", "CATHEY", "CATO", "CATRON", "CAUDILL",
+ "CAUDLE", "CAUSEY", "CAVANAUGH", "CAVAZOS", "CAVE", "CECIL", "CENTENO", "CERDA", "CERVANTES", "CHACON",
+ "CHADWICK", "CHAFFIN", "CHALMERS", "CHAMBERLAIN", "CHAMBERLIN", "CHAMBERS", "CHAMBLISS", "CHAMPAGNE",
+ "CHAMPION", "CHAN", "CHANCE", "CHANDLER", "CHANEY", "CHANG", "CHAPA", "CHAPIN", "CHAPMAN", "CHAPPELL",
+ "CHARLES", "CHARLTON", "CHASE", "CHASTAIN", "CHATMAN", "CHAU", "CHAVARRIA", "CHAVES", "CHAVEZ",
+ "CHAVIS", "CHEATHAM", "CHEEK", "CHEN", "CHENEY", "CHENG", "CHERRY", "CHESSER", "CHESTER", "CHESTNUT",
+ "CHEUNG", "CHEW", "CHILD", "CHILDERS", "CHILDRESS", "CHILDS", "CHILTON", "CHIN", "CHISHOLM", "CHISM",
+ "CHISOLM", "CHITWOOD", "CHO", "CHOATE", "CHOI", "CHONG", "CHOW", "CHRISTENSEN", "CHRISTENSON",
+ "CHRISTIAN", "CHRISTIANSEN", "CHRISTIANSON", "CHRISTIE", "CHRISTMAN", "CHRISTMAS", "CHRISTOPHER",
+ "CHRISTY", "CHU", "CHUN", "CHUNG", "CHURCH", "CHURCHILL", "CINTRON", "CISNEROS", "CLANCY", "CLANTON",
+ "CLAPP", "CLARK", "CLARKE", "CLARKSON", "CLARY", "CLAUSEN", "CLAWSON", "CLAY", "CLAYTON", "CLEARY",
+ "CLEGG", "CLEM", "CLEMENS", "CLEMENT", "CLEMENTS", "CLEMMONS", "CLEMONS", "CLEVELAND", "CLEVENGER",
+ "CLICK", "CLIFFORD", "CLIFTON", "CLINE", "CLINTON", "CLOSE", "CLOUD", "CLOUGH", "CLOUTIER", "COATES",
+ "COATS", "COBB", "COBBS", "COBLE", "COBURN", "COCHRAN", "COCHRANE", "COCKRELL", "CODY", "COE", "COFFEY",
+ "COFFIN", "COFFMAN", "COGGINS", "COHEN", "COHN", "COKER", "COLBERT", "COLBURN", "COLBY", "COLE",
+ "COLEMAN", "COLES", "COLEY", "COLLADO", "COLLAZO", "COLLEY", "COLLIER", "COLLINS", "COLON", "COLSON",
+ "COLVIN", "COLWELL", "COMBS", "COMEAUX", "COMER", "COMPTON", "COMSTOCK", "CONAWAY", "CONCEPCION",
+ "CONDON", "CONE", "CONGER", "CONKLIN", "CONLEY", "CONN", "CONNELL", "CONNELLY", "CONNER", "CONNERS",
+ "CONNOLLY", "CONNOR", "CONNORS", "CONOVER", "CONRAD", "CONROY", "CONTE", "CONTI", "CONTRERAS", "CONWAY",
+ "CONYERS", "COOK", "COOKE", "COOKS", "COOKSEY", "COOLEY", "COOMBS", "COON", "COONEY", "COONS", "COOPER",
+ "COPE", "COPELAND", "COPLEY", "COPPOLA", "CORBETT", "CORBIN", "CORBITT", "CORCORAN", "CORDELL",
+ "CORDERO", "CORDOVA", "COREY", "CORLEY", "CORMIER", "CORNELIUS", "CORNELL", "CORNETT", "CORNISH",
+ "CORNWELL", "CORONA", "CORONADO", "CORRAL", "CORREA", "CORREIA", "CORRIGAN", "CORTES", "CORTEZ",
+ "CORWIN", "COSBY", "COSGROVE", "COSTA", "COSTELLO", "COTA", "COTE", "COTHRAN", "COTTER", "COTTON",
+ "COTTRELL", "COUCH", "COUGHLIN", "COULTER", "COUNCIL", "COUNTS", "COURTNEY", "COUSINS", "COUTURE",
+ "COVERT", "COVEY", "COVINGTON", "COWAN", "COWARD", "COWART", "COWELL", "COWLES", "COWLEY", "COX", "COY",
+ "COYLE", "COYNE", "CRABTREE", "CRADDOCK", "CRAFT", "CRAIG", "CRAIN", "CRAMER", "CRANDALL", "CRANE",
+ "CRANFORD", "CRAVEN", "CRAWFORD", "CRAWLEY", "CRAYTON", "CREAMER", "CREECH", "CREEL", "CREIGHTON",
+ "CRENSHAW", "CRESPO", "CREWS", "CRIDER", "CRISP", "CRIST", "CRISWELL", "CRITTENDEN", "CROCKER",
+ "CROCKETT", "CROFT", "CROMER", "CROMWELL", "CRONIN", "CROOK", "CROOKS", "CROSBY", "CROSS", "CROTEAU",
+ "CROUCH", "CROUSE", "CROW", "CROWDER", "CROWE", "CROWELL", "CROWLEY", "CRUM", "CRUMP", "CRUSE",
+ "CRUTCHER", "CRUTCHFIELD", "CRUZ", "CUELLAR", "CUEVAS", "CULBERTSON", "CULLEN", "CULP", "CULPEPPER",
+ "CULVER", "CUMMINGS", "CUMMINS", "CUNNINGHAM", "CUPP", "CURLEY", "CURRAN", "CURRIE", "CURRIER", "CURRY",
+ "CURTIN", "CURTIS", "CUSHMAN", "CUSTER", "CUTLER", "CYR", "DABNEY", "DAHL", "DAIGLE", "DAILEY", "DAILY",
+ "DALE", "DALEY", "DALLAS", "DALTON", "DALY", "DAMICO", "DAMON", "DAMRON", "DANCY", "DANG", "DANGELO",
+ "DANIEL", "DANIELS", "DANIELSON", "DANNER", "DARBY", "DARDEN", "DARLING", "DARNELL", "DASILVA",
+ "DAUGHERTY", "DAUGHTRY", "DAVENPORT", "DAVID", "DAVIDSON", "DAVIES", "DAVILA", "DAVIS", "DAVISON",
+ "DAWKINS", "DAWSON", "DAY", "DAYTON", "DEAL", "DEAN", "DEATON", "DEBERRY", "DECKER", "DEES", "DEHART",
+ "DEJESUS", "DELACRUZ", "DELAGARZA", "DELANEY", "DELAROSA", "DELATORRE", "DELEON", "DELGADILLO",
+ "DELGADO", "DELL", "DELLINGER", "DELOACH", "DELONG", "DELOSSANTOS", "DELUCA", "DELVALLE", "DEMARCO",
+ "DEMERS", "DEMPSEY", "DENHAM", "DENNEY", "DENNING", "DENNIS", "DENNISON", "DENNY", "DENSON", "DENT",
+ "DENTON", "DEROSA", "DERR", "DERRICK", "DESANTIS", "DESIMONE", "DEVINE", "DEVITO", "DEVLIN", "DEVORE",
+ "DEVRIES", "DEW", "DEWEY", "DEWITT", "DEXTER", "DIAL", "DIAMOND", "DIAS", "DIAZ", "DICK", "DICKENS",
+ "DICKERSON", "DICKEY", "DICKINSON", "DICKSON", "DIEHL", "DIETRICH", "DIETZ", "DIGGS", "DILL", "DILLARD",
+ "DILLON", "DINKINS", "DION", "DIX", "DIXON", "DO", "DOAN", "DOBBINS", "DOBBS", "DOBSON", "DOCKERY",
+ "DODD", "DODDS", "DODGE", "DODSON", "DOE", "DOHERTY", "DOLAN", "DOLL", "DOLLAR", "DOMINGO", "DOMINGUEZ",
+ "DOMINQUEZ", "DONAHUE", "DONALD", "DONALDSON", "DONATO", "DONNELL", "DONNELLY", "DONOHUE", "DONOVAN",
+ "DOOLEY", "DOOLITTLE", "DORAN", "DORMAN", "DORN", "DORRIS", "DORSEY", "DORTCH", "DOSS", "DOTSON",
+ "DOTY", "DOUCETTE", "DOUGHERTY", "DOUGHTY", "DOUGLAS", "DOUGLASS", "DOVE", "DOVER", "DOW", "DOWD",
+ "DOWDY", "DOWELL", "DOWLING", "DOWNEY", "DOWNING", "DOWNS", "DOYLE", "DOZIER", "DRAKE", "DRAPER",
+ "DRAYTON", "DREW", "DRISCOLL", "DRIVER", "DRUMMOND", "DRURY", "DUARTE", "DUBE", "DUBOIS", "DUBOSE",
+ "DUCKETT", "DUCKWORTH", "DUDLEY", "DUFF", "DUFFY", "DUGAN", "DUGAS", "DUGGAN", "DUGGER", "DUKE",
+ "DUKES", "DUMAS", "DUMONT", "DUNAWAY", "DUNBAR", "DUNCAN", "DUNHAM", "DUNLAP", "DUNN", "DUNNE",
+ "DUNNING", "DUONG", "DUPONT", "DUPRE", "DUPREE", "DUPUIS", "DURAN", "DURAND", "DURANT", "DURBIN",
+ "DURDEN", "DURHAM", "DURKIN", "DURR", "DUTTON", "DUVAL", "DUVALL", "DWYER", "DYE", "DYER", "DYKES",
+ "DYSON", "EAGLE", "EARL", "EARLE", "EARLEY", "EARLS", "EARLY", "EARNEST", "EASLEY", "EASON", "EAST",
+ "EASTER", "EASTERLING", "EASTMAN", "EASTON", "EATON", "EAVES", "EBERT", "ECHEVARRIA", "ECHOLS",
+ "ECKERT", "EDDY", "EDGAR", "EDGE", "EDMOND", "EDMONDS", "EDMONDSON", "EDWARD", "EDWARDS", "EGAN",
+ "EGGLESTON", "ELAM", "ELDER", "ELDRIDGE", "ELIAS", "ELIZONDO", "ELKINS", "ELLER", "ELLINGTON", "ELLIOT",
+ "ELLIOTT", "ELLIS", "ELLISON", "ELLSWORTH", "ELMORE", "ELROD", "ELSTON", "ELY", "EMANUEL", "EMBRY",
+ "EMERSON", "EMERY", "EMMONS", "ENG", "ENGEL", "ENGLAND", "ENGLE", "ENGLISH", "ENNIS", "ENOS", "ENRIGHT",
+ "ENRIQUEZ", "EPPERSON", "EPPS", "EPSTEIN", "ERDMANN", "ERICKSON", "ERNST", "ERVIN", "ERWIN",
+ "ESCALANTE", "ESCAMILLA", "ESCOBAR", "ESCOBEDO", "ESPARZA", "ESPINAL", "ESPINO", "ESPINOSA", "ESPINOZA",
+ "ESPOSITO", "ESQUIVEL", "ESTEP", "ESTES", "ESTRADA", "ESTRELLA", "ETHERIDGE", "ETHRIDGE", "EUBANKS",
+ "EVANS", "EVERETT", "EVERHART", "EVERS", "EVERSON", "EWING", "EZELL", "FABER", "FABIAN", "FAGAN",
+ "FAHEY", "FAIN", "FAIR", "FAIRBANKS", "FAIRCHILD", "FAIRLEY", "FAISON", "FAJARDO", "FALCON", "FALK",
+ "FALLON", "FALLS", "FANNING", "FARIAS", "FARLEY", "FARMER", "FARNSWORTH", "FARR", "FARRAR", "FARRELL",
+ "FARRINGTON", "FARRIS", "FARROW", "FAULK", "FAULKNER", "FAUST", "FAY", "FEENEY", "FELDER", "FELDMAN",
+ "FELICIANO", "FELIX", "FELLOWS", "FELTON", "FELTS", "FENNELL", "FENNER", "FENTON", "FERGUSON",
+ "FERNANDES", "FERNANDEZ", "FERRARA", "FERRARI", "FERRARO", "FERREIRA", "FERRELL", "FERRER", "FERRIS",
+ "FERRY", "FIELD", "FIELDER", "FIELDS", "FIERRO", "FIFE", "FIGUEROA", "FINCH", "FINCHER", "FINDLEY",
+ "FINE", "FINK", "FINLEY", "FINN", "FINNEGAN", "FINNEY", "FIORE", "FISCHER", "FISH", "FISHER", "FISHMAN",
+ "FISK", "FITCH", "FITE", "FITTS", "FITZGERALD", "FITZPATRICK", "FITZSIMMONS", "FLAGG", "FLAHERTY",
+ "FLANAGAN", "FLANDERS", "FLANIGAN", "FLANNERY", "FLECK", "FLEMING", "FLEMMING", "FLETCHER", "FLINT",
+ "FLOOD", "FLORA", "FLORENCE", "FLORES", "FLOREZ", "FLOURNOY", "FLOWERS", "FLOYD", "FLYNN", "FOGARTY",
+ "FOGG", "FOGLE", "FOLEY", "FOLSE", "FOLSOM", "FOLTZ", "FONG", "FONSECA", "FONTAINE", "FONTENOT",
+ "FOOTE", "FORBES", "FORD", "FOREMAN", "FOREST", "FORET", "FORMAN", "FORNEY", "FORREST", "FORRESTER",
+ "FORSTER", "FORSYTH", "FORSYTHE", "FORT", "FORTE", "FORTENBERRY", "FORTIER", "FORTIN", "FORTNER",
+ "FORTUNE", "FOSS", "FOSTER", "FOUNTAIN", "FOURNIER", "FOUST", "FOWLER", "FOX", "FOY", "FRALEY", "FRAME",
+ "FRANCE", "FRANCIS", "FRANCISCO", "FRANCO", "FRANCOIS", "FRANK", "FRANKLIN", "FRANKS", "FRANTZ",
+ "FRANZ", "FRASER", "FRASIER", "FRAZER", "FRAZIER", "FREDERICK", "FREDERICKS", "FREDRICK", "FREDRICKSON",
+ "FREE", "FREED", "FREEDMAN", "FREEMAN", "FREESE", "FREITAS", "FRENCH", "FREUND", "FREY", "FRIAS",
+ "FRICK", "FRIEDMAN", "FRIEND", "FRIERSON", "FRIES", "FRITZ", "FRIZZELL", "FROST", "FRY", "FRYE",
+ "FRYER", "FUCHS", "FUENTES", "FUGATE", "FULCHER", "FULLER", "FULLERTON", "FULMER", "FULTON", "FULTZ",
+ "FUNDERBURK", "FUNK", "FUQUA", "FURMAN", "FURR", "FUSCO", "GABLE", "GABRIEL", "GADDIS", "GADDY",
+ "GAFFNEY", "GAGE", "GAGNE", "GAGNON", "GAINES", "GAINEY", "GAITHER", "GALARZA", "GALBRAITH", "GALE",
+ "GALINDO", "GALLAGHER", "GALLANT", "GALLARDO", "GALLEGOS", "GALLO", "GALLOWAY", "GALVAN", "GALVEZ",
+ "GALVIN", "GAMBLE", "GAMBOA", "GAMEZ", "GANDY", "GANN", "GANNON", "GANT", "GANTT", "GARAY", "GARBER",
+ "GARCIA", "GARDINER", "GARDNER", "GARLAND", "GARMON", "GARNER", "GARNETT", "GARRETT", "GARRIS",
+ "GARRISON", "GARVEY", "GARVIN", "GARY", "GARZA", "GASKIN", "GASKINS", "GASS", "GASTON", "GATES",
+ "GATEWOOD", "GATLIN", "GAULT", "GAUTHIER", "GAVIN", "GAY", "GAYLORD", "GEARY", "GEE", "GEER", "GEIGER",
+ "GENTILE", "GENTRY", "GEORGE", "GERALD", "GERARD", "GERBER", "GERMAN", "GETZ", "GIBBONS", "GIBBS",
+ "GIBSON", "GIFFORD", "GIL", "GILBERT", "GILBERTSON", "GILBREATH", "GILCHRIST", "GILES", "GILL",
+ "GILLEN", "GILLESPIE", "GILLETTE", "GILLEY", "GILLIAM", "GILLILAND", "GILLIS", "GILMAN", "GILMER",
+ "GILMORE", "GILSON", "GINN", "GIORDANO", "GIPSON", "GIRARD", "GIRON", "GIROUX", "GIST", "GIVENS",
+ "GLADDEN", "GLADNEY", "GLASER", "GLASGOW", "GLASS", "GLAZE", "GLEASON", "GLENN", "GLOVER", "GLYNN",
+ "GOAD", "GOBLE", "GODDARD", "GODFREY", "GODINEZ", "GODWIN", "GOEBEL", "GOETZ", "GOFF", "GOFORTH",
+ "GOINS", "GOLD", "GOLDBERG", "GOLDEN", "GOLDMAN", "GOLDSMITH", "GOLDSTEIN", "GOMES", "GOMEZ",
+ "GONSALVES", "GONZALES", "GONZALEZ", "GOOCH", "GOOD", "GOODE", "GOODEN", "GOODIN", "GOODING", "GOODMAN",
+ "GOODRICH", "GOODSON", "GOODWIN", "GOOLSBY", "GORDON", "GORE", "GORHAM", "GORMAN", "GOSS", "GOSSETT",
+ "GOUGH", "GOULD", "GOULET", "GRACE", "GRACIA", "GRADY", "GRAF", "GRAFF", "GRAGG", "GRAHAM", "GRANADOS",
+ "GRANGER", "GRANT", "GRANTHAM", "GRAVES", "GRAY", "GRAYSON", "GREATHOUSE", "GRECO", "GREEN",
+ "GREENBERG", "GREENE", "GREENFIELD", "GREENLEE", "GREENWOOD", "GREER", "GREGG", "GREGORY", "GREINER",
+ "GRENIER", "GRESHAM", "GREY", "GRICE", "GRIDER", "GRIER", "GRIFFIN", "GRIFFIS", "GRIFFITH", "GRIFFITHS",
+ "GRIGGS", "GRIGSBY", "GRIMES", "GRIMM", "GRISHAM", "GRISSOM", "GRISWOLD", "GROCE", "GROGAN", "GROOMS",
+ "GROSS", "GROSSMAN", "GROVE", "GROVER", "GROVES", "GRUBB", "GRUBBS", "GRUBER", "GUAJARDO", "GUENTHER",
+ "GUERIN", "GUERRA", "GUERRERO", "GUESS", "GUEST", "GUEVARA", "GUFFEY", "GUIDRY", "GUILLEN", "GUILLORY",
+ "GUINN", "GULLEY", "GUNDERSON", "GUNN", "GUNTER", "GUNTHER", "GURLEY", "GUSTAFSON", "GUTHRIE",
+ "GUTIERREZ", "GUY", "GUYTON", "GUZMAN", "HA", "HAAG", "HAAS", "HAASE", "HACKER", "HACKETT", "HACKNEY",
+ "HADDEN", "HADLEY", "HAGAN", "HAGEN", "HAGER", "HAGGARD", "HAGGERTY", "HAHN", "HAIGHT", "HAILEY",
+ "HAINES", "HAIR", "HAIRSTON", "HALCOMB", "HALE", "HALES", "HALEY", "HALL", "HALLER", "HALLMAN",
+ "HALSEY", "HALSTEAD", "HALVERSON", "HAM", "HAMBLIN", "HAMBY", "HAMEL", "HAMER", "HAMILTON", "HAMLIN",
+ "HAMM", "HAMMER", "HAMMETT", "HAMMOND", "HAMMONDS", "HAMMONS", "HAMPTON", "HAMRICK", "HAN", "HANCOCK",
+ "HAND", "HANDLEY", "HANDY", "HANES", "HANEY", "HANKINS", "HANKS", "HANLEY", "HANLON", "HANNA", "HANNAH",
+ "HANNAN", "HANNON", "HANSEN", "HANSON", "HARBIN", "HARDAWAY", "HARDEE", "HARDEN", "HARDER", "HARDESTY",
+ "HARDIN", "HARDING", "HARDISON", "HARDMAN", "HARDWICK", "HARDY", "HARE", "HARGIS", "HARGRAVE",
+ "HARGROVE", "HARKINS", "HARLAN", "HARLEY", "HARLOW", "HARMAN", "HARMON", "HARMS", "HARNESS", "HARP",
+ "HARPER", "HARR", "HARRELL", "HARRINGTON", "HARRIS", "HARRISON", "HARRY", "HART", "HARTER", "HARTLEY",
+ "HARTMAN", "HARTMANN", "HARTWELL", "HARVEY", "HARWELL", "HARWOOD", "HASKELL", "HASKINS", "HASS",
+ "HASSELL", "HASTINGS", "HATCH", "HATCHER", "HATCHETT", "HATFIELD", "HATHAWAY", "HATLEY", "HATTON",
+ "HAUGEN", "HAUSER", "HAVENS", "HAWES", "HAWK", "HAWKINS", "HAWKS", "HAWLEY", "HAWTHORNE", "HAY",
+ "HAYDEN", "HAYES", "HAYNES", "HAYS", "HAYWARD", "HAYWOOD", "HAZEL", "HEAD", "HEADLEY", "HEADRICK",
+ "HEALEY", "HEALY", "HEARD", "HEARN", "HEATH", "HEATON", "HEBERT", "HECK", "HECKMAN", "HEDGES",
+ "HEDRICK", "HEFFNER", "HEFLIN", "HEFNER", "HEIM", "HEIN", "HEINRICH", "HEINZ", "HELD", "HELLER", "HELM",
+ "HELMS", "HELTON", "HEMBREE", "HEMPHILL", "HENDERSON", "HENDON", "HENDRICK", "HENDRICKS", "HENDRICKSON",
+ "HENDRIX", "HENKE", "HENLEY", "HENNESSEY", "HENNING", "HENRY", "HENSLEY", "HENSON", "HER", "HERBERT",
+ "HEREDIA", "HERMAN", "HERMANN", "HERNANDEZ", "HERNDON", "HERR", "HERRERA", "HERRICK", "HERRIN",
+ "HERRING", "HERRINGTON", "HERRMANN", "HERRON", "HERSHBERGER", "HERZOG", "HESS", "HESTER", "HEWITT",
+ "HEYWARD", "HIATT", "HIBBARD", "HICKEY", "HICKMAN", "HICKS", "HICKSON", "HIDALGO", "HIGDON",
+ "HIGGINBOTHAM", "HIGGINS", "HIGGS", "HIGH", "HIGHTOWER", "HILDEBRAND", "HILDRETH", "HILL", "HILLARD",
+ "HILLER", "HILLIARD", "HILLMAN", "HILLS", "HILTON", "HIMES", "HINDMAN", "HINDS", "HINES", "HINKLE",
+ "HINOJOSA", "HINSON", "HINTON", "HIRSCH", "HITCHCOCK", "HITE", "HITT", "HO", "HOANG", "HOBBS", "HOBSON",
+ "HODGE", "HODGES", "HODGSON", "HOFF", "HOFFMAN", "HOFFMANN", "HOGAN", "HOGG", "HOGUE", "HOKE",
+ "HOLBROOK", "HOLCOMB", "HOLCOMBE", "HOLDEN", "HOLDER", "HOLGUIN", "HOLIDAY", "HOLLAND", "HOLLENBECK",
+ "HOLLEY", "HOLLIDAY", "HOLLINGSWORTH", "HOLLINS", "HOLLIS", "HOLLOMAN", "HOLLOWAY", "HOLLY", "HOLM",
+ "HOLMAN", "HOLMES", "HOLT", "HOLTON", "HOLTZ", "HOMAN", "HOMER", "HONEYCUTT", "HONG", "HOOD", "HOOK",
+ "HOOKER", "HOOKS", "HOOPER", "HOOVER", "HOPE", "HOPKINS", "HOPPE", "HOPPER", "HOPSON", "HORAN", "HORN",
+ "HORNE", "HORNER", "HORNSBY", "HOROWITZ", "HORSLEY", "HORTON", "HORVATH", "HOSKINS", "HOSTETLER",
+ "HOUCK", "HOUGH", "HOUGHTON", "HOULE", "HOUSE", "HOUSER", "HOUSTON", "HOWARD", "HOWE", "HOWELL",
+ "HOWERTON", "HOWES", "HOWLAND", "HOY", "HOYLE", "HOYT", "HSU", "HUANG", "HUBBARD", "HUBER", "HUBERT",
+ "HUDDLESTON", "HUDGENS", "HUDGINS", "HUDSON", "HUERTA", "HUEY", "HUFF", "HUFFMAN", "HUGGINS", "HUGHES",
+ "HUGHEY", "HULL", "HULSEY", "HUMES", "HUMMEL", "HUMPHREY", "HUMPHREYS", "HUMPHRIES", "HUNDLEY", "HUNT",
+ "HUNTER", "HUNTINGTON", "HUNTLEY", "HURD", "HURLEY", "HURST", "HURT", "HURTADO", "HUSKEY", "HUSSEY",
+ "HUSTON", "HUTCHENS", "HUTCHERSON", "HUTCHESON", "HUTCHINGS", "HUTCHINS", "HUTCHINSON", "HUTCHISON",
+ "HUTSON", "HUTTO", "HUTTON", "HUYNH", "HWANG", "HYATT", "HYDE", "HYLAND", "HYLTON", "HYMAN", "HYNES",
+ "IBARRA", "INGLE", "INGRAHAM", "INGRAM", "INMAN", "IRBY", "IRELAND", "IRISH", "IRIZARRY", "IRONS",
+ "IRVIN", "IRVINE", "IRVING", "IRWIN", "ISAAC", "ISAACS", "ISAACSON", "ISBELL", "ISOM", "ISON", "ISRAEL",
+ "IVERSON", "IVES", "IVEY", "IVORY", "IVY", "JACK", "JACKMAN", "JACKS", "JACKSON", "JACOB", "JACOBS",
+ "JACOBSEN", "JACOBSON", "JACOBY", "JACQUES", "JAEGER", "JAMES", "JAMESON", "JAMISON", "JANES",
+ "JANKOWSKI", "JANSEN", "JANSSEN", "JARAMILLO", "JARRELL", "JARRETT", "JARVIS", "JASPER", "JAY",
+ "JAYNES", "JEAN", "JEFFERIES", "JEFFERS", "JEFFERSON", "JEFFERY", "JEFFREY", "JEFFRIES", "JENKINS",
+ "JENNINGS", "JENSEN", "JENSON", "JERNIGAN", "JESSUP", "JETER", "JETT", "JEWELL", "JEWETT", "JIMENEZ",
+ "JOBE", "JOE", "JOHANSEN", "JOHN", "JOHNS", "JOHNSON", "JOHNSTON", "JOINER", "JOLLEY", "JOLLY", "JONES",
+ "JORDAN", "JORDON", "JORGENSEN", "JORGENSON", "JOSE", "JOSEPH", "JOY", "JOYCE", "JOYNER", "JUAREZ",
+ "JUDD", "JUDE", "JUDGE", "JUDKINS", "JULIAN", "JUNG", "JUSTICE", "JUSTUS", "KAHN", "KAISER", "KAMINSKI",
+ "KANE", "KANG", "KAPLAN", "KARR", "KASPER", "KATZ", "KAUFFMAN", "KAUFMAN", "KAY", "KAYE", "KEANE",
+ "KEARNEY", "KEARNS", "KEATING", "KEATON", "KECK", "KEE", "KEEFE", "KEEFER", "KEEGAN", "KEEL", "KEELER",
+ "KEELING", "KEEN", "KEENAN", "KEENE", "KEENER", "KEENEY", "KEETON", "KEITH", "KELLEHER", "KELLER",
+ "KELLEY", "KELLOGG", "KELLUM", "KELLY", "KELSEY", "KELSO", "KEMP", "KEMPER", "KENDALL", "KENDRICK",
+ "KENNEDY", "KENNEY", "KENNY", "KENT", "KENYON", "KERN", "KERNS", "KERR", "KESSLER", "KETCHUM", "KEY",
+ "KEYES", "KEYS", "KEYSER", "KHAN", "KIDD", "KIDWELL", "KIEFER", "KILGORE", "KILLIAN", "KILPATRICK",
+ "KIM", "KIMBALL", "KIMBLE", "KIMBRELL", "KIMBROUGH", "KIMMEL", "KINARD", "KINCAID", "KINDER", "KING",
+ "KINGSLEY", "KINNEY", "KINSEY", "KIRBY", "KIRCHNER", "KIRK", "KIRKLAND", "KIRKPATRICK", "KIRKWOOD",
+ "KISER", "KISH", "KITCHEN", "KITCHENS", "KLEIN", "KLINE", "KLINGER", "KNAPP", "KNIGHT", "KNOLL",
+ "KNOTT", "KNOTTS", "KNOWLES", "KNOWLTON", "KNOX", "KNUDSEN", "KNUDSON", "KNUTSON", "KOCH", "KOEHLER",
+ "KOENIG", "KOHL", "KOHLER", "KOHN", "KOLB", "KONG", "KOONCE", "KOONTZ", "KOPP", "KOVACH", "KOWALSKI",
+ "KOZAK", "KOZLOWSKI", "KRAFT", "KRAMER", "KRAUS", "KRAUSE", "KRAUSS", "KREBS", "KRIEGER", "KROLL",
+ "KRUEGER", "KRUG", "KRUGER", "KRUSE", "KUHN", "KUNKEL", "KUNTZ", "KUNZ", "KURTZ", "KUYKENDALL", "KYLE",
+ "LABBE", "LABELLE", "LACEY", "LACHANCE", "LACKEY", "LACROIX", "LACY", "LADD", "LADNER", "LAFFERTY",
+ "LAFLAMME", "LAFLEUR", "LAI", "LAIRD", "LAKE", "LAM", "LAMAR", "LAMB", "LAMBERT", "LAMM", "LANCASTER",
+ "LANCE", "LAND", "LANDERS", "LANDIS", "LANDON", "LANDRUM", "LANDRY", "LANE", "LANEY", "LANG", "LANGDON",
+ "LANGE", "LANGER", "LANGFORD", "LANGLEY", "LANGLOIS", "LANGSTON", "LANHAM", "LANIER", "LANKFORD",
+ "LANNING", "LANTZ", "LAPLANTE", "LAPOINTE", "LAPORTE", "LARA", "LARGE", "LARKIN", "LAROCHE", "LAROSE",
+ "LARRY", "LARSEN", "LARSON", "LARUE", "LASH", "LASHLEY", "LASSITER", "LASTER", "LATHAM", "LATIMER",
+ "LATTIMORE", "LAU", "LAUER", "LAUGHLIN", "LAVENDER", "LAVIGNE", "LAVOIE", "LAW", "LAWHORN", "LAWLER",
+ "LAWLESS", "LAWRENCE", "LAWS", "LAWSON", "LAWTON", "LAY", "LAYMAN", "LAYNE", "LAYTON", "LE", "LEA",
+ "LEACH", "LEAHY", "LEAK", "LEAKE", "LEAL", "LEAR", "LEARY", "LEAVITT", "LEBLANC", "LEBRON", "LECLAIR",
+ "LEDBETTER", "LEDESMA", "LEDFORD", "LEDOUX", "LEE", "LEEPER", "LEES", "LEFEBVRE", "LEGER", "LEGG",
+ "LEGGETT", "LEHMAN", "LEHMANN", "LEIGH", "LEIGHTON", "LEMASTER", "LEMAY", "LEMIEUX", "LEMKE", "LEMMON",
+ "LEMON", "LEMONS", "LEMUS", "LENNON", "LENTZ", "LENZ", "LEON", "LEONARD", "LEONE", "LERMA", "LERNER",
+ "LEROY", "LESLIE", "LESSARD", "LESTER", "LEUNG", "LEVESQUE", "LEVI", "LEVIN", "LEVINE", "LEVY", "LEW",
+ "LEWANDOWSKI", "LEWIS", "LEYVA", "LI", "LIBBY", "LIDDELL", "LIEBERMAN", "LIGHT", "LIGHTFOOT",
+ "LIGHTNER", "LIGON", "LILES", "LILLEY", "LILLY", "LIM", "LIMA", "LIMON", "LIN", "LINARES", "LINCOLN",
+ "LIND", "LINDBERG", "LINDER", "LINDGREN", "LINDLEY", "LINDQUIST", "LINDSAY", "LINDSEY", "LINDSTROM",
+ "LINK", "LINKOUS", "LINN", "LINTON", "LINVILLE", "LIPSCOMB", "LIRA", "LISTER", "LITTLE", "LITTLEFIELD",
+ "LITTLEJOHN", "LITTLETON", "LIU", "LIVELY", "LIVINGSTON", "LLOYD", "LO", "LOCKE", "LOCKETT", "LOCKHART",
+ "LOCKLEAR", "LOCKWOOD", "LOERA", "LOFTIN", "LOFTIS", "LOFTON", "LOGAN", "LOGSDON", "LOGUE", "LOMAX",
+ "LOMBARD", "LOMBARDI", "LOMBARDO", "LONDON", "LONG", "LONGO", "LONGORIA", "LOOMIS", "LOONEY", "LOPER",
+ "LOPES", "LOPEZ", "LORD", "LORENZ", "LORENZO", "LOTT", "LOUIS", "LOVE", "LOVEJOY", "LOVELACE",
+ "LOVELESS", "LOVELL", "LOVETT", "LOVING", "LOW", "LOWE", "LOWELL", "LOWERY", "LOWMAN", "LOWRY", "LOY",
+ "LOYA", "LOYD", "LOZANO", "LU", "LUCAS", "LUCE", "LUCERO", "LUCIANO", "LUCKETT", "LUDWIG", "LUGO",
+ "LUIS", "LUJAN", "LUKE", "LUMPKIN", "LUNA", "LUND", "LUNDBERG", "LUNDY", "LUNSFORD", "LUONG", "LUSK",
+ "LUSTER", "LUTHER", "LUTTRELL", "LUTZ", "LY", "LYLE", "LYLES", "LYMAN", "LYNCH", "LYNN", "LYON",
+ "LYONS", "LYTLE", "MA", "MAAS", "MABE", "MABRY", "MACDONALD", "MACE", "MACHADO", "MACIAS", "MACK",
+ "MACKAY", "MACKENZIE", "MACKEY", "MACKIE", "MACKLIN", "MACLEAN", "MACLEOD", "MACON", "MADDEN", "MADDOX",
+ "MADERA", "MADISON", "MADRID", "MADRIGAL", "MADSEN", "MAES", "MAESTAS", "MAGANA", "MAGEE", "MAGGARD",
+ "MAGNUSON", "MAGUIRE", "MAHAFFEY", "MAHAN", "MAHER", "MAHON", "MAHONEY", "MAIER", "MAIN", "MAJOR",
+ "MAJORS", "MAKI", "MALCOLM", "MALDONADO", "MALLEY", "MALLORY", "MALLOY", "MALONE", "MALONEY", "MANCINI",
+ "MANCUSO", "MANESS", "MANGUM", "MANLEY", "MANN", "MANNING", "MANNS", "MANSFIELD", "MANSON", "MANUEL",
+ "MANZO", "MAPLE", "MAPLES", "MARBLE", "MARCH", "MARCHAND", "MARCOTTE", "MARCUM", "MARCUS", "MARES",
+ "MARIN", "MARINO", "MARION", "MARK", "MARKHAM", "MARKLEY", "MARKS", "MARLER", "MARLOW", "MARLOWE",
+ "MARQUEZ", "MARQUIS", "MARR", "MARRERO", "MARROQUIN", "MARSH", "MARSHALL", "MARTEL", "MARTELL",
+ "MARTENS", "MARTIN", "MARTINDALE", "MARTINEZ", "MARTINO", "MARTINS", "MARTINSON", "MARTZ", "MARVIN",
+ "MARX", "MASON", "MASSEY", "MASSIE", "MAST", "MASTERS", "MASTERSON", "MATA", "MATHENY", "MATHESON",
+ "MATHEWS", "MATHIAS", "MATHIS", "MATLOCK", "MATNEY", "MATOS", "MATSON", "MATTESON", "MATTHEW",
+ "MATTHEWS", "MATTINGLY", "MATTISON", "MATTOS", "MATTOX", "MATTSON", "MAULDIN", "MAUPIN", "MAURER",
+ "MAURO", "MAXEY", "MAXFIELD", "MAXWELL", "MAY", "MAYBERRY", "MAYER", "MAYERS", "MAYES", "MAYFIELD",
+ "MAYHEW", "MAYNARD", "MAYO", "MAYS", "MAZZA", "MCADAMS", "MCAFEE", "MCALISTER", "MCALLISTER",
+ "MCARTHUR", "MCBEE", "MCBRIDE", "MCCABE", "MCCAFFREY", "MCCAIN", "MCCALL", "MCCALLISTER", "MCCALLUM",
+ "MCCANN", "MCCANTS", "MCCARTER", "MCCARTHY", "MCCARTNEY", "MCCARTY", "MCCASKILL", "MCCAULEY", "MCCLAIN",
+ "MCCLANAHAN", "MCCLARY", "MCCLEARY", "MCCLELLAN", "MCCLELLAND", "MCCLENDON", "MCCLINTOCK", "MCCLINTON",
+ "MCCLOSKEY", "MCCLOUD", "MCCLUNG", "MCCLURE", "MCCOLLUM", "MCCOMBS", "MCCONNELL", "MCCOOL", "MCCORD",
+ "MCCORKLE", "MCCORMACK", "MCCORMICK", "MCCOY", "MCCRACKEN", "MCCRARY", "MCCRAY", "MCCREARY", "MCCUE",
+ "MCCULLOCH", "MCCULLOUGH", "MCCUNE", "MCCURDY", "MCCURRY", "MCCUTCHEON", "MCDADE", "MCDANIEL",
+ "MCDANIELS", "MCDERMOTT", "MCDONALD", "MCDONNELL", "MCDONOUGH", "MCDOUGAL", "MCDOUGALL", "MCDOWELL",
+ "MCDUFFIE", "MCELROY", "MCEWEN", "MCFADDEN", "MCFALL", "MCFARLAND", "MCFARLANE", "MCGEE", "MCGEHEE",
+ "MCGHEE", "MCGILL", "MCGINNIS", "MCGOVERN", "MCGOWAN", "MCGRATH", "MCGRAW", "MCGREGOR", "MCGREW",
+ "MCGRIFF", "MCGUIRE", "MCHENRY", "MCHUGH", "MCINNIS", "MCINTIRE", "MCINTOSH", "MCINTYRE", "MCKAY",
+ "MCKEE", "MCKEEVER", "MCKENNA", "MCKENNEY", "MCKENZIE", "MCKEON", "MCKEOWN", "MCKINLEY", "MCKINNEY",
+ "MCKINNON", "MCKNIGHT", "MCLAIN", "MCLAUGHLIN", "MCLAURIN", "MCLEAN", "MCLEMORE", "MCLENDON", "MCLEOD",
+ "MCMAHAN", "MCMAHON", "MCMANUS", "MCMASTER", "MCMILLAN", "MCMILLEN", "MCMILLIAN", "MCMULLEN",
+ "MCMURRAY", "MCNABB", "MCNAIR", "MCNALLY", "MCNAMARA", "MCNEAL", "MCNEELY", "MCNEIL", "MCNEILL",
+ "MCNULTY", "MCNUTT", "MCPHERSON", "MCQUEEN", "MCRAE", "MCREYNOLDS", "MCSWAIN", "MCVAY", "MCVEY",
+ "MCWHORTER", "MCWILLIAMS", "MEACHAM", "MEAD", "MEADE", "MEADOR", "MEADOWS", "MEANS", "MEARS",
+ "MEDEIROS", "MEDINA", "MEDLEY", "MEDLIN", "MEDLOCK", "MEDRANO", "MEEHAN", "MEEK", "MEEKER", "MEEKS",
+ "MEIER", "MEJIA", "MELANCON", "MELENDEZ", "MELLO", "MELTON", "MELVIN", "MENA", "MENARD", "MENDENHALL",
+ "MENDEZ", "MENDOZA", "MENENDEZ", "MERCADO", "MERCER", "MERCHANT", "MERCIER", "MEREDITH", "MERRELL",
+ "MERRICK", "MERRILL", "MERRIMAN", "MERRITT", "MESA", "MESSENGER", "MESSER", "MESSINA", "METCALF",
+ "METZ", "METZGER", "METZLER", "MEYER", "MEYERS", "MEZA", "MICHAEL", "MICHAELS", "MICHAUD", "MICHEL",
+ "MICKENS", "MIDDLETON", "MILAM", "MILBURN", "MILES", "MILLARD", "MILLER", "MILLIGAN", "MILLIKEN",
+ "MILLS", "MILNE", "MILNER", "MILTON", "MIMS", "MINER", "MINNICK", "MINOR", "MINTER", "MINTON", "MINTZ",
+ "MIRANDA", "MIRELES", "MITCHELL", "MIXON", "MIZE", "MOBLEY", "MOCK", "MOE", "MOELLER", "MOEN",
+ "MOFFETT", "MOFFITT", "MOHR", "MOJICA", "MOLINA", "MOLL", "MONACO", "MONAGHAN", "MONAHAN", "MONEY",
+ "MONIZ", "MONK", "MONROE", "MONSON", "MONTAGUE", "MONTALVO", "MONTANEZ", "MONTANO", "MONTEMAYOR",
+ "MONTERO", "MONTES", "MONTEZ", "MONTGOMERY", "MONTOYA", "MOODY", "MOON", "MOONEY", "MOORE", "MOORMAN",
+ "MORA", "MORALES", "MORAN", "MOREAU", "MOREHEAD", "MORELAND", "MORENO", "MOREY", "MORGAN", "MORIARTY",
+ "MORIN", "MORLEY", "MORRELL", "MORRILL", "MORRIS", "MORRISON", "MORRISSEY", "MORROW", "MORSE",
+ "MORTENSEN", "MORTON", "MOSBY", "MOSELEY", "MOSER", "MOSES", "MOSHER", "MOSIER", "MOSLEY", "MOSS",
+ "MOTLEY", "MOTT", "MOULTON", "MOULTRIE", "MOUNT", "MOWERY", "MOYA", "MOYE", "MOYER", "MUELLER",
+ "MUHAMMAD", "MUIR", "MULKEY", "MULL", "MULLEN", "MULLER", "MULLIGAN", "MULLIN", "MULLINS", "MULLIS",
+ "MUNCY", "MUNDY", "MUNIZ", "MUNN", "MUNOZ", "MUNSON", "MURDOCK", "MURILLO", "MURPHY", "MURRAY",
+ "MURRELL", "MURRY", "MUSE", "MUSGROVE", "MUSSER", "MYERS", "MYLES", "MYRICK", "NABORS", "NADEAU",
+ "NAGEL", "NAGLE", "NAGY", "NAJERA", "NAKAMURA", "NALL", "NANCE", "NAPIER", "NAQUIN", "NARANJO",
+ "NARVAEZ", "NASH", "NATHAN", "NATION", "NAVA", "NAVARRETE", "NAVARRO", "NAYLOR", "NEAL", "NEALY",
+ "NEEDHAM", "NEEL", "NEELEY", "NEELY", "NEFF", "NEGRETE", "NEGRON", "NEIL", "NEILL", "NELMS", "NELSON",
+ "NESBITT", "NESMITH", "NESS", "NESTOR", "NETTLES", "NEUMAN", "NEUMANN", "NEVAREZ", "NEVILLE", "NEW",
+ "NEWBERRY", "NEWBY", "NEWCOMB", "NEWELL", "NEWKIRK", "NEWMAN", "NEWSOM", "NEWSOME", "NEWTON", "NG",
+ "NGO", "NGUYEN", "NICHOLAS", "NICHOLS", "NICHOLSON", "NICKEL", "NICKERSON", "NIELSEN", "NIELSON",
+ "NIETO", "NIEVES", "NILES", "NIX", "NIXON", "NOBLE", "NOBLES", "NOE", "NOEL", "NOLAN", "NOLAND",
+ "NOLEN", "NOLL", "NOONAN", "NORFLEET", "NORIEGA", "NORMAN", "NORRIS", "NORTH", "NORTON", "NORWOOD",
+ "NOVAK", "NOVOTNY", "NOWAK", "NOWLIN", "NOYES", "NUGENT", "NULL", "NUMBERS", "NUNES", "NUNEZ", "NUNLEY",
+ "NUNN", "NUTT", "NUTTER", "NYE", "OAKES", "OAKLEY", "OAKS", "OATES", "OBRIEN", "OBRYAN", "OCAMPO",
+ "OCASIO", "OCHOA", "OCHS", "OCONNELL", "OCONNER", "OCONNOR", "ODELL", "ODEN", "ODOM", "ODONNELL",
+ "ODUM", "OGDEN", "OGLE", "OGLESBY", "OH", "OHARA", "OJEDA", "OKEEFE", "OLDHAM", "OLDS", "OLEARY",
+ "OLIPHANT", "OLIVA", "OLIVARES", "OLIVAREZ", "OLIVAS", "OLIVE", "OLIVEIRA", "OLIVER", "OLIVO",
+ "OLMSTEAD", "OLSEN", "OLSON", "OLVERA", "OMALLEY", "ONEAL", "ONEIL", "ONEILL", "ONTIVEROS", "ORDONEZ",
+ "OREILLY", "ORELLANA", "ORLANDO", "ORNELAS", "OROSCO", "OROURKE", "OROZCO", "ORR", "ORTA", "ORTEGA",
+ "ORTIZ", "OSBORN", "OSBORNE", "OSBURN", "OSGOOD", "OSHEA", "OSORIO", "OSTEEN", "OSTRANDER", "OSULLIVAN",
+ "OSWALD", "OSWALT", "OTERO", "OTIS", "OTOOLE", "OTT", "OTTO", "OUELLETTE", "OUTLAW", "OVERBY",
+ "OVERSTREET", "OVERTON", "OWEN", "OWENS", "PACE", "PACHECO", "PACK", "PACKARD", "PACKER", "PADGETT",
+ "PADILLA", "PAGAN", "PAGE", "PAIGE", "PAINE", "PAINTER", "PAK", "PALACIOS", "PALMA", "PALMER",
+ "PALUMBO", "PANNELL", "PANTOJA", "PAPE", "PAPPAS", "PAQUETTE", "PARADIS", "PARDO", "PAREDES", "PARENT",
+ "PARHAM", "PARIS", "PARISH", "PARK", "PARKER", "PARKINSON", "PARKS", "PARNELL", "PARR", "PARRA",
+ "PARRIS", "PARRISH", "PARROTT", "PARRY", "PARSON", "PARSONS", "PARTIN", "PARTRIDGE", "PASSMORE", "PATE",
+ "PATEL", "PATERSON", "PATINO", "PATRICK", "PATTEN", "PATTERSON", "PATTON", "PAUL", "PAULEY", "PAULSEN",
+ "PAULSON", "PAXTON", "PAYNE", "PAYTON", "PAZ", "PEACE", "PEACHEY", "PEACOCK", "PEAK", "PEARCE",
+ "PEARSON", "PEASE", "PECK", "PEDERSEN", "PEDERSON", "PEEBLES", "PEEK", "PEEL", "PEELER", "PEEPLES",
+ "PELLETIER", "PELTIER", "PEMBERTON", "PENA", "PENCE", "PENDER", "PENDERGRASS", "PENDLETON", "PENN",
+ "PENNELL", "PENNINGTON", "PENNY", "PEOPLES", "PEPPER", "PERALES", "PERALTA", "PERDUE", "PEREA",
+ "PEREIRA", "PEREZ", "PERKINS", "PERREAULT", "PERRIN", "PERRON", "PERRY", "PERRYMAN", "PERSON", "PETER",
+ "PETERMAN", "PETERS", "PETERSEN", "PETERSON", "PETIT", "PETRIE", "PETTIGREW", "PETTIS", "PETTIT",
+ "PETTWAY", "PETTY", "PEYTON", "PFEIFER", "PFEIFFER", "PHAM", "PHAN", "PHELAN", "PHELPS", "PHIFER",
+ "PHILLIPS", "PHIPPS", "PICARD", "PICKARD", "PICKENS", "PICKERING", "PICKETT", "PIERCE", "PIERRE",
+ "PIERSON", "PIKE", "PILCHER", "PIMENTEL", "PINA", "PINCKNEY", "PINEDA", "PINKERTON", "PINKSTON", "PINO",
+ "PINSON", "PINTO", "PIPER", "PIPKIN", "PIPPIN", "PITMAN", "PITRE", "PITT", "PITTMAN", "PITTS", "PLACE",
+ "PLANTE", "PLATT", "PLEASANT", "PLUMMER", "PLUNKETT", "POE", "POGUE", "POINDEXTER", "POINTER",
+ "POIRIER", "POLANCO", "POLAND", "POLING", "POLK", "POLLACK", "POLLARD", "POLLOCK", "POMEROY", "PONCE",
+ "POND", "PONDER", "POOL", "POOLE", "POORE", "POPE", "POPP", "PORTER", "PORTERFIELD", "PORTILLO",
+ "POSEY", "POST", "POSTON", "POTTER", "POTTS", "POULIN", "POUNDS", "POWELL", "POWER", "POWERS", "PRADO",
+ "PRATER", "PRATHER", "PRATT", "PRENTICE", "PRESCOTT", "PRESLEY", "PRESSLEY", "PRESTON", "PREWITT",
+ "PRICE", "PRICHARD", "PRIDE", "PRIDGEN", "PRIEST", "PRIETO", "PRINCE", "PRINGLE", "PRITCHARD",
+ "PRITCHETT", "PROCTOR", "PROFFITT", "PROSSER", "PROVOST", "PRUETT", "PRUITT", "PRYOR", "PUCKETT",
+ "PUENTE", "PUGH", "PULIDO", "PULLEN", "PULLEY", "PULLIAM", "PURCELL", "PURDY", "PURNELL", "PURVIS",
+ "PUTMAN", "PUTNAM", "PYLE", "QUALLS", "QUARLES", "QUEEN", "QUEZADA", "QUICK", "QUIGLEY", "QUILLEN",
+ "QUINLAN", "QUINN", "QUINONES", "QUINONEZ", "QUINTANA", "QUINTANILLA", "QUINTERO", "QUIROZ", "RADER",
+ "RADFORD", "RAFFERTY", "RAGAN", "RAGLAND", "RAGSDALE", "RAINES", "RAINEY", "RAINS", "RALEY", "RALPH",
+ "RALSTON", "RAMEY", "RAMIREZ", "RAMON", "RAMOS", "RAMSAY", "RAMSEY", "RAND", "RANDALL", "RANDLE",
+ "RANDOLPH", "RANEY", "RANGEL", "RANKIN", "RANSOM", "RAPP", "RASH", "RASMUSSEN", "RATCLIFF", "RATLIFF",
+ "RAU", "RAUCH", "RAWLINGS", "RAWLINS", "RAWLS", "RAY", "RAYBURN", "RAYFORD", "RAYMOND", "RAYNOR",
+ "RAZO", "REA", "READ", "REAGAN", "REARDON", "REAVES", "RECTOR", "REDD", "REDDEN", "REDDICK", "REDDING",
+ "REDDY", "REDMAN", "REDMON", "REDMOND", "REECE", "REED", "REEDER", "REEDY", "REES", "REESE", "REEVES",
+ "REGALADO", "REGAN", "REGISTER", "REICH", "REICHERT", "REID", "REILLY", "REINHARDT", "REINHART", "REIS",
+ "REITER", "RENDON", "RENFRO", "RENNER", "RENO", "RENTERIA", "REUTER", "REY", "REYES", "REYNA",
+ "REYNOLDS", "REYNOSO", "RHEA", "RHOADES", "RHOADS", "RHODEN", "RHODES", "RICCI", "RICE", "RICH",
+ "RICHARD", "RICHARDS", "RICHARDSON", "RICHEY", "RICHIE", "RICHMOND", "RICHTER", "RICKARD", "RICKER",
+ "RICKETTS", "RICKMAN", "RICKS", "RICO", "RIDDELL", "RIDDICK", "RIDDLE", "RIDENOUR", "RIDER", "RIDGEWAY",
+ "RIDLEY", "RIFE", "RIGBY", "RIGGINS", "RIGGS", "RIGSBY", "RILEY", "RINALDI", "RINEHART", "RING", "RIOS",
+ "RIPLEY", "RITCHEY", "RITCHIE", "RITTER", "RIVAS", "RIVERA", "RIVERS", "RIZZO", "ROACH", "ROARK",
+ "ROBB", "ROBBINS", "ROBERGE", "ROBERSON", "ROBERT", "ROBERTS", "ROBERTSON", "ROBEY", "ROBINETTE",
+ "ROBINS", "ROBINSON", "ROBISON", "ROBLES", "ROBSON", "ROBY", "ROCHA", "ROCHE", "ROCK", "ROCKWELL",
+ "RODEN", "RODERICK", "RODGERS", "RODRIGUE", "RODRIGUES", "RODRIGUEZ", "RODRIQUEZ", "ROE", "ROGER",
+ "ROGERS", "ROHR", "ROJAS", "ROLAND", "ROLDAN", "ROLLER", "ROLLINS", "ROMAN", "ROMANO", "ROMEO",
+ "ROMERO", "ROMO", "RONEY", "ROONEY", "ROOT", "ROPER", "ROQUE", "ROSA", "ROSADO", "ROSALES", "ROSARIO",
+ "ROSAS", "ROSE", "ROSEN", "ROSENBAUM", "ROSENBERG", "ROSENTHAL", "ROSS", "ROSSER", "ROSSI", "ROTH",
+ "ROUNDS", "ROUNDTREE", "ROUNTREE", "ROUSE", "ROUSH", "ROUSSEAU", "ROUSSEL", "ROWAN", "ROWE", "ROWELL",
+ "ROWLAND", "ROWLEY", "ROY", "ROYAL", "ROYBAL", "ROYER", "ROYSTER", "RUBIN", "RUBIO", "RUBY", "RUCKER",
+ "RUDD", "RUDOLPH", "RUFF", "RUFFIN", "RUIZ", "RUNYAN", "RUNYON", "RUPERT", "RUPP", "RUSH", "RUSHING",
+ "RUSS", "RUSSELL", "RUSSO", "RUST", "RUTH", "RUTHERFORD", "RUTLEDGE", "RYAN", "RYDER", "SAAVEDRA",
+ "SABO", "SACCO", "SADLER", "SAENZ", "SAGE", "SAGER", "SALAS", "SALAZAR", "SALCEDO", "SALCIDO",
+ "SALDANA", "SALDIVAR", "SALERNO", "SALES", "SALGADO", "SALINAS", "SALISBURY", "SALLEE", "SALLEY",
+ "SALMON", "SALTER", "SAM", "SAMMONS", "SAMPLE", "SAMPLES", "SAMPSON", "SAMS", "SAMSON", "SAMUEL",
+ "SAMUELS", "SANBORN", "SANCHES", "SANCHEZ", "SANDBERG", "SANDER", "SANDERS", "SANDERSON", "SANDLIN",
+ "SANDOVAL", "SANDS", "SANFORD", "SANTANA", "SANTIAGO", "SANTOS", "SAPP", "SARGENT", "SASSER",
+ "SATTERFIELD", "SAUCEDO", "SAUCIER", "SAUER", "SAULS", "SAUNDERS", "SAVAGE", "SAVOY", "SAWYER",
+ "SAWYERS", "SAXON", "SAXTON", "SAYERS", "SAYLOR", "SAYRE", "SCALES", "SCANLON", "SCARBOROUGH",
+ "SCARBROUGH", "SCHAEFER", "SCHAEFFER", "SCHAFER", "SCHAFFER", "SCHELL", "SCHERER", "SCHILLER",
+ "SCHILLING", "SCHINDLER", "SCHMID", "SCHMIDT", "SCHMITT", "SCHMITZ", "SCHNEIDER", "SCHOFIELD", "SCHOLL",
+ "SCHOONOVER", "SCHOTT", "SCHRADER", "SCHREIBER", "SCHREINER", "SCHROEDER", "SCHUBERT", "SCHULER",
+ "SCHULTE", "SCHULTZ", "SCHULZ", "SCHULZE", "SCHUMACHER", "SCHUSTER", "SCHWAB", "SCHWARTZ", "SCHWARZ",
+ "SCHWEITZER", "SCOGGINS", "SCOTT", "SCRIBNER", "SCROGGINS", "SCRUGGS", "SCULLY", "SEAL", "SEALS",
+ "SEAMAN", "SEARCY", "SEARS", "SEATON", "SEAY", "SEE", "SEELEY", "SEGURA", "SEIBERT", "SEIDEL",
+ "SEIFERT", "SEILER", "SEITZ", "SELBY", "SELF", "SELL", "SELLERS", "SELLS", "SENA", "SEPULVEDA", "SERNA",
+ "SERRANO", "SESSIONS", "SETTLE", "SETTLES", "SEVERSON", "SEWARD", "SEWELL", "SEXTON", "SEYMORE",
+ "SEYMOUR", "SHACKELFORD", "SHADE", "SHAFER", "SHAFFER", "SHAH", "SHANK", "SHANKS", "SHANNON", "SHAPIRO",
+ "SHARKEY", "SHARP", "SHARPE", "SHAVER", "SHAW", "SHAY", "SHEA", "SHEARER", "SHEEHAN", "SHEETS",
+ "SHEFFIELD", "SHELBY", "SHELDON", "SHELL", "SHELLEY", "SHELLY", "SHELTON", "SHEPARD", "SHEPHARD",
+ "SHEPHERD", "SHEPPARD", "SHERIDAN", "SHERMAN", "SHERRILL", "SHERROD", "SHERRY", "SHERWOOD", "SHIELDS",
+ "SHIFFLETT", "SHIN", "SHINN", "SHIPLEY", "SHIPMAN", "SHIPP", "SHIRLEY", "SHIVELY", "SHIVERS",
+ "SHOCKLEY", "SHOEMAKER", "SHOOK", "SHORE", "SHORES", "SHORT", "SHORTER", "SHRADER", "SHULER", "SHULL",
+ "SHULTZ", "SHUMAKER", "SHUMAN", "SHUMATE", "SIBLEY", "SIDES", "SIEGEL", "SIERRA", "SIGLER", "SIKES",
+ "SILER", "SILLS", "SILVA", "SILVER", "SILVERMAN", "SILVERS", "SILVIA", "SIMMONS", "SIMMS", "SIMON",
+ "SIMONE", "SIMONS", "SIMONSON", "SIMPKINS", "SIMPSON", "SIMS", "SINCLAIR", "SINGER", "SINGH",
+ "SINGLETARY", "SINGLETON", "SIPES", "SISCO", "SISK", "SISSON", "SIZEMORE", "SKAGGS", "SKELTON",
+ "SKIDMORE", "SKINNER", "SKIPPER", "SLACK", "SLADE", "SLAGLE", "SLATER", "SLATON", "SLATTERY",
+ "SLAUGHTER", "SLAYTON", "SLEDGE", "SLOAN", "SLOCUM", "SLONE", "SMALL", "SMALLEY", "SMALLS", "SMALLWOOD",
+ "SMART", "SMILEY", "SMITH", "SMITHSON", "SMOOT", "SMOTHERS", "SMYTH", "SNEAD", "SNEED", "SNELL",
+ "SNIDER", "SNIPES", "SNODGRASS", "SNOW", "SNOWDEN", "SNYDER", "SOARES", "SOLANO", "SOLIS", "SOLIZ",
+ "SOLOMON", "SOMERS", "SOMERVILLE", "SOMMER", "SOMMERS", "SONG", "SORENSEN", "SORENSON", "SORIA",
+ "SORIANO", "SORRELL", "SOSA", "SOTELO", "SOTO", "SOUSA", "SOUTH", "SOUTHARD", "SOUTHERLAND", "SOUTHERN",
+ "SOUZA", "SOWELL", "SOWERS", "SPAIN", "SPALDING", "SPANGLER", "SPANN", "SPARKMAN", "SPARKS", "SPARROW",
+ "SPAULDING", "SPEAR", "SPEARMAN", "SPEARS", "SPEED", "SPEER", "SPEIGHT", "SPELLMAN", "SPENCE",
+ "SPENCER", "SPERRY", "SPICER", "SPILLMAN", "SPINKS", "SPIVEY", "SPOONER", "SPRADLIN", "SPRAGUE",
+ "SPRIGGS", "SPRING", "SPRINGER", "SPROUSE", "SPRUILL", "SPURGEON", "SPURLOCK", "SQUIRES", "STACEY",
+ "STACK", "STACKHOUSE", "STACY", "STAFFORD", "STAGGS", "STAHL", "STALEY", "STALLINGS", "STALLWORTH",
+ "STAMM", "STAMPER", "STAMPS", "STANFIELD", "STANFORD", "STANLEY", "STANTON", "STAPLES", "STAPLETON",
+ "STARK", "STARKEY", "STARKS", "STARLING", "STARNES", "STARR", "STATEN", "STATON", "STAUFFER", "STCLAIR",
+ "STEADMAN", "STEARNS", "STEED", "STEEL", "STEELE", "STEEN", "STEFFEN", "STEGALL", "STEIN", "STEINBERG",
+ "STEINER", "STEPHEN", "STEPHENS", "STEPHENSON", "STEPP", "STERLING", "STERN", "STEVENS", "STEVENSON",
+ "STEWARD", "STEWART", "STIDHAM", "STILES", "STILL", "STILLMAN", "STILLWELL", "STILTNER", "STINE",
+ "STINNETT", "STINSON", "STITT", "STJOHN", "STOCK", "STOCKTON", "STODDARD", "STOKER", "STOKES", "STOLL",
+ "STONE", "STONER", "STOREY", "STORY", "STOTT", "STOUT", "STOVALL", "STOVER", "STOWE", "STPIERRE",
+ "STRAIN", "STRAND", "STRANGE", "STRATTON", "STRAUB", "STRAUSS", "STREET", "STREETER", "STRICKLAND",
+ "STRINGER", "STRONG", "STROTHER", "STROUD", "STROUP", "STRUNK", "STUART", "STUBBLEFIELD", "STUBBS",
+ "STUCKEY", "STULL", "STUMP", "STURDIVANT", "STURGEON", "STURGILL", "STURGIS", "STURM", "STYLES",
+ "SUAREZ", "SUGGS", "SULLIVAN", "SUMMERLIN", "SUMMERS", "SUMNER", "SUMPTER", "SUN", "SUTHERLAND",
+ "SUTTER", "SUTTON", "SWAFFORD", "SWAIN", "SWAN", "SWANK", "SWANN", "SWANSON", "SWARTZ", "SWEARINGEN",
+ "SWEAT", "SWEENEY", "SWEET", "SWENSON", "SWIFT", "SWISHER", "SWITZER", "SWOPE", "SYKES", "SYLVESTER",
+ "TABER", "TABOR", "TACKETT", "TAFT", "TAGGART", "TALBERT", "TALBOT", "TALBOTT", "TALLENT", "TALLEY",
+ "TAM", "TAMAYO", "TAN", "TANAKA", "TANG", "TANNER", "TAPIA", "TAPP", "TARVER", "TATE", "TATUM",
+ "TAVARES", "TAYLOR", "TEAGUE", "TEAL", "TEEL", "TEETER", "TEJADA", "TEJEDA", "TELLEZ", "TEMPLE",
+ "TEMPLETON", "TENNANT", "TENNEY", "TERRELL", "TERRILL", "TERRY", "THACKER", "THAMES", "THAO", "THARP",
+ "THATCHER", "THAYER", "THERIAULT", "THERIOT", "THIBODEAU", "THIBODEAUX", "THIEL", "THIGPEN", "THOMAS",
+ "THOMASON", "THOMPSON", "THOMSEN", "THOMSON", "THORN", "THORNBURG", "THORNE", "THORNHILL", "THORNTON",
+ "THORP", "THORPE", "THORTON", "THRASH", "THRASHER", "THURMAN", "THURSTON", "TIBBETTS", "TIBBS", "TICE",
+ "TIDWELL", "TIERNEY", "TIJERINA", "TILLER", "TILLERY", "TILLEY", "TILLMAN", "TILTON", "TIMM", "TIMMONS",
+ "TINKER", "TINSLEY", "TIPTON", "TIRADO", "TISDALE", "TITUS", "TOBIAS", "TOBIN", "TODD", "TOLBERT",
+ "TOLEDO", "TOLER", "TOLIVER", "TOLLIVER", "TOM", "TOMLIN", "TOMLINSON", "TOMPKINS", "TONEY", "TONG",
+ "TORO", "TORRENCE", "TORRES", "TORREZ", "TOTH", "TOTTEN", "TOVAR", "TOWNES", "TOWNS", "TOWNSEND",
+ "TRACY", "TRAHAN", "TRAMMELL", "TRAN", "TRAPP", "TRASK", "TRAVERS", "TRAVIS", "TRAYLOR", "TREADWAY",
+ "TREADWELL", "TREJO", "TREMBLAY", "TRENT", "TREVINO", "TRIBBLE", "TRICE", "TRIMBLE", "TRINIDAD",
+ "TRIPLETT", "TRIPP", "TROTTER", "TROUT", "TROUTMAN", "TROY", "TRUDEAU", "TRUE", "TRUITT", "TRUJILLO",
+ "TRUONG", "TUBBS", "TUCK", "TUCKER", "TUGGLE", "TURK", "TURLEY", "TURMAN", "TURNBULL", "TURNER",
+ "TURNEY", "TURPIN", "TUTTLE", "TYLER", "TYNER", "TYREE", "TYSON", "ULRICH", "UNDERHILL", "UNDERWOOD",
+ "UNGER", "UPCHURCH", "UPSHAW", "UPTON", "URBAN", "URBINA", "URIBE", "USHER", "UTLEY", "VAIL", "VALADEZ",
+ "VALDES", "VALDEZ", "VALENCIA", "VALENTI", "VALENTIN", "VALENTINE", "VALENZUELA", "VALERIO", "VALLE",
+ "VALLEJO", "VALLES", "VAN", "VANBUREN", "VANCE", "VANDIVER", "VANDYKE", "VANG", "VANHOOSE", "VANHORN",
+ "VANMETER", "VANN", "VANOVER", "VANWINKLE", "VARELA", "VARGAS", "VARNER", "VARNEY", "VASQUEZ",
+ "VAUGHAN", "VAUGHN", "VAUGHT", "VAZQUEZ", "VEAL", "VEGA", "VELA", "VELASCO", "VELASQUEZ", "VELAZQUEZ",
+ "VELEZ", "VENABLE", "VENEGAS", "VENTURA", "VERA", "VERDIN", "VERGARA", "VERNON", "VEST", "VETTER",
+ "VICK", "VICKERS", "VICKERY", "VICTOR", "VIDAL", "VIEIRA", "VIERA", "VIGIL", "VILLA", "VILLALOBOS",
+ "VILLANUEVA", "VILLAREAL", "VILLARREAL", "VILLASENOR", "VILLEGAS", "VINCENT", "VINES", "VINSON",
+ "VITALE", "VO", "VOGEL", "VOGT", "VOSS", "VU", "VUE", "WADDELL", "WADE", "WADSWORTH", "WAGGONER",
+ "WAGNER", "WAGONER", "WAHL", "WAITE", "WAKEFIELD", "WALDEN", "WALDRON", "WALDROP", "WALKER", "WALL",
+ "WALLACE", "WALLEN", "WALLER", "WALLING", "WALLIS", "WALLS", "WALSH", "WALSTON", "WALTER", "WALTERS",
+ "WALTON", "WAMPLER", "WANG", "WARD", "WARDEN", "WARE", "WARFIELD", "WARNER", "WARREN", "WASHBURN",
+ "WASHINGTON", "WASSON", "WATERMAN", "WATERS", "WATKINS", "WATSON", "WATT", "WATTERS", "WATTS", "WAUGH",
+ "WAY", "WAYNE", "WEATHERFORD", "WEATHERLY", "WEATHERS", "WEAVER", "WEBB", "WEBBER", "WEBER", "WEBSTER",
+ "WEDDLE", "WEED", "WEEKS", "WEEMS", "WEINBERG", "WEINER", "WEINSTEIN", "WEIR", "WEIS", "WEISS", "WELCH",
+ "WELDON", "WELKER", "WELLER", "WELLMAN", "WELLS", "WELSH", "WENDT", "WENGER", "WENTWORTH", "WENTZ",
+ "WENZEL", "WERNER", "WERTZ", "WESLEY", "WEST", "WESTBROOK", "WESTER", "WESTFALL", "WESTMORELAND",
+ "WESTON", "WETZEL", "WHALEN", "WHALEY", "WHARTON", "WHATLEY", "WHEAT", "WHEATLEY", "WHEATON", "WHEELER",
+ "WHELAN", "WHIPPLE", "WHITAKER", "WHITCOMB", "WHITE", "WHITED", "WHITEHEAD", "WHITEHURST", "WHITEMAN",
+ "WHITESIDE", "WHITFIELD", "WHITING", "WHITLEY", "WHITLOCK", "WHITLOW", "WHITMAN", "WHITMIRE",
+ "WHITMORE", "WHITNEY", "WHITSON", "WHITT", "WHITTAKER", "WHITTEN", "WHITTINGTON", "WHITTLE",
+ "WHITWORTH", "WHYTE", "WICK", "WICKER", "WICKHAM", "WICKS", "WIESE", "WIGGINS", "WILBANKS", "WILBER",
+ "WILBUR", "WILBURN", "WILCOX", "WILD", "WILDE", "WILDER", "WILES", "WILEY", "WILHELM", "WILHITE",
+ "WILKE", "WILKERSON", "WILKES", "WILKINS", "WILKINSON", "WILKS", "WILL", "WILLARD", "WILLETT", "WILLEY",
+ "WILLIAM", "WILLIAMS", "WILLIAMSON", "WILLIFORD", "WILLINGHAM", "WILLIS", "WILLOUGHBY", "WILLS",
+ "WILLSON", "WILMOTH", "WILSON", "WILT", "WIMBERLY", "WINCHESTER", "WINDHAM", "WINFIELD", "WINFREY",
+ "WING", "WINGATE", "WINGFIELD", "WINKLER", "WINN", "WINSLOW", "WINSTEAD", "WINSTON", "WINTER",
+ "WINTERS", "WIRTH", "WISE", "WISEMAN", "WISNIEWSKI", "WITCHER", "WITHERS", "WITHERSPOON", "WITHROW",
+ "WITT", "WITTE", "WOFFORD", "WOLF", "WOLFE", "WOLFF", "WOLFORD", "WOMACK", "WONG", "WOO", "WOOD",
+ "WOODALL", "WOODARD", "WOODBURY", "WOODCOCK", "WOODEN", "WOODLEY", "WOODRUFF", "WOODS", "WOODSON",
+ "WOODWARD", "WOODWORTH", "WOODY", "WOOLDRIDGE", "WOOLEY", "WOOTEN", "WORD", "WORDEN", "WORKMAN",
+ "WORLEY", "WORRELL", "WORSHAM", "WORTH", "WORTHAM", "WORTHINGTON", "WORTHY", "WRAY", "WREN", "WRIGHT",
+ "WU", "WYANT", "WYATT", "WYLIE", "WYMAN", "WYNN", "WYNNE", "XIONG", "YAMAMOTO", "YANCEY", "YANEZ",
+ "YANG", "YARBROUGH", "YATES", "YAZZIE", "YBARRA", "YEAGER", "YEE", "YI", "YOCUM", "YODER", "YOO",
+ "YOON", "YORK", "YOST", "YOUNG", "YOUNGBLOOD", "YOUNGER", "YOUNT", "YU", "ZAMBRANO", "ZAMORA", "ZAPATA",
+ "ZARAGOZA", "ZARATE", "ZAVALA", "ZEIGLER", "ZELLER", "ZEPEDA", "ZHANG", "ZIEGLER", "ZIELINSKI",
+ "ZIMMER", "ZIMMERMAN", "ZINK", "ZOOK", "ZUNIGA" };
}
public static String generateRandomName() {
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java b/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java
index 160b384150..7a93cbbeb7 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java
@@ -1,8 +1,9 @@
package gtPlusPlus.plugin.villagers;
+import net.minecraftforge.event.entity.EntityJoinWorldEvent;
+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import gtPlusPlus.core.util.Utils;
-import net.minecraftforge.event.entity.EntityJoinWorldEvent;
public class VillagerEventHandler {
@@ -16,26 +17,14 @@ public class VillagerEventHandler {
@SubscribeEvent
public void onEntityJoinWorld(EntityJoinWorldEvent event) {
- /*try {
- if (event.entity != null && event.entity instanceof EntityLivingBase && event.entity instanceof EntityVillager){
- EntityVillager entity = (EntityVillager) event.entity;
- World world = entity.worldObj;
- int profession = entity.getProfession();
- if (world != null && (profession >= 7735 && profession <= 7737)){
- EntityBaseVillager mNew = new EntityBaseVillager(world, profession);
- mNew.copyLocationAndAnglesFrom(entity);
- if (mNew != null) {
- world.removeEntity(entity);
- world.spawnEntityInWorld(mNew);
- }
- }
-
- }
- }
- catch (Throwable t) {
- t.printStackTrace();
- return;
- }*/
+ /*
+ * try { if (event.entity != null && event.entity instanceof EntityLivingBase && event.entity instanceof
+ * EntityVillager){ EntityVillager entity = (EntityVillager) event.entity; World world = entity.worldObj; int
+ * profession = entity.getProfession(); if (world != null && (profession >= 7735 && profession <= 7737)){
+ * EntityBaseVillager mNew = new EntityBaseVillager(world, profession); mNew.copyLocationAndAnglesFrom(entity);
+ * if (mNew != null) { world.removeEntity(entity); world.spawnEntityInWorld(mNew); } } } } catch (Throwable t) {
+ * t.printStackTrace(); return; }
+ */
}
}
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java b/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java
index ad49741726..5d1b36b134 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java
@@ -1,9 +1,10 @@
package gtPlusPlus.plugin.villagers;
+import net.minecraft.util.ResourceLocation;
+
import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.util.ResourceLocation;
public class VillagerObject {
@@ -11,12 +12,7 @@ public class VillagerObject {
public final String mName;
public final IVillageTradeHandler mCustomTrade;
- public VillagerObject(
- int aID,
- String aName,
- Object aProfession,
- Object aCareer,
- Object aSkin,
+ public VillagerObject(int aID, String aName, Object aProfession, Object aCareer, Object aSkin,
IVillageTradeHandler aCustomTrade) {
mID = aID;
@@ -25,8 +21,8 @@ public class VillagerObject {
// Register Custom Trade to Registry.
if (aCustomTrade != null) {
- Core_VillagerAdditions.mVillagerTrades.put(
- new Pair<Integer, IVillageTradeHandler>(7735 + aID, aCustomTrade));
+ Core_VillagerAdditions.mVillagerTrades
+ .put(new Pair<Integer, IVillageTradeHandler>(7735 + aID, aCustomTrade));
}
// Register Skin to Registry.
if (aSkin != null) {
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/VillagerUtils.java b/src/main/java/gtPlusPlus/plugin/villagers/VillagerUtils.java
index abdb16721c..9ca9377865 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/VillagerUtils.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/VillagerUtils.java
@@ -1,18 +1,14 @@
package gtPlusPlus.plugin.villagers;
-import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
import java.util.HashMap;
+import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
+
public class VillagerUtils {
public static final HashMap<Integer, VillagerObject> mVillagerMap = new HashMap<Integer, VillagerObject>();
- public static void registerNewVillager(
- int aID,
- String aName,
- Object aProfession,
- Object aCareer,
- Object aSkin,
+ public static void registerNewVillager(int aID, String aName, Object aProfession, Object aCareer, Object aSkin,
IVillageTradeHandler aCustomTrade) {
registerNewVillager(aID, new VillagerObject(aID, aName, aProfession, aCareer, aSkin, aCustomTrade));
}
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java b/src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java
index 82650fbd70..a2ab11cead 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java
@@ -2,13 +2,8 @@ package gtPlusPlus.plugin.villagers.block;
import static gtPlusPlus.core.lib.CORE.RANDOM;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockSpawner;
-import gtPlusPlus.plugin.villagers.Core_VillagerAdditions;
-import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
import java.util.List;
+
import net.minecraft.block.BlockMobSpawner;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
@@ -17,6 +12,13 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockSpawner;
+import gtPlusPlus.plugin.villagers.Core_VillagerAdditions;
+import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
+
public class BlockGenericSpawner extends BlockMobSpawner {
public BlockGenericSpawner() {
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java b/src/main/java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java
index a1ada6c7d5..967bc73bd0 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java
@@ -1,12 +1,13 @@
package gtPlusPlus.plugin.villagers.tile;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-import gtPlusPlus.core.block.ModBlocks;
import net.minecraft.entity.Entity;
import net.minecraft.tileentity.MobSpawnerBaseLogic;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.EntityRegistry;
+import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
+import gtPlusPlus.core.block.ModBlocks;
+
public class MobSpawnerCustomLogic extends MobSpawnerBaseLogic {
private TileEntityGenericSpawner mTile;
@@ -27,10 +28,8 @@ public class MobSpawnerCustomLogic extends MobSpawnerBaseLogic {
@Override
public void func_98267_a(int eventID) {
- if (mTile != null)
- mTile.getWorldObj()
- .addBlockEvent(
- mTile.xCoord, mTile.yCoord, mTile.zCoord, ModBlocks.blockCustomMobSpawner, eventID, 0);
+ if (mTile != null) mTile.getWorldObj()
+ .addBlockEvent(mTile.xCoord, mTile.yCoord, mTile.zCoord, ModBlocks.blockCustomMobSpawner, eventID, 0);
}
@Override
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java b/src/main/java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java
index df4e58124a..451a4aefe5 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java
@@ -1,16 +1,18 @@
package gtPlusPlus.plugin.villagers.tile;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.util.HashMap;
import java.util.Map;
+
import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.MobSpawnerBaseLogic;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityMobSpawner;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class TileEntityGenericSpawner extends TileEntityMobSpawner {
/*
@@ -30,10 +32,8 @@ public class TileEntityGenericSpawner extends TileEntityMobSpawner {
/**
* Registers a New Mob Spawner Type
*
- * @param aID
- * - the Spawner type ID
- * @param aEntity
- * - the Entity which you'd like to spawn
+ * @param aID - the Spawner type ID
+ * @param aEntity - the Entity which you'd like to spawn
*/
public static boolean registerNewMobSpawner(int aID, Class<Entity> aEntity) {
int registered = mSpawners.size();
@@ -63,8 +63,7 @@ public class TileEntityGenericSpawner extends TileEntityMobSpawner {
/**
* Constructs a new Spawner, based on an existing type registered.
*
- * @param aID
- * - The ID in the {@link mSpawners} map.
+ * @param aID - The ID in the {@link mSpawners} map.
*/
public TileEntityGenericSpawner(int aID) {
mID = aID;
@@ -81,10 +80,8 @@ public class TileEntityGenericSpawner extends TileEntityMobSpawner {
/**
* Constructs a new Spawner, then registers it.
*
- * @param aID
- * - The ID to be used in the {@link mSpawners} map.
- * @param aEntity
- * - The {@link Entity} type which will be spawned.
+ * @param aID - The ID to be used in the {@link mSpawners} map.
+ * @param aEntity - The {@link Entity} type which will be spawned.
*/
public TileEntityGenericSpawner(int aID, Entity aEntity) {
mID = aID;
@@ -178,10 +175,8 @@ public class TileEntityGenericSpawner extends TileEntityMobSpawner {
if (Utils.isServer()) {
try {
- Map<?, ?> a1 = (Map<?, ?>) ReflectionUtils.getField(TileEntity.class, "nameToClassMap")
- .get(this);
- Map<?, ?> a2 = (Map<?, ?>) ReflectionUtils.getField(TileEntity.class, "classToNameMap")
- .get(this);
+ Map<?, ?> a1 = (Map<?, ?>) ReflectionUtils.getField(TileEntity.class, "nameToClassMap").get(this);
+ Map<?, ?> a2 = (Map<?, ?>) ReflectionUtils.getField(TileEntity.class, "classToNameMap").get(this);
if (a1 != null) {
if (nameToClassMap_Ex == null) {
nameToClassMap_Ex = a1;
@@ -211,27 +206,20 @@ public class TileEntityGenericSpawner extends TileEntityMobSpawner {
}
}
- /*Field mInternalLogicField = ReflectionUtils.getField(getClass(), "field_145882_a");
- if (mInternalLogicField != null) {
- MobSpawnerBaseLogic a = (MobSpawnerBaseLogic) mInternalLogicField.get(this);
- if (a != null) {
- ReflectionUtils.setField(this, "field_145882_a", getLogic());
- if (a.equals(getLogic())) {
- isReady = true;
- return true;
- }
- }
- }*/
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ /*
+ * Field mInternalLogicField = ReflectionUtils.getField(getClass(), "field_145882_a"); if
+ * (mInternalLogicField != null) { MobSpawnerBaseLogic a = (MobSpawnerBaseLogic)
+ * mInternalLogicField.get(this); if (a != null) { ReflectionUtils.setField(this, "field_145882_a",
+ * getLogic()); if (a.equals(getLogic())) { isReady = true; return true; } } }
+ */
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
}
return false;
}
}
/**
- * Called when a client event is received with the event number and argument,
- * see World.sendClientEvent
+ * Called when a client event is received with the event number and argument, see World.sendClientEvent
*/
@Override
public boolean receiveClientEvent(int p_145842_1_, int p_145842_2_) {
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java
index c42da6895f..3ad3cdd7eb 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java
@@ -1,11 +1,13 @@
package gtPlusPlus.plugin.villagers.trade;
-import gtPlusPlus.core.recipe.common.CI;
import java.util.Random;
+
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.village.MerchantRecipe;
import net.minecraft.village.MerchantRecipeList;
+import gtPlusPlus.core.recipe.common.CI;
+
public class TradeHandlerBanker extends TradeHandlerBase {
@SuppressWarnings("unchecked")
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java
index 1e1e326201..fa95404f49 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java
@@ -1,24 +1,24 @@
/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
+ * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
+ * at http://www.gnu.org/licenses/lgpl-3.0.txt
*
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
+ * MysteriousAges
******************************************************************************/
package gtPlusPlus.plugin.villagers.trade;
-import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
import java.util.Random;
+
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.village.MerchantRecipeList;
+import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
+
public abstract class TradeHandlerBase implements IVillageTradeHandler {
@SuppressWarnings("unchecked")
@Override
- public abstract void manipulateTradesForVillager(
- EntityVillager villager, MerchantRecipeList recipeList, Random random);
+ public abstract void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList,
+ Random random);
}
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java
index bd2acc9bfe..1b67e2b478 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java
@@ -1,11 +1,13 @@
package gtPlusPlus.plugin.villagers.trade;
-import gtPlusPlus.core.recipe.common.CI;
import java.util.Random;
+
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.village.MerchantRecipe;
import net.minecraft.village.MerchantRecipeList;
+import gtPlusPlus.core.recipe.common.CI;
+
public class TradeHandlerTechnician extends TradeHandlerBase {
@SuppressWarnings("unchecked")
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
index f866bd7aa6..4b0e99471a 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
@@ -1,16 +1,18 @@
package gtPlusPlus.plugin.villagers.trade;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.Collections;
import java.util.Random;
+
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.village.MerchantRecipe;
import net.minecraft.village.MerchantRecipeList;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class TradeHandlerTrader extends TradeHandlerBase {
public TradeHandlerTrader() {
@@ -33,15 +35,16 @@ public class TradeHandlerTrader extends TradeHandlerBase {
if (Ore2 == null) {
Ore2 = ELEMENT.getInstance().LEAD.getOre(1);
}
- recipeList.add(new MerchantRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("logWood", 32),
- ELEMENT.getInstance().IRON.getOre(1)));
- recipeList.add(new MerchantRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 32),
- ELEMENT.getInstance().COPPER.getOre(1)));
- recipeList.add(new MerchantRecipe(
- ItemUtils.getSimpleStack(Blocks.obsidian, 6),
- ELEMENT.getInstance().TIN.getOre(1)));
+ recipeList.add(
+ new MerchantRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("logWood", 32),
+ ELEMENT.getInstance().IRON.getOre(1)));
+ recipeList.add(
+ new MerchantRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 32),
+ ELEMENT.getInstance().COPPER.getOre(1)));
+ recipeList.add(
+ new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.obsidian, 6), ELEMENT.getInstance().TIN.getOre(1)));
recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.glowstone, 32), Ore1));
recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.piston, 32), Ore2));
Collections.shuffle(recipeList);
diff --git a/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java b/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java
index 303868e6d8..a382572db5 100644
--- a/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java
+++ b/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java
@@ -1,11 +1,12 @@
package gtPlusPlus.preloader;
-import cpw.mods.fml.common.versioning.ArtifactVersion;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import cpw.mods.fml.common.versioning.ArtifactVersion;
+
public class CORE_Preloader {
public static final String NAME = "GT++ Preloader";
diff --git a/src/main/java/gtPlusPlus/preloader/ChunkDebugger.java b/src/main/java/gtPlusPlus/preloader/ChunkDebugger.java
index 091188995d..6c7f4075a8 100644
--- a/src/main/java/gtPlusPlus/preloader/ChunkDebugger.java
+++ b/src/main/java/gtPlusPlus/preloader/ChunkDebugger.java
@@ -1,19 +1,19 @@
package gtPlusPlus.preloader;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.Pair;
import java.util.LinkedHashMap;
import java.util.Map;
+
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeChunkManager.Ticket;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
+
public class ChunkDebugger {
- public static final Map<Integer, Pair<String, String>> mChunkTicketsMap =
- new LinkedHashMap<Integer, Pair<String, String>>();
- public static final Map<String, Pair<String, String>> mChunksLoadedByModsMap =
- new LinkedHashMap<String, Pair<String, String>>();
+ public static final Map<Integer, Pair<String, String>> mChunkTicketsMap = new LinkedHashMap<Integer, Pair<String, String>>();
+ public static final Map<String, Pair<String, String>> mChunksLoadedByModsMap = new LinkedHashMap<String, Pair<String, String>>();
public static void storeTicketToCache(Ticket aTicket, World aWorld) {
mChunkTicketsMap.put(
@@ -25,8 +25,12 @@ public class ChunkDebugger {
public static void storeLoadChunkToCache(Ticket aTicket, ChunkCoordIntPair aChunk) {
mChunksLoadedByModsMap.put(aChunk.toString(), new Pair<String, String>(aTicket.getModId(), aChunk.toString()));
- Logger.REFLECTION("Chunk Loaded by " + aTicket.getModId() + " at position " + aChunk.toString()
- + " for dimension " + aTicket.world.provider.dimensionId);
+ Logger.REFLECTION(
+ "Chunk Loaded by " + aTicket.getModId()
+ + " at position "
+ + aChunk.toString()
+ + " for dimension "
+ + aTicket.world.provider.dimensionId);
}
public static void removeTicketFromCache(Ticket aTicket) {
diff --git a/src/main/java/gtPlusPlus/preloader/CustomClassLoader.java b/src/main/java/gtPlusPlus/preloader/CustomClassLoader.java
index 388b5fa2a6..17cb86bf49 100644
--- a/src/main/java/gtPlusPlus/preloader/CustomClassLoader.java
+++ b/src/main/java/gtPlusPlus/preloader/CustomClassLoader.java
@@ -6,6 +6,7 @@ import java.security.Permissions;
import java.security.ProtectionDomain;
import java.security.cert.Certificate;
import java.util.HashMap;
+
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.tree.ClassNode;
diff --git a/src/main/java/gtPlusPlus/preloader/DevHelper.java b/src/main/java/gtPlusPlus/preloader/DevHelper.java
index 10d81d1ce3..bc240b1b5d 100644
--- a/src/main/java/gtPlusPlus/preloader/DevHelper.java
+++ b/src/main/java/gtPlusPlus/preloader/DevHelper.java
@@ -1,14 +1,16 @@
package gtPlusPlus.preloader;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.api.objects.data.weakref.WeakAutoMap;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
+
import net.minecraft.launchwrapper.Launch;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.api.objects.data.weakref.WeakAutoMap;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class DevHelper {
private static final DevHelper mInstance;
@@ -36,8 +38,7 @@ public class DevHelper {
} else {
deobfuscatedEnvironment = false;
}
- } catch (IOException e) {
- }
+ } catch (IOException e) {}
return !deobfuscatedEnvironment;
}
@@ -57,8 +58,7 @@ public class DevHelper {
return b;
}
}
- } catch (Exception e) {
- }
+ } catch (Exception e) {}
return null;
}
@@ -102,6 +102,7 @@ public class DevHelper {
}
public static class DevHelperInternals {
+
public static final Map<String, String> srgToForge = new HashMap<String, String>();
public static final Map<String, String> forgeToSrg = new HashMap<String, String>();
private static WeakAutoMap<Pair<String, String>> mInitMap = new WeakAutoMap<Pair<String, String>>();
@@ -3560,8 +3561,10 @@ public class DevHelper {
mInitMap.put(new Pair<String, String>("func_75543_d", "dropOldestVillagerPosition"));
mInitMap.put(new Pair<String, String>("func_75544_a", "tick"));
mInitMap.put(new Pair<String, String>("func_75545_e", "addmInitMap.put(newDoorsToVillageOrCreateVillage"));
- mInitMap.put(new Pair<String, String>(
- "func_75546_a", "addUnassignedWoodenDoorsAroundTomInitMap.put(newDoorsList"));
+ mInitMap.put(
+ new Pair<String, String>(
+ "func_75546_a",
+ "addUnassignedWoodenDoorsAroundTomInitMap.put(newDoorsList"));
mInitMap.put(new Pair<String, String>("func_75547_b", "getVillageDoorAt"));
mInitMap.put(new Pair<String, String>("func_75548_d", "isVillagerPositionPresent"));
mInitMap.put(new Pair<String, String>("func_75549_c", "removeAnnihilatedVillages"));
@@ -5056,16 +5059,18 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("amd", "net/minecraft/block/BlockMycelium"));
mObInitMap.put(new Pair<String, String>("aag", "net/minecraft/inventory/ContainerEnchantment"));
mObInitMap.put(new Pair<String, String>("aie", "net/minecraft/world/biome/WorldChunkManagerHell"));
- mObInitMap.put(new Pair<String, String>(
- "aub", "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$DesertPyramid"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aub",
+ "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$DesertPyramid"));
mObInitMap.put(new Pair<String, String>("bue", "net/minecraft/client/stream/ChatController"));
mObInitMap.put(new Pair<String, String>("bqf", "net/minecraft/client/renderer/texture/TextureManager"));
mObInitMap.put(new Pair<String, String>("bei", "net/minecraft/client/gui/achievement/GuiAchievements"));
mObInitMap.put(new Pair<String, String>("bih", "net/minecraft/client/model/ModelSquid"));
mObInitMap.put(new Pair<String, String>("bmg", "net/minecraft/client/shader/Framebuffer"));
mObInitMap.put(new Pair<String, String>("na", "net/minecraft/client/network/NetHandlerHandshakeMemory"));
- mObInitMap.put(
- new Pair<String, String>("jb", "net/minecraft/network/play/client/C02PacketUseEntity$Action"));
+ mObInitMap
+ .put(new Pair<String, String>("jb", "net/minecraft/network/play/client/C02PacketUseEntity$Action"));
mObInitMap.put(new Pair<String, String>("fc", "net/minecraft/util/MessageDeserializer2"));
mObInitMap.put(new Pair<String, String>("bd", "net/minecraft/command/server/CommandPardonIp"));
mObInitMap.put(new Pair<String, String>("amw", "net/minecraft/block/BlockPumpkin"));
@@ -5081,8 +5086,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("afm", "net/minecraft/enchantment/EnchantmentArrowDamage"));
mObInitMap.put(new Pair<String, String>("brm", "net/minecraft/client/resources/SkinManager$3"));
mObInitMap.put(new Pair<String, String>("aqu", "net/minecraft/world/gen/ChunkProviderFlat"));
- mObInitMap.put(new Pair<String, String>(
- "aut", "net/minecraft/world/gen/structure/StructureStrongholdPieces$Prison"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aut",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$Prison"));
mObInitMap.put(new Pair<String, String>("ays", "net/minecraft/world/storage/WorldInfo"));
mObInitMap.put(new Pair<String, String>("bbq", "net/minecraft/util/MinecraftError"));
mObInitMap.put(new Pair<String, String>("bfp", "net/minecraft/util/EnchantmentNameParts"));
@@ -5139,25 +5146,29 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("xk", "net/minecraft/entity/item/EntityItem"));
mObInitMap.put(new Pair<String, String>("tl", "net/minecraft/entity/ai/attributes/BaseAttributeMap"));
mObInitMap.put(new Pair<String, String>("pm", "net/minecraft/stats/IStatType"));
- mObInitMap.put(
- new Pair<String, String>("atc", "net/minecraft/world/gen/structure/StructureMineshaftStart"));
+ mObInitMap
+ .put(new Pair<String, String>("atc", "net/minecraft/world/gen/structure/StructureMineshaftStart"));
mObInitMap.put(new Pair<String, String>("apd", "net/minecraft/tileentity/TileEntityEnchantmentTable"));
mObInitMap.put(new Pair<String, String>("ale", "net/minecraft/block/BlockFurnace"));
mObInitMap.put(new Pair<String, String>("adg", "net/minecraft/item/ItemLeaves"));
mObInitMap.put(new Pair<String, String>("ahf", "net/minecraft/world/World$4"));
mObInitMap.put(new Pair<String, String>("axb", "net/minecraft/world/gen/layer/GenLayerAddIsland"));
mObInitMap.put(new Pair<String, String>("bpg", "net/minecraft/client/util/JsonBlendingMode"));
- mObInitMap.put(
- new Pair<String, String>("net/minecraft/realms/RealmsMth", "net/minecraft/realms/RealmsMth"));
+ mObInitMap
+ .put(new Pair<String, String>("net/minecraft/realms/RealmsMth", "net/minecraft/realms/RealmsMth"));
mObInitMap.put(new Pair<String, String>("qa", "net/minecraft/util/IntHashMap$Entry"));
mObInitMap.put(new Pair<String, String>("mb", "net/minecraft/server/gui/MinecraftServerGui$3"));
mObInitMap.put(
new Pair<String, String>("ic", "net/minecraft/network/play/server/S3BPacketScoreboardObjective"));
mObInitMap.put(new Pair<String, String>("ed", "net/minecraft/nbt/JsonToNBT$Compound"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/RendererUtility", "net/minecraft/realms/RendererUtility"));
- mObInitMap.put(new Pair<String, String>(
- "atv", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Stairs"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/realms/RendererUtility",
+ "net/minecraft/realms/RendererUtility"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atv",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Stairs"));
mObInitMap.put(new Pair<String, String>("apw", "net/minecraft/world/chunk/EmptyChunk"));
mObInitMap.put(new Pair<String, String>("alx", "net/minecraft/block/BlockLog"));
mObInitMap.put(new Pair<String, String>("adz", "net/minecraft/item/ItemSign"));
@@ -5184,8 +5195,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("bar", "net/minecraft/client/Minecraft$11"));
mObInitMap.put(new Pair<String, String>("beq", "net/minecraft/client/gui/achievement/GuiStats$Stats"));
mObInitMap.put(new Pair<String, String>("bip", "net/minecraft/client/model/ModelZombie"));
- mObInitMap.put(new Pair<String, String>(
- "bmo", "net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bmo",
+ "net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer"));
mObInitMap.put(new Pair<String, String>("ni", "net/minecraft/network/NetHandlerPlayServer$1"));
mObInitMap.put(new Pair<String, String>("jj", "net/minecraft/network/play/client/C0BPacketEntityAction"));
mObInitMap.put(new Pair<String, String>("fk", "net/minecraft/util/IChatComponent$Serializer"));
@@ -5193,8 +5206,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("yq", "net/minecraft/entity/monster/EntityZombie"));
mObInitMap.put(new Pair<String, String>("abc", "net/minecraft/item/ItemArmor$1"));
mObInitMap.put(new Pair<String, String>("afb", "net/minecraft/item/crafting/RecipesMapCloning"));
- mObInitMap.put(new Pair<String, String>(
- "brb", "net/minecraft/client/resources/ResourcePackFileNotFoundException"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "brb",
+ "net/minecraft/client/resources/ResourcePackFileNotFoundException"));
mObInitMap.put(new Pair<String, String>("aqj", "net/minecraft/world/chunk/storage/RegionFileCache"));
mObInitMap.put(
new Pair<String, String>("aui", "net/minecraft/world/gen/structure/StructureStrongholdPieces"));
@@ -5218,8 +5233,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ajs", "net/minecraft/block/BlockButton"));
mObInitMap.put(new Pair<String, String>("avp", "net/minecraft/world/gen/structure/StructureVillagePieces"));
mObInitMap.put(new Pair<String, String>("azo", "net/minecraft/world/storage/SaveHandlerMP"));
- mObInitMap.put(new Pair<String, String>(
- "brt", "net/minecraft/client/resources/data/BaseMetadataSectionSerializer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "brt",
+ "net/minecraft/client/resources/data/BaseMetadataSectionSerializer"));
mObInitMap.put(new Pair<String, String>("bfw", "net/minecraft/client/gui/GuiMerchant$MerchantButton"));
mObInitMap.put(new Pair<String, String>("bjv", "net/minecraft/client/particle/EntityBubbleFX"));
mObInitMap.put(new Pair<String, String>("bnu", "net/minecraft/client/renderer/entity/RenderGiantZombie"));
@@ -5232,8 +5249,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("akg", "net/minecraft/block/BlockDaylightDetector"));
mObInitMap.put(new Pair<String, String>("aci", "net/minecraft/item/ItemDoublePlant"));
mObInitMap.put(new Pair<String, String>("agh", "net/minecraft/enchantment/EnchantmentOxygen"));
- mObInitMap.put(new Pair<String, String>(
- "bsh", "net/minecraft/client/resources/data/PackMetadataSectionSerializer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bsh",
+ "net/minecraft/client/resources/data/PackMetadataSectionSerializer"));
mObInitMap.put(new Pair<String, String>("bcl", "net/minecraft/client/gui/GuiOptionsRowList$Row"));
mObInitMap.put(new Pair<String, String>("bgk", "net/minecraft/client/gui/GuiResourcePackList"));
mObInitMap.put(new Pair<String, String>("bkj", "net/minecraft/client/particle/EntityHugeExplodeFX"));
@@ -5262,15 +5281,19 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("lv", "net/minecraft/server/dedicated/DedicatedServer$2"));
mObInitMap.put(new Pair<String, String>("hw", "net/minecraft/network/play/server/S1CPacketEntityMetadata"));
mObInitMap.put(new Pair<String, String>("dx", "net/minecraft/nbt/NBTTagString"));
- mObInitMap.put(new Pair<String, String>(
- "atk", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor4"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atk",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor4"));
mObInitMap.put(new Pair<String, String>("apl", "net/minecraft/tileentity/TileEntityNote"));
mObInitMap.put(new Pair<String, String>("alm", "net/minecraft/block/BlockHay"));
mObInitMap.put(new Pair<String, String>("ado", "net/minecraft/item/ItemPiston"));
mObInitMap.put(new Pair<String, String>("ahn", "net/minecraft/world/EnumSkyBlock"));
mObInitMap.put(new Pair<String, String>("axj", "net/minecraft/world/gen/layer/GenLayerFuzzyZoom"));
- mObInitMap.put(new Pair<String, String>(
- "btn", "net/minecraft/client/audio/SoundManager$SoundSystemStarterThread"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "btn",
+ "net/minecraft/client/audio/SoundManager$SoundSystemStarterThread"));
mObInitMap.put(new Pair<String, String>("bpo", "net/minecraft/client/shader/ShaderUniform"));
mObInitMap.put(new Pair<String, String>("bhq", "net/minecraft/client/model/ModelMinecart"));
mObInitMap.put(new Pair<String, String>("blp", "net/minecraft/client/renderer/RenderSorter"));
@@ -5286,8 +5309,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aad", "net/minecraft/inventory/ContainerChest"));
mObInitMap.put(new Pair<String, String>("aib", "net/minecraft/world/biome/WorldChunkManager"));
mObInitMap.put(new Pair<String, String>("d", "net/minecraft/crash/CrashReport$2"));
- mObInitMap.put(new Pair<String, String>(
- "bub", "net/minecraft/client/stream/BroadcastController$SwitchBroadcastState"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bub",
+ "net/minecraft/client/stream/BroadcastController$SwitchBroadcastState"));
mObInitMap.put(new Pair<String, String>("bqc", "net/minecraft/client/renderer/texture/TextureMap$3"));
mObInitMap.put(new Pair<String, String>("bag", "net/minecraft/scoreboard/ScoreHealthCriteria"));
mObInitMap.put(new Pair<String, String>("bef", "net/minecraft/client/gui/GuiVideoSettings"));
@@ -5297,14 +5322,14 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aev", "net/minecraft/item/crafting/RecipesArmor"));
mObInitMap.put(new Pair<String, String>("aaw", "net/minecraft/inventory/InventoryCraftResult"));
mObInitMap.put(new Pair<String, String>("w", "net/minecraft/client/audio/SoundCategory"));
- mObInitMap.put(
- new Pair<String, String>("bqv", "net/minecraft/client/resources/IReloadableResourceManager"));
+ mObInitMap
+ .put(new Pair<String, String>("bqv", "net/minecraft/client/resources/IReloadableResourceManager"));
mObInitMap.put(new Pair<String, String>("baz", "net/minecraft/client/Minecraft$3"));
mObInitMap.put(new Pair<String, String>("bey", "net/minecraft/client/gui/GuiRepair"));
mObInitMap.put(new Pair<String, String>("bix", "net/minecraft/client/model/ModelRenderer"));
mObInitMap.put(new Pair<String, String>("bmw", "net/minecraft/client/renderer/culling/ClippingHelperImpl"));
- mObInitMap.put(
- new Pair<String, String>("fs", "net/minecraft/util/ChatComponentTranslationFormatException"));
+ mObInitMap
+ .put(new Pair<String, String>("fs", "net/minecraft/util/ChatComponentTranslationFormatException"));
mObInitMap.put(new Pair<String, String>("bt", "net/minecraft/command/server/CommandStop"));
mObInitMap.put(new Pair<String, String>("yy", "net/minecraft/entity/player/InventoryPlayer$1"));
mObInitMap.put(new Pair<String, String>("uz", "net/minecraft/entity/ai/EntityAIPanic"));
@@ -5312,12 +5337,16 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ams", "net/minecraft/block/BlockCompressedPowered"));
mObInitMap.put(new Pair<String, String>("aeu", "net/minecraft/item/crafting/RecipesArmorDyes"));
mObInitMap.put(new Pair<String, String>("ait", "net/minecraft/world/biome/BiomeGenSavanna$Mutated"));
- mObInitMap.put(new Pair<String, String>(
- "auq", "net/minecraft/world/gen/structure/StructureStrongholdPieces$Library"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "auq",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$Library"));
mObInitMap.put(new Pair<String, String>("ayp", "net/minecraft/world/storage/DerivedWorldInfo"));
mObInitMap.put(new Pair<String, String>("bbn", "net/minecraft/client/settings/GameSettings$Options$1"));
- mObInitMap.put(new Pair<String, String>(
- "bfm", "net/minecraft/client/gui/inventory/GuiContainerCreative$ContainerCreative"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bfm",
+ "net/minecraft/client/gui/inventory/GuiContainerCreative$ContainerCreative"));
mObInitMap.put(new Pair<String, String>("but", "net/minecraft/realms/RealmsServerStatusPinger$1"));
mObInitMap.put(new Pair<String, String>("bqu", "net/minecraft/client/resources/GrassColorReloadListener"));
mObInitMap.put(new Pair<String, String>("zm", "net/minecraft/entity/item/EntityEnderPearl"));
@@ -5325,8 +5354,8 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ro", "net/minecraft/util/DamageSource"));
mObInitMap.put(
new Pair<String, String>("np", "net/minecraft/server/network/NetHandlerLoginServer$LoginState"));
- mObInitMap.put(
- new Pair<String, String>("jq", "net/minecraft/network/handshake/INetHandlerHandshakeServer"));
+ mObInitMap
+ .put(new Pair<String, String>("jq", "net/minecraft/network/handshake/INetHandlerHandshakeServer"));
mObInitMap.put(new Pair<String, String>("fr", "net/minecraft/util/ChatComponentTranslation"));
mObInitMap.put(new Pair<String, String>("arf", "net/minecraft/world/gen/feature/WorldGenBlockBlob"));
mObInitMap.put(new Pair<String, String>("ang", "net/minecraft/block/BlockRotatedPillar"));
@@ -5335,8 +5364,8 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ajh", "net/minecraft/block/BlockBed"));
mObInitMap.put(new Pair<String, String>("ave", "net/minecraft/world/gen/structure/MapGenStructure"));
mObInitMap.put(new Pair<String, String>("azd", "net/minecraft/client/AnvilConverterException"));
- mObInitMap.put(
- new Pair<String, String>("net/minecraft/client/main/Main", "net/minecraft/client/main/Main"));
+ mObInitMap
+ .put(new Pair<String, String>("net/minecraft/client/main/Main", "net/minecraft/client/main/Main"));
mObInitMap.put(new Pair<String, String>("bri", "net/minecraft/client/resources/SimpleResource"));
mObInitMap.put(new Pair<String, String>("bfl", "net/minecraft/client/gui/inventory/GuiContainerCreative"));
mObInitMap.put(new Pair<String, String>("bjk", "net/minecraft/client/entity/EntityClientPlayerMP"));
@@ -5345,8 +5374,8 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("sc", "net/minecraft/entity/Entity$2"));
mObInitMap.put(new Pair<String, String>("od", "net/minecraft/server/management/PreYggdrasilConverter$4"));
mObInitMap.put(new Pair<String, String>("ke", "net/minecraft/network/ServerStatusResponse$Serializer"));
- mObInitMap.put(
- new Pair<String, String>("gf", "net/minecraft/network/play/server/S35PacketUpdateTileEntity"));
+ mObInitMap
+ .put(new Pair<String, String>("gf", "net/minecraft/network/play/server/S35PacketUpdateTileEntity"));
mObInitMap.put(new Pair<String, String>("cg", "net/minecraft/command/PlayerNotFoundException"));
mObInitMap.put(new Pair<String, String>("ary", "net/minecraft/world/gen/feature/WorldGenGlowStone1"));
mObInitMap.put(new Pair<String, String>("anz", "net/minecraft/block/BlockTallGrass"));
@@ -5361,8 +5390,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("bsp", "net/minecraft/client/audio/SoundList"));
mObInitMap.put(new Pair<String, String>("boq", "net/minecraft/client/renderer/entity/RenderSheep"));
mObInitMap.put(new Pair<String, String>("arx", "net/minecraft/world/gen/feature/WorldGenLakes"));
- mObInitMap.put(new Pair<String, String>(
- "avw", "net/minecraft/world/gen/structure/StructureVillagePieces$House4Garden"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "avw",
+ "net/minecraft/world/gen/structure/StructureVillagePieces$House4Garden"));
mObInitMap.put(new Pair<String, String>("azv", "net/minecraft/util/MovingObjectPosition$MovingObjectType"));
mObInitMap.put(new Pair<String, String>("bct", "net/minecraft/client/gui/GuiChat"));
mObInitMap.put(new Pair<String, String>("bgs", "net/minecraft/client/gui/stream/GuiTwitchUserMode"));
@@ -5386,10 +5417,12 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("alb", "net/minecraft/block/BlockFire"));
mObInitMap.put(new Pair<String, String>("add", "net/minecraft/item/ItemStack"));
mObInitMap.put(new Pair<String, String>("ahc", "net/minecraft/world/World$1"));
- mObInitMap.put(new Pair<String, String>(
- "btc", "net/minecraft/client/network/LanServerDetector$ThreadLanServerFind"));
mObInitMap.put(
- new Pair<String, String>("bpd", "net/minecraft/client/renderer/tileentity/RenderWitherSkull"));
+ new Pair<String, String>(
+ "btc",
+ "net/minecraft/client/network/LanServerDetector$ThreadLanServerFind"));
+ mObInitMap
+ .put(new Pair<String, String>("bpd", "net/minecraft/client/renderer/tileentity/RenderWitherSkull"));
mObInitMap.put(new Pair<String, String>("bhf", "net/minecraft/client/model/ModelBook"));
mObInitMap.put(new Pair<String, String>("ble", "net/minecraft/client/particle/EntityFishWakeFX"));
mObInitMap.put(new Pair<String, String>("ea", "net/minecraft/nbt/NBTException"));
@@ -5411,45 +5444,59 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("l", "net/minecraft/crash/CrashReportCategory$1"));
mObInitMap.put(
new Pair<String, String>("bqk", "net/minecraft/client/renderer/texture/ITickableTextureObject"));
- mObInitMap.put(new Pair<String, String>(
- "atr", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Throne"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atr",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Throne"));
mObInitMap.put(new Pair<String, String>("aps", "net/minecraft/tileentity/TileEntityPiston"));
mObInitMap.put(new Pair<String, String>("axq", "net/minecraft/world/gen/layer/GenLayerRareBiome"));
mObInitMap.put(new Pair<String, String>("bao", "net/minecraft/client/Minecraft"));
mObInitMap.put(new Pair<String, String>("ben", "net/minecraft/client/gui/achievement/GuiStats$StatsItem"));
mObInitMap.put(new Pair<String, String>("bim", "net/minecraft/client/model/ModelWitch"));
- mObInitMap.put(new Pair<String, String>(
- "bml", "net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bml",
+ "net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer"));
mObInitMap.put(new Pair<String, String>("fh", "net/minecraft/event/ClickEvent"));
mObInitMap.put(new Pair<String, String>("bi", "net/minecraft/command/server/CommandSaveOff"));
mObInitMap.put(new Pair<String, String>("yn", "net/minecraft/entity/monster/EntitySpider"));
mObInitMap.put(new Pair<String, String>("uo", "net/minecraft/entity/ai/EntityAILookAtTradePlayer"));
- mObInitMap.put(new Pair<String, String>(
- "aqg", "net/minecraft/world/chunk/storage/ChunkLoader$AnvilConverterData"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aqg",
+ "net/minecraft/world/chunk/storage/ChunkLoader$AnvilConverterData"));
mObInitMap.put(new Pair<String, String>("amh", "net/minecraft/block/BlockNewLeaf"));
mObInitMap.put(new Pair<String, String>("aii", "net/minecraft/world/biome/BiomeGenHell"));
- mObInitMap.put(new Pair<String, String>(
- "auf", "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$SwampHut"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "auf",
+ "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$SwampHut"));
mObInitMap.put(new Pair<String, String>("aye", "net/minecraft/pathfinding/PathPoint"));
mObInitMap.put(new Pair<String, String>("bbc", "net/minecraft/client/Minecraft$6"));
- mObInitMap.put(
- new Pair<String, String>("bfb", "net/minecraft/client/gui/inventory/GuiBeacon$ConfirmButton"));
+ mObInitMap
+ .put(new Pair<String, String>("bfb", "net/minecraft/client/gui/inventory/GuiBeacon$ConfirmButton"));
mObInitMap.put(new Pair<String, String>("bui", "net/minecraft/client/stream/IngestServerTester"));
mObInitMap.put(new Pair<String, String>("bqj", "net/minecraft/client/renderer/texture/ITickable"));
- mObInitMap.put(
- new Pair<String, String>("zb", "net/minecraft/entity/player/EntityPlayer$EnumChatVisibility"));
+ mObInitMap
+ .put(new Pair<String, String>("zb", "net/minecraft/entity/player/EntityPlayer$EnumChatVisibility"));
mObInitMap.put(new Pair<String, String>("vc", "net/minecraft/entity/ai/EntityAIWander"));
mObInitMap.put(new Pair<String, String>("rd", "net/minecraft/world/EnumDifficulty"));
mObInitMap.put(new Pair<String, String>("ne", "net/minecraft/network/NetworkSystem$2"));
- mObInitMap.put(new Pair<String, String>(
- "jf", "net/minecraft/network/play/client/C03PacketPlayer$C06PacketPlayerPosLook"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "jf",
+ "net/minecraft/network/play/client/C03PacketPlayer$C06PacketPlayerPosLook"));
mObInitMap.put(new Pair<String, String>("fg", "net/minecraft/util/ChatComponentStyle$2"));
mObInitMap.put(new Pair<String, String>("aqz", "net/minecraft/world/gen/ChunkProviderGenerate"));
- mObInitMap.put(new Pair<String, String>(
- "auy", "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stairs"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "auy",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stairs"));
mObInitMap.put(new Pair<String, String>("ayx", "net/minecraft/world/storage/WorldInfo$5"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/RealmsSliderButton", "net/minecraft/realms/RealmsSliderButton"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/realms/RealmsSliderButton",
+ "net/minecraft/realms/RealmsSliderButton"));
mObInitMap.put(new Pair<String, String>("zu", "net/minecraft/inventory/ContainerRepair"));
mObInitMap.put(new Pair<String, String>("vv", "net/minecraft/pathfinding/PathNavigate"));
mObInitMap.put(new Pair<String, String>("rw", "net/minecraft/potion/PotionEffect"));
@@ -5463,8 +5510,8 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ajp", "net/minecraft/block/BlockBookshelf"));
mObInitMap.put(new Pair<String, String>("brq", "net/minecraft/client/resources/Language"));
mObInitMap.put(new Pair<String, String>("bbu", "net/minecraft/client/gui/FontRenderer"));
- mObInitMap.put(
- new Pair<String, String>("bft", "net/minecraft/client/gui/inventory/GuiScreenHorseInventory"));
+ mObInitMap
+ .put(new Pair<String, String>("bft", "net/minecraft/client/gui/inventory/GuiScreenHorseInventory"));
mObInitMap.put(new Pair<String, String>("bjs", "net/minecraft/client/network/OldServerPinger$2"));
mObInitMap.put(new Pair<String, String>("bnr", "net/minecraft/client/renderer/entity/RenderFireball"));
mObInitMap.put(new Pair<String, String>("sk", "net/minecraft/command/IEntitySelector$1"));
@@ -5477,15 +5524,19 @@ public class DevHelper {
mObInitMap.put(
new Pair<String, String>("bse", "net/minecraft/client/resources/data/LanguageMetadataSection"));
mObInitMap.put(new Pair<String, String>("arm", "net/minecraft/world/gen/feature/WorldGenDoublePlant"));
- mObInitMap.put(new Pair<String, String>(
- "avl", "net/minecraft/world/gen/structure/StructureComponent$BlockSelector"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "avl",
+ "net/minecraft/world/gen/structure/StructureComponent$BlockSelector"));
mObInitMap.put(new Pair<String, String>("bci", "net/minecraft/client/gui/GuiListExtended$IGuiListEntry"));
mObInitMap.put(
new Pair<String, String>("bgh", "net/minecraft/client/resources/ResourcePackListEntryDefault"));
mObInitMap.put(new Pair<String, String>("bkg", "net/minecraft/client/particle/EntityFootStepFX"));
mObInitMap.put(new Pair<String, String>("bof", "net/minecraft/client/renderer/entity/RenderLeashKnot"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/server/MinecraftServer", "net/minecraft/server/MinecraftServer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/server/MinecraftServer",
+ "net/minecraft/server/MinecraftServer"));
mObInitMap.put(new Pair<String, String>("hb", "net/minecraft/network/play/server/S2APacketParticles"));
mObInitMap.put(new Pair<String, String>("wi", "net/minecraft/entity/passive/EntityHorse"));
mObInitMap.put(new Pair<String, String>("sj", "net/minecraft/command/IEntitySelector"));
@@ -5493,8 +5544,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aob", "net/minecraft/block/BlockTNT"));
mObInitMap.put(new Pair<String, String>("akc", "net/minecraft/block/BlockRedstoneComparator"));
mObInitMap.put(new Pair<String, String>("agd", "net/minecraft/enchantment/EnchantmentFireAspect"));
- mObInitMap.put(new Pair<String, String>(
- "bsd", "net/minecraft/client/resources/data/FontMetadataSectionSerializer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bsd",
+ "net/minecraft/client/resources/data/FontMetadataSectionSerializer"));
mObInitMap.put(new Pair<String, String>("ha", "net/minecraft/network/play/server/S28PacketEffect"));
mObInitMap.put(new Pair<String, String>("ast", "net/minecraft/world/gen/FlatLayerInfo"));
mObInitMap.put(new Pair<String, String>("aou", "net/minecraft/tileentity/TileEntity$3"));
@@ -5527,8 +5580,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aj", "net/minecraft/command/server/CommandDeOp"));
mObInitMap.put(new Pair<String, String>("aaa", "net/minecraft/inventory/ContainerBrewingStand$Ingredient"));
mObInitMap.put(new Pair<String, String>("a", "net/minecraft/util/EnumChatFormatting"));
- mObInitMap.put(new Pair<String, String>(
- "atg", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Crossing3"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atg",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Crossing3"));
mObInitMap.put(new Pair<String, String>("axf", "net/minecraft/world/gen/layer/GenLayerBiome"));
mObInitMap.put(new Pair<String, String>("bad", "net/minecraft/scoreboard/ScoreboardSaveData"));
mObInitMap.put(new Pair<String, String>("bec", "net/minecraft/client/gui/GuiScreenOptionsSounds"));
@@ -5538,8 +5593,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ud", "net/minecraft/entity/ai/EntityAIEatGrass"));
mObInitMap.put(new Pair<String, String>("qe", "net/minecraft/util/LongHashMap$Entry"));
mObInitMap.put(new Pair<String, String>("t", "net/minecraft/util/ChatAllowedCharacters"));
- mObInitMap.put(new Pair<String, String>(
- "atz", "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atz",
+ "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces"));
mObInitMap.put(new Pair<String, String>("baw", "net/minecraft/client/Minecraft$16"));
mObInitMap.put(new Pair<String, String>("bev", "net/minecraft/client/gui/GuiKeyBindingList$KeyEntry"));
mObInitMap.put(new Pair<String, String>("yv", "net/minecraft/entity/passive/EntityVillager"));
@@ -5550,23 +5607,31 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aqo", "net/minecraft/world/WorldProvider"));
mObInitMap.put(new Pair<String, String>("amp", "net/minecraft/block/BlockPortal"));
mObInitMap.put(new Pair<String, String>("aas", "net/minecraft/inventory/InventoryMerchant"));
- mObInitMap.put(new Pair<String, String>(
- "aun", "net/minecraft/world/gen/structure/StructureStrongholdPieces$Corridor"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aun",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$Corridor"));
mObInitMap.put(new Pair<String, String>("aym", "net/minecraft/world/chunk/storage/AnvilSaveHandler"));
mObInitMap.put(new Pair<String, String>("buq", "net/minecraft/client/stream/TwitchStream$1$1"));
mObInitMap.put(new Pair<String, String>("bqr", "net/minecraft/client/resources/FileResourcePack"));
- mObInitMap.put(new Pair<String, String>(
- "bms", "net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bms",
+ "net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer"));
mObInitMap.put(new Pair<String, String>("zj", "net/minecraft/entity/projectile/EntitySnowball"));
mObInitMap.put(new Pair<String, String>("vk", "net/minecraft/entity/ai/EntityAITempt"));
mObInitMap.put(new Pair<String, String>("rl", "net/minecraft/inventory/ISidedInventory"));
- mObInitMap.put(new Pair<String, String>(
- "nm", "net/minecraft/server/network/NetHandlerHandshakeTCP$SwitchEnumConnectionState"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "nm",
+ "net/minecraft/server/network/NetHandlerHandshakeTCP$SwitchEnumConnectionState"));
mObInitMap.put(new Pair<String, String>("jn", "net/minecraft/network/play/client/C12PacketUpdateSign"));
mObInitMap.put(new Pair<String, String>("fo", "net/minecraft/util/ChatStyle$1"));
mObInitMap.put(new Pair<String, String>("bp", "net/minecraft/command/CommandSetSpawnpoint"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/RealmsServerAddress", "net/minecraft/realms/RealmsServerAddress"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/realms/RealmsServerAddress",
+ "net/minecraft/realms/RealmsServerAddress"));
mObInitMap.put(new Pair<String, String>("arc", "net/minecraft/world/gen/feature/WorldGenAbstractTree"));
mObInitMap.put(new Pair<String, String>("and", "net/minecraft/block/BlockRedstoneTorch$Toggle"));
mObInitMap.put(new Pair<String, String>("abg", "net/minecraft/item/ItemBed"));
@@ -5584,29 +5649,34 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("cd", "net/minecraft/command/CommandException"));
mObInitMap.put(new Pair<String, String>("abz", "net/minecraft/creativetab/CreativeTabs$3"));
mObInitMap.put(new Pair<String, String>("afy", "net/minecraft/enchantment/EnchantmentHelper$HurtIterator"));
- mObInitMap.put(new Pair<String, String>(
- "bry", "net/minecraft/client/resources/data/IMetadataSerializer$Registration"));
- mObInitMap.put(new Pair<String, String>(
- "ava", "net/minecraft/world/gen/structure/StructureStrongholdPieces$Straight"));
- mObInitMap.put(new Pair<String, String>("bnz", "net/minecraft/client/renderer/entity/RenderItem$1"));
mObInitMap.put(
- new Pair<String, String>("gv", "net/minecraft/network/play/server/S2BPacketChangeGameState"));
+ new Pair<String, String>(
+ "bry",
+ "net/minecraft/client/resources/data/IMetadataSerializer$Registration"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "ava",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$Straight"));
+ mObInitMap.put(new Pair<String, String>("bnz", "net/minecraft/client/renderer/entity/RenderItem$1"));
+ mObInitMap
+ .put(new Pair<String, String>("gv", "net/minecraft/network/play/server/S2BPacketChangeGameState"));
mObInitMap.put(new Pair<String, String>("cw", "net/minecraft/util/RegistryNamespaced"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/RealmsScrolledSelectionList",
- "net/minecraft/realms/RealmsScrolledSelectionList"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/realms/RealmsScrolledSelectionList",
+ "net/minecraft/realms/RealmsScrolledSelectionList"));
mObInitMap.put(new Pair<String, String>("aru", "net/minecraft/world/gen/feature/WorldGenBigMushroom"));
mObInitMap.put(new Pair<String, String>("anv", "net/minecraft/block/BlockStone"));
- mObInitMap.put(
- new Pair<String, String>("afx", "net/minecraft/enchantment/EnchantmentHelper$DamageIterator"));
+ mObInitMap
+ .put(new Pair<String, String>("afx", "net/minecraft/enchantment/EnchantmentHelper$DamageIterator"));
mObInitMap.put(new Pair<String, String>("ajw", "net/minecraft/block/BlockCauldron"));
mObInitMap.put(
new Pair<String, String>("avt", "net/minecraft/world/gen/structure/StructureVillagePieces$Torch"));
mObInitMap.put(new Pair<String, String>("azs", "net/minecraft/world/storage/IThreadedFileIO"));
mObInitMap.put(new Pair<String, String>("bcq", "net/minecraft/client/gui/GuiScreenRealmsProxy"));
mObInitMap.put(new Pair<String, String>("bgp", "net/minecraft/client/gui/stream/GuiStreamUnavailable"));
- mObInitMap.put(
- new Pair<String, String>("brx", "net/minecraft/client/resources/data/IMetadataSerializer$1"));
+ mObInitMap
+ .put(new Pair<String, String>("brx", "net/minecraft/client/resources/data/IMetadataSerializer$1"));
mObInitMap.put(new Pair<String, String>("wq", "net/minecraft/entity/passive/EntitySheep$1"));
mObInitMap.put(new Pair<String, String>("sr", "net/minecraft/entity/EntityFlying"));
mObInitMap.put(new Pair<String, String>("os", "net/minecraft/server/management/UserListWhitelistEntry"));
@@ -5627,8 +5697,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("tf", "net/minecraft/entity/DataWatcher$WatchableObject"));
mObInitMap.put(new Pair<String, String>("pg", "net/minecraft/stats/StatisticsFile"));
mObInitMap.put(new Pair<String, String>("lh", "net/minecraft/server/MinecraftServer$1"));
- mObInitMap.put(new Pair<String, String>(
- "hi", "net/minecraft/network/play/server/S14PacketEntity$S16PacketEntityLook"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "hi",
+ "net/minecraft/network/play/server/S14PacketEntity$S16PacketEntityLook"));
mObInitMap.put(new Pair<String, String>("dj", "net/minecraft/nbt/NBTTagCompound$2"));
mObInitMap.put(new Pair<String, String>("ada", "net/minecraft/item/ItemHoe"));
mObInitMap.put(new Pair<String, String>("bpa", "net/minecraft/client/renderer/entity/RenderVillager"));
@@ -5650,8 +5722,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("xw", "net/minecraft/entity/item/EntityTNTPrimed"));
mObInitMap.put(new Pair<String, String>("tx", "net/minecraft/entity/ai/EntityAIAvoidEntity$1"));
mObInitMap.put(new Pair<String, String>("i", "net/minecraft/crash/CrashReport$7"));
- mObInitMap.put(new Pair<String, String>(
- "ato", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor5"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "ato",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor5"));
mObInitMap.put(new Pair<String, String>("app", "net/minecraft/block/BlockPistonBase"));
mObInitMap.put(new Pair<String, String>("alq", "net/minecraft/block/BlockJukebox"));
mObInitMap.put(new Pair<String, String>("ahr", "net/minecraft/world/ChunkCache"));
@@ -5668,17 +5742,21 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aeg", "net/minecraft/item/ItemSlab"));
mObInitMap.put(new Pair<String, String>("aah", "net/minecraft/inventory/ContainerEnchantment$1"));
mObInitMap.put(new Pair<String, String>("aif", "net/minecraft/world/biome/BiomeGenForest"));
- mObInitMap.put(new Pair<String, String>(
- "auc", "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$JunglePyramid"));
- mObInitMap.put(new Pair<String, String>("ayb", "net/minecraft/world/gen/layer/GenLayerVoronoiZoom"));
mObInitMap.put(
- new Pair<String, String>("buf", "net/minecraft/client/stream/ChatController$SwitchChatState"));
+ new Pair<String, String>(
+ "auc",
+ "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$JunglePyramid"));
+ mObInitMap.put(new Pair<String, String>("ayb", "net/minecraft/world/gen/layer/GenLayerVoronoiZoom"));
+ mObInitMap
+ .put(new Pair<String, String>("buf", "net/minecraft/client/stream/ChatController$SwitchChatState"));
mObInitMap.put(new Pair<String, String>("bqg", "net/minecraft/client/renderer/texture/TextureManager$1"));
mObInitMap.put(new Pair<String, String>("bii", "net/minecraft/client/model/PositionTextureVertex"));
mObInitMap.put(new Pair<String, String>("bmh", "net/minecraft/client/renderer/Tessellator"));
mObInitMap.put(new Pair<String, String>("ra", "net/minecraft/inventory/InventoryLargeChest"));
- mObInitMap.put(new Pair<String, String>(
- "nb", "net/minecraft/client/network/NetHandlerHandshakeMemory$SwitchEnumConnectionState"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "nb",
+ "net/minecraft/client/network/NetHandlerHandshakeMemory$SwitchEnumConnectionState"));
mObInitMap.put(new Pair<String, String>("jc", "net/minecraft/network/play/client/C00PacketKeepAlive"));
mObInitMap.put(new Pair<String, String>("fd", "net/minecraft/util/MessageSerializer2"));
mObInitMap.put(new Pair<String, String>("be", "net/minecraft/command/server/CommandPardonPlayer"));
@@ -5697,17 +5775,21 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("afn", "net/minecraft/enchantment/EnchantmentArrowFire"));
mObInitMap.put(new Pair<String, String>("brn", "net/minecraft/client/resources/SkinManager$3$1"));
mObInitMap.put(new Pair<String, String>("aqv", "net/minecraft/world/gen/ChunkProviderHell"));
- mObInitMap.put(new Pair<String, String>(
- "auu", "net/minecraft/world/gen/structure/StructureStrongholdPieces$RightTurn"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "auu",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$RightTurn"));
mObInitMap.put(new Pair<String, String>("ayt", "net/minecraft/world/storage/WorldInfo$1"));
mObInitMap.put(new Pair<String, String>("bbr", "net/minecraft/util/Timer"));
mObInitMap.put(new Pair<String, String>("bfq", "net/minecraft/client/gui/GuiEnchantment"));
mObInitMap.put(new Pair<String, String>("bjp", "net/minecraft/client/multiplayer/ServerList"));
mObInitMap.put(new Pair<String, String>("bno", "net/minecraft/client/renderer/entity/Render"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/RealmsLevelSummary", "net/minecraft/realms/RealmsLevelSummary"));
mObInitMap.put(
- new Pair<String, String>("gk", "net/minecraft/network/play/server/S22PacketMultiBlockChange"));
+ new Pair<String, String>(
+ "net/minecraft/realms/RealmsLevelSummary",
+ "net/minecraft/realms/RealmsLevelSummary"));
+ mObInitMap
+ .put(new Pair<String, String>("gk", "net/minecraft/network/play/server/S22PacketMultiBlockChange"));
mObInitMap.put(new Pair<String, String>("cl", "net/minecraft/block/BlockSourceImpl"));
mObInitMap.put(new Pair<String, String>("vr", "net/minecraft/entity/ai/EntityAITargetNonTamed"));
mObInitMap.put(new Pair<String, String>("rs", "net/minecraft/potion/PotionAttackDamage"));
@@ -5719,13 +5801,15 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("bge", "net/minecraft/client/gui/ServerSelectionList"));
mObInitMap.put(new Pair<String, String>("wf", "net/minecraft/entity/passive/EntityAnimal"));
mObInitMap.put(new Pair<String, String>("sg", "net/minecraft/entity/EntityList"));
- mObInitMap.put(new Pair<String, String>(
- "oh", "net/minecraft/server/management/PreYggdrasilConverter$ConversionError"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "oh",
+ "net/minecraft/server/management/PreYggdrasilConverter$ConversionError"));
mObInitMap.put(new Pair<String, String>("ki", "net/minecraft/network/status/client/C01PacketPing"));
mObInitMap.put(new Pair<String, String>("gj", "net/minecraft/network/play/server/S02PacketChat"));
mObInitMap.put(new Pair<String, String>("acb", "net/minecraft/creativetab/CreativeTabs$5"));
- mObInitMap.put(
- new Pair<String, String>("aga", "net/minecraft/enchantment/EnchantmentHelper$ModifierLiving"));
+ mObInitMap
+ .put(new Pair<String, String>("aga", "net/minecraft/enchantment/EnchantmentHelper$ModifierLiving"));
mObInitMap.put(
new Pair<String, String>("bsa", "net/minecraft/client/resources/data/AnimationMetadataSection"));
mObInitMap.put(new Pair<String, String>("bkc", "net/minecraft/client/particle/EntityFireworkOverlayFX"));
@@ -5746,8 +5830,8 @@ public class DevHelper {
new Pair<String, String>("tn", "net/minecraft/entity/ai/attributes/ModifiableAttributeInstance"));
mObInitMap.put(new Pair<String, String>("po", "net/minecraft/util/IJsonSerializable"));
mObInitMap.put(new Pair<String, String>("lp", "net/minecraft/scoreboard/ServerScoreboard"));
- mObInitMap.put(
- new Pair<String, String>("hq", "net/minecraft/network/play/server/S13PacketDestroyEntities"));
+ mObInitMap
+ .put(new Pair<String, String>("hq", "net/minecraft/network/play/server/S13PacketDestroyEntities"));
mObInitMap.put(new Pair<String, String>("dr", "net/minecraft/nbt/NBTTagLong"));
mObInitMap.put(new Pair<String, String>("adi", "net/minecraft/item/ItemBucketMilk"));
mObInitMap.put(new Pair<String, String>("ahh", "net/minecraft/world/IWorldAccess"));
@@ -5767,15 +5851,19 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ahg", "net/minecraft/world/MinecraftException"));
mObInitMap.put(new Pair<String, String>("axc", "net/minecraft/world/gen/layer/GenLayerAddMushroomIsland"));
mObInitMap.put(new Pair<String, String>("baa", "net/minecraft/scoreboard/Score$1"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/DisconnectedOnlineScreen", "net/minecraft/realms/DisconnectedOnlineScreen"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/realms/DisconnectedOnlineScreen",
+ "net/minecraft/realms/DisconnectedOnlineScreen"));
mObInitMap.put(new Pair<String, String>("btg", "net/minecraft/client/audio/MusicTicker"));
mObInitMap.put(new Pair<String, String>("ua", "net/minecraft/entity/ai/EntityAIMate"));
mObInitMap.put(new Pair<String, String>("mc", "net/minecraft/server/gui/MinecraftServerGui$4"));
mObInitMap.put(new Pair<String, String>("id", "net/minecraft/network/play/server/S3EPacketTeams"));
mObInitMap.put(new Pair<String, String>("q", "net/minecraft/util/Facing"));
- mObInitMap.put(new Pair<String, String>(
- "atw", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Start"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atw",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Start"));
mObInitMap.put(new Pair<String, String>("apx", "net/minecraft/world/chunk/Chunk"));
mObInitMap.put(new Pair<String, String>("aly", "net/minecraft/block/BlockMelon"));
mObInitMap.put(new Pair<String, String>("ahz", "net/minecraft/world/biome/BiomeCache$Block"));
@@ -5799,8 +5887,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("bas", "net/minecraft/client/Minecraft$12"));
mObInitMap.put(new Pair<String, String>("ber", "net/minecraft/client/gui/IProgressMeter"));
mObInitMap.put(new Pair<String, String>("biq", "net/minecraft/client/model/ModelDragon"));
- mObInitMap.put(new Pair<String, String>(
- "bmp", "net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bmp",
+ "net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer"));
mObInitMap.put(new Pair<String, String>("ri", "net/minecraft/profiler/PlayerUsageSnooper"));
mObInitMap.put(new Pair<String, String>("nj", "net/minecraft/network/NetHandlerPlayServer$2"));
mObInitMap.put(new Pair<String, String>("jk", "net/minecraft/network/play/client/C0CPacketInput"));
@@ -5848,8 +5938,8 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("akh", "net/minecraft/block/BlockDeadBush"));
mObInitMap.put(new Pair<String, String>("acj", "net/minecraft/item/ItemDye"));
mObInitMap.put(new Pair<String, String>("agi", "net/minecraft/enchantment/EnchantmentProtection"));
- mObInitMap.put(
- new Pair<String, String>("bsi", "net/minecraft/client/resources/data/TextureMetadataSection"));
+ mObInitMap
+ .put(new Pair<String, String>("bsi", "net/minecraft/client/resources/data/TextureMetadataSection"));
mObInitMap.put(new Pair<String, String>("bcm", "net/minecraft/client/gui/GuiSlot"));
mObInitMap.put(new Pair<String, String>("bgl", "net/minecraft/client/gui/GuiResourcePackSelected"));
mObInitMap.put(new Pair<String, String>("bkk", "net/minecraft/client/particle/EntityLavaFX"));
@@ -5861,15 +5951,17 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("hf", "net/minecraft/network/play/server/S14PacketEntity"));
mObInitMap.put(new Pair<String, String>("dg", "net/minecraft/nbt/NBTTagByte"));
mObInitMap.put(new Pair<String, String>("ase", "net/minecraft/world/gen/feature/WorldGenMinable"));
- mObInitMap.put(new Pair<String, String>(
- "awd", "net/minecraft/world/gen/structure/StructureVillagePieces$Village"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "awd",
+ "net/minecraft/world/gen/structure/StructureVillagePieces$Village"));
mObInitMap.put(new Pair<String, String>("bda", "net/minecraft/client/gui/GuiCreateFlatWorld$Details"));
mObInitMap.put(new Pair<String, String>("hy", "net/minecraft/network/play/server/S12PacketEntityVelocity"));
mObInitMap.put(new Pair<String, String>("dz", "net/minecraft/nbt/NBTBase$NBTPrimitive"));
mObInitMap.put(new Pair<String, String>("xa", "net/minecraft/entity/boss/EntityDragon"));
mObInitMap.put(new Pair<String, String>("tb", "net/minecraft/entity/item/EntityPainting"));
- mObInitMap.put(
- new Pair<String, String>("asx", "net/minecraft/world/gen/structure/StructureMineshaftPieces"));
+ mObInitMap
+ .put(new Pair<String, String>("asx", "net/minecraft/world/gen/structure/StructureMineshaftPieces"));
mObInitMap.put(new Pair<String, String>("aoy", "net/minecraft/tileentity/TileEntityCommandBlock$1"));
mObInitMap.put(new Pair<String, String>("akz", "net/minecraft/block/BlockFence"));
mObInitMap.put(new Pair<String, String>("aww", "net/minecraft/block/material/MaterialPortal"));
@@ -5881,8 +5973,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("lw", "net/minecraft/server/dedicated/DedicatedServer$3"));
mObInitMap.put(new Pair<String, String>("hx", "net/minecraft/network/play/server/S1BPacketEntityAttach"));
mObInitMap.put(new Pair<String, String>("f", "net/minecraft/crash/CrashReport$4"));
- mObInitMap.put(new Pair<String, String>(
- "atl", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Entrance"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atl",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Entrance"));
mObInitMap.put(new Pair<String, String>("apm", "net/minecraft/tileentity/TileEntitySign"));
mObInitMap.put(new Pair<String, String>("aln", "net/minecraft/block/BlockHopper"));
mObInitMap.put(new Pair<String, String>("adp", "net/minecraft/item/ItemPotion"));
@@ -5894,11 +5988,13 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("yh", "net/minecraft/entity/monster/EntityPigZombie"));
mObInitMap.put(new Pair<String, String>("ui", "net/minecraft/entity/ai/EntityAIBase"));
mObInitMap.put(new Pair<String, String>("qj", "net/minecraft/profiler/Profiler$Result"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/RealmsServerStatusPinger", "net/minecraft/realms/RealmsServerStatusPinger"));
- mObInitMap.put(new Pair<String, String>("mk", "net/minecraft/world/demo/DemoWorldServer"));
mObInitMap.put(
- new Pair<String, String>("il", "net/minecraft/network/play/server/S20PacketEntityProperties"));
+ new Pair<String, String>(
+ "net/minecraft/realms/RealmsServerStatusPinger",
+ "net/minecraft/realms/RealmsServerStatusPinger"));
+ mObInitMap.put(new Pair<String, String>("mk", "net/minecraft/world/demo/DemoWorldServer"));
+ mObInitMap
+ .put(new Pair<String, String>("il", "net/minecraft/network/play/server/S20PacketEntityProperties"));
mObInitMap.put(new Pair<String, String>("em", "net/minecraft/network/NetworkManager$3"));
mObInitMap.put(new Pair<String, String>("an", "net/minecraft/command/server/CommandEmote"));
mObInitMap.put(new Pair<String, String>("aqa", "net/minecraft/world/chunk/storage/NibbleArrayReader"));
@@ -5931,12 +6027,16 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aqs", "net/minecraft/world/gen/MapGenRavine"));
mObInitMap.put(new Pair<String, String>("amt", "net/minecraft/block/BlockRailPowered"));
mObInitMap.put(new Pair<String, String>("aiu", "net/minecraft/world/biome/BiomeGenStoneBeach"));
- mObInitMap.put(new Pair<String, String>(
- "aur", "net/minecraft/world/gen/structure/StructureStrongholdPieces$PieceWeight"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aur",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$PieceWeight"));
mObInitMap.put(new Pair<String, String>("ayq", "net/minecraft/world/storage/SaveHandler"));
mObInitMap.put(new Pair<String, String>("bbo", "net/minecraft/client/LoadingScreenRenderer"));
- mObInitMap.put(new Pair<String, String>(
- "bfn", "net/minecraft/client/gui/inventory/GuiContainerCreative$CreativeSlot"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bfn",
+ "net/minecraft/client/gui/inventory/GuiContainerCreative$CreativeSlot"));
mObInitMap.put(new Pair<String, String>("bjm", "net/minecraft/client/multiplayer/ServerAddress"));
mObInitMap.put(new Pair<String, String>("buu", "net/minecraft/client/renderer/OpenGlHelper"));
mObInitMap.put(new Pair<String, String>("zn", "net/minecraft/entity/item/EntityExpBottle"));
@@ -5958,8 +6058,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("wc", "net/minecraft/village/VillageCollection"));
mObInitMap.put(new Pair<String, String>("sd", "net/minecraft/entity/Entity$SwitchEnumEntitySize"));
mObInitMap.put(new Pair<String, String>("oe", "net/minecraft/server/management/PreYggdrasilConverter$5"));
- mObInitMap.put(new Pair<String, String>(
- "kf", "net/minecraft/network/ServerStatusResponse$MinecraftProtocolVersionIdentifier"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "kf",
+ "net/minecraft/network/ServerStatusResponse$MinecraftProtocolVersionIdentifier"));
mObInitMap.put(new Pair<String, String>("gg", "net/minecraft/network/play/server/S24PacketBlockAction"));
mObInitMap.put(new Pair<String, String>("ch", "net/minecraft/command/CommandNotFoundException"));
mObInitMap.put(new Pair<String, String>("arz", "net/minecraft/world/gen/feature/WorldGenMegaJungle"));
@@ -5974,8 +6076,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("agq", "net/minecraft/tileentity/MobSpawnerBaseLogic"));
mObInitMap.put(new Pair<String, String>("bsq", "net/minecraft/client/audio/SoundList$SoundEntry"));
mObInitMap.put(new Pair<String, String>("bor", "net/minecraft/client/renderer/entity/RenderSilverfish"));
- mObInitMap.put(new Pair<String, String>(
- "avx", "net/minecraft/world/gen/structure/StructureVillagePieces$WoodHut"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "avx",
+ "net/minecraft/world/gen/structure/StructureVillagePieces$WoodHut"));
mObInitMap.put(new Pair<String, String>("azw", "net/minecraft/util/Vec3"));
mObInitMap.put(new Pair<String, String>("bcu", "net/minecraft/client/gui/GuiConfirmOpenLink"));
mObInitMap.put(new Pair<String, String>("bgt", "net/minecraft/client/main/Main$1"));
@@ -6006,8 +6110,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ia", "net/minecraft/network/play/server/S1FPacketSetExperience"));
mObInitMap.put(new Pair<String, String>("eb", "net/minecraft/nbt/JsonToNBT"));
mObInitMap.put(new Pair<String, String>("ac", "net/minecraft/command/ICommandSender"));
- mObInitMap.put(new Pair<String, String>(
- "att", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$PieceWeight"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "att",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$PieceWeight"));
mObInitMap.put(new Pair<String, String>("apu", "net/minecraft/world/chunk/IChunkProvider"));
mObInitMap.put(new Pair<String, String>("alv", "net/minecraft/block/BlockLever"));
mObInitMap.put(new Pair<String, String>("adx", "net/minecraft/item/ItemShears"));
@@ -6018,28 +6124,36 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("bly", "net/minecraft/client/renderer/ItemRenderer"));
mObInitMap.put(new Pair<String, String>("uq", "net/minecraft/entity/ai/EntityAIAttackOnCollide"));
mObInitMap.put(new Pair<String, String>("ms", "net/minecraft/world/gen/ChunkProviderServer"));
- mObInitMap.put(new Pair<String, String>(
- "it", "net/minecraft/network/play/client/C16PacketClientStatus$EnumState"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "it",
+ "net/minecraft/network/play/client/C16PacketClientStatus$EnumState"));
mObInitMap.put(new Pair<String, String>("eu", "net/minecraft/network/NetworkStatistics"));
mObInitMap.put(new Pair<String, String>("av", "net/minecraft/command/CommandServerKick"));
mObInitMap.put(new Pair<String, String>("ael", "net/minecraft/item/ItemWritableBook"));
mObInitMap.put(new Pair<String, String>("aam", "net/minecraft/inventory/ContainerHorseInventory"));
mObInitMap.put(new Pair<String, String>("aik", "net/minecraft/world/biome/BiomeGenJungle"));
mObInitMap.put(new Pair<String, String>("m", "net/minecraft/crash/CrashReportCategory$2"));
- mObInitMap.put(new Pair<String, String>(
- "buk", "net/minecraft/client/stream/IngestServerTester$IngestTestListener"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "buk",
+ "net/minecraft/client/stream/IngestServerTester$IngestTestListener"));
mObInitMap.put(new Pair<String, String>("bql", "net/minecraft/client/renderer/texture/TextureClock"));
- mObInitMap.put(new Pair<String, String>(
- "ats", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Piece"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "ats",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Piece"));
mObInitMap.put(new Pair<String, String>("axr", "net/minecraft/world/gen/layer/GenLayerHills"));
mObInitMap.put(new Pair<String, String>("bap", "net/minecraft/client/Minecraft$1"));
- mObInitMap.put(
- new Pair<String, String>("beo", "net/minecraft/client/gui/achievement/GuiStats$StatsItem$1"));
+ mObInitMap
+ .put(new Pair<String, String>("beo", "net/minecraft/client/gui/achievement/GuiStats$StatsItem$1"));
mObInitMap.put(new Pair<String, String>("bin", "net/minecraft/client/model/ModelWither"));
- mObInitMap.put(new Pair<String, String>(
- "bmm", "net/minecraft/client/renderer/tileentity/TileEntityChestRenderer"));
mObInitMap.put(
- new Pair<String, String>("jh", "net/minecraft/network/play/client/C13PacketPlayerAbilities"));
+ new Pair<String, String>(
+ "bmm",
+ "net/minecraft/client/renderer/tileentity/TileEntityChestRenderer"));
+ mObInitMap
+ .put(new Pair<String, String>("jh", "net/minecraft/network/play/client/C13PacketPlayerAbilities"));
mObInitMap.put(new Pair<String, String>("fi", "net/minecraft/event/ClickEvent$Action"));
mObInitMap.put(new Pair<String, String>("bj", "net/minecraft/command/server/CommandSaveOn"));
mObInitMap.put(new Pair<String, String>("yo", "net/minecraft/entity/monster/EntitySpider$GroupData"));
@@ -6058,14 +6172,20 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("vd", "net/minecraft/entity/ai/EntityAIArrowAttack"));
mObInitMap.put(new Pair<String, String>("re", "net/minecraft/client/renderer/IconFlipped"));
mObInitMap.put(new Pair<String, String>("nf", "net/minecraft/network/NetworkSystem$3"));
- mObInitMap.put(new Pair<String, String>(
- "jg", "net/minecraft/network/play/client/C03PacketPlayer$C05PacketPlayerLook"));
- mObInitMap.put(new Pair<String, String>(
- "auz", "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stairs2"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "jg",
+ "net/minecraft/network/play/client/C03PacketPlayer$C05PacketPlayerLook"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "auz",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stairs2"));
mObInitMap.put(new Pair<String, String>("ayy", "net/minecraft/world/storage/WorldInfo$6"));
mObInitMap.put(new Pair<String, String>("bja", "net/minecraft/client/network/NetHandlerLoginClient$1"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/RealmsSharedConstants", "net/minecraft/realms/RealmsSharedConstants"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/realms/RealmsSharedConstants",
+ "net/minecraft/realms/RealmsSharedConstants"));
mObInitMap.put(new Pair<String, String>("zv", "net/minecraft/inventory/ContainerRepair$1"));
mObInitMap.put(new Pair<String, String>("vw", "net/minecraft/entity/ai/EntitySenses"));
mObInitMap.put(new Pair<String, String>("rx", "net/minecraft/entity/EntityAgeable"));
@@ -6090,12 +6210,14 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ake", "net/minecraft/block/BlockWorkbench"));
mObInitMap.put(new Pair<String, String>("acg", "net/minecraft/item/ItemTool"));
mObInitMap.put(new Pair<String, String>("agf", "net/minecraft/enchantment/EnchantmentKnockback"));
- mObInitMap.put(new Pair<String, String>(
- "bsf", "net/minecraft/client/resources/data/LanguageMetadataSectionSerializer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bsf",
+ "net/minecraft/client/resources/data/LanguageMetadataSectionSerializer"));
mObInitMap.put(new Pair<String, String>("avm", "net/minecraft/world/gen/structure/StructureStart"));
mObInitMap.put(new Pair<String, String>("bcj", "net/minecraft/client/gui/GuiOptionButton"));
- mObInitMap.put(
- new Pair<String, String>("bgi", "net/minecraft/client/resources/ResourcePackListEntryFound"));
+ mObInitMap
+ .put(new Pair<String, String>("bgi", "net/minecraft/client/resources/ResourcePackListEntryFound"));
mObInitMap.put(new Pair<String, String>("bkh", "net/minecraft/client/particle/EntityHeartFX"));
mObInitMap.put(new Pair<String, String>("bog", "net/minecraft/client/renderer/entity/RenderLightningBolt"));
mObInitMap.put(new Pair<String, String>("lb", "net/minecraft/client/util/JsonException"));
@@ -6120,8 +6242,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("lt", "net/minecraft/server/dedicated/DedicatedServer"));
mObInitMap.put(new Pair<String, String>("hu", "net/minecraft/network/play/server/S09PacketHeldItemChange"));
mObInitMap.put(new Pair<String, String>("dv", "net/minecraft/nbt/NBTUtil"));
- mObInitMap.put(new Pair<String, String>(
- "ati", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Straight"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "ati",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Straight"));
mObInitMap.put(new Pair<String, String>("apj", "net/minecraft/tileentity/TileEntityMobSpawner"));
mObInitMap.put(new Pair<String, String>("alk", "net/minecraft/block/BlockBreakable"));
mObInitMap.put(new Pair<String, String>("adm", "net/minecraft/item/ItemNameTag"));
@@ -6140,8 +6264,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aab", "net/minecraft/inventory/ContainerBrewingStand$Potion"));
mObInitMap.put(new Pair<String, String>("b", "net/minecraft/crash/CrashReport"));
mObInitMap.put(new Pair<String, String>("bqa", "net/minecraft/client/renderer/texture/TextureMap$1"));
- mObInitMap.put(new Pair<String, String>(
- "ath", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$End"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "ath",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$End"));
mObInitMap.put(new Pair<String, String>("bae", "net/minecraft/scoreboard/Team"));
mObInitMap.put(new Pair<String, String>("bed", "net/minecraft/client/gui/GuiScreenOptionsSounds$Button"));
mObInitMap.put(new Pair<String, String>("bic", "net/minecraft/client/model/ModelSkeleton"));
@@ -6159,8 +6285,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("amq", "net/minecraft/block/BlockPortal$Size"));
mObInitMap.put(new Pair<String, String>("aat", "net/minecraft/inventory/ContainerMerchant"));
mObInitMap.put(new Pair<String, String>("air", "net/minecraft/world/biome/BiomeGenRiver"));
- mObInitMap.put(new Pair<String, String>(
- "auo", "net/minecraft/world/gen/structure/StructureStrongholdPieces$Crossing"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "auo",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$Crossing"));
mObInitMap.put(new Pair<String, String>("ayn", "net/minecraft/world/chunk/storage/AnvilSaveConverter"));
mObInitMap.put(new Pair<String, String>("bbl", "net/minecraft/client/settings/GameSettings$SwitchOptions"));
mObInitMap.put(new Pair<String, String>("bur", "net/minecraft/client/stream/NullStream"));
@@ -6179,8 +6307,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("abh", "net/minecraft/item/ItemBlock"));
mObInitMap.put(new Pair<String, String>("afg", "net/minecraft/item/crafting/IRecipe"));
mObInitMap.put(new Pair<String, String>("ajf", "net/minecraft/block/BlockRailBase$Rail"));
- mObInitMap.put(new Pair<String, String>(
- "avc", "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stronghold"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "avc",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stronghold"));
mObInitMap.put(
new Pair<String, String>("brg", "net/minecraft/client/resources/SimpleReloadableResourceManager"));
mObInitMap.put(new Pair<String, String>("bbk", "net/minecraft/client/settings/GameSettings$1"));
@@ -6189,16 +6319,18 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("bnh", "net/minecraft/client/renderer/entity/RenderCow"));
mObInitMap.put(new Pair<String, String>("sa", "net/minecraft/entity/Entity"));
mObInitMap.put(new Pair<String, String>("ob", "net/minecraft/server/management/PreYggdrasilConverter$2"));
- mObInitMap.put(
- new Pair<String, String>("kc", "net/minecraft/network/ServerStatusResponse$PlayerCountData"));
+ mObInitMap
+ .put(new Pair<String, String>("kc", "net/minecraft/network/ServerStatusResponse$PlayerCountData"));
mObInitMap.put(new Pair<String, String>("gd", "net/minecraft/network/play/server/S37PacketStatistics"));
mObInitMap.put(new Pair<String, String>("ce", "net/minecraft/command/NumberInvalidException"));
mObInitMap.put(new Pair<String, String>("net/minecraft/realms/Realms", "net/minecraft/realms/Realms"));
mObInitMap.put(new Pair<String, String>("ajy", "net/minecraft/block/BlockClay"));
mObInitMap.put(new Pair<String, String>("afz", "net/minecraft/enchantment/EnchantmentHelper$IModifier"));
mObInitMap.put(new Pair<String, String>("brz", "net/minecraft/client/resources/data/AnimationFrame"));
- mObInitMap.put(new Pair<String, String>(
- "avb", "net/minecraft/world/gen/structure/StructureStrongholdPieces$StairsStraight"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "avb",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$StairsStraight"));
mObInitMap.put(new Pair<String, String>("aza", "net/minecraft/world/storage/WorldInfo$8"));
mObInitMap.put(new Pair<String, String>("kv", "net/minecraft/init/Bootstrap$5"));
mObInitMap.put(new Pair<String, String>("gw", "net/minecraft/network/play/server/S00PacketKeepAlive"));
@@ -6206,12 +6338,16 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("arv", "net/minecraft/world/gen/feature/WorldGenIcePath"));
mObInitMap.put(new Pair<String, String>("anw", "net/minecraft/block/BlockStoneBrick"));
mObInitMap.put(new Pair<String, String>("ajx", "net/minecraft/block/BlockChest"));
- mObInitMap.put(new Pair<String, String>(
- "avu", "net/minecraft/world/gen/structure/StructureVillagePieces$PieceWeight"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "avu",
+ "net/minecraft/world/gen/structure/StructureVillagePieces$PieceWeight"));
mObInitMap.put(new Pair<String, String>("azt", "net/minecraft/util/AxisAlignedBB"));
mObInitMap.put(new Pair<String, String>("bcr", "net/minecraft/client/gui/GuiSlotRealmsProxy"));
- mObInitMap.put(new Pair<String, String>(
- "bgq", "net/minecraft/client/gui/stream/GuiStreamUnavailable$SwitchReason"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bgq",
+ "net/minecraft/client/gui/stream/GuiStreamUnavailable$SwitchReason"));
mObInitMap.put(new Pair<String, String>("bkp", "net/minecraft/client/particle/EffectRenderer$2"));
mObInitMap.put(new Pair<String, String>("wr", "net/minecraft/entity/monster/EntitySnowman"));
mObInitMap.put(new Pair<String, String>("ss", "net/minecraft/entity/EntityHanging"));
@@ -6253,17 +6389,21 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ty", "net/minecraft/entity/ai/EntityAIBeg"));
mObInitMap.put(new Pair<String, String>("aaj", "net/minecraft/inventory/ContainerFurnace"));
mObInitMap.put(new Pair<String, String>("j", "net/minecraft/crash/CrashReport$8"));
- mObInitMap.put(new Pair<String, String>(
- "atp", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor2"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atp",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor2"));
mObInitMap.put(new Pair<String, String>("apq", "net/minecraft/block/BlockPistonExtension"));
mObInitMap.put(new Pair<String, String>("alr", "net/minecraft/block/BlockJukebox$TileEntityJukebox"));
mObInitMap.put(new Pair<String, String>("axo", "net/minecraft/world/gen/layer/GenLayer$1"));
mObInitMap.put(new Pair<String, String>("bam", "net/minecraft/client/renderer/RenderHelper"));
- mObInitMap.put(
- new Pair<String, String>("bel", "net/minecraft/client/gui/achievement/GuiStats$StatsBlock$1"));
+ mObInitMap
+ .put(new Pair<String, String>("bel", "net/minecraft/client/gui/achievement/GuiStats$StatsBlock$1"));
mObInitMap.put(new Pair<String, String>("bik", "net/minecraft/client/model/ModelVillager"));
- mObInitMap.put(new Pair<String, String>(
- "bmj", "net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bmj",
+ "net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer"));
mObInitMap.put(new Pair<String, String>("bg", "net/minecraft/command/server/CommandPublishLocalServer"));
mObInitMap.put(new Pair<String, String>("yl", "net/minecraft/entity/monster/EntitySkeleton"));
mObInitMap.put(new Pair<String, String>("um", "net/minecraft/entity/ai/EntityAILeapAtTarget"));
@@ -6273,8 +6413,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aeh", "net/minecraft/item/ItemSword"));
mObInitMap.put(new Pair<String, String>("aai", "net/minecraft/inventory/ContainerEnchantment$2"));
mObInitMap.put(new Pair<String, String>("aig", "net/minecraft/world/biome/BiomeGenForest$1"));
- mObInitMap.put(new Pair<String, String>(
- "aud", "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$JunglePyramid$Stones"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aud",
+ "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$JunglePyramid$Stones"));
mObInitMap.put(new Pair<String, String>("ayc", "net/minecraft/world/gen/layer/GenLayerZoom"));
mObInitMap.put(new Pair<String, String>("bba", "net/minecraft/client/Minecraft$4"));
mObInitMap.put(new Pair<String, String>("bug", "net/minecraft/client/stream/ChatController$ChatState"));
@@ -6289,8 +6431,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aqx", "net/minecraft/world/gen/MapGenBase"));
mObInitMap.put(new Pair<String, String>("amy", "net/minecraft/block/BlockRail"));
mObInitMap.put(new Pair<String, String>("aiz", "net/minecraft/world/gen/feature/WorldGenWaterlily"));
- mObInitMap.put(new Pair<String, String>(
- "auw", "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stones"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "auw",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stones"));
mObInitMap.put(new Pair<String, String>("vt", "net/minecraft/entity/ai/EntityAIOwnerHurtTarget"));
mObInitMap.put(new Pair<String, String>("ru", "net/minecraft/potion/PotionHealth"));
mObInitMap.put(
@@ -6302,10 +6446,14 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("abp", "net/minecraft/item/ItemCarrotOnAStick"));
mObInitMap.put(new Pair<String, String>("afo", "net/minecraft/enchantment/EnchantmentArrowInfinite"));
mObInitMap.put(new Pair<String, String>("ajn", "net/minecraft/init/Blocks"));
- mObInitMap.put(new Pair<String, String>(
- "bro", "net/minecraft/client/resources/SkinManager$SkinAvailableCallback"));
- mObInitMap.put(new Pair<String, String>(
- "auv", "net/minecraft/world/gen/structure/StructureStrongholdPieces$RoomCrossing"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bro",
+ "net/minecraft/client/resources/SkinManager$SkinAvailableCallback"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "auv",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$RoomCrossing"));
mObInitMap.put(new Pair<String, String>("ayu", "net/minecraft/world/storage/WorldInfo$2"));
mObInitMap.put(new Pair<String, String>("bbs", "net/minecraft/util/Session"));
mObInitMap.put(new Pair<String, String>("bfr", "net/minecraft/client/gui/inventory/GuiFurnace"));
@@ -6325,15 +6473,17 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("bke", "net/minecraft/client/particle/EntityFireworkStarterFX"));
mObInitMap.put(new Pair<String, String>("wg", "net/minecraft/entity/passive/EntityChicken"));
mObInitMap.put(new Pair<String, String>("sh", "net/minecraft/entity/EntityList$EntityEggInfo"));
- mObInitMap.put(
- new Pair<String, String>("oi", "net/minecraft/server/management/ServerConfigurationManager"));
+ mObInitMap
+ .put(new Pair<String, String>("oi", "net/minecraft/server/management/ServerConfigurationManager"));
mObInitMap.put(new Pair<String, String>("kj", "net/minecraft/network/status/client/C00PacketServerQuery"));
mObInitMap.put(new Pair<String, String>("aka", "net/minecraft/block/BlockColored"));
mObInitMap.put(new Pair<String, String>("acc", "net/minecraft/creativetab/CreativeTabs$6"));
+ mObInitMap
+ .put(new Pair<String, String>("agb", "net/minecraft/enchantment/EnchantmentHelper$ModifierDamage"));
mObInitMap.put(
- new Pair<String, String>("agb", "net/minecraft/enchantment/EnchantmentHelper$ModifierDamage"));
- mObInitMap.put(new Pair<String, String>(
- "bsb", "net/minecraft/client/resources/data/AnimationMetadataSectionSerializer"));
+ new Pair<String, String>(
+ "bsb",
+ "net/minecraft/client/resources/data/AnimationMetadataSectionSerializer"));
mObInitMap.put(new Pair<String, String>("bkd", "net/minecraft/client/particle/EntityFireworkSparkFX"));
mObInitMap.put(new Pair<String, String>("boc", "net/minecraft/client/renderer/entity/RenderItem$4"));
mObInitMap.put(new Pair<String, String>("wz", "net/minecraft/entity/item/EntityEnderCrystal"));
@@ -6347,9 +6497,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("bov", "net/minecraft/client/renderer/entity/RenderSpider"));
mObInitMap.put(new Pair<String, String>("bcy", "net/minecraft/client/multiplayer/GuiConnecting$1"));
mObInitMap.put(new Pair<String, String>("bkw", "net/minecraft/client/particle/EntitySnowShovelFX"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/RealmsAnvilLevelStorageSource",
- "net/minecraft/realms/RealmsAnvilLevelStorageSource"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/realms/RealmsAnvilLevelStorageSource",
+ "net/minecraft/realms/RealmsAnvilLevelStorageSource"));
mObInitMap.put(new Pair<String, String>("to", "net/minecraft/entity/ai/attributes/RangedAttribute"));
mObInitMap.put(new Pair<String, String>("pp", "net/minecraft/stats/StatList"));
mObInitMap.put(new Pair<String, String>("lq", "net/minecraft/server/dedicated/PropertyManager"));
@@ -6370,8 +6521,8 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("xm", "net/minecraft/entity/item/EntityMinecartChest"));
mObInitMap.put(
new Pair<String, String>("net/minecraft/realms/Tezzelator", "net/minecraft/realms/Tezzelator"));
- mObInitMap.put(
- new Pair<String, String>("ate", "net/minecraft/world/gen/structure/MapGenNetherBridge$Start"));
+ mObInitMap
+ .put(new Pair<String, String>("ate", "net/minecraft/world/gen/structure/MapGenNetherBridge$Start"));
mObInitMap.put(new Pair<String, String>("apf", "net/minecraft/tileentity/TileEntityFlowerPot"));
mObInitMap.put(new Pair<String, String>("alg", "net/minecraft/block/BlockGlowstone"));
mObInitMap.put(new Pair<String, String>("axd", "net/minecraft/world/gen/layer/GenLayerAddSnow"));
@@ -6396,19 +6547,23 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("amn", "net/minecraft/block/BlockOre"));
mObInitMap.put(new Pair<String, String>("aaq", "net/minecraft/inventory/ContainerPlayer$1"));
mObInitMap.put(new Pair<String, String>("aio", "net/minecraft/world/biome/BiomeGenOcean"));
- mObInitMap.put(new Pair<String, String>(
- "aul", "net/minecraft/world/gen/structure/StructureStrongholdPieces$SwitchDoor"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aul",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$SwitchDoor"));
mObInitMap.put(new Pair<String, String>("buo", "net/minecraft/client/stream/TwitchStream"));
mObInitMap.put(new Pair<String, String>("bqp", "net/minecraft/client/resources/DefaultResourcePack"));
mObInitMap.put(new Pair<String, String>("bat", "net/minecraft/client/Minecraft$13"));
mObInitMap.put(new Pair<String, String>("bes", "net/minecraft/client/gui/GuiKeyBindingList"));
mObInitMap.put(new Pair<String, String>("bir", "net/minecraft/client/model/ModelEnderCrystal"));
- mObInitMap.put(new Pair<String, String>(
- "bmq", "net/minecraft/client/renderer/tileentity/TileEntityRendererPiston"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bmq",
+ "net/minecraft/client/renderer/tileentity/TileEntityRendererPiston"));
mObInitMap.put(new Pair<String, String>("vi", "net/minecraft/entity/ai/EntityAICreeperSwell"));
mObInitMap.put(new Pair<String, String>("rj", "net/minecraft/profiler/PlayerUsageSnooper$1"));
- mObInitMap.put(
- new Pair<String, String>("nk", "net/minecraft/network/NetHandlerPlayServer$SwitchEnumState"));
+ mObInitMap
+ .put(new Pair<String, String>("nk", "net/minecraft/network/NetHandlerPlayServer$SwitchEnumState"));
mObInitMap.put(new Pair<String, String>("jl", "net/minecraft/network/play/client/C09PacketHeldItemChange"));
mObInitMap.put(new Pair<String, String>("fm", "net/minecraft/event/HoverEvent$Action"));
mObInitMap.put(new Pair<String, String>("bn", "net/minecraft/command/server/CommandSetDefaultSpawnpoint"));
@@ -6450,8 +6605,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("kr", "net/minecraft/init/Bootstrap$14"));
mObInitMap.put(new Pair<String, String>("gs", "net/minecraft/network/play/server/S40PacketDisconnect"));
mObInitMap.put(new Pair<String, String>("ct", "net/minecraft/util/ObjectIntIdentityMap"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/RealmsEditBox", "net/minecraft/realms/RealmsEditBox"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/realms/RealmsEditBox",
+ "net/minecraft/realms/RealmsEditBox"));
mObInitMap.put(new Pair<String, String>("asg", "net/minecraft/world/gen/feature/WorldGenPumpkin"));
mObInitMap.put(new Pair<String, String>("aoh", "net/minecraft/block/BlockVine"));
mObInitMap.put(new Pair<String, String>("aki", "net/minecraft/block/BlockRailDetector"));
@@ -6459,8 +6616,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("agj", "net/minecraft/enchantment/EnchantmentThorns"));
mObInitMap.put(
new Pair<String, String>("awf", "net/minecraft/world/gen/structure/StructureVillagePieces$Well"));
- mObInitMap.put(new Pair<String, String>(
- "bsj", "net/minecraft/client/resources/data/TextureMetadataSectionSerializer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bsj",
+ "net/minecraft/client/resources/data/TextureMetadataSectionSerializer"));
mObInitMap.put(new Pair<String, String>("bok", "net/minecraft/client/renderer/entity/RenderLiving"));
mObInitMap.put(new Pair<String, String>("bcn", "net/minecraft/client/gui/GuiOptionSlider"));
mObInitMap.put(new Pair<String, String>("bgm", "net/minecraft/client/gui/stream/GuiIngestServers"));
@@ -6468,31 +6627,39 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("xc", "net/minecraft/entity/boss/EntityWither"));
mObInitMap.put(new Pair<String, String>("td", "net/minecraft/entity/EntityCreature"));
mObInitMap.put(new Pair<String, String>("pe", "net/minecraft/stats/StatBasic"));
- mObInitMap.put(new Pair<String, String>(
- "hg", "net/minecraft/network/play/server/S14PacketEntity$S15PacketEntityRelMove"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "hg",
+ "net/minecraft/network/play/server/S14PacketEntity$S15PacketEntityRelMove"));
mObInitMap.put(new Pair<String, String>("dh", "net/minecraft/nbt/NBTTagCompound"));
mObInitMap.put(
new Pair<String, String>("awe", "net/minecraft/world/gen/structure/StructureVillagePieces$Road"));
mObInitMap.put(new Pair<String, String>("bdb", "net/minecraft/client/gui/GuiCreateWorld"));
mObInitMap.put(new Pair<String, String>("ly", "net/minecraft/server/gui/MinecraftServerGui"));
+ mObInitMap
+ .put(new Pair<String, String>("hz", "net/minecraft/network/play/server/S04PacketEntityEquipment"));
mObInitMap.put(
- new Pair<String, String>("hz", "net/minecraft/network/play/server/S04PacketEntityEquipment"));
- mObInitMap.put(new Pair<String, String>(
- "asy", "net/minecraft/world/gen/structure/StructureMineshaftPieces$Corridor"));
+ new Pair<String, String>(
+ "asy",
+ "net/minecraft/world/gen/structure/StructureMineshaftPieces$Corridor"));
mObInitMap.put(new Pair<String, String>("aoz", "net/minecraft/tileentity/TileEntityComparator"));
mObInitMap.put(new Pair<String, String>("awx", "net/minecraft/world/gen/layer/GenLayerDeepOcean"));
mObInitMap.put(new Pair<String, String>("bdu", "net/minecraft/client/gui/GuiDownloadTerrain"));
mObInitMap.put(new Pair<String, String>("bht", "net/minecraft/client/model/ModelOcelot"));
- mObInitMap.put(new Pair<String, String>(
- "bls", "net/minecraft/client/renderer/tileentity/TileEntityRendererChestHelper"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bls",
+ "net/minecraft/client/renderer/tileentity/TileEntityRendererChestHelper"));
mObInitMap.put(new Pair<String, String>("ap", "net/minecraft/command/CommandXP"));
mObInitMap.put(new Pair<String, String>("xu", "net/minecraft/entity/ai/EntityMinecartMobSpawner$1"));
mObInitMap.put(new Pair<String, String>("tv", "net/minecraft/entity/ai/EntityMoveHelper"));
mObInitMap.put(new Pair<String, String>("pw", "net/minecraft/util/HttpUtil$1"));
mObInitMap.put(new Pair<String, String>("lx", "net/minecraft/server/dedicated/DedicatedServer$4"));
mObInitMap.put(new Pair<String, String>("g", "net/minecraft/crash/CrashReport$5"));
- mObInitMap.put(new Pair<String, String>(
- "atm", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Crossing2"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atm",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Crossing2"));
mObInitMap.put(new Pair<String, String>("apn", "net/minecraft/tileentity/TileEntitySkull"));
mObInitMap.put(new Pair<String, String>("alo", "net/minecraft/block/BlockHugeMushroom"));
mObInitMap.put(new Pair<String, String>("adq", "net/minecraft/item/EnumRarity"));
@@ -6506,21 +6673,29 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("uj", "net/minecraft/entity/ai/EntityAITasks"));
mObInitMap.put(new Pair<String, String>("qk", "net/minecraft/util/IProgressUpdate"));
mObInitMap.put(new Pair<String, String>("ml", "net/minecraft/world/demo/DemoWorldManager"));
- mObInitMap.put(new Pair<String, String>(
- "im", "net/minecraft/network/play/server/S20PacketEntityProperties$Snapshot"));
- mObInitMap.put(new Pair<String, String>(
- "en", "net/minecraft/network/NetworkManager$InboundHandlerTuplePacketListener"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "im",
+ "net/minecraft/network/play/server/S20PacketEntityProperties$Snapshot"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "en",
+ "net/minecraft/network/NetworkManager$InboundHandlerTuplePacketListener"));
mObInitMap.put(new Pair<String, String>("ao", "net/minecraft/command/CommandEnchant"));
mObInitMap.put(new Pair<String, String>("amc", "net/minecraft/block/BlockMushroom"));
mObInitMap.put(new Pair<String, String>("aee", "net/minecraft/item/ItemMonsterPlacer"));
mObInitMap.put(new Pair<String, String>("aaf", "net/minecraft/inventory/ContainerWorkbench"));
mObInitMap.put(new Pair<String, String>("aid", "net/minecraft/world/biome/BiomeGenHills"));
- mObInitMap.put(new Pair<String, String>(
- "aua", "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$1"));
- mObInitMap.put(new Pair<String, String>(
- "bud", "net/minecraft/client/stream/BroadcastController$BroadcastListener"));
mObInitMap.put(
- new Pair<String, String>("bqe", "net/minecraft/client/renderer/texture/TextureAtlasSprite$1"));
+ new Pair<String, String>(
+ "aua",
+ "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$1"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bud",
+ "net/minecraft/client/stream/BroadcastController$BroadcastListener"));
+ mObInitMap
+ .put(new Pair<String, String>("bqe", "net/minecraft/client/renderer/texture/TextureAtlasSprite$1"));
mObInitMap.put(new Pair<String, String>("beh", "net/minecraft/client/gui/achievement/GuiAchievement"));
mObInitMap.put(new Pair<String, String>("big", "net/minecraft/client/model/ModelSpider"));
mObInitMap.put(new Pair<String, String>("ja", "net/minecraft/network/play/client/C02PacketUseEntity"));
@@ -6538,12 +6713,16 @@ public class DevHelper {
new Pair<String, String>("jt", "net/minecraft/network/login/server/S01PacketEncryptionRequest"));
mObInitMap.put(new Pair<String, String>("fu", "net/minecraft/network/play/server/S08PacketPlayerPosLook"));
mObInitMap.put(new Pair<String, String>("bv", "net/minecraft/command/server/CommandTeleport"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/realms/RealmsConnect", "net/minecraft/realms/RealmsConnect"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/realms/RealmsConnect",
+ "net/minecraft/realms/RealmsConnect"));
mObInitMap.put(new Pair<String, String>("abm", "net/minecraft/item/ItemBow"));
mObInitMap.put(new Pair<String, String>("amu", "net/minecraft/block/BlockPressurePlate"));
- mObInitMap.put(new Pair<String, String>(
- "aus", "net/minecraft/world/gen/structure/StructureStrongholdPieces$PortalRoom"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aus",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$PortalRoom"));
mObInitMap.put(new Pair<String, String>("ayr", "net/minecraft/world/storage/SaveFormatOld"));
mObInitMap.put(new Pair<String, String>("bbp", "net/minecraft/util/ScreenShotHelper"));
mObInitMap.put(new Pair<String, String>("bfo", "net/minecraft/client/renderer/InventoryEffectRenderer"));
@@ -6566,8 +6745,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("wd", "net/minecraft/entity/passive/EntityAmbientCreature"));
mObInitMap.put(new Pair<String, String>("se", "net/minecraft/entity/Entity$EnumEntitySize"));
mObInitMap.put(new Pair<String, String>("of", "net/minecraft/server/management/PreYggdrasilConverter$6"));
- mObInitMap.put(new Pair<String, String>(
- "kg", "net/minecraft/network/ServerStatusResponse$MinecraftProtocolVersionIdentifier$Serializer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "kg",
+ "net/minecraft/network/ServerStatusResponse$MinecraftProtocolVersionIdentifier$Serializer"));
mObInitMap.put(new Pair<String, String>("gh", "net/minecraft/network/play/server/S23PacketBlockChange"));
mObInitMap.put(new Pair<String, String>("ci", "net/minecraft/command/WrongUsageException"));
mObInitMap.put(
@@ -6583,8 +6764,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("kz", "net/minecraft/init/Bootstrap$8"));
mObInitMap.put(new Pair<String, String>("akq", "net/minecraft/block/BlockDropper"));
mObInitMap.put(new Pair<String, String>("acs", "net/minecraft/item/ItemFirework"));
- mObInitMap.put(new Pair<String, String>(
- "agr", "net/minecraft/tileentity/MobSpawnerBaseLogic$WeightedRandomMinecart"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "agr",
+ "net/minecraft/tileentity/MobSpawnerBaseLogic$WeightedRandomMinecart"));
mObInitMap.put(new Pair<String, String>("bsr", "net/minecraft/client/audio/SoundList$SoundEntry$Type"));
mObInitMap.put(new Pair<String, String>("bos", "net/minecraft/client/renderer/entity/RenderSkeleton"));
mObInitMap.put(
@@ -6608,8 +6791,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("tk", "net/minecraft/entity/ai/attributes/BaseAttribute"));
mObInitMap.put(new Pair<String, String>("pl", "net/minecraft/stats/StatBase$4"));
mObInitMap.put(new Pair<String, String>("lm", "net/minecraft/server/MinecraftServer$6"));
- mObInitMap.put(new Pair<String, String>(
- "atb", "net/minecraft/world/gen/structure/StructureMineshaftPieces$Stairs"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atb",
+ "net/minecraft/world/gen/structure/StructureMineshaftPieces$Stairs"));
mObInitMap.put(new Pair<String, String>("apc", "net/minecraft/tileentity/TileEntityDropper"));
mObInitMap.put(new Pair<String, String>("ald", "net/minecraft/block/BlockFlowerPot"));
mObInitMap.put(new Pair<String, String>("adf", "net/minecraft/item/ItemLead"));
@@ -6621,8 +6806,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ib", "net/minecraft/network/play/server/S06PacketUpdateHealth"));
mObInitMap.put(new Pair<String, String>("ec", "net/minecraft/nbt/JsonToNBT$Any"));
mObInitMap.put(new Pair<String, String>("ad", "net/minecraft/command/PlayerSelector"));
- mObInitMap.put(new Pair<String, String>(
- "atu", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Crossing"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atu",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Crossing"));
mObInitMap.put(new Pair<String, String>("apv", "net/minecraft/world/chunk/NibbleArray"));
mObInitMap.put(new Pair<String, String>("alw", "net/minecraft/block/BlockLiquid"));
mObInitMap.put(new Pair<String, String>("ady", "net/minecraft/item/ItemSpade"));
@@ -6699,8 +6886,8 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("bck", "net/minecraft/client/gui/GuiOptionsRowList"));
mObInitMap.put(new Pair<String, String>("bgj", "net/minecraft/client/gui/GuiResourcePackAvailable"));
mObInitMap.put(new Pair<String, String>("bki", "net/minecraft/client/particle/EntityLargeExplodeFX"));
- mObInitMap.put(
- new Pair<String, String>("boh", "net/minecraft/client/renderer/entity/RendererLivingEntity"));
+ mObInitMap
+ .put(new Pair<String, String>("boh", "net/minecraft/client/renderer/entity/RendererLivingEntity"));
mObInitMap.put(new Pair<String, String>("lc", "net/minecraft/client/util/JsonException$1"));
mObInitMap.put(new Pair<String, String>("hd", "net/minecraft/network/play/server/S01PacketJoinGame"));
mObInitMap.put(new Pair<String, String>("de", "net/minecraft/util/StringTranslate"));
@@ -6725,8 +6912,10 @@ public class DevHelper {
mObInitMap.put(
new Pair<String, String>("hv", "net/minecraft/network/play/server/S3DPacketDisplayScoreboard"));
mObInitMap.put(new Pair<String, String>("dw", "net/minecraft/nbt/NBTTagShort"));
- mObInitMap.put(new Pair<String, String>(
- "atj", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor3"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atj",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor3"));
mObInitMap.put(new Pair<String, String>("apk", "net/minecraft/tileentity/TileEntityMobSpawner$1"));
mObInitMap.put(new Pair<String, String>("all", "net/minecraft/block/BlockHardenedClay"));
mObInitMap.put(new Pair<String, String>("adn", "net/minecraft/item/ItemPickaxe"));
@@ -6763,13 +6952,15 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aqq", "net/minecraft/world/WorldProviderSurface"));
mObInitMap.put(new Pair<String, String>("amr", "net/minecraft/block/BlockPotato"));
mObInitMap.put(new Pair<String, String>("ais", "net/minecraft/world/biome/BiomeGenSavanna"));
- mObInitMap.put(new Pair<String, String>(
- "aup", "net/minecraft/world/gen/structure/StructureStrongholdPieces$LeftTurn"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aup",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$LeftTurn"));
mObInitMap.put(new Pair<String, String>("ayo", "net/minecraft/world/chunk/storage/AnvilSaveConverter$1"));
mObInitMap.put(new Pair<String, String>("bbm", "net/minecraft/client/settings/GameSettings$Options"));
mObInitMap.put(new Pair<String, String>("bus", "net/minecraft/realms/RealmsConnect$1"));
- mObInitMap.put(
- new Pair<String, String>("bqt", "net/minecraft/client/resources/FoliageColorReloadListener"));
+ mObInitMap
+ .put(new Pair<String, String>("bqt", "net/minecraft/client/resources/FoliageColorReloadListener"));
mObInitMap.put(new Pair<String, String>("zl", "net/minecraft/entity/projectile/EntityEgg"));
mObInitMap.put(new Pair<String, String>("vm", "net/minecraft/entity/ai/EntityAIDefendVillage"));
mObInitMap.put(new Pair<String, String>("rn", "net/minecraft/util/CombatTracker"));
@@ -6782,19 +6973,25 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("abi", "net/minecraft/item/ItemReed"));
mObInitMap.put(new Pair<String, String>("afh", "net/minecraft/item/crafting/ShapedRecipes"));
mObInitMap.put(new Pair<String, String>("ajg", "net/minecraft/block/BlockBeacon"));
- mObInitMap.put(new Pair<String, String>(
- "avd", "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stronghold$Door"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "avd",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stronghold$Door"));
mObInitMap.put(new Pair<String, String>("azc", "net/minecraft/world/storage/ISaveHandler"));
- mObInitMap.put(new Pair<String, String>(
- "brh", "net/minecraft/client/resources/SimpleReloadableResourceManager$1"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "brh",
+ "net/minecraft/client/resources/SimpleReloadableResourceManager$1"));
mObInitMap.put(new Pair<String, String>("bfk", "net/minecraft/client/gui/inventory/CreativeCrafting"));
mObInitMap.put(new Pair<String, String>("bjj", "net/minecraft/client/multiplayer/WorldClient$4"));
mObInitMap.put(new Pair<String, String>("bni", "net/minecraft/client/renderer/entity/RenderCreeper"));
mObInitMap.put(new Pair<String, String>("wa", "net/minecraft/village/Village$VillageAgressor"));
mObInitMap.put(new Pair<String, String>("sb", "net/minecraft/entity/Entity$1"));
mObInitMap.put(new Pair<String, String>("oc", "net/minecraft/server/management/PreYggdrasilConverter$3"));
- mObInitMap.put(new Pair<String, String>(
- "kd", "net/minecraft/network/ServerStatusResponse$PlayerCountData$Serializer"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "kd",
+ "net/minecraft/network/ServerStatusResponse$PlayerCountData$Serializer"));
mObInitMap.put(new Pair<String, String>("ge", "net/minecraft/network/play/server/S25PacketBlockBreakAnim"));
mObInitMap.put(new Pair<String, String>("cf", "net/minecraft/command/SyntaxErrorException"));
mObInitMap.put(new Pair<String, String>("any", "net/minecraft/block/BlockStoneSlab"));
@@ -6832,8 +7029,8 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("th", "net/minecraft/entity/ai/attributes/IAttribute"));
mObInitMap.put(new Pair<String, String>("pi", "net/minecraft/stats/StatBase$1"));
mObInitMap.put(new Pair<String, String>("lj", "net/minecraft/server/MinecraftServer$3"));
- mObInitMap.put(
- new Pair<String, String>("hk", "net/minecraft/network/play/server/S39PacketPlayerAbilities"));
+ mObInitMap
+ .put(new Pair<String, String>("hk", "net/minecraft/network/play/server/S39PacketPlayerAbilities"));
mObInitMap.put(new Pair<String, String>("dl", "net/minecraft/nbt/NBTTagEnd"));
mObInitMap.put(new Pair<String, String>("ala", "net/minecraft/block/BlockFenceGate"));
mObInitMap.put(new Pair<String, String>("adc", "net/minecraft/item/Item$ToolMaterial"));
@@ -6861,16 +7058,20 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("aej", "net/minecraft/item/ItemLilyPad"));
mObInitMap.put(new Pair<String, String>("aak", "net/minecraft/inventory/SlotFurnace"));
mObInitMap.put(new Pair<String, String>("k", "net/minecraft/crash/CrashReportCategory"));
- mObInitMap.put(new Pair<String, String>(
- "atq", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$NetherStalkRoom"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atq",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$NetherStalkRoom"));
mObInitMap.put(new Pair<String, String>("apr", "net/minecraft/block/BlockPistonMoving"));
mObInitMap.put(new Pair<String, String>("axp", "net/minecraft/world/gen/layer/GenLayer$2"));
mObInitMap.put(new Pair<String, String>("ban", "net/minecraft/client/renderer/GLAllocation"));
- mObInitMap.put(
- new Pair<String, String>("bem", "net/minecraft/client/gui/achievement/GuiStats$StatsGeneral"));
+ mObInitMap
+ .put(new Pair<String, String>("bem", "net/minecraft/client/gui/achievement/GuiStats$StatsGeneral"));
mObInitMap.put(new Pair<String, String>("bil", "net/minecraft/client/model/ModelZombieVillager"));
- mObInitMap.put(new Pair<String, String>(
- "bmk", "net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "bmk",
+ "net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher"));
mObInitMap.put(new Pair<String, String>("bh", "net/minecraft/command/server/CommandSaveAll"));
mObInitMap.put(new Pair<String, String>("ym", "net/minecraft/entity/monster/EntitySlime"));
mObInitMap.put(new Pair<String, String>("un", "net/minecraft/entity/ai/EntityAIWatchClosest"));
@@ -6879,20 +7080,24 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("amg", "net/minecraft/block/BlockNetherrack"));
mObInitMap.put(new Pair<String, String>("aei", "net/minecraft/item/EnumAction"));
mObInitMap.put(new Pair<String, String>("aih", "net/minecraft/world/biome/BiomeGenForest$2"));
- mObInitMap.put(new Pair<String, String>(
- "aue", "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$Feature"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aue",
+ "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$Feature"));
mObInitMap.put(new Pair<String, String>("ayd", "net/minecraft/pathfinding/Path"));
mObInitMap.put(new Pair<String, String>("bbb", "net/minecraft/client/Minecraft$5"));
- mObInitMap.put(
- new Pair<String, String>("bfa", "net/minecraft/client/gui/inventory/GuiBeacon$CancelButton"));
+ mObInitMap
+ .put(new Pair<String, String>("bfa", "net/minecraft/client/gui/inventory/GuiBeacon$CancelButton"));
mObInitMap.put(new Pair<String, String>("buh", "net/minecraft/client/stream/ChatController$ChatListener"));
mObInitMap.put(new Pair<String, String>("bqi", "net/minecraft/client/renderer/texture/TextureUtil"));
mObInitMap.put(new Pair<String, String>("za", "net/minecraft/entity/player/EntityPlayer$EnumStatus"));
mObInitMap.put(new Pair<String, String>("vb", "net/minecraft/entity/ai/EntityAILookIdle"));
mObInitMap.put(new Pair<String, String>("rc", "net/minecraft/inventory/IInvBasic"));
mObInitMap.put(new Pair<String, String>("nd", "net/minecraft/network/NetworkSystem$1"));
- mObInitMap.put(new Pair<String, String>(
- "je", "net/minecraft/network/play/client/C03PacketPlayer$C04PacketPlayerPosition"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "je",
+ "net/minecraft/network/play/client/C03PacketPlayer$C04PacketPlayerPosition"));
mObInitMap.put(new Pair<String, String>("ff", "net/minecraft/util/ChatComponentStyle$1"));
mObInitMap.put(new Pair<String, String>("aqy", "net/minecraft/world/gen/MapGenCavesHell"));
mObInitMap.put(new Pair<String, String>("amz", "net/minecraft/block/BlockRedstoneOre"));
@@ -6980,8 +7185,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("uc", "net/minecraft/entity/ai/EntityAIDoorInteract"));
mObInitMap.put(new Pair<String, String>("qd", "net/minecraft/util/LongHashMap"));
mObInitMap.put(new Pair<String, String>("s", "net/minecraft/util/ReportedException"));
- mObInitMap.put(new Pair<String, String>(
- "net/minecraft/client/ClientBrandRetriever", "net/minecraft/client/ClientBrandRetriever"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "net/minecraft/client/ClientBrandRetriever",
+ "net/minecraft/client/ClientBrandRetriever"));
mObInitMap.put(new Pair<String, String>("apz", "net/minecraft/world/chunk/storage/ExtendedBlockStorage"));
mObInitMap.put(
new Pair<String, String>("aty", "net/minecraft/world/gen/structure/MapGenScatteredFeature$Start"));
@@ -6996,8 +7203,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("ez", "net/minecraft/util/MessageDeserializer"));
mObInitMap.put(new Pair<String, String>("amo", "net/minecraft/block/BlockPackedIce"));
mObInitMap.put(new Pair<String, String>("aip", "net/minecraft/world/biome/BiomeGenPlains"));
- mObInitMap.put(new Pair<String, String>(
- "aum", "net/minecraft/world/gen/structure/StructureStrongholdPieces$ChestCorridor"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "aum",
+ "net/minecraft/world/gen/structure/StructureStrongholdPieces$ChestCorridor"));
mObInitMap.put(new Pair<String, String>("ayl", "net/minecraft/world/WorldSavedData"));
mObInitMap.put(new Pair<String, String>("bup", "net/minecraft/client/stream/TwitchStream$1"));
mObInitMap.put(new Pair<String, String>("bqq", "net/minecraft/client/resources/FallbackResourceManager"));
@@ -7009,8 +7218,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("vj", "net/minecraft/entity/ai/EntityAIFollowGolem"));
mObInitMap.put(new Pair<String, String>("rk", "net/minecraft/profiler/IPlayerUsage"));
mObInitMap.put(new Pair<String, String>("nl", "net/minecraft/server/network/NetHandlerHandshakeTCP"));
- mObInitMap.put(new Pair<String, String>(
- "jm", "net/minecraft/network/play/client/C10PacketCreativeInventoryAction"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "jm",
+ "net/minecraft/network/play/client/C10PacketCreativeInventoryAction"));
mObInitMap.put(new Pair<String, String>("fn", "net/minecraft/util/ChatStyle"));
mObInitMap.put(new Pair<String, String>("bo", "net/minecraft/command/CommandSetPlayerTimeout"));
mObInitMap.put(new Pair<String, String>("anc", "net/minecraft/block/BlockRedstoneTorch"));
@@ -7062,8 +7273,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("te", "net/minecraft/entity/DataWatcher"));
mObInitMap.put(new Pair<String, String>("pf", "net/minecraft/stats/StatCrafting"));
mObInitMap.put(new Pair<String, String>("lg", "net/minecraft/server/ServerEula"));
- mObInitMap.put(new Pair<String, String>(
- "hh", "net/minecraft/network/play/server/S14PacketEntity$S17PacketEntityLookMove"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "hh",
+ "net/minecraft/network/play/server/S14PacketEntity$S17PacketEntityLookMove"));
mObInitMap.put(new Pair<String, String>("di", "net/minecraft/nbt/NBTTagCompound$1"));
mObInitMap.put(new Pair<String, String>("bdc", "net/minecraft/client/gui/GuiGameOver"));
mObInitMap.put(new Pair<String, String>("bla", "net/minecraft/client/particle/EntityAuraFX"));
@@ -7071,8 +7284,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("lz", "net/minecraft/server/gui/MinecraftServerGui$1"));
mObInitMap.put(new Pair<String, String>("ads", "net/minecraft/item/ItemRedstone"));
mObInitMap.put(new Pair<String, String>("bps", "net/minecraft/client/renderer/ThreadDownloadImageData$1"));
- mObInitMap.put(new Pair<String, String>(
- "asz", "net/minecraft/world/gen/structure/StructureMineshaftPieces$Cross"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "asz",
+ "net/minecraft/world/gen/structure/StructureMineshaftPieces$Cross"));
mObInitMap.put(new Pair<String, String>("awy", "net/minecraft/world/gen/layer/GenLayerEdge"));
mObInitMap.put(new Pair<String, String>("bdv", "net/minecraft/client/gui/GuiRenameWorld"));
mObInitMap.put(new Pair<String, String>("bhu", "net/minecraft/client/model/ModelPig"));
@@ -7083,8 +7298,10 @@ public class DevHelper {
mObInitMap.put(new Pair<String, String>("tw", "net/minecraft/entity/ai/EntityAIAvoidEntity"));
mObInitMap.put(new Pair<String, String>("px", "net/minecraft/util/HttpUtil$DownloadListener"));
mObInitMap.put(new Pair<String, String>("h", "net/minecraft/crash/CrashReport$6"));
- mObInitMap.put(new Pair<String, String>(
- "atn", "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor"));
+ mObInitMap.put(
+ new Pair<String, String>(
+ "atn",
+ "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor"));
mObInitMap.put(new Pair<String, String>("apo", "net/minecraft/tileentity/TileEntityEndPortal"));
mObInitMap.put(new Pair<String, String>("alp", "net/minecraft/block/BlockIce"));
mObInitMap.put(new Pair<String, String>("adr", "net/minecraft/item/ItemRecord"));
diff --git a/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
index bfd2cbae69..21d53cd615 100644
--- a/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
+++ b/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
@@ -1,13 +1,15 @@
package gtPlusPlus.preloader;
+import net.minecraft.item.ItemStack;
+
+import org.apache.logging.log4j.Level;
+
import cpw.mods.fml.relauncher.FMLRelaunchLog;
import gregtech.common.items.GT_MetaGenerated_Item_01;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import net.minecraft.item.ItemStack;
-import org.apache.logging.log4j.Level;
public class Preloader_GT_OreDict {
@@ -21,21 +23,18 @@ public class Preloader_GT_OreDict {
try {
if (CORE_Preloader.enableOldGTcircuits) {
- if ((bannedItem != null)
- && ItemUtils.getModId(bannedItem).toLowerCase().equals("gregtech")) {
+ if ((bannedItem != null) && ItemUtils.getModId(bannedItem).toLowerCase().equals("gregtech")) {
final int damageValue = bannedItem.getItemDamage() - 32000;
if (bannedItem.getItem() instanceof GT_MetaGenerated_Item_01) { // 700-720
if ((damageValue >= 700) && (damageValue <= 720)) {
return true;
}
} else {
- if (ReflectionUtils.doesClassExist(
- "gregtech.common.items.GT_MetaGenerated_Item_03")) { // 6/11/12/14/16/20/30-57/69-73/79-96
- final Class<?> MetaItem03 =
- ReflectionUtils.getClass("gregtech.common.items.GT_MetaGenerated_Item_03");
+ if (ReflectionUtils.doesClassExist("gregtech.common.items.GT_MetaGenerated_Item_03")) { // 6/11/12/14/16/20/30-57/69-73/79-96
+ final Class<?> MetaItem03 = ReflectionUtils
+ .getClass("gregtech.common.items.GT_MetaGenerated_Item_03");
if (isInstanceOf(MetaItem03, bannedItem.getItem())) {
- if ((damageValue == 6)
- || (damageValue == 7)
+ if ((damageValue == 6) || (damageValue == 7)
|| (damageValue == 11)
|| (damageValue == 12)
|| (damageValue == 14)
@@ -58,12 +57,8 @@ public class Preloader_GT_OreDict {
}
// Mekanism Support - Let's not make Mek Osmium useful in GT anymore.
- if ((((bannedItem != null)
- && !LoadedMods.RedTech
- && (ItemUtils.getModId(bannedItem)
- .toLowerCase()
- .equals("mekanism")))
- || (LoadedMods.Mekanism))
+ if ((((bannedItem != null) && !LoadedMods.RedTech
+ && (ItemUtils.getModId(bannedItem).toLowerCase().equals("mekanism"))) || (LoadedMods.Mekanism))
&& !LoadedMods.RedTech) {
// Circuits
if (ReflectionUtils.doesClassExist("mekanism.common.item.ItemControlCircuit")) {
@@ -200,8 +195,7 @@ public class Preloader_GT_OreDict {
"[GT++ ASM] OreDictTransformer",
Level.INFO,
"Item was not null, but still invalidly registering: %s",
- bannedItem.getDisplayName() != null
- ? bannedItem.getDisplayName()
+ bannedItem.getDisplayName() != null ? bannedItem.getDisplayName()
: "INVALID ITEM FOUND");
} else {
FMLRelaunchLog.log(
diff --git a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java
index efc35b8a72..42f9c40f39 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java
@@ -1,13 +1,16 @@
package gtPlusPlus.preloader.asm;
-import cpw.mods.fml.common.FMLLog;
-import gtPlusPlus.preloader.Preloader_Logger;
import java.io.File;
import java.util.ArrayList;
+
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
+
import org.apache.logging.log4j.Level;
+import cpw.mods.fml.common.FMLLog;
+import gtPlusPlus.preloader.Preloader_Logger;
+
public class AsmConfig {
public static boolean loaded;
@@ -104,8 +107,7 @@ public class AsmConfig {
propOrder.add(prop.getName());
prop = config.get("general", "enabledLwjglKeybindingFix", true);
- prop.comment =
- "Prevents the game crashing from having invalid keybinds. https://github.com/alkcorp/GTplusplus/issues/544";
+ prop.comment = "Prevents the game crashing from having invalid keybinds. https://github.com/alkcorp/GTplusplus/issues/544";
prop.setLanguageKey("gtpp.enabledLwjglKeybindingFix").setRequiresMcRestart(true);
enabledLwjglKeybindingFix = prop.getBoolean(true);
propOrder.add(prop.getName());
@@ -150,8 +152,8 @@ public class AsmConfig {
Preloader_Logger.INFO("COFH Patch - Enabled: " + enableCofhPatch);
Preloader_Logger.INFO("Gc Fuel Changes Patch - Enabled: " + enableGcFuelChanges);
Preloader_Logger.INFO("Thaumcraft Aspect Safety Patch - Enabled: " + enableTcAspectSafety);
- Preloader_Logger.INFO(
- "Fix bad usage of EntityLivingBase.setHealth Patch - Enabled: " + enabledFixEntitySetHealth);
+ Preloader_Logger
+ .INFO("Fix bad usage of EntityLivingBase.setHealth Patch - Enabled: " + enabledFixEntitySetHealth);
} catch (Exception var3) {
FMLLog.log(Level.ERROR, var3, "GT++ ASM had a problem loading it's config", new Object[0]);
diff --git a/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java b/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java
index 8f4809dcd6..a3fd8789c6 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java
@@ -15,31 +15,24 @@ public class ClassesToTransform {
public static final String TINKERS_FLUID_BLOCK = "tconstruct.smeltery.blocks.TConstructFluid";
public static final String GALACTICRAFT_FLUID_UTILS = "micdoodle8.mods.galacticraft.core.util.FluidUtil";
- public static final String GALACTICRAFT_TILE_ENTITY_FUEL_LOADER =
- "micdoodle8.mods.galacticraft.core.tile.TileEntityFuelLoader";
- public static final String GALACTICRAFT_ENTITY_AUTO_ROCKET =
- "micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket";
+ public static final String GALACTICRAFT_TILE_ENTITY_FUEL_LOADER = "micdoodle8.mods.galacticraft.core.tile.TileEntityFuelLoader";
+ public static final String GALACTICRAFT_ENTITY_AUTO_ROCKET = "micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket";
public static final String GT_UTILITY = "gregtech.api.util.GT_Utility";
public static final String GT_ACHIEVEMENTS = "gregtech.loaders.misc.GT_Achievements";
public static final String GT_CLIENT_PROXY = "gregtech.common.GT_Client";
public static final String GT_PACKET_TILE_ENTITY = "gregtech.api.net.GT_Packet_TileEntity";
public static final String GT_BASE_META_TILE_ENTITY = "gregtech.api.metatileentity.BaseMetaTileEntity";
- public static final String GT_MTE_CHARCOAL_PIT =
- "gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Charcoal_Pit";
+ public static final String GT_MTE_CHARCOAL_PIT = "gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Charcoal_Pit";
public static final String GT_ITEM_MACHINES = "gregtech.common.blocks.GT_Item_Machines";
public static final String GT_METAGENERATED_TOOL = "gregtech.api.items.GT_MetaGenerated_Tool";
public static final String GT_BLOCK_MACHINES = "gregtech.common.blocks.GT_Block_Machines";
- public static final String GT_MTE_HATCH_ENERGY =
- "gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy";
+ public static final String GT_MTE_HATCH_ENERGY = "gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy";
public static final String GT_METAPIPE_ITEM = "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item";
- public static final String GT_METAPIPE_FLUID =
- "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid";
- public static final String GT_METAPIPE_FRAME =
- "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame";
+ public static final String GT_METAPIPE_FLUID = "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid";
+ public static final String GT_METAPIPE_FRAME = "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame";
- public static final String GTPP_MTE_HATCH_RTG =
- "gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG";
+ public static final String GTPP_MTE_HATCH_RTG = "gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG";
public static final String THAUMCRAFT_ITEM_WISP_ESSENCE = "thaumcraft.common.items.ItemWispEssence";
public static final String THAUMCRAFT_CRAFTING_MANAGER = "thaumcraft.common.lib.crafting.ThaumcraftCraftingManager";
@@ -51,15 +44,13 @@ public class ClassesToTransform {
public static final String IC2_BLOCK_MACHINE1 = "ic2.core.block.machine.BlockMachine";
public static final String IC2_BLOCK_MACHINE2 = "ic2.core.block.machine.BlockMachine2";
public static final String IC2_BLOCK_MACHINE3 = "ic2.core.block.machine.BlockMachine3";
- public static final String IC2_BLOCK_KINETIC_GENERATOR =
- "ic2.core.block.kineticgenerator.block.BlockKineticGenerator";
+ public static final String IC2_BLOCK_KINETIC_GENERATOR = "ic2.core.block.kineticgenerator.block.BlockKineticGenerator";
public static final String IC2_BLOCK_HEAT_GENERATOR = "ic2.core.block.heatgenerator.block.BlockHeatGenerator";
public static final String IC2_BLOCK_GENERATOR = "ic2.core.block.generator.block.BlockGenerator";
public static final String IC2_BLOCK_REACTOR_ACCESS_HATCH = "ic2.core.block.reactor.block.BlockReactorAccessHatch";
public static final String IC2_BLOCK_REACTOR_CHAMBER = "ic2.core.block.reactor.block.BlockReactorChamber";
public static final String IC2_BLOCK_REACTOR_FLUID_PORT = "ic2.core.block.reactor.block.BlockReactorFluidPort";
- public static final String IC2_BLOCK_REACTOR_REDSTONE_PORT =
- "ic2.core.block.reactor.block.BlockReactorRedstonePort";
+ public static final String IC2_BLOCK_REACTOR_REDSTONE_PORT = "ic2.core.block.reactor.block.BlockReactorRedstonePort";
public static final String IC2_BLOCK_REACTOR_VESSEL = "ic2.core.block.reactor.block.BlockReactorVessel";
public static final String IC2_BLOCK_PERSONAL = "ic2.core.block.personal.BlockPersonal.class";
public static final String IC2_BLOCK_CHARGEPAD = "ic2.core.block.wiring.BlockChargepad.class";
diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java
index 853038a972..6f464484a5 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java
@@ -1,7 +1,13 @@
package gtPlusPlus.preloader.asm;
+import java.io.File;
+import java.util.Arrays;
+
+import net.minecraftforge.common.config.Configuration;
+
import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
+
import cpw.mods.fml.common.DummyModContainer;
import cpw.mods.fml.common.LoadController;
import cpw.mods.fml.common.ModMetadata;
@@ -11,9 +17,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.preloader.Preloader_Logger;
-import java.io.File;
-import java.util.Arrays;
-import net.minecraftforge.common.config.Configuration;
public class Preloader_DummyContainer extends DummyModContainer {
@@ -64,8 +67,8 @@ public class Preloader_DummyContainer extends DummyModContainer {
}
public static void handleConfigFile(final FMLPreInitializationEvent event) {
- final Configuration config =
- new Configuration(new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
+ final Configuration config = new Configuration(
+ new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
config.load();
// BGM Watchdog
diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
index 90cf1b9e10..16095d00e4 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
@@ -1,5 +1,12 @@
package gtPlusPlus.preloader.asm;
+import java.io.File;
+import java.text.NumberFormat;
+import java.util.Locale;
+import java.util.Map;
+
+import net.minecraft.launchwrapper.Launch;
+
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex;
@@ -7,11 +14,6 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.preloader.Preloader_Logger;
import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler;
-import java.io.File;
-import java.text.NumberFormat;
-import java.util.Locale;
-import java.util.Map;
-import net.minecraft.launchwrapper.Launch;
@SortingIndex(10097)
@MCVersion(value = "1.7.10")
@@ -33,7 +35,7 @@ public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin {
@Override
public String[] getASMTransformerClass() {
// This will return the name of the class
- return new String[] {Preloader_Transformer_Handler.class.getName()};
+ return new String[] { Preloader_Transformer_Handler.class.getName() };
}
@Override
@@ -69,16 +71,24 @@ public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin {
}
CORE_Preloader.DEV_ENVIRONMENT = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode;
- Preloader_Logger.INFO("Running on " + gtPlusPlus.preloader.CORE_Preloader.JAVA_VERSION
- + " | Development Environment: " + CORE_Preloader.DEV_ENVIRONMENT);
+ Preloader_Logger.INFO(
+ "Running on " + gtPlusPlus.preloader.CORE_Preloader.JAVA_VERSION
+ + " | Development Environment: "
+ + CORE_Preloader.DEV_ENVIRONMENT);
// Preloader_Logger.INFO("Is Client? "+Utils.isClient()+" | Is Server? "+Utils.isServer());
Locale aDefaultLocale = Locale.getDefault();
NumberFormat aFormat = NumberFormat.getInstance();
- Locale aDisplayLocale =
- ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale"));
- Locale aFormatLocale =
- ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultFormatLocale"));
- Preloader_Logger.INFO("Locale: " + aDefaultLocale + " | Test: " + aFormat.format(1000000000) + " | Display: "
- + aDisplayLocale + " | Format: " + aFormatLocale);
+ Locale aDisplayLocale = ReflectionUtils
+ .getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale"));
+ Locale aFormatLocale = ReflectionUtils
+ .getFieldValue(ReflectionUtils.getField(Locale.class, "defaultFormatLocale"));
+ Preloader_Logger.INFO(
+ "Locale: " + aDefaultLocale
+ + " | Test: "
+ + aFormat.format(1000000000)
+ + " | Display: "
+ + aDisplayLocale
+ + " | Format: "
+ + aFormatLocale);
}
}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java
index d48e191054..28f28e783b 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java
@@ -1,8 +1,9 @@
package gtPlusPlus.preloader.asm;
+import java.util.Map;
+
import cpw.mods.fml.relauncher.IFMLCallHook;
import gtPlusPlus.preloader.Preloader_Logger;
-import java.util.Map;
public class Preloader_SetupClass implements IFMLCallHook {
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
index eea82c33e5..bb167c3261 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
@@ -7,25 +7,30 @@ import static org.objectweb.asm.Opcodes.ASM5;
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
import static org.objectweb.asm.Opcodes.RETURN;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+import org.apache.logging.log4j.Level;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+
import cofh.core.util.oredict.OreDictionaryArbiter;
import cofh.lib.util.ItemWrapper;
+
import com.google.common.base.Strings;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
+
import cpw.mods.fml.relauncher.FMLRelaunchLog;
import gnu.trove.map.TMap;
import gnu.trove.map.hash.THashMap;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.preloader.DevHelper;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-import org.apache.logging.log4j.Level;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
public class ClassTransformer_COFH_OreDictionaryArbiter {
@@ -77,21 +82,20 @@ public class ClassTransformer_COFH_OreDictionaryArbiter {
} catch (ClassNotFoundException e) {
isObfuscated = true;
}
- String aItemStack =
- isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") : "net/minecraft/item/ItemStack";
+ String aItemStack = isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack")
+ : "net/minecraft/item/ItemStack";
MethodVisitor mv;
if (aMethodName.equals("registerOreDictionaryEntry")) {
FMLRelaunchLog.log(
"[GT++ ASM] COFH OreDictionaryArbiter Patch",
Level.INFO,
"Injecting " + aMethodName + " into " + className + ". ItemStack: " + aItemStack);
- mv = getWriter()
- .visitMethod(
- ACC_PUBLIC + ACC_STATIC,
- "registerOreDictionaryEntry",
- "(L" + aItemStack + ";Ljava/lang/String;)V",
- null,
- null);
+ mv = getWriter().visitMethod(
+ ACC_PUBLIC + ACC_STATIC,
+ "registerOreDictionaryEntry",
+ "(L" + aItemStack + ";Ljava/lang/String;)V",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -147,15 +151,12 @@ public class ClassTransformer_COFH_OreDictionaryArbiter {
try {
oreIDs = (BiMap<String, Integer>) ReflectionUtils.getField(OreDictionaryArbiter.class, "oreIDs")
.get(null);
- oreStacks = (TMap<Integer, ArrayList<ItemStack>>)
- ReflectionUtils.getField(OreDictionaryArbiter.class, "oreStacks")
- .get(null);
- stackIDs = (TMap<ItemWrapper, ArrayList<Integer>>)
- ReflectionUtils.getField(OreDictionaryArbiter.class, "stackIDs")
- .get(null);
- stackNames = (TMap<ItemWrapper, ArrayList<String>>)
- ReflectionUtils.getField(OreDictionaryArbiter.class, "stackNames")
- .get(null);
+ oreStacks = (TMap<Integer, ArrayList<ItemStack>>) ReflectionUtils
+ .getField(OreDictionaryArbiter.class, "oreStacks").get(null);
+ stackIDs = (TMap<ItemWrapper, ArrayList<Integer>>) ReflectionUtils
+ .getField(OreDictionaryArbiter.class, "stackIDs").get(null);
+ stackNames = (TMap<ItemWrapper, ArrayList<String>>) ReflectionUtils
+ .getField(OreDictionaryArbiter.class, "stackNames").get(null);
} catch (Throwable t) {
oreIDs = HashBiMap.create();
oreStacks = new THashMap<Integer, ArrayList<ItemStack>>();
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java
index cfb4663734..e26c5b0d03 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java
@@ -2,8 +2,6 @@ package gtPlusPlus.preloader.asm.transformers;
import static org.objectweb.asm.Opcodes.*;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gtPlusPlus.preloader.DevHelper;
import org.apache.logging.log4j.Level;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -11,6 +9,9 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.preloader.DevHelper;
+
public class ClassTransformer_Forge_ChunkLoading {
// The qualified name of the class we plan to transform.
@@ -47,12 +48,11 @@ public class ClassTransformer_Forge_ChunkLoading {
if (reader != null && writer != null && !doesMethodAlreadyExist) {
- aChunkCoordIntPair = obfuscated
- ? DevHelper.getObfuscated("net/minecraft/world/ChunkCoordIntPair")
+ aChunkCoordIntPair = obfuscated ? DevHelper.getObfuscated("net/minecraft/world/ChunkCoordIntPair")
: "net/minecraft/world/ChunkCoordIntPair";
aWorld = obfuscated ? DevHelper.getObfuscated("net/minecraft/world/World") : "net/minecraft/world/World";
- aEntity =
- obfuscated ? DevHelper.getObfuscated("net/minecraft/entity/Entity") : "net/minecraft/entity/Entity";
+ aEntity = obfuscated ? DevHelper.getObfuscated("net/minecraft/entity/Entity")
+ : "net/minecraft/entity/Entity";
injectMethod("forceChunk");
injectMethod("unforceChunk");
@@ -76,16 +76,17 @@ public class ClassTransformer_Forge_ChunkLoading {
public void injectMethod(String aMethodName) {
MethodVisitor mv;
FMLRelaunchLog.log(
- "[GT++ ASM] Chunkloading Patch", Level.INFO, "Injecting " + aMethodName + " into " + className + ".");
+ "[GT++ ASM] Chunkloading Patch",
+ Level.INFO,
+ "Injecting " + aMethodName + " into " + className + ".");
if (aMethodName.equals("forceChunk")) {
- mv = getWriter()
- .visitMethod(
- ACC_PUBLIC + ACC_STATIC,
- "forceChunk",
- "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V",
- null,
- null);
+ mv = getWriter().visitMethod(
+ ACC_PUBLIC + ACC_STATIC,
+ "forceChunk",
+ "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -166,7 +167,10 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";");
+ GETFIELD,
+ "net/minecraftforge/common/ForgeChunkManager$Ticket",
+ "world",
+ "L" + aWorld + ";");
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap");
mv.visitVarInsn(ALOAD, 0);
@@ -270,10 +274,16 @@ public class ClassTransformer_Forge_ChunkLoading {
"()Lcom/google/common/collect/ImmutableSetMultimap$Builder;",
false);
mv.visitFieldInsn(
- GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "forcedChunks", "Ljava/util/Map;");
+ GETSTATIC,
+ "net/minecraftforge/common/ForgeChunkManager",
+ "forcedChunks",
+ "Ljava/util/Map;");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";");
+ GETFIELD,
+ "net/minecraftforge/common/ForgeChunkManager$Ticket",
+ "world",
+ "L" + aWorld + ";");
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap");
mv.visitMethodInsn(
@@ -301,10 +311,16 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitLabel(l12);
mv.visitLineNumber(748, l12);
mv.visitFieldInsn(
- GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "forcedChunks", "Ljava/util/Map;");
+ GETSTATIC,
+ "net/minecraftforge/common/ForgeChunkManager",
+ "forcedChunks",
+ "Ljava/util/Map;");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";");
+ GETFIELD,
+ "net/minecraftforge/common/ForgeChunkManager$Ticket",
+ "world",
+ "L" + aWorld + ";");
mv.visitVarInsn(ALOAD, 2);
mv.visitMethodInsn(
INVOKEINTERFACE,
@@ -368,7 +384,7 @@ public class ClassTransformer_Forge_ChunkLoading {
false);
mv.visitLabel(l14);
mv.visitLineNumber(754, l14);
- mv.visitFrame(F_APPEND, 1, new Object[] {"com/google/common/collect/ImmutableSetMultimap"}, 0, null);
+ mv.visitFrame(F_APPEND, 1, new Object[] { "com/google/common/collect/ImmutableSetMultimap" }, 0, null);
mv.visitInsn(RETURN);
Label l17 = new Label();
mv.visitLabel(l17);
@@ -388,13 +404,12 @@ public class ClassTransformer_Forge_ChunkLoading {
} else if (aMethodName.equals("unforceChunk")) {
- mv = getWriter()
- .visitMethod(
- ACC_PUBLIC + ACC_STATIC,
- "unforceChunk",
- "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V",
- null,
- null);
+ mv = getWriter().visitMethod(
+ ACC_PUBLIC + ACC_STATIC,
+ "unforceChunk",
+ "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -461,10 +476,16 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitLabel(l5);
mv.visitLineNumber(788, l5);
mv.visitFieldInsn(
- GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "forcedChunks", "Ljava/util/Map;");
+ GETSTATIC,
+ "net/minecraftforge/common/ForgeChunkManager",
+ "forcedChunks",
+ "Ljava/util/Map;");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";");
+ GETFIELD,
+ "net/minecraftforge/common/ForgeChunkManager$Ticket",
+ "world",
+ "L" + aWorld + ";");
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap");
mv.visitMethodInsn(
@@ -502,10 +523,16 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitLabel(l8);
mv.visitLineNumber(791, l8);
mv.visitFieldInsn(
- GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "forcedChunks", "Ljava/util/Map;");
+ GETSTATIC,
+ "net/minecraftforge/common/ForgeChunkManager",
+ "forcedChunks",
+ "Ljava/util/Map;");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";");
+ GETFIELD,
+ "net/minecraftforge/common/ForgeChunkManager$Ticket",
+ "world",
+ "L" + aWorld + ";");
mv.visitVarInsn(ALOAD, 3);
mv.visitMethodInsn(
INVOKEINTERFACE,
@@ -543,14 +570,13 @@ public class ClassTransformer_Forge_ChunkLoading {
} else if (aMethodName.equals("requestTicket")) {
- mv = getWriter()
- .visitMethod(
- ACC_PUBLIC + ACC_STATIC,
- "requestTicket",
- "(Ljava/lang/Object;L" + aWorld
- + ";Lnet/minecraftforge/common/ForgeChunkManager$Type;)Lnet/minecraftforge/common/ForgeChunkManager$Ticket;",
- null,
- null);
+ mv = getWriter().visitMethod(
+ ACC_PUBLIC + ACC_STATIC,
+ "requestTicket",
+ "(Ljava/lang/Object;L" + aWorld
+ + ";Lnet/minecraftforge/common/ForgeChunkManager$Type;)Lnet/minecraftforge/common/ForgeChunkManager$Ticket;",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -605,10 +631,14 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitInsn(ARETURN);
mv.visitLabel(l2);
mv.visitLineNumber(662, l2);
- mv.visitFrame(F_APPEND, 1, new Object[] {"cpw/mods/fml/common/ModContainer"}, 0, null);
+ mv.visitFrame(F_APPEND, 1, new Object[] { "cpw/mods/fml/common/ModContainer" }, 0, null);
mv.visitVarInsn(ALOAD, 3);
mv.visitMethodInsn(
- INVOKEINTERFACE, "cpw/mods/fml/common/ModContainer", "getModId", "()Ljava/lang/String;", true);
+ INVOKEINTERFACE,
+ "cpw/mods/fml/common/ModContainer",
+ "getModId",
+ "()Ljava/lang/String;",
+ true);
mv.visitVarInsn(ASTORE, 4);
Label l5 = new Label();
mv.visitLabel(l5);
@@ -644,7 +674,7 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitInsn(ATHROW);
mv.visitLabel(l6);
mv.visitLineNumber(669, l6);
- mv.visitFrame(F_APPEND, 1, new Object[] {"java/lang/String"}, 0, null);
+ mv.visitFrame(F_APPEND, 1, new Object[] { "java/lang/String" }, 0, null);
mv.visitVarInsn(ALOAD, 4);
mv.visitMethodInsn(
INVOKESTATIC,
@@ -675,7 +705,10 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitLabel(l11);
mv.visitLineNumber(673, l11);
mv.visitFieldInsn(
- GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "warnedMods", "Ljava/util/Set;");
+ GETSTATIC,
+ "net/minecraftforge/common/ForgeChunkManager",
+ "warnedMods",
+ "Ljava/util/Set;");
mv.visitVarInsn(ALOAD, 4);
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Set", "contains", "(Ljava/lang/Object;)Z", true);
Label l12 = new Label();
@@ -706,13 +739,16 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitLabel(l14);
mv.visitLineNumber(676, l14);
mv.visitFieldInsn(
- GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "warnedMods", "Ljava/util/Set;");
+ GETSTATIC,
+ "net/minecraftforge/common/ForgeChunkManager",
+ "warnedMods",
+ "Ljava/util/Set;");
mv.visitVarInsn(ALOAD, 4);
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Set", "add", "(Ljava/lang/Object;)Z", true);
mv.visitInsn(POP);
mv.visitLabel(l12);
mv.visitLineNumber(678, l12);
- mv.visitFrame(F_APPEND, 1, new Object[] {INTEGER}, 0, null);
+ mv.visitFrame(F_APPEND, 1, new Object[] { INTEGER }, 0, null);
mv.visitInsn(ACONST_NULL);
mv.visitInsn(ARETURN);
mv.visitLabel(l10);
@@ -776,13 +812,12 @@ public class ClassTransformer_Forge_ChunkLoading {
} else if (aMethodName.equals("releaseTicket")) {
- mv = getWriter()
- .visitMethod(
- ACC_PUBLIC + ACC_STATIC,
- "releaseTicket",
- "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)V",
- null,
- null);
+ mv = getWriter().visitMethod(
+ ACC_PUBLIC + ACC_STATIC,
+ "releaseTicket",
+ "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)V",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -827,7 +862,10 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";");
+ GETFIELD,
+ "net/minecraftforge/common/ForgeChunkManager$Ticket",
+ "world",
+ "L" + aWorld + ";");
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap");
mv.visitVarInsn(ALOAD, 0);
@@ -891,7 +929,7 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitFrame(
F_FULL,
3,
- new Object[] {"net/minecraftforge/common/ForgeChunkManager$Ticket", TOP, "java/util/Iterator"},
+ new Object[] { "net/minecraftforge/common/ForgeChunkManager$Ticket", TOP, "java/util/Iterator" },
0,
new Object[] {});
mv.visitVarInsn(ALOAD, 2);
@@ -918,7 +956,11 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitLabel(l6);
mv.visitLineNumber(708, l6);
mv.visitFrame(
- F_FULL, 1, new Object[] {"net/minecraftforge/common/ForgeChunkManager$Ticket"}, 0, new Object[] {});
+ F_FULL,
+ 1,
+ new Object[] { "net/minecraftforge/common/ForgeChunkManager$Ticket" },
+ 0,
+ new Object[] {});
mv.visitVarInsn(ALOAD, 0);
mv.visitMethodInsn(
INVOKESTATIC,
@@ -967,7 +1009,10 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";");
+ GETFIELD,
+ "net/minecraftforge/common/ForgeChunkManager$Ticket",
+ "world",
+ "L" + aWorld + ";");
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap");
mv.visitLdcInsn("Forge");
@@ -990,7 +1035,10 @@ public class ClassTransformer_Forge_ChunkLoading {
mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";");
+ GETFIELD,
+ "net/minecraftforge/common/ForgeChunkManager$Ticket",
+ "world",
+ "L" + aWorld + ";");
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap");
mv.visitVarInsn(ALOAD, 0);
@@ -1031,8 +1079,7 @@ public class ClassTransformer_Forge_ChunkLoading {
@Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
- if (name.equals("forceChunk")
- || name.equals("unforceChunk")
+ if (name.equals("forceChunk") || name.equals("unforceChunk")
|| name.equals("requestTicket")
|| name.equals("releaseTicket")) {
FMLRelaunchLog.log("[GT++ ASM] Chunkloading Patch", Level.INFO, "Found method " + name + ", Patching.");
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java
index db3b9f3621..ca268f9f37 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java
@@ -2,8 +2,6 @@ package gtPlusPlus.preloader.asm.transformers;
import static org.objectweb.asm.Opcodes.*;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gtPlusPlus.preloader.DevHelper;
import org.apache.logging.log4j.Level;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -11,6 +9,9 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.preloader.DevHelper;
+
public class ClassTransformer_GC_EntityAutoRocket {
// The qualified name of the class we plan to transform.
@@ -44,8 +45,8 @@ public class ClassTransformer_GC_EntityAutoRocket {
if (reader != null && writer != null) {
injectMethod();
} else {
- FMLRelaunchLog.log(
- "[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Failed to Inject new code.");
+ FMLRelaunchLog
+ .log("[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Failed to Inject new code.");
}
}
@@ -63,35 +64,28 @@ public class ClassTransformer_GC_EntityAutoRocket {
public void injectMethod() {
- String aEntityPlayer = isObfuscated
- ? DevHelper.getObfuscated("net/minecraft/entity/player/EntityPlayer")
+ String aEntityPlayer = isObfuscated ? DevHelper.getObfuscated("net/minecraft/entity/player/EntityPlayer")
: "net/minecraft/entity/player/EntityPlayer";
- String aEntityPlayerMP = isObfuscated
- ? DevHelper.getObfuscated("net/minecraft/entity/player/EntityPlayerMP")
+ String aEntityPlayerMP = isObfuscated ? DevHelper.getObfuscated("net/minecraft/entity/player/EntityPlayerMP")
: "net/minecraft/entity/player/EntityPlayerMP";
- String aWorld =
- isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/World") : "net/minecraft/world/World";
- String aItemStack =
- isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") : "net/minecraft/item/ItemStack";
- String aEntity =
- isObfuscated ? DevHelper.getObfuscated("net/minecraft/entity/Entity") : "net/minecraft/entity/Entity";
- String aWorldClient = isObfuscated
- ? DevHelper.getObfuscated("net/minecraft/client/multiplayer/WorldClient")
+ String aWorld = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/World")
+ : "net/minecraft/world/World";
+ String aItemStack = isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack")
+ : "net/minecraft/item/ItemStack";
+ String aEntity = isObfuscated ? DevHelper.getObfuscated("net/minecraft/entity/Entity")
+ : "net/minecraft/entity/Entity";
+ String aWorldClient = isObfuscated ? DevHelper.getObfuscated("net/minecraft/client/multiplayer/WorldClient")
: "net/minecraft/client/multiplayer/WorldClient";
- String aDifficultyEnum = isObfuscated
- ? DevHelper.getObfuscated("net/minecraft/world/EnumDifficulty")
+ String aDifficultyEnum = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/EnumDifficulty")
: "net/minecraft/world/EnumDifficulty";
- String aWorldInfo = isObfuscated
- ? DevHelper.getObfuscated("net/minecraft/world/storage/WorldInfo")
+ String aWorldInfo = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/storage/WorldInfo")
: "net/minecraft/world/storage/WorldInfo";
String aItemInWorldManager = isObfuscated
? DevHelper.getObfuscated("net/minecraft/server/management/ItemInWorldManager")
: "net/minecraft/server/management/ItemInWorldManager";
- String aWorldType = isObfuscated
- ? DevHelper.getObfuscated("net/minecraft/world/WorldType")
+ String aWorldType = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/WorldType")
: "net/minecraft/world/WorldType";
- String aGameType = isObfuscated
- ? DevHelper.getObfuscated("net/minecraft/world/WorldSettings$GameType")
+ String aGameType = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/WorldSettings$GameType")
: "net/minecraft/world/WorldSettings$GameType";
if (isValidTransformer()) {
@@ -99,8 +93,8 @@ public class ClassTransformer_GC_EntityAutoRocket {
"[GT++ ASM] Galacticraft EntityAutoRocket Patch",
Level.INFO,
"Injecting decodePacketdata into " + className + ".");
- MethodVisitor mv =
- getWriter().visitMethod(ACC_PUBLIC, "decodePacketdata", "(Lio/netty/buffer/ByteBuf;)V", null, null);
+ MethodVisitor mv = getWriter()
+ .visitMethod(ACC_PUBLIC, "decodePacketdata", "(Lio/netty/buffer/ByteBuf;)V", null, null);
mv.visitCode();
Label l0 = new Label();
@@ -174,12 +168,15 @@ public class ClassTransformer_GC_EntityAutoRocket {
false);
mv.visitLabel(l4);
mv.visitLineNumber(1038, l4);
- mv.visitFrame(F_APPEND, 2, new Object[] {"net/minecraftforge/fluids/FluidStack", INTEGER}, 0, null);
+ mv.visitFrame(F_APPEND, 2, new Object[] { "net/minecraftforge/fluids/FluidStack", INTEGER }, 0, null);
mv.visitVarInsn(ALOAD, 0);
mv.visitVarInsn(ALOAD, 1);
mv.visitMethodInsn(INVOKEVIRTUAL, "io/netty/buffer/ByteBuf", "readBoolean", "()Z", false);
mv.visitFieldInsn(
- PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "landing", "Z");
+ PUTFIELD,
+ "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "landing",
+ "Z");
Label l8 = new Label();
mv.visitLabel(l8);
mv.visitLineNumber(1039, l8);
@@ -211,7 +208,11 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitVarInsn(ALOAD, 1);
mv.visitMethodInsn(INVOKEVIRTUAL, "io/netty/buffer/ByteBuf", "readInt", "()I", false);
mv.visitMethodInsn(
- INVOKESPECIAL, "micdoodle8/mods/galacticraft/api/vector/BlockVec3", "<init>", "(III)V", false);
+ INVOKESPECIAL,
+ "micdoodle8/mods/galacticraft/api/vector/BlockVec3",
+ "<init>",
+ "(III)V",
+ false);
mv.visitFieldInsn(
PUTFIELD,
"micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
@@ -226,7 +227,10 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitLdcInsn(new Double("8000.0"));
mv.visitInsn(DDIV);
mv.visitFieldInsn(
- PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "motionX", "D");
+ PUTFIELD,
+ "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "motionX",
+ "D");
Label l12 = new Label();
mv.visitLabel(l12);
mv.visitLineNumber(1047, l12);
@@ -236,7 +240,10 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitLdcInsn(new Double("8000.0"));
mv.visitInsn(DDIV);
mv.visitFieldInsn(
- PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "motionY", "D");
+ PUTFIELD,
+ "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "motionY",
+ "D");
Label l13 = new Label();
mv.visitLabel(l13);
mv.visitLineNumber(1048, l13);
@@ -246,7 +253,10 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitLdcInsn(new Double("8000.0"));
mv.visitInsn(DDIV);
mv.visitFieldInsn(
- PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "motionZ", "D");
+ PUTFIELD,
+ "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "motionZ",
+ "D");
Label l14 = new Label();
mv.visitLabel(l14);
mv.visitLineNumber(1049, l14);
@@ -256,7 +266,10 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitLdcInsn(new Double("8000.0"));
mv.visitInsn(DDIV);
mv.visitFieldInsn(
- PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "lastMotionY", "D");
+ PUTFIELD,
+ "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "lastMotionY",
+ "D");
Label l15 = new Label();
mv.visitLabel(l15);
mv.visitLineNumber(1050, l15);
@@ -345,8 +358,11 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitJumpInsn(GOTO, l22);
mv.visitLabel(l21);
mv.visitFrame(
- F_SAME1, 0, null, 1, new Object[] {"micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket"
- });
+ F_SAME1,
+ 0,
+ null,
+ 1,
+ new Object[] { "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket" });
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
GETFIELD,
@@ -357,15 +373,11 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitFrame(
F_FULL,
4,
- new Object[] {
- "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
- "io/netty/buffer/ByteBuf",
- "net/minecraftforge/fluids/FluidStack",
- INTEGER
- },
+ new Object[] { "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "io/netty/buffer/ByteBuf", "net/minecraftforge/fluids/FluidStack", INTEGER },
2,
- new Object[] {"micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "java/lang/String"
- });
+ new Object[] { "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "java/lang/String" });
mv.visitFieldInsn(
PUTFIELD,
"micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
@@ -400,7 +412,10 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitVarInsn(ALOAD, 1);
mv.visitMethodInsn(INVOKEVIRTUAL, "io/netty/buffer/ByteBuf", "readBoolean", "()Z", false);
mv.visitFieldInsn(
- PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "statusValid", "Z");
+ PUTFIELD,
+ "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "statusValid",
+ "Z");
Label l26 = new Label();
mv.visitLabel(l26);
mv.visitLineNumber(1066, l26);
@@ -466,7 +481,10 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitFieldInsn(GETFIELD, "" + aEntity + "", "dimension", "I");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "dimension", "I");
+ GETFIELD,
+ "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "dimension",
+ "I");
Label l35 = new Label();
mv.visitJumpInsn(IF_ICMPEQ, l35);
Label l36 = new Label();
@@ -480,7 +498,10 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitLineNumber(1080, l37);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "dimension", "I");
+ GETFIELD,
+ "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "dimension",
+ "I");
mv.visitVarInsn(ALOAD, 5);
mv.visitFieldInsn(GETFIELD, "" + aEntity + "", "worldObj", "L" + aWorld + ";");
mv.visitFieldInsn(GETFIELD, aWorld, "difficultySetting", "L" + aDifficultyEnum + ";");
@@ -493,9 +514,16 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitVarInsn(ALOAD, 5);
mv.visitTypeInsn(CHECKCAST, "" + aEntityPlayerMP + "");
mv.visitFieldInsn(
- GETFIELD, "" + aEntityPlayerMP + "", "theItemInWorldManager", "L" + aItemInWorldManager + ";");
+ GETFIELD,
+ "" + aEntityPlayerMP + "",
+ "theItemInWorldManager",
+ "L" + aItemInWorldManager + ";");
mv.visitMethodInsn(
- INVOKEVIRTUAL, "" + aItemInWorldManager + "", "getGameType", "()L" + aGameType + ";", false);
+ INVOKEVIRTUAL,
+ "" + aItemInWorldManager + "",
+ "getGameType",
+ "()L" + aGameType + ";",
+ false);
mv.visitMethodInsn(INVOKEVIRTUAL, "" + aGameType + "", "getID", "()I", false);
mv.visitMethodInsn(
INVOKESTATIC,
@@ -516,7 +544,7 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitJumpInsn(GOTO, l27);
mv.visitLabel(l35);
mv.visitLineNumber(1085, l35);
- mv.visitFrame(F_APPEND, 2, new Object[] {INTEGER, "" + aEntity + ""}, 0, null);
+ mv.visitFrame(F_APPEND, 2, new Object[] { INTEGER, "" + aEntity + "" }, 0, null);
mv.visitVarInsn(ALOAD, 5);
mv.visitVarInsn(ALOAD, 0);
mv.visitMethodInsn(INVOKEVIRTUAL, "" + aEntity + "", "mountEntity", "(L" + aEntity + ";)V", false);
@@ -588,7 +616,10 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitFieldInsn(GETFIELD, "" + aEntity + "", "dimension", "I");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "dimension", "I");
+ GETFIELD,
+ "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "dimension",
+ "I");
Label l47 = new Label();
mv.visitJumpInsn(IF_ICMPEQ, l47);
Label l48 = new Label();
@@ -602,7 +633,10 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitLineNumber(1104, l49);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "dimension", "I");
+ GETFIELD,
+ "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket",
+ "dimension",
+ "I");
mv.visitVarInsn(ALOAD, 5);
mv.visitFieldInsn(GETFIELD, "" + aEntity + "", "worldObj", "L" + aWorld + ";");
mv.visitFieldInsn(GETFIELD, aWorld, "difficultySetting", "L" + aDifficultyEnum + ";");
@@ -615,9 +649,16 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitVarInsn(ALOAD, 5);
mv.visitTypeInsn(CHECKCAST, "" + aEntityPlayerMP + "");
mv.visitFieldInsn(
- GETFIELD, "" + aEntityPlayerMP + "", "theItemInWorldManager", "L" + aItemInWorldManager + ";");
+ GETFIELD,
+ "" + aEntityPlayerMP + "",
+ "theItemInWorldManager",
+ "L" + aItemInWorldManager + ";");
mv.visitMethodInsn(
- INVOKEVIRTUAL, "" + aItemInWorldManager + "", "getGameType", "()L" + aGameType + ";", false);
+ INVOKEVIRTUAL,
+ "" + aItemInWorldManager + "",
+ "getGameType",
+ "()L" + aGameType + ";",
+ false);
mv.visitMethodInsn(INVOKEVIRTUAL, "" + aGameType + "", "getID", "()I", false);
mv.visitMethodInsn(
INVOKESTATIC,
@@ -638,7 +679,7 @@ public class ClassTransformer_GC_EntityAutoRocket {
mv.visitJumpInsn(GOTO, l27);
mv.visitLabel(l47);
mv.visitLineNumber(1109, l47);
- mv.visitFrame(F_APPEND, 1, new Object[] {"" + aEntity + ""}, 0, null);
+ mv.visitFrame(F_APPEND, 1, new Object[] { "" + aEntity + "" }, 0, null);
mv.visitVarInsn(ALOAD, 5);
mv.visitVarInsn(ALOAD, 0);
mv.visitMethodInsn(INVOKEVIRTUAL, "" + aEntity + "", "mountEntity", "(L" + aEntity + ";)V", false);
@@ -685,7 +726,12 @@ public class ClassTransformer_GC_EntityAutoRocket {
Label l54 = new Label();
mv.visitLabel(l54);
mv.visitLocalVariable(
- "this", "Lmicdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket;", null, l0, l54, 0);
+ "this",
+ "Lmicdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket;",
+ null,
+ l0,
+ l54,
+ 0);
mv.visitLocalVariable("buffer", "Lio/netty/buffer/ByteBuf;", null, l0, l54, 1);
mv.visitLocalVariable("g", "Lnet/minecraftforge/fluids/FluidStack;", null, l2, l54, 2);
mv.visitLocalVariable("aBufferData", "I", null, l3, l54, 3);
@@ -702,15 +748,15 @@ public class ClassTransformer_GC_EntityAutoRocket {
public localClassVisitor(ClassVisitor cv) {
super(ASM5, cv);
- FMLRelaunchLog.log(
- "[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Inspecting Class " + className);
+ FMLRelaunchLog
+ .log("[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Inspecting Class " + className);
}
@Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
if (name.equals("decodePacketdata")) {
- FMLRelaunchLog.log(
- "[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Removing method " + name);
+ FMLRelaunchLog
+ .log("[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Removing method " + name);
return null;
}
MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java
index ec2a9cecbb..8ed7241b63 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java
@@ -2,7 +2,6 @@ package gtPlusPlus.preloader.asm.transformers;
import static org.objectweb.asm.Opcodes.*;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
import org.apache.logging.log4j.Level;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -10,6 +9,8 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+
public class ClassTransformer_GC_FluidUtil {
// The qualified name of the class we plan to transform.
@@ -78,7 +79,12 @@ public class ClassTransformer_GC_FluidUtil {
mv.visitJumpInsn(GOTO, l1);
Label l2 = new Label();
mv.visitLabel(l2);
- mv.visitFrame(F_FULL, 3, new Object[] {"java/lang/String", TOP, "java/util/Iterator"}, 0, new Object[] {});
+ mv.visitFrame(
+ F_FULL,
+ 3,
+ new Object[] { "java/lang/String", TOP, "java/util/Iterator" },
+ 0,
+ new Object[] {});
mv.visitVarInsn(ALOAD, 2);
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Iterator", "next", "()Ljava/lang/Object;", true);
mv.visitTypeInsn(CHECKCAST, "java/lang/String");
@@ -113,13 +119,12 @@ public class ClassTransformer_GC_FluidUtil {
mv.visitMaxs(2, 3);
mv.visitEnd();
} else if (aMethodName.equals("fillWithGCFuel")) {
- mv = getWriter()
- .visitMethod(
- ACC_PUBLIC + ACC_STATIC,
- "fillWithGCFuel",
- "(Lnet/minecraftforge/fluids/FluidTank;Lnet/minecraftforge/fluids/FluidStack;Z)I",
- null,
- null);
+ mv = getWriter().visitMethod(
+ ACC_PUBLIC + ACC_STATIC,
+ "fillWithGCFuel",
+ "(Lnet/minecraftforge/fluids/FluidTank;Lnet/minecraftforge/fluids/FluidStack;Z)I",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -176,14 +181,8 @@ public class ClassTransformer_GC_FluidUtil {
mv.visitFrame(
F_FULL,
6,
- new Object[] {
- "net/minecraftforge/fluids/FluidTank",
- "net/minecraftforge/fluids/FluidStack",
- INTEGER,
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- "java/util/Iterator"
- },
+ new Object[] { "net/minecraftforge/fluids/FluidTank", "net/minecraftforge/fluids/FluidStack",
+ INTEGER, "net/minecraftforge/fluids/FluidStack", TOP, "java/util/Iterator" },
0,
new Object[] {});
mv.visitVarInsn(ALOAD, 5);
@@ -236,12 +235,8 @@ public class ClassTransformer_GC_FluidUtil {
mv.visitFrame(
F_FULL,
4,
- new Object[] {
- "net/minecraftforge/fluids/FluidTank",
- "net/minecraftforge/fluids/FluidStack",
- INTEGER,
- "net/minecraftforge/fluids/FluidStack"
- },
+ new Object[] { "net/minecraftforge/fluids/FluidTank", "net/minecraftforge/fluids/FluidStack",
+ INTEGER, "net/minecraftforge/fluids/FluidStack" },
0,
new Object[] {});
mv.visitVarInsn(ALOAD, 3);
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java
index 13137824d8..e9589ff756 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java
@@ -2,8 +2,6 @@ package gtPlusPlus.preloader.asm.transformers;
import static org.objectweb.asm.Opcodes.*;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gtPlusPlus.preloader.DevHelper;
import org.apache.logging.log4j.Level;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -11,6 +9,9 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.preloader.DevHelper;
+
public class ClassTransformer_GC_FuelLoader {
// The qualified name of the class we plan to transform.
@@ -61,12 +62,11 @@ public class ClassTransformer_GC_FuelLoader {
}
public void injectMethod() {
- String aWorld =
- isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/World") : "net/minecraft/world/World";
- String aItemStack =
- isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") : "net/minecraft/item/ItemStack";
- String aTileEntity = isObfuscated
- ? DevHelper.getObfuscated("net/minecraft/tileentity/TileEntity")
+ String aWorld = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/World")
+ : "net/minecraft/world/World";
+ String aItemStack = isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack")
+ : "net/minecraft/item/ItemStack";
+ String aTileEntity = isObfuscated ? DevHelper.getObfuscated("net/minecraft/tileentity/TileEntity")
: "net/minecraft/tileentity/TileEntity";
if (isValidTransformer()) {
@@ -104,7 +104,10 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitVarInsn(ALOAD, 0);
mv.visitInsn(ICONST_0);
mv.visitFieldInsn(
- PUTFIELD, "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", "loadedFuelLastTick", "Z");
+ PUTFIELD,
+ "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "loadedFuelLastTick",
+ "Z");
Label l4 = new Label();
mv.visitLabel(l4);
mv.visitLineNumber(63, l4);
@@ -214,13 +217,8 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_FULL,
5,
- new Object[] {
- "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- TOP,
- INTEGER
- },
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "net/minecraftforge/fluids/FluidStack", TOP, TOP, INTEGER },
0,
new Object[] {});
mv.visitVarInsn(ALOAD, 0);
@@ -268,17 +266,9 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_FULL,
9,
- new Object[] {
- "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- TOP,
- INTEGER,
- "net/minecraftforge/fluids/FluidStack",
- INTEGER,
- TOP,
- "java/util/Iterator"
- },
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "net/minecraftforge/fluids/FluidStack", TOP, TOP, INTEGER,
+ "net/minecraftforge/fluids/FluidStack", INTEGER, TOP, "java/util/Iterator" },
0,
new Object[] {});
mv.visitVarInsn(ALOAD, 8);
@@ -333,39 +323,24 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_FULL,
9,
- new Object[] {
- "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- TOP,
- INTEGER,
- "net/minecraftforge/fluids/FluidStack",
- INTEGER,
- "net/minecraftforge/fluids/Fluid",
- "java/util/Iterator"
- },
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "net/minecraftforge/fluids/FluidStack", TOP, TOP, INTEGER,
+ "net/minecraftforge/fluids/FluidStack", INTEGER, "net/minecraftforge/fluids/Fluid",
+ "java/util/Iterator" },
0,
new Object[] {});
mv.visitInsn(ICONST_0);
mv.visitLabel(l23);
- mv.visitFrame(F_SAME1, 0, null, 1, new Object[] {INTEGER});
+ mv.visitFrame(F_SAME1, 0, null, 1, new Object[] { INTEGER });
mv.visitVarInsn(ISTORE, 6);
mv.visitLabel(l18);
mv.visitLineNumber(76, l18);
mv.visitFrame(
F_FULL,
9,
- new Object[] {
- "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- TOP,
- INTEGER,
- "net/minecraftforge/fluids/FluidStack",
- INTEGER,
- TOP,
- "java/util/Iterator"
- },
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "net/minecraftforge/fluids/FluidStack", TOP, TOP, INTEGER,
+ "net/minecraftforge/fluids/FluidStack", INTEGER, TOP, "java/util/Iterator" },
0,
new Object[] {});
mv.visitVarInsn(ALOAD, 8);
@@ -381,15 +356,9 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_FULL,
7,
- new Object[] {
- "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- TOP,
- INTEGER,
- "net/minecraftforge/fluids/FluidStack",
- INTEGER
- },
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "net/minecraftforge/fluids/FluidStack", TOP, TOP, INTEGER,
+ "net/minecraftforge/fluids/FluidStack", INTEGER },
0,
new Object[] {});
mv.visitVarInsn(ALOAD, 5);
@@ -447,7 +416,7 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(F_SAME, 0, null, 0, null);
mv.visitInsn(ICONST_0);
mv.visitLabel(l28);
- mv.visitFrame(F_SAME1, 0, null, 1, new Object[] {INTEGER});
+ mv.visitFrame(F_SAME1, 0, null, 1, new Object[] { INTEGER });
mv.visitVarInsn(ISTORE, 6);
mv.visitLabel(l25);
mv.visitLineNumber(88, l25);
@@ -500,10 +469,8 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_FULL,
2,
- new Object[] {
- "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
- "net/minecraftforge/fluids/FluidStack"
- },
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "net/minecraftforge/fluids/FluidStack" },
0,
new Object[] {});
mv.visitVarInsn(ALOAD, 0);
@@ -552,7 +519,7 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_APPEND,
3,
- new Object[] {INTEGER, INTEGER, "[Lnet/minecraftforge/common/util/ForgeDirection;"},
+ new Object[] { INTEGER, INTEGER, "[Lnet/minecraftforge/common/util/ForgeDirection;" },
0,
null);
mv.visitVarInsn(ALOAD, 4);
@@ -631,7 +598,7 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_APPEND,
2,
- new Object[] {"net/minecraftforge/common/util/ForgeDirection", "" + aTileEntity + ""},
+ new Object[] { "net/minecraftforge/common/util/ForgeDirection", "" + aTileEntity + "" },
0,
null);
mv.visitVarInsn(ALOAD, 6);
@@ -738,15 +705,9 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_FULL,
7,
- new Object[] {
- "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- TOP,
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- "java/util/Iterator"
- },
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "net/minecraftforge/fluids/FluidStack", TOP, TOP, "net/minecraftforge/fluids/FluidStack",
+ TOP, "java/util/Iterator" },
0,
new Object[] {});
mv.visitVarInsn(ALOAD, 6);
@@ -801,13 +762,8 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_FULL,
5,
- new Object[] {
- "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- TOP,
- "net/minecraftforge/fluids/FluidStack"
- },
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "net/minecraftforge/fluids/FluidStack", TOP, TOP, "net/minecraftforge/fluids/FluidStack" },
0,
new Object[] {});
mv.visitVarInsn(ALOAD, 4);
@@ -925,33 +881,26 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_FULL,
6,
- new Object[] {
- "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- INTEGER,
- "net/minecraftforge/fluids/FluidStack",
- INTEGER
- },
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "net/minecraftforge/fluids/FluidStack", TOP, INTEGER,
+ "net/minecraftforge/fluids/FluidStack", INTEGER },
1,
- new Object[] {"micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader"});
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader" });
mv.visitInsn(ICONST_0);
mv.visitLabel(l67);
mv.visitFrame(
F_FULL,
6,
- new Object[] {
- "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
- "net/minecraftforge/fluids/FluidStack",
- TOP,
- INTEGER,
- "net/minecraftforge/fluids/FluidStack",
- INTEGER
- },
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "net/minecraftforge/fluids/FluidStack", TOP, INTEGER,
+ "net/minecraftforge/fluids/FluidStack", INTEGER },
2,
- new Object[] {"micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", INTEGER});
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", INTEGER });
mv.visitFieldInsn(
- PUTFIELD, "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", "loadedFuelLastTick", "Z");
+ PUTFIELD,
+ "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader",
+ "loadedFuelLastTick",
+ "Z");
Label l68 = new Label();
mv.visitLabel(l68);
mv.visitLineNumber(137, l68);
@@ -975,14 +924,19 @@ public class ClassTransformer_GC_FuelLoader {
mv.visitFrame(
F_FULL,
1,
- new Object[] {"micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader"},
+ new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader" },
0,
new Object[] {});
mv.visitInsn(RETURN);
Label l69 = new Label();
mv.visitLabel(l69);
mv.visitLocalVariable(
- "this", "Lmicdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader;", null, l0, l69, 0);
+ "this",
+ "Lmicdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader;",
+ null,
+ l0,
+ l69,
+ 0);
mv.visitLocalVariable("liquid", "Lnet/minecraftforge/fluids/FluidStack;", null, l5, l2, 1);
mv.visitLocalVariable("amount", "I", null, l37, l32, 2);
mv.visitLocalVariable("filled", "I", null, l36, l32, 3);
@@ -1007,8 +961,8 @@ public class ClassTransformer_GC_FuelLoader {
public localClassVisitor(ClassVisitor cv) {
super(ASM5, cv);
- FMLRelaunchLog.log(
- "[GT++ ASM] Galacticraft Fuel_Loader Patch", Level.INFO, "Inspecting Class " + className);
+ FMLRelaunchLog
+ .log("[GT++ ASM] Galacticraft Fuel_Loader Patch", Level.INFO, "Inspecting Class " + className);
}
@Override
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
index 659f76ca0e..7dde3c4c55 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
@@ -2,10 +2,11 @@ package gtPlusPlus.preloader.asm.transformers;
import static org.objectweb.asm.Opcodes.*;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.item.Item;
+
import org.apache.logging.log4j.Level;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -13,6 +14,8 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+
public class ClassTransformer_IC2_GetHarvestTool {
private final boolean isValid;
@@ -72,8 +75,8 @@ public class ClassTransformer_IC2_GetHarvestTool {
injectMethod(aName_damageDropped);
} else if (aClassName.equals("ic2.core.block.generator.block.BlockGenerator")
|| aClassName.equals("ic2.core.block.machine.BlockMachine")) {
- injectMethod(aName_damageDropped);
- }
+ injectMethod(aName_damageDropped);
+ }
}
}
@@ -119,7 +122,11 @@ public class ClassTransformer_IC2_GetHarvestTool {
didInject = true;
} else if (aMethodName.equals(aName_getItemDropped)) {
mv = cw.visitMethod(
- ACC_PUBLIC, aName_getItemDropped, "(ILjava/util/Random;I)Lnet/minecraft/item/Item;", null, null);
+ ACC_PUBLIC,
+ aName_getItemDropped,
+ "(ILjava/util/Random;I)Lnet/minecraft/item/Item;",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -196,23 +203,23 @@ public class ClassTransformer_IC2_GetHarvestTool {
}
} else if (aClassName.equals("ic2.core.block.generator.block.BlockGenerator")
|| aClassName.equals("ic2.core.block.machine.BlockMachine")) {
- if (name.equals(aName_damageDropped)) {
- methodVisitor = null;
- } else if (name.equals("getHarvestTool")) {
- methodVisitor = null;
- } else {
- methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
- }
- } else {
- if (name.equals("getHarvestTool")) {
- methodVisitor = null;
- } else {
- methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
- }
- }
+ if (name.equals(aName_damageDropped)) {
+ methodVisitor = null;
+ } else if (name.equals("getHarvestTool")) {
+ methodVisitor = null;
+ } else {
+ methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
+ }
+ } else {
+ if (name.equals("getHarvestTool")) {
+ methodVisitor = null;
+ } else {
+ methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
+ }
+ }
if (methodVisitor == null) {
- FMLRelaunchLog.log(
- "[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Found method " + name + ", removing.");
+ FMLRelaunchLog
+ .log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Found method " + name + ", removing.");
}
return methodVisitor;
}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java
index d968d17ef5..3f6de75f9d 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java
@@ -8,14 +8,13 @@ import static org.objectweb.asm.Opcodes.ASM5;
import static org.objectweb.asm.Opcodes.ILOAD;
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Field;
import java.util.HashMap;
+
import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.client.settings.KeyBinding;
+
import org.apache.logging.log4j.Level;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -23,6 +22,10 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class ClassTransformer_LWJGL_Keyboard {
private final boolean isValid;
@@ -35,8 +38,7 @@ public class ClassTransformer_LWJGL_Keyboard {
* Gets a key's name
*
* @param key The key
- * @return a String with the key's human readable name in it or null if the key
- * is unnamed
+ * @return a String with the key's human readable name in it or null if the key is unnamed
*/
public static synchronized String getKeyName(int key) {
if (init()) {
@@ -115,8 +117,7 @@ public class ClassTransformer_LWJGL_Keyboard {
String[] y = (String[]) o;
return y;
}
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
}
return new String[] {};
}
@@ -140,8 +141,8 @@ public class ClassTransformer_LWJGL_Keyboard {
} else {
isValid = false;
}
- FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Valid? " + isValid + ".");
+ FMLRelaunchLog
+ .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Valid? " + isValid + ".");
reader = aTempReader;
writer = aTempWriter;
}
@@ -164,9 +165,15 @@ public class ClassTransformer_LWJGL_Keyboard {
MethodVisitor mv;
boolean didInject = false;
FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Injecting " + "getKeyName" + ".");
+ "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
+ Level.INFO,
+ "Injecting " + "getKeyName" + ".");
mv = cw.visitMethod(
- ACC_PUBLIC + ACC_STATIC + ACC_SYNCHRONIZED, "getKeyName", "(I)Ljava/lang/String;", null, null);
+ ACC_PUBLIC + ACC_STATIC + ACC_SYNCHRONIZED,
+ "getKeyName",
+ "(I)Ljava/lang/String;",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -186,8 +193,8 @@ public class ClassTransformer_LWJGL_Keyboard {
mv.visitEnd();
didInject = true;
- FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete.");
+ FMLRelaunchLog
+ .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete.");
return didInject;
}
@@ -196,7 +203,9 @@ public class ClassTransformer_LWJGL_Keyboard {
boolean didInject = false;
String aMethodName = this.isClientSettingsObfuscated ? "func_74298_c" : "getKeyDisplayString";
FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Injecting " + aMethodName + ".");
+ "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
+ Level.INFO,
+ "Injecting " + aMethodName + ".");
mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, aMethodName, "(I)Ljava/lang/String;", null, null);
mv.visitCode();
Label l0 = new Label();
@@ -216,8 +225,8 @@ public class ClassTransformer_LWJGL_Keyboard {
mv.visitMaxs(1, 1);
mv.visitEnd();
didInject = true;
- FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete.");
+ FMLRelaunchLog
+ .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete.");
return didInject;
}
@@ -228,7 +237,7 @@ public class ClassTransformer_LWJGL_Keyboard {
this.cv = cv;
}
- private final String[] aMethodsToStrip = new String[] {"func_74298_c", "getKeyDisplayString"};
+ private final String[] aMethodsToStrip = new String[] { "func_74298_c", "getKeyDisplayString" };
@Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
@@ -268,7 +277,7 @@ public class ClassTransformer_LWJGL_Keyboard {
this.cv = cv;
}
- private final String[] aMethodsToStrip = new String[] {"getKeyName"};
+ private final String[] aMethodsToStrip = new String[] { "getKeyName" };
@Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
index c73b97aa6d..cb88d7bc07 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
@@ -32,8 +32,6 @@ import static org.objectweb.asm.Opcodes.LDIV;
import static org.objectweb.asm.Opcodes.LREM;
import static org.objectweb.asm.Opcodes.NEW;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gtPlusPlus.preloader.DevHelper;
import org.apache.logging.log4j.Level;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.ClassReader;
@@ -42,6 +40,9 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.preloader.DevHelper;
+
public class ClassTransformer_TC_ItemWispEssence {
private final boolean isValid;
@@ -59,7 +60,7 @@ public class ClassTransformer_TC_ItemWispEssence {
String aGetColour = obfuscated ? DevHelper.getSRG("getColorFromItemStack") : "getColorFromItemStack";
aTempReader = new ClassReader(basicClass);
aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
- aTempReader.accept(new AddAdapter(aTempWriter, new String[] {"getAspects", aGetColour}), 0);
+ aTempReader.accept(new AddAdapter(aTempWriter, new String[] { "getAspects", aGetColour }), 0);
injectMethod("getAspects", aTempWriter, obfuscated);
injectMethod(aGetColour, aTempWriter, obfuscated);
if (aTempReader != null && aTempWriter != null) {
@@ -154,10 +155,10 @@ public class ClassTransformer_TC_ItemWispEssence {
Label l8 = new Label();
mv.visitJumpInsn(GOTO, l8);
mv.visitLabel(l7);
- mv.visitFrame(F_APPEND, 1, new Object[] {"thaumcraft/api/aspects/AspectList"}, 0, null);
+ mv.visitFrame(F_APPEND, 1, new Object[] { "thaumcraft/api/aspects/AspectList" }, 0, null);
mv.visitInsn(ACONST_NULL);
mv.visitLabel(l8);
- mv.visitFrame(F_SAME1, 0, null, 1, new Object[] {"thaumcraft/api/aspects/AspectList"});
+ mv.visitFrame(F_SAME1, 0, null, 1, new Object[] { "thaumcraft/api/aspects/AspectList" });
mv.visitInsn(ARETURN);
mv.visitLabel(l3);
mv.visitLineNumber(149, l3);
@@ -310,7 +311,9 @@ public class ClassTransformer_TC_ItemWispEssence {
if (found) {
FMLRelaunchLog.log(
- "[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Found method " + name + ", removing.");
+ "[GT++ ASM] Thaumcraft WispEssence_Patch",
+ Level.INFO,
+ "Found method " + name + ", removing.");
}
return methodVisitor;
}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java
index 676c072eb2..831da8f90d 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java
@@ -2,16 +2,19 @@ package gtPlusPlus.preloader.asm.transformers;
import static org.objectweb.asm.Opcodes.*;
-import cpw.mods.fml.common.Loader;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.Preloader_Logger;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
+
import org.apache.logging.log4j.Level;
import org.objectweb.asm.*;
+import cpw.mods.fml.common.Loader;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.Preloader_Logger;
+
public class ClassTransformer_TT_ThaumicRestorer {
private final boolean isValid;
@@ -44,15 +47,15 @@ public class ClassTransformer_TT_ThaumicRestorer {
// thaumic.tinkerer.common.block.tile.TileRepairer
private static final boolean isTConstructTool(ItemStack aStack) {
- return ReflectionUtils.invoke(null, mIsTcTool, new Object[] {aStack});
+ return ReflectionUtils.invoke(null, mIsTcTool, new Object[] { aStack });
}
private static final int getDamage(ItemStack aStack) {
- return (int) ReflectionUtils.invokeNonBool(null, mGetTcDamage, new Object[] {aStack});
+ return (int) ReflectionUtils.invokeNonBool(null, mGetTcDamage, new Object[] { aStack });
}
private static final boolean fixDamage(ItemStack aStack, int aAmount) {
- return ReflectionUtils.invoke(null, mFixTcDamage, new Object[] {aStack, aAmount});
+ return ReflectionUtils.invoke(null, mFixTcDamage, new Object[] { aStack, aAmount });
}
private static final int drawEssentia(TileEntity aTile) {
@@ -60,7 +63,7 @@ public class ClassTransformer_TT_ThaumicRestorer {
}
private static final void sparkle(float a, float b, float c, int d) {
- ReflectionUtils.invokeVoid(ReflectionUtils.getFieldValue(mProxyTC), mSparkle, new Object[] {a, b, c, d});
+ ReflectionUtils.invokeVoid(ReflectionUtils.getFieldValue(mProxyTC), mSparkle, new Object[] { a, b, c, d });
}
public static void updateEntity(TileEntity aTile) {
@@ -72,14 +75,14 @@ public class ClassTransformer_TT_ThaumicRestorer {
mThaumicTinkerer = ReflectionUtils.getClass("thaumic.tinkerer.common.ThaumicTinkerer");
mTCProxy = ReflectionUtils.getClass("thaumcraft.common.CommonProxy");
// Set the methods we need
- mIsTcTool = ReflectionUtils.getMethod(
- mTinkersConstructCompat, "isTConstructTool", new Class[] {ItemStack.class});
- mGetTcDamage =
- ReflectionUtils.getMethod(mTinkersConstructCompat, "getDamage", new Class[] {ItemStack.class});
- mFixTcDamage = ReflectionUtils.getMethod(
- mTinkersConstructCompat, "fixDamage", new Class[] {ItemStack.class, int.class});
- mSparkle = ReflectionUtils.getMethod(
- mTCProxy, "sparkle", new Class[] {float.class, float.class, float.class, int.class});
+ mIsTcTool = ReflectionUtils
+ .getMethod(mTinkersConstructCompat, "isTConstructTool", new Class[] { ItemStack.class });
+ mGetTcDamage = ReflectionUtils
+ .getMethod(mTinkersConstructCompat, "getDamage", new Class[] { ItemStack.class });
+ mFixTcDamage = ReflectionUtils
+ .getMethod(mTinkersConstructCompat, "fixDamage", new Class[] { ItemStack.class, int.class });
+ mSparkle = ReflectionUtils
+ .getMethod(mTCProxy, "sparkle", new Class[] { float.class, float.class, float.class, int.class });
mDrawEssentia = ReflectionUtils.getMethod(mTileRepairerClass, "drawEssentia", new Class[] {});
// Set the fields we need
mRepairTiconTools = ReflectionUtils.getField(mTTConfigHandler, "repairTConTools");
@@ -101,8 +104,7 @@ public class ClassTransformer_TT_ThaumicRestorer {
ReflectionUtils.setField(aTile, mTicksExisted, ticksExisted);
boolean aDidRun = false;
if (ticksExisted % 10 == 0) {
- if (Loader.isModLoaded("TConstruct")
- && repairTConTools
+ if (Loader.isModLoaded("TConstruct") && repairTConTools
&& inventorySlots[0] != null
&& isTConstructTool(inventorySlots[0])) {
final int dmg = getDamage(inventorySlots[0]);
@@ -126,8 +128,7 @@ public class ClassTransformer_TT_ThaumicRestorer {
dmgLastTick = ((inventorySlots[0] == null) ? 0 : getDamage(inventorySlots[0]));
aDidRun = true;
}
- if (inventorySlots[0] != null
- && inventorySlots[0].getItemDamage() > 0
+ if (inventorySlots[0] != null && inventorySlots[0].getItemDamage() > 0
&& inventorySlots[0].getItem().isRepairable()) {
final int essentia2 = drawEssentia(aTile);
final int dmg2 = inventorySlots[0].getItemDamage();
@@ -273,7 +274,10 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitLineNumber(61, l4);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitJumpInsn(IFNULL, l3);
@@ -282,7 +286,10 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitLineNumber(62, l5);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitMethodInsn(
@@ -297,7 +304,10 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitLineNumber(63, l6);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitMethodInsn(
@@ -318,14 +328,21 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitLineNumber(65, l9);
mv.visitVarInsn(ALOAD, 0);
mv.visitMethodInsn(
- INVOKEVIRTUAL, "thaumic/tinkerer/common/block/tile/TileRepairer", "drawEssentia", "()I", false);
+ INVOKEVIRTUAL,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "drawEssentia",
+ "()I",
+ false);
mv.visitVarInsn(ISTORE, 2);
Label l10 = new Label();
mv.visitLabel(l10);
mv.visitLineNumber(66, l10);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitVarInsn(ILOAD, 2);
@@ -356,7 +373,10 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitLabel(l14);
mv.visitLineNumber(69, l14);
mv.visitFieldInsn(
- GETSTATIC, "thaumic/tinkerer/common/ThaumicTinkerer", "tcProxy", "Lthaumcraft/common/CommonProxy;");
+ GETSTATIC,
+ "thaumic/tinkerer/common/ThaumicTinkerer",
+ "tcProxy",
+ "Lthaumcraft/common/CommonProxy;");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "xCoord", "I");
mv.visitInsn(I2D);
@@ -401,7 +421,7 @@ public class ClassTransformer_TT_ThaumicRestorer {
Label l17 = new Label();
mv.visitJumpInsn(GOTO, l17);
mv.visitLabel(l13);
- mv.visitFrame(Opcodes.F_APPEND, 2, new Object[] {Opcodes.INTEGER, Opcodes.INTEGER}, 0, null);
+ mv.visitFrame(Opcodes.F_APPEND, 2, new Object[] { Opcodes.INTEGER, Opcodes.INTEGER }, 0, null);
mv.visitVarInsn(ALOAD, 0);
mv.visitInsn(ICONST_0);
mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "tookLastTick", "Z");
@@ -420,7 +440,10 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitVarInsn(ALOAD, 0);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
Label l19 = new Label();
@@ -429,10 +452,13 @@ public class ClassTransformer_TT_ThaumicRestorer {
Label l20 = new Label();
mv.visitJumpInsn(GOTO, l20);
mv.visitLabel(l19);
- mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {"thaumic/tinkerer/common/block/tile/TileRepairer"});
+ mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer" });
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitMethodInsn(
@@ -445,9 +471,9 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitFrame(
Opcodes.F_FULL,
2,
- new Object[] {"thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER},
+ new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER },
2,
- new Object[] {"thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER});
+ new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER });
mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "dmgLastTick", "I");
Label l21 = new Label();
mv.visitLabel(l21);
@@ -458,21 +484,30 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitFrame(Opcodes.F_CHOP, 1, null, 0, null);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
Label l22 = new Label();
mv.visitJumpInsn(IFNULL, l22);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItemDamage + "", "()I", false);
mv.visitJumpInsn(IFLE, l22);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItem + "", "()L" + aItem + ";", false);
@@ -483,14 +518,21 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitLineNumber(79, l23);
mv.visitVarInsn(ALOAD, 0);
mv.visitMethodInsn(
- INVOKEVIRTUAL, "thaumic/tinkerer/common/block/tile/TileRepairer", "drawEssentia", "()I", false);
+ INVOKEVIRTUAL,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "drawEssentia",
+ "()I",
+ false);
mv.visitVarInsn(ISTORE, 1);
Label l24 = new Label();
mv.visitLabel(l24);
mv.visitLineNumber(80, l24);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItemDamage + "", "()I", false);
@@ -500,7 +542,10 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitLineNumber(81, l25);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitInsn(ICONST_0);
@@ -529,7 +574,10 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitLabel(l29);
mv.visitLineNumber(85, l29);
mv.visitFieldInsn(
- GETSTATIC, "thaumic/tinkerer/common/ThaumicTinkerer", "tcProxy", "Lthaumcraft/common/CommonProxy;");
+ GETSTATIC,
+ "thaumic/tinkerer/common/ThaumicTinkerer",
+ "tcProxy",
+ "Lthaumcraft/common/CommonProxy;");
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "xCoord", "I");
mv.visitInsn(I2D);
@@ -574,7 +622,7 @@ public class ClassTransformer_TT_ThaumicRestorer {
Label l32 = new Label();
mv.visitJumpInsn(GOTO, l32);
mv.visitLabel(l28);
- mv.visitFrame(Opcodes.F_APPEND, 2, new Object[] {Opcodes.INTEGER, Opcodes.INTEGER}, 0, null);
+ mv.visitFrame(Opcodes.F_APPEND, 2, new Object[] { Opcodes.INTEGER, Opcodes.INTEGER }, 0, null);
mv.visitVarInsn(ALOAD, 0);
mv.visitInsn(ICONST_0);
mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "tookLastTick", "Z");
@@ -593,7 +641,10 @@ public class ClassTransformer_TT_ThaumicRestorer {
mv.visitVarInsn(ALOAD, 0);
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
Label l34 = new Label();
@@ -602,18 +653,23 @@ public class ClassTransformer_TT_ThaumicRestorer {
Label l35 = new Label();
mv.visitJumpInsn(GOTO, l35);
mv.visitLabel(l34);
- mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {"thaumic/tinkerer/common/block/tile/TileRepairer"});
+ mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer" });
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(
- GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";");
+ GETFIELD,
+ "thaumic/tinkerer/common/block/tile/TileRepairer",
+ "inventorySlots",
+ "[L" + aItemStack + ";");
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItemDamage + "", "()I", false);
mv.visitLabel(l35);
mv.visitFrame(
- Opcodes.F_FULL, 1, new Object[] {"thaumic/tinkerer/common/block/tile/TileRepairer"}, 2, new Object[] {
- "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER
- });
+ Opcodes.F_FULL,
+ 1,
+ new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer" },
+ 2,
+ new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER });
mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "dmgLastTick", "I");
mv.visitLabel(l1);
mv.visitLineNumber(92, l1);
@@ -643,7 +699,7 @@ public class ClassTransformer_TT_ThaumicRestorer {
this.cv = cv;
}
- private final String[] aMethodsToStrip = new String[] {"updateEntity", "func_145845_h"};
+ private final String[] aMethodsToStrip = new String[] { "updateEntity", "func_145845_h" };
public boolean isObfuscated = false;
@Override
@@ -668,8 +724,8 @@ public class ClassTransformer_TT_ThaumicRestorer {
}
if (found) {
- Preloader_Logger.LOG(
- "Thaumic Tinkerer RepairItem Patch", Level.INFO, "Found method " + name + ", removing.");
+ Preloader_Logger
+ .LOG("Thaumic Tinkerer RepairItem Patch", Level.INFO, "Found method " + name + ", removing.");
}
return methodVisitor;
}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java
index 5148df0349..98a1ab48e4 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java
@@ -2,8 +2,6 @@ package gtPlusPlus.preloader.asm.transformers;
import static org.objectweb.asm.Opcodes.*;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gtPlusPlus.preloader.DevHelper;
import org.apache.logging.log4j.Level;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -11,6 +9,9 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.preloader.DevHelper;
+
public class ClassTransformer_TiConFluids {
// Leftover Code, in case I ever want to inject interfaces.
@@ -67,8 +68,12 @@ public class ClassTransformer_TiConFluids {
FMLRelaunchLog.log(
"[GT++ ASM] Bright Fluids",
Level.INFO,
- "Injecting " + methodName + " into " + className + ". ["
- + (isObfuscated ? "Obfuscated" : "Unobfuscated") + "]");
+ "Injecting " + methodName
+ + " into "
+ + className
+ + ". ["
+ + (isObfuscated ? "Obfuscated" : "Unobfuscated")
+ + "]");
// Account for Obfuscated constructor args.
String IBlockAccessName = isObfuscated ? "ahl" : "net/minecraft/world/IBlockAccess";
String aConstructorTypes = "(L" + IBlockAccessName + ";III)I";
@@ -94,7 +99,7 @@ public class ClassTransformer_TiConFluids {
mv.visitInsn(IRETURN);
mv.visitLabel(l2);
mv.visitLineNumber(21, l2);
- mv.visitFrame(F_APPEND, 1, new Object[] {INTEGER}, 0, null);
+ mv.visitFrame(F_APPEND, 1, new Object[] { INTEGER }, 0, null);
mv.visitVarInsn(ALOAD, 0);
mv.visitVarInsn(ALOAD, 1);
mv.visitVarInsn(ILOAD, 2);
@@ -102,7 +107,11 @@ public class ClassTransformer_TiConFluids {
mv.visitVarInsn(ILOAD, 4);
// net.minecraftforge.fluids.BlockFluidClassic.getLightValue(IBlockAccess, int, int, int)
mv.visitMethodInsn(
- INVOKESPECIAL, "net/minecraftforge/fluids/BlockFluidClassic", methodName, aConstructorTypes, false);
+ INVOKESPECIAL,
+ "net/minecraftforge/fluids/BlockFluidClassic",
+ methodName,
+ aConstructorTypes,
+ false);
mv.visitInsn(IRETURN);
Label l4 = new Label();
mv.visitLabel(l4);
@@ -134,7 +143,9 @@ public class ClassTransformer_TiConFluids {
MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
if (name.equals(methodName) && desc.equals(aConstructorTypes)) {
FMLRelaunchLog.log(
- "[GT++ ASM] OreDictTransformer", Level.INFO, "Found target method. [" + mIsObfuscated + "]");
+ "[GT++ ASM] OreDictTransformer",
+ Level.INFO,
+ "Found target method. [" + mIsObfuscated + "]");
return new localMethodVisitor(methodVisitor, mIsObfuscated);
}
return methodVisitor;
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
index 34425a49c3..ee82871d6a 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
@@ -6,12 +6,13 @@ import static org.objectweb.asm.Opcodes.IFEQ;
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
import static org.objectweb.asm.Opcodes.RETURN;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
import org.apache.logging.log4j.Level;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+
public class Preloader_ClassTransformer {
public static final class OreDictionaryVisitor extends ClassVisitor {
@@ -46,13 +47,15 @@ public class Preloader_ClassTransformer {
@Override
public void visitCode() {
FMLRelaunchLog.log(
- "[GT++ ASM] OreDictTransformer", Level.INFO, "Fixing Forge's poor attempt at an oreDictionary.");
+ "[GT++ ASM] OreDictTransformer",
+ Level.INFO,
+ "Fixing Forge's poor attempt at an oreDictionary.");
super.visitCode();
super.visitVarInsn(ALOAD, 0);
super.visitVarInsn(ALOAD, 1);
if (!mObfuscated) {
- FMLRelaunchLog.log(
- "[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Unobfuscated]");
+ FMLRelaunchLog
+ .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Unobfuscated]");
super.visitMethodInsn(
INVOKESTATIC,
"gtPlusPlus/preloader/Preloader_GT_OreDict",
@@ -60,8 +63,8 @@ public class Preloader_ClassTransformer {
"(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)Z",
false);
} else {
- FMLRelaunchLog.log(
- "[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Obfuscated]");
+ FMLRelaunchLog
+ .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Obfuscated]");
super.visitMethodInsn(
INVOKESTATIC,
"gtPlusPlus/preloader/Preloader_GT_OreDict",
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
index 3735f08860..7e5f4d3f6f 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
@@ -4,12 +4,11 @@ public class Preloader_ClassTransformer2 {
/**
*
- * So what I'd try is something like patch a new field into BaseMetaTileEntity to hold the ItemNBT,
- * then patch GT_Block_Machines.breakBlock to store the ItemNBT into that field by calling setItemNBT,
- * and then patch BaseMetaTileEntity.getDrops to retrieve that field instead of calling setItemNBT
- * But there's probably a simpler solution if all you want to do is fix this
- * for your super tanks rather than for all GT machines
- * (which would only include saving the output count for chest buffers and item distributors...)
+ * So what I'd try is something like patch a new field into BaseMetaTileEntity to hold the ItemNBT, then patch
+ * GT_Block_Machines.breakBlock to store the ItemNBT into that field by calling setItemNBT, and then patch
+ * BaseMetaTileEntity.getDrops to retrieve that field instead of calling setItemNBT But there's probably a simpler
+ * solution if all you want to do is fix this for your super tanks rather than for all GT machines (which would only
+ * include saving the output count for chest buffers and item distributors...)
*
*/
}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index 283bb47413..7ce78e16cc 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -2,6 +2,15 @@ package gtPlusPlus.preloader.asm.transformers;
import static gtPlusPlus.preloader.asm.ClassesToTransform.*;
+import java.io.File;
+import java.io.IOException;
+
+import net.minecraft.launchwrapper.IClassTransformer;
+import net.minecraft.launchwrapper.Launch;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+
import cpw.mods.fml.relauncher.CoreModManager;
import cpw.mods.fml.relauncher.ReflectionHelper;
import gtPlusPlus.api.objects.data.AutoMap;
@@ -10,12 +19,6 @@ import gtPlusPlus.preloader.DevHelper;
import gtPlusPlus.preloader.Preloader_Logger;
import gtPlusPlus.preloader.asm.AsmConfig;
import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor;
-import java.io.File;
-import java.io.IOException;
-import net.minecraft.launchwrapper.IClassTransformer;
-import net.minecraft.launchwrapper.Launch;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
public class Preloader_Transformer_Handler implements IClassTransformer {
@@ -24,8 +27,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
static {
mConfig = new AsmConfig(new File("config/GTplusplus/asm.cfg"));
- Preloader_Logger.INFO(
- "Config Location: " + AsmConfig.config.getConfigFile().getAbsolutePath());
+ Preloader_Logger.INFO("Config Location: " + AsmConfig.config.getConfigFile().getAbsolutePath());
Preloader_Logger.INFO("Is DevHelper Valid? " + DevHelper.mIsValidHelper);
IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_BASE_TILE_ENTITY);
IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_MACHINE1);
@@ -79,28 +81,22 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
final boolean obfuscated = checkObfuscated();
// Fix LWJGL index array out of bounds on keybinding IDs
- if ((transformedName.equals(LWJGL_KEYBOARD)
- || transformedName.equals(MINECRAFT_GAMESETTINGS_OBF)
- || transformedName.equals(MINECRAFT_GAMESETTINGS))
- && AsmConfig.enabledLwjglKeybindingFix
- // Do not transform if using lwjgl3
+ if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS_OBF)
+ || transformedName.equals(MINECRAFT_GAMESETTINGS)) && AsmConfig.enabledLwjglKeybindingFix
+ // Do not transform if using lwjgl3
&& !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) {
boolean isClientSettingsClass = false;
if (!transformedName.equals("org.lwjgl.input.Keyboard")) {
isClientSettingsClass = true;
}
Preloader_Logger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName);
- return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass)
- .getWriter()
- .toByteArray();
+ return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter().toByteArray();
}
// Enable mapping of Tickets and loaded chunks. - Forge
if (transformedName.equals(FORGE_CHUNK_MANAGER) && AsmConfig.enableChunkDebugging) {
Preloader_Logger.INFO("Chunkloading Patch", "Transforming " + transformedName);
- return new ClassTransformer_Forge_ChunkLoading(basicClass, false)
- .getWriter()
- .toByteArray();
+ return new ClassTransformer_Forge_ChunkLoading(basicClass, false).getWriter().toByteArray();
}
// Fix the OreDictionary - Forge
@@ -114,38 +110,28 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
// Fix the OreDictionary COFH
if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER) && (AsmConfig.enableCofhPatch || !obfuscated)) {
Preloader_Logger.INFO("COFH", "Transforming " + transformedName);
- return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass)
- .getWriter()
- .toByteArray();
+ return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter().toByteArray();
}
// Fix Tinkers Fluids
if (transformedName.equals(TINKERS_FLUID_BLOCK) && AsmConfig.enableTiConFluidLighting) {
Preloader_Logger.INFO("Bright Fluids", "Transforming " + transformedName);
- return new ClassTransformer_TiConFluids("getLightValue", obfuscated, basicClass)
- .getWriter()
- .toByteArray();
+ return new ClassTransformer_TiConFluids("getLightValue", obfuscated, basicClass).getWriter().toByteArray();
}
// Fix GC stuff
if (AsmConfig.enableGcFuelChanges) {
if (transformedName.equals(GALACTICRAFT_FLUID_UTILS)) {
Preloader_Logger.INFO("Galacticraft FluidUtils Patch", "Transforming " + transformedName);
- return new ClassTransformer_GC_FluidUtil(basicClass, false)
- .getWriter()
- .toByteArray();
+ return new ClassTransformer_GC_FluidUtil(basicClass, false).getWriter().toByteArray();
}
if (transformedName.equals(GALACTICRAFT_TILE_ENTITY_FUEL_LOADER)) {
Preloader_Logger.INFO("Galacticraft Fuel_Loader Patch", "Transforming " + transformedName);
- return new ClassTransformer_GC_FuelLoader(basicClass, false)
- .getWriter()
- .toByteArray();
+ return new ClassTransformer_GC_FuelLoader(basicClass, false).getWriter().toByteArray();
}
if (transformedName.equals(GALACTICRAFT_ENTITY_AUTO_ROCKET)) {
Preloader_Logger.INFO("Galacticraft EntityAutoRocket Patch", "Transforming " + transformedName);
- return new ClassTransformer_GC_EntityAutoRocket(basicClass, false)
- .getWriter()
- .toByteArray();
+ return new ClassTransformer_GC_EntityAutoRocket(basicClass, false).getWriter().toByteArray();
}
}
@@ -153,8 +139,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
for (String y : IC2_WRENCH_PATCH_CLASS_NAMES) {
if (transformedName.equals(y)) {
Preloader_Logger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName);
- return new ClassTransformer_IC2_GetHarvestTool(basicClass, obfuscated, transformedName)
- .getWriter()
+ return new ClassTransformer_IC2_GetHarvestTool(basicClass, obfuscated, transformedName).getWriter()
.toByteArray();
}
}
@@ -163,9 +148,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
// Patching ItemWispEssence to allow invalid item handling
if (transformedName.equals(THAUMCRAFT_ITEM_WISP_ESSENCE) && AsmConfig.enableTcAspectSafety) {
Preloader_Logger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName);
- return new ClassTransformer_TC_ItemWispEssence(basicClass, obfuscated)
- .getWriter()
- .toByteArray();
+ return new ClassTransformer_TC_ItemWispEssence(basicClass, obfuscated).getWriter().toByteArray();
}
return basicClass;
diff --git a/src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java b/src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java
index 4acfa1ccf2..164d1b8b37 100644
--- a/src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java
+++ b/src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java
@@ -1,58 +1,44 @@
/*
- * Copyright (c) 2002-2008 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2002-2008 LWJGL Project All rights reserved. Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following conditions are met: * Redistributions of source code
+ * must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in
+ * binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution. * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived from this software without specific prior written
+ * permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package gtPlusPlus.preloader.keyboard;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.asm.transformers.ClassTransformer_LWJGL_Keyboard;
import java.lang.reflect.Field;
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
+
import net.minecraft.client.resources.I18n;
+
import org.apache.logging.log4j.Level;
import org.lwjgl.BufferUtils;
import org.lwjgl.input.Keyboard;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.asm.transformers.ClassTransformer_LWJGL_Keyboard;
+
/**
* <br>
- * A raw Keyboard interface. This can be used to poll the current state of the
- * keys, or read all the keyboard presses / releases since the last read.
+ * A raw Keyboard interface. This can be used to poll the current state of the keys, or read all the keyboard presses /
+ * releases since the last read.
*
* @author cix_foo <cix_foo@users.sourceforge.net>
* @author elias_naur <elias_naur@users.sourceforge.net>
* @author Brian Matzon <brian@matzon.dk>
- * @version $Revision$
- * $Id$
+ * @version $Revision$ $Id$
*/
public class BetterKeyboard {
@@ -127,6 +113,7 @@ public class BetterKeyboard {
/**
* Gets a key's name
+ *
* @param key The key
* @return a String with the key's human readable name in it or null if the key is unnamed
*/
@@ -138,8 +125,7 @@ public class BetterKeyboard {
* Represents a key or mouse button as a string. Args: key
*/
public static String getKeyDisplayString(int aKeyValue) {
- return aKeyValue < 0
- ? I18n.format("key.mouseButton", new Object[] {Integer.valueOf(aKeyValue + 101)})
+ return aKeyValue < 0 ? I18n.format("key.mouseButton", new Object[] { Integer.valueOf(aKeyValue + 101) })
: getKeyName(aKeyValue);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java
index 7114aa3db4..c44620e5da 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java
@@ -1,18 +1,21 @@
package gtPlusPlus.xmod.bartcrops;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.bartcrops.crops.Crop_Force;
import gtPlusPlus.xmod.bartcrops.crops.Crop_Hemp;
import ic2.api.crops.CropCard;
import ic2.api.crops.Crops;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
/**
* Mostly borrowed from the Crops++ Crop Loader.
+ *
* @author Alkalus
*/
public class LoaderOfTheCrops {
@@ -101,8 +104,7 @@ public class LoaderOfTheCrops {
for (int i = 0; i < mCropList.size(); ++i) {
if (baseseed.get(i) != null && cropObjs().get(i) != null) {
- Crops.instance.registerBaseSeed(
- (ItemStack) baseseed.get(i), (CropCard) cropObjs().get(i), 1, 1, 1, 1);
+ Crops.instance.registerBaseSeed((ItemStack) baseseed.get(i), (CropCard) cropObjs().get(i), 1, 1, 1, 1);
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java
index 32c9dbf0f6..279300487f 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java
@@ -1,18 +1,20 @@
package gtPlusPlus.xmod.bartcrops.abstracts;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import ic2.api.crops.CropCard;
-import ic2.api.crops.ICropTile;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+
import speiger.src.crops.api.ICropCardInfo;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import ic2.api.crops.CropCard;
+import ic2.api.crops.ICropTile;
public abstract class BaseCrop extends CropCard implements ICropCardInfo {
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java
index 926bc33776..7bb8a0925a 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java
@@ -1,11 +1,12 @@
package gtPlusPlus.xmod.bartcrops.crops;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.material.ELEMENT.STANDALONE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.bartcrops.abstracts.BaseAestheticCrop;
import ic2.api.crops.ICropTile;
-import net.minecraft.item.ItemStack;
public class Crop_Force extends BaseAestheticCrop {
@@ -24,9 +25,9 @@ public class Crop_Force extends BaseAestheticCrop {
public int growthDuration(ICropTile crop) {
int ret = 800;
- /*if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) {
- ret = 225;
- }*/
+ /*
+ * if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) { ret = 225; }
+ */
if (CORE_Preloader.DEBUG_MODE) {
ret = 1;
@@ -36,7 +37,7 @@ public class Crop_Force extends BaseAestheticCrop {
}
public String[] attributes() {
- return new String[] {"Power", "Soil", "Yellow", "Gold"};
+ return new String[] { "Power", "Soil", "Yellow", "Gold" };
}
public ItemStack getGain(ICropTile crop) {
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java
index c7cd1c0bea..5932f984ba 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java
@@ -1,12 +1,13 @@
package gtPlusPlus.xmod.bartcrops.crops;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.bartcrops.abstracts.BaseAestheticCrop;
import ic2.api.crops.ICropTile;
-import net.minecraft.item.ItemStack;
public class Crop_Hemp extends BaseAestheticCrop {
@@ -25,9 +26,9 @@ public class Crop_Hemp extends BaseAestheticCrop {
public int growthDuration(ICropTile crop) {
int ret = 550;
- /*if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) {
- ret = 225;
- }*/
+ /*
+ * if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) { ret = 225; }
+ */
if (CORE_Preloader.DEBUG_MODE) {
ret = 1;
@@ -37,7 +38,7 @@ public class Crop_Hemp extends BaseAestheticCrop {
}
public String[] attributes() {
- return new String[] {"Green", "Soil", "Orange"};
+ return new String[] { "Green", "Soil", "Orange" };
}
public ItemStack getGain(ICropTile crop) {
diff --git a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java
index dba2976758..fabcc2b6c8 100644
--- a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java
+++ b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java
@@ -1,14 +1,16 @@
package gtPlusPlus.xmod.bartworks;
-import gregtech.api.enums.OrePrefixes;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Map;
+
import net.minecraft.item.ItemStack;
+import gregtech.api.enums.OrePrefixes;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class BW_Utils {
private static final Method sName;
@@ -21,16 +23,16 @@ public class BW_Utils {
static {
sName = ReflectionUtils.getMethod(Enum.class, "name");
- sClassBW_NonMeta_MaterialItems =
- ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems");
+ sClassBW_NonMeta_MaterialItems = ReflectionUtils
+ .getClass("com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems");
sGet = ReflectionUtils.getMethod(sClassBW_NonMeta_MaterialItems, "get", long.class, Object[].class);
Werkstoff = ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.Werkstoff");
- WerkstoffLoader =
- ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader");
+ WerkstoffLoader = ReflectionUtils
+ .getClass("com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader");
Field fieldWerkstoffHashMap = ReflectionUtils.getField(Werkstoff, "werkstoffHashMap");
werkstoffHashMap = ReflectionUtils.getFieldValue(fieldWerkstoffHashMap);
- getCorrespondingItemStackUnsafe = ReflectionUtils.getMethod(
- WerkstoffLoader, "getCorrespondingItemStackUnsafe", OrePrefixes.class, Werkstoff, int.class);
+ getCorrespondingItemStackUnsafe = ReflectionUtils
+ .getMethod(WerkstoffLoader, "getCorrespondingItemStackUnsafe", OrePrefixes.class, Werkstoff, int.class);
}
public enum NonMeta_MaterialItem {
@@ -49,9 +51,8 @@ public class BW_Utils {
for (Object obj : sClassBW_NonMeta_MaterialItems.getEnumConstants()) {
try {
if (aItem.name().equals(ReflectionUtils.invokeNonBool(obj, sName, new Object[] {}))) {
- return ((ItemStack) ReflectionUtils.invokeNonBool(
- obj, sGet, new Object[] {aAmount, new Object[] {}}))
- .copy();
+ return ((ItemStack) ReflectionUtils
+ .invokeNonBool(obj, sGet, new Object[] { aAmount, new Object[] {} })).copy();
}
} catch (Throwable t) {
t.printStackTrace();
@@ -76,7 +77,9 @@ public class BW_Utils {
Object werkstoff = werkstoffHashMap.get(werkstoffID);
if (werkstoff != null) {
return (ItemStack) ReflectionUtils.invokeNonBool(
- null, getCorrespondingItemStackUnsafe, new Object[] {orePrefixes, werkstoff, amount});
+ null,
+ getCorrespondingItemStackUnsafe,
+ new Object[] { orePrefixes, werkstoff, amount });
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java
index f66677838f..39aee4681f 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java
@@ -1,14 +1,16 @@
package gtPlusPlus.xmod.bop;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import java.lang.reflect.Field;
+
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+
public class HANDLER_BiomesOPlenty {
public static Item mPineCone;
@@ -63,36 +65,36 @@ public class HANDLER_BiomesOPlenty {
// BOPCBlocks.colorizedLeaves2 - 1
private static void setFields() {
- Field aBopMiscItem =
- ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCItems"), "misc");
-
- Field aBopBlock1 =
- ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs1");
- Field aBopBlock2 =
- ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs2");
- Field aBopBlock3 =
- ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs3");
- Field aBopBlock4 =
- ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs4");
-
- Field aBopLeaves1 =
- ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves1");
- Field aBopLeaves2 =
- ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves2");
- Field aBopLeaves3 =
- ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves3");
- Field aBopLeaves4 =
- ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves4");
-
- Field aBopColouredLeaves1 = ReflectionUtils.getField(
- ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedLeaves1");
- Field aBopColouredLeaves2 = ReflectionUtils.getField(
- ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedLeaves2");
-
- Field aBopSapling =
- ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "saplings");
- Field aBopColouredSapling = ReflectionUtils.getField(
- ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedSaplings");
+ Field aBopMiscItem = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCItems"), "misc");
+
+ Field aBopBlock1 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs1");
+ Field aBopBlock2 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs2");
+ Field aBopBlock3 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs3");
+ Field aBopBlock4 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "logs4");
+
+ Field aBopLeaves1 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves1");
+ Field aBopLeaves2 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves2");
+ Field aBopLeaves3 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves3");
+ Field aBopLeaves4 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "leaves4");
+
+ Field aBopColouredLeaves1 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedLeaves1");
+ Field aBopColouredLeaves2 = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedLeaves2");
+
+ Field aBopSapling = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "saplings");
+ Field aBopColouredSapling = ReflectionUtils
+ .getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedSaplings");
if (aBopMiscItem != null) {
Item aMiscItem = ReflectionUtils.getFieldValue(aBopMiscItem);
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
index add656087d..316e826e37 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.bop.blocks;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
@@ -22,11 +28,6 @@ import gtPlusPlus.xmod.bop.blocks.pine.SaplingPineTree;
import gtPlusPlus.xmod.bop.blocks.rainforest.LeavesRainforestTree;
import gtPlusPlus.xmod.bop.blocks.rainforest.LogRainforestTree;
import gtPlusPlus.xmod.bop.blocks.rainforest.SaplingRainforestTree;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
public class BOP_Block_Registrator {
@@ -74,9 +75,10 @@ public class BOP_Block_Registrator {
public static final void addLogRecipes(final ItemStack aStack) {
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {aStack},
+ new ItemStack[] { aStack },
ItemUtils.getSimpleStack(
- Item.getItemFromBlock(Blocks.planks), GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 4));
+ Item.getItemFromBlock(Blocks.planks),
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 4));
RecipeUtils.recipeBuilder(
CI.craftingToolSaw,
null,
@@ -97,7 +99,7 @@ public class BOP_Block_Registrator {
GT_ModHandler.addCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L),
GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"sLf", 'L', GT_Utility.copyAmount(1L, aStack)});
+ new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) });
GT_Values.RA.addLatheRecipe(
GT_Utility.copyAmount(1L, aStack),
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L),
@@ -137,8 +139,8 @@ public class BOP_Block_Registrator {
GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
new ItemStack(Items.coal, 1, 1))) {
addPyrolyeOvenRecipes(aStack);
- if (GregTech_API.sRecipeFile.get(
- ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
+ if (GregTech_API.sRecipeFile
+ .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
}
}
@@ -147,8 +149,8 @@ public class BOP_Block_Registrator {
GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null),
new ItemStack(Items.coal, 1, 1))) {
addPyrolyeOvenRecipes(aStack);
- if (GregTech_API.sRecipeFile.get(
- ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
+ if (GregTech_API.sRecipeFile
+ .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i));
}
}
@@ -170,8 +172,7 @@ public class BOP_Block_Registrator {
GT_Values.RA.addCutterRecipe(
new ItemStack(aStack.getItem(), 1, i),
GT_Utility.copyAmount(
- GT_Mod.gregtechproxy.mNerfedWoodPlank
- ? ((long) tStack.stackSize)
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize)
: ((long) (tStack.stackSize * 5 / 4)),
tStack),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
@@ -184,15 +185,15 @@ public class BOP_Block_Registrator {
GT_ModHandler.removeRecipe(new ItemStack(aStack.getItem(), 1, i));
GT_ModHandler.addCraftingRecipe(
GT_Utility.copyAmount(
- GT_Mod.gregtechproxy.mNerfedWoodPlank
- ? ((long) tStack.stackSize)
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize)
: ((long) (tStack.stackSize * 5 / 4)),
tStack),
- new Object[] {"s", "L", 'L', new ItemStack(aStack.getItem(), 1, i)});
+ new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) });
GT_ModHandler.addShapelessCraftingRecipe(
GT_Utility.copyAmount(
- tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack),
- new Object[] {new ItemStack(aStack.getItem(), 1, i)});
+ tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1),
+ tStack),
+ new Object[] { new ItemStack(aStack.getItem(), 1, i) });
}
}
} else {
@@ -200,8 +201,8 @@ public class BOP_Block_Registrator {
GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
new ItemStack(Items.coal, 1, 1))) {
addPyrolyeOvenRecipes(aStack);
- if (GregTech_API.sRecipeFile.get(
- ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
+ if (GregTech_API.sRecipeFile
+ .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
}
}
@@ -219,8 +220,7 @@ public class BOP_Block_Registrator {
GT_Values.RA.addCutterRecipe(
GT_Utility.copyAmount(1L, aStack),
GT_Utility.copyAmount(
- GT_Mod.gregtechproxy.mNerfedWoodPlank
- ? ((long) tStack2.stackSize)
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize)
: ((long) (tStack2.stackSize * 5 / 4)),
tStack2),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
@@ -233,15 +233,15 @@ public class BOP_Block_Registrator {
GT_ModHandler.removeRecipe(GT_Utility.copyAmount(1L, aStack));
GT_ModHandler.addCraftingRecipe(
GT_Utility.copyAmount(
- GT_Mod.gregtechproxy.mNerfedWoodPlank
- ? ((long) tStack2.stackSize)
+ GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize)
: ((long) (tStack2.stackSize * 5 / 4)),
tStack2),
- new Object[] {"s", "L", 'L', GT_Utility.copyAmount(1L, aStack)});
+ new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) });
GT_ModHandler.addShapelessCraftingRecipe(
GT_Utility.copyAmount(
- tStack2.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack2),
- new Object[] {GT_Utility.copyAmount(1L, aStack)});
+ tStack2.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1),
+ tStack2),
+ new Object[] { GT_Utility.copyAmount(1L, aStack) });
}
}
if (GT_Utility.areStacksEqual(
@@ -261,8 +261,8 @@ public class BOP_Block_Registrator {
null,
0,
false);
- GT_ModHandler.addCompressionRecipe(
- GT_Utility.copyAmount(8L, aStack), ItemList.IC2_Plantball.get(1L, new Object[0]));
+ GT_ModHandler
+ .addCompressionRecipe(GT_Utility.copyAmount(8L, aStack), ItemList.IC2_Plantball.get(1L, new Object[0]));
GT_Values.RA.addLatheRecipe(
GT_Utility.copyAmount(1L, aStack),
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L),
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
index c2d534dfb6..f33b4de9c4 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
@@ -1,16 +1,8 @@
package gtPlusPlus.xmod.bop.blocks.base;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.BlockLeaves;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
@@ -21,10 +13,20 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class LeavesBase extends BlockLeaves {
protected IIcon[][] leafTextures = new IIcon[2][];
- protected String[][] leafType = new String[][] {{}, {}};
+ protected String[][] leafType = new String[][] { {}, {} };
protected String[] treeType = new String[] {};
protected ItemStack[] bonusDrops;
@@ -77,8 +79,7 @@ public class LeavesBase extends BlockLeaves {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int p_149691_1_, int metaID) {
- return (metaID & 3) == 1
- ? this.leafTextures[this.field_150127_b][1]
+ return (metaID & 3) == 1 ? this.leafTextures[this.field_150127_b][1]
: this.leafTextures[this.field_150127_b][0];
}
@@ -93,8 +94,8 @@ public class LeavesBase extends BlockLeaves {
for (int i = 0; i < leafType.length; ++i) {
this.leafTextures[i] = new IIcon[leafType[i].length];
for (int j = 0; j < leafType[i].length; ++j) {
- this.leafTextures[i][j] =
- iIcon.registerIcon(CORE.MODID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]);
+ this.leafTextures[i][j] = iIcon
+ .registerIcon(CORE.MODID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]);
}
}
setVanillaVariable(this.field_150129_M, this.leafTextures);
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
index 4c8a905834..4723403ea0 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
@@ -1,14 +1,7 @@
package gtPlusPlus.xmod.bop.blocks.base;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
+
import net.minecraft.block.BlockLog;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
@@ -18,7 +11,17 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public abstract class LogBase extends BlockLog {
+
public String[] treeType = new String[] {};
protected IIcon[] textureSide;
protected IIcon[] textureTop;
@@ -30,7 +33,9 @@ public abstract class LogBase extends BlockLog {
GameRegistry.registerBlock(this, ItemBlock.class, blockName);
this.setBlockName(blockName);
ItemUtils.addItemToOreDictionary(
- ItemUtils.getSimpleStack(this), "log" + Utils.sanitizeString(blockNameLocalized), true);
+ ItemUtils.getSimpleStack(this),
+ "log" + Utils.sanitizeString(blockNameLocalized),
+ true);
ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), "logWood", true);
this.setCreativeTab(AddToCreativeTab.tabBOP);
LanguageRegistry.addName(this, blockNameLocalized);
@@ -72,8 +77,8 @@ public abstract class LogBase extends BlockLog {
for (int i = 0; i < this.textureSide.length; ++i) {
this.textureSide[i] = iIcon.registerIcon(CORE.MODID + ":" + "trees/" + "logs/" + "log_" + treeType[i]);
- this.textureTop[i] =
- iIcon.registerIcon(CORE.MODID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top");
+ this.textureTop[i] = iIcon
+ .registerIcon(CORE.MODID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top");
}
setVanillaVariable(this.field_150167_a, this.textureSide);
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
index f606a3c173..42ca117573 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
@@ -1,16 +1,8 @@
package gtPlusPlus.xmod.bop.blocks.base;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -26,7 +18,18 @@ import net.minecraft.world.gen.feature.WorldGenBigTree;
import net.minecraft.world.gen.feature.WorldGenTrees;
import net.minecraft.world.gen.feature.WorldGenerator;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class SaplingBase extends BlockSapling {
+
protected String[] saplingTypes = new String[] {};
protected IIcon[] saplingTextures = new IIcon[] {};
@@ -56,8 +59,9 @@ public class SaplingBase extends BlockSapling {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int someInt, int meta) {
- /* p_149691_2_ &= 7;
- return saplingTextures[MathHelper.clamp_int(p_149691_2_, 0, 5)];*/
+ /*
+ * p_149691_2_ &= 7; return saplingTextures[MathHelper.clamp_int(p_149691_2_, 0, 5)];
+ */
// return this.saplingTextures[meta % this.saplingTextures.length];
try {
return this.saplingTextures[meta];
@@ -177,8 +181,8 @@ public class SaplingBase extends BlockSapling {
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iIcon) {
for (int i = 0; i < saplingTextures.length; ++i) {
- saplingTextures[i] =
- iIcon.registerIcon(CORE.MODID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]);
+ saplingTextures[i] = iIcon
+ .registerIcon(CORE.MODID + ":" + "trees/" + "saplings/" + "sapling_" + saplingTypes[i]);
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java
index b901766583..d03473d0f7 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java
@@ -1,22 +1,24 @@
package gtPlusPlus.xmod.bop.blocks.pine;
+import java.util.Random;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.chemistry.AgriculturalChem;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import gtPlusPlus.xmod.bop.blocks.base.LeavesBase;
-import java.util.Random;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class LeavesPineTree extends LeavesBase {
public LeavesPineTree() {
super("Pine", "pine", new ItemStack[] {});
- this.treeType = new String[] {"pine"};
- this.leafType = new String[][] {{"pine"}, {"pine_opaque"}};
+ this.treeType = new String[] { "pine" };
+ this.leafType = new String[][] { { "pine" }, { "pine_opaque" } };
}
@Override
@@ -29,7 +31,11 @@ public class LeavesPineTree extends LeavesBase {
Logger.INFO("Dropping Bonus Drops");
if (MathUtils.randInt(0, 10) >= 9) {
this.dropBlockAsItem(
- world, x, y, z, ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, MathUtils.randInt(1, 4)));
+ world,
+ x,
+ y,
+ z,
+ ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, MathUtils.randInt(1, 4)));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java
index e8de630960..98e384cd3f 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java
@@ -5,20 +5,17 @@ import gtPlusPlus.xmod.bop.blocks.base.LogBase;
public class LogPineTree extends LogBase {
public LogPineTree() {
- super("Pine Log", "pine", new String[] {"pine"});
- this.treeType = new String[] {"pine"};
+ super("Pine Log", "pine", new String[] { "pine" });
+ this.treeType = new String[] { "pine" };
}
- /*@Override
- @SideOnly(Side.CLIENT)
- protected IIcon getSideIcon(int metaID){
- return this.textureSide[metaID % this.textureSide.length];
- }
-
- @Override
- @SideOnly(Side.CLIENT)
- protected IIcon getTopIcon(int metaID){
- return this.textureTop[metaID % this.textureTop.length];
- }*/
+ /*
+ * @Override
+ * @SideOnly(Side.CLIENT) protected IIcon getSideIcon(int metaID){ return this.textureSide[metaID %
+ * this.textureSide.length]; }
+ * @Override
+ * @SideOnly(Side.CLIENT) protected IIcon getTopIcon(int metaID){ return this.textureTop[metaID %
+ * this.textureTop.length]; }
+ */
}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java
index a5c9012f76..2c2bb38af6 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java
@@ -1,10 +1,7 @@
package gtPlusPlus.xmod.bop.blocks.pine;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.bop.blocks.base.SaplingBase;
-import gtPlusPlus.xmod.bop.world.features.trees.WorldGenPineTree;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
@@ -12,10 +9,15 @@ import net.minecraft.world.gen.feature.WorldGenBigTree;
import net.minecraft.world.gen.feature.WorldGenTrees;
import net.minecraft.world.gen.feature.WorldGenerator;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.bop.blocks.base.SaplingBase;
+import gtPlusPlus.xmod.bop.world.features.trees.WorldGenPineTree;
+
public class SaplingPineTree extends SaplingBase {
public SaplingPineTree() {
- super("Pine Sapling", "pine", new String[] {"pine"});
+ super("Pine Sapling", "pine", new String[] { "pine" });
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java
index fe6eb4446d..816b666a40 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java
@@ -1,19 +1,21 @@
package gtPlusPlus.xmod.bop.blocks.rainforest;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
-import gtPlusPlus.xmod.bop.blocks.base.LeavesBase;
import java.util.Random;
+
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+import gtPlusPlus.xmod.bop.blocks.base.LeavesBase;
+
public class LeavesRainforestTree extends LeavesBase {
public LeavesRainforestTree() {
- super("Rainforest Oak", "rainforestoak", new ItemStack[] {ItemUtils.getSimpleStack(Items.apple)});
- this.treeType = new String[] {"rainforest"};
- this.leafType = new String[][] {{"rainforest"}, {"rainforest_opaque"}};
+ super("Rainforest Oak", "rainforestoak", new ItemStack[] { ItemUtils.getSimpleStack(Items.apple) });
+ this.treeType = new String[] { "rainforest" };
+ this.leafType = new String[][] { { "rainforest" }, { "rainforest_opaque" } };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java
index b3f42fcd93..94d936d477 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java
@@ -5,20 +5,17 @@ import gtPlusPlus.xmod.bop.blocks.base.LogBase;
public class LogRainforestTree extends LogBase {
public LogRainforestTree() {
- super("Rainforest Oak", "rainforestoak", new String[] {"rainforest"});
- this.treeType = new String[] {"rainforest"};
+ super("Rainforest Oak", "rainforestoak", new String[] { "rainforest" });
+ this.treeType = new String[] { "rainforest" };
}
- /*@Override
- @SideOnly(Side.CLIENT)
- protected IIcon getSideIcon(int metaID){
- return this.textureSide[metaID % this.textureSide.length];
- }
-
- @Override
- @SideOnly(Side.CLIENT)
- protected IIcon getTopIcon(int metaID){
- return this.textureTop[metaID % this.textureTop.length];
- }*/
+ /*
+ * @Override
+ * @SideOnly(Side.CLIENT) protected IIcon getSideIcon(int metaID){ return this.textureSide[metaID %
+ * this.textureSide.length]; }
+ * @Override
+ * @SideOnly(Side.CLIENT) protected IIcon getTopIcon(int metaID){ return this.textureTop[metaID %
+ * this.textureTop.length]; }
+ */
}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
index 72de197adf..bc5cadc4bb 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
@@ -1,10 +1,7 @@
package gtPlusPlus.xmod.bop.blocks.rainforest;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
-import gtPlusPlus.xmod.bop.blocks.base.SaplingBase;
-import gtPlusPlus.xmod.bop.world.features.trees.WorldGenRainForestTree_Ex;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
@@ -12,10 +9,15 @@ import net.minecraft.world.gen.feature.WorldGenBigTree;
import net.minecraft.world.gen.feature.WorldGenTrees;
import net.minecraft.world.gen.feature.WorldGenerator;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+import gtPlusPlus.xmod.bop.blocks.base.SaplingBase;
+import gtPlusPlus.xmod.bop.world.features.trees.WorldGenRainForestTree_Ex;
+
public class SaplingRainforestTree extends SaplingBase {
public SaplingRainforestTree() {
- super("Rainforest Oak Sapling", "rainforestoak", new String[] {"rainforest"});
+ super("Rainforest Oak Sapling", "rainforestoak", new String[] { "rainforest" });
}
@Override
@@ -41,7 +43,13 @@ public class SaplingRainforestTree extends SaplingBase {
world.setBlock(x, y, z, block, 0, 4);
}
Object o = new WorldGenRainForestTree_Ex(
- BOP_Block_Registrator.log_Rainforest, BOP_Block_Registrator.leaves_Rainforest, 0, 0, true, 50, 75);
+ BOP_Block_Registrator.log_Rainforest,
+ BOP_Block_Registrator.leaves_Rainforest,
+ 0,
+ 0,
+ true,
+ 50,
+ 75);
if (!((WorldGenerator) o).generate(world, rand, x + i1, y, z + j1)) {
if (flag) {
diff --git a/src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java b/src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java
index a4795efa51..55bc7fb4cd 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java
@@ -1,10 +1,11 @@
package gtPlusPlus.xmod.bop.creative;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+
public class MiscUtilsBOPTab extends CreativeTabs {
public MiscUtilsBOPTab(final String lable) {
@@ -13,7 +14,6 @@ public class MiscUtilsBOPTab extends CreativeTabs {
@Override
public Item getTabIconItem() {
- return ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)
- .getItem();
+ return ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest).getItem();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java
index a3f805c710..4d8e61c2ac 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java
@@ -1,8 +1,7 @@
package gtPlusPlus.xmod.bop.world.features.trees;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling;
import net.minecraft.init.Blocks;
@@ -10,6 +9,9 @@ import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
import net.minecraftforge.common.util.ForgeDirection;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+
public class WorldGenPineTree extends WorldGenAbstractTree {
public WorldGenPineTree() {
diff --git a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java
index cdd14b9c71..225e639ede 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java
@@ -1,7 +1,7 @@
package gtPlusPlus.xmod.bop.world.features.trees;
-import gtPlusPlus.api.objects.Logger;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling;
import net.minecraft.init.Blocks;
@@ -9,6 +9,8 @@ import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
import net.minecraftforge.common.util.ForgeDirection;
+import gtPlusPlus.api.objects.Logger;
+
public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree {
private final int minTreeHeight;
@@ -18,17 +20,11 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree {
private final int woodMeta;
private final int leavesMeta;
- // return random.nextInt(5) == 0 ? new WorldGenTrees(false, 4 + random.nextInt(7), 3, 3, true) : new
+ // return random.nextInt(5) == 0 ? new WorldGenTrees(false, 4 + random.nextInt(7), 3, 3, true) : new
// WorldGenRainforestTree1(BOPCBlocks.logs4, BOPCBlocks.colorizedLeaves2, 3, 2, false, 8, 8);
- public WorldGenRainForestTree_Ex(
- Block wood,
- Block leaves,
- int woodMeta,
- int leavesMeta,
- boolean doBlockNotify,
- int minTreeHeight,
- int randomTreeHeight) {
+ public WorldGenRainForestTree_Ex(Block wood, Block leaves, int woodMeta, int leavesMeta, boolean doBlockNotify,
+ int minTreeHeight, int randomTreeHeight) {
super(doBlockNotify);
this.wood = wood;
this.leaves = leaves;
@@ -69,8 +65,8 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree {
}
Block block2 = world.getBlock(x, y - 1, z);
- boolean isSoil =
- block2.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling) Blocks.sapling);
+ boolean isSoil = block2
+ .canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (BlockSapling) Blocks.sapling);
if ((isSoil) && (y < 256 - treeHeight - 1)) {
block2.onPlantGrow(world, x, y - 1, z, x, y, z);
byte b0 = 3;
@@ -88,8 +84,7 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree {
int l2 = k2 - z;
Logger.WARNING(
"[3]| k2 = " + k2 + " | z = " + z + " | l1 = " + l1 + " | l2 = " + l2 + " | ");
- if ((Math.abs(j2) != l1)
- || (Math.abs(l2) != l1)
+ if ((Math.abs(j2) != l1) || (Math.abs(l2) != l1)
|| ((random.nextInt(2) != 0) && (i3 != 0))) {
Block block1 = world.getBlock(i2, k1, k2);
if ((block1.isAir(world, i2, k1, k2)) || (block1.isLeaves(world, i2, k1, k2))) {
@@ -122,8 +117,13 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree {
Logger.WARNING(
"Doing Nothing at " + "x=" + xDir + " | y=" + y + " z=" + zDir);
} else {
- Logger.WARNING("Trying to place leaves at " + "x=" + xDir + " | y=" + y
- + " z=" + zDir);
+ Logger.WARNING(
+ "Trying to place leaves at " + "x="
+ + xDir
+ + " | y="
+ + y
+ + " z="
+ + zDir);
block5 = world.getBlock(x + xDir, y + k1, z + zDir);
if (block5.isAir(world, x + xDir, y + k1, x + zDir)) {
setBlockAndNotifyAdequately(
@@ -141,11 +141,25 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree {
for (int xDir = -4; xDir <= 4; xDir++) {
for (int zDir = -4; zDir <= 4; zDir++) {
if (canRemoveLeafBlockLayer2(-4, 4, xDir, -4, 4, zDir)) {
- Logger.WARNING("Doing Nothing at " + "x=" + xDir + " | y=" + y + k1 + 1
- + " z=" + zDir);
+ Logger.WARNING(
+ "Doing Nothing at " + "x="
+ + xDir
+ + " | y="
+ + y
+ + k1
+ + 1
+ + " z="
+ + zDir);
} else {
- Logger.WARNING("Trying to place leaves at " + "x=" + xDir + " | y=" + y + k1
- + 1 + " z=" + zDir);
+ Logger.WARNING(
+ "Trying to place leaves at " + "x="
+ + xDir
+ + " | y="
+ + y
+ + k1
+ + 1
+ + " z="
+ + zDir);
block5 = world.getBlock(x + xDir, y + k1 + 1, z + zDir);
if (block5.isAir(world, x + xDir, y + k1 + 1, x + zDir)) {
setBlockAndNotifyAdequately(
@@ -164,11 +178,25 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree {
for (int xDir = -3; xDir <= 3; xDir++) {
for (int zDir = -3; zDir <= 3; zDir++) {
if (canRemoveLeafBlockLayer2(-3, 3, xDir, -3, 3, zDir)) {
- Logger.WARNING("Doing Nothing at " + "x=" + xDir + " | y=" + y + k1 + 2
- + " z=" + zDir);
+ Logger.WARNING(
+ "Doing Nothing at " + "x="
+ + xDir
+ + " | y="
+ + y
+ + k1
+ + 2
+ + " z="
+ + zDir);
} else {
- Logger.WARNING("Trying to place leaves at " + "x=" + xDir + " | y=" + y + k1
- + 2 + " z=" + zDir);
+ Logger.WARNING(
+ "Trying to place leaves at " + "x="
+ + xDir
+ + " | y="
+ + y
+ + k1
+ + 2
+ + " z="
+ + zDir);
block5 = world.getBlock(x + xDir, y + k1 + 2, z + zDir);
if (block5.isAir(world, x + xDir, y + k1 + 2, x + zDir)) {
setBlockAndNotifyAdequately(
@@ -187,11 +215,25 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree {
for (int xDir = -2; xDir <= 2; xDir++) {
for (int zDir = -2; zDir <= 2; zDir++) {
if (canRemoveLeafBlockLayer2(-2, 2, xDir, -2, 2, zDir)) {
- Logger.WARNING("Doing Nothing at " + "x=" + xDir + " | y=" + y + k1 + 3
- + " z=" + zDir);
+ Logger.WARNING(
+ "Doing Nothing at " + "x="
+ + xDir
+ + " | y="
+ + y
+ + k1
+ + 3
+ + " z="
+ + zDir);
} else {
- Logger.WARNING("Trying to place leaves at " + "x=" + xDir + " | y=" + y + k1
- + 3 + " z=" + zDir);
+ Logger.WARNING(
+ "Trying to place leaves at " + "x="
+ + xDir
+ + " | y="
+ + y
+ + k1
+ + 3
+ + " z="
+ + zDir);
block5 = world.getBlock(x + xDir, y + k1 + 3, z + zDir);
if (block5.isAir(world, x + xDir, y + k1 + 3, x + zDir)) {
setBlockAndNotifyAdequately(
diff --git a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
index 1e96109660..e586bbc0c4 100644
--- a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
+++ b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
@@ -2,14 +2,16 @@ package gtPlusPlus.xmod.eio.handler;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips;
+import java.lang.reflect.Field;
+
+import net.minecraft.item.Item;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import gregtech.api.enums.Materials;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.eio.material.MaterialEIO;
-import java.lang.reflect.Field;
-import net.minecraft.item.Item;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
public class HandlerTooltip_EIO {
@@ -37,14 +39,12 @@ public class HandlerTooltip_EIO {
}
}
}
- } catch (Throwable e) {
- }
+ } catch (Throwable e) {}
}
if (mIngot != null) {
// If the Item is an instance of ItemAlloy.class then proceed
- if (event.itemStack.getItem() == mIngot
- || oIngotClass.isInstance(event.itemStack.getItem())
+ if (event.itemStack.getItem() == mIngot || oIngotClass.isInstance(event.itemStack.getItem())
|| event.itemStack.getUnlocalizedName().toLowerCase().contains("item.itemAlloy")) {
// If stacks match, add a tooltip.
diff --git a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java
index ea72b6312a..4bf3b3a840 100644
--- a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java
+++ b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java
@@ -8,7 +8,7 @@ public class MaterialEIO {
public static final Material SOULARIUM = new Material(
"Soularium", // Material Name
MaterialState.SOLID, // State
- new short[] {95, 90, 54, 0}, // Material Colour
+ new short[] { 95, 90, 54, 0 }, // Material Colour
10, // Melting Point in C
10,
10,
@@ -16,14 +16,13 @@ public class MaterialEIO {
false, // Uses Blast furnace?
false, // Generates a cell
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().GOLD, 1), new MaterialStack(NONMATERIAL.SOULSAND, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 1),
+ new MaterialStack(NONMATERIAL.SOULSAND, 1) });
public static final Material CONDUCTIVE_IRON = new Material(
"Conductive Iron", // Material Name
MaterialState.SOLID, // State
- new short[] {164, 109, 100, 0}, // Material Colour
+ new short[] { 164, 109, 100, 0 }, // Material Colour
10, // Melting Point in C
10,
10,
@@ -31,14 +30,13 @@ public class MaterialEIO {
false, // Uses Blast furnace?
false, // Generates a cell
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 1), new MaterialStack(NONMATERIAL.REDSTONE, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 1),
+ new MaterialStack(NONMATERIAL.REDSTONE, 1) });
public static final Material PULSATING_IRON = new Material(
"Pulsating Iron", // Material Name
MaterialState.SOLID, // State
- new short[] {50, 91, 21, 0}, // Material Colour
+ new short[] { 50, 91, 21, 0 }, // Material Colour
10, // Melting Point in C
10,
10,
@@ -46,14 +44,13 @@ public class MaterialEIO {
false, // Uses Blast furnace?
false, // Generates a cell
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 1), new MaterialStack(NONMATERIAL.ENDERPEARL, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 1),
+ new MaterialStack(NONMATERIAL.ENDERPEARL, 1) });
public static final Material ELECTRICAL_STEEL = new Material(
"Electrical Steel", // Material Name
MaterialState.SOLID, // State
- new short[] {194, 194, 194, 0}, // Material Colour
+ new short[] { 194, 194, 194, 0 }, // Material Colour
10, // Melting Point in C
10,
10,
@@ -61,13 +58,13 @@ public class MaterialEIO {
true, // Uses Blast furnace?
false, // Generates a cell
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {new MaterialStack(ALLOY.STEEL, 3), new MaterialStack(ELEMENT.getInstance().SILICON, 1)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 3),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 1) });
public static final Material ENERGETIC_ALLOY = new Material(
"Energetic Alloy", // Material Name
MaterialState.SOLID, // State
- new short[] {252, 151, 45, 0}, // Material Colour
+ new short[] { 252, 151, 45, 0 }, // Material Colour
10, // Melting Point in C
10,
10,
@@ -75,16 +72,13 @@ public class MaterialEIO {
true, // Uses Blast furnace?
false, // Generates a cell
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().GOLD, 1),
- new MaterialStack(NONMATERIAL.REDSTONE, 1),
- new MaterialStack(NONMATERIAL.GLOWSTONE, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 1),
+ new MaterialStack(NONMATERIAL.REDSTONE, 1), new MaterialStack(NONMATERIAL.GLOWSTONE, 1) });
public static final Material VIBRANT_ALLOY = new Material(
"Vibrant Alloy", // Material Name
MaterialState.SOLID, // State
- new short[] {204, 242, 142, 0}, // Material Colour
+ new short[] { 204, 242, 142, 0 }, // Material Colour
10, // Melting Point in C
10,
10,
@@ -92,12 +86,13 @@ public class MaterialEIO {
true, // Uses Blast furnace?
false, // Generates a cell
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {new MaterialStack(ENERGETIC_ALLOY, 1), new MaterialStack(NONMATERIAL.ENDERPEARL, 1)});
+ new MaterialStack[] { new MaterialStack(ENERGETIC_ALLOY, 1),
+ new MaterialStack(NONMATERIAL.ENDERPEARL, 1) });
public static final Material REDSTONE_ALLOY = new Material(
"Redstone Alloy", // Material Name
MaterialState.SOLID, // State
- new short[] {178, 34, 34, 0}, // Material Colour
+ new short[] { 178, 34, 34, 0 }, // Material Colour
10, // Melting Point in C
10,
10,
@@ -105,7 +100,6 @@ public class MaterialEIO {
false, // Uses Blast furnace?
false, // Generates a cell
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().SILICON, 1), new MaterialStack(NONMATERIAL.REDSTONE, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SILICON, 1),
+ new MaterialStack(NONMATERIAL.REDSTONE, 1) });
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
index 493d50490a..1ad9fbad13 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
@@ -1,5 +1,12 @@
package gtPlusPlus.xmod.forestry;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import binnie.extratrees.genetics.ExtraTreeSpecies;
import cpw.mods.fml.common.Optional;
import forestry.api.arboriculture.EnumGermlingType;
@@ -12,11 +19,6 @@ import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class HANDLER_FR {
@@ -42,8 +44,8 @@ public class HANDLER_FR {
}
}
- public static boolean createBlockBreakParticles(
- final World world, final int x, final int y, final int z, final Block block) {
+ public static boolean createBlockBreakParticles(final World world, final int x, final int y, final int z,
+ final Block block) {
if (LoadedMods.Forestry) {
createBlockBreakParticles_INTERNAL(world, x, y, z, block);
}
@@ -51,8 +53,8 @@ public class HANDLER_FR {
}
@Optional.Method(modid = "Forestry")
- private static void createBlockBreakParticles_INTERNAL(
- final World world, final int x, final int y, final int z, final Block block) {
+ private static void createBlockBreakParticles_INTERNAL(final World world, final int x, final int y, final int z,
+ final Block block) {
if (LoadedMods.Forestry) {
Class oClass;
try {
@@ -70,11 +72,8 @@ public class HANDLER_FR {
int.class);
mParticles.invoke(oProxy, world, x, y, z, block, 0);
}
- } catch (SecurityException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException e) {
- }
+ } catch (SecurityException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException e) {}
}
}
@@ -88,13 +87,13 @@ public class HANDLER_FR {
aLog = TreeManager.woodItemAccess.getLog(woodType, false);
GregtechMetaTileEntityTreeFarm.sLogCache.put(value.getUID(), aLog);
- GregtechMetaTileEntityTreeFarm.sLogCache.put(
- value.getUID() + "fireproof", TreeManager.woodItemAccess.getLog(woodType, true));
+ GregtechMetaTileEntityTreeFarm.sLogCache
+ .put(value.getUID() + "fireproof", TreeManager.woodItemAccess.getLog(woodType, true));
} else {
aLog = ReflectionUtils.getField(value, "vanillaWood");
- GregtechMetaTileEntityTreeFarm.sLogCache.put(
- value.getUID(), ReflectionUtils.getField(value, "vanillaWood"));
+ GregtechMetaTileEntityTreeFarm.sLogCache
+ .put(value.getUID(), ReflectionUtils.getField(value, "vanillaWood"));
}
GregtechMetaTileEntityTreeFarm.addFakeRecipeToNEI(aSaplingStack, aLog);
@@ -104,8 +103,8 @@ public class HANDLER_FR {
@Optional.Method(modid = "ExtraTrees")
private static void mapExtraTreesSaplingToLog() {
for (ExtraTreeSpecies value : ExtraTreeSpecies.values()) {
- ItemStack aSaplingStack = TreeManager.treeRoot.getMemberStack(
- TreeManager.treeRoot.templateAsIndividual(value.getTemplate()), 0);
+ ItemStack aSaplingStack = TreeManager.treeRoot
+ .getMemberStack(TreeManager.treeRoot.templateAsIndividual(value.getTemplate()), 0);
ItemStack aLog = null;
if (value.getLog() != null) {
aLog = value.getLog().getItemStack();
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java
index ea95479cf7..ef33baab5a 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java
@@ -1,12 +1,10 @@
/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
+ * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
+ * at http://www.gnu.org/licenses/lgpl-3.0.txt
*
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
+ * MysteriousAges
******************************************************************************/
package gtPlusPlus.xmod.forestry.bees.blocks;
@@ -15,6 +13,7 @@ import forestry.core.blocks.BlockBase;
import gtPlusPlus.core.creative.AddToCreativeTab;
public class BlockDenseBeeHouse extends BlockBase<BlockApicultureType> {
+
public BlockDenseBeeHouse() {
super();
setCreativeTab(AddToCreativeTab.tabBOP);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java
index 02f74b55ae..f873963b7f 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java
@@ -1,14 +1,16 @@
package gtPlusPlus.xmod.forestry.bees.blocks;
-import cpw.mods.fml.common.registry.GameRegistry;
-import forestry.core.utils.StringUtil;
-import forestry.plugins.PluginManager;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
+import cpw.mods.fml.common.registry.GameRegistry;
+import forestry.core.utils.StringUtil;
+import forestry.plugins.PluginManager;
+
public abstract class FR_BlockRegistry {
+
protected static <T extends Block> T registerBlock(T block, Class<? extends ItemBlock> itemClass, String name) {
if (PluginManager.getStage() != PluginManager.Stage.SETUP) {
throw new RuntimeException("Tried to register Block outside of Setup");
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
index 5423ae803b..031061bfc3 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
@@ -32,64 +32,38 @@ public enum CustomCombs {
// Trash
SALT("salt", true, Materials.Salt, 75),
- SAND("sand", true, Materials.Sand, 100),
- ;
+ SAND("sand", true, Materials.Sand, 100),;
private static int[][] colours = new int[][] {
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, // SILICON
- {Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75)}, // RUBBER
- {Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175)}, // PLASTIC
- {Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75)}, // PTFE
- {Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)}, // PBS
- // Unused
- {Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14)}, // Biofuel
- {Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32)}, // Ethanol
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
- {Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150)}, // Fluorine
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
- {Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)}, // Force
- {Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170)}, // Nikolite
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
- {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
- {0x666666, 0x525252},
- {0x2E8F5B, 0xDCC289},
- {0x4C4C4C, 0x333333},
- {0x808080, 0x999999},
- {0x57CFFB, 0xBBEEFF},
- {0x7D0F0F, 0xD11919},
- {0x1947D1, 0x476CDA},
- {0xE6005C, 0xCC0052},
- {0x0033CC, 0x00248F},
- {0xCCFFFF, 0xA3CCCC},
- {0x248F24, 0xCCFFCC},
- {0x248F24, 0x2EB82E},
- {0xD4D4D4, 0x58300B},
- {0xFF6600, 0xE65C00},
- {0xD4D4D4, 0xDDDDDD},
- {0x666699, 0xA3A3CC},
- {0xDA9147, 0xDE9C59},
- {0x808080, 0x999999},
- {0x8585AD, 0x9D9DBD},
- {0xF0DEF0, 0xF2E1F2},
- {0xC2C2D6, 0xCECEDE},
- {0xE6B800, 0xCFA600},
- {0x008AB8, 0xD6D6FF},
- {0xD5D5D5, 0xAAAAAA},
- {0xCC99FF, 0xDBB8FF},
- {0xEBA1EB, 0xF2C3F2},
- {0x62626D, 0x161620},
- {0xE6E6E6, 0xFFFFCC},
- {0xDADADA, 0xD1D1E0},
- {0x19AF19, 0x169E16},
- {0x335C33, 0x6B8F00},
- {0x003300, 0x002400},
- };
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // SILICON
+ { Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75) }, // RUBBER
+ { Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175) }, // PLASTIC
+ { Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75) }, // PTFE
+ { Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14) }, // PBS
+ // Unused
+ { Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14) }, // Biofuel
+ { Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32) }, // Ethanol
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150) }, // Fluorine
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5) }, // Force
+ { Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170) }, // Nikolite
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+ { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, { 0x666666, 0x525252 },
+ { 0x2E8F5B, 0xDCC289 }, { 0x4C4C4C, 0x333333 }, { 0x808080, 0x999999 }, { 0x57CFFB, 0xBBEEFF },
+ { 0x7D0F0F, 0xD11919 }, { 0x1947D1, 0x476CDA }, { 0xE6005C, 0xCC0052 }, { 0x0033CC, 0x00248F },
+ { 0xCCFFFF, 0xA3CCCC }, { 0x248F24, 0xCCFFCC }, { 0x248F24, 0x2EB82E }, { 0xD4D4D4, 0x58300B },
+ { 0xFF6600, 0xE65C00 }, { 0xD4D4D4, 0xDDDDDD }, { 0x666699, 0xA3A3CC }, { 0xDA9147, 0xDE9C59 },
+ { 0x808080, 0x999999 }, { 0x8585AD, 0x9D9DBD }, { 0xF0DEF0, 0xF2E1F2 }, { 0xC2C2D6, 0xCECEDE },
+ { 0xE6B800, 0xCFA600 }, { 0x008AB8, 0xD6D6FF }, { 0xD5D5D5, 0xAAAAAA }, { 0xCC99FF, 0xDBB8FF },
+ { 0xEBA1EB, 0xF2C3F2 }, { 0x62626D, 0x161620 }, { 0xE6E6E6, 0xFFFFCC }, { 0xDADADA, 0xD1D1E0 },
+ { 0x19AF19, 0x169E16 }, { 0x335C33, 0x6B8F00 }, { 0x003300, 0x002400 }, };
public boolean showInList;
public Materials material;
public int chance;
@@ -107,9 +81,10 @@ public enum CustomCombs {
}
public String getName() {
- // return "gt.comb."+this.name;
+ // return "gt.comb."+this.name;
return GT_LanguageManager.addStringLocalization(
- "comb." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb");
+ "comb." + this.name,
+ this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb");
}
public int[] getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
index 633178c851..624d8161d6 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
@@ -1,5 +1,15 @@
package gtPlusPlus.xmod.forestry.bees.custom;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Locale;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.BiomeDictionary.Type;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.text.WordUtils;
+
import forestry.api.apiculture.*;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
@@ -11,21 +21,12 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Locale;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.BiomeDictionary.Type;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.lang3.text.WordUtils;
public enum GTPP_Bee_Definition implements IBeeDefinition {
- SILICON(
- GTPP_Branch_Definition.ORGANIC,
- "Silicon",
- true,
- Utils.rgbtoHexValue(75, 75, 75),
+
+ SILICON(GTPP_Branch_Definition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75),
Utils.rgbtoHexValue(125, 125, 125)) {
+
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getSlagComb(), 0.10f);
@@ -41,17 +42,16 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
@Override
protected void registerMutations() {
- IBeeMutationCustom tMutation =
- registerMutation(getGregtechBeeType("SLIMEBALL"), getGregtechBeeType("STICKYRESIN"), 10);
+ IBeeMutationCustom tMutation = registerMutation(
+ getGregtechBeeType("SLIMEBALL"),
+ getGregtechBeeType("STICKYRESIN"),
+ 10);
}
},
- RUBBER(
- GTPP_Branch_Definition.ORGANIC,
- "Rubber",
- true,
- Utils.rgbtoHexValue(55, 55, 55),
+ RUBBER(GTPP_Branch_Definition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55),
Utils.rgbtoHexValue(75, 75, 75)) {
+
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getSlagComb(), 0.10f);
@@ -67,17 +67,16 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
@Override
protected void registerMutations() {
- IBeeMutationCustom tMutation =
- registerMutation(getGregtechBeeType("SLIMEBALL"), getGregtechBeeType("STICKYRESIN"), 10);
+ IBeeMutationCustom tMutation = registerMutation(
+ getGregtechBeeType("SLIMEBALL"),
+ getGregtechBeeType("STICKYRESIN"),
+ 10);
}
},
- PLASTIC(
- GTPP_Branch_Definition.ORGANIC,
- "Plastic",
- true,
- Utils.rgbtoHexValue(245, 245, 245),
+ PLASTIC(GTPP_Branch_Definition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245),
Utils.rgbtoHexValue(175, 175, 175)) {
+
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.30f);
@@ -97,12 +96,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
},
- PTFE(
- GTPP_Branch_Definition.ORGANIC,
- "Ptfe",
- true,
- Utils.rgbtoHexValue(150, 150, 150),
+ PTFE(GTPP_Branch_Definition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150),
Utils.rgbtoHexValue(75, 75, 75)) {
+
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.30f);
@@ -123,6 +119,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
},
PBS(GTPP_Branch_Definition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) {
+
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.30f);
@@ -145,12 +142,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
/**
* Fuels
*/
- BIOMASS(
- GTPP_Branch_Definition.ORGANIC,
- "Biomass",
- true,
- Utils.rgbtoHexValue(33, 225, 24),
+ BIOMASS(GTPP_Branch_Definition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24),
Utils.rgbtoHexValue(23, 175, 14)) {
+
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f);
@@ -171,12 +165,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
}
},
- ETHANOL(
- GTPP_Branch_Definition.ORGANIC,
- "Ethanol",
- true,
- Utils.rgbtoHexValue(255, 128, 0),
+ ETHANOL(GTPP_Branch_Definition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0),
Utils.rgbtoHexValue(220, 156, 32)) {
+
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f);
@@ -200,12 +191,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
/**
* Materials
*/
- FLUORINE(
- GTPP_Branch_Definition.ORGANIC,
- "Fluorine",
- true,
- Utils.rgbtoHexValue(30, 230, 230),
+ FLUORINE(GTPP_Branch_Definition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230),
Utils.rgbtoHexValue(10, 150, 150)) {
+
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.40f);
@@ -221,8 +209,10 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
@Override
protected void registerMutations() {
- IBeeMutationCustom tMutation =
- registerMutation(getGregtechBeeType("LAPIS"), getGregtechBeeType("SAPPHIRE"), 5);
+ IBeeMutationCustom tMutation = registerMutation(
+ getGregtechBeeType("LAPIS"),
+ getGregtechBeeType("SAPPHIRE"),
+ 5);
tMutation.restrictBiomeType(Type.COLD);
}
},
@@ -230,12 +220,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
// Coke
// Force
- FORCE(
- GTPP_Branch_Definition.METAL,
- "Force",
- true,
- Utils.rgbtoHexValue(250, 250, 20),
+ FORCE(GTPP_Branch_Definition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20),
Utils.rgbtoHexValue(200, 200, 5)) {
+
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.30f);
@@ -253,19 +240,18 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
@Override
protected void registerMutations() {
- IBeeMutationCustom tMutation =
- registerMutation(getGregtechBeeType("STEEL"), getGregtechBeeType("GOLD"), 10);
+ IBeeMutationCustom tMutation = registerMutation(
+ getGregtechBeeType("STEEL"),
+ getGregtechBeeType("GOLD"),
+ 10);
tMutation.restrictBiomeType(Type.HOT);
}
},
// Nikolite
- NIKOLITE(
- GTPP_Branch_Definition.METAL,
- "Nikolite",
- true,
- Utils.rgbtoHexValue(60, 180, 200),
+ NIKOLITE(GTPP_Branch_Definition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200),
Utils.rgbtoHexValue(40, 150, 170)) {
+
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(getStoneComb(), 0.30f);
@@ -281,493 +267,203 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
@Override
protected void registerMutations() {
- IBeeMutationCustom tMutation =
- registerMutation(getGregtechBeeType("ALUMINIUM"), getGregtechBeeType("SILVER"), 8);
+ IBeeMutationCustom tMutation = registerMutation(
+ getGregtechBeeType("ALUMINIUM"),
+ getGregtechBeeType("SILVER"),
+ 8);
tMutation.restrictBiomeType(Type.HOT);
}
},
-/*
-
-
-CLAY(GTPP_Branch_Definition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
- beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.DAMP);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.MEADOWS.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(getSpecies("Industrious"), getSpecies("Diligent"), 20);
- }
- },
- SLIMEBALL(GTPP_Branch_Definition.ORGANIC, "SlimeBall", true, 0x4E9E55, 0x00FF15) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STICKY), 0.30f);
- beeSpecies.setHumidity(EnumHumidity.DAMP);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.MARSHY.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(getSpecies("Marshy"), CLAY.species, 15);
- }
- },
- PEAT(GTPP_Branch_Definition.ORGANIC, "Peat", true, 0x906237, 0x58300B) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f);
- beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.RURAL.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(getSpecies("Rural"), CLAY.species, 20);
- }
- },
- STICKYRESIN(GTPP_Branch_Definition.ORGANIC, "StickyResin", true, 0x2E8F5B, 0xDCC289) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
- beeSpecies.addProduct(ItemList.IC2_Resin.get(1, new Object[0]), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.MEADOWS.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(SLIMEBALL.species, PEAT.species, 25);
- }
- },
- COAL(GTPP_Branch_Definition.ORGANIC, "Coal", true, 0x666666, 0x525252) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.COAL), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.AUSTERE.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(getSpecies("Industrious"), PEAT.species, 18);
- }
- },
- OIL(GTPP_Branch_Definition.ORGANIC, "Oil", true, 0x4C4C4C, 0x333333) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.OIL), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.DAMP);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- beeSpecies.setNocturnal();
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.MEADOWS.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(COAL.species, STICKYRESIN.species, 8);
- }
- },
- REDSTONE(GTPP_Branch_Definition.GEM, "Redstone", true, 0x7D0F0F, 0xD11919) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.REDSTONE), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(getSpecies("Industrious"), getSpecies("Demonic"), 20);
- }
- },
- LAPIS(GTPP_Branch_Definition.GEM, "Lapis", true, 0x1947D1, 0x476CDA) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LAPIS), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(getSpecies("Demonic"), getSpecies("Imperial"), 20);
- }
- },
- CERTUS(GTPP_Branch_Definition.GEM, "CertusQuartz", true, 0x57CFFB, 0xBBEEFF) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.CERTUS), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(getSpecies("Hermitic"), LAPIS.species, 20);
- }
- },
- RUBY(GTPP_Branch_Definition.GEM, "Ruby", true, 0xE6005C, 0xCC0052) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.RUBY), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(REDSTONE.species, DIAMOND.species, 10);
- }
- },
- SAPPHIRE(GTPP_Branch_Definition.GEM, "Sapphire", true, 0x0033CC, 0x00248F) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAPPHIRE), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(CERTUS.species, LAPIS.species, 10);
- }
- },
- DIAMOND(GTPP_Branch_Definition.GEM, "Diamond", true, 0xCCFFFF, 0xA3CCCC) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.DIAMOND), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(CERTUS.species, COAL.species, 6);
- }
- },
- OLIVINE(GTPP_Branch_Definition.GEM, "Olivine", true, 0x248F24, 0xCCFFCC) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.OLIVINE), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(CERTUS.species, getSpecies("Ended"), 10);
- }
- },
- EMERALD(GTPP_Branch_Definition.GEM, "Emerald", true, 0x248F24, 0x2EB82E) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.EMERALD), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.COLD);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(OLIVINE.species, DIAMOND.species, 8);
- }
- },
- COPPER(GTPP_Branch_Definition.METAL, "Copper", true, 0xFF6600, 0xE65C00) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.COPPER), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(getSpecies("Majestic"), CLAY.species, 25);
- }
- },
- TIN(GTPP_Branch_Definition.METAL, "Tin", true, 0xD4D4D4, 0xDDDDDD) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.TIN), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(CLAY.species, getSpecies("Diligent"), 25);
- }
- },
- LEAD(GTPP_Branch_Definition.METAL, "Lead", true, 0x666699, 0xA3A3CC) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LEAD), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.DAMP);
- beeSpecies.setTemperature(EnumTemperature.WARM);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(COAL.species, COPPER.species, 25);
- }
- },
- IRON(GTPP_Branch_Definition.METAL, "Iron", true, 0xDA9147, 0xDE9C59) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.IRON), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(TIN.species, COPPER.species, 25);
- }
- },
- STEEL(GTPP_Branch_Definition.METAL, "Steel", true, 0x808080, 0x999999) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STEEL), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(IRON.species, COAL.species, 20);
- }
- },
- NICKEL(GTPP_Branch_Definition.METAL, "Nickel", true, 0x8585AD, 0x8585AD) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.NICKEL), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(IRON.species, COPPER.species, 25);
- }
- },
- ZINC(GTPP_Branch_Definition.METAL, "Zinc", true, 0xF0DEF0, 0xF2E1F2) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.ZINC), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(IRON.species, TIN.species, 20);
- }
- },
- SILVER(GTPP_Branch_Definition.METAL, "Silver", true, 0xC2C2D6, 0xCECEDE) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SILVER), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(LEAD.species, TIN.species, 20);
- }
- },
- GOLD(GTPP_Branch_Definition.METAL, "Gold", true, 0xEBC633, 0xEDCC47) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.GOLD), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.NORMAL);
- beeSpecies.setTemperature(EnumTemperature.NORMAL);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(LEAD.species, COPPER.species, 20);
- }
- },
- ALUMINIUM(GTPP_Branch_Definition.RAREMETAL, "Aluminium", true, 0xB8B8FF, 0xD6D6FF) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.ALUMINIUM), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.ARID);
- beeSpecies.setTemperature(EnumTemperature.HOT);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(NICKEL.species, ZINC.species, 18);
- }
- },
- TITANIUM(GTPP_Branch_Definition.RAREMETAL, "Titanium", true, 0xCC99FF, 0xDBB8FF) {
- @Override
- protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
- beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.TITANIUM), 0.15f);
- beeSpecies.setHumidity(EnumHumidity.ARID);
- beeSpecies.setTemperature(EnumTemperature.HOT);
- }
-
- @Override
- protected void setAlleles(IAllele[] template) {
- template = BeeDefinition.COMMON.getTemplate();
- }
-
- @Override
- protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(REDSTONE.species, ALUMINIUM.species, 5);
- }
- }*/
-
-;
+ /*
+ * CLAY(GTPP_Branch_Definition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+ * beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f); beeSpecies.setHumidity(EnumHumidity.DAMP);
+ * beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MEADOWS.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation =
+ * registerMutation(getSpecies("Industrious"), getSpecies("Diligent"), 20); } },
+ * SLIMEBALL(GTPP_Branch_Definition.ORGANIC, "SlimeBall", true, 0x4E9E55, 0x00FF15) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STICKY), 0.30f);
+ * beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MARSHY.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation =
+ * registerMutation(getSpecies("Marshy"), CLAY.species, 15); } }, PEAT(GTPP_Branch_Definition.ORGANIC, "Peat", true,
+ * 0x906237, 0x58300B) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f);
+ * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.RURAL.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation =
+ * registerMutation(getSpecies("Rural"), CLAY.species, 20); } }, STICKYRESIN(GTPP_Branch_Definition.ORGANIC,
+ * "StickyResin", true, 0x2E8F5B, 0xDCC289) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+ * beeSpecies.addProduct(ItemList.IC2_Resin.get(1, new Object[0]), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MEADOWS.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(SLIMEBALL.species,
+ * PEAT.species, 25); } }, COAL(GTPP_Branch_Definition.ORGANIC, "Coal", true, 0x666666, 0x525252) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.COAL), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.AUSTERE.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation =
+ * registerMutation(getSpecies("Industrious"), PEAT.species, 18); } }, OIL(GTPP_Branch_Definition.ORGANIC, "Oil",
+ * true, 0x4C4C4C, 0x333333) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.OIL), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL);
+ * beeSpecies.setNocturnal(); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.MEADOWS.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(COAL.species,
+ * STICKYRESIN.species, 8); } }, REDSTONE(GTPP_Branch_Definition.GEM, "Redstone", true, 0x7D0F0F, 0xD11919) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.REDSTONE), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation =
+ * registerMutation(getSpecies("Industrious"), getSpecies("Demonic"), 20); } }, LAPIS(GTPP_Branch_Definition.GEM,
+ * "Lapis", true, 0x1947D1, 0x476CDA) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LAPIS), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation =
+ * registerMutation(getSpecies("Demonic"), getSpecies("Imperial"), 20); } }, CERTUS(GTPP_Branch_Definition.GEM,
+ * "CertusQuartz", true, 0x57CFFB, 0xBBEEFF) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.CERTUS), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation =
+ * registerMutation(getSpecies("Hermitic"), LAPIS.species, 20); } }, RUBY(GTPP_Branch_Definition.GEM, "Ruby", true,
+ * 0xE6005C, 0xCC0052) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.RUBY), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(REDSTONE.species,
+ * DIAMOND.species, 10); } }, SAPPHIRE(GTPP_Branch_Definition.GEM, "Sapphire", true, 0x0033CC, 0x00248F) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAPPHIRE), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(CERTUS.species,
+ * LAPIS.species, 10); } }, DIAMOND(GTPP_Branch_Definition.GEM, "Diamond", true, 0xCCFFFF, 0xA3CCCC) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.DIAMOND), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(CERTUS.species,
+ * COAL.species, 6); } }, OLIVINE(GTPP_Branch_Definition.GEM, "Olivine", true, 0x248F24, 0xCCFFCC) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.OLIVINE), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(CERTUS.species,
+ * getSpecies("Ended"), 10); } }, EMERALD(GTPP_Branch_Definition.GEM, "Emerald", true, 0x248F24, 0x2EB82E) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.EMERALD), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.COLD); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(OLIVINE.species,
+ * DIAMOND.species, 8); } }, COPPER(GTPP_Branch_Definition.METAL, "Copper", true, 0xFF6600, 0xE65C00) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.COPPER), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation =
+ * registerMutation(getSpecies("Majestic"), CLAY.species, 25); } }, TIN(GTPP_Branch_Definition.METAL, "Tin", true,
+ * 0xD4D4D4, 0xDDDDDD) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.TIN), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(CLAY.species,
+ * getSpecies("Diligent"), 25); } }, LEAD(GTPP_Branch_Definition.METAL, "Lead", true, 0x666699, 0xA3A3CC) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LEAD), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.WARM); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(COAL.species,
+ * COPPER.species, 25); } }, IRON(GTPP_Branch_Definition.METAL, "Iron", true, 0xDA9147, 0xDE9C59) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.IRON), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(TIN.species,
+ * COPPER.species, 25); } }, STEEL(GTPP_Branch_Definition.METAL, "Steel", true, 0x808080, 0x999999) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STEEL), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(IRON.species,
+ * COAL.species, 20); } }, NICKEL(GTPP_Branch_Definition.METAL, "Nickel", true, 0x8585AD, 0x8585AD) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.NICKEL), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(IRON.species,
+ * COPPER.species, 25); } }, ZINC(GTPP_Branch_Definition.METAL, "Zinc", true, 0xF0DEF0, 0xF2E1F2) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.ZINC), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(IRON.species,
+ * TIN.species, 20); } }, SILVER(GTPP_Branch_Definition.METAL, "Silver", true, 0xC2C2D6, 0xCECEDE) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SILVER), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(LEAD.species,
+ * TIN.species, 20); } }, GOLD(GTPP_Branch_Definition.METAL, "Gold", true, 0xEBC633, 0xEDCC47) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.GOLD), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(LEAD.species,
+ * COPPER.species, 20); } }, ALUMINIUM(GTPP_Branch_Definition.RAREMETAL, "Aluminium", true, 0xB8B8FF, 0xD6D6FF) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.ALUMINIUM), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.HOT); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(NICKEL.species,
+ * ZINC.species, 18); } }, TITANIUM(GTPP_Branch_Definition.RAREMETAL, "Titanium", true, 0xCC99FF, 0xDBB8FF) {
+ * @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SLAG), 0.30f);
+ * beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.TITANIUM), 0.15f);
+ * beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.HOT); }
+ * @Override protected void setAlleles(IAllele[] template) { template = BeeDefinition.COMMON.getTemplate(); }
+ * @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(REDSTONE.species,
+ * ALUMINIUM.species, 5); } }
+ */
+
+ ;
private final GTPP_Branch_Definition branch;
private final IAlleleBeeSpeciesCustom species;
@@ -785,7 +481,15 @@ CLAY(GTPP_Branch_Definition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) {
this.branch = branch;
this.species = BeeManager.beeFactory.createSpecies(
- uid, dominant, "Sengir", name, description, branch.getBranch(), binomial, primary, secondary);
+ uid,
+ dominant,
+ "Sengir",
+ name,
+ description,
+ branch.getBranch(),
+ binomial,
+ primary,
+ secondary);
}
public static void initBees() {
@@ -798,8 +502,8 @@ CLAY(GTPP_Branch_Definition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) {
}
private static IAlleleBeeSpecies getSpecies(String name) {
- return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(
- (new StringBuilder()).append("forestry.species").append(name).toString());
+ return (IAlleleBeeSpecies) AlleleManager.alleleRegistry
+ .getAllele((new StringBuilder()).append("forestry.species").append(name).toString());
}
protected abstract void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies);
@@ -820,8 +524,8 @@ CLAY(GTPP_Branch_Definition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) {
BeeManager.beeRoot.registerTemplate(template);
}
- protected final IBeeMutationCustom registerMutation(
- IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance) {
+ protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2,
+ int chance) {
IAllele[] template = getTemplate();
Logger.DEBUG_BEES("parent1: " + (parent1 != null));
Logger.DEBUG_BEES("parent2: " + (parent2 != null));
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
index 1007eac0be..9d49df7487 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
@@ -1,5 +1,15 @@
package gtPlusPlus.xmod.forestry.bees.custom;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+
import cpw.mods.fml.common.Loader;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
@@ -14,13 +24,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import org.apache.commons.lang3.reflect.FieldUtils;
public class GTPP_Bees {
@@ -45,7 +48,7 @@ public class GTPP_Bees {
// public static GTPP_Branch_Definition definition;
public GTPP_Bees() {
- if (Loader.isModLoaded("Forestry") /*&& tryGetBeesBoolean()*/) {
+ if (Loader.isModLoaded("Forestry") /* && tryGetBeesBoolean() */) {
for (IAllele o : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
// Utils.LOG_DEBUG_BEES(" ==================================================");
@@ -71,17 +74,17 @@ public class GTPP_Bees {
}
private void setCustomItems() {
- dropForceGem = new BaseItemMisc("Force", new short[] {250, 250, 20}, 64, MiscTypes.GEM, null);
+ dropForceGem = new BaseItemMisc("Force", new short[] { 250, 250, 20 }, 64, MiscTypes.GEM, null);
// mGregMatLoader.enableMaterial(Materials.Force);
// MaterialUtils.tryEnableMaterial(Materials.Force);
// MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Force);
// MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Force);
- dropBiomassBlob = new BaseItemMisc("Biomass", new short[] {33, 225, 24}, 64, MiscTypes.DROP, null);
- dropEthanolBlob = new BaseItemMisc("Ethanol", new short[] {255, 128, 0}, 64, MiscTypes.DROP, null);
+ dropBiomassBlob = new BaseItemMisc("Biomass", new short[] { 33, 225, 24 }, 64, MiscTypes.DROP, null);
+ dropEthanolBlob = new BaseItemMisc("Ethanol", new short[] { 255, 128, 0 }, 64, MiscTypes.DROP, null);
// Nikolite may not exist, so lets make it.
- dropNikoliteDust =
- ItemUtils.generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
+ dropNikoliteDust = ItemUtils
+ .generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
// mGregMatLoader.enableMaterial(Materials.BlueAlloy);
// mGregMatLoader.enableMaterial(Materials.Nikolite);
// MaterialUtils.tryEnableMaterial(Materials.Nikolite);
@@ -93,7 +96,7 @@ public class GTPP_Bees {
new BaseItemIngot_OLD("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0);
}
- dropFluorineBlob = new BaseItemMisc("Fluorine", new short[] {30, 230, 230}, 64, MiscTypes.DROP, null);
+ dropFluorineBlob = new BaseItemMisc("Fluorine", new short[] { 30, 230, 230 }, 64, MiscTypes.DROP, null);
addRecipes();
}
@@ -160,18 +163,12 @@ public class GTPP_Bees {
if (Comb_Stone == null) {
Comb_Stone = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeStone);
}
- /*}
- else {
- Utils.LOG_BEES("oCombObject was not an instance of gregtech.common.items.ItemComb");
- }*/
-
- } catch (NullPointerException
- | ClassNotFoundException
- | IllegalArgumentException
- | IllegalAccessException
- | NoSuchMethodException
- | SecurityException
- | InvocationTargetException e) {
+ /*
+ * } else { Utils.LOG_BEES("oCombObject was not an instance of gregtech.common.items.ItemComb"); }
+ */
+
+ } catch (NullPointerException | ClassNotFoundException | IllegalArgumentException | IllegalAccessException
+ | NoSuchMethodException | SecurityException | InvocationTargetException e) {
Logger.BEES("Bad Reflection. setMaterials()");
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java
index d61f0d749d..92edae4356 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java
@@ -1,12 +1,14 @@
package gtPlusPlus.xmod.forestry.bees.custom;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
import gtPlusPlus.api.objects.Logger;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
public enum GTPP_Branch_Definition {
+
ORGANIC("ORGANIC"),
GEM("GEM"),
METAL("METAL"),
@@ -33,12 +35,8 @@ public enum GTPP_Branch_Definition {
Logger.INFO("[Bees] methodMyMethod: " + (methodMyMethod != null));
return (IAllele[]) methodMyMethod.invoke(enumA);
- } catch (ClassNotFoundException
- | NoSuchMethodException
- | SecurityException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException e) {
+ } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException e) {
Logger.INFO("[Bees] Bad Reflection. getTemplate()");
e.printStackTrace();
// gregtech.loaders.misc.GT_BranchDefinition.getTemplate()
@@ -58,12 +56,8 @@ public enum GTPP_Branch_Definition {
Logger.INFO("[Bees] methodMyMethod: " + (methodMyMethod != null));
return (IClassification) methodMyMethod.invoke(enum_MY_SAMPLE_ENUM);
- } catch (ClassNotFoundException
- | NoSuchMethodException
- | SecurityException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException e) {
+ } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException e) {
Logger.INFO("[Bees] Bad Reflection. getBranch()");
e.printStackTrace();
return null;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
index 3e1c40e972..60ffb8a051 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
@@ -1,5 +1,16 @@
package gtPlusPlus.xmod.forestry.bees.custom;
+import java.lang.reflect.Field;
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -10,16 +21,9 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.lang.reflect.Field;
-import java.util.List;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import org.apache.commons.lang3.reflect.FieldUtils;
public class ItemCustomComb extends Item {
+
@SideOnly(Side.CLIENT)
private IIcon secondIcon;
@@ -39,7 +43,7 @@ public class ItemCustomComb extends Item {
return new ItemStack(this, count, type.ordinal());
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list) {
@@ -136,7 +140,7 @@ public class ItemCustomComb extends Item {
GT_Values.NI,
GT_Values.NI,
GT_Values.NI,
- new int[] {chance * 100, 3000},
+ new int[] { chance * 100, 3000 },
128,
5);
// RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f,
@@ -155,21 +159,15 @@ public class ItemCustomComb extends Item {
GT_Values.NI,
GT_Values.NI,
GT_Values.NI,
- new int[] {chance * 100, 3000, chance2 * 100},
+ new int[] { chance * 100, 3000, chance2 * 100 },
128,
5);
// RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f,
// ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f));
}
- public void addSpecialCent(
- ItemStack tComb,
- ItemStack aOutput,
- int chance,
- ItemStack aOutput2,
- int chance2,
- ItemStack aOutput3,
- int chance3) {
+ public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2,
+ ItemStack aOutput3, int chance3) {
GT_Values.RA.addCentrifugeRecipe(
tComb,
GT_Values.NI,
@@ -181,7 +179,7 @@ public class ItemCustomComb extends Item {
aOutput3,
GT_Values.NI,
GT_Values.NI,
- new int[] {chance * 100, 3000, chance2 * 100, chance3 * 100},
+ new int[] { chance * 100, 3000, chance2 * 100, chance3 * 100 },
128,
5);
// RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f,
@@ -194,9 +192,7 @@ public class ItemCustomComb extends Item {
GT_Utility.copyAmount(9, tComb),
GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1),
Materials.Water.getFluid(1000),
- aMaterial.mOreByProducts.isEmpty()
- ? null
- : aMaterial.mOreByProducts.get(0).getMolten(144),
+ aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144),
GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4),
96);
GT_Values.RA.addAutoclaveRecipe(
@@ -218,7 +214,7 @@ public class ItemCustomComb extends Item {
GT_Values.NI,
GT_Values.NI,
GT_Values.NI,
- new int[] {chance * 100, 3000},
+ new int[] { chance * 100, 3000 },
128,
5);
// RecipeManagers.centrifugeManager.addRecipe(40, tComb,
@@ -233,9 +229,7 @@ public class ItemCustomComb extends Item {
GT_Utility.copyAmount(9, tComb),
GT_OreDictUnificator.get(OrePrefixes.crushed, aInMaterial, 1),
Materials.Water.getFluid(1000),
- aInMaterial.mOreByProducts.isEmpty()
- ? null
- : aInMaterial.mOreByProducts.get(0).getMolten(144),
+ aInMaterial.mOreByProducts.isEmpty() ? null : aInMaterial.mOreByProducts.get(0).getMolten(144),
GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 4),
96);
GT_Values.RA.addAutoclaveRecipe(
@@ -257,7 +251,7 @@ public class ItemCustomComb extends Item {
GT_Values.NI,
GT_Values.NI,
GT_Values.NI,
- new int[] {chance * 100, 3000},
+ new int[] { chance * 100, 3000 },
128,
5);
// RecipeManagers.centrifugeManager.addRecipe(40, tComb,
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java
index 3132cddc01..73399d970f 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java
@@ -1,22 +1,21 @@
/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
+ * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
+ * at http://www.gnu.org/licenses/lgpl-3.0.txt
*
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
+ * MysteriousAges
******************************************************************************/
package gtPlusPlus.xmod.forestry.bees.gui;
+import net.minecraft.entity.player.InventoryPlayer;
+
import forestry.apiculture.gui.ContainerBeeHelper;
import forestry.apiculture.gui.IContainerBeeHousing;
import forestry.apiculture.tiles.TileBeeHousingBase;
import forestry.core.gui.ContainerTile;
import forestry.core.network.IForestryPacketClient;
import forestry.core.network.packets.PacketGuiUpdate;
-import net.minecraft.entity.player.InventoryPlayer;
public class ContainerBeeHouse extends ContainerTile<TileBeeHousingBase> implements IContainerBeeHousing {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java
index 5c0287628e..b2cdd2b2ef 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java
@@ -1,26 +1,26 @@
/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
+ * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
+ * at http://www.gnu.org/licenses/lgpl-3.0.txt
*
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
+ * MysteriousAges
******************************************************************************/
package gtPlusPlus.xmod.forestry.bees.gui;
+import net.minecraft.inventory.Container;
+
import forestry.apiculture.gui.IContainerBeeHousing;
import forestry.apiculture.gui.IGuiBeeHousingInventory;
import forestry.core.config.Constants;
import forestry.core.gui.GuiForestryTitled;
import forestry.core.render.EnumTankLevel;
-import net.minecraft.inventory.Container;
public class GuiBeeHouse<C extends Container & IContainerBeeHousing>
extends GuiForestryTitled<C, IGuiBeeHousingInventory> {
public enum Icon {
+
APIARY("/apiary.png"),
BEE_HOUSE("/alveary.png");
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
index 196d0c8fe9..cc29daf6b6 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
@@ -1,12 +1,14 @@
package gtPlusPlus.xmod.forestry.bees.handler;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_LanguageManager;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import net.minecraft.item.ItemStack;
public enum GTPP_CombType {
+
DRAGONBLOOD(0, "Dragon Blood", true, 30, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)),
FORCE(1, "Force", true, 30, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5));
@@ -47,7 +49,7 @@ public enum GTPP_CombType {
}
public int[] getColours() {
- return mColour == null || mColour.length != 2 ? new int[] {0, 0} : mColour;
+ return mColour == null || mColour.length != 2 ? new int[] { 0, 0 } : mColour;
}
public ItemStack getStackForType(int count) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
index 069bd86ff4..f045dc9b26 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
@@ -1,12 +1,14 @@
package gtPlusPlus.xmod.forestry.bees.handler;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_LanguageManager;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import net.minecraft.item.ItemStack;
public enum GTPP_DropType {
+
DRAGONBLOOD(0, "Dragon Blood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)),
FORCE(1, "Force", true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5));
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
index d275328194..d4591b5094 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
@@ -1,12 +1,14 @@
package gtPlusPlus.xmod.forestry.bees.handler;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_LanguageManager;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import net.minecraft.item.ItemStack;
public enum GTPP_PollenType {
+
DRAGONBLOOD(0, "Dragon Blood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20));
public boolean mShowInList;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
index 00df14a3bc..5049053773 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
@@ -1,12 +1,14 @@
package gtPlusPlus.xmod.forestry.bees.handler;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_LanguageManager;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import net.minecraft.item.ItemStack;
public enum GTPP_PropolisType {
+
DRAGONBLOOD(0, "Dragon Blood", true, Utils.rgbtoHexValue(220, 20, 20)),
FORCE(1, "Force", true, Utils.rgbtoHexValue(250, 250, 20));
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java
index 86b1184c6c..eac0e5f7b6 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java
@@ -1,26 +1,27 @@
/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
+ * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
+ * at http://www.gnu.org/licenses/lgpl-3.0.txt
*
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
+ * MysteriousAges
******************************************************************************/
package gtPlusPlus.xmod.forestry.bees.inventory;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
import forestry.api.apiculture.*;
import forestry.apiculture.InventoryBeeHousing;
import forestry.apiculture.inventory.IApiaryInventory;
import forestry.core.access.IAccessHandler;
import forestry.core.utils.SlotUtil;
-import java.util.ArrayList;
-import java.util.Collection;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
public class InventoryDenseBeeHouse extends InventoryBeeHousing implements IApiaryInventory {
+
public static final int SLOT_FRAMES_1 = 9;
public static final int SLOT_FRAMES_COUNT = 3;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
index 00062dc0ec..c74bb116b0 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -1,26 +1,25 @@
/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
+ * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
+ * at http://www.gnu.org/licenses/lgpl-3.0.txt
*
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
+ * MysteriousAges
******************************************************************************/
package gtPlusPlus.xmod.forestry.bees.items;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.registry.GameRegistry;
-import forestry.core.utils.StringUtil;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.WeightedRandomChestContent;
import net.minecraftforge.common.ChestGenHooks;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
+import forestry.core.utils.StringUtil;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+
public class FR_ItemRegistry {
// ----- Apiary Frames ----------------------
@@ -58,18 +57,24 @@ public class FR_ItemRegistry {
// Magic Bee like Frames
if (!CORE.GTNH) {
- hiveFrameVoid =
- new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare, "Makes your bee die in the blink of an eye.");
+ hiveFrameVoid = new MB_ItemFrame(
+ MB_FrameType.VOID,
+ EnumRarity.rare,
+ "Makes your bee die in the blink of an eye.");
} else {
hiveFrameVoid = new MB_ItemFrame(
- MB_FrameType.USELESS, EnumRarity.common, "No more cheaty frames for GTNH players.");
+ MB_FrameType.USELESS,
+ EnumRarity.common,
+ "No more cheaty frames for GTNH players.");
}
hiveFrameAccelerated = new MB_ItemFrame(
MB_FrameType.ACCELERATED,
"Longevity for bees isn't very common, especially if they're working harder.");
hiveFrameMutagenic = new MB_ItemFrame(
- MB_FrameType.MUTAGENIC, EnumRarity.epic, "Evolution of the fittest, finest and fastest.");
+ MB_FrameType.MUTAGENIC,
+ EnumRarity.epic,
+ "Evolution of the fittest, finest and fastest.");
hiveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Your bee will work harder and longer than you expected.");
ChestGenHooks.addItem(
ChestGenHooks.STRONGHOLD_CORRIDOR,
@@ -78,7 +83,8 @@ public class FR_ItemRegistry {
ChestGenHooks.STRONGHOLD_LIBRARY,
new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 18));
ChestGenHooks.addItem(
- ChestGenHooks.DUNGEON_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
+ ChestGenHooks.DUNGEON_CHEST,
+ new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
ChestGenHooks.addItem(
ChestGenHooks.MINESHAFT_CORRIDOR,
new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 9));
@@ -105,13 +111,19 @@ public class FR_ItemRegistry {
}
// Frame Items added by bartimaeusnek
- hiveFrameDecay =
- new MB_ItemFrame(MB_FrameType.DECAYING, EnumRarity.uncommon, "Who really needs stable genetics?");
+ hiveFrameDecay = new MB_ItemFrame(
+ MB_FrameType.DECAYING,
+ EnumRarity.uncommon,
+ "Who really needs stable genetics?");
hiveFrameSlow = new MB_ItemFrame(MB_FrameType.SLOWING, EnumRarity.common, "The journey is its own reward.");
hiveFrameStalilize = new MB_ItemFrame(
- MB_FrameType.STABILIZING, EnumRarity.rare, "If you wish your bees to keep their form.");
- hiveFrameArborist =
- new MB_ItemFrame(MB_FrameType.ARBORISTS, EnumRarity.common, "Who need Bees when you can have Trees?");
+ MB_FrameType.STABILIZING,
+ EnumRarity.rare,
+ "If you wish your bees to keep their form.");
+ hiveFrameArborist = new MB_ItemFrame(
+ MB_FrameType.ARBORISTS,
+ EnumRarity.common,
+ "Who need Bees when you can have Trees?");
ChestGenHooks.addItem(
ChestGenHooks.PYRAMID_JUNGLE_CHEST,
new WeightedRandomChestContent(new ItemStack(hiveFrameArborist), 1, 4, 24));
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
index 4312e36714..8ce963fa7a 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.forestry.bees.items;
import net.minecraft.util.StatCollector;
public class FR_StringUtil {
+
public static String getLocalizedString(final String key) {
if (StatCollector.canTranslate(key)) {
return StatCollector.translateToLocal(key);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
index dcbb8b94a1..b7130aff3a 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
@@ -4,6 +4,7 @@ import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeModifier;
public enum MB_FrameType implements IBeeModifier {
+
// ExtraBees Clone Frames
// Name, FrameHP, territory (1f), Mutation rate, lifespan rate, production rate, genetic decay (1f)
COCOA("Chocolate", 240, 1.0f, 1.0f, 0.50f, 1.50f, 1f),
@@ -39,30 +40,14 @@ public enum MB_FrameType implements IBeeModifier {
private final boolean isSunlit;
private final boolean isHellish;
- MB_FrameType(
- final String name,
- final int damage,
- final float territory,
- final float mutation,
- final float lifespan,
- final float production,
- final float geneticDecay) {
+ MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
+ final float production, final float geneticDecay) {
this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false);
}
- MB_FrameType(
- final String name,
- final int damage,
- final float territory,
- final float mutation,
- final float lifespan,
- final float production,
- final float flowering,
- final float geneticDecay,
- final boolean sealed,
- final boolean lit,
- final boolean sunlit,
- final boolean hellish) {
+ MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
+ final float production, final float flowering, final float geneticDecay, final boolean sealed,
+ final boolean lit, final boolean sunlit, final boolean hellish) {
this.frameName = name;
this.maxDamage = damage;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
index db2a8e317f..d2f3747cc3 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
@@ -1,12 +1,7 @@
package gtPlusPlus.xmod.forestry.bees.items;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.apiculture.*;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
@@ -14,7 +9,15 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.apiculture.*;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
public class MB_ItemFrame extends Item implements IHiveFrame {
+
private final MB_FrameType type;
private EnumRarity rarity_value = EnumRarity.uncommon;
private final String toolTip;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
index df1b3be843..9ca749e599 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
@@ -1,5 +1,14 @@
package gtPlusPlus.xmod.forestry.bees.items.output;
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.FluidStack;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -11,13 +20,6 @@ import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import java.util.List;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.FluidStack;
public class GTPP_Comb extends Item {
@@ -94,20 +96,16 @@ public class GTPP_Comb extends Item {
addChemicalRecipe(
GTPP_CombType.DRAGONBLOOD,
- new ItemStack[] {
- GT_ModHandler.getModItem("Forestry", "refractoryWax", 1L, 0),
- GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.DRAGONBLOOD),
- GTPP_Bees.drop.getStackForType(GTPP_DropType.DRAGONBLOOD)
- },
- new int[] {3000, 1500, 500});
+ new ItemStack[] { GT_ModHandler.getModItem("Forestry", "refractoryWax", 1L, 0),
+ GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.DRAGONBLOOD),
+ GTPP_Bees.drop.getStackForType(GTPP_DropType.DRAGONBLOOD) },
+ new int[] { 3000, 1500, 500 });
addChemicalRecipe(
GTPP_CombType.FORCE,
- new ItemStack[] {
- GT_ModHandler.getModItem("Forestry", "beeswax", 1L, 0),
- GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.FORCE),
- GTPP_Bees.drop.getStackForType(GTPP_DropType.FORCE)
- },
- new int[] {5000, 3000, 1000});
+ new ItemStack[] { GT_ModHandler.getModItem("Forestry", "beeswax", 1L, 0),
+ GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.FORCE),
+ GTPP_Bees.drop.getStackForType(GTPP_DropType.FORCE) },
+ new int[] { 5000, 3000, 1000 });
}
public static void addChemicalRecipe(GTPP_CombType aInputStack, ItemStack[] aOutputs, int[] aChances) {
@@ -115,9 +113,7 @@ public class GTPP_Comb extends Item {
long aEU = aMat.vVoltageMultiplier;
int aTier = Math.max(aMat.vTier / 2, 1);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- aInputStack.getStackForType(aTier),
- },
+ new ItemStack[] { aInputStack.getStackForType(aTier), },
new FluidStack[] {},
aOutputs,
new FluidStack[] {},
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
index b32ac5c601..873c2859c8 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
@@ -1,5 +1,14 @@
package gtPlusPlus.xmod.forestry.bees.items.output;
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.FluidStack;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -9,13 +18,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import java.util.List;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.FluidStack;
public class GTPP_Drop extends Item {
@@ -88,8 +90,8 @@ public class GTPP_Drop extends Item {
return GTPP_DropType.get(stack.getItemDamage()).getName();
}
- private static final int[] sFluidOutputs =
- new int[] {144, 136, 128, 120, 112, 104, 96, 88, 80, 72, 64, 48, 32, 16, 8, 4};
+ private static final int[] sFluidOutputs = new int[] { 144, 136, 128, 120, 112, 104, 96, 88, 80, 72, 64, 48, 32, 16,
+ 8, 4 };
public static void initDropsRecipes() {
ItemStack tDrop;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
index 7fd8a7ec20..ffd1ec7cbb 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
@@ -1,18 +1,20 @@
package gtPlusPlus.xmod.forestry.bees.items.output;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.core.Tabs;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.core.Tabs;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType;
+
public class GTPP_Pollen extends Item {
@SideOnly(Side.CLIENT)
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
index e6976f0512..78425a96d0 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.forestry.bees.items.output;
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -8,12 +16,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import java.util.List;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
public class GTPP_Propolis extends Item {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
index 568508e06f..ecf7232f02 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
@@ -1,13 +1,14 @@
package gtPlusPlus.xmod.forestry.bees.recipe;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
public class FR_Gregtech_Recipes {
@@ -79,7 +80,8 @@ public class FR_Gregtech_Recipes {
} else {
if (LoadedMods.MagicBees) {
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {hiveFrameVoid}, ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1));
+ new ItemStack[] { hiveFrameVoid },
+ ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1));
}
}
RecipeUtils.addShapedGregtechRecipe(
@@ -109,10 +111,28 @@ public class FR_Gregtech_Recipes {
hiveFrameCocoa);
RecipeUtils.addShapedRecipe(
- hiveFrameImpregnated, blockIronBars, null, null, null, null, null, null, null, hiveFrameCaged);
+ hiveFrameImpregnated,
+ blockIronBars,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ hiveFrameCaged);
RecipeUtils.addShapedRecipe(
- hiveFrameImpregnated, blockSoulSand, null, null, null, null, null, null, null, hiveFrameSoul);
+ hiveFrameImpregnated,
+ blockSoulSand,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ hiveFrameSoul);
RecipeUtils.addShapedRecipe(
null,
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java
index 8258fbfcb5..67fe295dcc 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java
@@ -1,24 +1,18 @@
package gtPlusPlus.xmod.forestry.bees.registry;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.IAlleleBeeSpeciesCustom;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IClassification;
import forestry.apiculture.genetics.alleles.AlleleBeeSpecies;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
public class GTPP_AlleleBeeSpecies extends AlleleBeeSpecies {
- public GTPP_AlleleBeeSpecies(
- String uid,
- boolean dominant,
- String unlocalizedName,
- String authority,
- String unlocalizedDescription,
- IClassification branch,
- String binomial,
- int primaryColor,
+ public GTPP_AlleleBeeSpecies(String uid, boolean dominant, String unlocalizedName, String authority,
+ String unlocalizedDescription, IClassification branch, String binomial, int primaryColor,
int secondaryColor) {
super(
uid,
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
index 89cb54e603..fef7d1fe7e 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
@@ -3,6 +3,16 @@ package gtPlusPlus.xmod.forestry.bees.registry;
import static forestry.api.apiculture.EnumBeeChromosome.*;
import static forestry.api.core.EnumHumidity.ARID;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.function.Consumer;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.BiomeDictionary.Type;
+
+import org.apache.commons.lang3.text.WordUtils;
+
import forestry.api.apiculture.*;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
@@ -24,68 +34,46 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.function.Consumer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.BiomeDictionary.Type;
-import org.apache.commons.lang3.text.WordUtils;
public enum GTPP_BeeDefinition implements IBeeDefinition {
- DRAGONBLOOD(
- GTPP_BranchDefinition.LEGENDARY,
- "Dragon Blood",
- STANDALONE.DRAGON_METAL,
- true,
- Utils.rgbtoHexValue(220, 20, 20),
- Utils.rgbtoHexValue(20, 20, 20),
- beeSpecies -> {
+
+ DRAGONBLOOD(GTPP_BranchDefinition.LEGENDARY, "Dragon Blood", STANDALONE.DRAGON_METAL, true,
+ Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20), beeSpecies -> {
beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f);
beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPP_CombType.DRAGONBLOOD), 0.10f);
beeSpecies.setHumidity(ARID);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
beeSpecies.setHasEffect();
- },
- template -> {
+ }, template -> {
AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGER);
AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectAggressive);
AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_3);
AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_3);
- },
- dis -> {
+ }, dis -> {
IBeeMutationCustom tMutation = dis.registerMutation("DRAGONESSENCE", "NEUTRONIUM", 2);
tMutation.restrictHumidity(ARID);
tMutation.requireResource(STANDALONE.DRAGON_METAL.getBlock(), 1);
tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim
}),
- FORCE(
- GTPP_BranchDefinition.LEGENDARY,
- "Force",
- STANDALONE.FORCE,
- true,
- Utils.rgbtoHexValue(250, 250, 20),
- Utils.rgbtoHexValue(200, 200, 5),
- beeSpecies -> {
+ FORCE(GTPP_BranchDefinition.LEGENDARY, "Force", STANDALONE.FORCE, true, Utils.rgbtoHexValue(250, 250, 20),
+ Utils.rgbtoHexValue(200, 200, 5), beeSpecies -> {
beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALT), 0.15f);
beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPP_CombType.FORCE), 0.10f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.HOT);
beeSpecies.setHasEffect();
- },
- template -> {
+ }, template -> {
AlleleHelper.instance.set(template, LIFESPAN, Lifespan.NORMAL);
AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectAggressive);
AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.BOTH_1);
AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1);
- },
- dis -> {
+ }, dis -> {
IBeeMutationCustom tMutation = dis.registerMutation("STEEL", "GOLD", 10);
tMutation.restrictHumidity(ARID);
tMutation.restrictBiomeType(Type.HOT);
- }),
- ;
+ }),;
+
private final GTPP_BranchDefinition branch;
private final GTPP_AlleleBeeSpecies species;
private final Consumer<GTPP_AlleleBeeSpecies> mSpeciesProperties;
@@ -94,15 +82,8 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
private IAllele[] template;
private IBeeGenome genome;
- GTPP_BeeDefinition(
- GTPP_BranchDefinition branch,
- String binomial,
- Materials aMat,
- boolean dominant,
- int primary,
- int secondary,
- Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties,
- Consumer<IAllele[]> aAlleles,
+ GTPP_BeeDefinition(GTPP_BranchDefinition branch, String binomial, Materials aMat, boolean dominant, int primary,
+ int secondary, Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles,
Consumer<GTPP_BeeDefinition> aMutations) {
this(
branch,
@@ -116,15 +97,8 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
aMutations);
}
- GTPP_BeeDefinition(
- GTPP_BranchDefinition branch,
- String binomial,
- Material aMat,
- boolean dominant,
- int primary,
- int secondary,
- Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties,
- Consumer<IAllele[]> aAlleles,
+ GTPP_BeeDefinition(GTPP_BranchDefinition branch, String binomial, Material aMat, boolean dominant, int primary,
+ int secondary, Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles,
Consumer<GTPP_BeeDefinition> aMutations) {
this.mAlleles = aAlleles;
this.mMutations = aMutations;
@@ -138,7 +112,15 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
GTPP_Bees.sMaterialMappings.put(binomial.toLowerCase().replaceAll(" ", ""), aMat);
this.branch = branch;
this.species = new GTPP_AlleleBeeSpecies(
- uid, dominant, name, "GT++", description, branch.getBranch(), binomial, primary, secondary);
+ uid,
+ dominant,
+ name,
+ "GT++",
+ description,
+ branch.getBranch(),
+ binomial,
+ primary,
+ secondary);
}
public static void initBees() {
@@ -241,23 +223,23 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
BeeManager.beeRoot.registerTemplate(template);
}
- protected final IBeeMutationCustom registerMutation(
- IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance) {
+ protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2,
+ int chance) {
return registerMutation(parent1, parent2, chance, 1f);
}
- protected final IBeeMutationCustom registerMutation(
- GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance) {
+ protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2,
+ int chance) {
return registerMutation(parent1, parent2, chance, 1f);
}
- protected final IBeeMutationCustom registerMutation(
- IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2, int chance) {
+ protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2,
+ int chance) {
return registerMutation(parent1, parent2, chance, 1f);
}
- protected final IBeeMutationCustom registerMutation(
- GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2, int chance) {
+ protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2,
+ int chance) {
return registerMutation(parent1, parent2, chance, 1f);
}
@@ -266,33 +248,32 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
}
/**
- * Diese neue Funtion erlaubt Mutationsraten unter 1%. Setze dazu die
- * Mutationsrate als Bruch mit chance / chancedivider This new function
- * allows Mutation percentages under 1%. Set them as a fraction with chance
- * / chancedivider
+ * Diese neue Funtion erlaubt Mutationsraten unter 1%. Setze dazu die Mutationsrate als Bruch mit chance /
+ * chancedivider This new function allows Mutation percentages under 1%. Set them as a fraction with chance /
+ * chancedivider
*/
- protected final IBeeMutationCustom registerMutation(
- IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, float chancedivider) {
+ protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2,
+ int chance, float chancedivider) {
return new GTPP_Bee_Mutation(parent1, parent2, this.getTemplate(), chance, chancedivider);
}
- protected final IBeeMutationCustom registerMutation(
- GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance, float chancedivider) {
+ protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2,
+ int chance, float chancedivider) {
return registerMutation(parent1.species, parent2, chance, chancedivider);
}
- protected final IBeeMutationCustom registerMutation(
- IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2, int chance, float chancedivider) {
+ protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2,
+ int chance, float chancedivider) {
return registerMutation(parent1, parent2.species, chance, chancedivider);
}
- protected final IBeeMutationCustom registerMutation(
- GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2, int chance, float chancedivider) {
+ protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2,
+ int chance, float chancedivider) {
return registerMutation(parent1.species, parent2, chance, chancedivider);
}
- protected final IBeeMutationCustom registerMutation(
- String parent1, String parent2, int chance, float chancedivider) {
+ protected final IBeeMutationCustom registerMutation(String parent1, String parent2, int chance,
+ float chancedivider) {
return registerMutation(getGregtechBeeType(parent1), getGregtechBeeType(parent2), chance, chancedivider);
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java
index c9bf32d07b..75b43ff8f1 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.forestry.bees.registry;
+import java.lang.reflect.Field;
+import java.util.List;
+
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.World;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+
import forestry.api.apiculture.*;
import forestry.api.core.IClimateProvider;
import forestry.api.genetics.IAllele;
@@ -7,18 +15,13 @@ import forestry.api.genetics.IGenome;
import forestry.api.genetics.IMutationCondition;
import forestry.apiculture.genetics.BeeMutation;
import forestry.core.genetics.mutations.Mutation;
-import java.lang.reflect.Field;
-import java.util.List;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
-import org.apache.commons.lang3.reflect.FieldUtils;
public class GTPP_Bee_Mutation extends BeeMutation {
private final float split;
- public GTPP_Bee_Mutation(
- IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance, float split) {
+ public GTPP_Bee_Mutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance,
+ float split) {
super(bee0, bee1, result, chance);
this.split = split;
BeeManager.beeRoot.registerMutation(this);
@@ -30,12 +33,8 @@ public class GTPP_Bee_Mutation extends BeeMutation {
}
@Override
- public float getChance(
- IBeeHousing housing,
- IAlleleBeeSpecies allele0,
- IAlleleBeeSpecies allele1,
- IBeeGenome genome0,
- IBeeGenome genome1) {
+ public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1,
+ IBeeGenome genome0, IBeeGenome genome1) {
World world = housing != null ? housing.getWorld() : null;
ChunkCoordinates housingCoordinates = housing != null ? housing.getCoordinates() : null;
int x = housingCoordinates != null ? housingCoordinates.posX : 0;
@@ -49,8 +48,7 @@ public class GTPP_Bee_Mutation extends BeeMutation {
}
IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
- IBeeModifier beeModeModifier =
- BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier();
+ IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier();
processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, processedChance);
processedChance *= beeModeModifier.getMutationModifier(genome0, genome1, processedChance);
@@ -59,16 +57,8 @@ public class GTPP_Bee_Mutation extends BeeMutation {
}
@SuppressWarnings("unchecked")
- private float getBasicChance(
- World world,
- int x,
- int y,
- int z,
- IAllele allele0,
- IAllele allele1,
- IGenome genome0,
- IGenome genome1,
- IClimateProvider climate) {
+ private float getBasicChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0,
+ IGenome genome1, IClimateProvider climate) {
float mutationChance = this.getBaseChance();
List<IMutationCondition> mutationConditions = null;
Field f = FieldUtils.getDeclaredField(Mutation.class, "mutationConditions", true);
@@ -80,14 +70,12 @@ public class GTPP_Bee_Mutation extends BeeMutation {
e.printStackTrace();
}
- if (mutationConditions != null)
- for (IMutationCondition mutationCondition : mutationConditions) {
- mutationChance *=
- mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate);
- if (mutationChance == 0) {
- return 0;
- }
+ if (mutationConditions != null) for (IMutationCondition mutationCondition : mutationConditions) {
+ mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate);
+ if (mutationChance == 0) {
+ return 0;
}
+ }
return mutationChance;
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
index 38ba689944..10d9929bc8 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
@@ -2,6 +2,8 @@ package gtPlusPlus.xmod.forestry.bees.registry;
import static gregtech.api.enums.GT_Values.MOD_ID_FR;
+import java.util.HashMap;
+
import cpw.mods.fml.common.Loader;
import gregtech.GT_Mod;
import gtPlusPlus.api.objects.Logger;
@@ -10,7 +12,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.forestry.bees.handler.*;
import gtPlusPlus.xmod.forestry.bees.items.output.*;
-import java.util.HashMap;
public class GTPP_Bees {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java
index 76e195e9ef..a55330b5df 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java
@@ -2,6 +2,9 @@ package gtPlusPlus.xmod.forestry.bees.registry;
import static forestry.api.apiculture.EnumBeeChromosome.*;
+import java.util.Arrays;
+import java.util.function.Consumer;
+
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.genetics.IAllele;
@@ -9,10 +12,9 @@ import forestry.api.genetics.IClassification;
import forestry.apiculture.genetics.alleles.AlleleEffect;
import forestry.core.genetics.alleles.AlleleHelper;
import forestry.core.genetics.alleles.EnumAllele.*;
-import java.util.Arrays;
-import java.util.function.Consumer;
public enum GTPP_BranchDefinition {
+
LEGENDARY("gtpp.legendary", "Summa Potestas", alleles -> {
AlleleHelper.instance.set(alleles, TEMPERATURE_TOLERANCE, Tolerance.BOTH_2);
AlleleHelper.instance.set(alleles, HUMIDITY_TOLERANCE, Tolerance.BOTH_2);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java
index e8e2922791..5a2263fdac 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java
@@ -1,15 +1,19 @@
/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
+ * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
+ * at http://www.gnu.org/licenses/lgpl-3.0.txt
*
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
+ * MysteriousAges
******************************************************************************/
package gtPlusPlus.xmod.forestry.bees.tileentities;
+import java.util.*;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
+
import buildcraft.api.statements.ITriggerExternal;
import cpw.mods.fml.common.Optional;
import forestry.api.apiculture.*;
@@ -22,12 +26,9 @@ import forestry.apiculture.tiles.TileBeeHousingBase;
import forestry.apiculture.trigger.ApicultureTriggers;
import gtPlusPlus.xmod.forestry.bees.gui.ContainerBeeHouse;
import gtPlusPlus.xmod.forestry.bees.gui.GuiBeeHouse;
-import java.util.*;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
public class TileDenseBeeHouse extends TileBeeHousingBase implements IApiary {
+
private final IBeeModifier beeModifier = new ApiaryBeeModifier();
private final IBeeListener beeListener = new ApiaryBeeListener(this);
private final InventoryApiary inventory = new InventoryApiary(getAccessHandler());
diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java b/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
index 5957cfc89d..1cbf4a4787 100644
--- a/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
+++ b/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
@@ -9,19 +9,19 @@ public class HANDLER_GalactiCraft {
public static void preInit() {
if (LoadedMods.GalacticraftCore) {
// mSystemsCache.put("HD10180", new SystemHD10180());
- /*for (BaseSolarSystem solar : mSystemsCache.values()) {
- Logger.SPACE("Running 'pre-init' for "+solar.mSystemName);
- solar.preInit();
- }*/
+ /*
+ * for (BaseSolarSystem solar : mSystemsCache.values()) {
+ * Logger.SPACE("Running 'pre-init' for "+solar.mSystemName); solar.preInit(); }
+ */
}
}
public static void init() {
if (LoadedMods.GalacticraftCore) {
- /*for (BaseSolarSystem solar : mSystemsCache.values()) {
- Logger.SPACE("Running 'init' for "+solar.mSystemName);
- solar.init();
- }*/
+ /*
+ * for (BaseSolarSystem solar : mSystemsCache.values()) {
+ * Logger.SPACE("Running 'init' for "+solar.mSystemName); solar.init(); }
+ */
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java
index b0c5032e5f..103699e228 100644
--- a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java
+++ b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java
@@ -1,18 +1,20 @@
package gtPlusPlus.xmod.galacticraft.handler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.core.item.chemistry.RocketFuels;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.asm.AsmConfig;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.LinkedHashMap;
+
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.core.item.chemistry.RocketFuels;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.asm.AsmConfig;
+
public class HandlerTooltip_GC {
private static Item mItemBlock;
@@ -35,8 +37,8 @@ public class HandlerTooltip_GC {
if (GCBlocks != null) {
oMainClass = GCBlocks;
- Class<?> GCFuelLoader =
- ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.blocks.BlockFuelLoader");
+ Class<?> GCFuelLoader = ReflectionUtils
+ .getClass("micdoodle8.mods.galacticraft.core.blocks.BlockFuelLoader");
if (GCFuelLoader != null) {
oFuelLoaderClass = GCFuelLoader;
@@ -51,8 +53,7 @@ public class HandlerTooltip_GC {
}
}
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
if (mFuelNames == null) {
mFuelNames = new LinkedHashMap<Integer, String>();
@@ -69,8 +70,7 @@ public class HandlerTooltip_GC {
if (mItemBlock != null && !mFuelNames.isEmpty()) {
Item aTempItem = event.itemStack.getItem();
Block aTempBlock = Block.getBlockFromItem(aTempItem);
- if (aTempItem == mItemBlock
- || oFuelLoaderClass.isInstance(aTempBlock)
+ if (aTempItem == mItemBlock || oFuelLoaderClass.isInstance(aTempBlock)
|| event.itemStack.getUnlocalizedName().toLowerCase().contains("fuelloader")) {
for (int aMapKey : mFuelNames.keySet()) {
String aFuel = mFuelNames.get(aMapKey);
diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java b/src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java
index b0b5b48d7d..c25d6b4352 100644
--- a/src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java
+++ b/src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java
@@ -1,14 +1,16 @@
package gtPlusPlus.xmod.galacticraft.util;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.minecraft.entity.Entity;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.chemistry.RocketFuels;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.entity.Entity;
-import net.minecraftforge.fluids.FluidStack;
public class GalacticUtils {
@@ -51,8 +53,7 @@ public class GalacticUtils {
getRocketTier = m1;
getRocket = m2;
getBuggy = m3;
- if (a1 != null
- && a2 != null
+ if (a1 != null && a2 != null
&& a3 != null
&& a4 != null
&& a5 != null
@@ -94,8 +95,7 @@ public class GalacticUtils {
if (getRocketTier != null) {
try {
return (int) getRocketTier.invoke(aEntity, new Object[] {});
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
}
}
return -1;
@@ -110,8 +110,7 @@ public class GalacticUtils {
if (aIDockable.isInstance(rocket) && rocket != null) {
return getRocketTier((Entity) rocket);
}
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
} else if (aBuggyPad.isInstance(aEntity)) {
Object buggy;
try {
@@ -119,8 +118,7 @@ public class GalacticUtils {
if (aIDockable.isInstance(buggy) && buggy != null) {
return 0;
}
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
}
}
return -1;
@@ -138,8 +136,7 @@ public class GalacticUtils {
if (aTieredRocket.isInstance(aEntity)) {
return getValidFuelForTier(getRocketTier(aEntity));
} else {
- Logger.SPACE(
- "Failed to get valid rocket fuel for " + aEntity.getClass().getCanonicalName());
+ Logger.SPACE("Failed to get valid rocket fuel for " + aEntity.getClass().getCanonicalName());
return getValidFuelForTier(0);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/goodgenerator/GG_Utils.java b/src/main/java/gtPlusPlus/xmod/goodgenerator/GG_Utils.java
index a48802a0ac..a58ffc00df 100644
--- a/src/main/java/gtPlusPlus/xmod/goodgenerator/GG_Utils.java
+++ b/src/main/java/gtPlusPlus/xmod/goodgenerator/GG_Utils.java
@@ -1,12 +1,14 @@
package gtPlusPlus.xmod.goodgenerator;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Field;
import java.util.ArrayList;
+
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class GG_Utils {
private static final Class sClassFuelRodLoader;
@@ -29,8 +31,7 @@ public class GG_Utils {
rodCompressedUraniumDepleted_4,
rodCompressedPlutoniumDepleted,
rodCompressedPlutoniumDepleted_2,
- rodCompressedPlutoniumDepleted_4,
- ;
+ rodCompressedPlutoniumDepleted_4,;
}
public static ItemStack getGG_Fuel_Rod(GG_Fuel_Rod aItem, int aAmount) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index 44d6fb3a09..96b17f0685 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -3,6 +3,14 @@ package gtPlusPlus.xmod.gregtech;
import static gtPlusPlus.core.recipe.common.CI.bits;
import static gtPlusPlus.core.util.minecraft.MaterialUtils.getMaterialName;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Element;
@@ -65,12 +73,6 @@ import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_MolecularTransformer
import gtPlusPlus.xmod.gregtech.recipes.RecipesToRemove;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechNitroDieselFix;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class HANDLER_GT {
@@ -195,8 +197,7 @@ public class HANDLER_GT {
FluidStack aFluid = aRecipe.mFluidInputs[0];
if (aFluid != null && aFluid.amount > 0) {
ItemStack tDataOrb = GregtechMTE_ElementalDuplicator.getSpecialSlotStack(aRecipe);
- Materials tMaterial = Element.get(Behaviour_DataOrb.getDataName(tDataOrb))
- .mLinkedMaterials
+ Materials tMaterial = Element.get(Behaviour_DataOrb.getDataName(tDataOrb)).mLinkedMaterials
.get(0);
FluidStack aOutputFluid = null;
ItemStack aOutputItem = null;
@@ -211,18 +212,20 @@ public class HANDLER_GT {
GTPP_Recipe aNewRecipe = new GTPP_Recipe(
false,
new ItemStack[] {},
- new ItemStack[] {!aUsingFluid ? aOutputItem : null},
+ new ItemStack[] { !aUsingFluid ? aOutputItem : null },
aRecipe.mSpecialItems,
null,
aRecipe.mFluidInputs,
- new FluidStack[] {aUsingFluid ? aOutputFluid : null},
+ new FluidStack[] { aUsingFluid ? aOutputFluid : null },
aRecipe.mDuration,
aRecipe.mEUt,
aRecipe.mFluidInputs[0].amount);
GTPP_Recipe_Map.sElementalDuplicatorRecipes.add(aNewRecipe);
- Logger.INFO("[EM] Generated recipe for " + tMaterial.mLocalizedName + ", Outputs "
- + (aUsingFluid ? "Fluid" : "Dust"));
+ Logger.INFO(
+ "[EM] Generated recipe for " + tMaterial.mLocalizedName
+ + ", Outputs "
+ + (aUsingFluid ? "Fluid" : "Dust"));
}
} else {
Logger.INFO("[EM] Bad UU Requirement. " + RecipeUtils.getRecipeInfo(aRecipe));
@@ -235,8 +238,11 @@ public class HANDLER_GT {
}
}
int aSize = GTPP_Recipe_Map.sElementalDuplicatorRecipes.mRecipeList.size();
- Logger.INFO("[EM] Generated " + aSize + "/" + GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList.size()
- + " Replicator recipes.");
+ Logger.INFO(
+ "[EM] Generated " + aSize
+ + "/"
+ + GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList.size()
+ + " Replicator recipes.");
}
private static void convertPyroToCokeOven() {
@@ -254,8 +260,8 @@ public class HANDLER_GT {
}
}
- private static GT_Recipe replaceItemInRecipeWithAnother(
- GT_Recipe aRecipe, ItemStack aExisting, ItemStack aNewItem) {
+ private static GT_Recipe replaceItemInRecipeWithAnother(GT_Recipe aRecipe, ItemStack aExisting,
+ ItemStack aNewItem) {
ItemStack[] aInputItemsCopy = aRecipe.mInputs;
String aOutputName = ItemUtils.getItemName(aRecipe.mOutputs[0]);
boolean aDidChange = false;
@@ -294,8 +300,9 @@ public class HANDLER_GT {
boolean aHardCasings = aHardCasingsTest != null ? (boolean) aHardCasingsTest : false;
- Logger.INFO("Are Hard casings/hulls enabled within GT? "
- + (aHardCasingsTest == null ? "Version does not support config option" : aHardCasings));
+ Logger.INFO(
+ "Are Hard casings/hulls enabled within GT? "
+ + (aHardCasingsTest == null ? "Version does not support config option" : aHardCasings));
// Static objects to save memory
ItemStack aCasing_LUV = CI.machineCasing_LuV;
@@ -313,8 +320,8 @@ public class HANDLER_GT {
int aTier_UV = 7;
// int aTier_MAX = 8;
- ItemStack[] aCasings = new ItemStack[] {aCasing_LUV, aCasing_ZPM, aCasing_UV, aCasing_MAX};
- ItemStack[] aHulls = new ItemStack[] {aHull_LUV, aHull_ZPM, aHull_UV, aHull_MAX};
+ ItemStack[] aCasings = new ItemStack[] { aCasing_LUV, aCasing_ZPM, aCasing_UV, aCasing_MAX };
+ ItemStack[] aHulls = new ItemStack[] { aHull_LUV, aHull_ZPM, aHull_UV, aHull_MAX };
// Remove Hand Crafting Recipes
@@ -339,8 +346,7 @@ public class HANDLER_GT {
AutoMap<Pair<GT_Recipe, GT_Recipe>> aDataToModify = new AutoMap<Pair<GT_Recipe, GT_Recipe>>();
- Outer:
- for (final GT_Recipe r : GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList) {
+ Outer: for (final GT_Recipe r : GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList) {
if (r != null && r.mOutputs != null && r.mOutputs.length > 0) {
@@ -348,8 +354,7 @@ public class HANDLER_GT {
GT_Recipe aNewRecipe = r.copy();
// Casings
- Inner:
- for (ItemStack aCasingObject : aCasings) {
+ Inner: for (ItemStack aCasingObject : aCasings) {
if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasingObject)) {
String aOutputName = ItemUtils.getItemName(aOldRecipeCopy.mOutputs[0]);
Logger.INFO("Attempting to Modify Assembly Recipe for " + aOutputName);
@@ -389,8 +394,7 @@ public class HANDLER_GT {
}
// Hulls
- Inner:
- for (ItemStack aHullObject : aHulls) {
+ Inner: for (ItemStack aHullObject : aHulls) {
if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHullObject)) {
String aOutputName = ItemUtils.getItemName(aOldRecipeCopy.mOutputs[0]);
Logger.INFO("Attempting to Modify Assembly Recipe for " + aOutputName);
@@ -441,72 +445,60 @@ public class HANDLER_GT {
}
Logger.INFO("Adding new Shaped recipes for Casings.");
- GT_ModHandler.addCraftingRecipe(ItemList.Casing_LuV.get(1), bits, new Object[] {
- "PPP", "PwP", "PPP", 'P', ELEMENT.getInstance().SELENIUM.getPlate(1)
- });
GT_ModHandler.addCraftingRecipe(
- ItemList.Casing_ZPM.get(1), bits, new Object[] {"PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_ZPM, 1)});
+ ItemList.Casing_LuV.get(1),
+ bits,
+ new Object[] { "PPP", "PwP", "PPP", 'P', ELEMENT.getInstance().SELENIUM.getPlate(1) });
+ GT_ModHandler.addCraftingRecipe(
+ ItemList.Casing_ZPM.get(1),
+ bits,
+ new Object[] { "PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_ZPM, 1) });
GT_ModHandler.addCraftingRecipe(
- ItemList.Casing_UV.get(1), bits, new Object[] {"PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_UV, 1)});
+ ItemList.Casing_UV.get(1),
+ bits,
+ new Object[] { "PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_UV, 1) });
if (!aHardCasings) {
Logger.INFO("Adding new easy Shaped recipes for Hulls.");
GT_ModHandler.addCraftingRecipe(
- ItemList.Hull_LuV.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, new Object[] {
- "CMC", 'M', ItemList.Casing_LuV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium)
- });
+ ItemList.Hull_LuV.get(1),
+ RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED,
+ new Object[] { "CMC", 'M', ItemList.Casing_LuV, 'C',
+ OrePrefixes.cableGt01.get(Materials.VanadiumGallium) });
GT_ModHandler.addCraftingRecipe(
ItemList.Hull_ZPM.get(1),
RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED,
- new Object[] {"CMC", 'M', ItemList.Casing_ZPM, 'C', OrePrefixes.cableGt01.get(Materials.Naquadah)});
+ new Object[] { "CMC", 'M', ItemList.Casing_ZPM, 'C',
+ OrePrefixes.cableGt01.get(Materials.Naquadah) });
GT_ModHandler.addCraftingRecipe(
- ItemList.Hull_UV.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, new Object[] {
- "CMC", 'M', ItemList.Casing_UV, 'C', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy)
- });
+ ItemList.Hull_UV.get(1),
+ RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED,
+ new Object[] { "CMC", 'M', ItemList.Casing_UV, 'C',
+ OrePrefixes.wireGt04.get(Materials.NaquadahAlloy) });
} else {
Materials aPolytetrafluoroethylene = MaterialUtils.getMaterial("Polytetrafluoroethylene", "Plastic");
Logger.INFO("Adding new hard Shaped recipes for Hulls.");
GT_ModHandler.addCraftingRecipe(
- ItemList.Hull_LuV.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, new Object[] {
- "PHP",
- "CMC",
- 'M',
- ItemList.Casing_LuV,
- 'C',
- OrePrefixes.cableGt01.get(Materials.VanadiumGallium),
- 'H',
- ELEMENT.getInstance().SELENIUM.getPlate(1),
- 'P',
- OrePrefixes.plate.get(Materials.Plastic)
- });
+ ItemList.Hull_LuV.get(1),
+ RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED,
+ new Object[] { "PHP", "CMC", 'M', ItemList.Casing_LuV, 'C',
+ OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H',
+ ELEMENT.getInstance().SELENIUM.getPlate(1), 'P',
+ OrePrefixes.plate.get(Materials.Plastic) });
GT_ModHandler.addCraftingRecipe(
- ItemList.Hull_ZPM.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, new Object[] {
- "PHP",
- "CMC",
- 'M',
- ItemList.Casing_ZPM,
- 'C',
- OrePrefixes.cableGt01.get(Materials.Naquadah),
- 'H',
- CI.getPlate(aTier_ZPM, 1),
- 'P',
- OrePrefixes.plate.get(aPolytetrafluoroethylene)
- });
+ ItemList.Hull_ZPM.get(1),
+ RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED,
+ new Object[] { "PHP", "CMC", 'M', ItemList.Casing_ZPM, 'C',
+ OrePrefixes.cableGt01.get(Materials.Naquadah), 'H', CI.getPlate(aTier_ZPM, 1), 'P',
+ OrePrefixes.plate.get(aPolytetrafluoroethylene) });
GT_ModHandler.addCraftingRecipe(
- ItemList.Hull_UV.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, new Object[] {
- "PHP",
- "CMC",
- 'M',
- ItemList.Casing_UV,
- 'C',
- OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
- 'H',
- CI.getPlate(aTier_UV, 1),
- 'P',
- OrePrefixes.plate.get(aPolytetrafluoroethylene)
- });
+ ItemList.Hull_UV.get(1),
+ RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED,
+ new Object[] { "PHP", "CMC", 'M', ItemList.Casing_UV, 'C',
+ OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'H', CI.getPlate(aTier_UV, 1), 'P',
+ OrePrefixes.plate.get(aPolytetrafluoroethylene) });
}
}
@@ -517,11 +509,9 @@ public class HANDLER_GT {
Collection<GT_Recipe> aAssRecipes = GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList;
// 170, 172, 174, 176
if (aAssRecipes.size() > 0 && (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH)) {
- recipe:
- for (GT_Recipe aG : aAssRecipes) {
+ recipe: for (GT_Recipe aG : aAssRecipes) {
if (aG.mOutputs != null && aG.mOutputs.length > 0) {
- outputs:
- for (ItemStack aI : aG.mOutputs) {
+ outputs: for (ItemStack aI : aG.mOutputs) {
if (aI == null) {
continue;
}
@@ -533,19 +523,23 @@ public class HANDLER_GT {
int aMeta = aI.getItemDamage();
if (aMeta >= 170 && aMeta <= 176) {
// Found a Turbine
- int aCutoff = aMeta == 170
- ? CUT
+ int aCutoff = aMeta == 170 ? CUT
: (aMeta == 172 ? CUT * 2 : (aMeta == 174 ? CUT * 3 : CUT * 4));
- String aType = aMeta == 170
- ? "Small "
+ String aType = aMeta == 170 ? "Small "
: (aMeta == 172 ? "" : (aMeta == 174 ? "Large " : "Huge "));
Materials aMainMaterial = GT_MetaGenerated_Tool.getPrimaryMaterial(aI);
Materials aSecondaryMaterial = GT_MetaGenerated_Tool.getSecondaryMaterial(aI);
long rotorDurabilityMax = GT_MetaGenerated_Tool.getToolMaxDamage(aI);
if (rotorDurabilityMax < aCutoff) {
- Logger.WARNING("[Turbine Cleanup] " + getMaterialName(aMainMaterial) + " " + aType
- + "Turbines have " + rotorDurabilityMax
- + ", which is below the cutoff durability of " + aCutoff + ", disabling.");
+ Logger.WARNING(
+ "[Turbine Cleanup] " + getMaterialName(aMainMaterial)
+ + " "
+ + aType
+ + "Turbines have "
+ + rotorDurabilityMax
+ + ", which is below the cutoff durability of "
+ + aCutoff
+ + ", disabling.");
aG.mEnabled = false;
aG.mHidden = true;
aG.mCanBeBuffered = false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java
index d4a7f97051..78b5cced08 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java
@@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
* The item should have a maximum damage of 13.
*/
public interface IC2ElectricItem {
+
/**
* Determine if the item can be used in a machine or as an armor part to supply energy.
*
@@ -38,8 +39,8 @@ public interface IC2ElectricItem {
double getMaxCharge(ItemStack itemStack);
/**
- * Get the item's tier, lower tiers can't send energy to higher ones.
- * Batteries are Tier 1, Energy Crystals are Tier 2, Lapotron Crystals are Tier 3.
+ * Get the item's tier, lower tiers can't send energy to higher ones. Batteries are Tier 1, Energy Crystals are Tier
+ * 2, Lapotron Crystals are Tier 3.
*
* @return Item's tier
*/
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java
index 4ec01ce63c..007d66de66 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java
@@ -6,26 +6,24 @@ import net.minecraft.item.ItemStack;
/**
* This interface specifies a manager to handle the various tasks for electric items.
*
- * The default implementation does the following:
- * - store and retrieve the charge
- * - handle charging, taking amount, tier, transfer limit, canProvideEnergy and simulate into account
- * - replace item IDs if appropriate (getChargedItemId() and getEmptyItemId())
- * - update and manage the damage value for the visual charge indicator
+ * The default implementation does the following: - store and retrieve the charge - handle charging, taking amount,
+ * tier, transfer limit, canProvideEnergy and simulate into account - replace item IDs if appropriate
+ * (getChargedItemId() and getEmptyItemId()) - update and manage the damage value for the visual charge indicator
*
- * @note If you're implementing your own variant (ISpecialElectricItem), you can delegate to the
- * default implementations through ElectricItem.rawManager. The default implementation is designed
- * to minimize its dependency on its own constraints/structure and delegates most work back to the
- * more atomic features in the gateway manager.
+ * @note If you're implementing your own variant (ISpecialElectricItem), you can delegate to the default implementations
+ * through ElectricItem.rawManager. The default implementation is designed to minimize its dependency on its own
+ * constraints/structure and delegates most work back to the more atomic features in the gateway manager.
*/
public interface IC2ElectricItemManager {
+
/**
* Charge an item with a specified amount of energy.
*
- * @param itemStack electric item's stack
- * @param amount amount of energy to charge in EU
- * @param tier tier of the charging device, has to be at least as high as the item to charge
+ * @param itemStack electric item's stack
+ * @param amount amount of energy to charge in EU
+ * @param tier tier of the charging device, has to be at least as high as the item to charge
* @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit()
- * @param simulate don't actually change the item, just determine the return value
+ * @param simulate don't actually change the item, just determine the return value
* @return Energy transferred into the electric item
*/
double charge(ItemStack stack, double amount, int tier, boolean ignoreTransferLimit, boolean simulate);
@@ -33,20 +31,15 @@ public interface IC2ElectricItemManager {
/**
* Discharge an item by a specified amount of energy
*
- * @param itemStack electric item's stack
- * @param amount amount of energy to discharge in EU
- * @param tier tier of the discharging device, has to be at least as high as the item to discharge
+ * @param itemStack electric item's stack
+ * @param amount amount of energy to discharge in EU
+ * @param tier tier of the discharging device, has to be at least as high as the item to discharge
* @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit()
- * @param externally use the supplied item externally, i.e. to power something else as if it was a battery
- * @param simulate don't actually discharge the item, just determine the return value
+ * @param externally use the supplied item externally, i.e. to power something else as if it was a battery
+ * @param simulate don't actually discharge the item, just determine the return value
* @return Energy retrieved from the electric item
*/
- double discharge(
- ItemStack stack,
- double amount,
- int tier,
- boolean ignoreTransferLimit,
- boolean externally,
+ double discharge(ItemStack stack, double amount, int tier, boolean ignoreTransferLimit, boolean externally,
boolean simulate);
/**
@@ -58,34 +51,34 @@ public interface IC2ElectricItemManager {
double getCharge(ItemStack stack);
/**
- * Determine if the specified electric item has at least a specific amount of EU.
- * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item.
- * BatPacks are not taken into account.
+ * Determine if the specified electric item has at least a specific amount of EU. This is supposed to be used in the
+ * item code during operation, for example if you want to implement your own electric item. BatPacks are not taken
+ * into account.
*
* @param itemStack electric item's stack
- * @param amount minimum amount of energy required
+ * @param amount minimum amount of energy required
* @return true if there's enough energy
*/
boolean canUse(ItemStack stack, double amount);
/**
- * Try to retrieve a specific amount of energy from an Item, and if applicable, a BatPack.
- * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item.
+ * Try to retrieve a specific amount of energy from an Item, and if applicable, a BatPack. This is supposed to be
+ * used in the item code during operation, for example if you want to implement your own electric item.
*
* @param itemStack electric item's stack
- * @param amount amount of energy to discharge in EU
- * @param entity entity holding the item
+ * @param amount amount of energy to discharge in EU
+ * @param entity entity holding the item
* @return true if the operation succeeded
*/
boolean use(ItemStack stack, double amount, EntityLivingBase entity);
/**
- * Charge an item from the BatPack a player is wearing.
- * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item.
- * use() already contains this functionality.
+ * Charge an item from the BatPack a player is wearing. This is supposed to be used in the item code during
+ * operation, for example if you want to implement your own electric item. use() already contains this
+ * functionality.
*
* @param itemStack electric item's stack
- * @param entity entity holding the item
+ * @param entity entity holding the item
*/
void chargeFromArmor(ItemStack stack, EntityLivingBase entity);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
index a31e728e23..74c9d9ee5b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
@@ -1,22 +1,25 @@
package gtPlusPlus.xmod.gregtech.api.enums;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
import gregtech.api.objects.GT_RenderedTexture;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
public class CustomGtTextures {
+
public enum ItemIcons implements IIconContainer, Runnable {
+
VOID, // The Empty Texture
RENDERING_ERROR,
PUMP,
SKOOKUMCHOOCHER;
- public static final ITexture[] ERROR_RENDERING = new ITexture[] {new GT_RenderedTexture(RENDERING_ERROR)};
+ public static final ITexture[] ERROR_RENDERING = new ITexture[] { new GT_RenderedTexture(RENDERING_ERROR) };
protected IIcon mIcon, mOverlay;
@@ -46,6 +49,7 @@ public class CustomGtTextures {
}
public static class CustomIcon implements IIconContainer, Runnable {
+
protected IIcon mIcon, mOverlay;
protected String mIconName;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java
index c0c4e6a5c8..fcbbd019a9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java
@@ -2,28 +2,14 @@ package gtPlusPlus.xmod.gregtech.api.enums;
import static gregtech.api.enums.GT_Values.B;
-import gregtech.api.enums.OrePrefixes;
import net.minecraftforge.common.util.EnumHelper;
+import gregtech.api.enums.OrePrefixes;
+
public enum CustomOrePrefix {
- milled(
- "Milled Ores",
- "Milled ",
- " Ore",
- true,
- true,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- true,
- B[3],
- -1,
- 64,
- -1);
+
+ milled("Milled Ores", "Milled ", " Ore", true, true, false, false, false, false, false, false, false, true, B[3],
+ -1, 64, -1);
private final String mRegularLocalName;
private final String mLocalizedMaterialPre;
@@ -45,24 +31,11 @@ public enum CustomOrePrefix {
private OrePrefixes mSelfReference;
- private CustomOrePrefix(
- String aRegularLocalName,
- String aLocalizedMaterialPre,
- String aLocalizedMaterialPost,
- boolean aIsUnificatable,
- boolean aIsMaterialBased,
- boolean aIsSelfReferencing,
- boolean aIsContainer,
- boolean aDontUnificateActively,
- boolean aIsUsedForBlocks,
- boolean aAllowNormalRecycling,
- boolean aGenerateDefaultItem,
- boolean aIsEnchantable,
- boolean aIsUsedForOreProcessing,
- int aMaterialGenerationBits,
- long aMaterialAmount,
- int aDefaultStackSize,
- int aTextureindex) {
+ private CustomOrePrefix(String aRegularLocalName, String aLocalizedMaterialPre, String aLocalizedMaterialPost,
+ boolean aIsUnificatable, boolean aIsMaterialBased, boolean aIsSelfReferencing, boolean aIsContainer,
+ boolean aDontUnificateActively, boolean aIsUsedForBlocks, boolean aAllowNormalRecycling,
+ boolean aGenerateDefaultItem, boolean aIsEnchantable, boolean aIsUsedForOreProcessing,
+ int aMaterialGenerationBits, long aMaterialAmount, int aDefaultStackSize, int aTextureindex) {
mRegularLocalName = aRegularLocalName;
mLocalizedMaterialPre = aLocalizedMaterialPre;
@@ -88,44 +61,13 @@ public enum CustomOrePrefix {
mSelfReference = EnumHelper.addEnum(
OrePrefixes.class,
this.name(),
- new Class[] {
- String.class,
- String.class,
- String.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- boolean.class,
- int.class,
- long.class,
- int.class,
- int.class
- },
- new Object[] {
- mRegularLocalName,
- mLocalizedMaterialPre,
- mLocalizedMaterialPost,
- mIsUnificatable,
- mIsMaterialBased,
- mIsSelfReferencing,
- mIsContainer,
- mDontUnificateActively,
- mIsUsedForBlocks,
- mAllowNormalRecycling,
- mGenerateDefaultItem,
- mIsEnchantable,
- mIsUsedForOreProcessing,
- mMaterialGenerationBits,
- mMaterialAmount,
- mDefaultStackSize,
- mTextureindex
- });
+ new Class[] { String.class, String.class, String.class, boolean.class, boolean.class, boolean.class,
+ boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class,
+ boolean.class, int.class, long.class, int.class, int.class },
+ new Object[] { mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost, mIsUnificatable,
+ mIsMaterialBased, mIsSelfReferencing, mIsContainer, mDontUnificateActively, mIsUsedForBlocks,
+ mAllowNormalRecycling, mGenerateDefaultItem, mIsEnchantable, mIsUsedForOreProcessing,
+ mMaterialGenerationBits, mMaterialAmount, mDefaultStackSize, mTextureindex });
return mSelfReference != null;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 355b1c7477..2506af7af5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -2,15 +2,16 @@ package gtPlusPlus.xmod.gregtech.api.enums;
import static gregtech.api.enums.GT_Values.W;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer;
+
/**
* Class containing all non-OreDict Items of GregTech.
*/
@@ -308,7 +309,7 @@ public enum GregtechItemList implements GregtechItemContainer {
Casing_Reactor_II,
// Multitank
- /*Industrial_MultiTank,*/
+ /* Industrial_MultiTank, */
Industrial_MultiTankDense,
Casing_MultitankExterior,
@@ -379,9 +380,9 @@ public enum GregtechItemList implements GregtechItemContainer {
Casing_Multi_Use,
// Bedrock Mining Platforms
- /*BedrockMiner_MKI, */
- /*BedrockMiner_MKII, */
- /*BedrockMiner_MKIII, */
+ /* BedrockMiner_MKI, */
+ /* BedrockMiner_MKII, */
+ /* BedrockMiner_MKIII, */
Casing_BedrockMiner,
// Large Packager
@@ -413,7 +414,7 @@ public enum GregtechItemList implements GregtechItemContainer {
Casing_Naq_Reactor_A,
Casing_Naq_Reactor_B,
Casing_Naq_Reactor_C,
- /*Controller_Naq_Reactor, */
+ /* Controller_Naq_Reactor, */
Casing_Containment,
// Arc Furnace
@@ -757,7 +758,7 @@ public enum GregtechItemList implements GregtechItemContainer {
Charger_MAX,
// Tiny Fusion
- /*Miniature_Fusion, */
+ /* Miniature_Fusion, */
// Component Makers
Machine_LV_Component_Maker,
@@ -932,7 +933,7 @@ public enum GregtechItemList implements GregtechItemContainer {
GT_Chisel_HV,
// Plasma Tank
- /*Plasma_Tank,*/
+ /* Plasma_Tank, */
// ----------------------------------------------------------------------------
@@ -968,11 +969,11 @@ public enum GregtechItemList implements GregtechItemContainer {
FakeMachineCasingPlate_UV,
FakeMachineCasingPlate_MAX,
-// ----------------------------------------------------------------------------
+ // ----------------------------------------------------------------------------
-;
+ ;
- public static final GregtechItemList[] DYE_ONLY_ITEMS = {Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV};
+ public static final GregtechItemList[] DYE_ONLY_ITEMS = { Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV };
private ItemStack mStack;
private boolean mHasNotBeenSet = true;
@@ -1028,8 +1029,8 @@ public enum GregtechItemList implements GregtechItemContainer {
if (GT_Utility.isStackInvalid(aStack)) {
return false;
}
- return GT_Utility.areUnificationsEqual(
- (ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT);
+ return GT_Utility
+ .areUnificationsEqual((ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT);
}
public static Block getBlockFromStack(Object aStack) {
@@ -1078,8 +1079,8 @@ public enum GregtechItemList implements GregtechItemContainer {
if (GT_Utility.isStackInvalid(this.mStack)) {
return GT_Utility.copyAmount(aAmount, aReplacements);
}
- return GT_Utility.copyAmountAndMetaData(
- aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack));
+ return GT_Utility
+ .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack));
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
index b535236575..4bd8831098 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java
@@ -1,29 +1,18 @@
package gtPlusPlus.xmod.gregtech.api.enums;
-/* Electric Components.
- *
- * usual Materials for this are:
- * Primitive (Tier 1)
- * Basic (Tier 2) as used by UE as well : IC2 Circuit and RE-Battery
- * Good (Tier 3)
- * Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium Battery
- * Data (Tier 5) : Data Storage Circuit
- * Elite (Tier 6) as used by UE as well : Energy Crystal and Data Control Circuit
- * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal
- * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb
- * Infinite (Cheaty)
- *
-Circuits
- Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced,
- Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick,
- Circuit_IV, Circuit_LuV, Circuit_ZPM,
-Circuit Parts
- Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM,
- Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM,
- Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
- Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM;
+/*
+ * Electric Components. usual Materials for this are: Primitive (Tier 1) Basic (Tier 2) as used by UE as well : IC2
+ * Circuit and RE-Battery Good (Tier 3) Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and
+ * Lithium Battery Data (Tier 5) : Data Storage Circuit Elite (Tier 6) as used by UE as well : Energy Crystal and Data
+ * Control Circuit Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal Ultimate (Tier 8) : Data Orb and
+ * Lapotronic Energy Orb Infinite (Cheaty) Circuits Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced,
+ * Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, Circuit_IV, Circuit_LuV,
+ * Circuit_ZPM, Circuit Parts Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, Circuit_Parts_Crystal_Chip_IV,
+ * Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, Circuit_Parts_IV, Circuit_Parts_LuV,
+ * Circuit_Parts_ZPM, Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM;
*/
public enum GregtechOreDictNames {
+
buffer_core,
itemGregConduit,
Circuit_IV,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 03d2741fe3..f71e07f0a3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -3,6 +3,13 @@ package gtPlusPlus.xmod.gregtech.api.enums;
import static gregtech.api.enums.GT_Values.*;
import static gtPlusPlus.core.util.Utils.getTcAspectStack;
+import java.util.*;
+
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.*;
import gregtech.api.enums.TC_Aspects.TC_AspectStack;
import gregtech.api.interfaces.*;
@@ -13,486 +20,88 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData;
import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack;
-import java.util.*;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public enum GregtechOrePrefixes {
- /* Electric Components.
- *
- * usual Materials for this are:
- * Primitive (Tier 1)
- * Basic (Tier 2) as used by UE as well : IC2 Circuit and RE-Battery
- * Good (Tier 3)
- * Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium Battery
- * Data (Tier 5) : Data Storage Circuit
- * Elite (Tier 6) as used by UE as well : Energy Crystal and Data Control Circuit
- * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal
- * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb
- * Infinite (Cheaty)
+
+ /*
+ * Electric Components. usual Materials for this are: Primitive (Tier 1) Basic (Tier 2) as used by UE as well : IC2
+ * Circuit and RE-Battery Good (Tier 3) Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery
+ * and Lithium Battery Data (Tier 5) : Data Storage Circuit Elite (Tier 6) as used by UE as well : Energy Crystal
+ * and Data Control Circuit Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal Ultimate (Tier 8) : Data Orb
+ * and Lapotronic Energy Orb Infinite (Cheaty)
*/
- ingotHot(
- "Hot Ingots",
- "Hot ",
- " Ingot",
- true,
- true,
- false,
- false,
- false,
- false,
- false,
- true,
- false,
- false,
- B[1],
- M * 1,
- 16,
- 12), // A hot Ingot, which has to be cooled down by a Vacuum Freezer.
- ingot(
- "Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64,
+ ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1],
+ M * 1, 16, 12), // A hot Ingot, which has to be cooled down by a Vacuum Freezer.
+ ingot("Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64,
11), // A regular Ingot. Introduced by Eloraam
- dustTiny(
- "Tiny Dusts",
- "Tiny Pile of ",
- " Dust",
- true,
- true,
- false,
- false,
- false,
- false,
- false,
- true,
- false,
- false,
- B[0] | B[1] | B[2] | B[3],
- M / 9,
- 64,
- 0), // 1/9th of a Dust.
- dustSmall(
- "Small Dusts",
- "Small Pile of ",
- " Dust",
- true,
- true,
- false,
- false,
- false,
- false,
- false,
- true,
- false,
- false,
- B[0] | B[1] | B[2] | B[3],
- M / 4,
- 64,
- 1), // 1/4th of a Dust.
- dustImpure(
- "Impure Dusts",
- "Impure Pile of ",
- " Dust",
- true,
- true,
- false,
- false,
- false,
- false,
- false,
- true,
- false,
- true,
- B[3],
- M * 1,
- 64,
- 3), // Dust with impurities. 1 Unit of Main Material and 1/9 - 1/4 Unit of secondary Material
- dustRefined(
- "Refined Dusts",
- "Refined Pile of ",
- " Dust",
- true,
- true,
- false,
- false,
- false,
- false,
- false,
- true,
- false,
- true,
- B[3],
- M * 1,
- 64,
- 2),
- dustPure(
- "Purified Dusts",
- "Purified Pile of ",
- " Dust",
- true,
- true,
- false,
- false,
- false,
- false,
- false,
- true,
- false,
- true,
- B[3],
- M * 1,
- 64,
- 4),
- dust(
- "Dusts",
- "",
- " Dust",
- true,
- true,
- false,
- false,
- false,
- false,
- false,
- true,
- false,
- false,
- B[0] | B[1] | B[2] | B[3],
- M * 1,
- 64,
- 2), // Pure Dust worth of one Ingot or Gem. Introduced by Alblaka.
- nugget(
- "Nuggets", "", " Nugget", true, true, false, false, false, false, false, true, false, false, B[1], M / 9,
- 64, 9), // A Nugget. Introduced by Eloraam
- plate(
- "Plates",
- "",
- " Plate",
- true,
- true,
- false,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[1] | B[2],
- M * 1,
- 64,
- 17), // Regular Plate made of one Ingot/Dust. Introduced by Calclavia
- block(
- "Storage Blocks",
- "Block of ",
- "",
- true,
- true,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- false,
- 0,
- M * 9,
- 64,
- 71), // Storage Block consisting out of 9 Ingots/Gems/Dusts. Introduced by CovertJaguar
- gem(
- "Gemstones",
- "",
- "",
- true,
- true,
- true,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[2],
- M * 1,
- 64,
- 8), // A regular Gem worth one Dust. Introduced by Eloraam
- gemChipped(
- "Chipped Gemstones",
- "Chipped ",
- "",
- true,
- true,
- true,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[2],
- M / 4,
- 64,
- 59), // A regular Gem worth one small Dust. Introduced by TerraFirmaCraft
- gemFlawed(
- "Flawed Gemstones",
- "Flawed ",
- "",
- true,
- true,
- true,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[2],
- M / 2,
- 64,
- 60), // A regular Gem worth two small Dusts. Introduced by TerraFirmaCraft
- gemFlawless(
- "Flawless Gemstones",
- "Flawless ",
- "",
- true,
- true,
- true,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[2],
- M * 2,
- 32,
- 61), // A regular Gem worth two Dusts. Introduced by TerraFirmaCraft
- gemExquisite(
- "Exquisite Gemstones",
- "Exquisite ",
- "",
- true,
- true,
- true,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[2],
- M * 4,
- 16,
- 62), // A regular Gem worth four Dusts. Introduced by TerraFirmaCraft
- stick(
- "Sticks/Rods",
- "",
- " Rod",
- true,
- true,
- false,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[1] | B[2],
- M / 2,
- 64,
- 23), // Stick made of half an Ingot. Introduced by Eloraam
- type2(
- "16x Wires",
- "16x ",
- " Wire",
- true,
- true,
- false,
- false,
- false,
- false,
- true,
- false,
- false,
- false,
- 0,
- M * 8,
- 64,
+ dustTiny("Tiny Dusts", "Tiny Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false,
+ B[0] | B[1] | B[2] | B[3], M / 9, 64, 0), // 1/9th of a Dust.
+ dustSmall("Small Dusts", "Small Pile of ", " Dust", true, true, false, false, false, false, false, true, false,
+ false, B[0] | B[1] | B[2] | B[3], M / 4, 64, 1), // 1/4th of a Dust.
+ dustImpure("Impure Dusts", "Impure Pile of ", " Dust", true, true, false, false, false, false, false, true, false,
+ true, B[3], M * 1, 64, 3), // Dust with impurities. 1 Unit of Main Material and 1/9 - 1/4 Unit of secondary
+ // Material
+ dustRefined("Refined Dusts", "Refined Pile of ", " Dust", true, true, false, false, false, false, false, true,
+ false, true, B[3], M * 1, 64, 2),
+ dustPure("Purified Dusts", "Purified Pile of ", " Dust", true, true, false, false, false, false, false, true, false,
+ true, B[3], M * 1, 64, 4),
+ dust("Dusts", "", " Dust", true, true, false, false, false, false, false, true, false, false,
+ B[0] | B[1] | B[2] | B[3], M * 1, 64, 2), // Pure Dust worth of one Ingot or Gem. Introduced by Alblaka.
+ nugget("Nuggets", "", " Nugget", true, true, false, false, false, false, false, true, false, false, B[1], M / 9, 64,
+ 9), // A Nugget. Introduced by Eloraam
+ plate("Plates", "", " Plate", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M * 1,
+ 64, 17), // Regular Plate made of one Ingot/Dust. Introduced by Calclavia
+ block("Storage Blocks", "Block of ", "", true, true, false, false, false, true, true, false, false, false, 0, M * 9,
+ 64, 71), // Storage Block consisting out of 9 Ingots/Gems/Dusts. Introduced by CovertJaguar
+ gem("Gemstones", "", "", true, true, true, false, false, false, true, true, false, false, B[2], M * 1, 64, 8), // A
+ // regular
+ // Gem
+ // worth
+ // one
+ // Dust.
+ // Introduced
+ // by
+ // Eloraam
+ gemChipped("Chipped Gemstones", "Chipped ", "", true, true, true, false, false, false, true, true, false, false,
+ B[2], M / 4, 64, 59), // A regular Gem worth one small Dust. Introduced by TerraFirmaCraft
+ gemFlawed("Flawed Gemstones", "Flawed ", "", true, true, true, false, false, false, true, true, false, false, B[2],
+ M / 2, 64, 60), // A regular Gem worth two small Dusts. Introduced by TerraFirmaCraft
+ gemFlawless("Flawless Gemstones", "Flawless ", "", true, true, true, false, false, false, true, true, false, false,
+ B[2], M * 2, 32, 61), // A regular Gem worth two Dusts. Introduced by TerraFirmaCraft
+ gemExquisite("Exquisite Gemstones", "Exquisite ", "", true, true, true, false, false, false, true, true, false,
+ false, B[2], M * 4, 16, 62), // A regular Gem worth four Dusts. Introduced by TerraFirmaCraft
+ stick("Sticks/Rods", "", " Rod", true, true, false, false, false, false, true, true, false, false, B[1] | B[2],
+ M / 2, 64, 23), // Stick made of half an Ingot. Introduced by Eloraam
+ type2("16x Wires", "16x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 8, 64,
-1),
- toolSkookumChoocher(
- "Skookum Choocher",
- "",
- " Skookum Choocher",
- true,
- true,
- false,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[6],
- M * 6,
- 16,
- 37), // consisting out of 6 Ingots.
- toolAngleGrinder(
- "Angle Grinder",
- "",
- "Angle Grinder",
- true,
- true,
- false,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[6],
- M * 6,
- 16,
- 37), // consisting out of 6 Ingots.
- toolElectricSnips(
- "Electric Snips",
- "",
- "Electric Snips",
- true,
- true,
- false,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[6],
- M * 6,
- 16,
- 37), // consisting out of 6 Ingots.
- toolElectricLighter(
- "Electric Lighter",
- "",
- "Electric Lighter",
- true,
- true,
- false,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[6],
- M * 6,
- 16,
- 37), // consisting out of 6 Ingots.
- toolElectricButcherKnife(
- "Electric Butcher Knife",
- "",
- "Electric Butcher Knife",
- true,
- true,
- false,
- false,
- false,
- false,
- true,
- true,
- false,
- false,
- B[6],
- M * 6,
- 16,
- 37), // consisting out of 6 Ingots.
-
- batterySingleuse(
- "Single Use Batteries",
- "",
- "",
- false,
- true,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- 0,
- -1,
- 64,
- -1),
- battery(
- "Reusable Batteries",
- "",
- "",
- false,
- true,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- 0,
- -1,
- 64,
- -1), // Introduced by Calclavia
- circuit(
- "Circuits",
- "",
- "",
- true,
- true,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- 0,
- -1,
- 64,
- -1), // Introduced by Calclavia
- chipset(
- "Chipsets",
- "",
- "",
- true,
- true,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- 0,
- -1,
- 64,
- -1), // Introduced by Buildcraft
- computer("Computers", "", "", true, true, false, false, true, false, false, false, false, false, 0, -1, 64, -1),
- ; // A whole Computer. "computerMaster" = ComputerCube
+ toolSkookumChoocher("Skookum Choocher", "", " Skookum Choocher", true, true, false, false, false, false, true, true,
+ false, false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots.
+ toolAngleGrinder("Angle Grinder", "", "Angle Grinder", true, true, false, false, false, false, true, true, false,
+ false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots.
+ toolElectricSnips("Electric Snips", "", "Electric Snips", true, true, false, false, false, false, true, true, false,
+ false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots.
+ toolElectricLighter("Electric Lighter", "", "Electric Lighter", true, true, false, false, false, false, true, true,
+ false, false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots.
+ toolElectricButcherKnife("Electric Butcher Knife", "", "Electric Butcher Knife", true, true, false, false, false,
+ false, true, true, false, false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots.
+
+ batterySingleuse("Single Use Batteries", "", "", false, true, false, false, false, false, false, false, false,
+ false, 0, -1, 64, -1),
+ battery("Reusable Batteries", "", "", false, true, false, false, false, false, false, false, false, false, 0, -1,
+ 64, -1), // Introduced by Calclavia
+ circuit("Circuits", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced
+ // by
+ // Calclavia
+ chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced
+ // by
+ // Buildcraft
+ computer("Computers", "", "", true, true, false, false, true, false, false, false, false, false, 0, -1, 64, -1),; // A
+ // whole
+ // Computer.
+ // "computerMaster"
+ // =
+ // ComputerCube
public static volatile int VERSION = 508;
@@ -503,28 +112,17 @@ public enum GregtechOrePrefixes {
public final ArrayList<ItemStack> mPrefixedItems = new ArrayList<>();
public final short mTextureIndex;
public final String mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost;
- public final boolean mIsUsedForOreProcessing,
- mIsEnchantable,
- mIsUnificatable,
- mIsMaterialBased,
- mIsSelfReferencing,
- mIsContainer,
- mDontUnificateActively,
- mIsUsedForBlocks,
- mAllowNormalRecycling,
- mGenerateDefaultItem;
+ public final boolean mIsUsedForOreProcessing, mIsEnchantable, mIsUnificatable, mIsMaterialBased, mIsSelfReferencing,
+ mIsContainer, mDontUnificateActively, mIsUsedForBlocks, mAllowNormalRecycling, mGenerateDefaultItem;
public final List<TC_AspectStack> mAspects = new ArrayList<>();
public final Collection<GregtechOrePrefixes> mFamiliarPrefixes = new HashSet<>();
/**
- * Used to determine the amount of Material this Prefix contains.
- * Multiply or Divide GregTech_API.MATERIAL_UNIT to get the Amounts in comparision to one Ingot.
- * 0 = Null
- * Negative = Undefined Amount
+ * Used to determine the amount of Material this Prefix contains. Multiply or Divide GregTech_API.MATERIAL_UNIT to
+ * get the Amounts in comparision to one Ingot. 0 = Null Negative = Undefined Amount
*/
public final long mMaterialAmount;
- private final Collection<Materials> mNotGeneratedItems = new HashSet<>(),
- mIgnoredMaterials = new HashSet<>(),
+ private final Collection<Materials> mNotGeneratedItems = new HashSet<>(), mIgnoredMaterials = new HashSet<>(),
mGeneratedItems = new HashSet<>();
private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessing = new ArrayList<>();
private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessingFake = new ArrayList<>();
@@ -539,24 +137,12 @@ public enum GregtechOrePrefixes {
*/
public int mMaterialGenerationBits = 0;
- private GregtechOrePrefixes(
- final String aRegularLocalName,
- final String aLocalizedMaterialPre,
- final String aLocalizedMaterialPost,
- final boolean aIsUnificatable,
- final boolean aIsMaterialBased,
- final boolean aIsSelfReferencing,
- final boolean aIsContainer,
- final boolean aDontUnificateActively,
- final boolean aIsUsedForBlocks,
- final boolean aAllowNormalRecycling,
- final boolean aGenerateDefaultItem,
- final boolean aIsEnchantable,
- final boolean aIsUsedForOreProcessing,
- final int aMaterialGenerationBits,
- final long aMaterialAmount,
- final int aDefaultStackSize,
- final int aTextureindex) {
+ private GregtechOrePrefixes(final String aRegularLocalName, final String aLocalizedMaterialPre,
+ final String aLocalizedMaterialPost, final boolean aIsUnificatable, final boolean aIsMaterialBased,
+ final boolean aIsSelfReferencing, final boolean aIsContainer, final boolean aDontUnificateActively,
+ final boolean aIsUsedForBlocks, final boolean aAllowNormalRecycling, final boolean aGenerateDefaultItem,
+ final boolean aIsEnchantable, final boolean aIsUsedForOreProcessing, final int aMaterialGenerationBits,
+ final long aMaterialAmount, final int aDefaultStackSize, final int aTextureindex) {
this.mIsUnificatable = aIsUnificatable;
this.mIsMaterialBased = aIsMaterialBased;
this.mIsSelfReferencing = aIsSelfReferencing;
@@ -599,19 +185,18 @@ public enum GregtechOrePrefixes {
getTcAspectStack(TC_Aspects.FABRICO.name(), 1).addToAspectList(this.mAspects);
} else if (this.name().startsWith("tool")) {
getTcAspectStack(TC_Aspects.INSTRUMENTUM.name(), 2).addToAspectList(this.mAspects);
- } else if (this.name().startsWith("gem")
- || this.name().startsWith("crystal")
- || this.name().startsWith("lens")) {
- getTcAspectStack(TC_Aspects.VITREUS.name(), 1).addToAspectList(this.mAspects);
- } else if (this.name().startsWith("crate")) {
- getTcAspectStack(TC_Aspects.ITER.name(), 2).addToAspectList(this.mAspects);
- } else if (this.name().startsWith("circuit")) {
- getTcAspectStack("COGNITIO", 1);
- } else if (this.name().startsWith("computer")) {
- getTcAspectStack("COGNITIO", 4).addToAspectList(this.mAspects);
- } else if (this.name().startsWith("battery")) {
- getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects);
- }
+ } else
+ if (this.name().startsWith("gem") || this.name().startsWith("crystal") || this.name().startsWith("lens")) {
+ getTcAspectStack(TC_Aspects.VITREUS.name(), 1).addToAspectList(this.mAspects);
+ } else if (this.name().startsWith("crate")) {
+ getTcAspectStack(TC_Aspects.ITER.name(), 2).addToAspectList(this.mAspects);
+ } else if (this.name().startsWith("circuit")) {
+ getTcAspectStack("COGNITIO", 1);
+ } else if (this.name().startsWith("computer")) {
+ getTcAspectStack("COGNITIO", 4).addToAspectList(this.mAspects);
+ } else if (this.name().startsWith("battery")) {
+ getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects);
+ }
}
public static GregtechOrePrefixes getOrePrefix(final String aOre) {
@@ -695,8 +280,7 @@ public enum GregtechOrePrefixes {
}
public boolean doGenerateItem(final Materials aMaterial) {
- return (aMaterial != null)
- && (aMaterial != Materials._NULL)
+ return (aMaterial != null) && (aMaterial != Materials._NULL)
&& (((aMaterial.mTypes & this.mMaterialGenerationBits) != 0)
|| this.mGeneratedItems.contains(aMaterial))
&& !this.mNotGeneratedItems.contains(aMaterial)
@@ -726,16 +310,21 @@ public enum GregtechOrePrefixes {
return this.mOreProcessing.add(aRegistrator);
}
- public void processOre(
- final GT_Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) {
+ public void processOre(final GT_Materials aMaterial, final String aOreDictName, final String aModName,
+ final ItemStack aStack) {
if ((aMaterial != null)
&& ((aMaterial != GT_Materials._NULL) || this.mIsSelfReferencing || !this.mIsMaterialBased)
&& GT_Utility.isStackValid(aStack)) {
for (final Interface_OreRecipeRegistrator tRegistrator : this.mOreProcessing) {
if (D2) {
GT_Log.ore.println(
- "Processing '" + aOreDictName + "' with the Prefix '" + this.name() + "' and the Material '"
- + aMaterial.name() + "' at " + GT_Utility.getClassName(tRegistrator));
+ "Processing '" + aOreDictName
+ + "' with the Prefix '"
+ + this.name()
+ + "' and the Material '"
+ + aMaterial.name()
+ + "' at "
+ + GT_Utility.getClassName(tRegistrator));
}
tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack));
}
@@ -743,16 +332,20 @@ public enum GregtechOrePrefixes {
}
// TODO
- public void processOre(
- final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) {
- if ((aMaterial != null)
- && ((aMaterial != Materials._NULL) || this.mIsSelfReferencing || !this.mIsMaterialBased)
+ public void processOre(final Materials aMaterial, final String aOreDictName, final String aModName,
+ final ItemStack aStack) {
+ if ((aMaterial != null) && ((aMaterial != Materials._NULL) || this.mIsSelfReferencing || !this.mIsMaterialBased)
&& GT_Utility.isStackValid(aStack)) {
for (final Interface_OreRecipeRegistrator tRegistrator : this.mOreProcessingFake) {
if (D2) {
GT_Log.ore.println(
- "Processing '" + aOreDictName + "' with the Prefix '" + this.name() + "' and the Material '"
- + aMaterial.name() + "' at " + GT_Utility.getClassName(tRegistrator));
+ "Processing '" + aOreDictName
+ + "' with the Prefix '"
+ + this.name()
+ + "' and the Material '"
+ + aMaterial.name()
+ + "' at "
+ + GT_Utility.getClassName(tRegistrator));
}
tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack));
}
@@ -775,727 +368,166 @@ public enum GregtechOrePrefixes {
public enum GT_Materials implements IColorModulationContainer, ISubTagContainer {
/**
- * This is the Default Material returned in case no Material has been found or a NullPointer has been inserted at a location where it shouldn't happen.
+ * This is the Default Material returned in case no Material has been found or a NullPointer has been inserted
+ * at a location where it shouldn't happen.
* <p/>
* Mainly for preventing NullPointer Exceptions and providing Default Values.
*
* Unknown Material Components. Dead End Section.
*
- * Alkalus Range 730-799 & 970-998
- * (aMetaItemSubID, TextureSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, R, G, B, Alpha, aLocalName,
- * aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor
- * this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, true);
+ * Alkalus Range 730-799 & 970-998 (aMetaItemSubID, TextureSet, aToolSpeed, aToolDurability, aToolQuality,
+ * aTypes, R, G, B, Alpha, aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp,
+ * aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor
+ * this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, true);
*
*/
- _NULL(
- -1,
- TextureSet.SET_NONE,
- 1.0F,
- 0,
- 0,
- 0,
- 255,
- 255,
- 255,
- 0,
- "NULL",
- 0,
- 0,
- 0,
- 0,
- false,
- false,
- 1,
- 1,
- 1,
- Dyes._NULL,
- Element._NULL,
- Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS.name(), 1))),
+ _NULL(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "NULL", 0, 0, 0, 0, false, false, 1, 1, 1,
+ Dyes._NULL, Element._NULL, Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS.name(), 1))),
// Lapis(526, TextureSet.SET_LAPIS, 1.0F, 0, 1, 1 | 4 | 8, 70, 70, 220, 0, "Lapis", 0, 0, -1, 0, false, false,
// 3, 1, 1, Dyes.dyeBlue, 2, Arrays.asList(new MaterialStack(Materials.Lazurite, 12), new
// MaterialStack(Materials.Sodalite, 2), new MaterialStack(Materials.Pyrite, 1), new
// MaterialStack(Materials.Calcite, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.SENSUS, 1))),
- Pyrotheum(
- 20,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 255,
- 128,
- 0,
- 0,
- "Pyrotheum",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeYellow,
- 2,
+ Pyrotheum(20, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 255, 128, 0, 0, "Pyrotheum", 0, 0, -1, 0, false,
+ false, 2, 3, 1, Dyes.dyeYellow, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
new MaterialStack(Materials.Sulfur, 1)),
Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TC_Aspects.IGNIS, 1))),
- Cryotheum(
- 21,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 102,
- 178,
- 255,
- 0,
- "Cryotheum",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeLightBlue,
- 2,
+ Cryotheum(21, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 102, 178, 255, 0, "Cryotheum", 0, 0, -1, 0, false,
+ false, 2, 3, 1, Dyes.dyeLightBlue, 2,
Arrays.asList(
new MaterialStack(Materials.Blizz, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Snow, 1),
new MaterialStack(Materials.Niter, 1)),
Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TC_Aspects.GELUM, 1))),
- Ender(
- 22,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 2,
- 1,
- 255,
- 255,
- 255,
- 0,
- "Ender",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 3,
- 1,
- 1,
+ Ender(22, TextureSet.SET_FLUID, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Ender", 0, 0, -1, 0, false, false, 3, 1, 1,
Dyes.dyeGreen),
/**
* Circuitry, Batteries and other Technical things
*/
- Symbiotic(
- -1,
- TextureSet.SET_NONE,
- 1.0F,
- 0,
- 0,
- 0,
- 255,
- 255,
- 255,
- 0,
- "IV Tier",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 1,
- 1,
- 1,
- Dyes.dyeLightGray,
+ Symbiotic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "IV Tier", 0, 0, -1, 0, false, false, 1, 1,
+ 1, Dyes.dyeLightGray,
Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 4), getTcAspectStack(TC_Aspects.MACHINA, 4))),
- Neutronic(
- -1,
- TextureSet.SET_NONE,
- 1.0F,
- 0,
- 0,
- 0,
- 255,
- 255,
- 255,
- 0,
- "LuV Tier",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 1,
- 1,
- 1,
- Dyes.dyeLightGray,
+ Neutronic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "LuV Tier", 0, 0, -1, 0, false, false, 1, 1,
+ 1, Dyes.dyeLightGray,
Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 6), getTcAspectStack(TC_Aspects.MACHINA, 6))),
- Quantum(
- -1,
- TextureSet.SET_NONE,
- 1.0F,
- 0,
- 0,
- 0,
- 255,
- 255,
- 255,
- 0,
- "ZPM Tier",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 1,
- 1,
- 1,
- Dyes.dyeLightGray,
+ Quantum(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "ZPM Tier", 0, 0, -1, 0, false, false, 1, 1,
+ 1, Dyes.dyeLightGray,
Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8), getTcAspectStack(TC_Aspects.MACHINA, 8))),
- Superconductor(
- -1,
- TextureSet.SET_NONE,
- 1.0F,
- 0,
- 0,
- 0,
- 190,
- 240,
- 190,
- 0,
- "Superconductor",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 1,
- 1,
- 1,
- Dyes.dyeGreen,
- Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8))),
-
- Staballoy(
- 30,
- TextureSet.SET_ROUGH,
- 10.0F,
- 5120,
- 4,
- 1 | 2 | 16 | 32 | 64 | 128,
- 68,
- 75,
- 66,
- 0,
- "Staballoy",
- 0,
- 0,
- 1500,
- 2800,
- true,
- false,
- 1,
- 3,
- 1,
- Dyes.dyeGreen,
- 2,
+ Superconductor(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 190, 240, 190, 0, "Superconductor", 0, 0, -1, 0, false,
+ false, 1, 1, 1, Dyes.dyeGreen, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8))),
+
+ Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 66, 0, "Staballoy", 0,
+ 0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2,
Arrays.asList(new MaterialStack(Materials.Titanium, 1), new MaterialStack(Materials.Uranium, 9)),
Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
- Bedrockium(
- 31,
- TextureSet.SET_FINE,
- 8.0F,
- 8196,
- 3,
- 1 | 2 | 16 | 32 | 64 | 128,
- 39,
- 39,
- 39,
- 0,
- "Bedrockium",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 1,
- 5,
- 1,
- Dyes.dyeLightGray,
- 2,
+ Bedrockium(31, TextureSet.SET_FINE, 8.0F, 8196, 3, 1 | 2 | 16 | 32 | 64 | 128, 39, 39, 39, 0, "Bedrockium", 0,
+ 0, -1, 0, false, false, 1, 5, 1, Dyes.dyeLightGray, 2,
Arrays.asList(new MaterialStack(Materials.Carbon, 63), new MaterialStack(Materials.Carbon, 56)),
Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS, 8), getTcAspectStack(TC_Aspects.TUTAMEN, 3))),
- BloodSteel(
- 32,
- TextureSet.SET_METALLIC,
- 11.0F,
- 768,
- 4,
- 1 | 2 | 16 | 32 | 64 | 128,
- 142,
- 28,
- 0,
- 0,
- "Blood Steel",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 1,
- 1,
- 1,
- Dyes.dyeRed,
- 2,
+ BloodSteel(32, TextureSet.SET_METALLIC, 11.0F, 768, 4, 1 | 2 | 16 | 32 | 64 | 128, 142, 28, 0, 0, "Blood Steel",
+ 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed, 2,
Arrays.asList(new MaterialStack(Materials.Steel, 3)),
Arrays.asList(getTcAspectStack(TC_Aspects.VICTUS, 8), getTcAspectStack(TC_Aspects.IGNIS, 3))),
- Void(
- 33,
- TextureSet.SET_METALLIC,
- 6.0F,
- 1280,
- 3,
- 1 | 2 | 16 | 32 | 64 | 128,
- 82,
- 17,
- 82,
- 0,
- "Void Metal",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 3,
- 1,
- 1,
- Dyes.dyeBlack,
+ Void(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0,
+ -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack,
Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TC_Aspects.VACUOS, 7))),
- ConductiveIron(
- 34,
- TextureSet.SET_METALLIC,
- 5.0F,
- 256,
- 2,
- 1 | 2,
- 164,
- 109,
- 100,
- 0,
- "Conductive Iron",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 3,
- 1,
- 1,
- Dyes.dyeRed,
- 2,
+ ConductiveIron(34, TextureSet.SET_METALLIC, 5.0F, 256, 2, 1 | 2, 164, 109, 100, 0, "Conductive Iron", 0, 0, -1,
+ 0, false, false, 3, 1, 1, Dyes.dyeRed, 2,
Arrays.asList(new MaterialStack(Materials.Iron, 6), new MaterialStack(Materials.Redstone, 2)),
Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 2), getTcAspectStack(TC_Aspects.METALLUM, 2))),
- ElectricalSteel(
- 35,
- TextureSet.SET_METALLIC,
- 7.0F,
- 768,
- 3,
- 1 | 2 | 64 | 128,
- 194,
- 194,
- 194,
- 0,
- "Electrical Steel",
- 0,
- 0,
- 1811,
- 1000,
- true,
- false,
- 3,
- 1,
- 1,
- Dyes.dyeLightGray,
- 2,
+ ElectricalSteel(35, TextureSet.SET_METALLIC, 7.0F, 768, 3, 1 | 2 | 64 | 128, 194, 194, 194, 0,
+ "Electrical Steel", 0, 0, 1811, 1000, true, false, 3, 1, 1, Dyes.dyeLightGray, 2,
Arrays.asList(
new MaterialStack(Materials.Iron, 3),
new MaterialStack(Materials.Coal, 2),
new MaterialStack(Materials.Silicon, 2)),
Arrays.asList(getTcAspectStack(TC_Aspects.MAGNETO, 2), getTcAspectStack(TC_Aspects.ELECTRUM, 5))),
- EnergeticAlloy(
- 36,
- TextureSet.SET_SHINY,
- 5.0F,
- 512,
- 3,
- 1 | 2 | 64 | 128,
- 252,
- 152,
- 45,
- 0,
- "Energetic Alloy",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 3,
- 1,
- 1,
- Dyes.dyeOrange,
- 2,
+ EnergeticAlloy(36, TextureSet.SET_SHINY, 5.0F, 512, 3, 1 | 2 | 64 | 128, 252, 152, 45, 0, "Energetic Alloy", 0,
+ 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange, 2,
Arrays.asList(
new MaterialStack(Materials.Gold, 3),
new MaterialStack(Materials.Glowstone, 2),
new MaterialStack(Materials.Redstone, 2)),
Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 4), getTcAspectStack(TC_Aspects.LUX, 3))),
- VibrantAlloy(
- 37,
- TextureSet.SET_SHINY,
- 7.0F,
- 1280,
- 4,
- 1 | 2 | 64 | 128,
- 204,
- 242,
- 142,
- 0,
- "Vibrant Alloy",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 3,
- 1,
- 1,
- Dyes.dyeLime,
- 2,
+ VibrantAlloy(37, TextureSet.SET_SHINY, 7.0F, 1280, 4, 1 | 2 | 64 | 128, 204, 242, 142, 0, "Vibrant Alloy", 0, 0,
+ -1, 0, false, false, 3, 1, 1, Dyes.dyeLime, 2,
Arrays.asList(
- new MaterialStack(Materials.EnergeticAlloy, 1), new MaterialStack(Materials.EnderPearl, 3)),
+ new MaterialStack(Materials.EnergeticAlloy, 1),
+ new MaterialStack(Materials.EnderPearl, 3)),
Arrays.asList(getTcAspectStack(TC_Aspects.MACHINA, 5), getTcAspectStack(TC_Aspects.TELUM, 4))),
- PulsatingIron(
- 38,
- TextureSet.SET_SHINY,
- 5.0F,
- 256,
- 2,
- 1 | 2 | 64 | 128,
- 50,
- 91,
- 21,
- 0,
- "Pulsating Iron",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 3,
- 1,
- 1,
- Dyes.dyeGreen,
- 2,
+ PulsatingIron(38, TextureSet.SET_SHINY, 5.0F, 256, 2, 1 | 2 | 64 | 128, 50, 91, 21, 0, "Pulsating Iron", 0, 0,
+ -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen, 2,
Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.EnderPearl, 2)),
Arrays.asList(getTcAspectStack(TC_Aspects.ALIENIS, 3), getTcAspectStack(TC_Aspects.METALLUM, 3))),
- /* TODO*/ RedstoneAlloy(
- 39,
- TextureSet.SET_METALLIC,
- 1.0F,
- 256,
- 2,
- 1 | 2 | 16 | 32 | 64,
- 178,
- 34,
- 34,
- 0,
- "Redstone Alloy",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 3,
- 1,
- 1,
- Dyes.dyeRed,
- 2,
+ /* TODO */ RedstoneAlloy(39, TextureSet.SET_METALLIC, 1.0F, 256, 2, 1 | 2 | 16 | 32 | 64, 178, 34, 34, 0,
+ "Redstone Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2,
Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.Redstone, 4))),
// Needs more Use, I think.
- Tantalloy60(
- 40,
- TextureSet.SET_DULL,
- 8.0F,
- 5120,
- 3,
- 1 | 2 | 16 | 32 | 64 | 128,
- 68,
- 75,
- 166,
- 0,
- "Tantalloy-60",
- 0,
- 0,
- 3035,
- 2200,
- true,
- false,
- 1,
- 2,
- 1,
- Dyes.dyeLightBlue,
- 2,
+ Tantalloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 166, 0, "Tantalloy-60",
+ 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)),
Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
- Tantalloy61(
- 41,
- TextureSet.SET_DULL,
- 7.0F,
- 5120,
- 2,
- 1 | 2 | 16 | 32 | 64 | 128,
- 122,
- 135,
- 196,
- 0,
- "Tantalloy-61",
- 0,
- 0,
- 3015,
- 2150,
- true,
- false,
- 1,
- 2,
- 1,
- Dyes.dyeLightBlue,
- 2,
+ Tantalloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 122, 135, 196, 0,
+ "Tantalloy-61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
Arrays.asList(
new MaterialStack(Materials.Tungsten, 1),
new MaterialStack(Materials.Tantalum, 9),
new MaterialStack(Materials.Titanium, 1)),
Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
- Potin(
- 42,
- TextureSet.SET_METALLIC,
- 7.0F,
- 5120,
- 2,
- 1 | 2 | 16 | 32 | 64 | 128,
- 201,
- 151,
- 129,
- 0,
- "Potin",
- 0,
- 0,
- 3015,
- 2150,
- true,
- false,
- 1,
- 2,
- 1,
- Dyes.dyeLightBlue,
- 2,
+ Potin(42, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 201, 151, 129, 0, "Potin", 0, 0,
+ 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
Arrays.asList(
new MaterialStack(Materials.Tungsten, 1),
new MaterialStack(Materials.Tantalum, 9),
new MaterialStack(Materials.Titanium, 1)),
Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
- Inconel792(
- 43,
- TextureSet.SET_METALLIC,
- 7.0F,
- 5120,
- 2,
- 1 | 2 | 16 | 32 | 64 | 128,
- 108,
- 240,
- 118,
- 0,
- "Inconel-792",
- 0,
- 0,
- 3015,
- 2150,
- true,
- false,
- 1,
- 2,
- 1,
- Dyes.dyeLightBlue,
- 2,
+ Inconel792(43, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 108, 240, 118, 0,
+ "Inconel-792", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
Arrays.asList(
new MaterialStack(Materials.Tungsten, 1),
new MaterialStack(Materials.Tantalum, 9),
new MaterialStack(Materials.Titanium, 1)),
Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
- Inconel690(
- 44,
- TextureSet.SET_DULL,
- 7.0F,
- 5120,
- 2,
- 1 | 2 | 16 | 32 | 64 | 128,
- 118,
- 220,
- 138,
- 0,
- "Inconel-690",
- 0,
- 0,
- 3015,
- 2150,
- true,
- false,
- 1,
- 2,
- 1,
- Dyes.dyeLightBlue,
- 2,
+ Inconel690(44, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 118, 220, 138, 0, "Inconel-690",
+ 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
Arrays.asList(
new MaterialStack(Materials.Tungsten, 1),
new MaterialStack(Materials.Tantalum, 9),
new MaterialStack(Materials.Titanium, 1)),
Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
- MaragingSteel300(
- 45,
- TextureSet.SET_METALLIC,
- 7.0F,
- 5120,
- 2,
- 1 | 2 | 16 | 32 | 64 | 128,
- 150,
- 150,
- 150,
- 0,
- "Maraging Steel 300",
- 0,
- 0,
- 3015,
- 2150,
- true,
- false,
- 1,
- 2,
- 1,
- Dyes.dyeLightBlue,
- 2,
+ MaragingSteel300(45, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 150, 150, 150, 0,
+ "Maraging Steel 300", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
Arrays.asList(
new MaterialStack(Materials.Tungsten, 1),
new MaterialStack(Materials.Tantalum, 9),
new MaterialStack(Materials.Titanium, 1)),
Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
- MaragingSteel350(
- 46,
- TextureSet.SET_METALLIC,
- 7.0F,
- 5120,
- 2,
- 1 | 2 | 16 | 32 | 64 | 128,
- 160,
- 160,
- 160,
- 0,
- "Maraging Steel 350",
- 0,
- 0,
- 3015,
- 2150,
- true,
- false,
- 1,
- 2,
- 1,
- Dyes.dyeLightBlue,
- 2,
+ MaragingSteel350(46, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 160, 160, 160, 0,
+ "Maraging Steel 350", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
Arrays.asList(
new MaterialStack(Materials.Tungsten, 1),
new MaterialStack(Materials.Tantalum, 9),
new MaterialStack(Materials.Titanium, 1)),
Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
- HastelloyX(
- 47,
- TextureSet.SET_SHINY,
- 7.0F,
- 5120,
- 2,
- 1 | 2 | 16 | 32 | 64 | 128,
- 255,
- 193,
- 37,
- 0,
- "Hastelloy-X",
- 0,
- 0,
- 3015,
- 2150,
- true,
- false,
- 1,
- 2,
- 1,
- Dyes.dyeLightBlue,
- 2,
+ HastelloyX(47, TextureSet.SET_SHINY, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 255, 193, 37, 0, "Hastelloy-X",
+ 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
Arrays.asList(
new MaterialStack(Materials.Tungsten, 1),
new MaterialStack(Materials.Tantalum, 9),
new MaterialStack(Materials.Titanium, 1)),
Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
- TriniumNaquadahCarbonite(
- 48,
- TextureSet.SET_SHINY,
- 7.0F,
- 5120,
- 2,
- 1 | 2 | 16 | 32 | 64 | 128,
- 255,
- 233,
- 0,
- 0,
- "Trinium Naquadah Carbonite",
- 0,
- 0,
- 3015,
- 2150,
- true,
- false,
- 1,
- 2,
- 1,
- Dyes.dyeLightBlue,
- 2,
+ TriniumNaquadahCarbonite(48, TextureSet.SET_SHINY, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 255, 233, 0, 0,
+ "Trinium Naquadah Carbonite", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2,
Arrays.asList(
new MaterialStack(Materials.Tungsten, 1),
new MaterialStack(Materials.Tantalum, 9),
@@ -1503,289 +535,78 @@ public enum GregtechOrePrefixes {
Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
// Radioactive Materials
- HydrofluoricAcid(
- -1,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 200,
- 200,
- 200,
- 0,
- "Hydrofluoric Acid",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeWhite,
- 2,
+ HydrofluoricAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 200, 200, 200, 0, "Hydrofluoric Acid", 0, 0,
+ -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
new MaterialStack(Materials.Sulfur, 1))),
- UraniumHexaFluoride(
- -1,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 73,
- 220,
- 83,
- 0,
- "Uranium Hexafluoride",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeLime,
- 2,
+ UraniumHexaFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium Hexafluoride",
+ 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLime, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
new MaterialStack(Materials.Sulfur, 1))),
- UraniumTetraFluoride(
- -1,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 73,
- 220,
- 83,
- 0,
- "Uranium Tetrafluoride",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeLime,
- 2,
+ UraniumTetraFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium Tetrafluoride",
+ 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLime, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
new MaterialStack(Materials.Sulfur, 1))),
- ThoriumTetraFluoride(
- -1,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 15,
- 120,
- 15,
- 0,
- "Thorium Tetrafluoride",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeGreen,
- 2,
+ ThoriumTetraFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 15, 120, 15, 0, "Thorium Tetrafluoride",
+ 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeGreen, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
new MaterialStack(Materials.Sulfur, 1))),
- SulfurousAcid(
- -1,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 110,
- 220,
- 30,
- 0,
- "Sulfurous Acid",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeWhite,
- 2,
+ SulfurousAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 110, 220, 30, 0, "Sulfurous Acid", 0, 0, -1, 0,
+ false, false, 2, 3, 1, Dyes.dyeWhite, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
new MaterialStack(Materials.Sulfur, 1))),
- SulfurDioxide(
- -1,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 150,
- 200,
- 50,
- 0,
- "Sulfur Dioxide",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeWhite,
- 2,
+ SulfurDioxide(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 150, 200, 50, 0, "Sulfur Dioxide", 0, 0, -1, 0,
+ false, false, 2, 3, 1, Dyes.dyeWhite, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
new MaterialStack(Materials.Sulfur, 1))),
- HydrogenChloride(
- -1,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 150,
- 240,
- 90,
- 0,
- "Hydrogen Chloride",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeWhite,
- 2,
+ HydrogenChloride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 150, 240, 90, 0, "Hydrogen Chloride", 0, 0,
+ -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
new MaterialStack(Materials.Sulfur, 1))),
- SulfuricApatite(
- -1,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 0,
- 105,
- 105,
- 0,
- "Sulfuric Apatite Solution",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeWhite,
- 2,
+ SulfuricApatite(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Sulfuric Apatite Solution",
+ 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
new MaterialStack(Materials.Sulfur, 1))),
- SulfuricLithium(
- -1,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 0,
- 105,
- 105,
- 0,
- "Sulfuric Lithium Solution",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeWhite,
- 2,
+ SulfuricLithium(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Sulfuric Lithium Solution",
+ 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
new MaterialStack(Materials.Sulfur, 1))),
- LithiumHydroxide(
- -1,
- TextureSet.SET_FLUID,
- 1.0F,
- 0,
- 1,
- 2 | 16 | 32,
- 0,
- 105,
- 105,
- 0,
- "Lithium Hydroxide",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 2,
- 3,
- 1,
- Dyes.dyeWhite,
- 2,
+ LithiumHydroxide(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Lithium Hydroxide", 0, 0,
+ -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2,
Arrays.asList(
new MaterialStack(Materials.Coal, 1),
new MaterialStack(Materials.Redstone, 1),
new MaterialStack(Materials.Blaze, 1),
- new MaterialStack(Materials.Sulfur, 1))),
- ;
+ new MaterialStack(Materials.Sulfur, 1))),;
/**
* List of all Materials.
@@ -1793,25 +614,24 @@ public enum GregtechOrePrefixes {
public static final Collection<GT_Materials> VALUES = new HashSet<>(Arrays.asList(values()));
static {
- /*Primitive.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
- Basic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
- Good.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
- Advanced.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
- Data.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
- Elite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
- Master.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
- Ultimate.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
- Superconductor.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
- Infinite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);*/
+ /*
+ * Primitive.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Basic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+ * Good.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Advanced.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+ * Data.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Elite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+ * Master.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Ultimate.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+ * Superconductor.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Infinite.add(SubTag.NO_SMASHING,
+ * SubTag.NO_SMELTING);
+ */
Symbiotic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
Neutronic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
Quantum.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
}
/**
- * This Array can be changed dynamically by a Tick Handler in order to get a glowing Effect on all GT Meta Items out of this Material.
+ * This Array can be changed dynamically by a Tick Handler in order to get a glowing Effect on all GT Meta Items
+ * out of this Material.
*/
- public final short[] mRGBa = new short[] {255, 255, 255, 0}, mMoltenRGBa = new short[] {255, 255, 255, 0};
+ public final short[] mRGBa = new short[] { 255, 255, 255, 0 }, mMoltenRGBa = new short[] { 255, 255, 255, 0 };
public final TextureSet mIconSet;
public final int mMetaItemSubID;
@@ -1829,37 +649,22 @@ public enum GregtechOrePrefixes {
public String mChemicalFormula = "?", mDefaultLocalName = "null";
public Dyes mColor = Dyes._NULL;
public short mMeltingPoint = 0, mBlastFurnaceTemp = 0;
- public int mTypes = 0,
- mDurability = 16,
- mFuelPower = 0,
- mFuelType = 0,
- mExtraData = 0,
- mOreValue = 0,
- mOreMultiplier = 1,
- mByProductMultiplier = 1,
- mSmeltingMultiplier = 1;
+ public int mTypes = 0, mDurability = 16, mFuelPower = 0, mFuelType = 0, mExtraData = 0, mOreValue = 0,
+ mOreMultiplier = 1, mByProductMultiplier = 1, mSmeltingMultiplier = 1;
public long mDensity = M;
public Element mElement = null;
- public GT_Materials mDirectSmelting = this,
- mOreReplacement = this,
- mMacerateInto = this,
- mSmeltInto = this,
- mArcSmeltInto = this,
- mHandleMaterial = this;
+ public GT_Materials mDirectSmelting = this, mOreReplacement = this, mMacerateInto = this, mSmeltInto = this,
+ mArcSmeltInto = this, mHandleMaterial = this;
public byte mToolQuality = 0;
public Fluid mSolid = null, mFluid = null, mGas = null, mPlasma = null;
/**
- * This Fluid is used as standard Unit for Molten Materials. 1296 is a Molten Block, what means 144 is one Material Unit worth
+ * This Fluid is used as standard Unit for Molten Materials. 1296 is a Molten Block, what means 144 is one
+ * Material Unit worth
*/
public Fluid mStandardMoltenFluid = null;
- private GT_Materials(
- final int aMetaItemSubID,
- final TextureSet aIconSet,
- final float aToolSpeed,
- final int aToolDurability,
- final int aToolQuality,
- final boolean aUnificatable) {
+ private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+ final int aToolDurability, final int aToolQuality, final boolean aUnificatable) {
this.mUnificatable = aUnificatable;
this.mMaterialInto = this;
this.mMetaItemSubID = aMetaItemSubID;
@@ -1890,20 +695,17 @@ public enum GregtechOrePrefixes {
/**
* @param aMetaItemSubID the Sub-ID used in my own MetaItems. Range 0-1000. -1 for no Material
- * @param aTypes which kind of Items should be generated. Bitmask as follows:
- * 1 = Dusts of all kinds.
- * 2 = Dusts, Ingots, Plates, Rods/Sticks, Machine Components and other Metal specific things.
- * 4 = Dusts, Gems, Plates, Lenses (if transparent).
- * 8 = Dusts, Impure Dusts, crushed Ores, purified Ores, centrifuged Ores etc.
- * 16 = Cells
- * 32 = Plasma Cells
- * 64 = Tool Heads
- * 128 = Gears
+ * @param aTypes which kind of Items should be generated. Bitmask as follows: 1 = Dusts of all
+ * kinds. 2 = Dusts, Ingots, Plates, Rods/Sticks, Machine Components and other
+ * Metal specific things. 4 = Dusts, Gems, Plates, Lenses (if transparent). 8 =
+ * Dusts, Impure Dusts, crushed Ores, purified Ores, centrifuged Ores etc. 16 =
+ * Cells 32 = Plasma Cells 64 = Tool Heads 128 = Gears
* @param aR, aG, aB Color of the Material 0-255 each.
* @param aA transparency of the Material Texture. 0 = fully visible, 255 = Invisible.
* @param aLocalName The Name used as Default for localization.
* @param aFuelType Type of Generator to get Energy from this Material.
- * @param aFuelPower EU generated. Will be multiplied by 1000, also additionally multiplied by 2 for Gems.
+ * @param aFuelPower EU generated. Will be multiplied by 1000, also additionally multiplied by 2 for
+ * Gems.
* @param aAmplificationValue Amount of UUM amplifier gotten from this.
* @param aUUMEnergy Amount of EU needed to shape the UUM into this Material.
* @param aMeltingPoint Used to determine the smelting Costs in Furnii.
@@ -1911,28 +713,12 @@ public enum GregtechOrePrefixes {
* @param aBlastFurnaceRequired If this requires a Blast Furnace.
* @param aColor Vanilla MC Wool Color which comes the closest to this.
*/
- private GT_Materials(
- final int aMetaItemSubID,
- final TextureSet aIconSet,
- final float aToolSpeed,
- final int aToolDurability,
- final int aToolQuality,
- final int aTypes,
- final int aR,
- final int aG,
- final int aB,
- final int aA,
- final String aLocalName,
- final int aFuelType,
- final int aFuelPower,
- final int aMeltingPoint,
- final int aBlastFurnaceTemp,
- final boolean aBlastFurnaceRequired,
- final boolean aTransparent,
- final int aOreValue,
- final int aDensityMultiplier,
- final int aDensityDivider,
- final Dyes aColor) {
+ private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+ final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
+ final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
+ final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
+ final boolean aTransparent, final int aOreValue, final int aDensityMultiplier,
+ final int aDensityDivider, final Dyes aColor) {
this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, true);
this.mDefaultLocalName = aLocalName;
this.mMeltingPoint = (short) aMeltingPoint;
@@ -1959,29 +745,12 @@ public enum GregtechOrePrefixes {
}
}
- private GT_Materials(
- final int aMetaItemSubID,
- final TextureSet aIconSet,
- final float aToolSpeed,
- final int aToolDurability,
- final int aToolQuality,
- final int aTypes,
- final int aR,
- final int aG,
- final int aB,
- final int aA,
- final String aLocalName,
- final int aFuelType,
- final int aFuelPower,
- final int aMeltingPoint,
- final int aBlastFurnaceTemp,
- final boolean aBlastFurnaceRequired,
- final boolean aTransparent,
- final int aOreValue,
- final int aDensityMultiplier,
- final int aDensityDivider,
- final Dyes aColor,
- final List<TC_AspectStack> aAspects) {
+ private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+ final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
+ final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
+ final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
+ final boolean aTransparent, final int aOreValue, final int aDensityMultiplier,
+ final int aDensityDivider, final Dyes aColor, final List<TC_AspectStack> aAspects) {
this(
aMetaItemSubID,
aIconSet,
@@ -2010,29 +779,12 @@ public enum GregtechOrePrefixes {
/**
* @param aElement The Element Enum represented by this Material
*/
- private GT_Materials(
- final int aMetaItemSubID,
- final TextureSet aIconSet,
- final float aToolSpeed,
- final int aToolDurability,
- final int aToolQuality,
- final int aTypes,
- final int aR,
- final int aG,
- final int aB,
- final int aA,
- final String aLocalName,
- final int aFuelType,
- final int aFuelPower,
- final int aMeltingPoint,
- final int aBlastFurnaceTemp,
- final boolean aBlastFurnaceRequired,
- final boolean aTransparent,
- final int aOreValue,
- final int aDensityMultiplier,
- final int aDensityDivider,
- final Dyes aColor,
- final Element aElement,
+ private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+ final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
+ final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
+ final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
+ final boolean aTransparent, final int aOreValue, final int aDensityMultiplier,
+ final int aDensityDivider, final Dyes aColor, final Element aElement,
final List<TC_AspectStack> aAspects) {
this(
aMetaItemSubID,
@@ -2067,29 +819,12 @@ public enum GregtechOrePrefixes {
this.mAspects.addAll(aAspects);
}
- private GT_Materials(
- final int aMetaItemSubID,
- final TextureSet aIconSet,
- final float aToolSpeed,
- final int aToolDurability,
- final int aToolQuality,
- final int aTypes,
- final int aR,
- final int aG,
- final int aB,
- final int aA,
- final String aLocalName,
- final int aFuelType,
- final int aFuelPower,
- final int aMeltingPoint,
- final int aBlastFurnaceTemp,
- final boolean aBlastFurnaceRequired,
- final boolean aTransparent,
- final int aOreValue,
- final int aDensityMultiplier,
- final int aDensityDivider,
- final Dyes aColor,
- final int aExtraData,
+ private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+ final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
+ final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
+ final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
+ final boolean aTransparent, final int aOreValue, final int aDensityMultiplier,
+ final int aDensityDivider, final Dyes aColor, final int aExtraData,
final List<MaterialStack> aMaterialList) {
this(
aMetaItemSubID,
@@ -2118,31 +853,13 @@ public enum GregtechOrePrefixes {
null);
}
- private GT_Materials(
- final int aMetaItemSubID,
- final TextureSet aIconSet,
- final float aToolSpeed,
- final int aToolDurability,
- final int aToolQuality,
- final int aTypes,
- final int aR,
- final int aG,
- final int aB,
- final int aA,
- final String aLocalName,
- final int aFuelType,
- final int aFuelPower,
- final int aMeltingPoint,
- final int aBlastFurnaceTemp,
- final boolean aBlastFurnaceRequired,
- final boolean aTransparent,
- final int aOreValue,
- final int aDensityMultiplier,
- final int aDensityDivider,
- final Dyes aColor,
- final int aExtraData,
- final List<MaterialStack> aMaterialList,
- final List<TC_AspectStack> aAspects) {
+ private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+ final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
+ final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
+ final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
+ final boolean aTransparent, final int aOreValue, final int aDensityMultiplier,
+ final int aDensityDivider, final Dyes aColor, final int aExtraData,
+ final List<MaterialStack> aMaterialList, final List<TC_AspectStack> aAspects) {
this(
aMetaItemSubID,
aIconSet,
@@ -2221,17 +938,16 @@ public enum GregtechOrePrefixes {
public static void init(final GT_Config aConfiguration) {
for (final GT_Materials tMaterial : VALUES) {
final String tString = tMaterial.toString().toLowerCase();
- tMaterial.mHeatDamage = (float)
- aConfiguration.get(ConfigCategories.Materials.heatdamage, tString, tMaterial.mHeatDamage);
+ tMaterial.mHeatDamage = (float) aConfiguration
+ .get(ConfigCategories.Materials.heatdamage, tString, tMaterial.mHeatDamage);
if (tMaterial.mBlastFurnaceRequired) {
- tMaterial.mBlastFurnaceRequired =
- aConfiguration.get(ConfigCategories.Materials.blastfurnacerequirements, tString, true);
+ tMaterial.mBlastFurnaceRequired = aConfiguration
+ .get(ConfigCategories.Materials.blastfurnacerequirements, tString, true);
}
- if (tMaterial.mBlastFurnaceRequired
- && aConfiguration.get(
- ConfigCategories.Materials.blastinductionsmelter,
- tString,
- tMaterial.mBlastFurnaceTemp < 1500)) {}
+ if (tMaterial.mBlastFurnaceRequired && aConfiguration.get(
+ ConfigCategories.Materials.blastinductionsmelter,
+ tString,
+ tMaterial.mBlastFurnaceTemp < 1500)) {}
// GT_ModHandler.ThermalExpansion.addSmelterBlastOre(tMaterial);
// tMaterial.mHandleMaterial = (tMaterial == Desh ? tMaterial.mHandleMaterial : tMaterial == Diamond ||
// tMaterial == Thaumium ? Wood : tMaterial.contains(SubTag.BURNING) ? Blaze :
@@ -2320,8 +1036,7 @@ public enum GregtechOrePrefixes {
}
if ((aMultiplier >= (M * 2)) && !this.mMaterialList.isEmpty()) {
return (((this.mElement != null)
- || ((this.mMaterialList.size() < 2)
- && (this.mMaterialList.get(0).mAmount == 1)))
+ || ((this.mMaterialList.size() < 2) && (this.mMaterialList.get(0).mAmount == 1)))
? this.mChemicalFormula
: "(" + this.mChemicalFormula + ")")
+ aMultiplier;
@@ -2414,8 +1129,8 @@ public enum GregtechOrePrefixes {
}
/**
- * Adds a Material to the List of Byproducts when grinding this Ore.
- * Is used for more precise Ore grinding, so that it is possible to choose between certain kinds of Materials.
+ * Adds a Material to the List of Byproducts when grinding this Ore. Is used for more precise Ore grinding, so
+ * that it is possible to choose between certain kinds of Materials.
*/
public GT_Materials addOreByProduct(final GT_Materials aMaterial) {
if (!this.mOreByProducts.contains(aMaterial.mMaterialInto)) {
@@ -2425,8 +1140,8 @@ public enum GregtechOrePrefixes {
}
/**
- * Adds multiple Materials to the List of Byproducts when grinding this Ore.
- * Is used for more precise Ore grinding, so that it is possible to choose between certain kinds of Materials.
+ * Adds multiple Materials to the List of Byproducts when grinding this Ore. Is used for more precise Ore
+ * grinding, so that it is possible to choose between certain kinds of Materials.
*/
public GT_Materials addOreByProducts(final GT_Materials... aMaterials) {
for (final GT_Materials tMaterial : aMaterials) {
@@ -2438,8 +1153,7 @@ public enum GregtechOrePrefixes {
}
/**
- * If this Ore gives multiple drops of its Main Material.
- * Lapis Ore for example gives about 6 drops.
+ * If this Ore gives multiple drops of its Main Material. Lapis Ore for example gives about 6 drops.
*/
public GT_Materials setOreMultiplier(final int aOreMultiplier) {
if (aOreMultiplier > 0) {
@@ -2459,8 +1173,7 @@ public enum GregtechOrePrefixes {
}
/**
- * If this Ore gives multiple drops of its Main Material.
- * Lapis Ore for example gives about 6 drops.
+ * If this Ore gives multiple drops of its Main Material. Lapis Ore for example gives about 6 drops.
*/
public GT_Materials setSmeltingMultiplier(final int aSmeltingMultiplier) {
if (aSmeltingMultiplier > 0) {
@@ -2480,8 +1193,8 @@ public enum GregtechOrePrefixes {
}
/**
- * This Material should be the Main Material this Ore gets ground into.
- * Example, Chromite giving Chrome or Tungstate giving Tungsten.
+ * This Material should be the Main Material this Ore gets ground into. Example, Chromite giving Chrome or
+ * Tungstate giving Tungsten.
*/
public GT_Materials setOreReplacement(final GT_Materials aMaterial) {
if (aMaterial != null) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java
index 4874e84b7b..87d85a578e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java
@@ -4,31 +4,20 @@ import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
public class GregtechTextureSet {
+
public static final GregtechTextureSet SET_NONE = new GregtechTextureSet("NONE"),
- SET_DULL = new GregtechTextureSet("DULL"),
- SET_RUBY = new GregtechTextureSet("RUBY"),
- SET_OPAL = new GregtechTextureSet("OPAL"),
- SET_LEAF = new GregtechTextureSet("LEAF"),
- SET_WOOD = new GregtechTextureSet("WOOD"),
- SET_SAND = new GregtechTextureSet("SAND"),
- SET_FINE = new GregtechTextureSet("FINE"),
- SET_FIERY = new GregtechTextureSet("FIERY"),
- SET_FLUID = new GregtechTextureSet("FLUID"),
- SET_ROUGH = new GregtechTextureSet("ROUGH"),
- SET_PAPER = new GregtechTextureSet("PAPER"),
- SET_GLASS = new GregtechTextureSet("GLASS"),
- SET_FLINT = new GregtechTextureSet("FLINT"),
- SET_LAPIS = new GregtechTextureSet("LAPIS"),
- SET_SHINY = new GregtechTextureSet("SHINY"),
- SET_SHARDS = new GregtechTextureSet("SHARDS"),
- SET_POWDER = new GregtechTextureSet("POWDER"),
- SET_QUARTZ = new GregtechTextureSet("QUARTZ"),
- SET_EMERALD = new GregtechTextureSet("EMERALD"),
- SET_DIAMOND = new GregtechTextureSet("DIAMOND"),
- SET_LIGNITE = new GregtechTextureSet("LIGNITE"),
- SET_MAGNETIC = new GregtechTextureSet("MAGNETIC"),
- SET_METALLIC = new GregtechTextureSet("METALLIC"),
- SET_NETHERSTAR = new GregtechTextureSet("NETHERSTAR"),
+ SET_DULL = new GregtechTextureSet("DULL"), SET_RUBY = new GregtechTextureSet("RUBY"),
+ SET_OPAL = new GregtechTextureSet("OPAL"), SET_LEAF = new GregtechTextureSet("LEAF"),
+ SET_WOOD = new GregtechTextureSet("WOOD"), SET_SAND = new GregtechTextureSet("SAND"),
+ SET_FINE = new GregtechTextureSet("FINE"), SET_FIERY = new GregtechTextureSet("FIERY"),
+ SET_FLUID = new GregtechTextureSet("FLUID"), SET_ROUGH = new GregtechTextureSet("ROUGH"),
+ SET_PAPER = new GregtechTextureSet("PAPER"), SET_GLASS = new GregtechTextureSet("GLASS"),
+ SET_FLINT = new GregtechTextureSet("FLINT"), SET_LAPIS = new GregtechTextureSet("LAPIS"),
+ SET_SHINY = new GregtechTextureSet("SHINY"), SET_SHARDS = new GregtechTextureSet("SHARDS"),
+ SET_POWDER = new GregtechTextureSet("POWDER"), SET_QUARTZ = new GregtechTextureSet("QUARTZ"),
+ SET_EMERALD = new GregtechTextureSet("EMERALD"), SET_DIAMOND = new GregtechTextureSet("DIAMOND"),
+ SET_LIGNITE = new GregtechTextureSet("LIGNITE"), SET_MAGNETIC = new GregtechTextureSet("MAGNETIC"),
+ SET_METALLIC = new GregtechTextureSet("METALLIC"), SET_NETHERSTAR = new GregtechTextureSet("NETHERSTAR"),
SET_GEM_VERTICAL = new GregtechTextureSet("GEM_VERTICAL"),
SET_GEM_HORIZONTAL = new GregtechTextureSet("GEM_HORIZONTAL");
@@ -38,8 +27,8 @@ public class GregtechTextureSet {
public GregtechTextureSet(final String aSetName) {
this.mSetName = aSetName;
this.mTextures[0] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/turbineBlade");
- this.mTextures[1] =
- new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/toolHeadSkookumChoocher");
+ this.mTextures[1] = new Textures.ItemIcons.CustomIcon(
+ "materialicons/" + this.mSetName + "/toolHeadSkookumChoocher");
this.mTextures[2] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
this.mTextures[3] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
this.mTextures[4] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
index b4251bd646..dee662ac20 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
@@ -1,15 +1,18 @@
package gtPlusPlus.xmod.gregtech.api.enums;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_IconContainer;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_Texture;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
public class GregtechTextures {
+
public enum BlockIcons implements Interface_IconContainer, Runnable {
+
VOID,
LARGECENTRIFUGE1,
@@ -30,31 +33,14 @@ public class GregtechTextures {
LARGECENTRIFUGE_ACTIVE7,
LARGECENTRIFUGE_ACTIVE8,
LARGECENTRIFUGE_ACTIVE9;
- public static final Interface_IconContainer[]
- CENTRIFUGE =
- new Interface_IconContainer[] {
- LARGECENTRIFUGE1,
- LARGECENTRIFUGE2,
- LARGECENTRIFUGE3,
- LARGECENTRIFUGE4,
- LARGECENTRIFUGE5,
- LARGECENTRIFUGE6,
- LARGECENTRIFUGE7,
- LARGECENTRIFUGE8,
- LARGECENTRIFUGE9
- },
- CENTRIFUGE_ACTIVE =
- new Interface_IconContainer[] {
- LARGECENTRIFUGE_ACTIVE1,
- LARGECENTRIFUGE_ACTIVE2,
- LARGECENTRIFUGE_ACTIVE3,
- LARGECENTRIFUGE_ACTIVE4,
- LARGECENTRIFUGE_ACTIVE5,
- LARGECENTRIFUGE_ACTIVE6,
- LARGECENTRIFUGE_ACTIVE7,
- LARGECENTRIFUGE_ACTIVE8,
- LARGECENTRIFUGE_ACTIVE9
- };
+
+ public static final Interface_IconContainer[] CENTRIFUGE = new Interface_IconContainer[] { LARGECENTRIFUGE1,
+ LARGECENTRIFUGE2, LARGECENTRIFUGE3, LARGECENTRIFUGE4, LARGECENTRIFUGE5, LARGECENTRIFUGE6,
+ LARGECENTRIFUGE7, LARGECENTRIFUGE8, LARGECENTRIFUGE9 },
+ CENTRIFUGE_ACTIVE = new Interface_IconContainer[] { LARGECENTRIFUGE_ACTIVE1, LARGECENTRIFUGE_ACTIVE2,
+ LARGECENTRIFUGE_ACTIVE3, LARGECENTRIFUGE_ACTIVE4, LARGECENTRIFUGE_ACTIVE5,
+ LARGECENTRIFUGE_ACTIVE6, LARGECENTRIFUGE_ACTIVE7, LARGECENTRIFUGE_ACTIVE8,
+ LARGECENTRIFUGE_ACTIVE9 };
public static Interface_Texture[] GT_CASING_BLOCKS = new Interface_Texture[64];
@@ -85,6 +71,7 @@ public class GregtechTextures {
}
public static class CustomIcon implements Interface_IconContainer, Runnable {
+
protected IIcon mIcon;
protected String mIconName;
@@ -116,6 +103,7 @@ public class GregtechTextures {
}
public enum ItemIcons implements Interface_IconContainer, Runnable {
+
VOID, // The Empty Texture
RENDERING_ERROR, // The Purple/Black Texture
SKOOKUMCHOOCHER, // The Skookum Tool Texture
@@ -124,29 +112,13 @@ public class GregtechTextures {
TURBINE_LARGE,
TURBINE_HUGE;
- /* public static final Interface_IconContainer[]
- DURABILITY_BAR = new Interface_IconContainer[]{
- DURABILITY_BAR_0,
- DURABILITY_BAR_1,
- DURABILITY_BAR_2,
- DURABILITY_BAR_3,
- DURABILITY_BAR_4,
- DURABILITY_BAR_5,
- DURABILITY_BAR_6,
- DURABILITY_BAR_7,
- DURABILITY_BAR_8,
- },
- ENERGY_BAR = new Interface_IconContainer[]{
- ENERGY_BAR_0,
- ENERGY_BAR_1,
- ENERGY_BAR_2,
- ENERGY_BAR_3,
- ENERGY_BAR_4,
- ENERGY_BAR_5,
- ENERGY_BAR_6,
- ENERGY_BAR_7,
- ENERGY_BAR_8,
- };*/
+ /*
+ * public static final Interface_IconContainer[] DURABILITY_BAR = new Interface_IconContainer[]{
+ * DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5,
+ * DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8, }, ENERGY_BAR = new Interface_IconContainer[]{
+ * ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6,
+ * ENERGY_BAR_7, ENERGY_BAR_8, };
+ */
// public static final Interface_Texture[] ERROR_RENDERING = new Interface_Texture[]{new
// GregtechRenderedTexture(RENDERING_ERROR)};
@@ -179,6 +151,7 @@ public class GregtechTextures {
}
public static class CustomIcon implements Interface_IconContainer, Runnable {
+
protected IIcon mIcon, mOverlay;
protected String mIconName;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java
index bd649fea76..26de142e22 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java
@@ -2,47 +2,47 @@ package gtPlusPlus.xmod.gregtech.api.gui;
import static gtPlusPlus.core.lib.CORE.MODID;
-import com.gtnewhorizons.modularui.api.drawable.AdaptableUITexture;
-import com.gtnewhorizons.modularui.api.drawable.UITexture;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+import com.gtnewhorizons.modularui.api.drawable.AdaptableUITexture;
+import com.gtnewhorizons.modularui.api.drawable.UITexture;
+
public class GTPP_UITextures {
public static final UITexture OVERLAY_SLOT_COAL = UITexture.fullImage(MODID, "gui/overlay_slot/coal");
- public static final UITexture OVERLAY_SLOT_CANISTER_DARK =
- UITexture.fullImage(MODID, "gui/overlay_slot/canister_dark");
+ public static final UITexture OVERLAY_SLOT_CANISTER_DARK = UITexture
+ .fullImage(MODID, "gui/overlay_slot/canister_dark");
- public static final AdaptableUITexture BACKGROUND_YELLOW =
- AdaptableUITexture.of(MODID, "gui/background/yellow", 176, 166, 4);
+ public static final AdaptableUITexture BACKGROUND_YELLOW = AdaptableUITexture
+ .of(MODID, "gui/background/yellow", 176, 166, 4);
- public static final AdaptableUITexture SLOT_ITEM_YELLOW =
- AdaptableUITexture.of(MODID, "gui/slot/item_yellow", 18, 18, 1);
+ public static final AdaptableUITexture SLOT_ITEM_YELLOW = AdaptableUITexture
+ .of(MODID, "gui/slot/item_yellow", 18, 18, 1);
public static final AdaptableUITexture[] SLOT_INVENTORY_MANAGER = new AdaptableUITexture[] {
- AdaptableUITexture.of(MODID, "gui/slot/red", 18, 18, 1),
- AdaptableUITexture.of(MODID, "gui/slot/green", 18, 18, 1),
- AdaptableUITexture.of(MODID, "gui/slot/blue", 18, 18, 1),
- AdaptableUITexture.of(MODID, "gui/slot/cyan", 18, 18, 1),
- AdaptableUITexture.of(MODID, "gui/slot/magenta", 18, 18, 1),
- AdaptableUITexture.of(MODID, "gui/slot/yellow", 18, 18, 1),
- };
+ AdaptableUITexture.of(MODID, "gui/slot/red", 18, 18, 1),
+ AdaptableUITexture.of(MODID, "gui/slot/green", 18, 18, 1),
+ AdaptableUITexture.of(MODID, "gui/slot/blue", 18, 18, 1),
+ AdaptableUITexture.of(MODID, "gui/slot/cyan", 18, 18, 1),
+ AdaptableUITexture.of(MODID, "gui/slot/magenta", 18, 18, 1),
+ AdaptableUITexture.of(MODID, "gui/slot/yellow", 18, 18, 1), };
public static final UITexture BUTTON_STANDARD_BRONZE = UITexture.fullImage(MODID, "gui/button/standard_bronze");
public static final UITexture BUTTON_STANDARD_16x16 = UITexture.fullImage(MODID, "gui/button/standard_16x16");
public static final UITexture OVERLAY_SLOT_WEED_EX = UITexture.fullImage(MODID, "gui/overlay_slot/weed_ex");
public static final UITexture OVERLAY_SLOT_FERTILIZER = UITexture.fullImage(MODID, "gui/overlay_slot/fertilizer");
- public static final UITexture OVERLAY_SLOT_ELECTRIC_TOOL =
- UITexture.fullImage(MODID, "gui/overlay_slot/electric_tool");
- public static final UITexture OVERLAY_SLOT_PAGE_PRINTED_BRONZE =
- UITexture.fullImage(MODID, "gui/overlay_slot/page_printed_bronze");
+ public static final UITexture OVERLAY_SLOT_ELECTRIC_TOOL = UITexture
+ .fullImage(MODID, "gui/overlay_slot/electric_tool");
+ public static final UITexture OVERLAY_SLOT_PAGE_PRINTED_BRONZE = UITexture
+ .fullImage(MODID, "gui/overlay_slot/page_printed_bronze");
public static final UITexture OVERLAY_SLOT_ARROW = UITexture.fullImage(MODID, "gui/overlay_slot/arrow");
- public static final UITexture OVERLAY_SLOT_ARROW_BRONZE =
- UITexture.fullImage(MODID, "gui/overlay_slot/arrow_bronze");
- public static final UITexture OVERLAY_SLOT_CRAFT_OUTPUT =
- UITexture.fullImage(MODID, "gui/overlay_slot/craft_output");
- public static final UITexture OVERLAY_SLOT_CRAFT_OUTPUT_BRONZE =
- UITexture.fullImage(MODID, "gui/overlay_slot/craft_output_bronze");
+ public static final UITexture OVERLAY_SLOT_ARROW_BRONZE = UITexture
+ .fullImage(MODID, "gui/overlay_slot/arrow_bronze");
+ public static final UITexture OVERLAY_SLOT_CRAFT_OUTPUT = UITexture
+ .fullImage(MODID, "gui/overlay_slot/craft_output");
+ public static final UITexture OVERLAY_SLOT_CRAFT_OUTPUT_BRONZE = UITexture
+ .fullImage(MODID, "gui/overlay_slot/craft_output_bronze");
public static final UITexture OVERLAY_SLOT_PARK = UITexture.fullImage(MODID, "gui/overlay_slot/park");
public static final UITexture OVERLAY_SLOT_PARK_BRONZE = UITexture.fullImage(MODID, "gui/overlay_slot/park_bronze");
public static final UITexture OVERLAY_SLOT_INGOT = UITexture.fullImage(MODID, "gui/overlay_slot/ingot");
@@ -50,90 +50,80 @@ public class GTPP_UITextures {
public static final UITexture OVERLAY_SLOT_TURBINE = UITexture.fullImage(MODID, "gui/overlay_slot/turbine");
public static final UITexture OVERLAY_SLOT_CHEST = UITexture.fullImage(MODID, "gui/overlay_slot/chest");
public static final UITexture[] OVERLAY_SLOT_INVENTORY_MANAGER_COLOR = new UITexture[] {
- UITexture.fullImage(MODID, "gui/overlay_slot/red"),
- UITexture.fullImage(MODID, "gui/overlay_slot/green"),
- UITexture.fullImage(MODID, "gui/overlay_slot/blue"),
- UITexture.fullImage(MODID, "gui/overlay_slot/cyan"),
- UITexture.fullImage(MODID, "gui/overlay_slot/magenta"),
- UITexture.fullImage(MODID, "gui/overlay_slot/yellow"),
- };
+ UITexture.fullImage(MODID, "gui/overlay_slot/red"), UITexture.fullImage(MODID, "gui/overlay_slot/green"),
+ UITexture.fullImage(MODID, "gui/overlay_slot/blue"), UITexture.fullImage(MODID, "gui/overlay_slot/cyan"),
+ UITexture.fullImage(MODID, "gui/overlay_slot/magenta"),
+ UITexture.fullImage(MODID, "gui/overlay_slot/yellow"), };
public static final UITexture[] OVERLAY_SLOT_INVENTORY_MANAGER_ARROW = new UITexture[] {
- UITexture.fullImage(MODID, "gui/overlay_slot/arrow_red"),
- UITexture.fullImage(MODID, "gui/overlay_slot/arrow_green"),
- UITexture.fullImage(MODID, "gui/overlay_slot/arrow_blue"),
- UITexture.fullImage(MODID, "gui/overlay_slot/arrow_cyan"),
- UITexture.fullImage(MODID, "gui/overlay_slot/arrow_magenta"),
- UITexture.fullImage(MODID, "gui/overlay_slot/arrow_yellow"),
- };
+ UITexture.fullImage(MODID, "gui/overlay_slot/arrow_red"),
+ UITexture.fullImage(MODID, "gui/overlay_slot/arrow_green"),
+ UITexture.fullImage(MODID, "gui/overlay_slot/arrow_blue"),
+ UITexture.fullImage(MODID, "gui/overlay_slot/arrow_cyan"),
+ UITexture.fullImage(MODID, "gui/overlay_slot/arrow_magenta"),
+ UITexture.fullImage(MODID, "gui/overlay_slot/arrow_yellow"), };
- public static final UITexture PROGRESSBAR_FLUID_REACTOR =
- UITexture.fullImage(MODID, "gui/progressbar/fluid_reactor");
+ public static final UITexture PROGRESSBAR_FLUID_REACTOR = UITexture
+ .fullImage(MODID, "gui/progressbar/fluid_reactor");
public static final UITexture PROGRESSBAR_BOILER_EMPTY = UITexture.fullImage(MODID, "gui/progressbar/boiler_empty");
public static final UITexture PROGRESSBAR_FUEL = UITexture.fullImage(MODID, "gui/progressbar/fuel");
public static final UITexture PROGRESSBAR_ARROW_2 = UITexture.fullImage(MODID, "gui/progressbar/arrow_2");
- public static final UITexture PROGRESSBAR_COMPUTER_ENERGY =
- UITexture.fullImage(MODID, "gui/progressbar/computer_energy");
+ public static final UITexture PROGRESSBAR_COMPUTER_ENERGY = UITexture
+ .fullImage(MODID, "gui/progressbar/computer_energy");
public static final UITexture PROGRESSBAR_PSS_ENERGY = UITexture.fullImage(MODID, "gui/progressbar/pss_energy");
- public static final AdaptableUITexture TAB_TITLE_YELLOW =
- AdaptableUITexture.of(MODID, "gui/tab/title_yellow", 28, 28, 4);
- public static final AdaptableUITexture TAB_TITLE_ANGULAR_YELLOW =
- AdaptableUITexture.of(MODID, "gui/tab/title_angular_yellow", 28, 28, 4);
- public static final AdaptableUITexture TAB_TITLE_DARK_YELLOW =
- AdaptableUITexture.of(MODID, "gui/tab/title_dark_yellow", 28, 28, 4);
+ public static final AdaptableUITexture TAB_TITLE_YELLOW = AdaptableUITexture
+ .of(MODID, "gui/tab/title_yellow", 28, 28, 4);
+ public static final AdaptableUITexture TAB_TITLE_ANGULAR_YELLOW = AdaptableUITexture
+ .of(MODID, "gui/tab/title_angular_yellow", 28, 28, 4);
+ public static final AdaptableUITexture TAB_TITLE_DARK_YELLOW = AdaptableUITexture
+ .of(MODID, "gui/tab/title_dark_yellow", 28, 28, 4);
- public static final UITexture OVERLAY_BUTTON_HARVESTER_MODE =
- UITexture.fullImage(MODID, "gui/overlay_button/harvester_mode");
+ public static final UITexture OVERLAY_BUTTON_HARVESTER_MODE = UITexture
+ .fullImage(MODID, "gui/overlay_button/harvester_mode");
public static final UITexture OVERLAY_BUTTON_FLUSH = UITexture.fullImage(MODID, "gui/overlay_button/flush");
- public static final UITexture OVERLAY_BUTTON_FLUSH_BRONZE =
- UITexture.fullImage(MODID, "gui/overlay_button/flush_bronze");
- public static final UITexture OVERLAY_BUTTON_AUTOMATION =
- UITexture.fullImage(MODID, "gui/overlay_button/automation");
+ public static final UITexture OVERLAY_BUTTON_FLUSH_BRONZE = UITexture
+ .fullImage(MODID, "gui/overlay_button/flush_bronze");
+ public static final UITexture OVERLAY_BUTTON_AUTOMATION = UITexture
+ .fullImage(MODID, "gui/overlay_button/automation");
public static final UITexture OVERLAY_BUTTON_LOCK = UITexture.fullImage(MODID, "gui/overlay_button/lock");
- public static final UITexture[] OVERLAY_BUTTON_THROUGHPUT = IntStream.range(
- 0, 4) // GT_MetaTileEntity_ElectricAutoWorkbench#MAX_THROUGHPUT
+ public static final UITexture[] OVERLAY_BUTTON_THROUGHPUT = IntStream.range(0, 4) // GT_MetaTileEntity_ElectricAutoWorkbench#MAX_THROUGHPUT
.mapToObj(i -> UITexture.fullImage(MODID, "gui/overlay_button/throughput_" + i))
- .collect(Collectors.toList())
- .toArray(new UITexture[0]);
- public static final UITexture[] OVERLAY_BUTTON_MODE = IntStream.range(
- 0, 10) // GT_MetaTileEntity_ElectricAutoWorkbench#MAX_MODES
- .mapToObj(i -> UITexture.fullImage(MODID, "gui/overlay_button/mode_" + i))
- .collect(Collectors.toList())
+ .collect(Collectors.toList()).toArray(new UITexture[0]);
+ public static final UITexture[] OVERLAY_BUTTON_MODE = IntStream.range(0, 10) // GT_MetaTileEntity_ElectricAutoWorkbench#MAX_MODES
+ .mapToObj(i -> UITexture.fullImage(MODID, "gui/overlay_button/mode_" + i)).collect(Collectors.toList())
.toArray(new UITexture[0]);
- public static final UITexture OVERLAY_BUTTON_COMPUTER_MODE =
- UITexture.fullImage(MODID, "gui/overlay_button/computer_mode");
+ public static final UITexture OVERLAY_BUTTON_COMPUTER_MODE = UITexture
+ .fullImage(MODID, "gui/overlay_button/computer_mode");
public static final UITexture OVERLAY_BUTTON_SAVE = UITexture.fullImage(MODID, "gui/overlay_button/save");
public static final UITexture OVERLAY_BUTTON_LOAD = UITexture.fullImage(MODID, "gui/overlay_button/load");
- public static final UITexture OVERLAY_BUTTON_NUCLEAR_SWITCH =
- UITexture.fullImage(MODID, "gui/overlay_button/nuclear_switch");
- public static final UITexture OVERLAY_BUTTON_ARROW_LEFT =
- UITexture.fullImage(MODID, "gui/overlay_button/arrow_left");
- public static final UITexture OVERLAY_BUTTON_ARROW_RIGHT =
- UITexture.fullImage(MODID, "gui/overlay_button/arrow_right");
+ public static final UITexture OVERLAY_BUTTON_NUCLEAR_SWITCH = UITexture
+ .fullImage(MODID, "gui/overlay_button/nuclear_switch");
+ public static final UITexture OVERLAY_BUTTON_ARROW_LEFT = UITexture
+ .fullImage(MODID, "gui/overlay_button/arrow_left");
+ public static final UITexture OVERLAY_BUTTON_ARROW_RIGHT = UITexture
+ .fullImage(MODID, "gui/overlay_button/arrow_right");
public static final UITexture[] OVERLAY_BUTTON_DIRECTION = new UITexture[] {
- UITexture.fullImage(MODID, "gui/overlay_button/bottom"),
- UITexture.fullImage(MODID, "gui/overlay_button/top"),
- UITexture.fullImage(MODID, "gui/overlay_button/north"),
- UITexture.fullImage(MODID, "gui/overlay_button/south"),
- UITexture.fullImage(MODID, "gui/overlay_button/west"),
- UITexture.fullImage(MODID, "gui/overlay_button/east"),
- };
+ UITexture.fullImage(MODID, "gui/overlay_button/bottom"),
+ UITexture.fullImage(MODID, "gui/overlay_button/top"),
+ UITexture.fullImage(MODID, "gui/overlay_button/north"),
+ UITexture.fullImage(MODID, "gui/overlay_button/south"),
+ UITexture.fullImage(MODID, "gui/overlay_button/west"),
+ UITexture.fullImage(MODID, "gui/overlay_button/east"), };
public static final UITexture[] OVERLAY_BUTTON_DIRECTION_GRAY = new UITexture[] {
- UITexture.fullImage(MODID, "gui/overlay_button/bottom_gray"),
- UITexture.fullImage(MODID, "gui/overlay_button/top_gray"),
- UITexture.fullImage(MODID, "gui/overlay_button/north_gray"),
- UITexture.fullImage(MODID, "gui/overlay_button/south_gray"),
- UITexture.fullImage(MODID, "gui/overlay_button/west_gray"),
- UITexture.fullImage(MODID, "gui/overlay_button/east_gray"),
- };
+ UITexture.fullImage(MODID, "gui/overlay_button/bottom_gray"),
+ UITexture.fullImage(MODID, "gui/overlay_button/top_gray"),
+ UITexture.fullImage(MODID, "gui/overlay_button/north_gray"),
+ UITexture.fullImage(MODID, "gui/overlay_button/south_gray"),
+ UITexture.fullImage(MODID, "gui/overlay_button/west_gray"),
+ UITexture.fullImage(MODID, "gui/overlay_button/east_gray"), };
public static final UITexture OVERLAY_BUTTON_TIP_GREEN = UITexture.fullImage(MODID, "gui/overlay_button/tip_green");
public static final UITexture OVERLAY_BUTTON_TIP_RED = UITexture.fullImage(MODID, "gui/overlay_button/tip_red");
- public static final UITexture OVERLAY_BUTTON_ACTIVE_STATE =
- UITexture.fullImage(MODID, "gui/overlay_button/active_state");
- public static final UITexture OVERLAY_BUTTON_CHANGE_MODE =
- UITexture.fullImage(MODID, "gui/overlay_button/change_mode");
- public static final UITexture OVERLAY_BUTTON_PLUS_MINUS =
- UITexture.fullImage(MODID, "gui/overlay_button/plus_minus");
+ public static final UITexture OVERLAY_BUTTON_ACTIVE_STATE = UITexture
+ .fullImage(MODID, "gui/overlay_button/active_state");
+ public static final UITexture OVERLAY_BUTTON_CHANGE_MODE = UITexture
+ .fullImage(MODID, "gui/overlay_button/change_mode");
+ public static final UITexture OVERLAY_BUTTON_PLUS_MINUS = UITexture
+ .fullImage(MODID, "gui/overlay_button/plus_minus");
public static final UITexture PICTURE_WORKBENCH_CIRCLE = UITexture.fullImage(MODID, "gui/picture/workbench_circle");
public static final UITexture PICTURE_ARROW_WHITE_DOWN = UITexture.fullImage(MODID, "gui/picture/arrow_white_down");
@@ -142,10 +132,10 @@ public class GTPP_UITextures {
public static final UITexture PICTURE_COMPUTER_GRID = UITexture.fullImage(MODID, "gui/picture/computer_grid");
public static final UITexture PICTURE_ARROWS_SEPARATE = UITexture.fullImage(MODID, "gui/picture/arrows_separate");
public static final UITexture PICTURE_ARROWS_FUSION = UITexture.fullImage(MODID, "gui/picture/arrows_fusion");
- public static final UITexture PICTURE_REDSTONE_CIRCUIT_SCREEN =
- UITexture.fullImage(MODID, "gui/picture/redstone_circuit_screen");
- public static final UITexture PICTURE_ELECTRICITY_ERROR =
- UITexture.fullImage(MODID, "gui/picture/electricity_error");
+ public static final UITexture PICTURE_REDSTONE_CIRCUIT_SCREEN = UITexture
+ .fullImage(MODID, "gui/picture/redstone_circuit_screen");
+ public static final UITexture PICTURE_ELECTRICITY_ERROR = UITexture
+ .fullImage(MODID, "gui/picture/electricity_error");
public static final UITexture PICTURE_ELECTRICITY_FINE = UITexture.fullImage(MODID, "gui/picture/electricity_fine");
public static final UITexture PICTURE_ENERGY_FRAME = UITexture.fullImage(MODID, "gui/picture/energy_frame");
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/DataStickSlotWidget.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/DataStickSlotWidget.java
index dbda217c27..7070fe5c8d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/DataStickSlotWidget.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/DataStickSlotWidget.java
@@ -4,6 +4,7 @@ import com.gtnewhorizons.modularui.api.ModularUITextures;
import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable;
import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.enums.ItemList;
import gregtech.api.gui.modularui.GT_UITextures;
import gregtech.api.util.GT_Utility;
@@ -12,6 +13,7 @@ public class DataStickSlotWidget extends SlotWidget {
public DataStickSlotWidget(IItemHandlerModifiable handler, int index) {
this(new BaseSlot(handler, index) {
+
@Override
public int getSlotStackLimit() {
return 1;
@@ -21,8 +23,9 @@ public class DataStickSlotWidget extends SlotWidget {
private DataStickSlotWidget(BaseSlot slot) {
super(slot);
- setFilter(stack -> GT_Utility.areStacksEqual(stack, ItemList.Tool_DataStick.get(1), true)
- || GT_Utility.areStacksEqual(stack, ItemList.Tool_DataOrb.get(1), true));
+ setFilter(
+ stack -> GT_Utility.areStacksEqual(stack, ItemList.Tool_DataStick.get(1), true)
+ || GT_Utility.areStacksEqual(stack, ItemList.Tool_DataOrb.get(1), true));
setBackground(ModularUITextures.ITEM_SLOT, GT_UITextures.OVERLAY_SLOT_DATA_ORB);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java
index b575c3c4bd..d555317717 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java
@@ -1,18 +1,21 @@
package gtPlusPlus.xmod.gregtech.api.gui.widget;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable;
import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.items.GT_MetaGenerated_Tool;
import ic2.api.info.Info;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
-import net.minecraft.item.ItemStack;
public class ElectricSlotWidget extends SlotWidget {
public ElectricSlotWidget(IItemHandlerModifiable handler, int index) {
this(new BaseSlot(handler, index, false) {
+
@Override
public int getSlotStackLimit() {
return 1;
@@ -22,9 +25,9 @@ public class ElectricSlotWidget extends SlotWidget {
private ElectricSlotWidget(BaseSlot slot) {
super(slot);
- setFilter(stack -> (accepts(stack))
- || (stack.getItem() instanceof GT_MetaGenerated_Tool)
- || (stack.getItem() instanceof IElectricItem));
+ setFilter(
+ stack -> (accepts(stack)) || (stack.getItem() instanceof GT_MetaGenerated_Tool)
+ || (stack.getItem() instanceof IElectricItem));
}
private boolean accepts(final ItemStack stack) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
index d49f1e9ed0..9431739c45 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
@@ -5,6 +5,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public interface GregtechItemContainer {
+
public Item getItem();
public Block getBlock();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java
index cf1f137e0d..00265fc893 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java
@@ -1,8 +1,9 @@
package gtPlusPlus.xmod.gregtech.api.interfaces;
-import ic2.api.energy.tile.IHeatSource;
import net.minecraftforge.common.util.ForgeDirection;
+import ic2.api.energy.tile.IHeatSource;
+
public interface IHeatEntity extends IHeatSource, IHeatSink {
public int getHeatBuffer();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java
index 60477c9f31..cb5d875071 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java
@@ -1,9 +1,11 @@
package gtPlusPlus.xmod.gregtech.api.interfaces;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import java.util.ArrayList;
+
import net.minecraft.tileentity.TileEntity;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+
public interface IMetaTileEntityHeatPipe extends IMetaTileEntity {
long transferHeat(byte var1, long var2, long var4, ArrayList<TileEntity> var6);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 8d1e9d597e..094e151fc8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -1,61 +1,45 @@
package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
-import gregtech.api.enums.Materials;
-import gtPlusPlus.core.material.Material;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.enums.Materials;
+import gtPlusPlus.core.material.Material;
+
public interface IGregtech_RecipeAdder {
+
/**
* Adds a Coke Oven Recipe
*
- * @param aInput1 = first Input (not null, and respects StackSize)
- * @param aInputb = second Input (can be null, and respects StackSize)
- * @param aFluidOutput = Output of the Creosote (not null, and respects StackSize)
- * @param aFluidInput = fluid Input (can be null, and respects StackSize)
- * @param aOutput = Output of the Coal/coke (can be null, and respects StackSize)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU needed for heating up (must be >= 0)
+ * @param aInput1 = first Input (not null, and respects StackSize)
+ * @param aInputb = second Input (can be null, and respects StackSize)
+ * @param aFluidOutput = Output of the Creosote (not null, and respects StackSize)
+ * @param aFluidInput = fluid Input (can be null, and respects StackSize)
+ * @param aOutput = Output of the Coal/coke (can be null, and respects StackSize)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
// public boolean addCokeOvenRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial,
// FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue);
- public boolean addCokeOvenRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- FluidStack aFluidInput,
- FluidStack aFluidOutput,
- ItemStack aOutput,
- int aDuration,
- int aEUt);
+ public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
+ FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt);
- public boolean addCokeOvenRecipe(
- int aCircuit,
- ItemStack aInput2,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int aDuration,
- int aEUt);
+ public boolean addCokeOvenRecipe(int aCircuit, ItemStack aInput2, FluidStack[] aFluidInputs,
+ FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt);
- public boolean addCokeOvenRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int aDuration,
- int aEUt);
+ public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack[] aFluidInputs,
+ FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt);
public boolean addFuel(ItemStack aInput1, ItemStack aOutput1, int aEU, int aType);
/**
* Adds a Matter Fabricator Recipe
*
- * @param aFluidOutput = Output of the UU-Matter (not null, and respects StackSize)
- * @param aFluidInput = fluid Input (can be UU_Amp or null, and respects StackSize)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU needed for heating up (must be >= 0)
+ * @param aFluidOutput = Output of the UU-Matter (not null, and respects StackSize)
+ * @param aFluidInput = fluid Input (can be UU_Amp or null, and respects StackSize)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
public boolean addMatterFabricatorRecipe(FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt);
@@ -63,62 +47,62 @@ public interface IGregtech_RecipeAdder {
/**
* Adds a Matter Fabricator Recipe
*
- * @param aItemInput = ItemStack Input, can be null I assume.
- * @param aFluidInput = fluid Input (can be UU_Amp or null, and respects StackSize)
- * @param aFluidOutput = Output of the UU-Matter (not null, and respects StackSize)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU needed for heating up (must be >= 0)
+ * @param aItemInput = ItemStack Input, can be null I assume.
+ * @param aFluidInput = fluid Input (can be UU_Amp or null, and respects StackSize)
+ * @param aFluidOutput = Output of the UU-Matter (not null, and respects StackSize)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- public boolean addMatterFabricatorRecipe(
- ItemStack aItemInput, FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt);
+ public boolean addMatterFabricatorRecipe(ItemStack aItemInput, FluidStack aFluidInput, FluidStack aFluidOutput,
+ int aDuration, int aEUt);
/**
* Adds a Recipe for the Dehydrator. (up to 9 Outputs)
*
- * @param aInput = Input itemstack (not null, and respects StackSize)
- * @param aFluidInput = fluid Input (can be UU_Amp or null, and respects StackSize)
- * @param aOutputItems = Itemstack[] (not null, and respects StackSize)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU needed for heating up (must be >= 0)
+ * @param aInput = Input itemstack (not null, and respects StackSize)
+ * @param aFluidInput = fluid Input (can be UU_Amp or null, and respects StackSize)
+ * @param aOutputItems = Itemstack[] (not null, and respects StackSize)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
// public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration,
// int aEUt);
- /*public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);*/
- /*public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt);
- public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[] aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt);*/
+ /*
+ * public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int
+ * aDuration, int aEUt);
+ */
+ /*
+ * public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration,
+ * int aEUt); public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[]
+ * aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt);
+ */
/**
* Adds a Recipe for the Dehydrator. (up to 9 Outputs)
*
- * @param aInput = ItemStack[] (not null, and respects StackSize)
- * @param aFluidInput = fluid Input (can be UU_Amp or null, and respects StackSize)
- * @param aFluidOutput = Output of the UU-Matter (not null, and respects StackSize)
- * @param aOutputItems = ItemStack[] (not null, and respects StackSize)
- * @param aChances = Output Change (can be == 0)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU needed for heating up (must be >= 0)
+ * @param aInput = ItemStack[] (not null, and respects StackSize)
+ * @param aFluidInput = fluid Input (can be UU_Amp or null, and respects StackSize)
+ * @param aFluidOutput = Output of the UU-Matter (not null, and respects StackSize)
+ * @param aOutputItems = ItemStack[] (not null, and respects StackSize)
+ * @param aChances = Output Change (can be == 0)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- public boolean addDehydratorRecipe(
- ItemStack[] aInput,
- FluidStack aFluidInput,
- FluidStack aFluidOutput,
- ItemStack[] aOutputItems,
- int[] aChances,
- int aDuration,
- int aEUt);
+ public boolean addDehydratorRecipe(ItemStack[] aInput, FluidStack aFluidInput, FluidStack aFluidOutput,
+ ItemStack[] aOutputItems, int[] aChances, int aDuration, int aEUt);
/**
* Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
*
- * @param aInput = ItemStack[] (not null, and respects StackSize)
- * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
- * @param aChances = Output Chance (can be == 0)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU per tick needed for heating up (must be >= 0)
+ * @param aInput = ItemStack[] (not null, and respects StackSize)
+ * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
+ * @param aChances = Output Chance (can be == 0)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aOutput, int aChance, int aDuration, int aEUt);
@@ -126,183 +110,126 @@ public interface IGregtech_RecipeAdder {
/**
* Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
*
- * @param aInput = ItemStack[] (not null, and respects StackSize)
- * @param aFluidInput = Input of a fluid (can be null, and respects StackSize)
- * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
- * @param aChances = Output Chance (can be == 0)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU per tick needed for heating up (must be >= 0)
+ * @param aInput = ItemStack[] (not null, and respects StackSize)
+ * @param aFluidInput = Input of a fluid (can be null, and respects StackSize)
+ * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
+ * @param aChances = Output Chance (can be == 0)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance, int aDuration, int aEUt);
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
+ int aDuration, int aEUt);
/**
* Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs, More than 1 Fluids)
*
- * @param aInput = ItemStack[] (not null, and respects StackSize)
- * @param aFluidInput = FluidStack[] (can be null, and respects StackSize)
- * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
- * @param aChances = Output Chance (can be == 0)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU per tick needed for heating up (must be >= 0)
+ * @param aInput = ItemStack[] (not null, and respects StackSize)
+ * @param aFluidInput = FluidStack[] (can be null, and respects StackSize)
+ * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
+ * @param aChances = Output Chance (can be == 0)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance, int aDuration, int aEUt);
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
+ int aDuration, int aEUt);
/**
* Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
*
- * @param aInput = ItemStack[] (not null, and respects StackSize)
- * @param aFluidInput = Input of a fluid (can be null, and respects StackSize)
- * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
- * @param aOutputStack = Item Output (Can be null)
- * @param aChances = Output Chance (can be == 0)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU per tick needed for heating up (must be >= 0)
+ * @param aInput = ItemStack[] (not null, and respects StackSize)
+ * @param aFluidInput = Input of a fluid (can be null, and respects StackSize)
+ * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
+ * @param aOutputStack = Item Output (Can be null)
+ * @param aChances = Output Chance (can be == 0)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- int[] aChance,
- int aDuration,
- int aEUt);
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt);
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack aInputFluid,
- FluidStack aOutput,
- int aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue);
-
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- int[] aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue,
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
+ int aDuration, int aEUt, int aSpecialValue);
+
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue,
boolean aOptimizeRecipe);
/**
* Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs, More than 1 fluids)
*
- * @param aInput = ItemStack[] (not null, and respects StackSize)
- * @param aFluidInput = FluidStack[] (can be null, and respects StackSize)
- * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
- * @param aOutputStack = Item Output (Can be null)
- * @param aChances = Output Chance (can be == 0)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU per tick needed for heating up (must be >= 0)
+ * @param aInput = ItemStack[] (not null, and respects StackSize)
+ * @param aFluidInput = FluidStack[] (can be null, and respects StackSize)
+ * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize)
+ * @param aOutputStack = Item Output (Can be null)
+ * @param aChances = Output Chance (can be == 0)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack[] aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- int[] aChance,
- int aDuration,
- int aEUt);
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt);
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack[] aInputFluid,
- FluidStack aOutput,
- int aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue);
-
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack[] aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- int[] aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue,
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
+ int aDuration, int aEUt, int aSpecialValue);
+
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue,
boolean aOptimizeRecipe);
/**
* Adds a Recipe for the LFTRr. (up to 9 Inputs)
*
- * @param aInput = ItemStack[] (not null, and respects StackSize)
+ * @param aInput = ItemStack[] (not null, and respects StackSize)
* @param aFluidInput = Input of a fluid (can be null, and respects StackSize)
- * @param aFluidOutput = Output of the Molten Salts (not null, and respects StackSize)
+ * @param aFluidOutput = Output of the Molten Salts (not null, and respects StackSize)
* @param aOutputStack = Item Output (Can be null)
- * @param aChances = Output Chance (can be == 0)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU per tick needed for heating up (must be >= 0)
- * @param aSpecialValue = Power produced in EU/t per dynamo
+ * @param aChances = Output Chance (can be == 0)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU per tick needed for heating up (must be >= 0)
+ * @param aSpecialValue = Power produced in EU/t per dynamo
* @return true if the Recipe got added, otherwise false.
*/
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- int[] aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue);
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue);
/**
* Adds a Recipe for the Quantum Force Smelter (up to 9 Inputs)
*
*
**/
- public boolean addQuantumTransformerRecipe(
- ItemStack[] aInput,
- FluidStack[] aFluidInput,
- FluidStack[] aFluidOutput,
- ItemStack[] aOutputStack,
- int[] aChances,
- int aDuration,
- int aEUt,
- int aSpecialValue);
-
- /** Adds a Recipe for the LFTRr. (up to 9 Inputs, More than 1 fluids)
+ public boolean addQuantumTransformerRecipe(ItemStack[] aInput, FluidStack[] aFluidInput, FluidStack[] aFluidOutput,
+ ItemStack[] aOutputStack, int[] aChances, int aDuration, int aEUt, int aSpecialValue);
+
+ /**
+ * Adds a Recipe for the LFTRr. (up to 9 Inputs, More than 1 fluids)
*
- * @param aInput = ItemStack[] (not null, and respects StackSize)
+ * @param aInput = ItemStack[] (not null, and respects StackSize)
* @param aFluidInput = FluidStack[] (can be null, and respects StackSize)
- * @param aFluidOutput = Output of the Molten Salts (not null, and respects StackSize)
+ * @param aFluidOutput = Output of the Molten Salts (not null, and respects StackSize)
* @param aOutputStack = Item Output (Can be null)
- * @param aChances = Output Chance (can be == 0)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU per tick needed for heating up (must be >= 0)
- * @param aSpecialValue = Power produced in EU/t per dynamo
+ * @param aChances = Output Chance (can be == 0)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU per tick needed for heating up (must be >= 0)
+ * @param aSpecialValue = Power produced in EU/t per dynamo
* @return true if the Recipe got added, otherwise false.
*/
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack[] aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- int[] aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue);
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue);
public boolean addLFTRRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt);
- public boolean addLFTRRecipe(
- ItemStack aInput1, FluidStack aInput2, ItemStack aOutput1, FluidStack aOutput2, int aDuration, int aEUt);
+ public boolean addLFTRRecipe(ItemStack aInput1, FluidStack aInput2, ItemStack aOutput1, FluidStack aOutput2,
+ int aDuration, int aEUt);
public boolean addLFTRRecipe(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aDuration, int aEUt);
/**
* Adds a custom Semifluid fuel for the GT++ SemiFluid Generators.
- * @param aFuelItem - A Fluidstack to be consumed.
+ *
+ * @param aFuelItem - A Fluidstack to be consumed.
* @param aFuelValue - Fuel value in thousands (1 = 1000)
* @return - Was the Fuel added?
*/
@@ -310,135 +237,62 @@ public interface IGregtech_RecipeAdder {
/**
* Adds a custom Semifluid fuel for the GT++ SemiFluid Generators.
- * @param aFuelItem - A Fluidstack to be consumed.
+ *
+ * @param aFuelItem - A Fluidstack to be consumed.
* @param aFuelValue - Fuel value in thousands (1 = 1000)
* @return - Was the Fuel added?
*/
public boolean addSemifluidFuel(ItemStack aFuelItem, int aFuelValue);
- public boolean addFissionFuel(
- FluidStack aInput1,
- FluidStack aInput2,
- FluidStack aInput3,
- FluidStack aInput4,
- FluidStack aInput5,
- FluidStack aInput6,
- FluidStack aInput7,
- FluidStack aInput8,
- FluidStack aInput9,
- FluidStack aOutput1,
- FluidStack aOutput2,
- int aDuration,
- int aEUt);
+ public boolean addFissionFuel(FluidStack aInput1, FluidStack aInput2, FluidStack aInput3, FluidStack aInput4,
+ FluidStack aInput5, FluidStack aInput6, FluidStack aInput7, FluidStack aInput8, FluidStack aInput9,
+ FluidStack aOutput1, FluidStack aOutput2, int aDuration, int aEUt);
- public boolean addFissionFuel(
- boolean aOptimise,
- FluidStack aInput1,
- FluidStack aInput2,
- FluidStack aInput3,
- FluidStack aInput4,
- FluidStack aInput5,
- FluidStack aInput6,
- FluidStack aInput7,
- FluidStack aInput8,
- FluidStack aInput9,
- FluidStack aOutput1,
- FluidStack aOutput2,
- int aDuration,
- int aEUt);
+ public boolean addFissionFuel(boolean aOptimise, FluidStack aInput1, FluidStack aInput2, FluidStack aInput3,
+ FluidStack aInput4, FluidStack aInput5, FluidStack aInput6, FluidStack aInput7, FluidStack aInput8,
+ FluidStack aInput9, FluidStack aOutput1, FluidStack aOutput2, int aDuration, int aEUt);
- public boolean addCyclotronRecipe(
- ItemStack aInput,
- FluidStack aFluidInput,
- ItemStack[] aOutputs,
- FluidStack aFluidOutput,
- int[] aChances,
- int aDuration,
- int aEUt,
- int aSpecialValue);
-
- boolean addCyclotronRecipe(
- ItemStack[] aInputs,
- FluidStack aFluidInput,
- ItemStack[] aOutput,
- FluidStack aFluidOutput,
- int[] aChances,
- int aDuration,
- int aEUt,
- int aSpecialValue);
-
- public boolean addMixerRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- ItemStack aInput3,
- ItemStack aInput4,
- FluidStack aFluidInput,
- FluidStack aFluidOutput,
- ItemStack aOutput1,
- ItemStack aOutput2,
- ItemStack aOutput3,
- ItemStack aOutput4,
- int aDuration,
- int aEUt);
+ public boolean addCyclotronRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs,
+ FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue);
+
+ boolean addCyclotronRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack[] aOutput,
+ FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue);
+
+ public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4,
+ FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3,
+ ItemStack aOutput4, int aDuration, int aEUt);
/**
* Adds a Recipe for the Machine Component Assembler. (up to 6 Inputs)
*
- * @param aInputs = ItemStack[] (not null, and respects StackSize)
- * @param aFluidInput = Input of a fluid (can be null, and respects StackSize)
- * @param aOutput1 = Output ItemStack (not null, and respects StackSize)
- * @param aDuration = Duration (must be >= 0)
- * @param aEUt = EU per tick needed for heating up (must be >= 0)
+ * @param aInputs = ItemStack[] (not null, and respects StackSize)
+ * @param aFluidInput = Input of a fluid (can be null, and respects StackSize)
+ * @param aOutput1 = Output ItemStack (not null, and respects StackSize)
+ * @param aDuration = Duration (must be >= 0)
+ * @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- public boolean addComponentMakerRecipe(
- ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt);
-
- public boolean addMultiblockCentrifugeRecipe(
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int[] aChances,
- int aDuration,
- int aEUtick,
- int aSpecial);
-
- public boolean addMultiblockElectrolyzerRecipe(
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int[] aChances,
- int aDuration,
- int aEUtick,
- int aSpecial);
-
- public boolean addAdvancedFreezerRecipe(
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int[] aChances,
- int aDuration,
- int aEUtick,
- int aSpecial);
-
- public boolean addAssemblerRecipeWithOreDict(
- Object aInput1, int aAmount1, Object aInput2, int aAmount2, ItemStack aOutput, int a1, int a2);
-
- public boolean addAssemblerRecipeWithOreDict(
- Object aInput1,
- int aAmount1,
- Object aInput2,
- int aAmount2,
- FluidStack aInputFluid,
- ItemStack aOutput,
- int a1,
- int a2);
-
- public boolean addSixSlotAssemblingRecipe(
- ItemStack[] aInputs, FluidStack aInputFluid, ItemStack aOutput1, int aDuration, int aEUt);
+ public boolean addComponentMakerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1,
+ int aDuration, int aEUt);
+
+ public boolean addMultiblockCentrifugeRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs,
+ FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
+
+ public boolean addMultiblockElectrolyzerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs,
+ FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
+
+ public boolean addAdvancedFreezerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
+ ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
+
+ public boolean addAssemblerRecipeWithOreDict(Object aInput1, int aAmount1, Object aInput2, int aAmount2,
+ ItemStack aOutput, int a1, int a2);
+
+ public boolean addAssemblerRecipeWithOreDict(Object aInput1, int aAmount1, Object aInput2, int aAmount2,
+ FluidStack aInputFluid, ItemStack aOutput, int a1, int a2);
+
+ public boolean addSixSlotAssemblingRecipe(ItemStack[] aInputs, FluidStack aInputFluid, ItemStack aOutput1,
+ int aDuration, int aEUt);
+
/**
* Adds an Assemblyline Recipe
*
@@ -448,291 +302,157 @@ public interface IGregtech_RecipeAdder {
* @param aDuration must be > 0
* @param aEUt should be > 0
*/
- public boolean addAssemblylineRecipe(
- ItemStack aResearchItem,
- int aResearchTime,
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- ItemStack aOutput,
- int aDuration,
- int aEUt);
+ public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
+ FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt);
/**
* Adds a Assemblyline Recipe
*
- * @param aInputs elements should be: ItemStack for single item;
- * ItemStack[] for multiple equivalent items;
+ * @param aInputs elements should be: ItemStack for single item; ItemStack[] for multiple equivalent items;
* {OreDict, amount} for oredict.
*/
- boolean addAssemblylineRecipe(
- ItemStack aResearchItem,
- int aResearchTime,
- Object[] aInputs,
- FluidStack[] aFluidInputs,
- ItemStack aOutput1,
- int aDuration,
- int aEUt);
+ boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, Object[] aInputs,
+ FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt);
+
+ public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
+ ItemStack output, int time, int eu);
+
+ public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
+ ItemStack output, Object object, int time, int eu);
+
+ public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
+ ItemStack output, ItemStack object, int time);
- public boolean addChemicalRecipe(
- ItemStack input1,
- ItemStack input2,
- FluidStack inputFluid,
- FluidStack outputFluid,
- ItemStack output,
- int time,
- int eu);
-
- public boolean addChemicalRecipe(
- ItemStack input1,
- ItemStack input2,
- FluidStack inputFluid,
- FluidStack outputFluid,
- ItemStack output,
- Object object,
- int time,
- int eu);
-
- public boolean addChemicalRecipe(
- ItemStack input1,
- ItemStack input2,
- FluidStack inputFluid,
- FluidStack outputFluid,
- ItemStack output,
- ItemStack object,
- int time);
-
- public boolean addChemicalRecipe(
- ItemStack input1,
- ItemStack input2,
- int aCircuit,
- FluidStack inputFluid,
- FluidStack outputFluid,
- ItemStack output,
- ItemStack output2,
- int time,
- int eu);
-
- public boolean addMultiblockChemicalRecipe(
- ItemStack[] itemStacks,
- FluidStack[] fluidStacks,
- FluidStack[] fluidStacks2,
- ItemStack[] outputs,
- int time,
- int eu);
+ public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, int aCircuit, FluidStack inputFluid,
+ FluidStack outputFluid, ItemStack output, ItemStack output2, int time, int eu);
+
+ public boolean addMultiblockChemicalRecipe(ItemStack[] itemStacks, FluidStack[] fluidStacks,
+ FluidStack[] fluidStacks2, ItemStack[] outputs, int time, int eu);
public boolean addCompressorRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt);
- public boolean addBrewingRecipe(
- ItemStack aIngredient, FluidStack aInput, FluidStack aOutput, int aTime, int aEu, boolean aHidden);
+ public boolean addBrewingRecipe(ItemStack aIngredient, FluidStack aInput, FluidStack aOutput, int aTime, int aEu,
+ boolean aHidden);
- public boolean addBrewingRecipe(
- int aCircuit, FluidStack aInput, FluidStack aOutput, int aTime, int aEu, boolean aHidden);
+ public boolean addBrewingRecipe(int aCircuit, FluidStack aInput, FluidStack aOutput, int aTime, int aEu,
+ boolean aHidden);
public boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aDust, ItemStack aOutput);
public boolean addFluidExtractionRecipe(ItemStack input, FluidStack output, int aTime, int aEu);
- public boolean addFluidExtractionRecipe(
- ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidOut, int aTime, int aEu);
+ public boolean addFluidExtractionRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidOut,
+ int aTime, int aEu);
public boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn);
- public boolean addFluidCannerRecipe(
- ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn, FluidStack rFluidOut);
+ public boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn,
+ FluidStack rFluidOut);
- public boolean addFluidCannerRecipe(
- ItemStack aContainer,
- ItemStack aFullContainer,
- FluidStack rFluidIn,
- FluidStack rFluidOut,
- int aTime,
- int aEu);
+ public boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn,
+ FluidStack rFluidOut, int aTime, int aEu);
/**
* Adds a Fusion reactor Recipe
*
- * @param aInput1 = first Input (not null, and respects StackSize)
- * @param aInput2 = second Input (not null, and respects StackSize)
- * @param plasma = Output of the Fusion (can be null, and respects StackSize)
- * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
- * @param aEu = The EU generated per Tick (can even be negative!)
- * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
+ * @param aInput1 = first Input (not null, and respects StackSize)
+ * @param aInput2 = second Input (not null, and respects StackSize)
+ * @param plasma = Output of the Fusion (can be null, and respects StackSize)
+ * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
+ * @param aEu = The EU generated per Tick (can even be negative!)
+ * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
*/
- public boolean addFusionReactorRecipe(
- ItemStack aInputStackA,
- ItemStack aInputStackB,
- FluidStack plasma,
- int aFusionDurationInTicks,
- int aEu,
- int aSpecial);
+ public boolean addFusionReactorRecipe(ItemStack aInputStackA, ItemStack aInputStackB, FluidStack plasma,
+ int aFusionDurationInTicks, int aEu, int aSpecial);
+
/**
* Adds a Fusion reactor Recipe
*
- * @param aInput1 = first Input (not null, and respects StackSize)
- * @param aInput2 = second Input (not null, and respects StackSize)
- * @param plasma = Output of the Fusion (can be null, and respects StackSize)
- * @param aOutputChance = chance to output plasma (can be 0)
- * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
- * @param aEu = The EU generated per Tick (can even be negative!)
- * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
+ * @param aInput1 = first Input (not null, and respects StackSize)
+ * @param aInput2 = second Input (not null, and respects StackSize)
+ * @param plasma = Output of the Fusion (can be null, and respects StackSize)
+ * @param aOutputChance = chance to output plasma (can be 0)
+ * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
+ * @param aEu = The EU generated per Tick (can even be negative!)
+ * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
*/
- public boolean addFusionReactorRecipe(
- FluidStack aInputStackA,
- FluidStack aInputStackB,
- FluidStack plasma,
- int aOutputChance,
- int aFusionDurationInTicks,
- int aEu,
- int aSpecial);
+ public boolean addFusionReactorRecipe(FluidStack aInputStackA, FluidStack aInputStackB, FluidStack plasma,
+ int aOutputChance, int aFusionDurationInTicks, int aEu, int aSpecial);
+
/**
* Adds a Fusion reactor Recipe
*
- * @param aInput1 = first Input (not null, and respects StackSize)
- * @param aInput2 = second Input (not null, and respects StackSize)
- * @param plasma = Output of the Fusion (can be null, and respects StackSize)
- * @param aOutputChance = chance to output plasma (can be 0)
- * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
- * @param aEu = The EU generated per Tick (can even be negative!)
- * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
+ * @param aInput1 = first Input (not null, and respects StackSize)
+ * @param aInput2 = second Input (not null, and respects StackSize)
+ * @param plasma = Output of the Fusion (can be null, and respects StackSize)
+ * @param aOutputChance = chance to output plasma (can be 0)
+ * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
+ * @param aEu = The EU generated per Tick (can even be negative!)
+ * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
*/
- public boolean addFusionReactorRecipe(
- ItemStack aInputStackA,
- ItemStack aInputStackB,
- FluidStack plasma,
- int aOutputChance,
- int aFusionDurationInTicks,
- int aEu,
- int aSpecial);
-
- public boolean addVacuumFurnaceRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- FluidStack aFluidInput,
- FluidStack aFluidOutput,
- ItemStack aOutput1,
- ItemStack aOutput2,
- int aDuration,
- int aEUt,
- int aLevel);
-
- public boolean addVacuumFurnaceRecipe(
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- ItemStack[] aOutputs,
- FluidStack[] aFluidOutputs,
- int aDuration,
- int aEUt,
- int aLevel);
+ public boolean addFusionReactorRecipe(ItemStack aInputStackA, ItemStack aInputStackB, FluidStack plasma,
+ int aOutputChance, int aFusionDurationInTicks, int aEu, int aSpecial);
+
+ public boolean addVacuumFurnaceRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
+ FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, int aLevel);
+
+ public boolean addVacuumFurnaceRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack[] aOutputs,
+ FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aLevel);
public boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu);
public boolean addIrLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu);
- public boolean addChemicalPlantRecipe(
- ItemStack[] aInputs,
- FluidStack[] aInputFluids,
- ItemStack[] aOutputs,
- FluidStack[] aFluidOutputs,
- int time,
- long eu,
- int aTier);
-
- public boolean addChemicalPlantRecipe(
- ItemStack[] aInputs,
- FluidStack[] aInputFluids,
- ItemStack[] aOutputs,
- FluidStack[] aFluidOutputs,
- int[] aChances,
- int time,
- long eu,
- int aTier);
-
- public boolean addBlastRecipe(
- ItemStack[] aInputs,
- FluidStack[] aInputFluids,
- ItemStack[] aOutputs,
- FluidStack[] aFluidOutputs,
- int time,
- long eu,
- int aHeat);
-
- public boolean addPyrolyseRecipe(
- ItemStack aInput,
- FluidStack aFluidInput,
- int intCircuit,
- ItemStack aOutput,
- FluidStack aFluidOutput,
- int aDuration,
- int aEUt);
+ public boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
+ FluidStack[] aFluidOutputs, int time, long eu, int aTier);
+
+ public boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
+ FluidStack[] aFluidOutputs, int[] aChances, int time, long eu, int aTier);
+
+ public boolean addBlastRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
+ FluidStack[] aFluidOutputs, int time, long eu, int aHeat);
+
+ public boolean addPyrolyseRecipe(ItemStack aInput, FluidStack aFluidInput, int intCircuit, ItemStack aOutput,
+ FluidStack aFluidOutput, int aDuration, int aEUt);
public boolean addExtractorRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEUt);
public boolean addExtractorRecipe(ItemStack aInput, ItemStack aOutput, int aChance, int aDuration, int aEUt);
- public boolean addDistilleryRecipe(
- ItemStack aCircuit,
- FluidStack aInput,
- FluidStack aOutput,
- ItemStack aSolidOutput,
- int aDuration,
- int aEUt,
- boolean aHidden);
+ public boolean addDistilleryRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput,
+ ItemStack aSolidOutput, int aDuration, int aEUt, boolean aHidden);
- public boolean addPulverisationRecipe(
- final ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, final ItemStack aOutput3);
+ public boolean addPulverisationRecipe(final ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2,
+ final ItemStack aOutput3);
public boolean addMillingRecipe(Materials aMat, int aEU);
public boolean addMillingRecipe(Material aMat, int aEU);
- public boolean addFlotationRecipe(
- Materials aMat,
- ItemStack aXanthate,
- FluidStack[] aInputFluids,
- FluidStack[] aOutputFluids,
- int aTime,
- int aEU);
-
- public boolean addFlotationRecipe(
- Material aMat,
- ItemStack aXanthate,
- FluidStack[] aInputFluids,
- FluidStack[] aOutputFluids,
- int aTime,
- int aEU);
-
- public boolean addpackagerRecipe(
- ItemStack aRecipeType, ItemStack aInput1, ItemStack aInput2, ItemStack aOutputStack1);
+ public boolean addFlotationRecipe(Materials aMat, ItemStack aXanthate, FluidStack[] aInputFluids,
+ FluidStack[] aOutputFluids, int aTime, int aEU);
+
+ public boolean addFlotationRecipe(Material aMat, ItemStack aXanthate, FluidStack[] aInputFluids,
+ FluidStack[] aOutputFluids, int aTime, int aEU);
+
+ public boolean addpackagerRecipe(ItemStack aRecipeType, ItemStack aInput1, ItemStack aInput2,
+ ItemStack aOutputStack1);
public boolean addFuelForRTG(ItemStack aFuelPellet, int aFuelDays, int aVoltage);
- public boolean addColdTrapRecipe(
- int aCircuit,
- ItemStack aInput,
- FluidStack aFluidInput,
- ItemStack[] aOutputs,
- int[] aChances,
- FluidStack aFluidOutput,
- int aTime,
- int aEU);
-
- public boolean addReactorProcessingUnitRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- FluidStack aFluidInput,
- ItemStack[] aOutputs,
- int[] aChances,
- FluidStack aFluidOutput,
- int aTime,
- int aEU);
-
- public boolean addFluidHeaterRecipe(
- ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt);
+ public boolean addColdTrapRecipe(int aCircuit, ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs,
+ int[] aChances, FluidStack aFluidOutput, int aTime, int aEU);
+
+ public boolean addReactorProcessingUnitRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
+ ItemStack[] aOutputs, int[] aChances, FluidStack aFluidOutput, int aTime, int aEU);
+
+ public boolean addFluidHeaterRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration,
+ int aEUt);
public boolean addVacuumFreezerRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEU);
public boolean addMolecularTransformerRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEU);
- public boolean addMolecularTransformerRecipe(
- ItemStack aInput, ItemStack aOutput, int aDuration, int aEU, int aAmps);
+ public boolean addMolecularTransformerRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEU,
+ int aAmps);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
index b597c221f5..2f4eaf4293 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
@@ -4,6 +4,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
public interface Interface_IconContainer {
+
/**
* @return A regular Icon.
*/
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
index 85ebb53217..6896d6ffb1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
@@ -1,8 +1,7 @@
package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
-import gregtech.api.enums.SubTag;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
import java.util.List;
+
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -12,34 +11,18 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gregtech.api.enums.SubTag;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
+
public interface Interface_ItemBehaviour<E extends Item> {
+
public boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity);
- public boolean onItemUse(
- E aItem,
- ItemStack aStack,
- EntityPlayer aPlayer,
- World aWorld,
- int aX,
- int aY,
- int aZ,
- int aSide,
- float hitX,
- float hitY,
- float hitZ);
-
- public boolean onItemUseFirst(
- E aItem,
- ItemStack aStack,
- EntityPlayer aPlayer,
- World aWorld,
- int aX,
- int aY,
- int aZ,
- int aSide,
- float hitX,
- float hitY,
- float hitZ);
+ public boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
+ int aSide, float hitX, float hitY, float hitZ);
+
+ public boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
+ int aSide, float hitX, float hitY, float hitZ);
public ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer);
@@ -55,9 +38,9 @@ public interface Interface_ItemBehaviour<E extends Item> {
public boolean hasProjectile(Gregtech_MetaItem_Base aItem, SubTag aProjectileType, ItemStack aStack);
- public EntityArrow getProjectile(
- E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ);
+ public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX,
+ double aY, double aZ);
- public EntityArrow getProjectile(
- E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed);
+ public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
+ EntityLivingBase aEntity, float aSpeed);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
index ec6bcae20c..1a8fdc175c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
@@ -1,29 +1,24 @@
package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.Materials;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import net.minecraft.item.ItemStack;
public interface Interface_OreRecipeRegistrator {
+
/**
- * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did before.
+ * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did
+ * before.
*
* @param aPrefix always != null
* @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based!
* @param aStack always != null
*/
- public void registerOre(
- GregtechOrePrefixes aPrefix,
- GT_Materials aMaterial,
- String aOreDictName,
- String aModName,
+ public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName,
ItemStack aStack);
- public void registerOre(
- GregtechOrePrefixes aPrefix,
- Materials aMaterial,
- String aOreDictName,
- String aModName,
+ public void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
ItemStack copyAmount);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
index 616fdfdebf..230dc6ab8d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
@@ -1,17 +1,20 @@
package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.OrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import net.minecraft.item.ItemStack;
public interface Interface_OreRecipeRegistrator_GT {
+
/**
- * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did before.
+ * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did
+ * before.
*
* @param aPrefix always != null
* @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based!
* @param aStack always != null
*/
- public void registerOre(
- OrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack);
+ public void registerOre(OrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName,
+ ItemStack aStack);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
index 5780109a7b..53d3055213 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
@@ -4,6 +4,7 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
public interface Interface_Texture {
+
public void renderXPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
public void renderXNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
index 6578ddeb0b..b8bb160cf7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
@@ -1,10 +1,7 @@
package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.entity.Entity;
@@ -14,12 +11,18 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraftforge.event.world.BlockEvent;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.interfaces.IToolStats;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
+
/**
* The Stats for GT Tools. Not including any Material Modifiers.
* <p/>
* And this is supposed to not have any ItemStack Parameters as these are generic Stats.
*/
public interface Interface_ToolStats extends IToolStats {
+
/**
* Called when aPlayer crafts this Tool
*/
@@ -44,7 +47,8 @@ public interface Interface_ToolStats extends IToolStats {
public int getToolDamagePerDropConversion();
/**
- * @return Damage the Tool receives when being used as Container Item. 100 is one use, however it is usually 8 times more than normal.
+ * @return Damage the Tool receives when being used as Container Item. 100 is one use, however it is usually 8 times
+ * more than normal.
*/
@Override
public int getToolDamagePerContainerCraft();
@@ -56,7 +60,8 @@ public interface Interface_ToolStats extends IToolStats {
public int getToolDamagePerEntityAttack();
/**
- * @return Basic Quality of the Tool, 0 is normal. If increased, it will increase the general quality of all Tools of this Type. Decreasing is also possible.
+ * @return Basic Quality of the Tool, 0 is normal. If increased, it will increase the general quality of all Tools
+ * of this Type. Decreasing is also possible.
*/
@Override
public int getBaseQuality();
@@ -130,7 +135,8 @@ public interface Interface_ToolStats extends IToolStats {
public boolean isWeapon();
/**
- * @return If this Tool is a Ranged Weapon. Return false at isWeapon unless you have a Blade attached to your Bow/Gun or something
+ * @return If this Tool is a Ranged Weapon. Return false at isWeapon unless you have a Blade attached to your
+ * Bow/Gun or something
*/
@Override
public boolean isRangedWeapon();
@@ -142,10 +148,12 @@ public interface Interface_ToolStats extends IToolStats {
public boolean isMiningTool();
/**
- * aBlock.getHarvestTool(aMetaData) can return the following Values for example.
- * "axe", "pickaxe", "sword", "shovel", "hoe", "grafter", "saw", "wrench", "crowbar", "file", "hammer", "plow", "plunger", "scoop", "screwdriver", "sense", "scythe", "softhammer", "cutter", "plasmatorch"
+ * aBlock.getHarvestTool(aMetaData) can return the following Values for example. "axe", "pickaxe", "sword",
+ * "shovel", "hoe", "grafter", "saw", "wrench", "crowbar", "file", "hammer", "plow", "plunger", "scoop",
+ * "screwdriver", "sense", "scythe", "softhammer", "cutter", "plasmatorch"
*
- * @return If this is a minable Block. Tool Quality checks (like Diamond Tier or something) are separate from this check.
+ * @return If this is a minable Block. Tool Quality checks (like Diamond Tier or something) are separate from this
+ * check.
*/
@Override
public boolean isMinableBlock(Block aBlock, byte aMetaData);
@@ -156,18 +164,8 @@ public interface Interface_ToolStats extends IToolStats {
* @return the Amount of modified Items.
*/
@Override
- public int convertBlockDrops(
- List<ItemStack> aDrops,
- ItemStack aStack,
- EntityPlayer aPlayer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- byte aMetaData,
- int aFortune,
- boolean aSilkTouch,
- BlockEvent.HarvestDropsEvent aEvent);
+ public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
+ int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent);
/**
* @return Returns a broken Version of the Item.
@@ -179,15 +177,15 @@ public interface Interface_ToolStats extends IToolStats {
* @return the Damage actually done to the Mob.
*/
@Override
- public float getNormalDamageAgainstEntity(
- float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer);
+ public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
+ EntityPlayer aPlayer);
/**
* @return the Damage actually done to the Mob.
*/
@Override
- public float getMagicDamageAgainstEntity(
- float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer);
+ public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
+ EntityPlayer aPlayer);
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java
index b9e402a2f6..3eefd1c314 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java
@@ -1,17 +1,7 @@
package gtPlusPlus.xmod.gregtech.api.items;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.SubTag;
-import gregtech.api.interfaces.IProjectileItem;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import java.util.List;
+
import net.minecraft.block.BlockDispenser;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.dispenser.*;
@@ -25,10 +15,23 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.SubTag;
+import gregtech.api.interfaces.IProjectileItem;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+
/**
* Extended by most Items, also used as a fallback Item, to prevent the accidental deletion when Errors occur.
*/
public class Gregtech_Generic_Item extends Item implements IProjectileItem {
+
private final String mName, mTooltip;
protected IIcon mIcon;
@@ -36,17 +39,16 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem {
this(aUnlocalized, aEnglish, aEnglishTooltip, true);
}
- public Gregtech_Generic_Item(
- final String aUnlocalized,
- final String aEnglish,
- final String aEnglishTooltip,
+ public Gregtech_Generic_Item(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip,
final boolean aWriteToolTipIntoLangFile) {
super();
this.mName = aUnlocalized;
GT_LanguageManager.addStringLocalization(this.mName + ".name", aEnglish);
if (GT_Utility.isStringValid(aEnglishTooltip)) {
GT_LanguageManager.addStringLocalization(
- this.mTooltip = this.mName + ".tooltip_main", aEnglishTooltip, aWriteToolTipIntoLangFile);
+ this.mTooltip = this.mName + ".tooltip_main",
+ aEnglishTooltip,
+ aWriteToolTipIntoLangFile);
} else {
this.mTooltip = null;
}
@@ -77,8 +79,8 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem {
}
@Override
- public boolean doesSneakBypassUse(
- final World aWorld, final int aX, final int aY, final int aZ, final EntityPlayer aPlayer) {
+ public boolean doesSneakBypassUse(final World aWorld, final int aX, final int aY, final int aZ,
+ final EntityPlayer aPlayer) {
return true;
}
@@ -92,8 +94,8 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem {
}
@Override
- public void addInformation(
- final ItemStack aStack, final EntityPlayer aPlayer, final List aList, final boolean aF3_H) {
+ public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList,
+ final boolean aF3_H) {
if ((this.getMaxDamage() > 0) && !this.getHasSubtypes()) {
aList.add((aStack.getMaxDamage() - this.getDamage(aStack)) + " / " + aStack.getMaxDamage());
}
@@ -128,23 +130,14 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem {
}
@Override
- public EntityArrow getProjectile(
- final SubTag aProjectileType,
- final ItemStack aStack,
- final World aWorld,
- final double aX,
- final double aY,
- final double aZ) {
+ public EntityArrow getProjectile(final SubTag aProjectileType, final ItemStack aStack, final World aWorld,
+ final double aX, final double aY, final double aZ) {
return null;
}
@Override
- public EntityArrow getProjectile(
- final SubTag aProjectileType,
- final ItemStack aStack,
- final World aWorld,
- final EntityLivingBase aEntity,
- final float aSpeed) {
+ public EntityArrow getProjectile(final SubTag aProjectileType, final ItemStack aStack, final World aWorld,
+ final EntityLivingBase aEntity, final float aSpeed) {
return null;
}
@@ -164,6 +157,7 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem {
}
public static class GT_Item_Dispense extends BehaviorProjectileDispense {
+
@Override
public ItemStack dispenseStack(final IBlockSource aSource, final ItemStack aStack) {
return ((Gregtech_Generic_Item) aStack.getItem()).onDispense(aSource, aStack);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java
index 3daf2d3f31..aa4f6fb45f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java
@@ -2,6 +2,17 @@ package gtPlusPlus.xmod.gregtech.api.items;
import static gregtech.api.enums.GT_Values.D1;
+import java.util.*;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
@@ -18,20 +29,12 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
-import java.util.*;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.EnumAction;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
+
/**
- * All instances of this Item Class are listed here.
- * This gets used to register the Renderer to all Items of this Type, if useStandardMetaItemRenderer() returns true.
+ * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this
+ * Type, if useStandardMetaItemRenderer() returns true.
* <p/>
* You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item.
*/
@@ -110,7 +113,8 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
if (tRandomData instanceof Interface_ItemBehaviour) {
this.addItemBehavior(
- this.mOffset + aID, (Interface_ItemBehaviour<Gregtech_MetaItem_Base>) tRandomData);
+ this.mOffset + aID,
+ (Interface_ItemBehaviour<Gregtech_MetaItem_Base>) tRandomData);
tUseOreDict = false;
}
if (tRandomData instanceof IItemContainer) {
@@ -170,19 +174,14 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
* @param aMaxCharge Maximum Charge. (if this is == 0 it will remove the Electric Behavior)
* @param aTransferLimit Transfer Limit.
* @param aTier The electric Tier.
- * @param aSpecialData If this Item has a Fixed Charge, like a SingleUse Battery (if > 0).
- * Use -1 if you want to make this Battery chargeable (the use and canUse Functions will still discharge if you just use this)
- * Use -2 if you want to make this Battery dischargeable.
- * Use -3 if you want to make this Battery charge/discharge-able.
+ * @param aSpecialData If this Item has a Fixed Charge, like a SingleUse Battery (if > 0). Use -1 if you want to
+ * make this Battery chargeable (the use and canUse Functions will still discharge if you just
+ * use this) Use -2 if you want to make this Battery dischargeable. Use -3 if you want to make
+ * this Battery charge/discharge-able.
* @return the Item itself for convenience in constructing.
*/
- public final Gregtech_MetaItem setElectricStats(
- final int aMetaValue,
- final long aMaxCharge,
- final long aTransferLimit,
- final long aTier,
- final long aSpecialData,
- final boolean aUseAnimations) {
+ public final Gregtech_MetaItem setElectricStats(final int aMetaValue, final long aMaxCharge,
+ final long aTransferLimit, final long aTier, final long aSpecialData, final boolean aUseAnimations) {
if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length()))) {
return this;
}
@@ -191,7 +190,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
} else {
this.mElectricStats.put(
(short) aMetaValue,
- new Long[] {aMaxCharge, Math.max(0, aTransferLimit), Math.max(-1, aTier), aSpecialData});
+ new Long[] { aMaxCharge, Math.max(0, aTransferLimit), Math.max(-1, aTier), aSpecialData });
if ((aMetaValue >= this.mOffset) && aUseAnimations) {
this.mIconList[aMetaValue - this.mOffset] = Arrays.copyOf(
this.mIconList[aMetaValue - this.mOffset],
@@ -206,21 +205,21 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
* @param aMaxCharge Maximum Charge. (if this is == 0 it will remove the Electric Behavior)
* @param aTransferLimit Transfer Limit.
* @param aTier The electric Tier.
- * @param aSpecialData If this Item has a Fixed Charge, like a SingleUse Battery (if > 0).
- * Use -1 if you want to make this Battery chargeable (the use and canUse Functions will still discharge if you just use this)
- * Use -2 if you want to make this Battery dischargeable.
- * Use -3 if you want to make this Battery charge/discharge-able.
+ * @param aSpecialData If this Item has a Fixed Charge, like a SingleUse Battery (if > 0). Use -1 if you want to
+ * make this Battery chargeable (the use and canUse Functions will still discharge if you just
+ * use this) Use -2 if you want to make this Battery dischargeable. Use -3 if you want to make
+ * this Battery charge/discharge-able.
* @return the Item itself for convenience in constructing.
*/
- public final Gregtech_MetaItem setFluidContainerStats(
- final int aMetaValue, final long aCapacity, final long aStacksize) {
+ public final Gregtech_MetaItem setFluidContainerStats(final int aMetaValue, final long aCapacity,
+ final long aStacksize) {
if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length()))) {
return this;
}
if (aCapacity < 0) {
this.mElectricStats.remove((short) aMetaValue);
} else {
- this.mFluidContainerStats.put((short) aMetaValue, new Long[] {aCapacity, Math.max(1, aStacksize)});
+ this.mFluidContainerStats.put((short) aMetaValue, new Long[] { aCapacity, Math.max(1, aStacksize) });
}
return this;
}
@@ -298,11 +297,11 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base {
for (short i = 0, j = (short) this.mEnabledItems.length(); i < j; i++) {
if (this.mEnabledItems.get(i)) {
for (byte k = 1; k < this.mIconList[i].length; k++) {
- this.mIconList[i][k] = aIconRegister.registerIcon(
- CORE.MODID + ":" + this.getUnlocalizedName() + "/" + i + "/" + k);
+ this.mIconList[i][k] = aIconRegister
+ .registerIcon(CORE.MODID + ":" + this.getUnlocalizedName() + "/" + i + "/" + k);
}
- this.mIconList[i][0] =
- aIconRegister.registerIcon(CORE.MODID + ":" + this.getUnlocalizedName() + "/" + i);
+ this.mIconList[i][0] = aIconRegister
+ .registerIcon(CORE.MODID + ":" + this.getUnlocalizedName() + "/" + i);
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
index a961b28cf7..6ed72a8803 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java
@@ -2,14 +2,10 @@ package gtPlusPlus.xmod.gregtech.api.items;
import static gregtech.api.enums.GT_Values.*;
-import gregtech.api.enums.SubTag;
-import gregtech.api.util.*;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
-import ic2.api.item.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -24,11 +20,17 @@ import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
+import gregtech.api.enums.SubTag;
+import gregtech.api.util.*;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
+import ic2.api.item.*;
+
public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem {
+
/* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
- private final HashMap<Short, ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>>> mItemBehaviors =
- new HashMap<>();
+ private final HashMap<Short, ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>>> mItemBehaviors = new HashMap<>();
/**
* Creates the Item using these Parameters.
@@ -51,8 +53,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
* @param aBehavior the Click Behavior you want to add.
* @return the Item itself for convenience in constructing.
*/
- public final Gregtech_MetaItem_Base addItemBehavior(
- final int aMetaValue, final Interface_ItemBehaviour<Gregtech_MetaItem_Base> aBehavior) {
+ public final Gregtech_MetaItem_Base addItemBehavior(final int aMetaValue,
+ final Interface_ItemBehaviour<Gregtech_MetaItem_Base> aBehavior) {
if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) {
return this;
}
@@ -71,8 +73,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
@Override
public boolean hasProjectile(final SubTag aProjectileType, final ItemStack aStack) {
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
if (tBehavior.hasProjectile(this, aProjectileType, aStack)) {
@@ -84,15 +86,10 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
}
@Override
- public EntityArrow getProjectile(
- final SubTag aProjectileType,
- final ItemStack aStack,
- final World aWorld,
- final double aX,
- final double aY,
- final double aZ) {
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ public EntityArrow getProjectile(final SubTag aProjectileType, final ItemStack aStack, final World aWorld,
+ final double aX, final double aY, final double aZ) {
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
final EntityArrow rArrow = tBehavior.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ);
@@ -105,18 +102,14 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
}
@Override
- public EntityArrow getProjectile(
- final SubTag aProjectileType,
- final ItemStack aStack,
- final World aWorld,
- final EntityLivingBase aEntity,
- final float aSpeed) {
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ public EntityArrow getProjectile(final SubTag aProjectileType, final ItemStack aStack, final World aWorld,
+ final EntityLivingBase aEntity, final float aSpeed) {
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
- final EntityArrow rArrow =
- tBehavior.getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed);
+ final EntityArrow rArrow = tBehavior
+ .getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed);
if (rArrow != null) {
return rArrow;
}
@@ -127,8 +120,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
@Override
public ItemStack onDispense(final IBlockSource aSource, final ItemStack aStack) {
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
if (tBehavior.canDispense(this, aSource, aStack)) {
@@ -141,8 +134,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
@Override
public boolean isItemStackUsable(final ItemStack aStack) {
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
if (!tBehavior.isItemStackUsable(this, aStack)) {
@@ -157,8 +150,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
public boolean onLeftClickEntity(final ItemStack aStack, final EntityPlayer aPlayer, final Entity aEntity) {
this.use(aStack, 0, aPlayer);
this.isItemStackUsable(aStack);
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
try {
@@ -183,21 +176,12 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
}
@Override
- public boolean onItemUse(
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final World aWorld,
- final int aX,
- final int aY,
- final int aZ,
- final int aSide,
- final float hitX,
- final float hitY,
- final float hitZ) {
+ public boolean onItemUse(final ItemStack aStack, final EntityPlayer aPlayer, final World aWorld, final int aX,
+ final int aY, final int aZ, final int aSide, final float hitX, final float hitY, final float hitZ) {
this.use(aStack, 0, aPlayer);
this.isItemStackUsable(aStack);
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
try {
@@ -222,21 +206,12 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
}
@Override
- public boolean onItemUseFirst(
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final World aWorld,
- final int aX,
- final int aY,
- final int aZ,
- final int aSide,
- final float hitX,
- final float hitY,
- final float hitZ) {
+ public boolean onItemUseFirst(final ItemStack aStack, final EntityPlayer aPlayer, final World aWorld, final int aX,
+ final int aY, final int aZ, final int aSide, final float hitX, final float hitY, final float hitZ) {
this.use(aStack, 0, aPlayer);
this.isItemStackUsable(aStack);
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
try {
@@ -264,8 +239,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
public ItemStack onItemRightClick(ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) {
this.use(aStack, 0, aPlayer);
this.isItemStackUsable(aStack);
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
try {
@@ -281,8 +256,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
}
@Override
- public final void addInformation(
- final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) {
+ public final void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList,
+ final boolean aF3_H) {
final String tKey = this.getUnlocalizedName(aStack) + ".tooltip",
tString = GT_LanguageManager.getTranslation(tKey);
if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) {
@@ -292,18 +267,27 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
Long[] tStats = this.getElectricStats(aStack);
if (tStats != null) {
if (tStats[3] > 0) {
- aList.add(EnumChatFormatting.AQUA + "Contains " + GT_Utility.formatNumbers(tStats[3]) + " EU Tier: "
- + (tStats[2] >= 0 ? tStats[2] : 0) + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.AQUA + "Contains "
+ + GT_Utility.formatNumbers(tStats[3])
+ + " EU Tier: "
+ + (tStats[2] >= 0 ? tStats[2] : 0)
+ + EnumChatFormatting.GRAY);
} else {
final long tCharge = this.getRealCharge(aStack);
if ((tStats[3] == -2) && (tCharge <= 0)) {
- aList.add(EnumChatFormatting.AQUA + "Empty. You should recycle it properly."
- + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.AQUA + "Empty. You should recycle it properly."
+ + EnumChatFormatting.GRAY);
} else {
- aList.add(EnumChatFormatting.AQUA + "" + GT_Utility.formatNumbers(tCharge) + " / "
- + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: "
- + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]
- + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.AQUA + ""
+ + GT_Utility.formatNumbers(tCharge)
+ + " / "
+ + GT_Utility.formatNumbers(Math.abs(tStats[0]))
+ + " EU - Voltage: "
+ + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]
+ + EnumChatFormatting.GRAY);
}
}
}
@@ -311,16 +295,17 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
tStats = this.getFluidContainerStats(aStack);
if ((tStats != null) && (tStats[0] > 0)) {
final FluidStack tFluid = this.getFluidContent(aStack);
- aList.add(EnumChatFormatting.BLUE
- + ((tFluid == null ? "No Fluids Contained" : GT_Utility.getFluidName(tFluid, true)))
- + EnumChatFormatting.GRAY);
- aList.add(EnumChatFormatting.BLUE
- + ((tFluid == null ? 0 : tFluid.amount) + "L / " + tStats[0] + "L")
- + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.BLUE
+ + ((tFluid == null ? "No Fluids Contained" : GT_Utility.getFluidName(tFluid, true)))
+ + EnumChatFormatting.GRAY);
+ aList.add(
+ EnumChatFormatting.BLUE + ((tFluid == null ? 0 : tFluid.amount) + "L / " + tStats[0] + "L")
+ + EnumChatFormatting.GRAY);
}
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
aList = tBehavior.getAdditionalToolTips(this, aList, aStack);
@@ -331,14 +316,10 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
}
@Override
- public void onUpdate(
- final ItemStack aStack,
- final World aWorld,
- final Entity aPlayer,
- final int aTimer,
+ public void onUpdate(final ItemStack aStack, final World aWorld, final Entity aPlayer, final int aTimer,
final boolean aIsInHand) {
- final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList =
- this.mItemBehaviors.get((short) this.getDamage(aStack));
+ final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors
+ .get((short) this.getDamage(aStack));
if (tList != null) {
for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) {
tBehavior.onUpdate(this, aStack, aWorld, aPlayer, aTimer, aIsInHand);
@@ -374,29 +355,19 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
}
@Override
- public final double charge(
- final ItemStack aStack,
- final double aCharge,
- final int aTier,
- final boolean aIgnoreTransferLimit,
- final boolean aSimulate) {
+ public final double charge(final ItemStack aStack, final double aCharge, final int aTier,
+ final boolean aIgnoreTransferLimit, final boolean aSimulate) {
final Long[] tStats = this.getElectricStats(aStack);
- if ((tStats == null)
- || (tStats[2] > aTier)
+ if ((tStats == null) || (tStats[2] > aTier)
|| !((tStats[3] == -1) || (tStats[3] == -3) || ((tStats[3] < 0) && (aCharge == Integer.MAX_VALUE)))
|| (aStack.stackSize != 1)) {
return 0;
}
- final long tChargeBefore = this.getRealCharge(aStack),
- tNewCharge =
- aCharge == Integer.MAX_VALUE
- ? Long.MAX_VALUE
- : Math.min(
- Math.abs(tStats[0]),
- tChargeBefore
- + (aIgnoreTransferLimit
- ? (long) aCharge
- : Math.min(tStats[1], (long) aCharge)));
+ final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = aCharge == Integer.MAX_VALUE
+ ? Long.MAX_VALUE
+ : Math.min(
+ Math.abs(tStats[0]),
+ tChargeBefore + (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
if (!aSimulate) {
this.setCharge(aStack, tNewCharge);
}
@@ -404,13 +375,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
}
@Override
- public final double discharge(
- final ItemStack aStack,
- final double aCharge,
- final int aTier,
- final boolean aIgnoreTransferLimit,
- final boolean aBatteryAlike,
- final boolean aSimulate) {
+ public final double discharge(final ItemStack aStack, final double aCharge, final int aTier,
+ final boolean aIgnoreTransferLimit, final boolean aBatteryAlike, final boolean aSimulate) {
final Long[] tStats = this.getElectricStats(aStack);
if ((tStats == null) || (tStats[2] > aTier)) {
return 0;
@@ -427,14 +393,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
}
return tStats[3];
}
- final long tChargeBefore = this.getRealCharge(aStack),
- tNewCharge =
- Math.max(
- 0,
- tChargeBefore
- - (aIgnoreTransferLimit
- ? (long) aCharge
- : Math.min(tStats[1], (long) aCharge)));
+ final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = Math
+ .max(0, tChargeBefore - (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
if (!aSimulate) {
this.setCharge(aStack, tNewCharge);
}
@@ -570,8 +530,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item
}
final Long[] tStats = this.getFluidContainerStats(aStack);
- if ((tStats == null)
- || (tStats[0] <= 0)
+ if ((tStats == null) || (tStats[0] <= 0)
|| (aFluid == null)
|| (aFluid.getFluid().getID() <= 0)
|| (aFluid.amount <= 0)) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
index a7f7cae271..c87b46e696 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.api.items;
+import java.util.Arrays;
+import java.util.List;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
@@ -12,24 +20,21 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.math.MathUtils;
-import java.util.Arrays;
-import java.util.List;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
/**
* @author Gregorius Techneticies
* <p/>
* One Item for everything!
* <p/>
- * This brilliant Item Class is used for automatically generating all possible variations of Material Items, like Dusts, Ingots, Gems, Plates and similar.
- * It saves me a ton of work, when adding Items, because I always have to make a new Item SubType for each OreDict Prefix, when adding a new Material.
+ * This brilliant Item Class is used for automatically generating all possible variations of Material Items,
+ * like Dusts, Ingots, Gems, Plates and similar. It saves me a ton of work, when adding Items, because I always
+ * have to make a new Item SubType for each OreDict Prefix, when adding a new Material.
* <p/>
- * As you can see, up to 32766 Items can be generated using this Class. And the last 766 Items can be custom defined, just to save space and MetaData.
+ * As you can see, up to 32766 Items can be generated using this Class. And the last 766 Items can be custom
+ * defined, just to save space and MetaData.
* <p/>
- * These Items can also have special RightClick abilities, electric Charge or even be set to become a Food alike Item.
+ * These Items can also have special RightClick abilities, electric Charge or even be set to become a Food alike
+ * Item.
*/
public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
@@ -57,7 +62,8 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
if (this.doesMaterialAllowGeneration(tPrefix, tMaterial)) {
final ItemStack tStack = new ItemStack(this, 1, i);
GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName(tStack) + ".name", this.getDefaultLocalization(tPrefix, tMaterial, i));
+ this.getUnlocalizedName(tStack) + ".name",
+ this.getDefaultLocalization(tPrefix, tMaterial, i));
GT_LanguageManager.addStringLocalization(
this.getUnlocalizedName(tStack) + ".tooltip",
tMaterial.getToolTip(tPrefix.mMaterialAmount / GT_Values.M));
@@ -67,8 +73,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
GT_OreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack);
}
if (((tPrefix == OrePrefixes.stick) || (tPrefix == OrePrefixes.wireFine))
- && ((tMaterial == Materials.Lead)
- || (tMaterial == Materials.Tin)
+ && ((tMaterial == Materials.Lead) || (tMaterial == Materials.Tin)
|| (tMaterial == Materials.SolderingAlloy))) {
GregTech_API.sSolderingMetalList.add(tStack);
}
@@ -118,19 +123,20 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
*/
public final IIconContainer getIconContainer(final int aMetaData, final Materials aMaterial) {
return (this.mGeneratedPrefixList[aMetaData / 1000] != null)
- && (this.mGeneratedPrefixList[aMetaData / 1000].mTextureIndex >= 0)
- ? aMaterial.mIconSet.mTextures[this.mGeneratedPrefixList[aMetaData / 1000].mTextureIndex]
- : null;
+ && (this.mGeneratedPrefixList[aMetaData / 1000].mTextureIndex >= 0)
+ ? aMaterial.mIconSet.mTextures[this.mGeneratedPrefixList[aMetaData / 1000].mTextureIndex]
+ : null;
}
/**
* @param aPrefix always != null
* @param aMaterial always != null
- * @param aDoShowAllItems this is the Configuration Setting of the User, if he wants to see all the Stuff like Tiny Dusts or Crushed Ores as well.
+ * @param aDoShowAllItems this is the Configuration Setting of the User, if he wants to see all the Stuff like Tiny
+ * Dusts or Crushed Ores as well.
* @return if this Item should be visible in NEI or Creative
*/
- public boolean doesShowInCreative(
- final OrePrefixes aPrefix, final Materials aMaterial, final boolean aDoShowAllItems) {
+ public boolean doesShowInCreative(final OrePrefixes aPrefix, final Materials aMaterial,
+ final boolean aDoShowAllItems) {
return true;
}
@@ -153,8 +159,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
@Override
public final IIconContainer getIconContainer(final int aMetaData) {
- return GregTech_API.sGeneratedMaterials[aMetaData % 1000] == null
- ? null
+ return GregTech_API.sGeneratedMaterials[aMetaData % 1000] == null ? null
: this.getIconContainer(aMetaData, GregTech_API.sGeneratedMaterials[aMetaData % 1000]);
}
@@ -163,7 +168,8 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
public final void getSubItems(final Item var1, final CreativeTabs aCreativeTab, final List aList) {
for (int i = 0; i < 32000; i++) {
if (this.doesMaterialAllowGeneration(
- this.mGeneratedPrefixList[i / 1000], GregTech_API.sGeneratedMaterials[i % 1000])
+ this.mGeneratedPrefixList[i / 1000],
+ GregTech_API.sGeneratedMaterials[i % 1000])
&& this.doesShowInCreative(
this.mGeneratedPrefixList[i / 1000],
GregTech_API.sGeneratedMaterials[i % 1000],
@@ -199,8 +205,8 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
public int getItemStackLimit(final ItemStack aStack) {
final int tDamage = this.getDamage(aStack);
if ((tDamage < 32000) && (this.mGeneratedPrefixList[tDamage / 1000] != null)) {
- return Math.min(
- super.getItemStackLimit(aStack), this.mGeneratedPrefixList[tDamage / 1000].mDefaultStackSize);
+ return Math
+ .min(super.getItemStackLimit(aStack), this.mGeneratedPrefixList[tDamage / 1000].mDefaultStackSize);
}
return super.getItemStackLimit(aStack);
}
@@ -236,7 +242,9 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem {
HEX_OxFFFFFF = 0xffb300;
} else if (stack.getDisplayName().contains("MAX")) {
HEX_OxFFFFFF = Utils.rgbtoHexValue(
- MathUtils.randInt(220, 250), MathUtils.randInt(221, 251), MathUtils.randInt(220, 250));
+ MathUtils.randInt(220, 250),
+ MathUtils.randInt(221, 251),
+ MathUtils.randInt(220, 250));
} else {
HEX_OxFFFFFF = 0xffffff;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
index 7cb79a4ad6..11a4c02fbb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
@@ -1,21 +1,12 @@
package gtPlusPlus.xmod.gregtech.api.items;
-import buildcraft.api.tools.IToolWrench;
-import cpw.mods.fml.common.Optional;
-import gregtech.api.enchants.Enchantment_Radioactivity;
-import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.IDamagableItem;
-import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
+
import mods.railcraft.api.core.items.IToolCrowbar;
+
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
@@ -34,21 +25,33 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.event.world.BlockEvent;
+import buildcraft.api.tools.IToolWrench;
+import cpw.mods.fml.common.Optional;
+import gregtech.api.enchants.Enchantment_Radioactivity;
+import gregtech.api.enums.Materials;
+import gregtech.api.interfaces.IDamagableItem;
+import gregtech.api.interfaces.IToolStats;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
+
/**
* This is an example on how you can create a Tool ItemStack, in this case a Bismuth Wrench:
- * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(16, 1, Materials.Bismuth, Materials.Bismuth, null);
+ * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(16, 1, Materials.Bismuth, Materials.Bismuth,
+ * null);
*/
-@Optional.InterfaceList({
- @Optional.Interface(iface = "forestry.api.arboriculture.IToolGrafter", modid = "Forestry"),
- @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = "Railcraft"),
- @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"),
- @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO")
-})
+@Optional.InterfaceList({ @Optional.Interface(iface = "forestry.api.arboriculture.IToolGrafter", modid = "Forestry"),
+ @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = "Railcraft"),
+ @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"),
+ @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO") })
public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
implements IDamagableItem, IToolCrowbar, IToolWrench {
+
/**
- * All instances of this Item Class are listed here.
- * This gets used to register the Renderer to all Items of this Type, if useStandardMetaItemRenderer() returns true.
+ * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this
+ * Type, if useStandardMetaItemRenderer() returns true.
* <p/>
* You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item.
*/
@@ -75,35 +78,26 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
* Called by the Block Harvesting Event within the GT_Proxy
*/
@Override
- public void onHarvestBlockEvent(
- final ArrayList<ItemStack> aDrops,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final Block aBlock,
- final int aX,
- final int aY,
- final int aZ,
- final byte aMetaData,
- final int aFortune,
- final boolean aSilkTouch,
+ public void onHarvestBlockEvent(final ArrayList<ItemStack> aDrops, final ItemStack aStack,
+ final EntityPlayer aPlayer, final Block aBlock, final int aX, final int aY, final int aZ,
+ final byte aMetaData, final int aFortune, final boolean aSilkTouch,
final BlockEvent.HarvestDropsEvent aEvent) {
final IToolStats tStats = this.getToolStats(aStack);
if (this.isItemStackUsable(aStack) && (this.getDigSpeed(aStack, aBlock, aMetaData) > 0.0F)) {
this.doDamage(
aStack,
tStats.convertBlockDrops(
- aDrops,
- aStack,
- aPlayer,
- aBlock,
- aX,
- aY,
- aZ,
- aMetaData,
- aFortune,
- aSilkTouch,
- aEvent)
- * tStats.getToolDamagePerDropConversion());
+ aDrops,
+ aStack,
+ aPlayer,
+ aBlock,
+ aX,
+ aY,
+ aZ,
+ aMetaData,
+ aFortune,
+ aSilkTouch,
+ aEvent) * tStats.getToolDamagePerDropConversion());
}
}
@@ -118,23 +112,23 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
return true;
}
if (aEntity.canAttackWithItem() && !aEntity.hitByEntity(aPlayer)) {
- final float tMagicDamage = tStats.getMagicDamageAgainstEntity(
- aEntity instanceof EntityLivingBase
- ? EnchantmentHelper.getEnchantmentModifierLiving(aPlayer, (EntityLivingBase) aEntity)
- : 0.0F,
- aEntity,
- aStack,
- aPlayer);
+ final float tMagicDamage = tStats
+ .getMagicDamageAgainstEntity(
+ aEntity instanceof EntityLivingBase
+ ? EnchantmentHelper
+ .getEnchantmentModifierLiving(aPlayer, (EntityLivingBase) aEntity)
+ : 0.0F,
+ aEntity,
+ aStack,
+ aPlayer);
float tDamage = tStats.getNormalDamageAgainstEntity(
- (float) aPlayer.getEntityAttribute(SharedMonsterAttributes.attackDamage)
- .getAttributeValue()
+ (float) aPlayer.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue()
+ this.getToolCombatDamage(aStack),
aEntity,
aStack,
aPlayer);
if ((tDamage + tMagicDamage) > 0.0F) {
- final boolean tCriticalHit = (aPlayer.fallDistance > 0.0F)
- && !aPlayer.onGround
+ final boolean tCriticalHit = (aPlayer.fallDistance > 0.0F) && !aPlayer.onGround
&& !aPlayer.isOnLadder()
&& !aPlayer.isInWater()
&& !aPlayer.isPotionActive(Potion.blindness)
@@ -148,10 +142,9 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
if (aEntity instanceof EntityLivingBase) {
aEntity.setFire(EnchantmentHelper.getFireAspectModifier(aPlayer) * 4);
}
- final int tKnockcack = (aPlayer.isSprinting() ? 1 : 0)
- + (aEntity instanceof EntityLivingBase
- ? EnchantmentHelper.getKnockbackModifier(aPlayer, (EntityLivingBase) aEntity)
- : 0);
+ final int tKnockcack = (aPlayer.isSprinting() ? 1 : 0) + (aEntity instanceof EntityLivingBase
+ ? EnchantmentHelper.getKnockbackModifier(aPlayer, (EntityLivingBase) aEntity)
+ : 0);
if (tKnockcack > 0) {
aEntity.addVelocity(
-MathHelper.sin((aPlayer.rotationYaw * (float) Math.PI) / 180.0F) * tKnockcack * 0.5F,
@@ -178,8 +171,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
if (aEntity instanceof EntityLivingBase) {
aPlayer.addStat(StatList.damageDealtStat, Math.round(tDamage * 10.0F));
}
- aEntity.hurtResistantTime =
- Math.max(1, tStats.getHurtResistanceTime(aEntity.hurtResistantTime, aEntity));
+ aEntity.hurtResistantTime = Math
+ .max(1, tStats.getHurtResistanceTime(aEntity.hurtResistantTime, aEntity));
aPlayer.addExhaustion(0.3F);
this.doDamage(aStack, tStats.getToolDamagePerEntityAttack());
}
@@ -208,29 +201,39 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
final int tOffset = this.getElectricStats(aStack) != null ? 2 : 1;
if (tStats != null) {
final String name = aStack.getUnlocalizedName();
- if (name.equals("gt.metatool.01.170")
- || name.equals("gt.metatool.01.172")
+ if (name.equals("gt.metatool.01.170") || name.equals("gt.metatool.01.172")
|| name.equals("gt.metatool.01.174")
|| name.equals("gt.metatool.01.176")) {
aList.add(
tOffset + 0,
- EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN
- + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + "Durability: "
+ + EnumChatFormatting.GREEN
+ + (tMaxDamage - getToolDamage(aStack))
+ + " / "
+ + tMaxDamage
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 1,
- EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl "
- + this.getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName
+ + EnumChatFormatting.YELLOW
+ + " lvl "
+ + this.getHarvestLevel(aStack, "")
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 2,
- EnumChatFormatting.WHITE + "Turbine Efficency: " + EnumChatFormatting.BLUE
- + (50.0F + (10.0F * this.getToolCombatDamage(aStack))) + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + "Turbine Efficency: "
+ + EnumChatFormatting.BLUE
+ + (50.0F + (10.0F * this.getToolCombatDamage(aStack)))
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 3,
- EnumChatFormatting.WHITE + "Optimal Steam flow: " + EnumChatFormatting.LIGHT_PURPLE
+ EnumChatFormatting.WHITE + "Optimal Steam flow: "
+ + EnumChatFormatting.LIGHT_PURPLE
+ Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed * 1000)
- + EnumChatFormatting.GRAY + "L/sec");
+ + EnumChatFormatting.GRAY
+ + "L/sec");
aList.add(
tOffset + 3,
EnumChatFormatting.WHITE + "Optimal Gas flow(EU burnvalue per tick): "
@@ -238,7 +241,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
+ Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed * 25)
- + EnumChatFormatting.GRAY + "EU/t");
+ + EnumChatFormatting.GRAY
+ + "EU/t");
aList.add(
tOffset + 3,
EnumChatFormatting.WHITE + "Optimal Plasma flow(Plasma energyvalue per tick): "
@@ -246,24 +250,35 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
+ Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed * 1000)
- + EnumChatFormatting.GRAY + "EU/t");
+ + EnumChatFormatting.GRAY
+ + "EU/t");
} else {
aList.add(
tOffset + 0,
- EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN
- + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + "Durability: "
+ + EnumChatFormatting.GREEN
+ + (tMaxDamage - getToolDamage(aStack))
+ + " / "
+ + tMaxDamage
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 1,
- EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl "
- + this.getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName
+ + EnumChatFormatting.YELLOW
+ + " lvl "
+ + this.getHarvestLevel(aStack, "")
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 2,
- EnumChatFormatting.WHITE + "Attack Damage: " + EnumChatFormatting.BLUE
- + this.getToolCombatDamage(aStack) + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + "Attack Damage: "
+ + EnumChatFormatting.BLUE
+ + this.getToolCombatDamage(aStack)
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 3,
- EnumChatFormatting.WHITE + "Mining Speed: " + EnumChatFormatting.LIGHT_PURPLE
+ EnumChatFormatting.WHITE + "Mining Speed: "
+ + EnumChatFormatting.LIGHT_PURPLE
+ Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed)
@@ -280,29 +295,39 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
final int tOffset = this.getElectricStats(aStack) != null ? 2 : 1;
if (tStats != null) {
final String name = aStack.getUnlocalizedName();
- if (name.equals("gt.metatool.01.170")
- || name.equals("gt.metatool.01.172")
+ if (name.equals("gt.metatool.01.170") || name.equals("gt.metatool.01.172")
|| name.equals("gt.metatool.01.174")
|| name.equals("gt.metatool.01.176")) {
aList.add(
tOffset + 0,
- EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN
- + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + "Durability: "
+ + EnumChatFormatting.GREEN
+ + (tMaxDamage - getToolDamage(aStack))
+ + " / "
+ + tMaxDamage
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 1,
- EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl "
- + this.getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName
+ + EnumChatFormatting.YELLOW
+ + " lvl "
+ + this.getHarvestLevel(aStack, "")
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 2,
- EnumChatFormatting.WHITE + "Turbine Efficency: " + EnumChatFormatting.BLUE
- + (50.0F + (10.0F * this.getToolCombatDamage(aStack))) + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + "Turbine Efficency: "
+ + EnumChatFormatting.BLUE
+ + (50.0F + (10.0F * this.getToolCombatDamage(aStack)))
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 3,
- EnumChatFormatting.WHITE + "Optimal Steam flow: " + EnumChatFormatting.LIGHT_PURPLE
+ EnumChatFormatting.WHITE + "Optimal Steam flow: "
+ + EnumChatFormatting.LIGHT_PURPLE
+ Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed * 1000)
- + EnumChatFormatting.GRAY + "L/sec");
+ + EnumChatFormatting.GRAY
+ + "L/sec");
aList.add(
tOffset + 3,
EnumChatFormatting.WHITE + "Optimal Gas flow(EU burnvalue per tick): "
@@ -310,7 +335,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
+ Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed * 50)
- + EnumChatFormatting.GRAY + "EU/t");
+ + EnumChatFormatting.GRAY
+ + "EU/t");
aList.add(
tOffset + 3,
EnumChatFormatting.WHITE + "Optimal Plasma flow(Plasma energyvalue per tick): "
@@ -318,24 +344,35 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
+ Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed * 1000)
- + EnumChatFormatting.GRAY + "EU/t");
+ + EnumChatFormatting.GRAY
+ + "EU/t");
} else {
aList.add(
tOffset + 0,
- EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN
- + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + "Durability: "
+ + EnumChatFormatting.GREEN
+ + (tMaxDamage - getToolDamage(aStack))
+ + " / "
+ + tMaxDamage
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 1,
- EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl "
- + this.getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName
+ + EnumChatFormatting.YELLOW
+ + " lvl "
+ + this.getHarvestLevel(aStack, "")
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 2,
- EnumChatFormatting.WHITE + "Attack Damage: " + EnumChatFormatting.BLUE
- + this.getToolCombatDamage(aStack) + EnumChatFormatting.GRAY);
+ EnumChatFormatting.WHITE + "Attack Damage: "
+ + EnumChatFormatting.BLUE
+ + this.getToolCombatDamage(aStack)
+ + EnumChatFormatting.GRAY);
aList.add(
tOffset + 3,
- EnumChatFormatting.WHITE + "Mining Speed: " + EnumChatFormatting.LIGHT_PURPLE
+ EnumChatFormatting.WHITE + "Mining Speed: "
+ + EnumChatFormatting.LIGHT_PURPLE
+ Math.max(
Float.MIN_NORMAL,
tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed)
@@ -362,7 +399,9 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
aList.add(
tOffset + 3,
- EnumChatFormatting.RED + "Heat: " + aNBT.getInteger("Heat") + " K"
+ EnumChatFormatting.RED + "Heat: "
+ + aNBT.getInteger("Heat")
+ + " K"
+ EnumChatFormatting.GRAY);
}
}
@@ -381,12 +420,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("GT.ToolStats");
if ((aNBT != null) && aNBT.getBoolean("Electric")) {
- return new Long[] {
- aNBT.getLong("MaxCharge"),
- aNBT.getLong("Voltage"),
- aNBT.getLong("Tier"),
- aNBT.getLong("SpecialData")
- };
+ return new Long[] { aNBT.getLong("MaxCharge"), aNBT.getLong("Voltage"), aNBT.getLong("Tier"),
+ aNBT.getLong("SpecialData") };
}
}
return new Long[] {};
@@ -416,14 +451,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
}
@Override
- public boolean onBlockDestroyed(
- final ItemStack aStack,
- final World aWorld,
- final Block aBlock,
- final int aX,
- final int aY,
- final int aZ,
- final EntityLivingBase aPlayer) {
+ public boolean onBlockDestroyed(final ItemStack aStack, final World aWorld, final Block aBlock, final int aX,
+ final int aY, final int aZ, final EntityLivingBase aPlayer) {
if (!this.isItemStackUsable(aStack)) {
return false;
}
@@ -432,8 +461,9 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
return false;
}
GT_Utility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F);
- this.doDamage(aStack, (int)
- Math.max(1, aBlock.getBlockHardness(aWorld, aX, aY, aZ) * tStats.getToolDamagePerBlockBreak()));
+ this.doDamage(
+ aStack,
+ (int) Math.max(1, aBlock.getBlockHardness(aWorld, aX, aY, aZ) * tStats.getToolDamagePerBlockBreak()));
return this.getDigSpeed(aStack, aBlock, aWorld.getBlockMetadata(aX, aY, aZ)) > 0.0F;
}
@@ -466,8 +496,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
}
@Override
- public boolean canWhack(
- final EntityPlayer aPlayer, final ItemStack aStack, final int aX, final int aY, final int aZ) {
+ public boolean canWhack(final EntityPlayer aPlayer, final ItemStack aStack, final int aX, final int aY,
+ final int aZ) {
if (!this.isItemStackUsable(aStack)) {
return false;
}
@@ -596,8 +626,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool
}
}
for (final Entry<Integer, Integer> tEntry : tMap.entrySet()) {
- if ((tEntry.getKey() == 33)
- || ((tEntry.getKey() == 20) && (tEntry.getValue() > 2))
+ if ((tEntry.getKey() == 33) || ((tEntry.getKey() == 20) && (tEntry.getValue() > 2))
|| (tEntry.getKey() == Enchantment_Radioactivity.INSTANCE.effectId)) {
tResult.put(tEntry.getKey(), tEntry.getValue());
} else {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
index c9f337d47b..77b407109e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
@@ -1,17 +1,10 @@
package gtPlusPlus.xmod.gregtech.api.items.tools;
-import gregtech.api.GregTech_API;
-import gregtech.api.enchants.Enchantment_Radioactivity;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.TC_Aspects.TC_AspectStack;
-import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.*;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
+
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
@@ -29,14 +22,25 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.event.world.BlockEvent;
+import gregtech.api.GregTech_API;
+import gregtech.api.enchants.Enchantment_Radioactivity;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.interfaces.IToolStats;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.util.*;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
+
/**
* This is an example on how you can create a Tool ItemStack, in this case a Bismuth Wrench:
- * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(16, 1, Materials.Bismuth, Materials.Bismuth, null);
+ * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(16, 1, Materials.Bismuth, Materials.Bismuth,
+ * null);
*/
public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
+
/**
- * All instances of this Item Class are listed here.
- * This gets used to register the Renderer to all Items of this Type, if useStandardMetaItemRenderer() returns true.
+ * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this
+ * Type, if useStandardMetaItemRenderer() returns true.
* <p/>
* You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item.
*/
@@ -86,18 +90,17 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
/**
* This adds a Custom Item to the ending Range.
*
- * @param aID The Id of the assigned Tool Class [0 - 32765] (only even Numbers allowed! Uneven ID's are empty electric Items)
+ * @param aID The Id of the assigned Tool Class [0 - 32765] (only even Numbers allowed! Uneven
+ * ID's are empty electric Items)
* @param aEnglish The Default Localized Name of the created Item
- * @param aToolTip The Default ToolTip of the created Item, you can also insert null for having no ToolTip
+ * @param aToolTip The Default ToolTip of the created Item, you can also insert null for having no
+ * ToolTip
* @param aToolStats The Food Value of this Item. Can be null as well.
- * @param aOreDictNamesAndAspects The OreDict Names you want to give the Item. Also used to assign Thaumcraft Aspects.
+ * @param aOreDictNamesAndAspects The OreDict Names you want to give the Item. Also used to assign Thaumcraft
+ * Aspects.
* @return An ItemStack containing the newly created Item, but without specific Stats.
*/
- public final ItemStack addToolEx(
- final int aID,
- final String aEnglish,
- String aToolTip,
- final IToolStats aToolStats,
+ public final ItemStack addToolEx(final int aID, final String aEnglish, String aToolTip, final IToolStats aToolStats,
final Object... aOreDictNamesAndAspects) {
if (aToolTip == null) {
aToolTip = "";
@@ -106,9 +109,11 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + "." + aID + ".name", aEnglish);
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + "." + aID + ".tooltip", aToolTip);
GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + "." + (aID + 1) + ".name", aEnglish + " (Empty)");
+ this.getUnlocalizedName() + "." + (aID + 1) + ".name",
+ aEnglish + " (Empty)");
GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + "." + (aID + 1) + ".tooltip", "You need to recharge it");
+ this.getUnlocalizedName() + "." + (aID + 1) + ".tooltip",
+ "You need to recharge it");
this.mToolStats.put((short) aID, aToolStats);
this.mToolStats.put((short) (aID + 1), aToolStats);
aToolStats.onStatsAddedToTool(this, aID);
@@ -138,12 +143,8 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
* @param aSecondaryMaterial Secondary (Rod/Handle) Material of this Tool
* @param aElectricArray The Electric Stats of this Tool (or null if not electric)
*/
- public final ItemStack getToolWithStatsEx(
- final int aToolID,
- final int aAmount,
- final Materials aPrimaryMaterial,
- final Materials aSecondaryMaterial,
- final long[] aElectricArray) {
+ public final ItemStack getToolWithStatsEx(final int aToolID, final int aAmount, final Materials aPrimaryMaterial,
+ final Materials aSecondaryMaterial, final long[] aElectricArray) {
final ItemStack rStack = new ItemStack(this, aAmount, aToolID);
final IToolStats tToolStats = this.getToolStats(rStack);
if (tToolStats != null) {
@@ -177,35 +178,26 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
* Called by the Block Harvesting Event within the GT_Proxy
*/
@Override
- public void onHarvestBlockEvent(
- final ArrayList<ItemStack> aDrops,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final Block aBlock,
- final int aX,
- final int aY,
- final int aZ,
- final byte aMetaData,
- final int aFortune,
- final boolean aSilkTouch,
+ public void onHarvestBlockEvent(final ArrayList<ItemStack> aDrops, final ItemStack aStack,
+ final EntityPlayer aPlayer, final Block aBlock, final int aX, final int aY, final int aZ,
+ final byte aMetaData, final int aFortune, final boolean aSilkTouch,
final BlockEvent.HarvestDropsEvent aEvent) {
final IToolStats tStats = this.getToolStats(aStack);
if (this.isItemStackUsable(aStack) && (this.getDigSpeed(aStack, aBlock, aMetaData) > 0.0F)) {
this.doDamage(
aStack,
tStats.convertBlockDrops(
- aDrops,
- aStack,
- aPlayer,
- aBlock,
- aX,
- aY,
- aZ,
- aMetaData,
- aFortune,
- aSilkTouch,
- aEvent)
- * tStats.getToolDamagePerDropConversion());
+ aDrops,
+ aStack,
+ aPlayer,
+ aBlock,
+ aX,
+ aY,
+ aZ,
+ aMetaData,
+ aFortune,
+ aSilkTouch,
+ aEvent) * tStats.getToolDamagePerDropConversion());
}
}
@@ -220,23 +212,23 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
return true;
}
if (aEntity.canAttackWithItem() && !aEntity.hitByEntity(aPlayer)) {
- final float tMagicDamage = tStats.getMagicDamageAgainstEntity(
- aEntity instanceof EntityLivingBase
- ? EnchantmentHelper.getEnchantmentModifierLiving(aPlayer, (EntityLivingBase) aEntity)
- : 0.0F,
- aEntity,
- aStack,
- aPlayer);
+ final float tMagicDamage = tStats
+ .getMagicDamageAgainstEntity(
+ aEntity instanceof EntityLivingBase
+ ? EnchantmentHelper
+ .getEnchantmentModifierLiving(aPlayer, (EntityLivingBase) aEntity)
+ : 0.0F,
+ aEntity,
+ aStack,
+ aPlayer);
float tDamage = tStats.getNormalDamageAgainstEntity(
- (float) aPlayer.getEntityAttribute(SharedMonsterAttributes.attackDamage)
- .getAttributeValue()
+ (float) aPlayer.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue()
+ this.getToolCombatDamage(aStack),
aEntity,
aStack,
aPlayer);
if ((tDamage + tMagicDamage) > 0.0F) {
- final boolean tCriticalHit = (aPlayer.fallDistance > 0.0F)
- && !aPlayer.onGround
+ final boolean tCriticalHit = (aPlayer.fallDistance > 0.0F) && !aPlayer.onGround
&& !aPlayer.isOnLadder()
&& !aPlayer.isInWater()
&& !aPlayer.isPotionActive(Potion.blindness)
@@ -250,10 +242,9 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
if (aEntity instanceof EntityLivingBase) {
aEntity.setFire(EnchantmentHelper.getFireAspectModifier(aPlayer) * 4);
}
- final int tKnockcack = (aPlayer.isSprinting() ? 1 : 0)
- + (aEntity instanceof EntityLivingBase
- ? EnchantmentHelper.getKnockbackModifier(aPlayer, (EntityLivingBase) aEntity)
- : 0);
+ final int tKnockcack = (aPlayer.isSprinting() ? 1 : 0) + (aEntity instanceof EntityLivingBase
+ ? EnchantmentHelper.getKnockbackModifier(aPlayer, (EntityLivingBase) aEntity)
+ : 0);
if (tKnockcack > 0) {
aEntity.addVelocity(
-MathHelper.sin((aPlayer.rotationYaw * (float) Math.PI) / 180.0F) * tKnockcack * 0.5F,
@@ -280,8 +271,8 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
if (aEntity instanceof EntityLivingBase) {
aPlayer.addStat(StatList.damageDealtStat, Math.round(tDamage * 10.0F));
}
- aEntity.hurtResistantTime =
- Math.max(1, tStats.getHurtResistanceTime(aEntity.hurtResistantTime, aEntity));
+ aEntity.hurtResistantTime = Math
+ .max(1, tStats.getHurtResistanceTime(aEntity.hurtResistantTime, aEntity));
aPlayer.addExhaustion(0.3F);
this.doDamage(aStack, tStats.getToolDamagePerEntityAttack());
}
@@ -313,12 +304,8 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("GT.ToolStats");
if ((aNBT != null) && aNBT.getBoolean("Electric")) {
- return new Long[] {
- aNBT.getLong("MaxCharge"),
- aNBT.getLong("Voltage"),
- aNBT.getLong("Tier"),
- aNBT.getLong("SpecialData")
- };
+ return new Long[] { aNBT.getLong("MaxCharge"), aNBT.getLong("Voltage"), aNBT.getLong("Tier"),
+ aNBT.getLong("SpecialData") };
}
}
return null;
@@ -348,14 +335,8 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
}
@Override
- public boolean onBlockDestroyed(
- final ItemStack aStack,
- final World aWorld,
- final Block aBlock,
- final int aX,
- final int aY,
- final int aZ,
- final EntityLivingBase aPlayer) {
+ public boolean onBlockDestroyed(final ItemStack aStack, final World aWorld, final Block aBlock, final int aX,
+ final int aY, final int aZ, final EntityLivingBase aPlayer) {
if (!this.isItemStackUsable(aStack)) {
return false;
}
@@ -364,8 +345,9 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
return false;
}
GT_Utility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F);
- this.doDamage(aStack, (int)
- Math.max(1, aBlock.getBlockHardness(aWorld, aX, aY, aZ) * tStats.getToolDamagePerBlockBreak()));
+ this.doDamage(
+ aStack,
+ (int) Math.max(1, aBlock.getBlockHardness(aWorld, aX, aY, aZ) * tStats.getToolDamagePerBlockBreak()));
return this.getDigSpeed(aStack, aBlock, aWorld.getBlockMetadata(aX, aY, aZ)) > 0.0F;
}
@@ -398,22 +380,16 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
}
@Override
- public float getSaplingModifier(
- final ItemStack aStack,
- final World aWorld,
- final EntityPlayer aPlayer,
- final int aX,
- final int aY,
- final int aZ) {
+ public float getSaplingModifier(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer,
+ final int aX, final int aY, final int aZ) {
final IToolStats tStats = this.getToolStats(aStack);
- return (tStats != null) && tStats.isGrafter()
- ? Math.min(100.0F, (1 + this.getHarvestLevel(aStack, "")) * 20.0F)
+ return (tStats != null) && tStats.isGrafter() ? Math.min(100.0F, (1 + this.getHarvestLevel(aStack, "")) * 20.0F)
: 0.0F;
}
@Override
- public boolean canWhack(
- final EntityPlayer aPlayer, final ItemStack aStack, final int aX, final int aY, final int aZ) {
+ public boolean canWhack(final EntityPlayer aPlayer, final ItemStack aStack, final int aX, final int aY,
+ final int aZ) {
if (!this.isItemStackUsable(aStack)) {
return false;
}
@@ -562,8 +538,7 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
}
}
for (final Entry<Integer, Integer> tEntry : tMap.entrySet()) {
- if ((tEntry.getKey() == 33)
- || ((tEntry.getKey() == 20) && (tEntry.getValue() > 2))
+ if ((tEntry.getKey() == 33) || ((tEntry.getKey() == 20) && (tEntry.getValue() > 2))
|| (tEntry.getKey() == Enchantment_Radioactivity.INSTANCE.effectId)) {
tResult.put(tEntry.getKey(), tEntry.getValue());
} else {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java
index e57f2009e7..463b6d9f7f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java
@@ -1,9 +1,7 @@
package gtPlusPlus.xmod.gregtech.api.items.types;
-import gregtech.api.enums.SubTag;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
import java.util.List;
+
import net.minecraft.block.BlockDispenser;
import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
import net.minecraft.dispenser.IBlockSource;
@@ -16,71 +14,47 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
+import gregtech.api.enums.SubTag;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
+
public class ToolType_Base implements Interface_ItemBehaviour<Gregtech_MetaItem_Base> {
+
@Override
- public boolean onLeftClickEntity(
- final Gregtech_MetaItem_Base aItem,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final Entity aEntity) {
+ public boolean onLeftClickEntity(final Gregtech_MetaItem_Base aItem, final ItemStack aStack,
+ final EntityPlayer aPlayer, final Entity aEntity) {
return false;
}
@Override
- public boolean onItemUse(
- final Gregtech_MetaItem_Base aItem,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final World aWorld,
- final int aX,
- final int aY,
- final int aZ,
- final int aSide,
- final float hitX,
- final float hitY,
- final float hitZ) {
+ public boolean onItemUse(final Gregtech_MetaItem_Base aItem, final ItemStack aStack, final EntityPlayer aPlayer,
+ final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX,
+ final float hitY, final float hitZ) {
return false;
}
@Override
- public boolean onItemUseFirst(
- final Gregtech_MetaItem_Base aItem,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final World aWorld,
- final int aX,
- final int aY,
- final int aZ,
- final int aSide,
- final float hitX,
- final float hitY,
- final float hitZ) {
+ public boolean onItemUseFirst(final Gregtech_MetaItem_Base aItem, final ItemStack aStack,
+ final EntityPlayer aPlayer, final World aWorld, final int aX, final int aY, final int aZ, final int aSide,
+ final float hitX, final float hitY, final float hitZ) {
return false;
}
@Override
- public ItemStack onItemRightClick(
- final Gregtech_MetaItem_Base aItem,
- final ItemStack aStack,
- final World aWorld,
+ public ItemStack onItemRightClick(final Gregtech_MetaItem_Base aItem, final ItemStack aStack, final World aWorld,
final EntityPlayer aPlayer) {
return aStack;
}
@Override
- public List<String> getAdditionalToolTips(
- final Gregtech_MetaItem_Base aItem, final List<String> aList, final ItemStack aStack) {
+ public List<String> getAdditionalToolTips(final Gregtech_MetaItem_Base aItem, final List<String> aList,
+ final ItemStack aStack) {
return aList;
}
@Override
- public void onUpdate(
- final Gregtech_MetaItem_Base aItem,
- final ItemStack aStack,
- final World aWorld,
- final Entity aPlayer,
- final int aTimer,
- final boolean aIsInHand) {}
+ public void onUpdate(final Gregtech_MetaItem_Base aItem, final ItemStack aStack, final World aWorld,
+ final Entity aPlayer, final int aTimer, final boolean aIsInHand) {}
@Override
public boolean isItemStackUsable(final Gregtech_MetaItem_Base aItem, final ItemStack aStack) {
@@ -93,8 +67,8 @@ public class ToolType_Base implements Interface_ItemBehaviour<Gregtech_MetaItem_
}
@Override
- public ItemStack onDispense(
- final Gregtech_MetaItem_Base aItem, final IBlockSource aSource, final ItemStack aStack) {
+ public ItemStack onDispense(final Gregtech_MetaItem_Base aItem, final IBlockSource aSource,
+ final ItemStack aStack) {
final EnumFacing enumfacing = BlockDispenser.func_149937_b(aSource.getBlockMetadata());
final IPosition iposition = BlockDispenser.func_149939_a(aSource);
final ItemStack itemstack1 = aStack.splitStack(1);
@@ -103,31 +77,20 @@ public class ToolType_Base implements Interface_ItemBehaviour<Gregtech_MetaItem_
}
@Override
- public boolean hasProjectile(
- final Gregtech_MetaItem_Base aItem, final SubTag aProjectileType, final ItemStack aStack) {
+ public boolean hasProjectile(final Gregtech_MetaItem_Base aItem, final SubTag aProjectileType,
+ final ItemStack aStack) {
return false;
}
@Override
- public EntityArrow getProjectile(
- final Gregtech_MetaItem_Base aItem,
- final SubTag aProjectileType,
- final ItemStack aStack,
- final World aWorld,
- final double aX,
- final double aY,
- final double aZ) {
+ public EntityArrow getProjectile(final Gregtech_MetaItem_Base aItem, final SubTag aProjectileType,
+ final ItemStack aStack, final World aWorld, final double aX, final double aY, final double aZ) {
return null;
}
@Override
- public EntityArrow getProjectile(
- final Gregtech_MetaItem_Base aItem,
- final SubTag aProjectileType,
- final ItemStack aStack,
- final World aWorld,
- final EntityLivingBase aEntity,
- final float aSpeed) {
+ public EntityArrow getProjectile(final Gregtech_MetaItem_Base aItem, final SubTag aProjectileType,
+ final ItemStack aStack, final World aWorld, final EntityLivingBase aEntity, final float aSpeed) {
return null;
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java
index 49063c43c2..6ed462d31f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java
@@ -1,15 +1,8 @@
package gtPlusPlus.xmod.gregtech.api.items.types;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Materials;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.objects.ItemData;
-import gregtech.api.util.*;
-import gregtech.common.blocks.GT_Block_Ores;
-import gregtech.common.blocks.GT_TileEntity_Ores;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -19,29 +12,30 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.IFluidBlock;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Materials;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.objects.ItemData;
+import gregtech.api.util.*;
+import gregtech.common.blocks.GT_Block_Ores;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+
public class ToolType_HardHammer extends ToolType_Base {
+
private final int mVanillaCosts;
private final int mEUCosts;
- private final String mTooltip =
- GT_LanguageManager.addStringLocalization("gt.behaviour.prospecting", "Usable for Prospecting");
+ private final String mTooltip = GT_LanguageManager
+ .addStringLocalization("gt.behaviour.prospecting", "Usable for Prospecting");
public ToolType_HardHammer(final int aVanillaCosts, final int aEUCosts) {
this.mVanillaCosts = aVanillaCosts;
this.mEUCosts = aEUCosts;
}
- public boolean onItemUseFirst(
- final GT_MetaBase_Item aItem,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final World aWorld,
- final int aX,
- final int aY,
- final int aZ,
- final int aSide,
- final float hitX,
- final float hitY,
- final float hitZ) {
+ public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
+ final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX,
+ final float hitY, final float hitZ) {
if (aWorld.isRemote) {
return false;
}
@@ -54,9 +48,16 @@ public class ToolType_HardHammer extends ToolType_Base {
ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta));
if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
GT_Utility.sendChatToPlayer(
- aPlayer, "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
+ aPlayer,
+ "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(1)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
return true;
}
if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone))
@@ -65,7 +66,13 @@ public class ToolType_HardHammer extends ToolType_Base {
|| (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone))) {
if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(1)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
int tX = aX;
int tY = aY;
int tZ = aZ;
@@ -85,8 +92,7 @@ public class ToolType_HardHammer extends ToolType_Base {
GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Rock.");
break;
}
- if ((tBlock == Blocks.water)
- || (tBlock == Blocks.flowing_water)
+ if ((tBlock == Blocks.water) || (tBlock == Blocks.flowing_water)
|| ((tBlock instanceof IFluidBlock))) {
GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Rock.");
break;
@@ -113,19 +119,19 @@ public class ToolType_HardHammer extends ToolType_Base {
if ((tBlock instanceof GT_Block_Ores)) {
final TileEntity tTileEntity = aWorld.getTileEntity(tX, tY, tZ);
if ((tTileEntity instanceof GT_TileEntity_Ores)) {
- final Materials tMaterial = GregTech_API.sGeneratedMaterials[
- (((GT_TileEntity_Ores) tTileEntity).mMetaData % 1000)];
+ final Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData
+ % 1000)];
if ((tMaterial != null) && (tMaterial != Materials._NULL)) {
GT_Utility.sendChatToPlayer(
- aPlayer, "Found traces of " + tMaterial.mDefaultLocalName + " Ore.");
+ aPlayer,
+ "Found traces of " + tMaterial.mDefaultLocalName + " Ore.");
return true;
}
}
} else {
tMetaID = aWorld.getBlockMetadata(tX, tY, tZ);
tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
- if ((tAssotiation != null)
- && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
+ if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
GT_Utility.sendChatToPlayer(
aPlayer,
"Found traces of " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
@@ -140,8 +146,8 @@ public class ToolType_HardHammer extends ToolType_Base {
return false;
}
- public List<String> getAdditionalToolTips(
- final GT_MetaBase_Item aItem, final List<String> aList, final ItemStack aStack) {
+ public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList,
+ final ItemStack aStack) {
aList.add(this.mTooltip);
return aList;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java
index f1dd3b391d..1504b45d8e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java
@@ -1,36 +1,30 @@
package gtPlusPlus.xmod.gregtech.api.items.types;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_Utility;
+
public class ToolType_Pump extends ToolType_Base {
+
private final int mCosts;
- private final String mTooltip = GT_LanguageManager.addStringLocalization(
- "gt.behaviour.pump", "Sucks in Machine Input Fluid tank contents on Rightclick");
+ private final String mTooltip = GT_LanguageManager
+ .addStringLocalization("gt.behaviour.pump", "Sucks in Machine Input Fluid tank contents on Rightclick");
public ToolType_Pump(final int aCosts) {
this.mCosts = aCosts;
}
- public boolean onItemUseFirst(
- final GT_MetaBase_Item aItem,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final World aWorld,
- final int aX,
- final int aY,
- final int aZ,
- final int aSide,
- final float hitX,
- final float hitY,
- final float hitZ) {
+ public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
+ final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX,
+ final float hitY, final float hitZ) {
if (aWorld.isRemote) {
return false;
}
@@ -41,110 +35,72 @@ public class ToolType_Pump extends ToolType_Base {
final byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
final byte aTargetSide = GT_Utility.determineWrenchingSide((byte) aSide, hitX, hitY, hitZ);
final TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
- /*try {
- if ((aTileEntity != null) && ((aTileEntity instanceof IWrenchable))) {
- if (((IWrenchable) aTileEntity).wrenchCanSetFacing(aPlayer, aTargetSide)) {
- if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
- ((IWrenchable) aTileEntity).setFacing(aTargetSide);
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }
- return true;
- }
- if (((IWrenchable) aTileEntity).wrenchCanRemove(aPlayer)) {
- final int tDamage = ((IWrenchable) aTileEntity).getWrenchDropRate() < 1.0F ? 10 : 3;
- if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, tDamage * this.mCosts))) {
- ItemStack tOutput = ((IWrenchable) aTileEntity).getWrenchDrop(aPlayer);
- for (final ItemStack tStack : aBlock.getDrops(aWorld, aX, aY, aZ, aMeta, 0)) {
- if (tOutput == null) {
- aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, tStack));
- } else {
- aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, tOutput));
- tOutput = null;
- }
- }
- aWorld.setBlockToAir(aX, aY, aZ);
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }
- return true;
- }
- return true;
- }
- } catch (final Throwable e) {
- }
- if ((aBlock == Blocks.log) || (aBlock == Blocks.log2) || (aBlock == Blocks.hay_block)) {
- if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
- aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 4) % 12, 3);
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }
- return true;
- }
- if ((aBlock == Blocks.powered_repeater) || (aBlock == Blocks.unpowered_repeater)) {
- if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
- aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta / 4) * 4) + (((aMeta % 4) + 1) % 4), 3);
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }
- return true;
- }
- if ((aBlock == Blocks.powered_comparator) || (aBlock == Blocks.unpowered_comparator)) {
- if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
- aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta / 4) * 4) + (((aMeta % 4) + 1) % 4), 3);
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }
- return true;
- }
- if ((aBlock == Blocks.crafting_table) || (aBlock == Blocks.bookshelf)) {
- if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
- aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, new ItemStack(aBlock, 1, aMeta)));
- aWorld.setBlockToAir(aX, aY, aZ);
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }
- return true;
- }
- if (aMeta == aTargetSide) {
- if ((aBlock == Blocks.pumpkin) || (aBlock == Blocks.lit_pumpkin) || (aBlock == Blocks.piston) || (aBlock == Blocks.sticky_piston) || (aBlock == Blocks.dispenser) || (aBlock == Blocks.dropper) || (aBlock == Blocks.furnace) || (aBlock == Blocks.lit_furnace) || (aBlock == Blocks.chest) || (aBlock == Blocks.trapped_chest) || (aBlock == Blocks.ender_chest) || (aBlock == Blocks.hopper)) {
- if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
- aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, new ItemStack(aBlock, 1, 0)));
- aWorld.setBlockToAir(aX, aY, aZ);
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }
- return true;
- }
- } else {
- if ((aBlock == Blocks.piston) || (aBlock == Blocks.sticky_piston) || (aBlock == Blocks.dispenser) || (aBlock == Blocks.dropper)) {
- if ((aMeta < 6) && ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
- aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3);
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }
- return true;
- }
- if ((aBlock == Blocks.pumpkin) || (aBlock == Blocks.lit_pumpkin) || (aBlock == Blocks.furnace) || (aBlock == Blocks.lit_furnace) || (aBlock == Blocks.chest) || (aBlock == Blocks.ender_chest) || (aBlock == Blocks.trapped_chest)) {
- if ((aTargetSide > 1) && ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
- aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3);
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }
- return true;
- }
- if (aBlock == Blocks.hopper) {
- if ((aTargetSide != 1) && ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
- aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3);
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }
- return true;
- }
- }
- if ((Arrays.asList(aBlock.getValidRotations(aWorld, aX, aY, aZ)).contains(ForgeDirection.getOrientation(aTargetSide))) &&
- ((aPlayer.capabilities.isCreativeMode) || (!GT_ModHandler.isElectricItem(aStack)) || (GT_ModHandler.canUseElectricItem(aStack, this.mCosts))) &&
- (aBlock.rotateBlock(aWorld, aX, aY, aZ, ForgeDirection.getOrientation(aTargetSide)))) {
- if (!aPlayer.capabilities.isCreativeMode) {
- ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts);
- }
- GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
- }*/
+ /*
+ * try { if ((aTileEntity != null) && ((aTileEntity instanceof IWrenchable))) { if (((IWrenchable)
+ * aTileEntity).wrenchCanSetFacing(aPlayer, aTargetSide)) { if ((aPlayer.capabilities.isCreativeMode) ||
+ * (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { ((IWrenchable)
+ * aTileEntity).setFacing(aTargetSide); GT_Utility.sendSoundToPlayers(aWorld,
+ * GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ); } return true; } if
+ * (((IWrenchable) aTileEntity).wrenchCanRemove(aPlayer)) { final int tDamage = ((IWrenchable)
+ * aTileEntity).getWrenchDropRate() < 1.0F ? 10 : 3; if ((aPlayer.capabilities.isCreativeMode) ||
+ * (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, tDamage * this.mCosts))) { ItemStack tOutput =
+ * ((IWrenchable) aTileEntity).getWrenchDrop(aPlayer); for (final ItemStack tStack : aBlock.getDrops(aWorld, aX,
+ * aY, aZ, aMeta, 0)) { if (tOutput == null) { aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY +
+ * 0.5D, aZ + 0.5D, tStack)); } else { aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ
+ * + 0.5D, tOutput)); tOutput = null; } } aWorld.setBlockToAir(aX, aY, aZ);
+ * GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY,
+ * aZ); } return true; } return true; } } catch (final Throwable e) { } if ((aBlock == Blocks.log) || (aBlock ==
+ * Blocks.log2) || (aBlock == Blocks.hay_block)) { if ((aPlayer.capabilities.isCreativeMode) ||
+ * (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY,
+ * aZ, (aMeta + 4) % 12, 3); GT_Utility.sendSoundToPlayers(aWorld,
+ * GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ); } return true; } if ((aBlock ==
+ * Blocks.powered_repeater) || (aBlock == Blocks.unpowered_repeater)) { if
+ * ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+ * aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta / 4) * 4) + (((aMeta % 4) + 1) % 4), 3);
+ * GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY,
+ * aZ); } return true; } if ((aBlock == Blocks.powered_comparator) || (aBlock == Blocks.unpowered_comparator)) {
+ * if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))
+ * { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta / 4) * 4) + (((aMeta % 4) + 1) % 4), 3);
+ * GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY,
+ * aZ); } return true; } if ((aBlock == Blocks.crafting_table) || (aBlock == Blocks.bookshelf)) { if
+ * ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+ * aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, new ItemStack(aBlock, 1,
+ * aMeta))); aWorld.setBlockToAir(aX, aY, aZ); GT_Utility.sendSoundToPlayers(aWorld,
+ * GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ); } return true; } if (aMeta ==
+ * aTargetSide) { if ((aBlock == Blocks.pumpkin) || (aBlock == Blocks.lit_pumpkin) || (aBlock == Blocks.piston)
+ * || (aBlock == Blocks.sticky_piston) || (aBlock == Blocks.dispenser) || (aBlock == Blocks.dropper) || (aBlock
+ * == Blocks.furnace) || (aBlock == Blocks.lit_furnace) || (aBlock == Blocks.chest) || (aBlock ==
+ * Blocks.trapped_chest) || (aBlock == Blocks.ender_chest) || (aBlock == Blocks.hopper)) { if
+ * ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+ * aWorld.spawnEntityInWorld(new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, new ItemStack(aBlock, 1,
+ * 0))); aWorld.setBlockToAir(aX, aY, aZ); GT_Utility.sendSoundToPlayers(aWorld,
+ * GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ); } return true; } } else { if
+ * ((aBlock == Blocks.piston) || (aBlock == Blocks.sticky_piston) || (aBlock == Blocks.dispenser) || (aBlock ==
+ * Blocks.dropper)) { if ((aMeta < 6) && ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool)
+ * aItem).doDamage(aStack, this.mCosts)))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3);
+ * GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY,
+ * aZ); } return true; } if ((aBlock == Blocks.pumpkin) || (aBlock == Blocks.lit_pumpkin) || (aBlock ==
+ * Blocks.furnace) || (aBlock == Blocks.lit_furnace) || (aBlock == Blocks.chest) || (aBlock ==
+ * Blocks.ender_chest) || (aBlock == Blocks.trapped_chest)) { if ((aTargetSide > 1) &&
+ * ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
+ * aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3); GT_Utility.sendSoundToPlayers(aWorld,
+ * GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ); } return true; } if (aBlock ==
+ * Blocks.hopper) { if ((aTargetSide != 1) && ((aPlayer.capabilities.isCreativeMode) ||
+ * (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) { aWorld.setBlockMetadataWithNotify(aX, aY,
+ * aZ, aTargetSide, 3); GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ * 1.0F, -1.0F, aX, aY, aZ); } return true; } } if ((Arrays.asList(aBlock.getValidRotations(aWorld, aX, aY,
+ * aZ)).contains(ForgeDirection.getOrientation(aTargetSide))) && ((aPlayer.capabilities.isCreativeMode) ||
+ * (!GT_ModHandler.isElectricItem(aStack)) || (GT_ModHandler.canUseElectricItem(aStack, this.mCosts))) &&
+ * (aBlock.rotateBlock(aWorld, aX, aY, aZ, ForgeDirection.getOrientation(aTargetSide)))) { if
+ * (!aPlayer.capabilities.isCreativeMode) { ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts); }
+ * GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY,
+ * aZ); }
+ */
return false;
}
- public List<String> getAdditionalToolTips(
- final GT_MetaBase_Item aItem, final List<String> aList, final ItemStack aStack) {
+ public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList,
+ final ItemStack aStack) {
aList.add(this.mTooltip);
return aList;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java
index 6c12663bb6..acd48785f4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java
@@ -1,14 +1,8 @@
package gtPlusPlus.xmod.gregtech.api.items.types;
-import gregtech.api.GregTech_API;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
-import ic2.api.tile.IWrenchable;
import java.util.Arrays;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@@ -18,27 +12,27 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import gregtech.api.GregTech_API;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
+import ic2.api.tile.IWrenchable;
+
public class ToolType_Wrench extends ToolType_Base {
+
private final int mCosts;
- private final String mTooltip =
- GT_LanguageManager.addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick");
+ private final String mTooltip = GT_LanguageManager
+ .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick");
public ToolType_Wrench(final int aCosts) {
this.mCosts = aCosts;
}
- public boolean onItemUseFirst(
- final GT_MetaBase_Item aItem,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final World aWorld,
- final int aX,
- final int aY,
- final int aZ,
- final int aSide,
- final float hitX,
- final float hitY,
- final float hitZ) {
+ public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
+ final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX,
+ final float hitY, final float hitZ) {
if (aWorld.isRemote) {
return false;
}
@@ -56,7 +50,13 @@ public class ToolType_Wrench extends ToolType_Base {
|| (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
((IWrenchable) aTileEntity).setFacing(aTargetSide);
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return true;
}
@@ -77,20 +77,31 @@ public class ToolType_Wrench extends ToolType_Base {
}
aWorld.setBlockToAir(aX, aY, aZ);
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return true;
}
return true;
}
- } catch (final Throwable e) {
- }
+ } catch (final Throwable e) {}
if ((aBlock == Blocks.log) || (aBlock == Blocks.log2) || (aBlock == Blocks.hay_block)) {
if ((aPlayer.capabilities.isCreativeMode)
|| (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 4) % 12, 3);
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return true;
}
@@ -99,7 +110,13 @@ public class ToolType_Wrench extends ToolType_Base {
|| (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta / 4) * 4) + (((aMeta % 4) + 1) % 4), 3);
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return true;
}
@@ -108,7 +125,13 @@ public class ToolType_Wrench extends ToolType_Base {
|| (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta / 4) * 4) + (((aMeta % 4) + 1) % 4), 3);
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return true;
}
@@ -119,13 +142,18 @@ public class ToolType_Wrench extends ToolType_Base {
new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, new ItemStack(aBlock, 1, aMeta)));
aWorld.setBlockToAir(aX, aY, aZ);
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return true;
}
if (aMeta == aTargetSide) {
- if ((aBlock == Blocks.pumpkin)
- || (aBlock == Blocks.lit_pumpkin)
+ if ((aBlock == Blocks.pumpkin) || (aBlock == Blocks.lit_pumpkin)
|| (aBlock == Blocks.piston)
|| (aBlock == Blocks.sticky_piston)
|| (aBlock == Blocks.dispenser)
@@ -142,68 +170,92 @@ public class ToolType_Wrench extends ToolType_Base {
new EntityItem(aWorld, aX + 0.5D, aY + 0.5D, aZ + 0.5D, new ItemStack(aBlock, 1, 0)));
aWorld.setBlockToAir(aX, aY, aZ);
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return true;
}
} else {
- if ((aBlock == Blocks.piston)
- || (aBlock == Blocks.sticky_piston)
+ if ((aBlock == Blocks.piston) || (aBlock == Blocks.sticky_piston)
|| (aBlock == Blocks.dispenser)
|| (aBlock == Blocks.dropper)) {
- if ((aMeta < 6)
- && ((aPlayer.capabilities.isCreativeMode)
- || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
+ if ((aMeta < 6) && ((aPlayer.capabilities.isCreativeMode)
+ || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3);
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return true;
}
- if ((aBlock == Blocks.pumpkin)
- || (aBlock == Blocks.lit_pumpkin)
+ if ((aBlock == Blocks.pumpkin) || (aBlock == Blocks.lit_pumpkin)
|| (aBlock == Blocks.furnace)
|| (aBlock == Blocks.lit_furnace)
|| (aBlock == Blocks.chest)
|| (aBlock == Blocks.ender_chest)
|| (aBlock == Blocks.trapped_chest)) {
- if ((aTargetSide > 1)
- && ((aPlayer.capabilities.isCreativeMode)
- || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
+ if ((aTargetSide > 1) && ((aPlayer.capabilities.isCreativeMode)
+ || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3);
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return true;
}
if (aBlock == Blocks.hopper) {
- if ((aTargetSide != 1)
- && ((aPlayer.capabilities.isCreativeMode)
- || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
+ if ((aTargetSide != 1) && ((aPlayer.capabilities.isCreativeMode)
+ || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) {
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aTargetSide, 3);
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return true;
}
}
if ((Arrays.asList(aBlock.getValidRotations(aWorld, aX, aY, aZ))
- .contains(ForgeDirection.getOrientation(aTargetSide)))
- && ((aPlayer.capabilities.isCreativeMode)
- || (!GT_ModHandler.isElectricItem(aStack))
+ .contains(ForgeDirection.getOrientation(aTargetSide)))
+ && ((aPlayer.capabilities.isCreativeMode) || (!GT_ModHandler.isElectricItem(aStack))
|| (GT_ModHandler.canUseElectricItem(aStack, this.mCosts)))
&& (aBlock.rotateBlock(aWorld, aX, aY, aZ, ForgeDirection.getOrientation(aTargetSide)))) {
if (!aPlayer.capabilities.isCreativeMode) {
((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts);
}
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(100)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(100)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
}
return false;
}
- public List<String> getAdditionalToolTips(
- final GT_MetaBase_Item aItem, final List<String> aList, final ItemStack aStack) {
+ public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList,
+ final ItemStack aStack) {
aList.add(this.mTooltip);
return aList;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
index a88105f7f6..aae4494f88 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Random;
+
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
@@ -12,12 +20,6 @@ import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.gregtech.api.interfaces.IBaseCustomMetaTileEntity;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
import ic2.api.Direction;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Random;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class BaseCustomTileEntity extends BaseMetaTileEntity implements IBaseCustomMetaTileEntity {
@@ -76,16 +78,13 @@ public class BaseCustomTileEntity extends BaseMetaTileEntity implements IBaseCus
}
if (this.getUniversalEnergyCapacity() > 0L
&& this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 5L) {
- this.doExplosion(this.getOutput()
- * (long)
- (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity()
- ? 4
- : (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 2L
- ? 2
- : 1)));
+ this.doExplosion(
+ this.getOutput() * (long) (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() ? 4
+ : (this.getUniversalEnergyStored() >= this.getUniversalEnergyCapacity() / 2L ? 2 : 1)));
GT_Mod arg9999 = GT_Mod.instance;
GT_Mod.achievements.issueAchievement(
- this.getWorldObj().getPlayerEntityByName(this.getOwnerName()), "electricproblems");
+ this.getWorldObj().getPlayerEntityByName(this.getOwnerName()),
+ "electricproblems");
}
}
@@ -147,8 +146,7 @@ public class BaseCustomTileEntity extends BaseMetaTileEntity implements IBaseCus
(double) ((float) this.zCoord + tRandom.nextFloat() * 0.8F + 0.1F),
new ItemStack(tItem.getItem(), tItem.stackSize, tItem.getItemDamage()));
if (tItem.hasTagCompound()) {
- tItemEntity.getEntityItem().setTagCompound((NBTTagCompound)
- tItem.getTagCompound().copy());
+ tItemEntity.getEntityItem().setTagCompound((NBTTagCompound) tItem.getTagCompound().copy());
}
tItemEntity.motionX = tRandom.nextGaussian() * 0.0500000007450581D;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java
index b3d8b8aa8c..ba67ba6466 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java
@@ -1,10 +1,11 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity;
import ic2.api.Direction;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
public class BaseCustomPower_MTE extends BaseCustomTileEntity {
@@ -21,8 +22,7 @@ public class BaseCustomPower_MTE extends BaseCustomTileEntity {
if (mMetaTileEntity == null) {
Logger.INFO("Bad Tile");
}
- if (this.canAccessData()
- && this.mMetaTileEntity.isElectric()
+ if (this.canAccessData() && this.mMetaTileEntity.isElectric()
&& this.inputEnergyFrom(aSide)
&& aAmperage > 0L
&& aVoltage > 0L
@@ -37,8 +37,9 @@ public class BaseCustomPower_MTE extends BaseCustomTileEntity {
Logger.INFO("aAmperage: " + aAmperage);
Logger.INFO("aVoltage: " + aVoltage);
Logger.INFO("this.getStoredEU() < this.getEUCapacity(): " + (this.getStoredEU() < this.getEUCapacity()));
- Logger.INFO("this.mMetaTileEntity.maxAmperesIn() >= this.mAcceptedAmperes: "
- + (this.mMetaTileEntity.maxAmperesIn() >= this.getInputAmperage()));
+ Logger.INFO(
+ "this.mMetaTileEntity.maxAmperesIn() >= this.mAcceptedAmperes: "
+ + (this.mMetaTileEntity.maxAmperesIn() >= this.getInputAmperage()));
Logger.INFO("this.mMetaTileEntity.maxAmperesIn(): " + (this.mMetaTileEntity.maxAmperesIn()));
Logger.INFO("this.mAcceptedAmperes: " + (this.getInputAmperage()));
return 0L;
@@ -47,13 +48,12 @@ public class BaseCustomPower_MTE extends BaseCustomTileEntity {
public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) {
Logger.INFO("Draining Energy Units 4");
- if (this.canAccessData()
- && this.mMetaTileEntity.isElectric()
+ if (this.canAccessData() && this.mMetaTileEntity.isElectric()
&& this.outputsEnergyTo(aSide)
&& this.getStoredEU() - aVoltage * aAmperage >= this.mMetaTileEntity.getMinimumStoredEU()) {
if (this.decreaseStoredEU(aVoltage * aAmperage, false)) {
- this.mAverageEUOutput[this.mAverageEUOutputIndex] =
- (int) ((long) this.mAverageEUOutput[this.mAverageEUOutputIndex] + aVoltage * aAmperage);
+ this.mAverageEUOutput[this.mAverageEUOutputIndex] = (int) ((long) this.mAverageEUOutput[this.mAverageEUOutputIndex]
+ + aVoltage * aAmperage);
return true;
} else {
return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java
index 841359c0b2..0060cba12c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power;
+import java.util.Collection;
+import java.util.Iterator;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures.BlockIcons;
import gregtech.api.gui.modularui.GT_UIInfos;
@@ -10,21 +18,16 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import java.util.Collection;
-import java.util.Iterator;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public abstract class GTPP_MTE_BasicLosslessGenerator extends GTPP_MTE_BasicTank {
- public GTPP_MTE_BasicLosslessGenerator(
- int aID, String aName, String aNameRegional, int aTier, String aDescription, ITexture... aTextures) {
+
+ public GTPP_MTE_BasicLosslessGenerator(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+ ITexture... aTextures) {
super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
}
- public GTPP_MTE_BasicLosslessGenerator(
- int aID, String aName, String aNameRegional, int aTier, String[] aDescription, ITexture... aTextures) {
+ public GTPP_MTE_BasicLosslessGenerator(int aID, String aName, String aNameRegional, int aTier,
+ String[] aDescription, ITexture... aTextures) {
super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
}
@@ -55,21 +58,11 @@ public abstract class GTPP_MTE_BasicLosslessGenerator extends GTPP_MTE_BasicTank
return rTextures;
}
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : (aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : (aSide == 0 ? 2 : (aSide == 1 ? 3 : 4))))][
- aColorIndex + 1];
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : (aSide == GT_Utility.getOppositeSide(aFacing) ? 1
+ : (aSide == 0 ? 2 : (aSide == 1 ? 3 : 4))))][aColorIndex + 1];
}
public String[] getDescription() {
@@ -86,23 +79,23 @@ public abstract class GTPP_MTE_BasicLosslessGenerator extends GTPP_MTE_BasicTank
}
public ITexture[] getFront(byte aColor) {
- return new ITexture[] {BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getBack(byte aColor) {
- return new ITexture[] {BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getBottom(byte aColor) {
- return new ITexture[] {BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getTop(byte aColor) {
- return new ITexture[] {BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getSides(byte aColor) {
- return new ITexture[] {BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getFrontActive(byte aColor) {
@@ -198,8 +191,10 @@ public abstract class GTPP_MTE_BasicLosslessGenerator extends GTPP_MTE_BasicTank
this.mInventory[this.getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
}
- this.mInventory[this.getStackDisplaySlot()].setStackDisplayName("Generating: "
- + (aBaseMetaTileEntity.getUniversalEnergyStored() - this.getMinimumStoredEU()) + " EU");
+ this.mInventory[this.getStackDisplaySlot()].setStackDisplayName(
+ "Generating: "
+ + (aBaseMetaTileEntity.getUniversalEnergyStored() - this.getMinimumStoredEU())
+ + " EU");
}
} else {
tFuelValue = this.getFuelValue(this.mFluid);
@@ -208,9 +203,8 @@ public abstract class GTPP_MTE_BasicLosslessGenerator extends GTPP_MTE_BasicTank
long tFluidAmountToUse = Math.min(
(long) (this.mFluid.amount / tConsumed),
(this.maxEUStore() - aBaseMetaTileEntity.getUniversalEnergyStored()) / (long) tFuelValue);
- if (tFluidAmountToUse > 0L
- && aBaseMetaTileEntity.increaseStoredEnergyUnits(
- tFluidAmountToUse * (long) tFuelValue, true)) {
+ if (tFluidAmountToUse > 0L && aBaseMetaTileEntity
+ .increaseStoredEnergyUnits(tFluidAmountToUse * (long) tFuelValue, true)) {
PollutionUtils.addPollution(this.getBaseMetaTileEntity(), 10 * this.getPollution());
this.mFluid.amount = (int) ((long) this.mFluid.amount - tFluidAmountToUse * (long) tConsumed);
}
@@ -235,8 +229,8 @@ public abstract class GTPP_MTE_BasicLosslessGenerator extends GTPP_MTE_BasicTank
if (aBaseMetaTileEntity.isServerSide()) {
Logger.WARNING("Ticking Servside");
- aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork()
- && aBaseMetaTileEntity.getUniversalEnergyStored()
+ aBaseMetaTileEntity.setActive(
+ aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.getUniversalEnergyStored()
>= this.maxEUOutput() + this.getMinimumStoredEU());
}
}
@@ -264,15 +258,13 @@ public abstract class GTPP_MTE_BasicLosslessGenerator extends GTPP_MTE_BasicTank
if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null
&& aLiquid.isFluidEqual(tLiquid)) {
Logger.WARNING("Fuel Ok");
- return (int) ((long) tFuel.mSpecialValue
- * (long) this.getEfficiency()
+ return (int) ((long) tFuel.mSpecialValue * (long) this.getEfficiency()
* (long) this.consumedFluidPerOperation(tLiquid)
/ 100L);
}
if ((tLiquid = tFuel.getRepresentativeFluidInput(0)) != null && aLiquid.isFluidEqual(tLiquid)) {
Logger.WARNING("Fuel Ok");
- return (int) ((long) tFuel.mSpecialValue
- * (long) this.getEfficiency()
+ return (int) ((long) tFuel.mSpecialValue * (long) this.getEfficiency()
* (long) this.consumedFluidPerOperation(tLiquid)
/ 100L);
}
@@ -288,11 +280,12 @@ public abstract class GTPP_MTE_BasicLosslessGenerator extends GTPP_MTE_BasicTank
public int getFuelValue(ItemStack aStack) {
if (!GT_Utility.isStackInvalid(aStack) && this.getRecipes() != null) {
Logger.WARNING("Fuel Item OK");
- GT_Recipe tFuel = this.getRecipes()
- .findRecipe(
- this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, (FluidStack[]) null, new ItemStack[] {
- aStack
- });
+ GT_Recipe tFuel = this.getRecipes().findRecipe(
+ this.getBaseMetaTileEntity(),
+ false,
+ Long.MAX_VALUE,
+ (FluidStack[]) null,
+ new ItemStack[] { aStack });
return tFuel != null ? (int) ((long) tFuel.mSpecialValue * 1000L * (long) this.getEfficiency() / 100L) : 0;
} else {
return 0;
@@ -301,13 +294,13 @@ public abstract class GTPP_MTE_BasicLosslessGenerator extends GTPP_MTE_BasicTank
public ItemStack getEmptyContainer(ItemStack aStack) {
if (!GT_Utility.isStackInvalid(aStack) && this.getRecipes() != null) {
- GT_Recipe tFuel = this.getRecipes()
- .findRecipe(
- this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, (FluidStack[]) null, new ItemStack[] {
- aStack
- });
- return tFuel != null
- ? GT_Utility.copy(new Object[] {tFuel.getOutput(0)})
+ GT_Recipe tFuel = this.getRecipes().findRecipe(
+ this.getBaseMetaTileEntity(),
+ false,
+ Long.MAX_VALUE,
+ (FluidStack[]) null,
+ new ItemStack[] { aStack });
+ return tFuel != null ? GT_Utility.copy(new Object[] { tFuel.getOutput(0) })
: GT_Utility.getContainerItem(aStack, true);
} else {
return null;
@@ -315,9 +308,8 @@ public abstract class GTPP_MTE_BasicLosslessGenerator extends GTPP_MTE_BasicTank
}
public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
- return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)
- && (this.getFuelValue(aStack) > 0
- || this.getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0);
+ return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack) && (this.getFuelValue(aStack) > 0
+ || this.getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0);
}
public int getCapacity() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java
index cb3f42b6f6..2721dc437e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java
@@ -2,6 +2,17 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power;
import static gregtech.api.enums.GT_Values.V;
+import java.util.Arrays;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidHandler;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Textures;
@@ -16,79 +27,48 @@ import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.random.XSTR;
-import java.util.Arrays;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidHandler;
/**
* NEVER INCLUDE THIS FILE IN YOUR MOD!!!
* <p/>
- * This is the main construct for my Basic Machines such as the Automatic Extractor
- * Extend this class to make a simple Machine
+ * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
+ * Machine
*/
public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
+
/**
* return values for checkRecipe()
*/
- protected static final int DID_NOT_FIND_RECIPE = 0,
- FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS = 1,
+ protected static final int DID_NOT_FIND_RECIPE = 0, FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS = 1,
FOUND_AND_SUCCESSFULLY_USED_RECIPE = 2;
public static final int OTHER_SLOT_COUNT = 4;
public final ItemStack[] mOutputItems;
public final int mInputSlotCount, mAmperage;
- public boolean mAllowInputFromOutputSide = false,
- mFluidTransfer = false,
- mItemTransfer = false,
- mHasBeenUpdated = false,
- mStuttering = false,
- mCharge = false,
- mDecharge = false;
+ public boolean mAllowInputFromOutputSide = false, mFluidTransfer = false, mItemTransfer = false,
+ mHasBeenUpdated = false, mStuttering = false, mCharge = false, mDecharge = false;
public int mMainFacing = -1, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mOutputBlocked = 0;
public FluidStack mOutputFluid;
public String mGUIName = "", mNEIName = "";
public GT_MetaTileEntity_MultiBlockBase mCleanroom;
/**
- * Contains the Recipe which has been previously used, or null if there was no previous Recipe, which could have been buffered
+ * Contains the Recipe which has been previously used, or null if there was no previous Recipe, which could have
+ * been buffered
*/
protected GT_Recipe mLastRecipe = null;
private FluidStack mFluidOut;
/**
- * @param aOverlays 0 = SideFacingActive
- * 1 = SideFacingInactive
- * 2 = FrontFacingActive
- * 3 = FrontFacingInactive
- * 4 = TopFacingActive
- * 5 = TopFacingInactive
- * 6 = BottomFacingActive
- * 7 = BottomFacingInactive
- * ----- Not all Array Elements have to be initialised, you can also just use 8 Parameters for the Default Pipe Texture Overlays -----
- * 8 = BottomFacingPipeActive
- * 9 = BottomFacingPipeInactive
- * 10 = TopFacingPipeActive
- * 11 = TopFacingPipeInactive
- * 12 = SideFacingPipeActive
- * 13 = SideFacingPipeInactive
+ * @param aOverlays 0 = SideFacingActive 1 = SideFacingInactive 2 = FrontFacingActive 3 = FrontFacingInactive 4 =
+ * TopFacingActive 5 = TopFacingInactive 6 = BottomFacingActive 7 = BottomFacingInactive ----- Not
+ * all Array Elements have to be initialised, you can also just use 8 Parameters for the Default
+ * Pipe Texture Overlays ----- 8 = BottomFacingPipeActive 9 = BottomFacingPipeInactive 10 =
+ * TopFacingPipeActive 11 = TopFacingPipeInactive 12 = SideFacingPipeActive 13 =
+ * SideFacingPipeInactive
*/
- public GTPP_MTE_BasicMachine(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- int aAmperage,
- String aDescription,
- int aInputSlotCount,
- int aOutputSlotCount,
- String aGUIName,
- String aNEIName,
+ public GTPP_MTE_BasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage,
+ String aDescription, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName,
ITexture... aOverlays) {
super(
aID,
@@ -105,17 +85,8 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
mNEIName = aNEIName;
}
- public GTPP_MTE_BasicMachine(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- int aAmperage,
- String[] aDescription,
- int aInputSlotCount,
- int aOutputSlotCount,
- String aGUIName,
- String aNEIName,
+ public GTPP_MTE_BasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage,
+ String[] aDescription, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName,
ITexture... aOverlays) {
super(
aID,
@@ -132,16 +103,8 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
mNEIName = aNEIName;
}
- public GTPP_MTE_BasicMachine(
- String aName,
- int aTier,
- int aAmperage,
- String aDescription,
- ITexture[][][] aTextures,
- int aInputSlotCount,
- int aOutputSlotCount,
- String aGUIName,
- String aNEIName) {
+ public GTPP_MTE_BasicMachine(String aName, int aTier, int aAmperage, String aDescription, ITexture[][][] aTextures,
+ int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName) {
super(aName, aTier, OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, aDescription, aTextures);
mInputSlotCount = Math.max(0, aInputSlotCount);
mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)];
@@ -150,16 +113,8 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
mNEIName = aNEIName;
}
- public GTPP_MTE_BasicMachine(
- String aName,
- int aTier,
- int aAmperage,
- String[] aDescription,
- ITexture[][][] aTextures,
- int aInputSlotCount,
- int aOutputSlotCount,
- String aGUIName,
- String aNEIName) {
+ public GTPP_MTE_BasicMachine(String aName, int aTier, int aAmperage, String[] aDescription,
+ ITexture[][][] aTextures, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName) {
super(aName, aTier, OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, aDescription, aTextures);
mInputSlotCount = Math.max(0, aInputSlotCount);
mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)];
@@ -188,13 +143,10 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
ITexture[][][] rTextures = new ITexture[14][17][];
aTextures = Arrays.copyOf(aTextures, 14);
- for (int i = 0; i < aTextures.length; i++)
- if (aTextures[i] != null)
- for (byte c = -1; c < 16; c++) {
- if (rTextures[i][c + 1] == null)
- rTextures[i][c + 1] =
- new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][c + 1], aTextures[i]};
- }
+ for (int i = 0; i < aTextures.length; i++) if (aTextures[i] != null) for (byte c = -1; c < 16; c++) {
+ if (rTextures[i][c + 1] == null) rTextures[i][c + 1] = new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[mTier][c + 1], aTextures[i] };
+ }
for (byte c = -1; c < 16; c++) {
if (rTextures[0][c + 1] == null) rTextures[0][c + 1] = getSideFacingActive(c);
@@ -216,28 +168,16 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
- return mTextures[
- mMainFacing < 2
- ? aSide == aFacing
- ? aActive ? 2 : 3
- : aSide == 0 ? aActive ? 6 : 7 : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1
- : aSide == mMainFacing
- ? aActive ? 2 : 3
- : (showPipeFacing() && aSide == aFacing)
- ? aSide == 0
- ? aActive ? 8 : 9
- : aSide == 1 ? aActive ? 10 : 11 : aActive ? 12 : 13
- : aSide == 0
- ? aActive ? 6 : 7
- : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1][
- aColorIndex + 1];
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
+ return mTextures[mMainFacing < 2
+ ? aSide == aFacing ? aActive ? 2 : 3
+ : aSide == 0 ? aActive ? 6 : 7 : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1
+ : aSide == mMainFacing ? aActive ? 2 : 3
+ : (showPipeFacing() && aSide == aFacing)
+ ? aSide == 0 ? aActive ? 8 : 9 : aSide == 1 ? aActive ? 10 : 11 : aActive ? 12 : 13
+ : aSide == 0 ? aActive ? 6 : 7
+ : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1][aColorIndex + 1];
}
@Override
@@ -262,8 +202,7 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
@Override
public boolean isValidSlot(int aIndex) {
- return aIndex > 0
- && super.isValidSlot(aIndex)
+ return aIndex > 0 && super.isValidSlot(aIndex)
&& aIndex != OTHER_SLOT_COUNT + mInputSlotCount + mOutputItems.length;
}
@@ -294,9 +233,7 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
@Override
public boolean isLiquidInput(byte aSide) {
- return aSide != mMainFacing
- && (mAllowInputFromOutputSide
- || aSide != getBaseMetaTileEntity().getFrontFacing());
+ return aSide != mMainFacing && (mAllowInputFromOutputSide || aSide != getBaseMetaTileEntity().getFrontFacing());
}
@Override
@@ -387,8 +324,7 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
@Override
public boolean isFluidInputAllowed(FluidStack aFluid) {
- return getFillableStack() != null
- || (getRecipeList() != null && getRecipeList().containsInput(aFluid));
+ return getFillableStack() != null || (getRecipeList() != null && getRecipeList().containsInput(aFluid));
}
@Override
@@ -467,9 +403,8 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
if (mOutputFluid != null) aNBT.setTag("mOutputFluid", mOutputFluid.writeToNBT(new NBTTagCompound()));
if (mFluidOut != null) aNBT.setTag("mFluidOut", mFluidOut.writeToNBT(new NBTTagCompound()));
- for (int i = 0; i < mOutputItems.length; i++)
- if (mOutputItems[i] != null)
- aNBT.setTag("mOutputItem" + i, mOutputItems[i].writeToNBT(new NBTTagCompound()));
+ for (int i = 0; i < mOutputItems.length; i++) if (mOutputItems[i] != null)
+ aNBT.setTag("mOutputItem" + i, mOutputItems[i].writeToNBT(new NBTTagCompound()));
}
@Override
@@ -506,9 +441,9 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
if (mProgresstime < 0 || drainEnergyForProcess(mEUt)) {
if (++mProgresstime >= mMaxProgresstime) {
for (int i = 0; i < mOutputItems.length; i++)
- for (int j = 0; j < mOutputItems.length; j++)
- if (aBaseMetaTileEntity.addStackToSlot(
- getOutputSlot() + ((j + i) % mOutputItems.length), mOutputItems[i])) break;
+ for (int j = 0; j < mOutputItems.length; j++) if (aBaseMetaTileEntity
+ .addStackToSlot(getOutputSlot() + ((j + i) % mOutputItems.length), mOutputItems[i]))
+ break;
if (mOutputFluid != null)
if (getDrainableStack() == null) setDrainableStack(mOutputFluid.copy());
else if (mOutputFluid.isFluidEqual(getDrainableStack()))
@@ -542,8 +477,7 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
boolean tRemovedOutputFluid = false;
- if (doesAutoOutputFluids()
- && getDrainableStack() != null
+ if (doesAutoOutputFluids() && getDrainableStack() != null
&& aBaseMetaTileEntity.getFrontFacing() != mMainFacing
&& (tSucceeded || aTick % 20 == 0)) {
IFluidHandler tTank = aBaseMetaTileEntity.getITankContainerAtSide(aBaseMetaTileEntity.getFrontFacing());
@@ -551,28 +485,26 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
FluidStack tDrained = drain(1000, false);
if (tDrained != null) {
int tFilledAmount = tTank.fill(
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()), tDrained, false);
- if (tFilledAmount > 0)
- tTank.fill(
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
- drain(tFilledAmount, true),
- true);
+ ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
+ tDrained,
+ false);
+ if (tFilledAmount > 0) tTank.fill(
+ ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
+ drain(tFilledAmount, true),
+ true);
}
}
if (getDrainableStack() == null) tRemovedOutputFluid = true;
}
- if (doesAutoOutput()
- && !isOutputEmpty()
+ if (doesAutoOutput() && !isOutputEmpty()
&& aBaseMetaTileEntity.getFrontFacing() != mMainFacing
- && (tSucceeded
- || mOutputBlocked % 300 == 1
+ && (tSucceeded || mOutputBlocked % 300 == 1
|| aBaseMetaTileEntity.hasInventoryBeenModified()
|| aTick % 600 == 0)) {
TileEntity tTileEntity2 = aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getFrontFacing());
- for (int i = 0, tCosts = 1;
- i < mOutputItems.length && tCosts > 0 && aBaseMetaTileEntity.isUniversalEnergyStored(128);
- i++) {
+ for (int i = 0, tCosts = 1; i < mOutputItems.length && tCosts > 0
+ && aBaseMetaTileEntity.isUniversalEnergyStored(128); i++) {
tCosts = GT_Utility.moveOneItemStack(
aBaseMetaTileEntity,
tTileEntity2,
@@ -588,15 +520,12 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
}
}
- if (mOutputBlocked != 0)
- if (isOutputEmpty()) mOutputBlocked = 0;
- else mOutputBlocked++;
+ if (mOutputBlocked != 0) if (isOutputEmpty()) mOutputBlocked = 0;
+ else mOutputBlocked++;
if (allowToCheckRecipe()) {
- if (mMaxProgresstime <= 0
- && aBaseMetaTileEntity.isAllowedToWork()
- && (tRemovedOutputFluid
- || tSucceeded
+ if (mMaxProgresstime <= 0 && aBaseMetaTileEntity.isAllowedToWork()
+ && (tRemovedOutputFluid || tSucceeded
|| aBaseMetaTileEntity.hasInventoryBeenModified()
|| aTick % 600 == 0
|| aBaseMetaTileEntity.hasWorkJustBeenEnabled())
@@ -647,8 +576,8 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
if (ItemList.Display_Fluid.isStackEqual(mInventory[tDisplayStackSlot], true, true))
mInventory[tDisplayStackSlot] = null;
} else {
- mInventory[tDisplayStackSlot] =
- GT_Utility.getFluidDisplayStack(getFillableStack(), displaysStackSize());
+ mInventory[tDisplayStackSlot] = GT_Utility
+ .getFluidDisplayStack(getFillableStack(), displaysStackSize());
}
}
}
@@ -694,32 +623,27 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
}
protected boolean canOutput(GT_Recipe aRecipe) {
- return aRecipe != null
- && (aRecipe.mNeedsEmptyOutput
- ? isOutputEmpty() && getDrainableStack() == null
- : canOutput(aRecipe.getFluidOutput(0)) && canOutput(aRecipe.mOutputs));
+ return aRecipe != null && (aRecipe.mNeedsEmptyOutput ? isOutputEmpty() && getDrainableStack() == null
+ : canOutput(aRecipe.getFluidOutput(0)) && canOutput(aRecipe.mOutputs));
}
protected boolean canOutput(ItemStack... aOutputs) {
if (aOutputs == null) return true;
ItemStack[] tOutputSlots = getAllOutputs();
for (int i = 0; i < tOutputSlots.length && i < aOutputs.length; i++)
- if (tOutputSlots[i] != null
- && aOutputs[i] != null
+ if (tOutputSlots[i] != null && aOutputs[i] != null
&& (!GT_Utility.areStacksEqual(tOutputSlots[i], aOutputs[i], false)
|| tOutputSlots[i].stackSize + aOutputs[i].stackSize > tOutputSlots[i].getMaxStackSize())) {
- mOutputBlocked++;
- return false;
- }
+ mOutputBlocked++;
+ return false;
+ }
return true;
}
protected boolean canOutput(FluidStack aOutput) {
- return getDrainableStack() == null
- || aOutput == null
- || (getDrainableStack().isFluidEqual(aOutput)
- && (getDrainableStack().amount <= 0
- || getDrainableStack().amount + aOutput.amount <= getCapacity()));
+ return getDrainableStack() == null || aOutput == null
+ || (getDrainableStack().isFluidEqual(aOutput) && (getDrainableStack().amount <= 0
+ || getDrainableStack().amount + aOutput.amount <= getCapacity()));
}
protected ItemStack getInputAt(int aIndex) {
@@ -819,15 +743,9 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
@Override
public String[] getInfoData() {
- return new String[] {
- mNEIName,
- "Progress:",
- (mProgresstime / 20) + " secs",
- (mMaxProgresstime / 20) + " secs",
- "Stored Energy:",
- getBaseMetaTileEntity().getStoredEU() + "EU",
- getBaseMetaTileEntity().getEUCapacity() + "EU"
- };
+ return new String[] { mNEIName, "Progress:", (mProgresstime / 20) + " secs", (mMaxProgresstime / 20) + " secs",
+ "Stored Energy:", getBaseMetaTileEntity().getStoredEU() + "EU",
+ getBaseMetaTileEntity().getEUCapacity() + "EU" };
}
@Override
@@ -847,9 +765,8 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
@Override
public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCoverID) {
- return (aSide != mMainFacing
- || GregTech_API.getCoverBehavior(aCoverID.toStack())
- .isGUIClickable(aSide, GT_Utility.stackToInt(aCoverID.toStack()), 0, getBaseMetaTileEntity()));
+ return (aSide != mMainFacing || GregTech_API.getCoverBehavior(aCoverID.toStack())
+ .isGUIClickable(aSide, GT_Utility.stackToInt(aCoverID.toStack()), 0, getBaseMetaTileEntity()));
}
@Override
@@ -859,10 +776,10 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
@Override
public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
- if (aSide == mMainFacing
- || aIndex < getInputSlot()
+ if (aSide == mMainFacing || aIndex < getInputSlot()
|| aIndex >= getInputSlot() + mInputSlotCount
- || (!mAllowInputFromOutputSide && aSide == aBaseMetaTileEntity.getFrontFacing())) return false;
+ || (!mAllowInputFromOutputSide && aSide == aBaseMetaTileEntity.getFrontFacing()))
+ return false;
for (int i = getInputSlot(), j = i + mInputSlotCount; i < j; i++)
if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(aStack), mInventory[i])) return i == aIndex;
return true;
@@ -876,7 +793,8 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
}
/**
- * Override this to check the Recipes yourself, super calls to this could be useful if you just want to add a special case
+ * Override this to check the Recipes yourself, super calls to this could be useful if you just want to add a
+ * special case
* <p/>
* I thought about Enum too, but Enum doesn't add support for people adding other return Systems.
* <p/>
@@ -910,7 +828,7 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
mLastRecipe,
false,
V[mTier],
- new FluidStack[] {getFillableStack()},
+ new FluidStack[] { getFillableStack() },
getSpecialSlot(),
getAllInputs());
if (tRecipe == null) return DID_NOT_FIND_RECIPE;
@@ -922,91 +840,78 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
}
if (tRecipe.mSpecialValue == -200 && (mCleanroom == null || mCleanroom.mEfficiency == 0))
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
- if (!tRecipe.isRecipeInputEqual(true, new FluidStack[] {getFillableStack()}, getAllInputs()))
+ if (!tRecipe.isRecipeInputEqual(true, new FluidStack[] { getFillableStack() }, getAllInputs()))
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
for (int i = 0; i < mOutputItems.length; i++)
if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(i))
mOutputItems[i] = tRecipe.getOutput(i);
- if (tRecipe.mSpecialValue == -200)
- for (int i = 0; i < mOutputItems.length; i++)
- if (mOutputItems[i] != null && getBaseMetaTileEntity().getRandomNumber(10000) > mCleanroom.mEfficiency)
- mOutputItems[i] = null;
+ if (tRecipe.mSpecialValue == -200) for (int i = 0; i < mOutputItems.length; i++)
+ if (mOutputItems[i] != null && getBaseMetaTileEntity().getRandomNumber(10000) > mCleanroom.mEfficiency)
+ mOutputItems[i] = null;
mOutputFluid = tRecipe.getFluidOutput(0);
calculateOverclockedNess(tRecipe);
return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
}
public ITexture[] getSideFacingActive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getSideFacingInactive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getFrontFacingActive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getFrontFacingInactive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getTopFacingActive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getTopFacingInactive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getBottomFacingActive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getBottomFacingInactive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getBottomFacingPipeActive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getBottomFacingPipeInactive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getTopFacingPipeActive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getTopFacingPipeInactive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getSideFacingPipeActive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getSideFacingPipeInactive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java
index 7e2cfaa94a..679b007111 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java
@@ -1,12 +1,13 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.util.GT_Utility;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
/**
* NEVER INCLUDE THIS FILE IN YOUR MOD!!!
@@ -20,35 +21,23 @@ public abstract class GTPP_MTE_BasicTank extends GTPP_MTE_TieredMachineBlock {
/**
* @param aInvSlotCount should be 3
*/
- public GTPP_MTE_BasicTank(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- int aInvSlotCount,
- String aDescription,
- ITexture... aTextures) {
+ public GTPP_MTE_BasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+ String aDescription, ITexture... aTextures) {
super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
}
- public GTPP_MTE_BasicTank(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- int aInvSlotCount,
- String[] aDescription,
- ITexture... aTextures) {
+ public GTPP_MTE_BasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+ String[] aDescription, ITexture... aTextures) {
super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
}
- public GTPP_MTE_BasicTank(
- String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
+ public GTPP_MTE_BasicTank(String aName, int aTier, int aInvSlotCount, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aInvSlotCount, aDescription, aTextures);
}
- public GTPP_MTE_BasicTank(
- String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
+ public GTPP_MTE_BasicTank(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aInvSlotCount, aDescription, aTextures);
}
@@ -137,8 +126,8 @@ public abstract class GTPP_MTE_BasicTank extends GTPP_MTE_TieredMachineBlock {
if (ItemList.Display_Fluid.isStackEqual(mInventory[getStackDisplaySlot()], true, true))
mInventory[getStackDisplaySlot()] = null;
} else {
- mInventory[getStackDisplaySlot()] =
- GT_Utility.getFluidDisplayStack(getDisplayedFluid(), displaysStackSize());
+ mInventory[getStackDisplaySlot()] = GT_Utility
+ .getFluidDisplayStack(getDisplayedFluid(), displaysStackSize());
}
}
@@ -172,8 +161,8 @@ public abstract class GTPP_MTE_BasicTank extends GTPP_MTE_TieredMachineBlock {
}
if (doesFillContainers()) {
- ItemStack tOutput =
- GT_Utility.fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true);
+ ItemStack tOutput = GT_Utility
+ .fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true);
if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) {
FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
@@ -196,11 +185,11 @@ public abstract class GTPP_MTE_BasicTank extends GTPP_MTE_TieredMachineBlock {
@Override
public int fill(FluidStack aFluid, boolean doFill) {
- if (aFluid == null
- || aFluid.getFluid().getID() <= 0
+ if (aFluid == null || aFluid.getFluid().getID() <= 0
|| aFluid.amount <= 0
|| !canTankBeFilled()
- || !isFluidInputAllowed(aFluid)) return 0;
+ || !isFluidInputAllowed(aFluid))
+ return 0;
if (getFillableStack() == null || getFillableStack().getFluid().getID() <= 0) {
if (aFluid.amount <= getCapacity()) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
index e45588e126..51596dd8cd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java
@@ -6,6 +6,7 @@ import gregtech.api.interfaces.ITexture;
import gtPlusPlus.api.objects.data.AutoMap;
public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPower {
+
/**
* Value between [0 - 9] to describe the Tier of this Machine.
*/
@@ -24,31 +25,19 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo
*/
public final ITexture[][][] mTextures;
- public GTPP_MTE_TieredMachineBlock(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- int aInvSlotCount,
- String aDescription,
- ITexture... aTextures) {
+ public GTPP_MTE_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+ String aDescription, ITexture... aTextures) {
super(aID, aName, aNameRegional, aInvSlotCount);
mTier = (byte) Math.max(0, Math.min(aTier, 9));
- mDescriptionArray = aDescription == null ? new String[0] : new String[] {aDescription};
+ mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription };
mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : "";
// must always be the last call!
if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
else mTextures = null;
}
- public GTPP_MTE_TieredMachineBlock(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- int aInvSlotCount,
- String[] aDescription,
- ITexture... aTextures) {
+ public GTPP_MTE_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+ String[] aDescription, ITexture... aTextures) {
super(aID, aName, aNameRegional, aInvSlotCount);
mTier = (byte) Math.max(0, Math.min(aTier, 9));
mDescriptionArray = aDescription == null ? new String[0] : aDescription;
@@ -59,17 +48,17 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo
else mTextures = null;
}
- public GTPP_MTE_TieredMachineBlock(
- String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
+ public GTPP_MTE_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aInvSlotCount);
mTier = (byte) aTier;
- mDescriptionArray = aDescription == null ? new String[0] : new String[] {aDescription};
+ mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription };
mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : "";
mTextures = aTextures;
}
- public GTPP_MTE_TieredMachineBlock(
- String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
+ public GTPP_MTE_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+ ITexture[][][] aTextures) {
super(aName, aInvSlotCount);
mTier = (byte) aTier;
mDescriptionArray = aDescription == null ? new String[0] : aDescription;
@@ -105,8 +94,8 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo
}
/**
- * Used Client Side to get a Texture Set for this Block.
- * Called after setting the Tier and the Description so that those two are accessible.
+ * Used Client Side to get a Texture Set for this Block. Called after setting the Tier and the Description so that
+ * those two are accessible.
*
* @param aTextures is the optional Array you can give to the Constructor.
*/
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
index 36185b638b..e2b5d1eafc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java
@@ -1,14 +1,15 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.CustomMetaTileBase;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
-import net.minecraft.entity.Entity;
-import net.minecraft.init.Blocks;
-import net.minecraft.world.World;
public abstract class MetaTileEntityCustomPower extends CustomMetaTileBase {
@@ -37,35 +38,40 @@ public abstract class MetaTileEntityCustomPower extends CustomMetaTileBase {
return;
}
- float tStrength = aExplosionPower < GT_Values.V[0]
- ? 1.0F
- : (aExplosionPower < GT_Values.V[1]
- ? 2.0F
- : (aExplosionPower < GT_Values.V[2]
- ? 3.0F
- : (aExplosionPower < GT_Values.V[3]
- ? 4.0F
- : (aExplosionPower < GT_Values.V[4]
- ? 5.0F
- : (aExplosionPower < GT_Values.V[4] * 2L
- ? 6.0F
- : (aExplosionPower < GT_Values.V[5]
- ? 7.0F
- : (aExplosionPower < GT_Values.V[6]
- ? 8.0F
- : (aExplosionPower < GT_Values.V[7]
- ? 9.0F
- : 10.0F))))))));
+ float tStrength = aExplosionPower
+ < GT_Values.V[0]
+ ? 1.0F
+ : (aExplosionPower < GT_Values.V[1] ? 2.0F
+ : (aExplosionPower < GT_Values.V[2] ? 3.0F
+ : (aExplosionPower < GT_Values.V[3] ? 4.0F
+ : (aExplosionPower < GT_Values.V[4] ? 5.0F
+ : (aExplosionPower < GT_Values.V[4] * 2L ? 6.0F
+ : (aExplosionPower < GT_Values.V[5] ? 7.0F
+ : (aExplosionPower < GT_Values.V[6] ? 8.0F
+ : (aExplosionPower < GT_Values.V[7]
+ ? 9.0F
+ : 10.0F))))))));
int tX = this.getBaseMetaTileEntity().getXCoord();
short tY = this.getBaseMetaTileEntity().getYCoord();
int tZ = this.getBaseMetaTileEntity().getZCoord();
World tWorld = this.getBaseMetaTileEntity().getWorld();
GT_Utility.sendSoundToPlayers(
- tWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(209)), 1.0F, -1.0F, tX, tY, tZ);
+ tWorld,
+ (String) GregTech_API.sSoundList.get(Integer.valueOf(209)),
+ 1.0F,
+ -1.0F,
+ tX,
+ tY,
+ tZ);
tWorld.setBlock(tX, tY, tZ, Blocks.air);
if (GregTech_API.sMachineExplosions) {
tWorld.createExplosion(
- (Entity) null, (double) tX + 0.5D, (double) tY + 0.5D, (double) tZ + 0.5D, tStrength, true);
+ (Entity) null,
+ (double) tX + 0.5D,
+ (double) tY + 0.5D,
+ (double) tZ + 0.5D,
+ tStrength,
+ true);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java
index b9ffc8740a..8d8ec9b1be 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java
@@ -1,7 +1,13 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures.BlockIcons;
import gregtech.api.gui.modularui.GT_UIInfos;
@@ -15,10 +21,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.GTPP_MTE_TieredMachineBlock;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock implements IAddUIWidgets {
@@ -30,18 +32,18 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
private long mStored = 0L;
private long mMax = 0L;
- public GT_MetaTileEntity_BasicBreaker(
- int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
+ public GT_MetaTileEntity_BasicBreaker(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+ int aSlotCount) {
super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription, new ITexture[0]);
}
- public GT_MetaTileEntity_BasicBreaker(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
+ public GT_MetaTileEntity_BasicBreaker(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+ int aSlotCount) {
super(aName, aTier, aSlotCount, aDescription, aTextures);
}
- public GT_MetaTileEntity_BasicBreaker(
- String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int aSlotCount) {
+ public GT_MetaTileEntity_BasicBreaker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
+ int aSlotCount) {
super(aName, aTier, aSlotCount, aDescription, aTextures);
}
@@ -49,13 +51,21 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
final String[] desc = new String[6];
int tTier = this.mTier;
desc[0] = "" + EnumChatFormatting.BOLD + "16 Fuse Slots";
- desc[1] = "Per each fuse, you may insert " + EnumChatFormatting.YELLOW + (GT_Values.V[tTier])
- + EnumChatFormatting.GRAY + " EU/t";
- desc[2] = "However this " + EnumChatFormatting.ITALIC + EnumChatFormatting.RED + "MUST"
- + EnumChatFormatting.GRAY + " be in a single Amp";
+ desc[1] = "Per each fuse, you may insert " + EnumChatFormatting.YELLOW
+ + (GT_Values.V[tTier])
+ + EnumChatFormatting.GRAY
+ + " EU/t";
+ desc[2] = "However this " + EnumChatFormatting.ITALIC
+ + EnumChatFormatting.RED
+ + "MUST"
+ + EnumChatFormatting.GRAY
+ + " be in a single Amp";
desc[3] = "This machine can accept upto a single amp of " + GT_Values.VN[Math.min(tTier + 2, 15)]
+ " as a result";
- desc[4] = "Breaker Loss: " + EnumChatFormatting.RED + "" + (GT_Values.V[tTier] / 16) + EnumChatFormatting.GRAY
+ desc[4] = "Breaker Loss: " + EnumChatFormatting.RED
+ + ""
+ + (GT_Values.V[tTier] / 16)
+ + EnumChatFormatting.GRAY
+ " EU/t";
desc[5] = CORE.GT_Tooltip;
return desc;
@@ -65,37 +75,30 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
ITexture[][][] rTextures = new ITexture[2][17][];
for (byte i = -1; i < 16; ++i) {
- rTextures[0][i + 1] = new ITexture[] {
- BlockIcons.MACHINE_CASINGS[this.mTier][i + 1],
- this.mInventory.length > 4
- ? BlockIcons.OVERLAYS_ENERGY_IN_MULTI[Math.min(12, mTier)]
- : BlockIcons.OVERLAYS_ENERGY_IN[Math.min(12, mTier)]
- };
-
- rTextures[1][i + 1] = new ITexture[] {
- BlockIcons.MACHINE_CASINGS[this.mTier][i + 1],
- this.mInventory.length > 4
- ? BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
- : BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]
- };
+ rTextures[0][i + 1] = new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][i + 1],
+ this.mInventory.length > 4 ? BlockIcons.OVERLAYS_ENERGY_IN_MULTI[Math.min(12, mTier)]
+ : BlockIcons.OVERLAYS_ENERGY_IN[Math.min(12, mTier)] };
+
+ rTextures[1][i + 1] = new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][i + 1],
+ this.mInventory.length > 4 ? BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
+ : BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
}
return rTextures;
}
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
return this.mTextures[aSide == aFacing ? 1 : 0][aColorIndex + 1];
}
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GT_MetaTileEntity_BasicBreaker(
- this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mInventory.length);
+ this.mName,
+ this.mTier,
+ this.mDescriptionArray,
+ this.mTextures,
+ this.mInventory.length);
}
public boolean isSimpleMachine() {
@@ -198,23 +201,14 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
super.onPostTick(aBaseMetaTileEntity, aTick);
if (aBaseMetaTileEntity.isServerSide()) {
- /*this.mCharge = aBaseMetaTileEntity.getStoredEU() / 2L > aBaseMetaTileEntity.getEUCapacity() / 3L;
- this.mDecharge = aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity() / 3L;
- this.mBatteryCount = 0;
- this.mChargeableCount = 0;
- ItemStack[] arg3 = this.mInventory;
- int arg4 = arg3.length;
-
- for (int arg5 = 0; arg5 < arg4; ++arg5) {
- ItemStack tStack = arg3[arg5];
- if (GT_ModHandler.isElectricItem(tStack, this.mTier)) {
- if (GT_ModHandler.isChargerItem(tStack)) {
- ++this.mBatteryCount;
- }
-
- ++this.mChargeableCount;
- }
- }*/
+ /*
+ * this.mCharge = aBaseMetaTileEntity.getStoredEU() / 2L > aBaseMetaTileEntity.getEUCapacity() / 3L;
+ * this.mDecharge = aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity() / 3L;
+ * this.mBatteryCount = 0; this.mChargeableCount = 0; ItemStack[] arg3 = this.mInventory; int arg4 =
+ * arg3.length; for (int arg5 = 0; arg5 < arg4; ++arg5) { ItemStack tStack = arg3[arg5]; if
+ * (GT_ModHandler.isElectricItem(tStack, this.mTier)) { if (GT_ModHandler.isChargerItem(tStack)) {
+ * ++this.mBatteryCount; } ++this.mChargeableCount; } }
+ */
}
}
@@ -274,11 +268,11 @@ public class GT_MetaTileEntity_BasicBreaker extends GTPP_MTE_TieredMachineBlock
tStored = Long.MAX_VALUE;
}
- return new long[] {tStored, tScale};
+ return new long[] { tStored, tScale };
}
public String[] getInfoData() {
- return new String[] {"Tile Type: " + this.getTileEntityBaseType()};
+ return new String[] { "Tile Type: " + this.getTileEntityBaseType() };
}
public boolean isGivingInformation() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java
index cf92bdc0ba..a47ed592c4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java
@@ -6,25 +6,10 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
public class GT_MetaTileEntity_BasicMachine_GTPP_Recipe extends GT_MetaTileEntity_BasicMachine_GT_Recipe {
- public GT_MetaTileEntity_BasicMachine_GTPP_Recipe(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- String aDescription,
- GT_Recipe_Map aRecipes,
- int aInputSlots,
- int aOutputSlots,
- int aTankCapacity,
- int aGUIParameterA,
- int aGUIParameterB,
- String aGUIName,
- String aSound,
- boolean aSharedTank,
- boolean aRequiresFluidForFiltering,
- int aSpecialEffect,
- String aOverlays,
- Object[] aRecipe) {
+ public GT_MetaTileEntity_BasicMachine_GTPP_Recipe(int aID, String aName, String aNameRegional, int aTier,
+ String aDescription, GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity,
+ int aGUIParameterA, int aGUIParameterB, String aGUIName, String aSound, boolean aSharedTank,
+ boolean aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays, Object[] aRecipe) {
super(
aID,
aName,
@@ -46,24 +31,10 @@ public class GT_MetaTileEntity_BasicMachine_GTPP_Recipe extends GT_MetaTileEntit
aRecipe);
}
- public GT_MetaTileEntity_BasicMachine_GTPP_Recipe(
- String aName,
- int aTier,
- String aDescription,
- GT_Recipe_Map aRecipes,
- int aInputSlots,
- int aOutputSlots,
- int aTankCapacity,
- int aAmperage,
- int aGUIParameterA,
- int aGUIParameterB,
- ITexture[][][] aTextures,
- String aGUIName,
- String aNEIName,
- String aSound,
- boolean aSharedTank,
- boolean aRequiresFluidForFiltering,
- int aSpecialEffect) {
+ public GT_MetaTileEntity_BasicMachine_GTPP_Recipe(String aName, int aTier, String aDescription,
+ GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage,
+ int aGUIParameterA, int aGUIParameterB, ITexture[][][] aTextures, String aGUIName, String aNEIName,
+ String aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, int aSpecialEffect) {
super(
aName,
aTier,
@@ -84,24 +55,10 @@ public class GT_MetaTileEntity_BasicMachine_GTPP_Recipe extends GT_MetaTileEntit
aSpecialEffect);
}
- public GT_MetaTileEntity_BasicMachine_GTPP_Recipe(
- String aName,
- int aTier,
- String[] aDescription,
- GT_Recipe_Map aRecipes,
- int aInputSlots,
- int aOutputSlots,
- int aTankCapacity,
- int aAmperage,
- int aGUIParameterA,
- int aGUIParameterB,
- ITexture[][][] aTextures,
- String aGUIName,
- String aNEIName,
- String aSound,
- boolean aSharedTank,
- boolean aRequiresFluidForFiltering,
- int aSpecialEffect) {
+ public GT_MetaTileEntity_BasicMachine_GTPP_Recipe(String aName, int aTier, String[] aDescription,
+ GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage,
+ int aGUIParameterA, int aGUIParameterB, ITexture[][][] aTextures, String aGUIName, String aNEIName,
+ String aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, int aSpecialEffect) {
super(
aName,
aTier,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java
index 7273977101..6852d7be5f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java
@@ -31,8 +31,8 @@ public class GT_MetaTileEntity_Dehydrator extends GT_MetaTileEntity_BasicMachine
// 3 8
}
- public GT_MetaTileEntity_Dehydrator(
- int aID, String aName, String aNameRegional, int aTier, String aDescription, int aTankCapacity) {
+ public GT_MetaTileEntity_Dehydrator(int aID, String aName, String aNameRegional, int aTier, String aDescription,
+ int aTankCapacity) {
super(
aID,
aName,
@@ -54,16 +54,9 @@ public class GT_MetaTileEntity_Dehydrator extends GT_MetaTileEntity_BasicMachine
null);
}
- public GT_MetaTileEntity_Dehydrator(
- String aName,
- int aTier,
- String[] aDescription,
- GT_Recipe.GT_Recipe_Map aRecipes,
- int aTankCapacity,
- int aAmperage,
- ITexture[][][] aTextures,
- String aGUIName,
- String aNEIName) {
+ public GT_MetaTileEntity_Dehydrator(String aName, int aTier, String[] aDescription,
+ GT_Recipe.GT_Recipe_Map aRecipes, int aTankCapacity, int aAmperage, ITexture[][][] aTextures,
+ String aGUIName, String aNEIName) {
super(
aName,
aTier,
@@ -116,13 +109,8 @@ public class GT_MetaTileEntity_Dehydrator extends GT_MetaTileEntity_BasicMachine
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
return super.getTexture(aBaseMetaTileEntity, aSide, aFacing, aColorIndex, aActive, aRedstone);
// return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide ==
// GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1];
@@ -130,87 +118,79 @@ public class GT_MetaTileEntity_Dehydrator extends GT_MetaTileEntity_BasicMachine
@Override
public ITexture[] getFrontFacingInactive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[0])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(sDehydratorOverlays[0]) };
}
@Override
public ITexture[] getBottomFacingInactive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[2])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(sDehydratorOverlays[2]) };
}
@Override
public ITexture[] getTopFacingInactive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[3])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(sDehydratorOverlays[3]) };
}
@Override
public ITexture[] getSideFacingInactive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[4])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(sDehydratorOverlays[4]) };
}
@Override
public ITexture[] getFrontFacingActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[5])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(sDehydratorOverlays[5]) };
}
@Override
public ITexture[] getBottomFacingActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[7])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(sDehydratorOverlays[7]) };
}
@Override
public ITexture[] getTopFacingActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[8])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(sDehydratorOverlays[8]) };
}
@Override
public ITexture[] getSideFacingActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[9])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(sDehydratorOverlays[9]) };
}
@Override
public ITexture[] getBottomFacingPipeActive(byte aColor) {
- return new ITexture[] {MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)};
+ return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) };
}
@Override
public ITexture[] getBottomFacingPipeInactive(byte aColor) {
- return new ITexture[] {MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)};
+ return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) };
}
@Override
public ITexture[] getTopFacingPipeActive(byte aColor) {
- return new ITexture[] {MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)};
+ return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) };
}
@Override
public ITexture[] getTopFacingPipeInactive(byte aColor) {
- return new ITexture[] {MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)};
+ return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) };
}
@Override
public ITexture[] getSideFacingPipeActive(byte aColor) {
- return new ITexture[] {MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)};
+ return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) };
}
@Override
public ITexture[] getSideFacingPipeInactive(byte aColor) {
- return new ITexture[] {MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)};
+ return new ITexture[] { MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
index 299580391a..8b39d1da32 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
@@ -2,6 +2,17 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
import static gregtech.api.enums.GT_Values.V;
+import java.util.Arrays;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidHandler;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Textures;
@@ -16,78 +27,47 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.random.XSTR;
-import java.util.Arrays;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidHandler;
/**
* NEVER INCLUDE THIS FILE IN YOUR MOD!!!
* <p/>
- * This is the main construct for my Basic Machines such as the Automatic Extractor
- * Extend this class to make a simple Machine
+ * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
+ * Machine
*/
public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_DeluxeTank {
+
/**
* return values for checkRecipe()
*/
- protected static final int DID_NOT_FIND_RECIPE = 0,
- FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS = 1,
+ protected static final int DID_NOT_FIND_RECIPE = 0, FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS = 1,
FOUND_AND_SUCCESSFULLY_USED_RECIPE = 2;
public static final int OTHER_SLOT_COUNT = 4;
public final ItemStack[] mOutputItems;
public final int mInputSlotCount, mAmperage;
- public boolean mAllowInputFromOutputSide = false,
- mFluidTransfer = false,
- mItemTransfer = false,
- mHasBeenUpdated = false,
- mStuttering = false,
- mCharge = false,
- mDecharge = false;
+ public boolean mAllowInputFromOutputSide = false, mFluidTransfer = false, mItemTransfer = false,
+ mHasBeenUpdated = false, mStuttering = false, mCharge = false, mDecharge = false;
public int mMainFacing = -1, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mOutputBlocked = 0;
public FluidStack mOutputFluid;
public String mGUIName = "", mNEIName = "";
/**
- * Contains the Recipe which has been previously used, or null if there was no previous Recipe, which could have been buffered
+ * Contains the Recipe which has been previously used, or null if there was no previous Recipe, which could have
+ * been buffered
*/
protected GT_Recipe mLastRecipe = null;
private FluidStack mFluidOut;
/**
- * @param aOverlays 0 = SideFacingActive
- * 1 = SideFacingInactive
- * 2 = FrontFacingActive
- * 3 = FrontFacingInactive
- * 4 = TopFacingActive
- * 5 = TopFacingInactive
- * 6 = BottomFacingActive
- * 7 = BottomFacingInactive
- * ----- Not all Array Elements have to be initialised, you can also just use 8 Parameters for the Default Pipe Texture Overlays -----
- * 8 = BottomFacingPipeActive
- * 9 = BottomFacingPipeInactive
- * 10 = TopFacingPipeActive
- * 11 = TopFacingPipeInactive
- * 12 = SideFacingPipeActive
- * 13 = SideFacingPipeInactive
+ * @param aOverlays 0 = SideFacingActive 1 = SideFacingInactive 2 = FrontFacingActive 3 = FrontFacingInactive 4 =
+ * TopFacingActive 5 = TopFacingInactive 6 = BottomFacingActive 7 = BottomFacingInactive ----- Not
+ * all Array Elements have to be initialised, you can also just use 8 Parameters for the Default
+ * Pipe Texture Overlays ----- 8 = BottomFacingPipeActive 9 = BottomFacingPipeInactive 10 =
+ * TopFacingPipeActive 11 = TopFacingPipeInactive 12 = SideFacingPipeActive 13 =
+ * SideFacingPipeInactive
*/
- public GT_MetaTileEntity_DeluxeMachine(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- int aAmperage,
- String aDescription,
- int aInputSlotCount,
- int aOutputSlotCount,
- String aGUIName,
- String aNEIName,
+ public GT_MetaTileEntity_DeluxeMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage,
+ String aDescription, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName,
ITexture... aOverlays) {
super(
aID,
@@ -104,16 +84,8 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
mNEIName = aNEIName;
}
- public GT_MetaTileEntity_DeluxeMachine(
- String aName,
- int aTier,
- int aAmperage,
- String aDescription,
- ITexture[][][] aTextures,
- int aInputSlotCount,
- int aOutputSlotCount,
- String aGUIName,
- String aNEIName) {
+ public GT_MetaTileEntity_DeluxeMachine(String aName, int aTier, int aAmperage, String aDescription,
+ ITexture[][][] aTextures, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName) {
super(aName, aTier, OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, aDescription, aTextures);
mInputSlotCount = Math.max(0, aInputSlotCount);
mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)];
@@ -137,13 +109,10 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
ITexture[][][] rTextures = new ITexture[14][17][];
aTextures = Arrays.copyOf(aTextures, 14);
- for (int i = 0; i < aTextures.length; i++)
- if (aTextures[i] != null)
- for (byte c = -1; c < 16; c++) {
- if (rTextures[i][c + 1] == null)
- rTextures[i][c + 1] =
- new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][c + 1], aTextures[i]};
- }
+ for (int i = 0; i < aTextures.length; i++) if (aTextures[i] != null) for (byte c = -1; c < 16; c++) {
+ if (rTextures[i][c + 1] == null) rTextures[i][c + 1] = new ITexture[] {
+ Textures.BlockIcons.MACHINE_CASINGS[mTier][c + 1], aTextures[i] };
+ }
for (byte c = -1; c < 16; c++) {
if (rTextures[0][c + 1] == null) rTextures[0][c + 1] = getSideFacingActive(c);
@@ -165,28 +134,16 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
- return mTextures[
- mMainFacing < 2
- ? aSide == aFacing
- ? aActive ? 2 : 3
- : aSide == 0 ? aActive ? 6 : 7 : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1
- : aSide == mMainFacing
- ? aActive ? 2 : 3
- : (showPipeFacing() && aSide == aFacing)
- ? aSide == 0
- ? aActive ? 8 : 9
- : aSide == 1 ? aActive ? 10 : 11 : aActive ? 12 : 13
- : aSide == 0
- ? aActive ? 6 : 7
- : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1][
- aColorIndex + 1];
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
+ return mTextures[mMainFacing < 2
+ ? aSide == aFacing ? aActive ? 2 : 3
+ : aSide == 0 ? aActive ? 6 : 7 : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1
+ : aSide == mMainFacing ? aActive ? 2 : 3
+ : (showPipeFacing() && aSide == aFacing)
+ ? aSide == 0 ? aActive ? 8 : 9 : aSide == 1 ? aActive ? 10 : 11 : aActive ? 12 : 13
+ : aSide == 0 ? aActive ? 6 : 7
+ : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1][aColorIndex + 1];
}
@Override
@@ -211,8 +168,7 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
@Override
public boolean isValidSlot(int aIndex) {
- return aIndex > 0
- && super.isValidSlot(aIndex)
+ return aIndex > 0 && super.isValidSlot(aIndex)
&& aIndex != OTHER_SLOT_COUNT + mInputSlotCount + mOutputItems.length;
}
@@ -243,9 +199,7 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
@Override
public boolean isLiquidInput(byte aSide) {
- return aSide != mMainFacing
- && (mAllowInputFromOutputSide
- || aSide != getBaseMetaTileEntity().getFrontFacing());
+ return aSide != mMainFacing && (mAllowInputFromOutputSide || aSide != getBaseMetaTileEntity().getFrontFacing());
}
@Override
@@ -336,8 +290,7 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
@Override
public boolean isFluidInputAllowed(FluidStack aFluid) {
- return getFillableStack() != null
- || (getRecipeList() != null && getRecipeList().containsInput(aFluid));
+ return getFillableStack() != null || (getRecipeList() != null && getRecipeList().containsInput(aFluid));
}
@Override
@@ -416,9 +369,8 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
if (mOutputFluid != null) aNBT.setTag("mOutputFluid", mOutputFluid.writeToNBT(new NBTTagCompound()));
if (mFluidOut != null) aNBT.setTag("mFluidOut", mFluidOut.writeToNBT(new NBTTagCompound()));
- for (int i = 0; i < mOutputItems.length; i++)
- if (mOutputItems[i] != null)
- aNBT.setTag("mOutputItem" + i, mOutputItems[i].writeToNBT(new NBTTagCompound()));
+ for (int i = 0; i < mOutputItems.length; i++) if (mOutputItems[i] != null)
+ aNBT.setTag("mOutputItem" + i, mOutputItems[i].writeToNBT(new NBTTagCompound()));
}
@Override
@@ -457,9 +409,9 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
if (mProgresstime < 0 || drainEnergyForProcess(mEUt)) {
if (++mProgresstime >= mMaxProgresstime) {
for (int i = 0; i < mOutputItems.length; i++)
- for (int j = 0; j < mOutputItems.length; j++)
- if (aBaseMetaTileEntity.addStackToSlot(
- getOutputSlot() + ((j + i) % mOutputItems.length), mOutputItems[i])) break;
+ for (int j = 0; j < mOutputItems.length; j++) if (aBaseMetaTileEntity
+ .addStackToSlot(getOutputSlot() + ((j + i) % mOutputItems.length), mOutputItems[i]))
+ break;
if (mOutputFluid != null)
if (getDrainableStack() == null) setDrainableStack(mOutputFluid.copy());
else if (mOutputFluid.isFluidEqual(getDrainableStack()))
@@ -475,15 +427,14 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
}
if (mProgresstime > 5) mStuttering = false;
XSTR aXSTR = new XSTR();
- if (false && aXSTR.nextInt(5000) == 0)
- GT_Utility.sendSoundToPlayers(
- aBaseMetaTileEntity.getWorld(),
- GregTech_API.sSoundList.get(5),
- 10.0F,
- -1.0F,
- aBaseMetaTileEntity.getXCoord(),
- aBaseMetaTileEntity.getYCoord(),
- aBaseMetaTileEntity.getZCoord());
+ if (false && aXSTR.nextInt(5000) == 0) GT_Utility.sendSoundToPlayers(
+ aBaseMetaTileEntity.getWorld(),
+ GregTech_API.sSoundList.get(5),
+ 10.0F,
+ -1.0F,
+ aBaseMetaTileEntity.getXCoord(),
+ aBaseMetaTileEntity.getYCoord(),
+ aBaseMetaTileEntity.getZCoord());
} else {
if (!mStuttering) {
stutterProcess();
@@ -498,8 +449,7 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
boolean tRemovedOutputFluid = false;
Logger.WARNING("R0");
- if (doesAutoOutputFluids()
- && getDrainableStack() != null
+ if (doesAutoOutputFluids() && getDrainableStack() != null
&& aBaseMetaTileEntity.getFrontFacing() != mMainFacing
&& (tSucceeded || aTick % 20 == 0)) {
IFluidHandler tTank = aBaseMetaTileEntity.getITankContainerAtSide(aBaseMetaTileEntity.getFrontFacing());
@@ -507,28 +457,26 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
FluidStack tDrained = drain(1000, false);
if (tDrained != null) {
int tFilledAmount = tTank.fill(
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()), tDrained, false);
- if (tFilledAmount > 0)
- tTank.fill(
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
- drain(tFilledAmount, true),
- true);
+ ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
+ tDrained,
+ false);
+ if (tFilledAmount > 0) tTank.fill(
+ ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
+ drain(tFilledAmount, true),
+ true);
}
}
if (getDrainableStack() == null) tRemovedOutputFluid = true;
}
- if (doesAutoOutput()
- && !isOutputEmpty()
+ if (doesAutoOutput() && !isOutputEmpty()
&& aBaseMetaTileEntity.getFrontFacing() != mMainFacing
- && (tSucceeded
- || mOutputBlocked % 300 == 1
+ && (tSucceeded || mOutputBlocked % 300 == 1
|| aBaseMetaTileEntity.hasInventoryBeenModified()
|| aTick % 600 == 0)) {
TileEntity tTileEntity2 = aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getFrontFacing());
- for (int i = 0, tCosts = 1;
- i < mOutputItems.length && tCosts > 0 && aBaseMetaTileEntity.isUniversalEnergyStored(128);
- i++) {
+ for (int i = 0, tCosts = 1; i < mOutputItems.length && tCosts > 0
+ && aBaseMetaTileEntity.isUniversalEnergyStored(128); i++) {
tCosts = GT_Utility.moveOneItemStack(
aBaseMetaTileEntity,
tTileEntity2,
@@ -544,9 +492,8 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
}
}
- if (mOutputBlocked != 0)
- if (isOutputEmpty()) mOutputBlocked = 0;
- else mOutputBlocked++;
+ if (mOutputBlocked != 0) if (isOutputEmpty()) mOutputBlocked = 0;
+ else mOutputBlocked++;
Logger.WARNING("R1");
if (allowToCheckRecipe()) {
Logger.WARNING("R2--------------------------------------------------");
@@ -564,10 +511,8 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
Logger.WARNING("R2--------------------------------------------------");
Logger.WARNING("R2-hasEnoughEnergyToCheckRecipe(): " + hasEnoughEnergyToCheckRecipe());
Logger.WARNING("R2--------------------------------------------------");
- if (mMaxProgresstime <= 0
- && aBaseMetaTileEntity.isAllowedToWork()
- && (tRemovedOutputFluid
- || tSucceeded
+ if (mMaxProgresstime <= 0 && aBaseMetaTileEntity.isAllowedToWork()
+ && (tRemovedOutputFluid || tSucceeded
|| aBaseMetaTileEntity.hasInventoryBeenModified()
|| aTick % 600 == 0
|| aBaseMetaTileEntity.hasWorkJustBeenEnabled())
@@ -620,8 +565,8 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
if (ItemList.Display_Fluid.isStackEqual(mInventory[tDisplayStackSlot], true, true))
mInventory[tDisplayStackSlot] = null;
} else {
- mInventory[tDisplayStackSlot] =
- GT_Utility.getFluidDisplayStack(getFillableStack(), displaysStackSize());
+ mInventory[tDisplayStackSlot] = GT_Utility
+ .getFluidDisplayStack(getFillableStack(), displaysStackSize());
}
}
}
@@ -667,32 +612,27 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
}
protected boolean canOutput(GT_Recipe aRecipe) {
- return aRecipe != null
- && (aRecipe.mNeedsEmptyOutput
- ? isOutputEmpty() && getDrainableStack() == null
- : canOutput(aRecipe.getFluidOutput(0)) && canOutput(aRecipe.mOutputs));
+ return aRecipe != null && (aRecipe.mNeedsEmptyOutput ? isOutputEmpty() && getDrainableStack() == null
+ : canOutput(aRecipe.getFluidOutput(0)) && canOutput(aRecipe.mOutputs));
}
protected boolean canOutput(ItemStack... aOutputs) {
if (aOutputs == null) return true;
ItemStack[] tOutputSlots = getAllOutputs();
for (int i = 0; i < tOutputSlots.length && i < aOutputs.length; i++)
- if (tOutputSlots[i] != null
- && aOutputs[i] != null
+ if (tOutputSlots[i] != null && aOutputs[i] != null
&& (!GT_Utility.areStacksEqual(tOutputSlots[i], aOutputs[i], false)
|| tOutputSlots[i].stackSize + aOutputs[i].stackSize > tOutputSlots[i].getMaxStackSize())) {
- mOutputBlocked++;
- return false;
- }
+ mOutputBlocked++;
+ return false;
+ }
return true;
}
protected boolean canOutput(FluidStack aOutput) {
- return getDrainableStack() == null
- || aOutput == null
- || (getDrainableStack().isFluidEqual(aOutput)
- && (getDrainableStack().amount <= 0
- || getDrainableStack().amount + aOutput.amount <= getCapacity()));
+ return getDrainableStack() == null || aOutput == null
+ || (getDrainableStack().isFluidEqual(aOutput) && (getDrainableStack().amount <= 0
+ || getDrainableStack().amount + aOutput.amount <= getCapacity()));
}
protected ItemStack getInputAt(int aIndex) {
@@ -792,15 +732,9 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
@Override
public String[] getInfoData() {
- return new String[] {
- mNEIName,
- "Progress:",
- (mProgresstime / 20) + " secs",
- (mMaxProgresstime / 20) + " secs",
- "Stored Energy:",
- getBaseMetaTileEntity().getStoredEU() + "EU",
- getBaseMetaTileEntity().getEUCapacity() + "EU"
- };
+ return new String[] { mNEIName, "Progress:", (mProgresstime / 20) + " secs", (mMaxProgresstime / 20) + " secs",
+ "Stored Energy:", getBaseMetaTileEntity().getStoredEU() + "EU",
+ getBaseMetaTileEntity().getEUCapacity() + "EU" };
}
@Override
@@ -814,17 +748,15 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
mAllowInputFromOutputSide = !mAllowInputFromOutputSide;
GT_Utility.sendChatToPlayer(
aPlayer,
- mAllowInputFromOutputSide
- ? ("Input from Output Side allowed")
+ mAllowInputFromOutputSide ? ("Input from Output Side allowed")
: ("Input from Output Side forbidden"));
}
}
@Override
public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCoverID) {
- return (aSide != mMainFacing
- || GregTech_API.getCoverBehavior(aCoverID.toStack())
- .isGUIClickable(aSide, GT_Utility.stackToInt(aCoverID.toStack()), 0, getBaseMetaTileEntity()));
+ return (aSide != mMainFacing || GregTech_API.getCoverBehavior(aCoverID.toStack())
+ .isGUIClickable(aSide, GT_Utility.stackToInt(aCoverID.toStack()), 0, getBaseMetaTileEntity()));
}
@Override
@@ -834,10 +766,10 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
@Override
public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
- if (aSide == mMainFacing
- || aIndex < getInputSlot()
+ if (aSide == mMainFacing || aIndex < getInputSlot()
|| aIndex >= getInputSlot() + mInputSlotCount
- || (!mAllowInputFromOutputSide && aSide == aBaseMetaTileEntity.getFrontFacing())) return false;
+ || (!mAllowInputFromOutputSide && aSide == aBaseMetaTileEntity.getFrontFacing()))
+ return false;
for (int i = getInputSlot(), j = i + mInputSlotCount; i < j; i++)
if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(aStack), mInventory[i])) return i == aIndex;
return true;
@@ -851,7 +783,8 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
}
/**
- * Override this to check the Recipes yourself, super calls to this could be useful if you just want to add a special case
+ * Override this to check the Recipes yourself, super calls to this could be useful if you just want to add a
+ * special case
* <p/>
* I thought about Enum too, but Enum doesn't add support for people adding other return Systems.
* <p/>
@@ -885,13 +818,12 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
mLastRecipe,
false,
V[mTier],
- new FluidStack[] {getFillableStack()},
+ new FluidStack[] { getFillableStack() },
getSpecialSlot(),
getAllInputs());
if (tRecipe == null) return DID_NOT_FIND_RECIPE;
- if (false
- && tRecipe.mSpecialValue == -100
+ if (false && tRecipe.mSpecialValue == -100
&& !isValidForLowGravity(tRecipe, getBaseMetaTileEntity().getWorld().provider.dimensionId))
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;
@@ -899,7 +831,7 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
mOutputBlocked++;
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
}
- if (!tRecipe.isRecipeInputEqual(true, new FluidStack[] {getFillableStack()}, getAllInputs()))
+ if (!tRecipe.isRecipeInputEqual(true, new FluidStack[] { getFillableStack() }, getAllInputs()))
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
for (int i = 0; i < mOutputItems.length; i++)
if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(i))
@@ -910,76 +842,64 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
}
public ITexture[] getSideFacingActive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getSideFacingInactive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getFrontFacingActive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getFrontFacingInactive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getTopFacingActive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getTopFacingInactive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getBottomFacingActive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getBottomFacingInactive(byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getBottomFacingPipeActive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getBottomFacingPipeInactive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getTopFacingPipeActive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getTopFacingPipeInactive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getSideFacingPipeActive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getSideFacingPipeInactive(byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java
index 50c2237209..f57293f03c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java
@@ -1,14 +1,15 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
/**
* NEVER INCLUDE THIS FILE IN YOUR MOD!!!
@@ -22,23 +23,13 @@ public abstract class GT_MetaTileEntity_DeluxeTank extends GT_MetaTileEntity_Bas
/**
* @param aInvSlotCount should be 3
*/
- public GT_MetaTileEntity_DeluxeTank(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription,
- final ITexture... aTextures) {
+ public GT_MetaTileEntity_DeluxeTank(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final int aInvSlotCount, final String aDescription, final ITexture... aTextures) {
super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
}
- public GT_MetaTileEntity_DeluxeTank(
- final String aName,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription,
- final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_DeluxeTank(final String aName, final int aTier, final int aInvSlotCount,
+ final String aDescription, final ITexture[][][] aTextures) {
super(aName, aTier, aInvSlotCount, aDescription, aTextures);
}
@@ -164,35 +155,32 @@ public abstract class GT_MetaTileEntity_DeluxeTank extends GT_MetaTileEntity_Bas
@Override
public void onPreTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
if (aBaseMetaTileEntity.isServerSide()) {
- if (this.isFluidChangingAllowed()
- && (this.getFillableStack() != null)
+ if (this.isFluidChangingAllowed() && (this.getFillableStack() != null)
&& (this.getFillableStack().amount <= 0)) {
this.setFillableStack(null);
}
- if (this.displaysItemStack()
- && (this.getStackDisplaySlot() >= 0)
+ if (this.displaysItemStack() && (this.getStackDisplaySlot() >= 0)
&& (this.getStackDisplaySlot() < this.mInventory.length)) {
if (this.getDisplayedFluid() == null) {
if (ItemList.Display_Fluid.isStackEqual(this.mInventory[this.getStackDisplaySlot()], true, true)) {
this.mInventory[this.getStackDisplaySlot()] = null;
}
} else {
- this.mInventory[this.getStackDisplaySlot()] =
- GT_Utility.getFluidDisplayStack(this.getDisplayedFluid(), this.displaysStackSize());
+ this.mInventory[this.getStackDisplaySlot()] = GT_Utility
+ .getFluidDisplayStack(this.getDisplayedFluid(), this.displaysStackSize());
}
}
- if (this.displaysItemStack()
- && (this.getStackDisplaySlot2() >= 0)
+ if (this.displaysItemStack() && (this.getStackDisplaySlot2() >= 0)
&& (this.getStackDisplaySlot2() < this.mInventory.length)) {
if (this.getDrainableStackEx(2) == null) {
if (ItemList.Display_Fluid.isStackEqual(this.mInventory[this.getStackDisplaySlot2()], true, true)) {
this.mInventory[this.getStackDisplaySlot2()] = null;
}
} else {
- this.mInventory[this.getStackDisplaySlot2()] =
- GT_Utility.getFluidDisplayStack(this.getDrainableStackEx(2), this.displaysStackSize());
+ this.mInventory[this.getStackDisplaySlot2()] = GT_Utility
+ .getFluidDisplayStack(this.getDrainableStackEx(2), this.displaysStackSize());
}
}
@@ -223,39 +211,43 @@ public abstract class GT_MetaTileEntity_DeluxeTank extends GT_MetaTileEntity_Bas
}
}
}
- } else if (tFluid.isFluidEqual(this.getDrainableStackEx(2))
- || (this.getDrainableStackEx(2) == null)) {
- if (this.getFillableStackEx(2) == null) {
- if (this.isFluidInputAllowed(tFluid) && (tFluid.amount <= this.getCapacity())) {
- if (aBaseMetaTileEntity.addStackToSlot(
- this.getOutputSlot(),
- GT_Utility.getContainerItem(this.mInventory[this.getInputSlot()], true),
- 1)) {
- this.setFillableStack2(tFluid.copy());
- aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
+ } else
+ if (tFluid.isFluidEqual(this.getDrainableStackEx(2)) || (this.getDrainableStackEx(2) == null)) {
+ if (this.getFillableStackEx(2) == null) {
+ if (this.isFluidInputAllowed(tFluid) && (tFluid.amount <= this.getCapacity())) {
+ if (aBaseMetaTileEntity.addStackToSlot(
+ this.getOutputSlot(),
+ GT_Utility.getContainerItem(this.mInventory[this.getInputSlot()], true),
+ 1)) {
+ this.setFillableStack2(tFluid.copy());
+ aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
+ }
}
- }
- } else {
- if (tFluid.isFluidEqual(this.getFillableStackEx(2))
- && ((tFluid.amount + this.getFillableStackEx(2).amount) <= this.getCapacity())) {
- if (aBaseMetaTileEntity.addStackToSlot(
- this.getOutputSlot(),
- GT_Utility.getContainerItem(this.mInventory[this.getInputSlot()], true),
- 1)) {
- this.getFillableStackEx(2).amount += tFluid.amount;
- aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
+ } else {
+ if (tFluid.isFluidEqual(this.getFillableStackEx(2))
+ && ((tFluid.amount + this.getFillableStackEx(2).amount)
+ <= this.getCapacity())) {
+ if (aBaseMetaTileEntity.addStackToSlot(
+ this.getOutputSlot(),
+ GT_Utility.getContainerItem(this.mInventory[this.getInputSlot()], true),
+ 1)) {
+ this.getFillableStackEx(2).amount += tFluid.amount;
+ aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
+ }
}
}
+ } else {
+ Logger.INFO("Something broke when trying to empty cells between two fluid tank areas.");
}
- } else {
- Logger.INFO("Something broke when trying to empty cells between two fluid tank areas.");
- }
}
}
if (this.doesFillContainers()) {
final ItemStack tOutput = GT_Utility.fillFluidContainer(
- this.getDrainableStack(), this.mInventory[this.getInputSlot()], false, true);
+ this.getDrainableStack(),
+ this.mInventory[this.getInputSlot()],
+ false,
+ true);
if ((tOutput != null) && aBaseMetaTileEntity.addStackToSlot(this.getOutputSlot(), tOutput, 1)) {
final FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
@@ -282,16 +274,14 @@ public abstract class GT_MetaTileEntity_DeluxeTank extends GT_MetaTileEntity_Bas
@Override
public int fill(final FluidStack aFluid, final boolean doFill) {
- if ((aFluid == null)
- || (aFluid.getFluid().getID() <= 0)
+ if ((aFluid == null) || (aFluid.getFluid().getID() <= 0)
|| (aFluid.amount <= 0)
|| !this.canTankBeFilled()
|| !this.isFluidInputAllowed(aFluid)) {
return 0;
}
- if ((this.getFillableStack() == null)
- || (this.getFillableStack().getFluid().getID() <= 0)) {
+ if ((this.getFillableStack() == null) || (this.getFillableStack().getFluid().getID() <= 0)) {
if (aFluid.amount <= this.getCapacity()) {
if (doFill) {
this.setFillableStack(aFluid.copy());
@@ -358,14 +348,14 @@ public abstract class GT_MetaTileEntity_DeluxeTank extends GT_MetaTileEntity_Bas
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return aIndex == this.getOutputSlot();
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return aIndex == this.getInputSlot();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java
index 6a49e9b84d..cc0bec1026 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java
@@ -1,23 +1,24 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.FluidUtils;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_FluidGenerator {
- public GT_MetaTileEntity_Hatch_AirIntake(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GT_MetaTileEntity_Hatch_AirIntake(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier);
}
- public GT_MetaTileEntity_Hatch_AirIntake(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@@ -56,8 +57,7 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_F
@Override
public boolean doesHatchMeetConditionsToGenerate() {
- return this.getBaseMetaTileEntity()
- .getAirAtSide(this.getBaseMetaTileEntity().getFrontFacing());
+ return this.getBaseMetaTileEntity().getAirAtSide(this.getBaseMetaTileEntity().getFrontFacing());
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java
index ca640b7a1d..bfc9cc7fc6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java
@@ -6,13 +6,13 @@ import gregtech.api.metatileentity.MetaTileEntity;
public class GT_MetaTileEntity_Hatch_AirIntake_Extreme extends GT_MetaTileEntity_Hatch_AirIntake {
- public GT_MetaTileEntity_Hatch_AirIntake_Extreme(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier);
}
- public GT_MetaTileEntity_Hatch_AirIntake_Extreme(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
index 37037f7bbb..5fb855c572 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
@@ -1,7 +1,12 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
+
import gregtech.api.gui.*;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.interfaces.ITexture;
@@ -16,9 +21,6 @@ import gtPlusPlus.core.item.general.ItemControlCore;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch {
@@ -40,24 +42,24 @@ public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch
super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 9 : 16, aDescription, aTextures);
}
- public GT_MetaTileEntity_Hatch_ControlCore(
- String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_ControlCore(String aName, int aTier, String[] aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 9 : 16, aDescription[0], aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, CORE.GT_Tooltip};
+ return new String[] { this.mDescription, CORE.GT_Tooltip };
}
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Control_Core)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Control_Core) };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Control_Core)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Control_Core) };
}
@Override
@@ -83,7 +85,10 @@ public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GT_MetaTileEntity_Hatch_ControlCore(
- mName, mTier, StaticFields59.getDescriptionArray(this), mTextures);
+ mName,
+ mTier,
+ StaticFields59.getDescriptionArray(this),
+ mTextures);
}
@Override
@@ -107,19 +112,18 @@ public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch
protected void fillStacksIntoFirstSlots() {
for (int i = 0; i < mInventory.length; i++)
- for (int j = i + 1; j < mInventory.length; j++)
- if (mInventory[j] != null
- && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) {
- GT_Utility.moveStackFromSlotAToSlotB(
- getBaseMetaTileEntity(),
- getBaseMetaTileEntity(),
- j,
- i,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- }
+ for (int j = i + 1; j < mInventory.length; j++) if (mInventory[j] != null
+ && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) {
+ GT_Utility.moveStackFromSlotAToSlotB(
+ getBaseMetaTileEntity(),
+ getBaseMetaTileEntity(),
+ j,
+ i,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
+ }
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
index 8405e2b09c..c9ab1e48a0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
@@ -10,27 +10,28 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatch_Dynamo {
- public GT_MetaTileEntity_Hatch_DynamoBuffer(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+
+ public GT_MetaTileEntity_Hatch_DynamoBuffer(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier);
}
- public GT_MetaTileEntity_Hatch_DynamoBuffer(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
- /*public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription,
- final ITexture[][][] aTextures) {
- super(aName, aTier, aDescription, aTextures);
- }*/
+ /*
+ * public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription,
+ * final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); }
+ */
public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, TexturesGtBlock.OVERLAYS_ENERGY_OUT_MULTI_BUFFER[this.mTier]};
+ return new ITexture[] { aBaseTexture, TexturesGtBlock.OVERLAYS_ENERGY_OUT_MULTI_BUFFER[this.mTier] };
}
public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, TexturesGtBlock.OVERLAYS_ENERGY_OUT_MULTI_BUFFER[this.mTier]};
+ return new ITexture[] { aBaseTexture, TexturesGtBlock.OVERLAYS_ENERGY_OUT_MULTI_BUFFER[this.mTier] };
}
@Override
@@ -45,30 +46,26 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc
@Override
public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
- return (MetaTileEntity)
- new GT_MetaTileEntity_Hatch_DynamoBuffer(this.mName, this.mTier, this.mDescription, this.mTextures);
+ return (MetaTileEntity) new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures);
}
@Override
public String[] getDescription() {
String[] g;
if (CORE.GTNH || (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechVersionAsInt() >= 50932)) {
- g = new String[] {
- "Dynamo with internal storage and additional Amp capacity",
- "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
- CORE.GT_Tooltip
- };
+ g = new String[] { "Dynamo with internal storage and additional Amp capacity",
+ "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
+ CORE.GT_Tooltip };
} else {
- g = new String[] {
- "Dynamo with internal storage and additional Amp capacity",
- "Stores " + maxEUStore() + "EU",
- "Amperage In: 4",
- "Amperage Out: 4",
- "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
- "Large Turbines only supply 1A to this, other Multiblocks can inject more amps",
- CORE.GT_Tooltip
- };
+ g = new String[] { "Dynamo with internal storage and additional Amp capacity",
+ "Stores " + maxEUStore() + "EU", "Amperage In: 4", "Amperage Out: 4",
+ "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
+ "Large Turbines only supply 1A to this, other Multiblocks can inject more amps", CORE.GT_Tooltip };
}
return g;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
index 964bc8adcf..fc80f604b3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
@@ -1,8 +1,15 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.SlotGroup;
+
import gregtech.api.enums.ItemList;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.gui.modularui.GT_UITextures;
@@ -18,42 +25,41 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileEntity_Hatch
implements IConfigurationCircuitSupport {
+
public GT_Recipe_Map mRecipeMap = null;
public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(int aID, String aName, String aNameRegional, int aTier) {
- super(aID, aName, aNameRegional, aTier, 17, new String[] {
- "Holds Data Orbs for the Elemental Duplicator",
- "Can insert/extract the circuit slot",
- "Use Circuit to select a slot (1-16)",
- CORE.GT_Tooltip
- });
- }
-
- public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+ super(
+ aID,
+ aName,
+ aNameRegional,
+ aTier,
+ 17,
+ new String[] { "Holds Data Orbs for the Elemental Duplicator", "Can insert/extract the circuit slot",
+ "Use Circuit to select a slot (1-16)", CORE.GT_Tooltip });
+ }
+
+ public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, 17, aDescription, aTextures);
}
- public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(
- String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(String aName, int aTier, String[] aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, 17, aDescription, aTextures);
}
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb) };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb) };
}
@Override
@@ -128,8 +134,7 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
@Override
public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
Logger.INFO("Checking if we can pull " + aStack.getDisplayName() + " from slot " + aIndex);
- if (aIndex == mInventory.length - 1
- && ItemUtils.isControlCircuit(aStack)
+ if (aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack)
&& aSide == getBaseMetaTileEntity().getFrontFacing()) {
return true;
}
@@ -139,8 +144,7 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
@Override
public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
Logger.INFO("Checking if we can put " + aStack.getDisplayName() + " into slot " + aIndex);
- if (aIndex == mInventory.length - 1
- && ItemUtils.isControlCircuit(aStack)
+ if (aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack)
&& aSide == getBaseMetaTileEntity().getFrontFacing()) {
return true;
}
@@ -158,8 +162,7 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
@Override
public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) {
- if (aIndex == mInventory.length - 1
- && ItemUtils.isControlCircuit(aStack)
+ if (aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack)
&& aSide == getBaseMetaTileEntity().getFrontFacing()) {
Logger.INFO("Putting " + aStack.getDisplayName() + " into slot " + aIndex);
return true;
@@ -203,13 +206,12 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 4)
- .startFromSlot(0)
- .endAtSlot(15)
- .background(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DATA_ORB)
- .applyForWidget(
- widget -> widget.setFilter(stack -> ItemList.Tool_DataOrb.isStackEqual(stack, false, true)))
- .build()
- .setPos(52, 7));
+ builder.widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(0).endAtSlot(15)
+ .background(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DATA_ORB)
+ .applyForWidget(
+ widget -> widget
+ .setFilter(stack -> ItemList.Tool_DataOrb.isStackEqual(stack, false, true)))
+ .build().setPos(52, 7));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java
index 7f291533a9..0d35795cb3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java
@@ -2,8 +2,16 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
import static gregtech.api.enums.GT_Values.V;
+import java.util.HashMap;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
+
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -14,23 +22,22 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.InventoryUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.HashMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class GT_MetaTileEntity_Hatch_Energy_RTG extends GT_MetaTileEntity_Hatch_Energy {
- public GT_MetaTileEntity_Hatch_Energy_RTG(
- int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount) {
- super(aID, aName, aNameRegional, aTier, aInvSlotCount, new String[] {
- "Energy Injector for Multiblocks", "Accepts up to 2 Amps"
- });
+ public GT_MetaTileEntity_Hatch_Energy_RTG(int aID, String aName, String aNameRegional, int aTier,
+ int aInvSlotCount) {
+ super(
+ aID,
+ aName,
+ aNameRegional,
+ aTier,
+ aInvSlotCount,
+ new String[] { "Energy Injector for Multiblocks", "Accepts up to 2 Amps" });
}
- public GT_MetaTileEntity_Hatch_Energy_RTG(
- String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_Energy_RTG(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aInvSlotCount, aDescription, aTextures);
}
@@ -45,18 +52,14 @@ public class GT_MetaTileEntity_Hatch_Energy_RTG extends GT_MetaTileEntity_Hatch_
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {
- aBaseTexture,
- TexturesGtBlock.getTextureFromIcon(TexturesGtBlock.Overlay_Hatch_RTG_On, new short[] {220, 220, 220, 0})
- };
+ return new ITexture[] { aBaseTexture, TexturesGtBlock
+ .getTextureFromIcon(TexturesGtBlock.Overlay_Hatch_RTG_On, new short[] { 220, 220, 220, 0 }) };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {
- aBaseTexture,
- TexturesGtBlock.getTextureFromIcon(TexturesGtBlock.Overlay_Hatch_RTG_Off, new short[] {220, 220, 220, 0})
- };
+ return new ITexture[] { aBaseTexture, TexturesGtBlock
+ .getTextureFromIcon(TexturesGtBlock.Overlay_Hatch_RTG_Off, new short[] { 220, 220, 220, 0 }) };
}
@Override
@@ -139,8 +142,8 @@ public class GT_MetaTileEntity_Hatch_Energy_RTG extends GT_MetaTileEntity_Hatch_
public Dat(ItemStack aStack) {
mStack = aStack;
mNBT = (aStack.getTagCompound() != null ? aStack.getTagCompound() : new NBTTagCompound());
- mUniqueDataTag = "" + Item.getIdFromItem(aStack.getItem()) + "" + aStack.getItemDamage() + "" + 1 + ""
- + mNBT.getId();
+ mUniqueDataTag = "" + Item
+ .getIdFromItem(aStack.getItem()) + "" + aStack.getItemDamage() + "" + 1 + "" + mNBT.getId();
}
public int getKey() {
@@ -165,8 +168,9 @@ public class GT_MetaTileEntity_Hatch_Energy_RTG extends GT_MetaTileEntity_Hatch_
mFuelValueMap.put(aKey, aFuelValue);
mFuelTypeMap.put(aKey, aDat.getKey());
mFuelTypeMapReverse.put(aDat.getKey(), aKey);
- Logger.INFO("RTG Hatch: Registered Fuel Pellet: " + ItemUtils.getItemName(aTemp) + ", Fuel Value: " + aFuelValue
- + ", Key: " + aKey + ", Key2: " + aDat.getKey());
+ Logger.INFO(
+ "RTG Hatch: Registered Fuel Pellet: " + ItemUtils.getItemName(
+ aTemp) + ", Fuel Value: " + aFuelValue + ", Key: " + aKey + ", Key2: " + aDat.getKey());
return true;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
index b11b3bc78e..86cddb8220 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
@@ -1,5 +1,15 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import java.lang.reflect.Field;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
@@ -12,27 +22,19 @@ import gtPlusPlus.api.objects.random.XSTR;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.Field;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTileEntity_Hatch_Input {
protected static XSTR floatGen = new XSTR();
public int mProgresstime = 0, mMaxProgresstime = 0;
- public GT_MetaTileEntity_Hatch_FluidGenerator(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GT_MetaTileEntity_Hatch_FluidGenerator(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier);
}
- public GT_MetaTileEntity_Hatch_FluidGenerator(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_FluidGenerator(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@@ -61,7 +63,7 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile
if (o instanceof String[]) {
S = (String[]) o;
} else if (o instanceof String) {
- S = new String[] {(String) o};
+ S = new String[] { (String) o };
}
}
}
@@ -85,19 +87,17 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile
t.printStackTrace();
}
- return new String[] {"Broken Tooltip - Report on Github"};
+ return new String[] { "Broken Tooltip - Report on Github" };
}
public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
- return new ITexture[] {
- aBaseTexture, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)
- };
+ return new ITexture[] { aBaseTexture,
+ new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) };
}
public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
- return new ITexture[] {
- aBaseTexture, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)
- };
+ return new ITexture[] { aBaseTexture,
+ new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) };
}
public boolean isSimpleMachine() {
@@ -118,13 +118,13 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile
public abstract MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity);
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@@ -198,9 +198,8 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile
// Logger.INFO("To add: "+this.getAmountOfFluidToGenerate());
// Logger.INFO("Space Free: "+(this.getCapacity()-this.getFluidAmount()));
}
- if (this.mFluid == null
- || (this.mFluid != null
- && (this.getCapacity() - this.getFluidAmount() >= this.getAmountOfFluidToGenerate()))) {
+ if (this.mFluid == null || (this.mFluid != null
+ && (this.getCapacity() - this.getFluidAmount() >= this.getAmountOfFluidToGenerate()))) {
return true;
}
return false;
@@ -218,8 +217,7 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile
@Override
public int fill(FluidStack aFluid, boolean doFill) {
- if (aFluid == null
- || aFluid.getFluid().getID() <= 0
+ if (aFluid == null || aFluid.getFluid().getID() <= 0
|| aFluid.amount <= 0
|| aFluid.getFluid() != getFluidToGenerate()
|| !canTankBeFilled()) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
index 03ba69a7cc..af9dab15ff 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
@@ -2,8 +2,12 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
import static gregtech.api.enums.GT_Values.V;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.interfaces.ITexture;
@@ -17,18 +21,17 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.gui.widget.ElectricSlotWidget;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatch {
+
public final GT_Recipe_Map mRecipeMap = null;
public GT_MetaTileEntity_Hatch_InputBattery(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Chargeable Item Bus for Multiblocks");
}
- public GT_MetaTileEntity_Hatch_InputBattery(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_InputBattery(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 4 : 16, aDescription, aTextures);
}
@@ -42,7 +45,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
} else {
mSlots = 16;
}
- return new String[] {this.mDescription, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip};
+ return new String[] { this.mDescription, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip };
}
@Override
@@ -77,12 +80,12 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger) };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger) };
}
@Override
@@ -126,9 +129,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
MetaTileEntity mMetaTileEntity = (MetaTileEntity) aBaseMetaTileEntity.getMetaTileEntity();
if (mMetaTileEntity.rechargerSlotCount() > 0 && aBaseMetaTileEntity.getStoredEU() > 0) {
for (int i = mMetaTileEntity.rechargerSlotStartIndex(),
- k = mMetaTileEntity.rechargerSlotCount() + i;
- i < k;
- i++) {
+ k = mMetaTileEntity.rechargerSlotCount() + i; i < k; i++) {
if (aBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) {
for (int u = 0; u < 10; u++) {
aBaseMetaTileEntity.decreaseStoredEnergyUnits(
@@ -163,19 +164,18 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
protected void fillStacksIntoFirstSlots() {
for (int i = 0; i < mInventory.length; i++)
- for (int j = i + 1; j < mInventory.length; j++)
- if (mInventory[j] != null
- && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) {
- GT_Utility.moveStackFromSlotAToSlotB(
- getBaseMetaTileEntity(),
- getBaseMetaTileEntity(),
- j,
- i,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- }
+ for (int j = i + 1; j < mInventory.length; j++) if (mInventory[j] != null
+ && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) {
+ GT_Utility.moveStackFromSlotAToSlotB(
+ getBaseMetaTileEntity(),
+ getBaseMetaTileEntity(),
+ j,
+ i,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
+ }
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
index f62e0c27e0..4ece1a69f9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
@@ -1,8 +1,14 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.gui.modularui.GUITextureSet;
@@ -20,10 +26,6 @@ import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch_Muffler implements IAddGregtechLogo {
@@ -47,11 +49,11 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
private int mPollutionSmogLimit = 500000;
public GT_MetaTileEntity_Hatch_Muffler_Adv(int aID, String aName, String aNameRegional, int aTier) {
- super(aID, aName, aNameRegional, aTier, 1, new String[] {""});
+ super(aID, aName, aNameRegional, aTier, 1, new String[] { "" });
}
- public GT_MetaTileEntity_Hatch_Muffler_Adv(
- String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_Muffler_Adv(String aName, int aTier, String[] aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, 1, aDescription, aTextures);
}
@@ -64,10 +66,10 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
desc[mDescArray.length + 1] = "Requires 3 Air on the exhaust face";
desc[mDescArray.length + 2] = "Requires Air Filters";
desc[mDescArray.length + 3] = "Mufflers require T2 Filters from IV-" + GT_Values.VN[9];
- desc[mDescArray.length + 4] =
- "Reduces Pollution to " + this.calculatePollutionReductionForTooltip(100) + "%";
- desc[mDescArray.length + 5] =
- "Recovers " + (105 - this.calculatePollutionReductionForTooltip(100)) + "% of CO2/CO/SO2";
+ desc[mDescArray.length + 4] = "Reduces Pollution to " + this.calculatePollutionReductionForTooltip(100)
+ + "%";
+ desc[mDescArray.length + 5] = "Recovers " + (105 - this.calculatePollutionReductionForTooltip(100))
+ + "% of CO2/CO/SO2";
desc[mDescArray.length + 6] = CORE.GT_Tooltip;
return desc;
} else {
@@ -76,11 +78,11 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
}
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv) };
}
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv) };
}
public boolean isValidSlot(int aIndex) {
@@ -89,7 +91,10 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GT_MetaTileEntity_Hatch_Muffler_Adv(
- this.mName, this.mTier, StaticFields59.getDescriptionArray(this), this.mTextures);
+ this.mName,
+ this.mTier,
+ StaticFields59.getDescriptionArray(this),
+ this.mTextures);
}
@Override
@@ -99,8 +104,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
}
private boolean airCheck() {
- if (this.getBaseMetaTileEntity()
- .getAirAtSide(this.getBaseMetaTileEntity().getFrontFacing())
+ if (this.getBaseMetaTileEntity().getAirAtSide(this.getBaseMetaTileEntity().getFrontFacing())
&& this.getBaseMetaTileEntity()
.getAirAtSideAndDistance(this.getBaseMetaTileEntity().getFrontFacing(), 1)
&& this.getBaseMetaTileEntity()
@@ -130,8 +134,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
double aVal1 = aPollution * Math.pow(0.64D, (double) (this.mTier - 1));
int aVal2 = (int) aVal1;
if (!hasValidFilter()) {
- aVal2 = (int) ((double) aPollution * Math.pow(0.7D, (double) (this.mTier - 1)));
- ;
+ aVal2 = (int) ((double) aPollution * Math.pow(0.7D, (double) (this.mTier - 1)));;
}
return aVal2;
}
@@ -331,10 +334,8 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
@Override
public GUITextureSet getGUITextureSet() {
- return new GUITextureSet()
- .setMainBackground(GTPP_UITextures.BACKGROUND_YELLOW)
- .setItemSlot(GTPP_UITextures.SLOT_ITEM_YELLOW)
- .setTitleTab(
+ return new GUITextureSet().setMainBackground(GTPP_UITextures.BACKGROUND_YELLOW)
+ .setItemSlot(GTPP_UITextures.SLOT_ITEM_YELLOW).setTitleTab(
GTPP_UITextures.TAB_TITLE_YELLOW,
GTPP_UITextures.TAB_TITLE_DARK_YELLOW,
GTPP_UITextures.TAB_TITLE_ANGULAR_YELLOW);
@@ -342,9 +343,8 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new SlotWidget(inventoryHandler, 0)
- .setFilter(stack -> stack.getItem() instanceof ItemAirFilter)
- .setBackground(getGUITextureSet().getItemSlot())
- .setPos(79, 34));
+ builder.widget(
+ new SlotWidget(inventoryHandler, 0).setFilter(stack -> stack.getItem() instanceof ItemAirFilter)
+ .setBackground(getGUITextureSet().getItemSlot()).setPos(79, 34));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
index 350b7a788a..54cf8f1366 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import java.lang.reflect.Field;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
import gregtech.api.enums.Textures.BlockIcons;
@@ -13,10 +19,6 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
-import java.lang.reflect.Field;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.fluids.FluidStack;
public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_Input {
@@ -29,15 +31,15 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
initHatch();
}
- public GT_MetaTileEntity_Hatch_Naquadah(
- final String aName, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_Naquadah(final String aName, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, 6, aDescription, aTextures);
mFluidCapacity = 32000;
initHatch();
}
- public GT_MetaTileEntity_Hatch_Naquadah(
- final String aName, final String[] aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_Naquadah(final String aName, final String[] aDescription,
+ final ITexture[][][] aTextures) {
super(aName, 6, aDescription[0], aTextures);
mFluidCapacity = 32000;
initHatch();
@@ -56,20 +58,17 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
}
public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
- return new ITexture[] {
- aBaseTexture,
- new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)
- };
+ return new ITexture[] { aBaseTexture,
+ new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) };
}
public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
- return new ITexture[] {
- aBaseTexture, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE)
- };
+ return new ITexture[] { aBaseTexture,
+ new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) };
}
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
if (aSide == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0) {
for (FluidStack f : mFluidsToUse) {
if (f != null) {
@@ -115,14 +114,9 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
String aNaq = aDescCache[0];
String aEnrNaq = aDescCache[1];
String aNaquad = aDescCache[2];
- String[] s2 = new String[] {
- "Fluid Input for Multiblocks",
- "Capacity: " + getCapacity() + "L",
- "Accepted Fluid: " + aNaq,
- "Accepted Fluid: " + aEnrNaq,
- "Accepted Fluid: " + aNaquad,
- CORE.GT_Tooltip
- };
+ String[] s2 = new String[] { "Fluid Input for Multiblocks", "Capacity: " + getCapacity() + "L",
+ "Accepted Fluid: " + aNaq, "Accepted Fluid: " + aEnrNaq, "Accepted Fluid: " + aNaquad,
+ CORE.GT_Tooltip };
return s2;
}
@@ -130,8 +124,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
private String formatFluidString(FluidStack f) {
FluidStack mLockedStack = f;
- Integer mLockedTemp = 0;
- ;
+ Integer mLockedTemp = 0;;
String mTempMod = "" + EnumChatFormatting.RESET;
mLockedTemp = mLockedStack.getFluid().getTemperature();
if (mLockedTemp != null) {
@@ -168,13 +161,8 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
private Field F1, F2;
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
byte a1 = 0, a2 = 0;
try {
if (F1 == null) {
@@ -190,32 +178,26 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
if (F2 != null) {
a2 = F2.getByte(this);
}
- } catch (IllegalArgumentException | IllegalAccessException n) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException n) {}
int textureIndex = a1 | a2 << 7;
byte texturePointer = (byte) (a1 & 127);
if (aSide == 1 || aSide == 0) {
- ITexture g = textureIndex > 0
- ? StaticFields59.getCasingTexturePages(a2, texturePointer)
+ ITexture g = textureIndex > 0 ? StaticFields59.getCasingTexturePages(a2, texturePointer)
: BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1];
- return new ITexture[] {
- g, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE)
- };
+ return new ITexture[] { g,
+ new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE) };
}
return aSide != aFacing
- ? (textureIndex > 0
- ? new ITexture[] {StaticFields59.getCasingTexturePages(a2, texturePointer)}
- : new ITexture[] {BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1]})
+ ? (textureIndex > 0 ? new ITexture[] { StaticFields59.getCasingTexturePages(a2, texturePointer) }
+ : new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1] })
: (textureIndex > 0
- ? (aActive
- ? this.getTexturesActive(StaticFields59.getCasingTexturePages(a2, texturePointer))
+ ? (aActive ? this.getTexturesActive(StaticFields59.getCasingTexturePages(a2, texturePointer))
: this.getTexturesInactive(StaticFields59.getCasingTexturePages(a2, texturePointer)))
- : (aActive
- ? this.getTexturesActive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])
+ : (aActive ? this.getTexturesActive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])
: this.getTexturesInactive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
index 101a310506..10b9af5cc9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
@@ -2,8 +2,12 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
import static gregtech.api.enums.GT_Values.V;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
+
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -15,16 +19,15 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.gui.widget.ElectricSlotWidget;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hatch {
+
public GT_MetaTileEntity_Hatch_OutputBattery(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Dischargeable Item Bus for Multiblocks");
}
- public GT_MetaTileEntity_Hatch_OutputBattery(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_OutputBattery(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 9 : 16, aDescription, aTextures);
}
@@ -38,7 +41,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
} else {
mSlots = 16;
}
- return new String[] {this.mDescription, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip};
+ return new String[] { this.mDescription, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip };
}
@Override
@@ -68,12 +71,12 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger) };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger) };
}
@Override
@@ -125,19 +128,18 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
protected void fillStacksIntoFirstSlots() {
for (int i = 0; i < mInventory.length; i++)
- for (int j = i + 1; j < mInventory.length; j++)
- if (mInventory[j] != null
- && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) {
- GT_Utility.moveStackFromSlotAToSlotB(
- getBaseMetaTileEntity(),
- getBaseMetaTileEntity(),
- j,
- i,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- }
+ for (int j = i + 1; j < mInventory.length; j++) if (mInventory[j] != null
+ && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) {
+ GT_Utility.moveStackFromSlotAToSlotB(
+ getBaseMetaTileEntity(),
+ getBaseMetaTileEntity(),
+ j,
+ i,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
+ }
}
@Override
@@ -172,9 +174,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
if (mMetaTileEntity.dechargerSlotCount() > 0
&& mMetaTileEntity.getEUVar() < aBaseMetaTileEntity.getEUCapacity()) {
for (int i = mMetaTileEntity.dechargerSlotStartIndex(),
- k = mMetaTileEntity.dechargerSlotCount() + i;
- i < k;
- i++) {
+ k = mMetaTileEntity.dechargerSlotCount() + i; i < k; i++) {
if (mMetaTileEntity.mInventory[i] != null
&& mMetaTileEntity.getEUVar() < aBaseMetaTileEntity.getEUCapacity()) {
aBaseMetaTileEntity.increaseStoredEnergyUnits(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java
index 7f09abf177..f7d769a285 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java
@@ -1,6 +1,15 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import java.lang.reflect.Field;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
import com.google.common.collect.BiMap;
+
import gregtech.api.enums.Textures.BlockIcons;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -11,12 +20,6 @@ import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
-import java.lang.reflect.Field;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Output {
@@ -30,15 +33,15 @@ public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Outp
initHatch();
}
- public GT_MetaTileEntity_Hatch_Plasma(
- final String aName, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_Plasma(final String aName, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, 6, aDescription, aTextures);
mFluidCapacity = 256000;
initHatch();
}
- public GT_MetaTileEntity_Hatch_Plasma(
- final String aName, final String[] aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_Plasma(final String aName, final String[] aDescription,
+ final ITexture[][][] aTextures) {
super(aName, 6, aDescription[0], aTextures);
mFluidCapacity = 256000;
initHatch();
@@ -67,11 +70,9 @@ public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Outp
}
}
}
- } catch (ClassCastException e) {
- }
+ } catch (ClassCastException e) {}
}
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
}
AutoMap<Fluid> mPlasmaCache = new AutoMap<Fluid>();
@@ -94,15 +95,15 @@ public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Outp
}
public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture};
+ return new ITexture[] { aBaseTexture };
}
public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture};
+ return new ITexture[] { aBaseTexture };
}
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
if (aSide == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0) {
for (Fluid f : mFluidsToUse) {
if (f != null) {
@@ -148,10 +149,14 @@ public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Outp
String aX = EnumChatFormatting.GRAY + "";
String a1 = EnumChatFormatting.GOLD + "Refined containment" + aX;
String a2 = EnumChatFormatting.GOLD + "Capacity: " + EnumChatFormatting.DARK_AQUA + getCapacity() + "L" + aX;
- String a3 = EnumChatFormatting.GOLD + "Supports " + EnumChatFormatting.DARK_RED + mTotalPlasmaSupported
- + EnumChatFormatting.GOLD + " types of plasma" + aX;
-
- String[] s2 = new String[] {a1, a2, a3, CORE.GT_Tooltip};
+ String a3 = EnumChatFormatting.GOLD + "Supports "
+ + EnumChatFormatting.DARK_RED
+ + mTotalPlasmaSupported
+ + EnumChatFormatting.GOLD
+ + " types of plasma"
+ + aX;
+
+ String[] s2 = new String[] { a1, a2, a3, CORE.GT_Tooltip };
return s2;
}
@@ -169,13 +174,8 @@ public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Outp
private Field F1, F2;
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
byte a1 = 0, a2 = 0;
try {
if (F1 == null) {
@@ -191,30 +191,25 @@ public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Outp
if (F2 != null) {
a2 = F2.getByte(this);
}
- } catch (IllegalArgumentException | IllegalAccessException n) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException n) {}
int textureIndex = a1 | a2 << 7;
byte texturePointer = (byte) (a1 & 127);
if (aSide == 1 || aSide == 0) {
- ITexture g = textureIndex > 0
- ? StaticFields59.getCasingTexturePages(a2, texturePointer)
+ ITexture g = textureIndex > 0 ? StaticFields59.getCasingTexturePages(a2, texturePointer)
: BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1];
- return new ITexture[] {g};
+ return new ITexture[] { g };
}
return aSide != aFacing
- ? (textureIndex > 0
- ? new ITexture[] {StaticFields59.getCasingTexturePages(a2, texturePointer)}
- : new ITexture[] {BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1]})
+ ? (textureIndex > 0 ? new ITexture[] { StaticFields59.getCasingTexturePages(a2, texturePointer) }
+ : new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1] })
: (textureIndex > 0
- ? (aActive
- ? this.getTexturesActive(StaticFields59.getCasingTexturePages(a2, texturePointer))
+ ? (aActive ? this.getTexturesActive(StaticFields59.getCasingTexturePages(a2, texturePointer))
: this.getTexturesInactive(StaticFields59.getCasingTexturePages(a2, texturePointer)))
- : (aActive
- ? this.getTexturesActive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])
+ : (aActive ? this.getTexturesActive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])
: this.getTexturesInactive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
index 0a2ccdb8e5..67827bcbf5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
@@ -1,12 +1,5 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.tileentity.TileEntity;
@@ -16,18 +9,26 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.IFluidHandler;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+
public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_FluidGenerator {
private static Block sBlock_EIO;
private static Block sBlock_RIO;
- public GT_MetaTileEntity_Hatch_Reservoir(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GT_MetaTileEntity_Hatch_Reservoir(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier);
}
- public GT_MetaTileEntity_Hatch_Reservoir(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_Reservoir(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@@ -85,8 +86,7 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
@Override
public boolean doesHatchMeetConditionsToGenerate() {
- Block aWater = this.getBaseMetaTileEntity()
- .getBlockAtSide(this.getBaseMetaTileEntity().getFrontFacing());
+ Block aWater = this.getBaseMetaTileEntity().getBlockAtSide(this.getBaseMetaTileEntity().getFrontFacing());
if (aWater != null && aWater != Blocks.air) {
if (!this.canTankBeFilled()) {
return false;
@@ -94,18 +94,18 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
setCrossModData();
if (LoadedMods.EnderIO) {
if (aWater == sBlock_EIO) {
- return isTileValid(this.getBaseMetaTileEntity()
- .getTileEntityAtSide(this.getBaseMetaTileEntity().getFrontFacing()));
+ return isTileValid(
+ this.getBaseMetaTileEntity()
+ .getTileEntityAtSide(this.getBaseMetaTileEntity().getFrontFacing()));
}
}
if (LoadedMods.RemoteIO) {
if (aWater == sBlock_RIO
- && this.getBaseMetaTileEntity()
- .getMetaIDAtSide(
- this.getBaseMetaTileEntity().getFrontFacing())
+ && this.getBaseMetaTileEntity().getMetaIDAtSide(this.getBaseMetaTileEntity().getFrontFacing())
== 0) {
- return isTileValid(this.getBaseMetaTileEntity()
- .getTileEntityAtSide(this.getBaseMetaTileEntity().getFrontFacing()));
+ return isTileValid(
+ this.getBaseMetaTileEntity()
+ .getTileEntityAtSide(this.getBaseMetaTileEntity().getFrontFacing()));
}
}
return aWater == Blocks.water || aWater == Blocks.flowing_water;
@@ -117,10 +117,10 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
public void generateParticles(World aWorld, String name) {}
public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water) };
}
public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
index 4be947d68e..eecef35269 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
@@ -3,8 +3,13 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
import static gregtech.api.enums.Textures.BlockIcons.ITEM_IN_SIGN;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_IN;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
+
import gregtech.GT_Mod;
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GT_UIInfos;
@@ -18,46 +23,46 @@ import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Hatch {
+
public GT_Recipe_Map mRecipeMap = null;
public boolean disableSort;
public GT_MetaTileEntity_Hatch_Steam_BusInput(int aID, String aName, String aNameRegional, int aTier) {
- super(aID, aName, aNameRegional, aTier, getSlots(aTier), new String[] {
- "Item Input for Steam Multiblocks",
- "Shift + right click with screwdriver to toggle automatic item shuffling",
- "Capacity: 4 stacks",
- "Does not work with non-steam multiblocks",
- CORE.GT_Tooltip
- });
- }
-
- public GT_MetaTileEntity_Hatch_Steam_BusInput(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+ super(
+ aID,
+ aName,
+ aNameRegional,
+ aTier,
+ getSlots(aTier),
+ new String[] { "Item Input for Steam Multiblocks",
+ "Shift + right click with screwdriver to toggle automatic item shuffling", "Capacity: 4 stacks",
+ "Does not work with non-steam multiblocks", CORE.GT_Tooltip });
+ }
+
+ public GT_MetaTileEntity_Hatch_Steam_BusInput(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, 4, aDescription, aTextures);
}
- public GT_MetaTileEntity_Hatch_Steam_BusInput(
- String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_Steam_BusInput(String aName, int aTier, String[] aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, 4, aDescription, aTextures);
}
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
- ? new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN)}
- : new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN)};
+ ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN) }
+ : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
- ? new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN)}
- : new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN)};
+ ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN) }
+ : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
}
@Override
@@ -110,18 +115,17 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
if (mInventory[i] != null && mInventory[i].stackSize <= 0) mInventory[i] = null;
} else {
for (int i = 0; i < mInventory.length; i++)
- for (int j = i + 1; j < mInventory.length; j++)
- if (mInventory[j] != null
- && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j])))
- GT_Utility.moveStackFromSlotAToSlotB(
- getBaseMetaTileEntity(),
- getBaseMetaTileEntity(),
- j,
- i,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
+ for (int j = i + 1; j < mInventory.length; j++) if (mInventory[j] != null
+ && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j])))
+ GT_Utility.moveStackFromSlotAToSlotB(
+ getBaseMetaTileEntity(),
+ getBaseMetaTileEntity(),
+ j,
+ i,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
}
}
@@ -186,127 +190,85 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
}
public ITexture[] getSideFacingActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
}
public ITexture[] getSideFacingInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
}
public ITexture[] getFrontFacingActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
}
public ITexture[] getFrontFacingInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
}
public ITexture[] getTopFacingActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) };
}
public ITexture[] getTopFacingInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) };
}
public ITexture[] getBottomFacingActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
- : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
+ : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) };
}
public ITexture[] getBottomFacingInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
- : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
+ : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) };
}
public ITexture[] getBottomFacingPipeActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
- : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
+ : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getBottomFacingPipeInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
- : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
+ : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getTopFacingPipeActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getTopFacingPipeInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getSideFacingPipeActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getSideFacingPipeInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
index a6bfd65636..48e27f0729 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
@@ -3,8 +3,12 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
import static gregtech.api.enums.Textures.BlockIcons.ITEM_OUT_SIGN;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_OUT;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
+
import gregtech.GT_Mod;
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GT_UIInfos;
@@ -15,41 +19,42 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.render.TextureFactory;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_Hatch {
- public GT_MetaTileEntity_Hatch_Steam_BusOutput(int aID, String aName, String aNameRegional, int aTier) {
- super(aID, aName, aNameRegional, aTier, 4, new String[] {
- "Item Output for Steam Multiblocks",
- "Capacity: 4 stacks",
- "Does not work with non-steam multiblocks",
- CORE.GT_Tooltip
- });
- }
- public GT_MetaTileEntity_Hatch_Steam_BusOutput(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_Steam_BusOutput(int aID, String aName, String aNameRegional, int aTier) {
+ super(
+ aID,
+ aName,
+ aNameRegional,
+ aTier,
+ 4,
+ new String[] { "Item Output for Steam Multiblocks", "Capacity: 4 stacks",
+ "Does not work with non-steam multiblocks", CORE.GT_Tooltip });
+ }
+
+ public GT_MetaTileEntity_Hatch_Steam_BusOutput(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, 4, aDescription, aTextures);
}
- public GT_MetaTileEntity_Hatch_Steam_BusOutput(
- String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_Steam_BusOutput(String aName, int aTier, String[] aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, 4, aDescription, aTextures);
}
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
- ? new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(ITEM_OUT_SIGN)}
- : new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT)};
+ ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(ITEM_OUT_SIGN) }
+ : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
- ? new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(ITEM_OUT_SIGN)}
- : new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT)};
+ ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(ITEM_OUT_SIGN) }
+ : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_OUT) };
}
@Override
@@ -116,127 +121,85 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
}
public ITexture[] getSideFacingActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
}
public ITexture[] getSideFacingInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
}
public ITexture[] getFrontFacingActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
}
public ITexture[] getFrontFacingInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE) };
}
public ITexture[] getTopFacingActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) };
}
public ITexture[] getTopFacingInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP) };
}
public ITexture[] getBottomFacingActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
- : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
+ : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) };
}
public ITexture[] getBottomFacingInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
- : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
+ : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM) };
}
public ITexture[] getBottomFacingPipeActive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
- : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
+ : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getBottomFacingPipeInactive(byte aColor) {
return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
- : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
+ : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getTopFacingPipeActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getTopFacingPipeInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getSideFacingPipeActive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getSideFacingPipeInactive(byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(
- mTier == 1
- ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
- : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
index 2c04c75fe3..00f7c97a01 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
@@ -3,9 +3,14 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST5;
import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST_ACTIVE5;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.gui.modularui.GT_UIInfos;
@@ -26,9 +31,6 @@ import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
@SuppressWarnings("deprecation")
public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
@@ -52,25 +54,21 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Right Click with a soldering iron to reset controller link",
- "Right Click with a wrench to remove turbine",
- "Right Click with a screwdriver for technical information",
- "Sneak + Right Click with a wrench to rotate",
- "Sneak + Right Click with a screwdriver to disable animations",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Right Click with a soldering iron to reset controller link",
+ "Right Click with a wrench to remove turbine",
+ "Right Click with a screwdriver for technical information",
+ "Sneak + Right Click with a wrench to rotate",
+ "Sneak + Right Click with a screwdriver to disable animations", CORE.GT_Tooltip };
}
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, getFrontFacingTurbineTexture()};
+ return new ITexture[] { aBaseTexture, getFrontFacingTurbineTexture() };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, getFrontFacingTurbineTexture()};
+ return new ITexture[] { aBaseTexture, getFrontFacingTurbineTexture() };
}
public int getEU() {
@@ -159,12 +157,10 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
public void damageTurbine(long aEUt, int damageFactorLow, float damageFactorHigh) {
if (hasTurbine() && MathUtils.randInt(0, 1) == 0) {
ItemStack aTurbine = getTurbine();
- ((GT_MetaGenerated_Tool) aTurbine.getItem())
- .doDamage(
- aTurbine,
- (long) getDamageToComponent(aTurbine)
- * (long) Math.min(
- (float) aEUt / (float) damageFactorLow, Math.pow(aEUt, damageFactorHigh)));
+ ((GT_MetaGenerated_Tool) aTurbine.getItem()).doDamage(
+ aTurbine,
+ (long) getDamageToComponent(aTurbine) * (long) Math
+ .min((float) aEUt / (float) damageFactorLow, Math.pow(aEUt, damageFactorHigh)));
}
}
@@ -223,8 +219,8 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
BlockPos p = BlockPos.generateBlockPos(mControllerLocation);
if (p != null) {
// Logger.INFO(p.getLocationString());
- IGregTechTileEntity tTileEntity =
- getBaseMetaTileEntity().getIGregTechTileEntity(p.xPos, p.yPos, p.zPos);
+ IGregTechTileEntity tTileEntity = getBaseMetaTileEntity()
+ .getIGregTechTileEntity(p.xPos, p.yPos, p.zPos);
if (tTileEntity != null
&& tTileEntity.getMetaTileEntity() instanceof GregtechMetaTileEntity_LargerTurbineBase) {
return (GregtechMetaTileEntity_LargerTurbineBase) tTileEntity.getMetaTileEntity();
@@ -269,8 +265,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
private ITexture getFrontFacingTurbineTexture() {
if (!mHasController) {
- return this.getBaseMetaTileEntity().isActive()
- ? new GT_RenderedTexture(LARGETURBINE_ST_ACTIVE5)
+ return this.getBaseMetaTileEntity().isActive() ? new GT_RenderedTexture(LARGETURBINE_ST_ACTIVE5)
: new GT_RenderedTexture(LARGETURBINE_ST5);
} else {
if (usingAnimations()) {
@@ -319,17 +314,15 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
if (mHasController) {
PlayerUtils.messagePlayer(
aPlayer,
- "Controller Location: "
- + BlockPos.generateBlockPos(mControllerLocation).getLocationString());
+ "Controller Location: " + BlockPos.generateBlockPos(mControllerLocation).getLocationString());
PlayerUtils.messagePlayer(aPlayer, "Controller Active? " + this.isControllerActive());
}
- PlayerUtils.messagePlayer(
- aPlayer, "Active? " + this.getBaseMetaTileEntity().isActive());
+ PlayerUtils.messagePlayer(aPlayer, "Active? " + this.getBaseMetaTileEntity().isActive());
PlayerUtils.messagePlayer(aPlayer, "Has Turbine inserted? " + this.hasTurbine());
if (this.hasTurbine()) {
Materials aMat = GT_MetaGenerated_Tool.getPrimaryMaterial(getTurbine());
- String aSize = GregtechMetaTileEntity_LargerTurbineBase.getTurbineSizeString(
- GregtechMetaTileEntity_LargerTurbineBase.getTurbineSize(getTurbine()));
+ String aSize = GregtechMetaTileEntity_LargerTurbineBase
+ .getTurbineSizeString(GregtechMetaTileEntity_LargerTurbineBase.getTurbineSize(getTurbine()));
PlayerUtils.messagePlayer(aPlayer, "Using: " + aMat.mLocalizedName + " " + aSize);
}
} else {
@@ -343,8 +336,8 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
}
@Override
- public boolean onWrenchRightClick(
- byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ public boolean onWrenchRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
+ float aZ) {
if (this.getBaseMetaTileEntity().isServerSide() && !aPlayer.isSneaking()) {
ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
if (tCurrentItem != null) {
@@ -357,8 +350,8 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
}
@Override
- public boolean onSolderingToolRightClick(
- byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
+ float aZ) {
if (this.getBaseMetaTileEntity().isServerSide()) {
ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
if (tCurrentItem != null) {
@@ -417,9 +410,8 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new SlotWidget(inventoryHandler, 0)
- .setFilter(GregtechMetaTileEntity_LargerTurbineBase::isValidTurbine)
- .setAccess(false, true)
- .setPos(79, 34));
+ builder.widget(
+ new SlotWidget(inventoryHandler, 0).setFilter(GregtechMetaTileEntity_LargerTurbineBase::isValidTurbine)
+ .setAccess(false, true).setPos(79, 34));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java
index 63937d42ce..a15a11f34a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java
@@ -1,8 +1,15 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -16,11 +23,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.sys.KeyboardUtils;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_Hatch_InputBus {
@@ -28,13 +30,13 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
super(aID, aName, aNameRegional, aTier);
}
- public GT_MetaTileEntity_Hatch_TurbineProvider(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_TurbineProvider(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
- public GT_MetaTileEntity_Hatch_TurbineProvider(
- String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_TurbineProvider(String aName, int aTier, String[] aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aDescription[0], aTextures);
}
@@ -44,16 +46,11 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
@Override
public String[] getDescription() {
- return new String[] {
- "An automation port for Large Turbines",
- "Will attempt once per 1200 ticks to fill the turbine slot of it's parent turbine",
- "You may adjust this with a screwdriver",
- "Hold shift to adjust in finer amounts",
- "Hold control to adjust direction",
- "Left Click with Screwdriver to reset",
- "This module assumes the entire turbine is in the same Chunk",
- CORE.GT_Tooltip
- };
+ return new String[] { "An automation port for Large Turbines",
+ "Will attempt once per 1200 ticks to fill the turbine slot of it's parent turbine",
+ "You may adjust this with a screwdriver", "Hold shift to adjust in finer amounts",
+ "Hold control to adjust direction", "Left Click with Screwdriver to reset",
+ "This module assumes the entire turbine is in the same Chunk", CORE.GT_Tooltip };
}
private GT_MetaTileEntity_LargeTurbine mParent = null;
@@ -214,9 +211,8 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new SlotWidget(inventoryHandler, 0)
- .setFilter(GregtechMetaTileEntity_LargerTurbineBase::isValidTurbine)
- .setAccess(false, true)
- .setPos(79, 34));
+ builder.widget(
+ new SlotWidget(inventoryHandler, 0).setFilter(GregtechMetaTileEntity_LargerTurbineBase::isValidTurbine)
+ .setAccess(false, true).setPos(79, 34));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java
index 8854818cac..f3d2d79e19 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java
@@ -4,6 +4,7 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow.Builder;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.Scrollable;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
@@ -12,6 +13,7 @@ import gregtech.api.util.extensions.ArrayExt;
import gtPlusPlus.core.lib.CORE;
public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_InputBus {
+
public GT_MetaTileEntity_SuperBus_Input(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, getSlots(aTier) + 1);
}
@@ -32,12 +34,15 @@ public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_In
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GT_MetaTileEntity_SuperBus_Input(
- this.mName, this.mTier, ArrayExt.of(this.mDescription), this.mTextures);
+ this.mName,
+ this.mTier,
+ ArrayExt.of(this.mDescription),
+ this.mTextures);
}
@Override
public String[] getDescription() {
- return new String[] {"Item Input for Multiblocks", "" + getSlots(this.mTier) + " Slots", CORE.GT_Tooltip};
+ return new String[] { "Item Input for Multiblocks", "" + getSlots(this.mTier) + " Slots", CORE.GT_Tooltip };
}
@Override
@@ -51,9 +56,9 @@ public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_In
for (int row = 0; row * 4 < inventoryHandler.getSlots() - 1; row++) {
int columnsToMake = Math.min(inventoryHandler.getSlots() - row * 4, 4);
for (int column = 0; column < columnsToMake; column++) {
- scrollable.widget(new SlotWidget(inventoryHandler, row * 4 + column)
- .setPos(column * 18, row * 18)
- .setSize(18, 18));
+ scrollable.widget(
+ new SlotWidget(inventoryHandler, row * 4 + column).setPos(column * 18, row * 18)
+ .setSize(18, 18));
}
}
builder.widget(scrollable.setSize(18 * 4 + 4, 18 * 4).setPos(52, 7));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java
index 26fbf7cdd8..418717b1c8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java
@@ -1,9 +1,12 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import net.minecraft.inventory.IInventory;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow.Builder;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.Scrollable;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
@@ -11,7 +14,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu
import gregtech.api.util.GT_Utility;
import gregtech.api.util.extensions.ArrayExt;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.inventory.IInventory;
public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_OutputBus {
@@ -39,7 +41,10 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GT_MetaTileEntity_SuperBus_Output(
- this.mName, this.mTier, ArrayExt.of(this.mDescription), this.mTextures);
+ this.mName,
+ this.mTier,
+ ArrayExt.of(this.mDescription),
+ this.mTextures);
}
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
@@ -61,9 +66,8 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O
protected void fillStacksIntoFirstSlots() {
for (int i = 0; i < this.mInventory.length; ++i) {
for (int j = i + 1; j < this.mInventory.length; ++j) {
- if (this.mInventory[j] != null
- && (this.mInventory[i] == null
- || GT_Utility.areStacksEqual(this.mInventory[i], this.mInventory[j]))) {
+ if (this.mInventory[j] != null && (this.mInventory[i] == null
+ || GT_Utility.areStacksEqual(this.mInventory[i], this.mInventory[j]))) {
GT_Utility.moveStackFromSlotAToSlotB(
(IInventory) this.getBaseMetaTileEntity(),
(IInventory) this.getBaseMetaTileEntity(),
@@ -80,8 +84,8 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O
@Override
public String[] getDescription() {
- String[] aDesc =
- new String[] {"Item Output for Multiblocks", "" + getSlots(this.mTier) + " Slots", CORE.GT_Tooltip};
+ String[] aDesc = new String[] { "Item Output for Multiblocks", "" + getSlots(this.mTier) + " Slots",
+ CORE.GT_Tooltip };
return aDesc;
}
@@ -91,9 +95,9 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O
for (int row = 0; row * 4 < inventoryHandler.getSlots() - 1; row++) {
int columnsToMake = Math.min(inventoryHandler.getSlots() - row * 4, 4);
for (int column = 0; column < columnsToMake; column++) {
- scrollable.widget(new SlotWidget(inventoryHandler, row * 4 + column)
- .setPos(column * 18, row * 18)
- .setSize(18, 18));
+ scrollable.widget(
+ new SlotWidget(inventoryHandler, row * 4 + column).setPos(column * 18, row * 18)
+ .setSize(18, 18));
}
}
builder.widget(scrollable.setSize(18 * 4 + 4, 18 * 4).setPos(52, 7));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
index 8f7fd8d4d3..26ed6b2bcd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import net.minecraft.util.EnumChatFormatting;
+
import gregtech.api.enums.Dyes;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.SubTag;
@@ -10,7 +12,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
import gregtech.api.render.TextureFactory;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
-import net.minecraft.util.EnumChatFormatting;
public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
@@ -23,38 +24,18 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
public final GT_Materials mMaterial;
private boolean mCheckConnections;
- public GregtechMetaPipeEntityFluid(
- int aID,
- String aName,
- String aNameRegional,
- float aThickNess,
- GT_Materials aMaterial,
- int aCapacity,
- int aHeatResistance,
- boolean aGasProof) {
+ public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess,
+ GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof) {
this(aID, aName, aNameRegional, aThickNess, aMaterial, aCapacity, aHeatResistance, aGasProof, 1);
}
- public GregtechMetaPipeEntityFluid(
- final String aName,
- final float aThickNess,
- final GT_Materials aMaterial,
- final int aCapacity,
- final int aHeatResistance,
- final boolean aGasProof) {
+ public GregtechMetaPipeEntityFluid(final String aName, final float aThickNess, final GT_Materials aMaterial,
+ final int aCapacity, final int aHeatResistance, final boolean aGasProof) {
this(aName, aThickNess, aMaterial, aCapacity, aHeatResistance, aGasProof, 1);
}
- public GregtechMetaPipeEntityFluid(
- int aID,
- String aName,
- String aNameRegional,
- float aThickNess,
- GT_Materials aMaterial,
- int aCapacity,
- int aHeatResistance,
- boolean aGasProof,
- int aFluidTypes) {
+ public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess,
+ GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) {
super(aID, aName, aNameRegional, aThickNess, null, aCapacity, aHeatResistance, aGasProof);
this.mLastReceivedFrom = 0;
this.oLastReceivedFrom = 0;
@@ -62,14 +43,8 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
this.mMaterial = aMaterial;
}
- public GregtechMetaPipeEntityFluid(
- String aName,
- float aThickNess,
- GT_Materials aMaterial,
- int aCapacity,
- int aHeatResistance,
- boolean aGasProof,
- int aFluidTypes) {
+ public GregtechMetaPipeEntityFluid(String aName, float aThickNess, GT_Materials aMaterial, int aCapacity,
+ int aHeatResistance, boolean aGasProof, int aFluidTypes) {
super(aName, aThickNess, null, aCapacity, aHeatResistance, aGasProof);
this.mLastReceivedFrom = 0;
this.oLastReceivedFrom = 0;
@@ -79,8 +54,7 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
@Override
public byte getTileEntityBaseType() {
- return this.mMaterial == null
- ? 4
+ return this.mMaterial == null ? 4
: (byte) ((this.mMaterial.contains(SubTag.WOOD) ? 12 : 4)
+ Math.max(0, Math.min(3, this.mMaterial.mToolQuality)));
}
@@ -88,80 +62,61 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaPipeEntityFluid(
- this.mName, this.mThickNess, this.mMaterial, this.mCapacity, this.mHeatResistance, this.mGasProof);
+ this.mName,
+ this.mThickNess,
+ this.mMaterial,
+ this.mCapacity,
+ this.mHeatResistance,
+ this.mGasProof);
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aConnections,
- byte aColorIndex,
- boolean aConnected,
- boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections,
+ byte aColorIndex, boolean aConnected, boolean aRedstone) {
float tThickNess = getThickNess();
if (mDisableInput == 0)
- return new ITexture[] {
- aConnected
- ? getBaseTexture(tThickNess, mPipeAmount, mMaterial, aColorIndex)
- : TextureFactory.of(
- mMaterial.mIconSet.mTextures[OrePrefixes.pipe.mTextureIndex],
- Dyes.getModulation(aColorIndex, mMaterial.mRGBa))
- };
+ return new ITexture[] { aConnected ? getBaseTexture(tThickNess, mPipeAmount, mMaterial, aColorIndex)
+ : TextureFactory.of(
+ mMaterial.mIconSet.mTextures[OrePrefixes.pipe.mTextureIndex],
+ Dyes.getModulation(aColorIndex, mMaterial.mRGBa)) };
byte tMask = 0;
- byte[][] sRestrictionArray = {
- {2, 3, 5, 4},
- {2, 3, 4, 5},
- {1, 0, 4, 5},
- {1, 0, 4, 5},
- {1, 0, 2, 3},
- {1, 0, 2, 3}
- };
+ byte[][] sRestrictionArray = { { 2, 3, 5, 4 }, { 2, 3, 4, 5 }, { 1, 0, 4, 5 }, { 1, 0, 4, 5 }, { 1, 0, 2, 3 },
+ { 1, 0, 2, 3 } };
if (aSide >= 0 && aSide < 6) {
for (byte i = 0; i < 4; i++) if (isInputDisabledAtSide(sRestrictionArray[aSide][i])) tMask |= 1 << i;
- // Full block size renderer flips side 5 and 2 textures, flip restrictor textures to compensate
+ // Full block size renderer flips side 5 and 2 textures, flip restrictor textures to compensate
if (aSide == 5 || aSide == 2) if (tMask > 3 && tMask < 12) tMask = (byte) (tMask ^ 12);
}
- return new ITexture[] {
- aConnected
- ? getBaseTexture(tThickNess, mPipeAmount, mMaterial, aColorIndex)
- : TextureFactory.of(
- mMaterial.mIconSet.mTextures[OrePrefixes.pipe.mTextureIndex],
- Dyes.getModulation(aColorIndex, mMaterial.mRGBa)),
- getRestrictorTexture(tMask)
- };
+ return new ITexture[] { aConnected ? getBaseTexture(tThickNess, mPipeAmount, mMaterial, aColorIndex)
+ : TextureFactory.of(
+ mMaterial.mIconSet.mTextures[OrePrefixes.pipe.mTextureIndex],
+ Dyes.getModulation(aColorIndex, mMaterial.mRGBa)),
+ getRestrictorTexture(tMask) };
}
- protected static ITexture getBaseTexture(
- float aThickNess, int aPipeAmount, GT_Materials aMaterial, byte aColorIndex) {
- if (aPipeAmount >= 9)
- return TextureFactory.of(
- aMaterial.mIconSet.mTextures[OrePrefixes.pipeNonuple.mTextureIndex],
- Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
- if (aPipeAmount >= 4)
- return TextureFactory.of(
- aMaterial.mIconSet.mTextures[OrePrefixes.pipeQuadruple.mTextureIndex],
- Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
- if (aThickNess < 0.124F)
- return TextureFactory.of(
- aMaterial.mIconSet.mTextures[OrePrefixes.pipe.mTextureIndex],
- Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
- if (aThickNess < 0.374F)
- return TextureFactory.of(
- aMaterial.mIconSet.mTextures[OrePrefixes.pipeTiny.mTextureIndex],
- Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
- if (aThickNess < 0.499F)
- return TextureFactory.of(
- aMaterial.mIconSet.mTextures[OrePrefixes.pipeSmall.mTextureIndex],
- Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
- if (aThickNess < 0.749F)
- return TextureFactory.of(
- aMaterial.mIconSet.mTextures[OrePrefixes.pipeMedium.mTextureIndex],
- Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
- if (aThickNess < 0.874F)
- return TextureFactory.of(
- aMaterial.mIconSet.mTextures[OrePrefixes.pipeLarge.mTextureIndex],
- Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
+ protected static ITexture getBaseTexture(float aThickNess, int aPipeAmount, GT_Materials aMaterial,
+ byte aColorIndex) {
+ if (aPipeAmount >= 9) return TextureFactory.of(
+ aMaterial.mIconSet.mTextures[OrePrefixes.pipeNonuple.mTextureIndex],
+ Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
+ if (aPipeAmount >= 4) return TextureFactory.of(
+ aMaterial.mIconSet.mTextures[OrePrefixes.pipeQuadruple.mTextureIndex],
+ Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
+ if (aThickNess < 0.124F) return TextureFactory.of(
+ aMaterial.mIconSet.mTextures[OrePrefixes.pipe.mTextureIndex],
+ Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
+ if (aThickNess < 0.374F) return TextureFactory.of(
+ aMaterial.mIconSet.mTextures[OrePrefixes.pipeTiny.mTextureIndex],
+ Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
+ if (aThickNess < 0.499F) return TextureFactory.of(
+ aMaterial.mIconSet.mTextures[OrePrefixes.pipeSmall.mTextureIndex],
+ Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
+ if (aThickNess < 0.749F) return TextureFactory.of(
+ aMaterial.mIconSet.mTextures[OrePrefixes.pipeMedium.mTextureIndex],
+ Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
+ if (aThickNess < 0.874F) return TextureFactory.of(
+ aMaterial.mIconSet.mTextures[OrePrefixes.pipeLarge.mTextureIndex],
+ Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
return TextureFactory.of(
aMaterial.mIconSet.mTextures[OrePrefixes.pipeHuge.mTextureIndex],
Dyes.getModulation(aColorIndex, aMaterial.mRGBa));
@@ -170,10 +125,13 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
@Override
public String[] getDescription() {
return new String[] {
- EnumChatFormatting.BLUE + "Fluid Capacity: %%%" + (mCapacity * 20) + "%%% L/sec" + EnumChatFormatting.GRAY,
- EnumChatFormatting.RED + "Heat Limit: %%%" + mHeatResistance + "%%% K" + EnumChatFormatting.GRAY,
- EnumChatFormatting.DARK_GREEN + "Gas Proof: " + (this.mGasProof) + EnumChatFormatting.GRAY,
- // CORE.GT_Tooltip
+ EnumChatFormatting.BLUE + "Fluid Capacity: %%%"
+ + (mCapacity * 20)
+ + "%%% L/sec"
+ + EnumChatFormatting.GRAY,
+ EnumChatFormatting.RED + "Heat Limit: %%%" + mHeatResistance + "%%% K" + EnumChatFormatting.GRAY,
+ EnumChatFormatting.DARK_GREEN + "Gas Proof: " + (this.mGasProof) + EnumChatFormatting.GRAY,
+ // CORE.GT_Tooltip
};
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index eff2413102..1605448cfb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -12,14 +12,14 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implements IMetaTileEntityCable {
+
private static Textures.BlockIcons INSULATION_MEDIUM_PLUS;
static {
if (GTNH) {
try {
- INSULATION_MEDIUM_PLUS =
- (Textures.BlockIcons) GT_Utility.getField(Textures.BlockIcons.class, "INSULATION_MEDIUM_PLUS")
- .get(null);
+ INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GT_Utility
+ .getField(Textures.BlockIcons.class, "INSULATION_MEDIUM_PLUS").get(null);
} catch (IllegalAccessException | NullPointerException e) {
throw new Error(e);
}
@@ -28,18 +28,9 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
private short[] vRGB = null;
- public GregtechMetaPipeEntity_Cable(
- final int aID,
- final String aName,
- final String aNameRegional,
- final float aThickNess,
- final Materials aMaterial,
- final long aCableLossPerMeter,
- final long aAmperage,
- final long aVoltage,
- final boolean aInsulated,
- final boolean aCanShock,
- final short[] aRGB) {
+ public GregtechMetaPipeEntity_Cable(final int aID, final String aName, final String aNameRegional,
+ final float aThickNess, final Materials aMaterial, final long aCableLossPerMeter, final long aAmperage,
+ final long aVoltage, final boolean aInsulated, final boolean aCanShock, final short[] aRGB) {
super(
aID,
aName,
@@ -54,31 +45,16 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
this.vRGB = aRGB == null || aRGB.length != 4 ? Materials.Iron.mRGBa : aRGB;
}
- public GregtechMetaPipeEntity_Cable(
- final String aName,
- final float aThickNess,
- final Materials aMaterial,
- final long aCableLossPerMeter,
- final long aAmperage,
- final long aVoltage,
- final boolean aInsulated,
- final boolean aCanShock,
- final short[] aRGB) {
+ public GregtechMetaPipeEntity_Cable(final String aName, final float aThickNess, final Materials aMaterial,
+ final long aCableLossPerMeter, final long aAmperage, final long aVoltage, final boolean aInsulated,
+ final boolean aCanShock, final short[] aRGB) {
super(aName, aThickNess, aMaterial, aCableLossPerMeter, aAmperage, aVoltage, aInsulated, aCanShock);
this.vRGB = aRGB == null || aRGB.length != 4 ? Materials.Iron.mRGBa : aRGB;
}
- public GregtechMetaPipeEntity_Cable(
- final int aID,
- final String aName,
- final String aNameRegional,
- final float aThickNess,
- final long aCableLossPerMeter,
- final long aAmperage,
- final long aVoltage,
- final boolean aInsulated,
- final boolean aCanShock,
- final short[] aRGB) {
+ public GregtechMetaPipeEntity_Cable(final int aID, final String aName, final String aNameRegional,
+ final float aThickNess, final long aCableLossPerMeter, final long aAmperage, final long aVoltage,
+ final boolean aInsulated, final boolean aCanShock, final short[] aRGB) {
this(
aID,
aName,
@@ -93,14 +69,8 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
aRGB);
}
- public GregtechMetaPipeEntity_Cable(
- final String aName,
- final float aThickNess,
- final long aCableLossPerMeter,
- final long aAmperage,
- final long aVoltage,
- final boolean aInsulated,
- final boolean aCanShock,
+ public GregtechMetaPipeEntity_Cable(final String aName, final float aThickNess, final long aCableLossPerMeter,
+ final long aAmperage, final long aVoltage, final boolean aInsulated, final boolean aCanShock,
final short[] aRGB) {
this(aName, aThickNess, null, aCableLossPerMeter, aAmperage, aVoltage, aInsulated, aCanShock, aRGB);
}
@@ -120,111 +90,84 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aConnections,
- byte aColorIndex,
- boolean aConnected,
- boolean aRedstone) {
- return GTNH
- ? getTextureGTNH(aBaseMetaTileEntity, aSide, aConnections, aColorIndex, aConnected, aRedstone)
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections,
+ byte aColorIndex, boolean aConnected, boolean aRedstone) {
+ return GTNH ? getTextureGTNH(aBaseMetaTileEntity, aSide, aConnections, aColorIndex, aConnected, aRedstone)
: getTexturePure(aBaseMetaTileEntity, aSide, aConnections, aColorIndex, aConnected, aRedstone);
}
- private ITexture[] getTextureGTNH(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aConnections,
- byte aColorIndex,
- boolean aConnected,
- boolean aRedstone) {
+ private ITexture[] getTextureGTNH(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections,
+ byte aColorIndex, boolean aConnected, boolean aRedstone) {
Materials wireMaterial = mMaterial;
if (wireMaterial == null) {
wireMaterial = Materials.Iron;
}
- if (!mInsulated)
- return new ITexture[] {
- new GT_RenderedTexture(
- wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], Dyes.getModulation(aColorIndex, vRGB))
- };
+ if (!mInsulated) return new ITexture[] { new GT_RenderedTexture(
+ wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire],
+ Dyes.getModulation(aColorIndex, vRGB)) };
if (aConnected) {
float tThickNess = getThickNess();
- if (tThickNess < 0.124F)
- return new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_FULL,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ if (tThickNess < 0.124F) return new ITexture[] { new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_FULL,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
if (tThickNess < 0.374F) // 0.375 x1
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_TINY,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] {
+ new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_TINY,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
if (tThickNess < 0.499F) // 0.500 x2
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_SMALL,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] {
+ new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_SMALL,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
if (tThickNess < 0.624F) // 0.625 x4
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_MEDIUM,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] {
+ new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_MEDIUM,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
if (tThickNess < 0.749F) // 0.750 x8
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
- INSULATION_MEDIUM_PLUS, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] {
+ new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ new GT_RenderedTexture(
+ INSULATION_MEDIUM_PLUS,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
if (tThickNess < 0.874F) // 0.825 x12
+ return new ITexture[] {
+ new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_LARGE,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
return new ITexture[] {
new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_LARGE,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_HUGE,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ Textures.BlockIcons.INSULATION_HUGE,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
- return new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_FULL,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
- private ITexture[] getTexturePure(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aConnections,
- byte aColorIndex,
- boolean aConnected,
- boolean aRedstone) {
+ private ITexture[] getTexturePure(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections,
+ byte aColorIndex, boolean aConnected, boolean aRedstone) {
// if (this.vRGB == null || this.vRGB.length < 3 || this.vRGB.length > 4){
- // this.vRGB = new short[]{200, 0, 200, 0};
+ // this.vRGB = new short[]{200, 0, 200, 0};
// }
// if (this.vRGB.length != 4){
- // short[] tempRGB = this.vRGB;
- // this.vRGB = new short[]{tempRGB[0], tempRGB[1], tempRGB[2], 0};
+ // short[] tempRGB = this.vRGB;
+ // this.vRGB = new short[]{tempRGB[0], tempRGB[1], tempRGB[2], 0};
// }
//
// Materials wireMaterial = this.mMaterial;
//
// if (wireMaterial == null){
- // wireMaterial = Materials.Iron;
+ // wireMaterial = Materials.Iron;
// }
// With the code in constructors it should work
@@ -233,63 +176,46 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
wireMaterial = Materials.Iron;
}
- if (!(this.mInsulated))
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], Dyes.getModulation(aColorIndex, this.vRGB))
- };
+ if (!(this.mInsulated)) return new ITexture[] { new GT_RenderedTexture(
+ wireMaterial.mIconSet.mTextures[69],
+ Dyes.getModulation(aColorIndex, this.vRGB)) };
if (aConnected) {
float tThickNess = getThickNess();
- if (tThickNess < 0.124F)
- return new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_FULL,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ if (tThickNess < 0.124F) return new ITexture[] { new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_FULL,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
if (tThickNess < 0.374F)
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_TINY,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_TINY,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
if (tThickNess < 0.499F)
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_SMALL,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_SMALL,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
if (tThickNess < 0.624F)
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_MEDIUM,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_MEDIUM,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
if (tThickNess < 0.749F)
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_LARGE,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_LARGE,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
if (tThickNess < 0.874F)
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_HUGE,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
+ return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_HUGE,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
- return new ITexture[] {
- new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_FULL,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ Textures.BlockIcons.INSULATION_FULL,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
- return new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_FULL,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java
index 14399e525d..acd2e316aa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java
@@ -1,48 +1,44 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.objects.GT_RenderedTexture;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaTreeFarmerBase;
-import net.minecraft.nbt.NBTTagCompound;
public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase {
@Override
public String[] getDescription() {
- return new String[] {this.mDescription};
+ return new String[] { this.mDescription };
}
- public GregtechMetaTreeFarmerStructural(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GregtechMetaTreeFarmerStructural(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier, 0, "Structural Blocks for the Tree Farmer.");
}
- public GregtechMetaTreeFarmerStructural(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription) {
+ public GregtechMetaTreeFarmerStructural(final int aID, final String aName, final String aNameRegional,
+ final int aTier, final int aInvSlotCount, final String aDescription) {
super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
}
- public GregtechMetaTreeFarmerStructural(
- final String aName,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription,
- final ITexture[][][] aTextures) {
+ public GregtechMetaTreeFarmerStructural(final String aName, final int aTier, final int aInvSlotCount,
+ final String aDescription, final ITexture[][][] aTextures) {
super(aName, aTier, aInvSlotCount, aDescription, aTextures);
}
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaTreeFarmerStructural(
- this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
+ this.mName,
+ this.mTier,
+ this.mInventory.length,
+ this.mDescription,
+ this.mTextures);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java
index 89bbe99771..ca4b938718 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java
@@ -1,12 +1,14 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
+import java.util.Locale;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.util.GT_LanguageManager;
import gtPlusPlus.xmod.gregtech.api.interfaces.IBaseCustomMetaTileEntity;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
-import java.util.Locale;
-import net.minecraft.item.ItemStack;
public abstract class CustomMetaTileBase extends MetaTileEntity {
@@ -39,8 +41,7 @@ public abstract class CustomMetaTileBase extends MetaTileEntity {
@Override
public void setBaseMetaTileEntity(IGregTechTileEntity aBaseMetaTileEntity) {
super.setBaseMetaTileEntity(aBaseMetaTileEntity);
- if (mBaseCustomMetaTileEntity != null
- && aBaseMetaTileEntity == null
+ if (mBaseCustomMetaTileEntity != null && aBaseMetaTileEntity == null
&& mBaseCustomMetaTileEntity.getMetaTileEntity() != null) {
mBaseCustomMetaTileEntity.getMetaTileEntity().inValidate();
mBaseCustomMetaTileEntity.setMetaTileEntity(null);
@@ -56,10 +57,7 @@ public abstract class CustomMetaTileBase extends MetaTileEntity {
}
public ItemStack getStackForm(long aAmount) {
- return new ItemStack(
- Meta_GT_Proxy.sBlockMachines,
- (int) aAmount,
- this.getBaseMetaTileEntity().getMetaTileID());
+ return new ItemStack(Meta_GT_Proxy.sBlockMachines, (int) aAmount, this.getBaseMetaTileEntity().getMetaTileID());
}
public String getLocalName() {
@@ -69,25 +67,17 @@ public abstract class CustomMetaTileBase extends MetaTileEntity {
/**
* This determines the BaseMetaTileEntity belonging to this MetaTileEntity by using the Meta ID of the Block itself.
* <p/>
- * 0 = BaseMetaTileEntity, Wrench lvl 0 to dismantlee
- * 1 = BaseMetaTileEntity, Wrench lvl 1 to dismantle
- * 2 = BaseMetaTileEntity, Wrench lvl 2 to dismantle
- * 3 = BaseMetaTileEntity, Wrench lvl 3 to dismantle
- * 4 = BaseMetaPipeEntity, Wrench lvl 0 to dismantle
- * 5 = BaseMetaPipeEntity, Wrench lvl 1 to dismantle
- * 6 = BaseMetaPipeEntity, Wrench lvl 2 to dismantle
- * 7 = BaseMetaPipeEntity, Wrench lvl 3 to dismantle
- * 8 = BaseMetaPipeEntity, Cutter lvl 0 to dismantle
- * 9 = BaseMetaPipeEntity, Cutter lvl 1 to dismantle
- * 10 = BaseMetaPipeEntity, Cutter lvl 2 to dismantle
- * 11 = BaseMetaPipeEntity, Cutter lvl 3 to dismantle
+ * 0 = BaseMetaTileEntity, Wrench lvl 0 to dismantlee 1 = BaseMetaTileEntity, Wrench lvl 1 to dismantle 2 =
+ * BaseMetaTileEntity, Wrench lvl 2 to dismantle 3 = BaseMetaTileEntity, Wrench lvl 3 to dismantle 4 =
+ * BaseMetaPipeEntity, Wrench lvl 0 to dismantle 5 = BaseMetaPipeEntity, Wrench lvl 1 to dismantle 6 =
+ * BaseMetaPipeEntity, Wrench lvl 2 to dismantle 7 = BaseMetaPipeEntity, Wrench lvl 3 to dismantle 8 =
+ * BaseMetaPipeEntity, Cutter lvl 0 to dismantle 9 = BaseMetaPipeEntity, Cutter lvl 1 to dismantle 10 =
+ * BaseMetaPipeEntity, Cutter lvl 2 to dismantle 11 = BaseMetaPipeEntity, Cutter lvl 3 to dismantle
*
* == Reserved for Alk now
*
- * 12 = BaseMetaPipeEntity, Wrench lvl 0 to dismantle
- * 13 = BaseMetaPipeEntity, Wrench lvl 1 to dismantle
- * 14 = BaseMetaPipeEntity, Wrench lvl 2 to dismantle
- * 15 = BaseMetaPipeEntity, Wrench lvl 3 to dismantle
+ * 12 = BaseMetaPipeEntity, Wrench lvl 0 to dismantle 13 = BaseMetaPipeEntity, Wrench lvl 1 to dismantle 14 =
+ * BaseMetaPipeEntity, Wrench lvl 2 to dismantle 15 = BaseMetaPipeEntity, Wrench lvl 3 to dismantle
*/
@Override
public byte getTileEntityBaseType() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
index 16a4184c9d..7eb7eb22f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java
@@ -3,6 +3,12 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
import static gregtech.api.enums.Textures.BlockIcons.FLUID_IN_SIGN;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_IN;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.GT_Mod;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.interfaces.ITexture;
@@ -14,11 +20,6 @@ import gregtech.api.util.GT_Utility;
import gregtech.common.gui.modularui.widget.FluidDisplaySlotWidget;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.FluidUtils;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_Hatch {
@@ -27,35 +28,35 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
protected FluidStack mLockedStack = null;
protected String mTempMod = null;
- public GT_MetaTileEntity_Hatch_CustomFluidBase(
- Fluid aFluid, int aAmount, final int aID, final String aName, final String aNameRegional) {
- super(aID, aName, aNameRegional, 6, 3, new String[] {
- "Fluid Input for Multiblocks", "Capacity: " + GT_Utility.formatNumbers(aAmount) + "L"
- });
+ public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final int aID, final String aName,
+ final String aNameRegional) {
+ super(
+ aID,
+ aName,
+ aNameRegional,
+ 6,
+ 3,
+ new String[] { "Fluid Input for Multiblocks", "Capacity: " + GT_Utility.formatNumbers(aAmount) + "L" });
this.mLockedFluid = aFluid;
this.mFluidCapacity = aAmount;
}
- public GT_MetaTileEntity_Hatch_CustomFluidBase(
- Fluid aFluid, int aAmount, final String aName, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final String aName,
+ final String aDescription, final ITexture[][][] aTextures) {
super(aName, 6, 3, aDescription, aTextures);
this.mLockedFluid = aFluid;
this.mFluidCapacity = aAmount;
}
- public GT_MetaTileEntity_Hatch_CustomFluidBase(
- Fluid aFluid,
- int aAmount,
- final String aName,
- final String[] aDescription,
- final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final String aName,
+ final String[] aDescription, final ITexture[][][] aTextures) {
super(aName, 6, 3, aDescription[0], aTextures);
this.mLockedFluid = aFluid;
this.mFluidCapacity = aAmount;
}
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
if (aSide == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0) {
FluidStack fs = GT_Utility.getFluidForFilledItem(aStack, true);
return fs != null && fs.getFluid() == this.mLockedFluid;
@@ -71,15 +72,15 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
- ? new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(FLUID_IN_SIGN)}
- : new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN)};
+ ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(FLUID_IN_SIGN) }
+ : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
return GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch
- ? new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(FLUID_IN_SIGN)}
- : new ITexture[] {aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN)};
+ ? new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(FLUID_IN_SIGN) }
+ : new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_PIPE_IN) };
}
@Override
@@ -180,13 +181,10 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
aColour = EnumChatFormatting.RED;
}
String aFluidName = "Accepted Fluid: " + aColour
- + (mLockedStack != null ? mLockedStack.getLocalizedName() : "Empty") + EnumChatFormatting.RESET;
- return new String[] {
- "Fluid Input for " + (isSteam ? "Steam " : "") + "Multiblocks",
- "Capacity: " + getCapacity() + "L",
- aFluidName,
- CORE.GT_Tooltip
- };
+ + (mLockedStack != null ? mLockedStack.getLocalizedName() : "Empty")
+ + EnumChatFormatting.RESET;
+ return new String[] { "Fluid Input for " + (isSteam ? "Steam " : "") + "Multiblocks",
+ "Capacity: " + getCapacity() + "L", aFluidName, CORE.GT_Tooltip };
}
public boolean isFluidInputAllowed(final FluidStack aFluid) {
@@ -195,7 +193,11 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H
public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GT_MetaTileEntity_Hatch_CustomFluidBase(
- this.mLockedFluid, this.mFluidCapacity, this.mName, this.mDescription, this.mTextures);
+ this.mLockedFluid,
+ this.mFluidCapacity,
+ this.mName,
+ this.mDescription,
+ this.mTextures);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
index efc2d008bb..6a5fb9d4d2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
@@ -2,6 +2,21 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
import static gregtech.api.enums.GT_Values.VN;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
import cofh.api.energy.IEnergyReceiver;
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
@@ -23,21 +38,9 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import ic2.api.energy.tile.IEnergySink;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements IMetaTileEntityCable {
+
public final float mThickNess;
public final GT_Materials mMaterial;
public final long mCableLossPerMeter, mAmperage, mVoltage;
@@ -47,17 +50,9 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
public short mOverheat;
public final int mWireHeatingTicks;
- public GregtechMetaPipeEntityBase_Cable(
- final int aID,
- final String aName,
- final String aNameRegional,
- final float aThickNess,
- final GT_Materials aMaterial,
- final long aCableLossPerMeter,
- final long aAmperage,
- final long aVoltage,
- final boolean aInsulated,
- final boolean aCanShock) {
+ public GregtechMetaPipeEntityBase_Cable(final int aID, final String aName, final String aNameRegional,
+ final float aThickNess, final GT_Materials aMaterial, final long aCableLossPerMeter, final long aAmperage,
+ final long aVoltage, final boolean aInsulated, final boolean aCanShock) {
super(aID, aName, aNameRegional, 0);
this.mThickNess = aThickNess;
this.mMaterial = aMaterial;
@@ -69,14 +64,8 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
this.mWireHeatingTicks = this.getGT5Var();
}
- public GregtechMetaPipeEntityBase_Cable(
- final String aName,
- final float aThickNess,
- final GT_Materials aMaterial,
- final long aCableLossPerMeter,
- final long aAmperage,
- final long aVoltage,
- final boolean aInsulated,
+ public GregtechMetaPipeEntityBase_Cable(final String aName, final float aThickNess, final GT_Materials aMaterial,
+ final long aCableLossPerMeter, final long aAmperage, final long aVoltage, final boolean aInsulated,
final boolean aCanShock) {
super(aName, 0);
this.mThickNess = aThickNess;
@@ -133,77 +122,73 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aConnections,
- final byte aColorIndex,
- final boolean aConnected,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide,
+ final byte aConnections, final byte aColorIndex, final boolean aConnected, final boolean aRedstone) {
if (!this.mInsulated) {
- return new ITexture[] {
- new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa)
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire],
+ this.mMaterial.mRGBa) };
}
if (aConnected) {
final float tThickNess = this.getThickNess();
if (tThickNess < 0.37F) {
return new ITexture[] {
- new GT_RenderedTexture(
- this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_TINY,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ new GT_RenderedTexture(
+ this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire],
+ this.mMaterial.mRGBa),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_TINY,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
if (tThickNess < 0.49F) {
return new ITexture[] {
- new GT_RenderedTexture(
- this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_SMALL,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ new GT_RenderedTexture(
+ this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire],
+ this.mMaterial.mRGBa),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_SMALL,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
if (tThickNess < 0.74F) {
return new ITexture[] {
- new GT_RenderedTexture(
- this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_MEDIUM,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ new GT_RenderedTexture(
+ this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire],
+ this.mMaterial.mRGBa),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_MEDIUM,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
if (tThickNess < 0.99F) {
return new ITexture[] {
- new GT_RenderedTexture(
- this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_LARGE,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ new GT_RenderedTexture(
+ this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire],
+ this.mMaterial.mRGBa),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_LARGE,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
return new ITexture[] {
- new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_HUGE,
- Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ new GT_RenderedTexture(
+ this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire],
+ this.mMaterial.mRGBa),
+ new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_HUGE,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
- return new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ Textures.BlockIcons.INSULATION_FULL,
+ Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
}
@Override
- public void onEntityCollidedWithBlock(
- final World aWorld, final int aX, final int aY, final int aZ, final Entity aEntity) {
- if (this.mCanShock
- && ((((BaseMetaPipeEntity) this.getBaseMetaTileEntity()).mConnections & -128) == 0)
+ public void onEntityCollidedWithBlock(final World aWorld, final int aX, final int aY, final int aZ,
+ final Entity aEntity) {
+ if (this.mCanShock && ((((BaseMetaPipeEntity) this.getBaseMetaTileEntity()).mConnections & -128) == 0)
&& (aEntity instanceof EntityLivingBase)) {
GT_Utility.applyElectricityDamage(
- (EntityLivingBase) aEntity, this.mTransferredVoltageLast20, this.mTransferredAmperageLast20);
+ (EntityLivingBase) aEntity,
+ this.mTransferredVoltageLast20,
+ this.mTransferredAmperageLast20);
}
}
@@ -212,8 +197,8 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
if (!this.mCanShock) {
return super.getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
}
- return AxisAlignedBB.getBoundingBox(
- aX + 0.125D, aY + 0.125D, aZ + 0.125D, aX + 0.875D, aY + 0.875D, aZ + 0.875D);
+ return AxisAlignedBB
+ .getBoundingBox(aX + 0.125D, aY + 0.125D, aZ + 0.125D, aX + 0.875D, aY + 0.875D, aZ + 0.875D);
}
@Override
@@ -248,21 +233,23 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
@Override
public long injectEnergyUnits(final byte aSide, final long aVoltage, final long aAmperage) {
- if (!this.getBaseMetaTileEntity()
- .getCoverBehaviorAtSide(aSide)
- .letsEnergyIn(
- aSide,
- this.getBaseMetaTileEntity().getCoverIDAtSide(aSide),
- this.getBaseMetaTileEntity().getCoverDataAtSide(aSide),
- this.getBaseMetaTileEntity())) {
+ if (!this.getBaseMetaTileEntity().getCoverBehaviorAtSide(aSide).letsEnergyIn(
+ aSide,
+ this.getBaseMetaTileEntity().getCoverIDAtSide(aSide),
+ this.getBaseMetaTileEntity().getCoverDataAtSide(aSide),
+ this.getBaseMetaTileEntity())) {
return 0;
}
return this.transferElectricity(
- aSide, aVoltage, aAmperage, new ArrayList<>(Arrays.asList((TileEntity) this.getBaseMetaTileEntity())));
+ aSide,
+ aVoltage,
+ aAmperage,
+ new ArrayList<>(Arrays.asList((TileEntity) this.getBaseMetaTileEntity())));
}
/**
- * Adds support for the newer function added by https://github.com/Blood-Asp/GT5-Unofficial/commit/73ee102b63efd92c0f164a7ed7a79ebcd2619617#diff-3051838621d8ae87aa5ccd1345e1f07d
+ * Adds support for the newer function added by
+ * https://github.com/Blood-Asp/GT5-Unofficial/commit/73ee102b63efd92c0f164a7ed7a79ebcd2619617#diff-3051838621d8ae87aa5ccd1345e1f07d
*/
public long transferElectricity(byte arg0, long arg1, long arg2, HashSet<TileEntity> arg3) {
ArrayList<TileEntity> aTiles = new ArrayList<TileEntity>();
@@ -273,42 +260,33 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
}
@Override
- public long transferElectricity(
- final byte aSide,
- long aVoltage,
- final long aAmperage,
+ public long transferElectricity(final byte aSide, long aVoltage, final long aAmperage,
final ArrayList<TileEntity> aAlreadyPassedTileEntityList) {
long rUsedAmperes = 0;
aVoltage -= this.mCableLossPerMeter;
if (aVoltage > 0) {
for (byte i = 0; (i < 6) && (aAmperage > rUsedAmperes); i++) {
- if ((i != aSide)
- && ((this.mConnections & (1 << i)) != 0)
- && this.getBaseMetaTileEntity()
- .getCoverBehaviorAtSide(i)
- .letsEnergyOut(
- i,
- this.getBaseMetaTileEntity().getCoverIDAtSide(i),
- this.getBaseMetaTileEntity().getCoverDataAtSide(i),
- this.getBaseMetaTileEntity())) {
+ if ((i != aSide) && ((this.mConnections & (1 << i)) != 0)
+ && this.getBaseMetaTileEntity().getCoverBehaviorAtSide(i).letsEnergyOut(
+ i,
+ this.getBaseMetaTileEntity().getCoverIDAtSide(i),
+ this.getBaseMetaTileEntity().getCoverDataAtSide(i),
+ this.getBaseMetaTileEntity())) {
final TileEntity tTileEntity = this.getBaseMetaTileEntity().getTileEntityAtSide(i);
if (!aAlreadyPassedTileEntityList.contains(tTileEntity)) {
aAlreadyPassedTileEntityList.add(tTileEntity);
if (tTileEntity instanceof IEnergyConnected) {
if (this.getBaseMetaTileEntity().getColorization() >= 0) {
final byte tColor = ((IEnergyConnected) tTileEntity).getColorization();
- if ((tColor >= 0)
- && (tColor
- != this.getBaseMetaTileEntity().getColorization())) {
+ if ((tColor >= 0) && (tColor != this.getBaseMetaTileEntity().getColorization())) {
continue;
}
}
if ((tTileEntity instanceof IGregTechTileEntity)
- && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity()
- instanceof IMetaTileEntityCable)
+ && (((IGregTechTileEntity) tTileEntity)
+ .getMetaTileEntity() instanceof IMetaTileEntityCable)
&& ((IGregTechTileEntity) tTileEntity)
- .getCoverBehaviorAtSide(GT_Utility.getOppositeSide(i))
- .letsEnergyIn(
+ .getCoverBehaviorAtSide(GT_Utility.getOppositeSide(i)).letsEnergyIn(
GT_Utility.getOppositeSide(i),
((IGregTechTileEntity) tTileEntity)
.getCoverIDAtSide(GT_Utility.getOppositeSide(i)),
@@ -316,18 +294,18 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
.getCoverDataAtSide(GT_Utility.getOppositeSide(i)),
((IGregTechTileEntity) tTileEntity))) {
if (((IGregTechTileEntity) tTileEntity).getTimer() > 50) {
- rUsedAmperes += ((IMetaTileEntityCable)
- ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())
- .transferElectricity(
+ rUsedAmperes += ((IMetaTileEntityCable) ((IGregTechTileEntity) tTileEntity)
+ .getMetaTileEntity()).transferElectricity(
GT_Utility.getOppositeSide(i),
aVoltage,
aAmperage - rUsedAmperes,
aAlreadyPassedTileEntityList);
}
} else {
- rUsedAmperes += ((IEnergyConnected) tTileEntity)
- .injectEnergyUnits(
- GT_Utility.getOppositeSide(i), aVoltage, aAmperage - rUsedAmperes);
+ rUsedAmperes += ((IEnergyConnected) tTileEntity).injectEnergyUnits(
+ GT_Utility.getOppositeSide(i),
+ aVoltage,
+ aAmperage - rUsedAmperes);
}
// } else if (tTileEntity instanceof IEnergySink) {
// ForgeDirection tDirection =
@@ -342,8 +320,7 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
// aVoltage) < aVoltage) rUsedAmperes++;
// }
} else if (tTileEntity instanceof IEnergySink) {
- final ForgeDirection tDirection =
- ForgeDirection.getOrientation(i).getOpposite();
+ final ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();
if (((IEnergySink) tTileEntity)
.acceptsEnergyFrom((TileEntity) this.getBaseMetaTileEntity(), tDirection)) {
if ((((IEnergySink) tTileEntity).getDemandedEnergy() > 0)
@@ -353,16 +330,15 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
}
}
} else if (GregTech_API.mOutputRF && (tTileEntity instanceof IEnergyReceiver)) {
- final ForgeDirection tDirection =
- ForgeDirection.getOrientation(i).getOpposite();
+ final ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();
final int rfOut = (int) ((aVoltage * GregTech_API.mEUtoRF) / 100);
if (((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, true) == rfOut) {
((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, false);
rUsedAmperes++;
} else if (((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, true) > 0) {
if (this.mRestRF == 0) {
- final int RFtrans =
- ((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, false);
+ final int RFtrans = ((IEnergyReceiver) tTileEntity)
+ .receiveEnergy(tDirection, rfOut, false);
rUsedAmperes++;
this.mRestRF = rfOut - RFtrans;
} else {
@@ -422,27 +398,21 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
this.mConnections = 0;
for (byte i = 0, j = 0; i < 6; i++) {
j = GT_Utility.getOppositeSide(i);
- if (aBaseMetaTileEntity
- .getCoverBehaviorAtSide(i)
- .alwaysLookConnected(
- i,
- aBaseMetaTileEntity.getCoverIDAtSide(i),
- aBaseMetaTileEntity.getCoverDataAtSide(i),
- aBaseMetaTileEntity)
- || aBaseMetaTileEntity
- .getCoverBehaviorAtSide(i)
- .letsEnergyIn(
- i,
- aBaseMetaTileEntity.getCoverIDAtSide(i),
- aBaseMetaTileEntity.getCoverDataAtSide(i),
- aBaseMetaTileEntity)
- || aBaseMetaTileEntity
- .getCoverBehaviorAtSide(i)
- .letsEnergyOut(
- i,
- aBaseMetaTileEntity.getCoverIDAtSide(i),
- aBaseMetaTileEntity.getCoverDataAtSide(i),
- aBaseMetaTileEntity)) {
+ if (aBaseMetaTileEntity.getCoverBehaviorAtSide(i).alwaysLookConnected(
+ i,
+ aBaseMetaTileEntity.getCoverIDAtSide(i),
+ aBaseMetaTileEntity.getCoverDataAtSide(i),
+ aBaseMetaTileEntity)
+ || aBaseMetaTileEntity.getCoverBehaviorAtSide(i).letsEnergyIn(
+ i,
+ aBaseMetaTileEntity.getCoverIDAtSide(i),
+ aBaseMetaTileEntity.getCoverDataAtSide(i),
+ aBaseMetaTileEntity)
+ || aBaseMetaTileEntity.getCoverBehaviorAtSide(i).letsEnergyOut(
+ i,
+ aBaseMetaTileEntity.getCoverIDAtSide(i),
+ aBaseMetaTileEntity.getCoverDataAtSide(i),
+ aBaseMetaTileEntity)) {
final TileEntity tTileEntity = aBaseMetaTileEntity.getTileEntityAtSide(i);
if (tTileEntity instanceof IColoredTileEntity) {
if (aBaseMetaTileEntity.getColorization() >= 0) {
@@ -458,53 +428,42 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
this.mConnections |= (1 << i);
continue;
}
- if ((tTileEntity instanceof IGregTechTileEntity)
- && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity()
- instanceof IMetaTileEntityCable)) {
- if (((IGregTechTileEntity) tTileEntity)
- .getCoverBehaviorAtSide(j)
- .alwaysLookConnected(
- j,
- ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(j),
- ((IGregTechTileEntity) tTileEntity).getCoverDataAtSide(j),
- ((IGregTechTileEntity) tTileEntity))
- || ((IGregTechTileEntity) tTileEntity)
- .getCoverBehaviorAtSide(j)
- .letsEnergyIn(
- j,
- ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(j),
- ((IGregTechTileEntity) tTileEntity).getCoverDataAtSide(j),
- ((IGregTechTileEntity) tTileEntity))
- || ((IGregTechTileEntity) tTileEntity)
- .getCoverBehaviorAtSide(j)
- .letsEnergyOut(
- j,
- ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(j),
- ((IGregTechTileEntity) tTileEntity).getCoverDataAtSide(j),
- ((IGregTechTileEntity) tTileEntity))) {
+ if ((tTileEntity instanceof IGregTechTileEntity) && (((IGregTechTileEntity) tTileEntity)
+ .getMetaTileEntity() instanceof IMetaTileEntityCable)) {
+ if (((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(j).alwaysLookConnected(
+ j,
+ ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(j),
+ ((IGregTechTileEntity) tTileEntity).getCoverDataAtSide(j),
+ ((IGregTechTileEntity) tTileEntity))
+ || ((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(j).letsEnergyIn(
+ j,
+ ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(j),
+ ((IGregTechTileEntity) tTileEntity).getCoverDataAtSide(j),
+ ((IGregTechTileEntity) tTileEntity))
+ || ((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(j).letsEnergyOut(
+ j,
+ ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(j),
+ ((IGregTechTileEntity) tTileEntity).getCoverDataAtSide(j),
+ ((IGregTechTileEntity) tTileEntity))) {
this.mConnections |= (1 << i);
continue;
}
}
- if ((tTileEntity instanceof IEnergySink)
- && ((IEnergySink) tTileEntity)
- .acceptsEnergyFrom(
- (TileEntity) aBaseMetaTileEntity, ForgeDirection.getOrientation(j))) {
+ if ((tTileEntity instanceof IEnergySink) && ((IEnergySink) tTileEntity).acceptsEnergyFrom(
+ (TileEntity) aBaseMetaTileEntity,
+ ForgeDirection.getOrientation(j))) {
this.mConnections |= (1 << i);
continue;
}
- if (GregTech_API.mOutputRF
- && (tTileEntity instanceof IEnergyReceiver)
+ if (GregTech_API.mOutputRF && (tTileEntity instanceof IEnergyReceiver)
&& ((IEnergyReceiver) tTileEntity).canConnectEnergy(ForgeDirection.getOrientation(j))) {
this.mConnections |= (1 << i);
continue;
}
/*
- * if (tTileEntity instanceof IEnergyEmitter &&
- * ((IEnergyEmitter)tTileEntity).emitsEnergyTo((
- * TileEntity)aBaseMetaTileEntity,
- * ForgeDirection.getOrientation(j))) { mConnections |=
- * (1<<i); continue; }
+ * if (tTileEntity instanceof IEnergyEmitter && ((IEnergyEmitter)tTileEntity).emitsEnergyTo((
+ * TileEntity)aBaseMetaTileEntity, ForgeDirection.getOrientation(j))) { mConnections |= (1<<i);
+ * continue; }
*/
}
}
@@ -513,26 +472,31 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
public String[] getDescription() {
return new String[] {
- "Max Voltage: " + EnumChatFormatting.GREEN + this.mVoltage + " (" + VN[GT_Utility.getTier(this.mVoltage)]
- + ")" + EnumChatFormatting.GRAY,
- "Max Amperage: " + EnumChatFormatting.YELLOW + this.mAmperage + EnumChatFormatting.GRAY,
- "Loss/Meter/Ampere: " + EnumChatFormatting.RED + this.mCableLossPerMeter + EnumChatFormatting.GRAY
- + " EU-Volt"
- };
+ "Max Voltage: " + EnumChatFormatting.GREEN
+ + this.mVoltage
+ + " ("
+ + VN[GT_Utility.getTier(this.mVoltage)]
+ + ")"
+ + EnumChatFormatting.GRAY,
+ "Max Amperage: " + EnumChatFormatting.YELLOW + this.mAmperage + EnumChatFormatting.GRAY,
+ "Loss/Meter/Ampere: " + EnumChatFormatting.RED
+ + this.mCableLossPerMeter
+ + EnumChatFormatting.GRAY
+ + " EU-Volt" };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
index 41f434f7e6..b727c0d84a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java
@@ -6,6 +6,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.metatileentity.MetaTileEntity;
public abstract class GregtechMetaTileEntity extends MetaTileEntity {
+
/**
* Value between [0 - 9] to describe the Tier of this Machine.
*/
@@ -21,14 +22,8 @@ public abstract class GregtechMetaTileEntity extends MetaTileEntity {
*/
public final ITexture[][][] mTextures;
- public GregtechMetaTileEntity(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription,
- final ITexture... aTextures) {
+ public GregtechMetaTileEntity(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final int aInvSlotCount, final String aDescription, final ITexture... aTextures) {
super(aID, aName, aNameRegional, aInvSlotCount);
this.mTier = (byte) Math.max(0, Math.min(aTier, 9));
this.mDescription = aDescription;
@@ -41,12 +36,8 @@ public abstract class GregtechMetaTileEntity extends MetaTileEntity {
}
}
- public GregtechMetaTileEntity(
- final String aName,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription,
- final ITexture[][][] aTextures) {
+ public GregtechMetaTileEntity(final String aName, final int aTier, final int aInvSlotCount,
+ final String aDescription, final ITexture[][][] aTextures) {
super(aName, aInvSlotCount);
this.mTier = (byte) aTier;
this.mDescription = aDescription;
@@ -70,15 +61,14 @@ public abstract class GregtechMetaTileEntity extends MetaTileEntity {
@Override
public String[] getDescription() {
- return new String[] {this.mDescription};
+ return new String[] { this.mDescription };
}
/**
- * Used Client Side to get a Texture Set for this Block. Called after
- * setting the Tier and the Description so that those two are accessible.
+ * Used Client Side to get a Texture Set for this Block. Called after setting the Tier and the Description so that
+ * those two are accessible.
*
- * @param aTextures
- * is the optional Array you can give to the Constructor.
+ * @param aTextures is the optional Array you can give to the Constructor.
*/
public abstract ITexture[][][] getTextureSet(ITexture[] aTextures);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java
index e900aac944..f881f6f5f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -8,8 +11,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer {
@@ -48,48 +49,30 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
ITexture[][][] rTextures = new ITexture[12][17][];
for (byte i = -1; i < 16; i++) {
- rTextures[0][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1], Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier]
- };
- rTextures[1][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1], Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier]
- };
- rTextures[2][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1], Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier]
- };
- rTextures[3][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
- Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier + 1]
- };
- rTextures[4][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
- Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier + 1]
- };
- rTextures[5][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
- Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier + 1]
- };
- rTextures[6][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1], Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier]
- };
- rTextures[7][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1], Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier]
- };
- rTextures[8][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1], Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier]
- };
- rTextures[9][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier + 1]
- };
- rTextures[10][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier + 1]
- };
- rTextures[11][i + 1] = new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier + 1]
- };
+ rTextures[0][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
+ rTextures[1][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
+ rTextures[2][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
+ rTextures[3][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier + 1] };
+ rTextures[4][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier + 1] };
+ rTextures[5][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier + 1] };
+ rTextures[6][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] };
+ rTextures[7][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] };
+ rTextures[8][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] };
+ rTextures[9][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier + 1] };
+ rTextures[10][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier + 1] };
+ rTextures[11][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][i + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier + 1] };
}
return rTextures;
}
@@ -101,9 +84,8 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription, "Accepts 4A and outputs 16A", "Toggle 2A/8A half-mode with Screwdriver", CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Accepts 4A and outputs 16A",
+ "Toggle 2A/8A half-mode with Screwdriver", CORE.GT_Tooltip };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 5f13bbaf09..84641bd357 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -1,5 +1,30 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BiConsumer;
+import java.util.function.BiPredicate;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import com.gtnewhorizon.structurelib.StructureLibAPI;
import com.gtnewhorizon.structurelib.structure.AutoPlaceEnvironment;
import com.gtnewhorizon.structurelib.structure.IStructureElement;
@@ -11,6 +36,7 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn;
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
@@ -52,28 +78,6 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.preloader.asm.AsmConfig;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
-import java.util.function.BiPredicate;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
// Glee8e - 11/12/21 - 2:15pm
// Yeah, now I see what's wrong. Someone inherited from GregtechMeta_MultiBlockBase instead of
@@ -112,10 +116,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
Logger.MACHINE_INFO("Found .09 findRecipe method? " + (a09 != null));
try {
- calculatePollutionReduction =
- GT_MetaTileEntity_Hatch_Muffler.class.getDeclaredMethod("calculatePollutionReduction", int.class);
- } catch (NoSuchMethodException | SecurityException e) {
- }
+ calculatePollutionReduction = GT_MetaTileEntity_Hatch_Muffler.class
+ .getDeclaredMethod("calculatePollutionReduction", int.class);
+ } catch (NoSuchMethodException | SecurityException e) {}
}
// Find Recipe Methods
@@ -207,76 +210,145 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
// Lets borrow the GTNH handling
- mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.progress") + ": " + EnumChatFormatting.GREEN
- + Integer.toString(mProgresstime / 20) + EnumChatFormatting.RESET + " s / "
- + EnumChatFormatting.YELLOW
- + Integer.toString(mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s");
+ mInfo.add(
+ StatCollector.translateToLocal("GTPP.multiblock.progress") + ": "
+ + EnumChatFormatting.GREEN
+ + Integer.toString(mProgresstime / 20)
+ + EnumChatFormatting.RESET
+ + " s / "
+ + EnumChatFormatting.YELLOW
+ + Integer.toString(mMaxProgresstime / 20)
+ + EnumChatFormatting.RESET
+ + " s");
if (!this.mAllEnergyHatches.isEmpty()) {
long storedEnergy = getStoredEnergyInAllEnergyHatches();
long maxEnergy = getMaxEnergyStorageOfAllEnergyHatches();
mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.energy") + ":");
- mInfo.add(StatCollector.translateToLocal("" + EnumChatFormatting.GREEN + Long.toString(storedEnergy)
- + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW + Long.toString(maxEnergy)
- + EnumChatFormatting.RESET + " EU"));
+ mInfo.add(
+ StatCollector.translateToLocal(
+ "" + EnumChatFormatting.GREEN
+ + Long.toString(storedEnergy)
+ + EnumChatFormatting.RESET
+ + " EU / "
+ + EnumChatFormatting.YELLOW
+ + Long.toString(maxEnergy)
+ + EnumChatFormatting.RESET
+ + " EU"));
mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.mei") + ":");
- mInfo.add(StatCollector.translateToLocal("" + EnumChatFormatting.YELLOW
- + Long.toString(getMaxInputVoltage()) + EnumChatFormatting.RESET + " EU/t(*2A) "
- + StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.YELLOW
- + GT_Values.VN[GT_Utility.getTier(getMaxInputVoltage())] + EnumChatFormatting.RESET));
- ;
+ mInfo.add(
+ StatCollector.translateToLocal(
+ "" + EnumChatFormatting.YELLOW
+ + Long.toString(getMaxInputVoltage())
+ + EnumChatFormatting.RESET
+ + " EU/t(*2A) "
+ + StatCollector.translateToLocal("GTPP.machines.tier")
+ + ": "
+ + EnumChatFormatting.YELLOW
+ + GT_Values.VN[GT_Utility.getTier(getMaxInputVoltage())]
+ + EnumChatFormatting.RESET));;
}
if (!this.mAllDynamoHatches.isEmpty()) {
long storedEnergy = getStoredEnergyInAllDynamoHatches();
long maxEnergy = getMaxEnergyStorageOfAllDynamoHatches();
mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.energy") + " In Dynamos:");
- mInfo.add(StatCollector.translateToLocal("" + EnumChatFormatting.GREEN + Long.toString(storedEnergy)
- + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW + Long.toString(maxEnergy)
- + EnumChatFormatting.RESET + " EU"));
+ mInfo.add(
+ StatCollector.translateToLocal(
+ "" + EnumChatFormatting.GREEN
+ + Long.toString(storedEnergy)
+ + EnumChatFormatting.RESET
+ + " EU / "
+ + EnumChatFormatting.YELLOW
+ + Long.toString(maxEnergy)
+ + EnumChatFormatting.RESET
+ + " EU"));
}
if (-lEUt > 0) {
mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.usage") + ":");
- mInfo.add(StatCollector.translateToLocal(
- "" + EnumChatFormatting.RED + (-lEUt) + EnumChatFormatting.RESET + " EU/t"));
+ mInfo.add(
+ StatCollector.translateToLocal(
+ "" + EnumChatFormatting.RED + (-lEUt) + EnumChatFormatting.RESET + " EU/t"));
} else {
mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.generation") + ":");
- mInfo.add(StatCollector.translateToLocal(
- "" + EnumChatFormatting.GREEN + lEUt + EnumChatFormatting.RESET + " EU/t"));
- }
-
- mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.problems") + ": " + EnumChatFormatting.RED
- + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " "
- + StatCollector.translateToLocal("GTPP.multiblock.efficiency") + ": " + EnumChatFormatting.YELLOW
- + Float.toString(mEfficiency / 100.0F) + EnumChatFormatting.RESET + " %");
+ mInfo.add(
+ StatCollector.translateToLocal(
+ "" + EnumChatFormatting.GREEN + lEUt + EnumChatFormatting.RESET + " EU/t"));
+ }
+
+ mInfo.add(
+ StatCollector.translateToLocal("GTPP.multiblock.problems") + ": "
+ + EnumChatFormatting.RED
+ + (getIdealStatus() - getRepairStatus())
+ + EnumChatFormatting.RESET
+ + " "
+ + StatCollector.translateToLocal("GTPP.multiblock.efficiency")
+ + ": "
+ + EnumChatFormatting.YELLOW
+ + Float.toString(mEfficiency / 100.0F)
+ + EnumChatFormatting.RESET
+ + " %");
if (this.getPollutionPerSecond(null) > 0) {
int mPollutionReduction = getPollutionReductionForAllMufflers();
- mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.pollution") + ": " + EnumChatFormatting.RED
- + this.getPollutionPerSecond(null) + EnumChatFormatting.RESET + "/sec");
- mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.pollutionreduced") + ": "
- + EnumChatFormatting.GREEN + mPollutionReduction + EnumChatFormatting.RESET + " %");
+ mInfo.add(
+ StatCollector.translateToLocal("GTPP.multiblock.pollution") + ": "
+ + EnumChatFormatting.RED
+ + this.getPollutionPerSecond(null)
+ + EnumChatFormatting.RESET
+ + "/sec");
+ mInfo.add(
+ StatCollector.translateToLocal("GTPP.multiblock.pollutionreduced") + ": "
+ + EnumChatFormatting.GREEN
+ + mPollutionReduction
+ + EnumChatFormatting.RESET
+ + " %");
}
if (this.mControlCoreBus.size() > 0) {
int tTier = this.getControlCoreTier();
- mInfo.add(StatCollector.translateToLocal("GTPP.CC.machinetier") + ": " + EnumChatFormatting.GREEN + tTier
- + EnumChatFormatting.RESET);
- }
-
- mInfo.add(StatCollector.translateToLocal("GTPP.CC.discount") + ": " + EnumChatFormatting.GREEN
- + (getEuDiscountForParallelism()) + EnumChatFormatting.RESET + "%");
-
- mInfo.add(StatCollector.translateToLocal("GTPP.CC.parallel") + ": " + EnumChatFormatting.GREEN
- + (getMaxParallelRecipes()) + EnumChatFormatting.RESET);
-
- mInfo.add("Total Time Since Built: " + EnumChatFormatting.DARK_GREEN + Integer.toString(weeks)
- + EnumChatFormatting.RESET + " Weeks, " + EnumChatFormatting.DARK_GREEN + Integer.toString(days)
- + EnumChatFormatting.RESET + " Days, ");
- mInfo.add(EnumChatFormatting.DARK_GREEN + Long.toString(hours) + EnumChatFormatting.RESET + " Hours, "
- + EnumChatFormatting.DARK_GREEN + Long.toString(minutes) + EnumChatFormatting.RESET + " Minutes, "
- + EnumChatFormatting.DARK_GREEN + Long.toString(second) + EnumChatFormatting.RESET + " Seconds.");
+ mInfo.add(
+ StatCollector.translateToLocal("GTPP.CC.machinetier") + ": "
+ + EnumChatFormatting.GREEN
+ + tTier
+ + EnumChatFormatting.RESET);
+ }
+
+ mInfo.add(
+ StatCollector.translateToLocal("GTPP.CC.discount") + ": "
+ + EnumChatFormatting.GREEN
+ + (getEuDiscountForParallelism())
+ + EnumChatFormatting.RESET
+ + "%");
+
+ mInfo.add(
+ StatCollector.translateToLocal("GTPP.CC.parallel") + ": "
+ + EnumChatFormatting.GREEN
+ + (getMaxParallelRecipes())
+ + EnumChatFormatting.RESET);
+
+ mInfo.add(
+ "Total Time Since Built: " + EnumChatFormatting.DARK_GREEN
+ + Integer.toString(weeks)
+ + EnumChatFormatting.RESET
+ + " Weeks, "
+ + EnumChatFormatting.DARK_GREEN
+ + Integer.toString(days)
+ + EnumChatFormatting.RESET
+ + " Days, ");
+ mInfo.add(
+ EnumChatFormatting.DARK_GREEN + Long.toString(hours)
+ + EnumChatFormatting.RESET
+ + " Hours, "
+ + EnumChatFormatting.DARK_GREEN
+ + Long.toString(minutes)
+ + EnumChatFormatting.RESET
+ + " Minutes, "
+ + EnumChatFormatting.DARK_GREEN
+ + Long.toString(second)
+ + EnumChatFormatting.RESET
+ + " Seconds.");
mInfo.add("Total Time in ticks: " + EnumChatFormatting.DARK_GREEN + Long.toString(this.mTotalRunTime));
String[] mInfo2 = mInfo.toArray(new String[mInfo.size()]);
@@ -340,9 +412,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
private String[] aCachedToolTip;
- /*private final String aRequiresMuffler = "1x Muffler Hatch";
- private final String aRequiresCoreModule = "1x Core Module";
- private final String aRequiresMaint = "1x Maintanence Hatch";*/
+ /*
+ * private final String aRequiresMuffler = "1x Muffler Hatch"; private final String aRequiresCoreModule =
+ * "1x Core Module"; private final String aRequiresMaint = "1x Maintanence Hatch";
+ */
public static final String TAG_HIDE_HATCHES = "TAG_HIDE_HATCHES";
public static final String TAG_HIDE_MAINT = "TAG_HIDE_MAINT";
@@ -411,22 +484,23 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
return checkRecipeGeneric(aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, 10000);
}
- public boolean checkRecipeGeneric(
- int aMaxParallelRecipes, long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(int aMaxParallelRecipes, long aEUPercent, int aSpeedBonusPercent,
+ int aOutputChanceRoll) {
ArrayList<ItemStack> tItems = getStoredInputs();
ArrayList<FluidStack> tFluids = getStoredFluids();
ItemStack[] tItemInputs = tItems.toArray(new ItemStack[tItems.size()]);
FluidStack[] tFluidInputs = tFluids.toArray(new FluidStack[tFluids.size()]);
return checkRecipeGeneric(
- tItemInputs, tFluidInputs, aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, aOutputChanceRoll);
+ tItemInputs,
+ tFluidInputs,
+ aMaxParallelRecipes,
+ aEUPercent,
+ aSpeedBonusPercent,
+ aOutputChanceRoll);
}
- public boolean checkRecipeGeneric(
- GT_Recipe aRecipe,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(GT_Recipe aRecipe, int aMaxParallelRecipes, long aEUPercent,
+ int aSpeedBonusPercent, int aOutputChanceRoll) {
if (aRecipe == null) {
return false;
}
@@ -444,13 +518,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
aRecipe);
}
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
return checkRecipeGeneric(
aItemInputs,
aFluidInputs,
@@ -462,152 +531,69 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
}
/*
- * public boolean checkRecipeGeneric( ItemStack[] aItemInputs, FluidStack[]
- * aFluidInputs, int aMaxParallelRecipes, int aEUPercent, int
- * aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) { // Based on
- * the Processing Array. A bit overkill, but very flexible.
- *
- *
- * if (this.doesMachineBoostOutput()) { log("Boosting."); return
- * checkRecipeBoostedOutputs(aItemInputs, aFluidInputs, aMaxParallelRecipes,
- * aEUPercent, aSpeedBonusPercent, aOutputChanceRoll, aRecipe); }
- *
- *
- * //Control Core to control the Multiblocks behaviour. int aControlCoreTier =
- * getControlCoreTier();
- *
- * //If no core, return false; if (aControlCoreTier > 0) {
- * log("Control core found."); }
- *
- *
- * // Reset outputs and progress stats this.lEUt = 0; this.mMaxProgresstime = 0;
- * this.mOutputItems = new ItemStack[]{}; this.mOutputFluids = new
- * FluidStack[]{};
- *
- * long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1,
- * GT_Utility.getTier(tVoltage)); log("Running checkRecipeGeneric(0)");
- *
- * //Check to see if Voltage Tier > Control Core Tier if (tTier >
- * aControlCoreTier) {
- * log("Control core found is lower tier than power tier. OK"); tTier = (byte)
- * aControlCoreTier; }
- *
- * tTier = (byte) MathUtils.getValueWithinRange(tTier, 0, 9);
- *
- * GT_Recipe tRecipe = aRecipe != null ? aRecipe : findRecipe(
- * getBaseMetaTileEntity(), mLastRecipe, false,
- * gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs);
- *
- * log("Running checkRecipeGeneric(1)"); // Remember last recipe - an
- * optimization for findRecipe() this.mLastRecipe = tRecipe;
- *
- * if (tRecipe == null) { log("BAD RETURN - 1"); return false; }
- *
- * if (!this.canBufferOutputs(tRecipe, aMaxParallelRecipes)) {
- * log("BAD RETURN - 2"); return false; }
- *
- * // EU discount float tRecipeEUt = (tRecipe.mEUt * aEUPercent) / 100.0f; float
- * tTotalEUt = 0.0f;
- *
- * int parallelRecipes = 0;
- *
- * log("parallelRecipes: "+parallelRecipes);
- * log("aMaxParallelRecipes: "+aMaxParallelRecipes);
- * log("tTotalEUt: "+tTotalEUt); log("tVoltage: "+tVoltage);
- * log("tRecipeEUt: "+tRecipeEUt); log("EU1: "+tRecipeEUt); // Count
- * recipes to do in parallel, consuming input items and fluids and considering
- * input voltage limits for (; parallelRecipes < aMaxParallelRecipes &&
- * tTotalEUt < (tVoltage - tRecipeEUt); parallelRecipes++) { if
- * (!tRecipe.isRecipeInputEqual(true, aFluidInputs, aItemInputs)) {
+ * public boolean checkRecipeGeneric( ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ * int aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) { // Based on the Processing
+ * Array. A bit overkill, but very flexible. if (this.doesMachineBoostOutput()) { log("Boosting."); return
+ * checkRecipeBoostedOutputs(aItemInputs, aFluidInputs, aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent,
+ * aOutputChanceRoll, aRecipe); } //Control Core to control the Multiblocks behaviour. int aControlCoreTier =
+ * getControlCoreTier(); //If no core, return false; if (aControlCoreTier > 0) { log("Control core found."); } //
+ * Reset outputs and progress stats this.lEUt = 0; this.mMaxProgresstime = 0; this.mOutputItems = new ItemStack[]{};
+ * this.mOutputFluids = new FluidStack[]{}; long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1,
+ * GT_Utility.getTier(tVoltage)); log("Running checkRecipeGeneric(0)"); //Check to see if Voltage Tier > Control
+ * Core Tier if (tTier > aControlCoreTier) { log("Control core found is lower tier than power tier. OK"); tTier =
+ * (byte) aControlCoreTier; } tTier = (byte) MathUtils.getValueWithinRange(tTier, 0, 9); GT_Recipe tRecipe = aRecipe
+ * != null ? aRecipe : findRecipe( getBaseMetaTileEntity(), mLastRecipe, false,
+ * gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs); log("Running checkRecipeGeneric(1)"); //
+ * Remember last recipe - an optimization for findRecipe() this.mLastRecipe = tRecipe; if (tRecipe == null) {
+ * log("BAD RETURN - 1"); return false; } if (!this.canBufferOutputs(tRecipe, aMaxParallelRecipes)) {
+ * log("BAD RETURN - 2"); return false; } // EU discount float tRecipeEUt = (tRecipe.mEUt * aEUPercent) / 100.0f;
+ * float tTotalEUt = 0.0f; int parallelRecipes = 0; log("parallelRecipes: "+parallelRecipes);
+ * log("aMaxParallelRecipes: "+aMaxParallelRecipes); log("tTotalEUt: "+tTotalEUt); log("tVoltage: "+tVoltage);
+ * log("tRecipeEUt: "+tRecipeEUt); log("EU1: "+tRecipeEUt); // Count recipes to do in parallel, consuming input
+ * items and fluids and considering input voltage limits for (; parallelRecipes < aMaxParallelRecipes && tTotalEUt <
+ * (tVoltage - tRecipeEUt); parallelRecipes++) { if (!tRecipe.isRecipeInputEqual(true, aFluidInputs, aItemInputs)) {
* log("Broke at "+parallelRecipes+"."); break; }
- * log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+"."); tTotalEUt
- * += tRecipeEUt; log("EU2: "+tTotalEUt); }
- *
- * if (parallelRecipes == 0) { log("BAD RETURN - 3"); return false; }
- *
- * log("EU3: "+tTotalEUt);
- *
- * // -- Try not to fail after this point - inputs have already been consumed!
- * --
- *
- *
- * // Convert speed bonus to duration multiplier // e.g. 100% speed bonus = 200%
- * speed = 100%/200% = 50% recipe duration. aSpeedBonusPercent = Math.max(-99,
- * aSpeedBonusPercent); float tTimeFactor = 100.0f / (100.0f +
- * aSpeedBonusPercent); this.mMaxProgresstime = (int)(tRecipe.mDuration *
- * tTimeFactor * 10000);
- *
- * int aTempEu = (int) Math.floor(tTotalEUt); log("EU4: "+aTempEu);
- * this.lEUt = (long) aTempEu;
- *
- *
- * this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
- * this.mEfficiencyIncrease = 10000;
- *
- * // Overclock if (this.lEUt <= 16) { this.lEUt = (this.lEUt * (1 << tTier - 1)
- * * (1 << tTier - 1)); this.mMaxProgresstime = (this.mMaxProgresstime / (1 <<
- * tTier - 1)); } else { while (this.lEUt <=
- * gregtech.api.enums.GT_Values.V[(tTier - 1)]) { this.lEUt *= 4;
- * this.mMaxProgresstime /= 2; } }
- *
- * if (this.lEUt > 0) { this.lEUt = (-this.lEUt); }
- *
- * this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
- *
- * // Collect fluid outputs FluidStack[] tOutputFluids = new
- * FluidStack[tRecipe.mFluidOutputs.length]; for (int h = 0; h <
- * tRecipe.mFluidOutputs.length; h++) { if (tRecipe.getFluidOutput(h) != null) {
- * tOutputFluids[h] = tRecipe.getFluidOutput(h).copy(); tOutputFluids[h].amount
- * *= parallelRecipes; } }
- *
- * // Collect output item types ItemStack[] tOutputItems = new
- * ItemStack[tRecipe.mOutputs.length]; for (int h = 0; h <
- * tRecipe.mOutputs.length; h++) { if (tRecipe.getOutput(h) != null) {
- * tOutputItems[h] = tRecipe.getOutput(h).copy(); tOutputItems[h].stackSize = 0;
- * } }
- *
- * // Set output item stack sizes (taking output chance into account) for (int f
- * = 0; f < tOutputItems.length; f++) { if (tRecipe.mOutputs[f] != null &&
- * tOutputItems[f] != null) { for (int g = 0; g < parallelRecipes; g++) { if
- * (getBaseMetaTileEntity().getRandomNumber(aOutputChanceRoll) <
- * tRecipe.getOutputChance(f)) tOutputItems[f].stackSize +=
- * tRecipe.mOutputs[f].stackSize; } } }
- *
- * tOutputItems = removeNulls(tOutputItems);
- *
- * // Sanitize item stack size, splitting any stacks greater than max stack size
- * List<ItemStack> splitStacks = new ArrayList<ItemStack>(); for (ItemStack
- * tItem : tOutputItems) { while (tItem.getMaxStackSize() < tItem.stackSize) {
- * ItemStack tmp = tItem.copy(); tmp.stackSize = tmp.getMaxStackSize();
- * tItem.stackSize = tItem.stackSize - tItem.getMaxStackSize();
- * splitStacks.add(tmp); } }
- *
- * if (splitStacks.size() > 0) { ItemStack[] tmp = new
- * ItemStack[splitStacks.size()]; tmp = splitStacks.toArray(tmp); tOutputItems =
- * ArrayUtils.addAll(tOutputItems, tmp); }
- *
- * // Strip empty stacks List<ItemStack> tSList = new ArrayList<ItemStack>();
- * for (ItemStack tS : tOutputItems) { if (tS.stackSize > 0) tSList.add(tS); }
- * tOutputItems = tSList.toArray(new ItemStack[tSList.size()]);
- *
- * // Commit outputs this.mOutputItems = tOutputItems; this.mOutputFluids =
- * tOutputFluids; updateSlots();
- *
- * // Play sounds (GT++ addition - GT multiblocks play no sounds)
- * startProcess();
- *
+ * log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+"."); tTotalEUt += tRecipeEUt;
+ * log("EU2: "+tTotalEUt); } if (parallelRecipes == 0) { log("BAD RETURN - 3"); return false; }
+ * log("EU3: "+tTotalEUt); // -- Try not to fail after this point - inputs have already been consumed! -- // Convert
+ * speed bonus to duration multiplier // e.g. 100% speed bonus = 200% speed = 100%/200% = 50% recipe duration.
+ * aSpeedBonusPercent = Math.max(-99, aSpeedBonusPercent); float tTimeFactor = 100.0f / (100.0f +
+ * aSpeedBonusPercent); this.mMaxProgresstime = (int)(tRecipe.mDuration * tTimeFactor * 10000); int aTempEu = (int)
+ * Math.floor(tTotalEUt); log("EU4: "+aTempEu); this.lEUt = (long) aTempEu; this.mEfficiency = (10000 -
+ * (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; // Overclock if (this.lEUt <=
+ * 16) { this.lEUt = (this.lEUt * (1 << tTier - 1) * (1 << tTier - 1)); this.mMaxProgresstime =
+ * (this.mMaxProgresstime / (1 << tTier - 1)); } else { while (this.lEUt <= gregtech.api.enums.GT_Values.V[(tTier -
+ * 1)]) { this.lEUt *= 4; this.mMaxProgresstime /= 2; } } if (this.lEUt > 0) { this.lEUt = (-this.lEUt); }
+ * this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); // Collect fluid outputs FluidStack[] tOutputFluids =
+ * new FluidStack[tRecipe.mFluidOutputs.length]; for (int h = 0; h < tRecipe.mFluidOutputs.length; h++) { if
+ * (tRecipe.getFluidOutput(h) != null) { tOutputFluids[h] = tRecipe.getFluidOutput(h).copy();
+ * tOutputFluids[h].amount *= parallelRecipes; } } // Collect output item types ItemStack[] tOutputItems = new
+ * ItemStack[tRecipe.mOutputs.length]; for (int h = 0; h < tRecipe.mOutputs.length; h++) { if (tRecipe.getOutput(h)
+ * != null) { tOutputItems[h] = tRecipe.getOutput(h).copy(); tOutputItems[h].stackSize = 0; } } // Set output item
+ * stack sizes (taking output chance into account) for (int f = 0; f < tOutputItems.length; f++) { if
+ * (tRecipe.mOutputs[f] != null && tOutputItems[f] != null) { for (int g = 0; g < parallelRecipes; g++) { if
+ * (getBaseMetaTileEntity().getRandomNumber(aOutputChanceRoll) < tRecipe.getOutputChance(f))
+ * tOutputItems[f].stackSize += tRecipe.mOutputs[f].stackSize; } } } tOutputItems = removeNulls(tOutputItems); //
+ * Sanitize item stack size, splitting any stacks greater than max stack size List<ItemStack> splitStacks = new
+ * ArrayList<ItemStack>(); for (ItemStack tItem : tOutputItems) { while (tItem.getMaxStackSize() < tItem.stackSize)
+ * { ItemStack tmp = tItem.copy(); tmp.stackSize = tmp.getMaxStackSize(); tItem.stackSize = tItem.stackSize -
+ * tItem.getMaxStackSize(); splitStacks.add(tmp); } } if (splitStacks.size() > 0) { ItemStack[] tmp = new
+ * ItemStack[splitStacks.size()]; tmp = splitStacks.toArray(tmp); tOutputItems = ArrayUtils.addAll(tOutputItems,
+ * tmp); } // Strip empty stacks List<ItemStack> tSList = new ArrayList<ItemStack>(); for (ItemStack tS :
+ * tOutputItems) { if (tS.stackSize > 0) tSList.add(tS); } tOutputItems = tSList.toArray(new
+ * ItemStack[tSList.size()]); // Commit outputs this.mOutputItems = tOutputItems; this.mOutputFluids =
+ * tOutputFluids; updateSlots(); // Play sounds (GT++ addition - GT multiblocks play no sounds) startProcess();
* log("GOOD RETURN - 1"); return true; }
*/
public long getMaxInputEnergy() {
long rEnergy = 0;
- if (mEnergyHatches.size()
- == 1) // so it only takes 1 amp is only 1 hatch is present so it works like most gt multies
- return mEnergyHatches.get(0).getBaseMetaTileEntity().getInputVoltage();
+ if (mEnergyHatches.size() == 1) // so it only takes 1 amp is only 1 hatch is present so it works like most gt
+ // multies
+ return mEnergyHatches.get(0).getBaseMetaTileEntity().getInputVoltage();
for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches)
- if (isValidMetaTileEntity(tHatch))
- rEnergy += tHatch.getBaseMetaTileEntity().getInputVoltage()
- * tHatch.getBaseMetaTileEntity().getInputAmperage();
+ if (isValidMetaTileEntity(tHatch)) rEnergy += tHatch.getBaseMetaTileEntity().getInputVoltage()
+ * tHatch.getBaseMetaTileEntity().getInputAmperage();
return rEnergy;
}
@@ -615,14 +601,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
return false;
}
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll,
- GT_Recipe aRecipe) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) {
// Based on the Processing Array. A bit overkill, but very flexible.
// Reset outputs and progress stats
@@ -652,7 +632,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
}
/*
- * Check for Special Behaviours
+ * Check for Special Behaviours
*/
// First populate the map if we need to.
@@ -694,14 +674,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
}
}
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -719,13 +694,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
- .setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(helper.getCurrentParallel())
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
+ .setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent)).setParallel(helper.getCurrentParallel())
.calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
@@ -749,6 +720,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
/**
* Does this machine boost it's output?
+ *
* @return - if true, gives additional % to output chances.
*/
protected boolean doesMachineBoostOutput() {
@@ -813,13 +785,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
* @param aRecipe
* @return
*/
- public boolean checkRecipeBoostedOutputs(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll,
+ public boolean checkRecipeBoostedOutputs(ItemStack[] aItemInputs, FluidStack[] aFluidInputs,
+ int aMaxParallelRecipes, long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll,
GT_Recipe aRecipe) {
long tVoltage = getMaxInputVoltage();
@@ -827,8 +794,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
long tEnergy = getMaxInputEnergy();
log("Running checkRecipeGeneric(0)");
- GT_Recipe tRecipe = aRecipe != null
- ? aRecipe
+ GT_Recipe tRecipe = aRecipe != null ? aRecipe
: findRecipe(
getBaseMetaTileEntity(),
mLastRecipe,
@@ -897,8 +863,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
// Bad modify, let's just use the original recipe.
if (!mHasBoostedCurrentRecipe || mBoostedRecipe == null) {
- tRecipe = aRecipe != null
- ? aRecipe
+ tRecipe = aRecipe != null ? aRecipe
: findRecipe(
getBaseMetaTileEntity(),
mLastRecipe,
@@ -917,14 +882,9 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
return false;
}
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -940,14 +900,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
return false;
}
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
.setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel()))
- .calculate();
+ .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(mMaxProgresstime * helper.getDurationMultiplier());
@@ -991,27 +947,27 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
@Override
public void explodeMultiblock() {
MetaTileEntity tTileEntity;
- for (final Iterator<GT_MetaTileEntity_Hatch_InputBattery> localIterator = this.mChargeHatches.iterator();
- localIterator.hasNext();
- tTileEntity.getBaseMetaTileEntity().doExplosion(gregtech.api.enums.GT_Values.V[8])) {
+ for (final Iterator<GT_MetaTileEntity_Hatch_InputBattery> localIterator = this.mChargeHatches
+ .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity()
+ .doExplosion(gregtech.api.enums.GT_Values.V[8])) {
tTileEntity = localIterator.next();
}
tTileEntity = null;
- for (final Iterator<GT_MetaTileEntity_Hatch_OutputBattery> localIterator = this.mDischargeHatches.iterator();
- localIterator.hasNext();
- tTileEntity.getBaseMetaTileEntity().doExplosion(gregtech.api.enums.GT_Values.V[8])) {
+ for (final Iterator<GT_MetaTileEntity_Hatch_OutputBattery> localIterator = this.mDischargeHatches
+ .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity()
+ .doExplosion(gregtech.api.enums.GT_Values.V[8])) {
tTileEntity = localIterator.next();
}
tTileEntity = null;
- for (final Iterator<GT_MetaTileEntity_Hatch> localIterator = this.mTecTechDynamoHatches.iterator();
- localIterator.hasNext();
- tTileEntity.getBaseMetaTileEntity().doExplosion(gregtech.api.enums.GT_Values.V[8])) {
+ for (final Iterator<GT_MetaTileEntity_Hatch> localIterator = this.mTecTechDynamoHatches
+ .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity()
+ .doExplosion(gregtech.api.enums.GT_Values.V[8])) {
tTileEntity = localIterator.next();
}
tTileEntity = null;
- for (final Iterator<GT_MetaTileEntity_Hatch> localIterator = this.mTecTechEnergyHatches.iterator();
- localIterator.hasNext();
- tTileEntity.getBaseMetaTileEntity().doExplosion(gregtech.api.enums.GT_Values.V[8])) {
+ for (final Iterator<GT_MetaTileEntity_Hatch> localIterator = this.mTecTechEnergyHatches
+ .iterator(); localIterator.hasNext(); tTileEntity.getBaseMetaTileEntity()
+ .doExplosion(gregtech.api.enums.GT_Values.V[8])) {
tTileEntity = localIterator.next();
}
@@ -1089,8 +1045,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
* Deplete fluid input from a set of restricted hatches. This assumes these hatches can store nothing else but your
* expected fluid
*/
- protected boolean depleteInputFromRestrictedHatches(
- Collection<GT_MetaTileEntity_Hatch_CustomFluidBase> aHatches, int aAmount) {
+ protected boolean depleteInputFromRestrictedHatches(Collection<GT_MetaTileEntity_Hatch_CustomFluidBase> aHatches,
+ int aAmount) {
for (final GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : aHatches) {
if (isValidMetaTileEntity(tHatch)) {
FluidStack tLiquid = tHatch.getFluid();
@@ -1133,6 +1089,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
/**
* Causes a Random Maint. Issue.
+ *
* @return {@link boolean} - Returns whether or not an issue was caused, should always be true.
*/
public boolean causeMaintenanceIssue() {
@@ -1186,13 +1143,13 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
&& (this.getPollutionPerSecond(null) > 0 ? !mMufflerHatches.isEmpty() : true);
}
- public <E> boolean addToMachineListInternal(
- ArrayList<E> aList, final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) {
+ public <E> boolean addToMachineListInternal(ArrayList<E> aList, final IGregTechTileEntity aTileEntity,
+ final int aBaseCasingIndex) {
return addToMachineListInternal(aList, getMetaTileEntity(aTileEntity), aBaseCasingIndex);
}
- public <E> boolean addToMachineListInternal(
- ArrayList<E> aList, final IMetaTileEntity aTileEntity, final int aBaseCasingIndex) {
+ public <E> boolean addToMachineListInternal(ArrayList<E> aList, final IMetaTileEntity aTileEntity,
+ final int aBaseCasingIndex) {
if (aTileEntity == null) {
return false;
}
@@ -1219,8 +1176,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
if (aList.isEmpty()) {
if (aTileEntity instanceof GT_MetaTileEntity_Hatch) {
if (GTplusplus.CURRENT_LOAD_PHASE == INIT_PHASE.STARTED) {
- log("Adding " + aTileEntity.getInventoryName() + " at "
- + new BlockPos(aTileEntity.getBaseMetaTileEntity()).getLocationString());
+ log(
+ "Adding " + aTileEntity.getInventoryName()
+ + " at "
+ + new BlockPos(aTileEntity.getBaseMetaTileEntity()).getLocationString());
}
updateTexture(aTileEntity, aBaseCasingIndex);
return aList.add((E) aTileEntity);
@@ -1228,8 +1187,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
} else {
IGregTechTileEntity aCur = aTileEntity.getBaseMetaTileEntity();
if (aList.contains(aTileEntity)) {
- log("Found Duplicate " + aTileEntity.getInventoryName() + " @ "
- + new BlockPos(aCur).getLocationString());
+ log(
+ "Found Duplicate " + aTileEntity.getInventoryName()
+ + " @ "
+ + new BlockPos(aCur).getLocationString());
return false;
}
BlockPos aCurPos = new BlockPos(aCur);
@@ -1262,10 +1223,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
public int getControlCoreTier() {
// Always return best tier if config is off.
- /*boolean aCoresConfig = gtPlusPlus.core.lib.CORE.ConfigSwitches.requireControlCores;
- if (!aCoresConfig) {
- return 10;
- }*/
+ /*
+ * boolean aCoresConfig = gtPlusPlus.core.lib.CORE.ConfigSwitches.requireControlCores; if (!aCoresConfig) {
+ * return 10; }
+ */
if (mControlCoreBus.isEmpty()) {
log("No Control Core Modules Found.");
@@ -1301,8 +1262,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
log("Tried to add a secondary control core module.");
return false;
}
- GT_MetaTileEntity_Hatch_ControlCore Module =
- (GT_MetaTileEntity_Hatch_ControlCore) getMetaTileEntity(aTileEntity);
+ GT_MetaTileEntity_Hatch_ControlCore Module = (GT_MetaTileEntity_Hatch_ControlCore) getMetaTileEntity(
+ aTileEntity);
if (Module != null) {
if (Module.setOwner(aTileEntity)) {
log("Adding control core module.");
@@ -1607,7 +1568,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
/**
* TecTech Multi-Amp Dynamo Support
- * @param aTileEntity - The Dynamo Hatch
+ *
+ * @param aTileEntity - The Dynamo Hatch
* @param aBaseCasingIndex - Casing Texture
* @return
*/
@@ -1628,8 +1590,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
public boolean isThisHatchMultiDynamo(IMetaTileEntity aMetaTileEntity) {
Class<?> mDynamoClass;
- mDynamoClass = ReflectionUtils.getClass(
- "com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti");
+ mDynamoClass = ReflectionUtils
+ .getClass("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti");
if (mDynamoClass != null) {
if (mDynamoClass.isInstance(aMetaTileEntity)) {
return true;
@@ -1660,7 +1622,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
/**
* TecTech Multi-Amp Energy Hatch Support
- * @param aTileEntity - The Energy Hatch
+ *
+ * @param aTileEntity - The Energy Hatch
* @param aBaseCasingIndex - Casing Texture
* @return
*/
@@ -1681,8 +1644,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
public boolean isThisHatchMultiEnergy(IMetaTileEntity aMetaTileEntity) {
Class<?> mDynamoClass;
- mDynamoClass = ReflectionUtils.getClass(
- "com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti");
+ mDynamoClass = ReflectionUtils
+ .getClass("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti");
if (mDynamoClass != null) {
if (mDynamoClass.isInstance(aMetaTileEntity)) {
return true;
@@ -1746,34 +1709,28 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
/**
* Custom Find Recipe with Debugging
*/
- public GT_Recipe findRecipe(
- final IHasWorldObjectAndCoords aTileEntity,
- final boolean aNotUnificated,
- final boolean aDontCheckStackSizes,
- final long aVoltage,
- final FluidStack[] aFluids,
+ public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final boolean aNotUnificated,
+ final boolean aDontCheckStackSizes, final long aVoltage, final FluidStack[] aFluids,
final ItemStack... aInputs) {
return this.findRecipe(
- aTileEntity, null, aNotUnificated, aDontCheckStackSizes, aVoltage, aFluids, (ItemStack) null, aInputs);
+ aTileEntity,
+ null,
+ aNotUnificated,
+ aDontCheckStackSizes,
+ aVoltage,
+ aFluids,
+ (ItemStack) null,
+ aInputs);
}
- public GT_Recipe findRecipe(
- final IHasWorldObjectAndCoords aTileEntity,
- final boolean aNotUnificated,
- final long aVoltage,
- final FluidStack[] aFluids,
- final ItemStack... aInputs) {
+ public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final boolean aNotUnificated,
+ final long aVoltage, final FluidStack[] aFluids, final ItemStack... aInputs) {
return this.findRecipe(aTileEntity, null, aNotUnificated, aVoltage, aFluids, (ItemStack) null, aInputs);
}
- public GT_Recipe findRecipe(
- final IHasWorldObjectAndCoords aTileEntity,
- final GT_Recipe aRecipe,
- final boolean aNotUnificated,
- final boolean aDontCheckStackSizes,
- final long aVoltage,
- final FluidStack[] aFluids,
- final ItemStack... aInputs) {
+ public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GT_Recipe aRecipe,
+ final boolean aNotUnificated, final boolean aDontCheckStackSizes, final long aVoltage,
+ final FluidStack[] aFluids, final ItemStack... aInputs) {
return this.findRecipe(
aTileEntity,
aRecipe,
@@ -1785,36 +1742,20 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
aInputs);
}
- public GT_Recipe findRecipe(
- final IHasWorldObjectAndCoords aTileEntity,
- final GT_Recipe aRecipe,
- final boolean aNotUnificated,
- final long aVoltage,
- final FluidStack[] aFluids,
- final ItemStack... aInputs) {
+ public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GT_Recipe aRecipe,
+ final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack... aInputs) {
return this.findRecipe(aTileEntity, aRecipe, aNotUnificated, aVoltage, aFluids, (ItemStack) null, aInputs);
}
- public GT_Recipe findRecipe(
- final IHasWorldObjectAndCoords aTileEntity,
- final GT_Recipe aRecipe,
- final boolean aNotUnificated,
- final long aVoltage,
- final FluidStack[] aFluids,
- final ItemStack aSpecialSlot,
+ public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GT_Recipe aRecipe,
+ final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack aSpecialSlot,
final ItemStack... aInputs) {
return this.findRecipe(aTileEntity, aRecipe, aNotUnificated, true, aVoltage, aFluids, aSpecialSlot, aInputs);
}
- public GT_Recipe findRecipe(
- final IHasWorldObjectAndCoords aTileEntity,
- final GT_Recipe aRecipe,
- final boolean aNotUnificated,
- final boolean aDontCheckStackSizes,
- final long aVoltage,
- final FluidStack[] aFluids,
- final ItemStack aSpecialSlot,
- ItemStack... aInputs) {
+ public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GT_Recipe aRecipe,
+ final boolean aNotUnificated, final boolean aDontCheckStackSizes, final long aVoltage,
+ final FluidStack[] aFluids, final ItemStack aSpecialSlot, ItemStack... aInputs) {
if (this.getRecipeMap().mRecipeList.isEmpty()) {
log("No Recipes in Map to search through.");
return null;
@@ -1860,11 +1801,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
if (aNotUnificated) {
aInputs = GT_OreDictUnificator.getStackArray(true, (Object[]) aInputs);
}
- if (aRecipe != null
- && !aRecipe.mFakeRecipe
+ if (aRecipe != null && !aRecipe.mFakeRecipe
&& aRecipe.mCanBeBuffered
&& aRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- mRecipeResult = (aRecipe.mEnabled /* && aVoltage * this.getRecipeMap().mAmperage >= aRecipe.mEUt*/)
+ mRecipeResult = (aRecipe.mEnabled /* && aVoltage * this.getRecipeMap().mAmperage >= aRecipe.mEUt */)
? aRecipe
: null;
log("x) Found Recipe? " + (mRecipeResult != null ? "true" : "false"));
@@ -1872,22 +1812,21 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
return mRecipeResult;
}
}
- if (mRecipeResult == null
- && this.getRecipeMap().mUsualInputCount >= 0
+ if (mRecipeResult == null && this.getRecipeMap().mUsualInputCount >= 0
&& aInputs != null
&& aInputs.length > 0) {
for (final ItemStack tStack : aInputs) {
if (tStack != null) {
- Collection<GT_Recipe> tRecipes =
- this.getRecipeMap().mRecipeItemMap.get(new GT_ItemStack(tStack));
+ Collection<GT_Recipe> tRecipes = this.getRecipeMap().mRecipeItemMap
+ .get(new GT_ItemStack(tStack));
if (tRecipes != null) {
for (final GT_Recipe tRecipe : tRecipes) {
if (!tRecipe.mFakeRecipe
&& tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- mRecipeResult =
- (tRecipe.mEnabled /* && aVoltage * this.getRecipeMap().mAmperage >= tRecipe.mEUt*/)
- ? tRecipe
- : null;
+ mRecipeResult = (tRecipe.mEnabled /*
+ * && aVoltage * this.getRecipeMap().mAmperage >=
+ * tRecipe.mEUt
+ */) ? tRecipe : null;
log("1) Found Recipe? " + (mRecipeResult != null ? "true" : "false"));
// return mRecipeResult;
}
@@ -1895,17 +1834,16 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
}
// TODO - Investigate if this requires to be in it's own block
- tRecipes = this.getRecipeMap()
- .mRecipeItemMap
- .get(new GT_ItemStack(GT_Utility.copyMetaData(32767L, new Object[] {tStack})));
+ tRecipes = this.getRecipeMap().mRecipeItemMap
+ .get(new GT_ItemStack(GT_Utility.copyMetaData(32767L, new Object[] { tStack })));
if (tRecipes != null) {
for (final GT_Recipe tRecipe : tRecipes) {
if (!tRecipe.mFakeRecipe
&& tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- mRecipeResult =
- (tRecipe.mEnabled /*&& aVoltage * this.getRecipeMap().mAmperage >= tRecipe.mEUt*/)
- ? tRecipe
- : null;
+ mRecipeResult = (tRecipe.mEnabled /*
+ * && aVoltage * this.getRecipeMap().mAmperage >=
+ * tRecipe.mEUt
+ */) ? tRecipe : null;
log("2) Found Recipe? " + (mRecipeResult != null ? "true" : "false"));
// return mRecipeResult;
}
@@ -1914,22 +1852,21 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
}
}
}
- if (mRecipeResult == null
- && this.getRecipeMap().mMinimalInputItems == 0
+ if (mRecipeResult == null && this.getRecipeMap().mMinimalInputItems == 0
&& aFluids != null
&& aFluids.length > 0) {
for (final FluidStack aFluid2 : aFluids) {
if (aFluid2 != null) {
- final Collection<GT_Recipe> tRecipes =
- this.getRecipeMap().mRecipeFluidMap.get(aFluid2.getFluid());
+ final Collection<GT_Recipe> tRecipes = this.getRecipeMap().mRecipeFluidMap
+ .get(aFluid2.getFluid());
if (tRecipes != null) {
for (final GT_Recipe tRecipe : tRecipes) {
if (!tRecipe.mFakeRecipe
&& tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- mRecipeResult =
- (tRecipe.mEnabled /* && aVoltage * this.getRecipeMap().mAmperage >= tRecipe.mEUt*/)
- ? tRecipe
- : null;
+ mRecipeResult = (tRecipe.mEnabled /*
+ * && aVoltage * this.getRecipeMap().mAmperage >=
+ * tRecipe.mEUt
+ */) ? tRecipe : null;
log("3) Found Recipe? " + (mRecipeResult != null ? "true" : "false"));
// return mRecipeResult;
}
@@ -1943,8 +1880,10 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
}
if (mRecipeResult == null) {
- log("Invalid recipe, Fallback lookup. "
- + this.getRecipeMap().mRecipeList.size() + " | " + this.getRecipeMap().mNEIName);
+ log(
+ "Invalid recipe, Fallback lookup. " + this.getRecipeMap().mRecipeList.size()
+ + " | "
+ + this.getRecipeMap().mNEIName);
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
try {
return (GT_Recipe) findRecipe08.invoke(
@@ -1986,8 +1925,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
* Custom Tool Handling
*/
@Override
- public boolean onRightclick(
- IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
+ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX,
+ float aY, float aZ) {
// Do Things
if (this.getBaseMetaTileEntity().isServerSide()) {
// Logger.INFO("Right Clicked Controller.");
@@ -2019,8 +1958,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
if (hatch.mFluid != null) {
PlayerUtils.messagePlayer(
aPlayer,
- "Clearing " + hatch.mFluid.amount + "L of " + hatch.mFluid.getLocalizedName() + " from hatch "
- + aHatchIndex + ".");
+ "Clearing " + hatch.mFluid.amount
+ + "L of "
+ + hatch.mFluid.getLocalizedName()
+ + " from hatch "
+ + aHatchIndex
+ + ".");
hatch.mFluid = null;
}
aHatchIndex++;
@@ -2029,21 +1972,22 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
}
@Override
- public boolean onSolderingToolRightClick(
- byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
+ float aZ) {
boolean tSuper = super.onSolderingToolRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ);
if (aPlayer.isSneaking()) return tSuper;
mVoidExcess = !mVoidExcess;
- aPlayer.addChatMessage(new ChatComponentTranslation(
- mVoidExcess ? "interaction.voidexcess.enabled" : "interaction.voidexcess.disabled"));
+ aPlayer.addChatMessage(
+ new ChatComponentTranslation(
+ mVoidExcess ? "interaction.voidexcess.enabled" : "interaction.voidexcess.disabled"));
return true;
}
protected boolean mUseMultiparallelMode = false;
@Override
- public boolean onWireCutterRightClick(
- byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ public boolean onWireCutterRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
+ float aZ) {
if (aPlayer.isSneaking()) {
mUseMultiparallelMode = !mUseMultiparallelMode;
if (mUseMultiparallelMode) {
@@ -2056,21 +2000,15 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
return false;
}
- public boolean isValidBlockForStructure(
- IGregTechTileEntity aBaseMetaTileEntity,
- int aCasingID,
- boolean canBeHatch,
- Block aFoundBlock,
- int aFoundMeta,
- Block aExpectedBlock,
- int aExpectedMeta) {
+ public boolean isValidBlockForStructure(IGregTechTileEntity aBaseMetaTileEntity, int aCasingID, boolean canBeHatch,
+ Block aFoundBlock, int aFoundMeta, Block aExpectedBlock, int aExpectedMeta) {
boolean isHatch = false;
if (aBaseMetaTileEntity != null) {
// Unsure why this check exists?
- /*if (aCasingID < 64) {
- aCasingID = TAE.GTPP_INDEX(aCasingID);
- }*/
+ /*
+ * if (aCasingID < 64) { aCasingID = TAE.GTPP_INDEX(aCasingID); }
+ */
isHatch = this.addToMachineList(aBaseMetaTileEntity, aCasingID);
if (isHatch) {
@@ -2110,8 +2048,14 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
return true;
} else if (aFoundBlock != aExpectedBlock) {
if (GTplusplus.CURRENT_LOAD_PHASE == INIT_PHASE.STARTED) {
- log("A1 - Found: " + aFoundBlock.getLocalizedName() + ":" + aFoundMeta + ", Expected: "
- + aExpectedBlock.getLocalizedName() + ":" + aExpectedMeta);
+ log(
+ "A1 - Found: " + aFoundBlock.getLocalizedName()
+ + ":"
+ + aFoundMeta
+ + ", Expected: "
+ + aExpectedBlock.getLocalizedName()
+ + ":"
+ + aExpectedMeta);
// log("Loc: "+(new BlockPos(aBaseMetaTileEntity).getLocationString()));
}
return false;
@@ -2149,31 +2093,24 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
}
private final void tryTickWaitTimerDown() {
- /*if (mStartUpCheck > 10) {
- mStartUpCheck = 10;
- }*/
+ /*
+ * if (mStartUpCheck > 10) { mStartUpCheck = 10; }
+ */
}
// Only support to use meta to tier
/**
* accept meta [0, maxMeta)
+ *
* @param maxMeta exclusive
*/
- public static <T> IStructureElement<T> addTieredBlock(
- Block aBlock,
- BiConsumer<T, Integer> aSetTheFuckingMeta,
- Function<T, Integer> aGetTheFuckingMeta,
- int maxMeta) {
- return addTieredBlock(
- aBlock,
- (t, i) -> {
- aSetTheFuckingMeta.accept(t, i);
- return true;
- },
- aGetTheFuckingMeta,
- 0,
- maxMeta);
+ public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiConsumer<T, Integer> aSetTheFuckingMeta,
+ Function<T, Integer> aGetTheFuckingMeta, int maxMeta) {
+ return addTieredBlock(aBlock, (t, i) -> {
+ aSetTheFuckingMeta.accept(t, i);
+ return true;
+ }, aGetTheFuckingMeta, 0, maxMeta);
}
/**
@@ -2181,21 +2118,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
* @param minMeta inclusive
* @param maxMeta exclusive
*/
- public static <T> IStructureElement<T> addTieredBlock(
- Block aBlock,
- BiConsumer<T, Integer> aSetTheFuckingMeta,
- Function<T, Integer> aGetTheFuckingMeta,
- int minMeta,
- int maxMeta) {
- return addTieredBlock(
- aBlock,
- (t, i) -> {
- aSetTheFuckingMeta.accept(t, i);
- return true;
- },
- aGetTheFuckingMeta,
- minMeta,
- maxMeta);
+ public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiConsumer<T, Integer> aSetTheFuckingMeta,
+ Function<T, Integer> aGetTheFuckingMeta, int minMeta, int maxMeta) {
+ return addTieredBlock(aBlock, (t, i) -> {
+ aSetTheFuckingMeta.accept(t, i);
+ return true;
+ }, aGetTheFuckingMeta, minMeta, maxMeta);
}
/**
@@ -2203,14 +2131,11 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
* @param minMeta inclusive
* @param maxMeta exclusive
*/
- public static <T> IStructureElement<T> addTieredBlock(
- Block aBlock,
- BiPredicate<T, Integer> aSetTheFuckingMeta,
- Function<T, Integer> aGetTheFuckingMeta,
- int minMeta,
- int maxMeta) {
+ public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiPredicate<T, Integer> aSetTheFuckingMeta,
+ Function<T, Integer> aGetTheFuckingMeta, int minMeta, int maxMeta) {
return new IStructureElement<T>() {
+
@Override
public boolean check(T t, World world, int x, int y, int z) {
Block tBlock = world.getBlock(x, y, z);
@@ -2247,14 +2172,14 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
@Nullable
@Override
- public BlocksToPlace getBlocksToPlace(
- T t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) {
+ public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger,
+ AutoPlaceEnvironment env) {
return BlocksToPlace.create(aBlock, getMeta(trigger));
}
@Override
- public PlaceResult survivalPlaceBlock(
- T t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) {
+ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger,
+ AutoPlaceEnvironment env) {
if (world.getBlock(x, y, z) == aBlock) {
if (world.getBlockMetadata(x, y, z) == getMeta(trigger)) {
return PlaceResult.SKIP;
@@ -2262,37 +2187,29 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
return PlaceResult.REJECT;
}
return StructureUtility.survivalPlaceBlock(
- aBlock, getMeta(trigger), world, x, y, z, env.getSource(), env.getActor(), env.getChatter());
+ aBlock,
+ getMeta(trigger),
+ world,
+ x,
+ y,
+ z,
+ env.getSource(),
+ env.getActor(),
+ env.getChatter());
}
};
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
if (aSide == aFacing) {
- if (aActive)
- return new ITexture[] {
- getCasingTexture(),
- TextureFactory.builder()
- .addIcon(getActiveOverlay())
- .extFacing()
- .build()
- };
- return new ITexture[] {
- getCasingTexture(),
- TextureFactory.builder()
- .addIcon(getInactiveOverlay())
- .extFacing()
- .build()
- };
- }
- return new ITexture[] {getCasingTexture()};
+ if (aActive) return new ITexture[] { getCasingTexture(),
+ TextureFactory.builder().addIcon(getActiveOverlay()).extFacing().build() };
+ return new ITexture[] { getCasingTexture(),
+ TextureFactory.builder().addIcon(getInactiveOverlay()).extFacing().build() };
+ }
+ return new ITexture[] { getCasingTexture() };
}
protected IIconContainer getActiveOverlay() {
@@ -2325,15 +2242,12 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
private static final ConcurrentHashMap<String, ItemStack> mToolStacks = new ConcurrentHashMap<>();
protected void addNoPlayerInventoryUI(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(3, 4)
- .setSize(152, 159));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(3, 4).setSize(152, 159));
for (int i = 0; i < 9; i++) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.BUTTON_STANDARD)
- .setPos(155, 3 + i * 18)
- .setSize(18, 18));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.BUTTON_STANDARD).setPos(155, 3 + i * 18)
+ .setSize(18, 18));
}
DynamicPositionedColumn screenElements = new DynamicPositionedColumn();
@@ -2342,163 +2256,229 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
setupToolDisplay();
- builder.widget(new ItemDrawable(() -> mToolStacks.get(mWrench + "WRENCH"))
- .asWidget()
- .setPos(156, 58))
+ builder.widget(new ItemDrawable(() -> mToolStacks.get(mWrench + "WRENCH")).asWidget().setPos(156, 58))
.widget(new FakeSyncWidget.BooleanSyncer(() -> mWrench, val -> mWrench = val));
- builder.widget(new ItemDrawable(() -> mToolStacks.get(mCrowbar + "CROWBAR"))
- .asWidget()
- .setPos(156, 76))
+ builder.widget(new ItemDrawable(() -> mToolStacks.get(mCrowbar + "CROWBAR")).asWidget().setPos(156, 76))
.widget(new FakeSyncWidget.BooleanSyncer(() -> mCrowbar, val -> mCrowbar = val));
- builder.widget(new ItemDrawable(() -> mToolStacks.get(mHardHammer + "HARDHAMMER"))
- .asWidget()
- .setPos(156, 94))
- .widget(new TextWidget("H")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(167, 103))
+ builder.widget(new ItemDrawable(() -> mToolStacks.get(mHardHammer + "HARDHAMMER")).asWidget().setPos(156, 94))
+ .widget(new TextWidget("H").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(167, 103))
.widget(new FakeSyncWidget.BooleanSyncer(() -> mHardHammer, val -> mHardHammer = val));
- builder.widget(new ItemDrawable(() -> mToolStacks.get(mSoftHammer + "SOFTHAMMER"))
- .asWidget()
- .setPos(156, 112))
- .widget(new TextWidget("M")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(167, 121))
+ builder.widget(new ItemDrawable(() -> mToolStacks.get(mSoftHammer + "SOFTHAMMER")).asWidget().setPos(156, 112))
+ .widget(new TextWidget("M").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(167, 121))
.widget(new FakeSyncWidget.BooleanSyncer(() -> mSoftHammer, val -> mSoftHammer = val));
- builder.widget(new ItemDrawable(() -> mToolStacks.get(mScrewdriver + "SCREWDRIVER"))
- .asWidget()
- .setPos(156, 130))
+ builder.widget(
+ new ItemDrawable(() -> mToolStacks.get(mScrewdriver + "SCREWDRIVER")).asWidget().setPos(156, 130))
.widget(new FakeSyncWidget.BooleanSyncer(() -> mScrewdriver, val -> mScrewdriver = val));
- builder.widget(new ItemDrawable(() -> mToolStacks.get(mSolderingTool + "SOLDERING_IRON_LV"))
- .asWidget()
+ builder.widget(
+ new ItemDrawable(() -> mToolStacks.get(mSolderingTool + "SOLDERING_IRON_LV")).asWidget()
.setPos(156, 148))
.widget(new FakeSyncWidget.BooleanSyncer(() -> mSolderingTool, val -> mSolderingTool = val));
- builder.widget(new ItemDrawable(
- () -> mToolStacks.get(getBaseMetaTileEntity().isActive() + "GLASS"))
- .asWidget()
+ builder.widget(
+ new ItemDrawable(() -> mToolStacks.get(getBaseMetaTileEntity().isActive() + "GLASS")).asWidget()
.setPos(156, 22))
- .widget(TextWidget.dynamicString(() -> getBaseMetaTileEntity().isActive() ? "On" : "Off")
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(157, 31))
- .widget(new FakeSyncWidget.BooleanSyncer(
- () -> getBaseMetaTileEntity().isActive(),
- val -> getBaseMetaTileEntity().setActive(val)));
+ .widget(
+ TextWidget.dynamicString(() -> getBaseMetaTileEntity().isActive() ? "On" : "Off")
+ .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(157, 31))
+ .widget(
+ new FakeSyncWidget.BooleanSyncer(
+ () -> getBaseMetaTileEntity().isActive(),
+ val -> getBaseMetaTileEntity().setActive(val)));
}
protected void drawTextsNoPlayerInventory(DynamicPositionedColumn screenElements) {
screenElements.setSynced(false).setSpace(0).setPos(6, 7);
screenElements
- .widget(new TextWidget(GT_Utility.trans("138", "Incomplete Structure."))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> !mMachine))
+ .widget(
+ new TextWidget(GT_Utility.trans("138", "Incomplete Structure."))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> !mMachine))
.widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val))
- .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("GTPP.machines.input") + " "
- + StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.GREEN
- + GT_Values.VOLTAGE_NAMES[(int) getInputTier()])
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine && getInputTier() > 0))
- .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("GTPP.machines.output") + " "
- + StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.GREEN
- + GT_Values.VOLTAGE_NAMES[(int) getOutputTier()])
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine && getOutputTier() > 0))
- .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("GTPP.multiblock.progress") + ": "
- + EnumChatFormatting.GREEN
- + getBaseMetaTileEntity().getProgress() / 20
- + EnumChatFormatting.RESET + " s / " + EnumChatFormatting.YELLOW
- + getBaseMetaTileEntity().getMaxProgress() / 20
- + EnumChatFormatting.RESET + " s")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(new TextWidget(StatCollector.translateToLocal("GTPP.multiblock.energy") + ":")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal(
- "" + EnumChatFormatting.GREEN + getStoredEnergyInAllEnergyHatches()
- + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW
- + getMaxEnergyStorageOfAllEnergyHatches()
- + EnumChatFormatting.RESET + " EU"))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(new TextWidget(StatCollector.translateToLocal("GTPP.multiblock.usage") + ":")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine && getLastRecipeEU() > 0 && getLastRecipeDuration() > 0))
- .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("" + EnumChatFormatting.RED
- + -getLastRecipeEU() + EnumChatFormatting.RESET + " EU/t/parallel"))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine && getLastRecipeEU() > 0 && getLastRecipeDuration() > 0))
- .widget(TextWidget.dynamicString(
- () -> StatCollector.translateToLocal("GTPP.multiblock.generation") + ":")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine && getLastRecipeEU() < 0 && getLastRecipeDuration() > 0))
- .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("" + EnumChatFormatting.GREEN
- + getLastRecipeEU() + EnumChatFormatting.RESET + " EU/t/parallel"))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine && getLastRecipeEU() < 0 && getLastRecipeDuration() > 0))
- .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("GTPP.multiblock.duration") + ": "
- + EnumChatFormatting.RED + getLastRecipeDuration() + EnumChatFormatting.RESET
- + " ticks")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine && getLastRecipeEU() != 0 && getLastRecipeDuration() > 0))
- .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("GTPP.multiblock.specialvalue")
- + ": " + EnumChatFormatting.RED + getLastRecipeEU() + EnumChatFormatting.RESET + "")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine
- && getLastRecipeEU() != 0
- && getLastRecipeDuration() > 0
- && (mLastRecipe != null ? mLastRecipe.mSpecialValue : 0) > 0))
- .widget(new TextWidget(StatCollector.translateToLocal("GTPP.multiblock.mei") + ":")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(TextWidget.dynamicString(() ->
- StatCollector.translateToLocal("" + EnumChatFormatting.YELLOW + getMaxInputVoltage()
- + EnumChatFormatting.RESET + " EU/t(*2A) "
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal("GTPP.machines.input") + " "
+ + StatCollector.translateToLocal("GTPP.machines.tier")
+ + ": "
+ + EnumChatFormatting.GREEN
+ + GT_Values.VOLTAGE_NAMES[(int) getInputTier()])
+ .setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setEnabled(widget -> mMachine && getInputTier() > 0))
+ .widget(
+ TextWidget.dynamicString(
+ () -> StatCollector.translateToLocal("GTPP.machines.output") + " "
+ StatCollector.translateToLocal("GTPP.machines.tier")
- + ": " + EnumChatFormatting.YELLOW
- + GT_Values.VN[GT_Utility.getTier(getMaxInputVoltage())]
- + EnumChatFormatting.RESET))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("GTPP.multiblock.efficiency")
- + ": " + EnumChatFormatting.YELLOW + (mEfficiency / 100.0F) + EnumChatFormatting.RESET
- + " %")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("GTPP.multiblock.pollution")
- + ": " + EnumChatFormatting.RED + (getPollutionPerTick(null) * 20)
- + EnumChatFormatting.RESET + "/sec")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(TextWidget.dynamicString(
- () -> StatCollector.translateToLocal("GTPP.multiblock.pollutionreduced") + ": "
- + EnumChatFormatting.GREEN + getPollutionReductionForAllMufflers()
- + EnumChatFormatting.RESET + " %")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(new TextWidget("Total Time Since Built: ")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(TextWidget.dynamicString(() -> "" + EnumChatFormatting.DARK_GREEN + getRuntimeWeeksDisplay()
- + EnumChatFormatting.RESET + " Weeks,")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(TextWidget.dynamicString(() -> "" + EnumChatFormatting.DARK_GREEN + getRuntimeDaysDisplay()
- + EnumChatFormatting.RESET + " Days,")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(TextWidget.dynamicString(() -> "" + EnumChatFormatting.DARK_GREEN + getRuntimeHoursDisplay()
- + EnumChatFormatting.RESET + " Hours,")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(TextWidget.dynamicString(() -> "" + EnumChatFormatting.DARK_GREEN + getRuntimeMinutesDisplay()
- + EnumChatFormatting.RESET + " Minutes,")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine))
- .widget(TextWidget.dynamicString(() -> "" + EnumChatFormatting.DARK_GREEN + getRuntimeSecondsDisplay()
- + EnumChatFormatting.RESET + " Seconds")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mMachine));
+ + ": "
+ + EnumChatFormatting.GREEN
+ + GT_Values.VOLTAGE_NAMES[(int) getOutputTier()])
+ .setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setEnabled(widget -> mMachine && getOutputTier() > 0))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal("GTPP.multiblock.progress") + ": "
+ + EnumChatFormatting.GREEN
+ + getBaseMetaTileEntity().getProgress() / 20
+ + EnumChatFormatting.RESET
+ + " s / "
+ + EnumChatFormatting.YELLOW
+ + getBaseMetaTileEntity().getMaxProgress() / 20
+ + EnumChatFormatting.RESET
+ + " s")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ new TextWidget(StatCollector.translateToLocal("GTPP.multiblock.energy") + ":")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal(
+ "" + EnumChatFormatting.GREEN
+ + getStoredEnergyInAllEnergyHatches()
+ + EnumChatFormatting.RESET
+ + " EU / "
+ + EnumChatFormatting.YELLOW
+ + getMaxEnergyStorageOfAllEnergyHatches()
+ + EnumChatFormatting.RESET
+ + " EU"))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ new TextWidget(StatCollector.translateToLocal("GTPP.multiblock.usage") + ":")
+ .setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setEnabled(widget -> mMachine && getLastRecipeEU() > 0 && getLastRecipeDuration() > 0))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal(
+ "" + EnumChatFormatting.RED
+ + -getLastRecipeEU()
+ + EnumChatFormatting.RESET
+ + " EU/t/parallel"))
+ .setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setEnabled(widget -> mMachine && getLastRecipeEU() > 0 && getLastRecipeDuration() > 0))
+ .widget(
+ TextWidget
+ .dynamicString(() -> StatCollector.translateToLocal("GTPP.multiblock.generation") + ":")
+ .setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setEnabled(widget -> mMachine && getLastRecipeEU() < 0 && getLastRecipeDuration() > 0))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal(
+ "" + EnumChatFormatting.GREEN
+ + getLastRecipeEU()
+ + EnumChatFormatting.RESET
+ + " EU/t/parallel"))
+ .setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setEnabled(widget -> mMachine && getLastRecipeEU() < 0 && getLastRecipeDuration() > 0))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal("GTPP.multiblock.duration") + ": "
+ + EnumChatFormatting.RED
+ + getLastRecipeDuration()
+ + EnumChatFormatting.RESET
+ + " ticks")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(
+ widget -> mMachine && getLastRecipeEU() != 0 && getLastRecipeDuration() > 0))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal("GTPP.multiblock.specialvalue") + ": "
+ + EnumChatFormatting.RED
+ + getLastRecipeEU()
+ + EnumChatFormatting.RESET
+ + "")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(
+ widget -> mMachine && getLastRecipeEU() != 0
+ && getLastRecipeDuration() > 0
+ && (mLastRecipe != null ? mLastRecipe.mSpecialValue : 0) > 0))
+ .widget(
+ new TextWidget(StatCollector.translateToLocal("GTPP.multiblock.mei") + ":")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal(
+ "" + EnumChatFormatting.YELLOW
+ + getMaxInputVoltage()
+ + EnumChatFormatting.RESET
+ + " EU/t(*2A) "
+ + StatCollector.translateToLocal("GTPP.machines.tier")
+ + ": "
+ + EnumChatFormatting.YELLOW
+ + GT_Values.VN[GT_Utility.getTier(getMaxInputVoltage())]
+ + EnumChatFormatting.RESET))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal("GTPP.multiblock.efficiency") + ": "
+ + EnumChatFormatting.YELLOW
+ + (mEfficiency / 100.0F)
+ + EnumChatFormatting.RESET
+ + " %")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal("GTPP.multiblock.pollution") + ": "
+ + EnumChatFormatting.RED
+ + (getPollutionPerTick(null) * 20)
+ + EnumChatFormatting.RESET
+ + "/sec")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> StatCollector.translateToLocal("GTPP.multiblock.pollutionreduced") + ": "
+ + EnumChatFormatting.GREEN
+ + getPollutionReductionForAllMufflers()
+ + EnumChatFormatting.RESET
+ + " %")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ new TextWidget("Total Time Since Built: ").setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setEnabled(widget -> mMachine))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> "" + EnumChatFormatting.DARK_GREEN
+ + getRuntimeWeeksDisplay()
+ + EnumChatFormatting.RESET
+ + " Weeks,")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> "" + EnumChatFormatting.DARK_GREEN
+ + getRuntimeDaysDisplay()
+ + EnumChatFormatting.RESET
+ + " Days,")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> "" + EnumChatFormatting.DARK_GREEN
+ + getRuntimeHoursDisplay()
+ + EnumChatFormatting.RESET
+ + " Hours,")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> "" + EnumChatFormatting.DARK_GREEN
+ + getRuntimeMinutesDisplay()
+ + EnumChatFormatting.RESET
+ + " Minutes,")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> "" + EnumChatFormatting.DARK_GREEN
+ + getRuntimeSecondsDisplay()
+ + EnumChatFormatting.RESET
+ + " Seconds")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine));
}
protected int getLastRecipeEU() {
@@ -2522,8 +2502,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
}
protected long getRuntimeHoursDisplay() {
- return TimeUnit.SECONDS.toHours(getRuntimeSeconds())
- - TimeUnit.DAYS.toHours(getRuntimeDaysDisplay())
+ return TimeUnit.SECONDS.toHours(getRuntimeSeconds()) - TimeUnit.DAYS.toHours(getRuntimeDaysDisplay())
- TimeUnit.DAYS.toHours(7 * getRuntimeWeeksDisplay());
}
@@ -2540,53 +2519,61 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
mToolStacks.put(
true + "WRENCH",
- GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.WRENCH, 1, GOOD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, GOOD, Materials.Tungsten, null));
mToolStacks.put(
true + "CROWBAR",
- GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.CROWBAR, 1, GOOD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, GOOD, Materials.Tungsten, null));
mToolStacks.put(
true + "HARDHAMMER",
- GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.HARDHAMMER, 1, GOOD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, GOOD, Materials.Tungsten, null));
mToolStacks.put(
true + "SOFTHAMMER",
- GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.SOFTHAMMER, 1, GOOD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.SOFTHAMMER, 1, GOOD, Materials.Tungsten, null));
mToolStacks.put(
true + "SCREWDRIVER",
- GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, GOOD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, GOOD, Materials.Tungsten, null));
mToolStacks.put(
true + "SOLDERING_IRON_LV",
GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, GOOD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV,
+ 1,
+ GOOD,
+ Materials.Tungsten,
+ null));
mToolStacks.put(
false + "WRENCH",
- GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.WRENCH, 1, BAD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, BAD, Materials.Tungsten, null));
mToolStacks.put(
false + "CROWBAR",
- GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.CROWBAR, 1, BAD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, BAD, Materials.Tungsten, null));
mToolStacks.put(
false + "HARDHAMMER",
- GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.HARDHAMMER, 1, BAD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, BAD, Materials.Tungsten, null));
mToolStacks.put(
false + "SOFTHAMMER",
- GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.SOFTHAMMER, 1, BAD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.SOFTHAMMER, 1, BAD, Materials.Tungsten, null));
mToolStacks.put(
false + "SCREWDRIVER",
- GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, BAD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, BAD, Materials.Tungsten, null));
mToolStacks.put(
false + "SOLDERING_IRON_LV",
GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, BAD, Materials.Tungsten, null));
+ GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV,
+ 1,
+ BAD,
+ Materials.Tungsten,
+ null));
ItemStack aGlassPane1 = ItemUtils.getItemStackOfAmountFromOreDict("paneGlassRed", 1);
ItemStack aGlassPane2 = ItemUtils.getItemStackOfAmountFromOreDict("paneGlassLime", 1);
@@ -2595,36 +2582,38 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
}
public enum GTPPHatchElement implements IHatchElement<GregtechMeta_MultiBlockBase<?>> {
+
AirIntake(GregtechMeta_MultiBlockBase::addAirIntakeToMachineList, GT_MetaTileEntity_Hatch_AirIntake.class) {
+
@Override
public long count(GregtechMeta_MultiBlockBase<?> t) {
return t.mAirIntakes.size();
}
},
- ControlCore(
- GregtechMeta_MultiBlockBase::addControlCoreToMachineList, GT_MetaTileEntity_Hatch_ControlCore.class) {
+ ControlCore(GregtechMeta_MultiBlockBase::addControlCoreToMachineList,
+ GT_MetaTileEntity_Hatch_ControlCore.class) {
+
@Override
public long count(GregtechMeta_MultiBlockBase<?> t) {
return t.mControlCoreBus.size();
}
},
- TTDynamo(
- GregtechMeta_MultiBlockBase::addMultiAmpDynamoToMachineList,
+ TTDynamo(GregtechMeta_MultiBlockBase::addMultiAmpDynamoToMachineList,
"com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti") {
+
@Override
public long count(GregtechMeta_MultiBlockBase<?> t) {
return t.mTecTechDynamoHatches.size();
}
},
- TTEnergy(
- GregtechMeta_MultiBlockBase::addMultiAmpEnergyToMachineList,
+ TTEnergy(GregtechMeta_MultiBlockBase::addMultiAmpEnergyToMachineList,
"com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti") {
+
@Override
public long count(GregtechMeta_MultiBlockBase<?> t) {
return t.mTecTechEnergyHatches.size();
}
- },
- ;
+ },;
@SuppressWarnings("unchecked")
private static <T> Class<T> retype(Class<?> clazz) {
@@ -2635,19 +2624,15 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
private final IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> mAdder;
@SafeVarargs
- GTPPHatchElement(
- IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> aAdder,
+ GTPPHatchElement(IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> aAdder,
Class<? extends IMetaTileEntity>... aMteClasses) {
this.mMteClasses = Arrays.asList(aMteClasses);
this.mAdder = aAdder;
}
GTPPHatchElement(IGT_HatchAdder<? super GregtechMeta_MultiBlockBase<?>> aAdder, String... aClassNames) {
- this.mMteClasses = Arrays.stream(aClassNames)
- .map(ReflectionUtils::getClass)
- .filter(Objects::nonNull)
- .<Class<? extends IMetaTileEntity>>map(GTPPHatchElement::retype)
- .collect(Collectors.toList());
+ this.mMteClasses = Arrays.stream(aClassNames).map(ReflectionUtils::getClass).filter(Objects::nonNull)
+ .<Class<? extends IMetaTileEntity>>map(GTPPHatchElement::retype).collect(Collectors.toList());
this.mAdder = aAdder;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
index 6aaa37f4ac..d1b4b5d951 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
@@ -4,6 +4,17 @@ import static gregtech.api.enums.GT_Values.V;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.apache.commons.lang3.ArrayUtils;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IHatchElement;
import gregtech.api.interfaces.ITexture;
@@ -17,24 +28,13 @@ import gtPlusPlus.api.objects.data.*;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusOutput;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.fluids.FluidStack;
-import org.apache.commons.lang3.ArrayUtils;
public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMultiBase<T>>
extends GregtechMeta_MultiBlockBase<T> {
- public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput> mSteamInputs =
- new ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput>();
- public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput> mSteamOutputs =
- new ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput>();
- public ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mSteamInputFluids =
- new ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase>();
+ public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput> mSteamInputs = new ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput>();
+ public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput> mSteamOutputs = new ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput>();
+ public ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mSteamInputFluids = new ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase>();
protected static final String TT_steaminputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamInputBus");
protected static final String TT_steamoutputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamOutputBus");
@@ -49,20 +49,13 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == aFacing) {
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex()),
- aActive ? getFrontOverlayActive() : getFrontOverlay()
- };
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex()),
+ aActive ? getFrontOverlayActive() : getFrontOverlay() };
}
- return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex())};
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex()) };
}
protected abstract GT_RenderedTexture getFrontOverlay();
@@ -110,8 +103,10 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
// Remember last recipe - an optimization for findRecipe()
this.mLastRecipe = tRecipe;
- int aMaxParallelRecipes =
- canBufferOutputs(tRecipe.mOutputs, tRecipe.mFluidOutputs, this.getMaxParallelRecipes());
+ int aMaxParallelRecipes = canBufferOutputs(
+ tRecipe.mOutputs,
+ tRecipe.mFluidOutputs,
+ this.getMaxParallelRecipes());
if (aMaxParallelRecipes == 0) {
log("BAD RETURN - 2");
return false;
@@ -366,9 +361,8 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
return 0;
}
- /* ========================================
- * Item Management
- * ========================================
+ /*
+ * ======================================== Item Management ========================================
*/
if (aDoesOutputItems) {
@@ -407,8 +401,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
// A map to hold the items we will be 'inputting' into the output buses. These itemstacks are actually the
// recipe outputs.
- ConcurrentSet<FlexiblePair<ItemStack, Integer>> aInputMap =
- new ConcurrentHashSet<FlexiblePair<ItemStack, Integer>>();
+ ConcurrentSet<FlexiblePair<ItemStack, Integer>> aInputMap = new ConcurrentHashSet<FlexiblePair<ItemStack, Integer>>();
// Iterate over the outputs, calculating require stack spacing they will require.
for (int i = 0; i < getOutputCount(aOutputs); i++) {
@@ -442,11 +435,9 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
if (aInputMap.size() > 0) {
// Iterate over the current stored items in the Output busses, if any match and are not full, we can try
// account for merging.
- busItems:
- for (FlexiblePair<ItemStack, Integer> y : aItemMap) {
+ busItems: for (FlexiblePair<ItemStack, Integer> y : aItemMap) {
// Iterate over the 'inputs', we can safely remove these as we go.
- outputItems:
- for (FlexiblePair<ItemStack, Integer> u : aInputMap) {
+ outputItems: for (FlexiblePair<ItemStack, Integer> u : aInputMap) {
// Create local vars for readability.
ItemStack aOutputBusStack = y.getKey();
ItemStack aOutputStack = u.getKey();
@@ -471,8 +462,9 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
// Update the stack size in the bus storage map.
y.setValue(64);
// Create a new object to iterate over later, with the remainder data;
- FlexiblePair<ItemStack, Integer> t =
- new FlexiblePair<ItemStack, Integer>(u.getKey(), aRemainder);
+ FlexiblePair<ItemStack, Integer> t = new FlexiblePair<ItemStack, Integer>(
+ u.getKey(),
+ aRemainder);
// Remove the 'input' stack from the recipe outputs, so we don't try count it again.
aInputMap.remove(u);
// Add the remainder stack.
@@ -490,8 +482,8 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
// We have stacks that did not merge, do we have space for them?
if (aInputMap.size() > 0) {
if (aInputMap.size() > aInputBusSlotsFree) {
- aParallelRecipes =
- (int) Math.floor((double) aInputBusSlotsFree / aInputMap.size() * aParallelRecipes);
+ aParallelRecipes = (int) Math
+ .floor((double) aInputBusSlotsFree / aInputMap.size() * aParallelRecipes);
// We do not have enough free slots in total to accommodate the remaining managed stacks.
log(" Free: " + aInputBusSlotsFree + ", Required: " + aInputMap.size());
if (aParallelRecipes == 0) {
@@ -507,9 +499,8 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
}
- /* ========================================
- * Fluid Management
- * ========================================
+ /*
+ * ======================================== Fluid Management ========================================
*/
if (aDoesOutputFluids) {
@@ -519,8 +510,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
int aEmptyFluidHatches = 0;
int aFullFluidHatches = 0;
// Create Map for Fluid Output
- ArrayList<Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>> aOutputHatches =
- new ArrayList<Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>>();
+ ArrayList<Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>> aOutputHatches = new ArrayList<Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>>();
for (final GT_MetaTileEntity_Hatch_Output tBus : this.mOutputHatches) {
if (!isValidMetaTileEntity(tBus)) {
continue;
@@ -528,12 +518,18 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
aFluidHatches++;
// Map the Hatch with the space left for easy checking later.
if (tBus.getFluid() == null) {
- aOutputHatches.add(new Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>(
- tBus, null, tBus.getCapacity()));
+ aOutputHatches.add(
+ new Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>(
+ tBus,
+ null,
+ tBus.getCapacity()));
} else {
int aSpaceLeft = tBus.getCapacity() - tBus.getFluidAmount();
- aOutputHatches.add(new Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>(
- tBus, tBus.getFluid(), aSpaceLeft));
+ aOutputHatches.add(
+ new Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>(
+ tBus,
+ tBus.getFluid(),
+ aSpaceLeft));
}
}
// Create a map of all the fluids we would like to output, we can iterate over this and see how many we can
@@ -609,9 +605,10 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
aOutputHatches.remove(aOutputHatches.get(i));
i--;
// Re-add hatch to hatch list, with new data.
- Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer> aNewHatchData =
- new Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>(
- aHatch, aNewHatchStack, aNewHatchStack.amount);
+ Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer> aNewHatchData = new Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>(
+ aHatch,
+ aNewHatchStack,
+ aNewHatchStack.amount);
aOutputHatches.add(aNewHatchData);
break;
}
@@ -629,9 +626,10 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
aOutputHatches.remove(aOutputHatches.get(i));
i--;
// Re-add hatch to hatch list, with new data.
- Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer> aNewHatchData =
- new Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>(
- aHatch, aNewHatchStack, aNewHatchStack.amount);
+ Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer> aNewHatchData = new Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer>(
+ aHatch,
+ aNewHatchStack,
+ aNewHatchStack.amount);
aOutputHatches.add(aNewHatchData);
// Check next fluid
continue;
@@ -646,8 +644,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
for (Triplet<GT_MetaTileEntity_Hatch_Output, FluidStack, Integer> aFreeHatchCheck : aOutputHatches) {
// Free Hatch
- if (aFreeHatchCheck.getValue_2() == null
- || aFreeHatchCheck.getValue_3() == 0
+ if (aFreeHatchCheck.getValue_2() == null || aFreeHatchCheck.getValue_3() == 0
|| aFreeHatchCheck.getValue_1().getFluid() == null) {
aEmptyFluidHatches++;
}
@@ -658,10 +655,12 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
if (aOutputFluids.size() > 0) {
// Not enough space to add fluids.
if (aOutputFluids.size() > aEmptyFluidHatches) {
- aParallelRecipes =
- (int) Math.floor((double) aEmptyFluidHatches / aOutputFluids.size() * aParallelRecipes);
- log("Failed to find enough space for all fluid outputs. Free: " + aEmptyFluidHatches
- + ", Required: " + aOutputFluids.size());
+ aParallelRecipes = (int) Math
+ .floor((double) aEmptyFluidHatches / aOutputFluids.size() * aParallelRecipes);
+ log(
+ "Failed to find enough space for all fluid outputs. Free: " + aEmptyFluidHatches
+ + ", Required: "
+ + aOutputFluids.size());
return 0;
}
}
@@ -703,8 +702,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
if (aLiquid != null) return depleteInput(aLiquid);
for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : mSteamInputFluids) {
if (isValidMetaTileEntity(tHatch)) {
- if (GT_Utility.areStacksEqual(
- aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(0))) {
+ if (GT_Utility.areStacksEqual(aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(0))) {
if (tHatch.getBaseMetaTileEntity().getStackInSlot(0).stackSize >= aStack.stackSize) {
tHatch.getBaseMetaTileEntity().decrStackSize(0, aStack.stackSize);
return true;
@@ -716,8 +714,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
tHatch.mRecipeMap = getRecipeMap();
if (isValidMetaTileEntity(tHatch)) {
for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) {
- if (GT_Utility.areStacksEqual(
- aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(i))) {
+ if (GT_Utility.areStacksEqual(aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(i))) {
if (tHatch.getBaseMetaTileEntity().getStackInSlot(0).stackSize >= aStack.stackSize) {
tHatch.getBaseMetaTileEntity().decrStackSize(0, aStack.stackSize);
return true;
@@ -803,14 +800,14 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
protected static <T extends GregtechMeta_SteamMultiBase<T>> GT_HatchElementBuilder<T> buildSteamInput(
Class<T> typeToken) {
- return buildHatchAdder(typeToken)
- .adder(GregtechMeta_SteamMultiBase::addToMachineList)
- .hatchIds(31040)
+ return buildHatchAdder(typeToken).adder(GregtechMeta_SteamMultiBase::addToMachineList).hatchIds(31040)
.shouldReject(t -> !t.mSteamInputFluids.isEmpty());
}
protected enum SteamHatchElement implements IHatchElement<GregtechMeta_SteamMultiBase<?>> {
+
InputBus_Steam {
+
@Override
public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
return Collections.singletonList(GT_MetaTileEntity_Hatch_Steam_BusInput.class);
@@ -822,6 +819,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
}
},
OutputBus_Steam {
+
@Override
public List<? extends Class<? extends IMetaTileEntity>> mteClasses() {
return Collections.singletonList(GT_MetaTileEntity_Hatch_Steam_BusOutput.class);
@@ -831,8 +829,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
public long count(GregtechMeta_SteamMultiBase<?> t) {
return t.mSteamOutputs.size();
}
- },
- ;
+ },;
@Override
public IGT_HatchAdder<? super GregtechMeta_SteamMultiBase<?>> adder() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java
index 440e59a272..482c9e9910 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java
@@ -2,6 +2,13 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generat
import static gregtech.api.enums.GT_Values.V;
+import java.util.Collection;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.interfaces.ITexture;
@@ -11,28 +18,18 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeTank;
-import java.util.Collection;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_DeluxeTank {
private boolean useFuel = false;
- public GregtechDoubleFuelGeneratorBase(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final ITexture... aTextures) {
+ public GregtechDoubleFuelGeneratorBase(final int aID, final String aName, final String aNameRegional,
+ final int aTier, final String aDescription, final ITexture... aTextures) {
super(aID, aName, aNameRegional, aTier, 4, aDescription, aTextures);
}
- public GregtechDoubleFuelGeneratorBase(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GregtechDoubleFuelGeneratorBase(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 4, aDescription, aTextures);
}
@@ -55,34 +52,22 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, "Fuel Efficiency: " + this.getEfficiency() + "%"};
+ return new String[] { this.mDescription, "Fuel Efficiency: " + this.getEfficiency() + "%" };
}
- /* @Override
- public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
- if (aBaseMetaTileEntity.isClientSide()) return true;
- aBaseMetaTileEntity.openGUI(aPlayer);
- return true;
- }*/
+ /*
+ * @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { if
+ * (aBaseMetaTileEntity.isClientSide()) return true; aBaseMetaTileEntity.openGUI(aPlayer); return true; }
+ */
@Override
public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
@@ -97,23 +82,23 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getFrontActive(final byte aColor) {
@@ -226,8 +211,10 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
if (this.mInventory[this.getStackDisplaySlot()] == null) {
this.mInventory[this.getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
}
- this.mInventory[this.getStackDisplaySlot()].setStackDisplayName("Generating: "
- + (aBaseMetaTileEntity.getUniversalEnergyStored() - this.getMinimumStoredEU()) + " EU");
+ this.mInventory[this.getStackDisplaySlot()].setStackDisplayName(
+ "Generating: "
+ + (aBaseMetaTileEntity.getUniversalEnergyStored() - this.getMinimumStoredEU())
+ + " EU");
}
} else {
if ((this.mFluid != null) && (this.mFluid2 != null)) {
@@ -235,10 +222,11 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
tConsumed = this.consumedFluidPerOperation(this.mFluid);
final int tFuelValue2 = this.getFuelValue(this.mFluid2),
tConsumed2 = this.consumedFluidPerOperation(this.mFluid2);
- if (((tFuelValue > 0)
- && (tConsumed > 0)
- && (this.mFluid.amount
- > tConsumed)) /* && (tFuelValue2 > 0 && tConsumed2 > 0 && mFluid2.amount > tConsumed2)*/) {
+ if (((tFuelValue > 0) && (tConsumed > 0)
+ && (this.mFluid.amount > tConsumed)) /*
+ * && (tFuelValue2 > 0 && tConsumed2 > 0 &&
+ * mFluid2.amount > tConsumed2)
+ */) {
Logger.WARNING("tFuelValue: " + tFuelValue);
Logger.WARNING("tConsumed: " + tConsumed);
@@ -250,29 +238,25 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
Logger.WARNING("tFuelValue2: " + tFuelValue2);
Logger.WARNING("tConsumed2: " + tConsumed2);
- Logger.WARNING(
- "mFluid2.name: " + this.mFluid2.getFluid().getName());
+ Logger.WARNING("mFluid2.name: " + this.mFluid2.getFluid().getName());
Logger.WARNING("mFluid2.amount: " + this.mFluid2.amount);
Logger.WARNING("mFluid2.amount > tConsumed2: " + (this.mFluid2.amount > tConsumed2));
long tFluidAmountToUse = Math.min(
this.mFluid.amount / tConsumed,
(((this.maxEUOutput() * 30) + this.getMinimumStoredEU())
- - aBaseMetaTileEntity.getUniversalEnergyStored())
- / tFuelValue);
+ - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue);
long tFluidAmountToUse2 = Math.min(
this.mFluid2.amount / tConsumed2,
(((this.maxEUOutput() * 30) + this.getMinimumStoredEU())
- - aBaseMetaTileEntity.getUniversalEnergyStored())
- / tFuelValue2);
+ - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2);
if (tFluidAmountToUse <= 0) {
- /*if ((mFluid.amount / tConsumed) == getCapacity()){
- tFluidAmountToUse = 1;
- }*/
+ /*
+ * if ((mFluid.amount / tConsumed) == getCapacity()){ tFluidAmountToUse = 1; }
+ */
- if (aBaseMetaTileEntity.getUniversalEnergyStored()
- <= (aBaseMetaTileEntity.getEUCapacity()
- - aBaseMetaTileEntity.getUniversalEnergyStored())) {
+ if (aBaseMetaTileEntity.getUniversalEnergyStored() <= (aBaseMetaTileEntity.getEUCapacity()
+ - aBaseMetaTileEntity.getUniversalEnergyStored())) {
tFluidAmountToUse = 1;
Logger.WARNING("=========================================================");
Logger.WARNING("tFluidAmountToUse - Updated: " + tFluidAmountToUse);
@@ -281,12 +265,11 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
}
if (tFluidAmountToUse2 <= 0) {
- /*if ((mFluid2.amount / tConsumed) == getCapacity()){
- tFluidAmountToUse2 = 1;
- }*/
- if (aBaseMetaTileEntity.getUniversalEnergyStored()
- <= (aBaseMetaTileEntity.getEUCapacity()
- - aBaseMetaTileEntity.getUniversalEnergyStored())) {
+ /*
+ * if ((mFluid2.amount / tConsumed) == getCapacity()){ tFluidAmountToUse2 = 1; }
+ */
+ if (aBaseMetaTileEntity.getUniversalEnergyStored() <= (aBaseMetaTileEntity.getEUCapacity()
+ - aBaseMetaTileEntity.getUniversalEnergyStored())) {
tFluidAmountToUse2 = 1;
Logger.WARNING("=========================================================");
Logger.WARNING("tFluidAmountToUse2 - Updated: " + tFluidAmountToUse2);
@@ -298,42 +281,53 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
Logger.WARNING("tFluidAmountToUse: " + tFluidAmountToUse);
Logger.WARNING("=========================================================");
- /*Utils.LOG_WARNING("mFluid.amount / tConsumed: "+("fluidAmount:"+mFluid.amount)+(" tConsumed:"+tConsumed)+" | "+(mFluid.amount / tConsumed));
- Utils.LOG_WARNING("maxEUOutput() * 20 + getMinimumStoredEU(): "+(maxEUOutput() * 30 + getMinimumStoredEU()));
- Utils.LOG_WARNING("maxEUOutput(): "+maxEUOutput());
- Utils.LOG_WARNING("maxEUOutput() * 20: "+(maxEUOutput() * 30));
- Utils.LOG_WARNING("getMinimumStoredEU(): "+(getMinimumStoredEU()));
- Utils.LOG_WARNING("aBaseMetaTileEntity.getUniversalEnergyStored(): "+(aBaseMetaTileEntity.getUniversalEnergyStored()));
- Utils.LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()): "+((maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored())));
- Utils.LOG_WARNING("tFuelValue: "+(tFuelValue));
- Utils.LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue): "+((maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue));
+ /*
+ * Utils.LOG_WARNING("mFluid.amount / tConsumed: "+("fluidAmount:"+mFluid.amount)+(" tConsumed:"
+ * +tConsumed)+" | "+(mFluid.amount / tConsumed));
+ * Utils.LOG_WARNING("maxEUOutput() * 20 + getMinimumStoredEU(): "+(maxEUOutput() * 30 +
+ * getMinimumStoredEU())); Utils.LOG_WARNING("maxEUOutput(): "+maxEUOutput());
+ * Utils.LOG_WARNING("maxEUOutput() * 20: "+(maxEUOutput() * 30));
+ * Utils.LOG_WARNING("getMinimumStoredEU(): "+(getMinimumStoredEU()));
+ * Utils.LOG_WARNING("aBaseMetaTileEntity.getUniversalEnergyStored(): "+(aBaseMetaTileEntity.
+ * getUniversalEnergyStored())); Utils.
+ * LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()): "
+ * +((maxEUOutput() * 30 + getMinimumStoredEU() -
+ * aBaseMetaTileEntity.getUniversalEnergyStored())));
+ * Utils.LOG_WARNING("tFuelValue: "+(tFuelValue)); Utils.
+ * LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue): "
+ * +((maxEUOutput() * 30 + getMinimumStoredEU() -
+ * aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue));
*/
Logger.WARNING("=========================================================");
Logger.WARNING("tFluidAmountToUse2: " + tFluidAmountToUse2);
Logger.WARNING("=========================================================");
- /*Utils.LOG_WARNING("mFluid2.amount / tConsumed2: "+("fluidAmount2:"+mFluid2.amount)+(" tConsumed2:"+tConsumed2)+" | "+(mFluid2.amount / tConsumed2));
- Utils.LOG_WARNING("maxEUOutput() * 20 + getMinimumStoredEU(): "+(maxEUOutput() * 30 + getMinimumStoredEU()));
- Utils.LOG_WARNING("maxEUOutput(): "+maxEUOutput());
- Utils.LOG_WARNING("maxEUOutput() * 20: "+(maxEUOutput() * 30));
- Utils.LOG_WARNING("getMinimumStoredEU(): "+(getMinimumStoredEU()));
- Utils.LOG_WARNING("aBaseMetaTileEntity.getUniversalEnergyStored(): "+(aBaseMetaTileEntity.getUniversalEnergyStored()));
- Utils.LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()): "+((maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored())));
- Utils.LOG_WARNING("tFuelValue2: "+(tFuelValue2));
- Utils.LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2): "+((maxEUOutput() * 30 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2));
+ /*
+ * Utils.LOG_WARNING("mFluid2.amount / tConsumed2: "+("fluidAmount2:"+mFluid2.amount)+
+ * (" tConsumed2:"+tConsumed2)+" | "+(mFluid2.amount / tConsumed2));
+ * Utils.LOG_WARNING("maxEUOutput() * 20 + getMinimumStoredEU(): "+(maxEUOutput() * 30 +
+ * getMinimumStoredEU())); Utils.LOG_WARNING("maxEUOutput(): "+maxEUOutput());
+ * Utils.LOG_WARNING("maxEUOutput() * 20: "+(maxEUOutput() * 30));
+ * Utils.LOG_WARNING("getMinimumStoredEU(): "+(getMinimumStoredEU()));
+ * Utils.LOG_WARNING("aBaseMetaTileEntity.getUniversalEnergyStored(): "+(aBaseMetaTileEntity.
+ * getUniversalEnergyStored())); Utils.
+ * LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()): "
+ * +((maxEUOutput() * 30 + getMinimumStoredEU() -
+ * aBaseMetaTileEntity.getUniversalEnergyStored())));
+ * Utils.LOG_WARNING("tFuelValue2: "+(tFuelValue2)); Utils.
+ * LOG_WARNING("(maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2): "
+ * +((maxEUOutput() * 30 + getMinimumStoredEU() -
+ * aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue2));
*/
if (((tFluidAmountToUse > 0)
- && aBaseMetaTileEntity.increaseStoredEnergyUnits(
- tFluidAmountToUse * tFuelValue, true))
- && ((tFluidAmountToUse2 > 0)
- && aBaseMetaTileEntity.increaseStoredEnergyUnits(
- tFluidAmountToUse2 * tFuelValue2, true))) {
+ && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true))
+ && ((tFluidAmountToUse2 > 0) && aBaseMetaTileEntity
+ .increaseStoredEnergyUnits(tFluidAmountToUse2 * tFuelValue2, true))) {
Logger.WARNING("tFuelValue: " + tFuelValue);
Logger.WARNING("tConsumed: " + tConsumed);
- Logger.WARNING(
- "mFluid.name: " + this.mFluid.getFluid().getName());
+ Logger.WARNING("mFluid.name: " + this.mFluid.getFluid().getName());
Logger.WARNING("mFluid.amount: " + this.mFluid.amount);
Logger.WARNING("mFluid.amount > tConsumed: " + (this.mFluid.amount > tConsumed));
@@ -341,8 +335,7 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
Logger.WARNING("tFuelValue2: " + tFuelValue2);
Logger.WARNING("tConsumed2: " + tConsumed2);
- Logger.WARNING(
- "mFluid2.name: " + this.mFluid2.getFluid().getName());
+ Logger.WARNING("mFluid2.name: " + this.mFluid2.getFluid().getName());
Logger.WARNING("mFluid2.amount: " + this.mFluid2.amount);
Logger.WARNING("mFluid2.amount > tConsumed2: " + (this.mFluid2.amount > tConsumed2));
@@ -362,18 +355,17 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
Logger.WARNING("tFluidAmountToUse2: " + tFluidAmountToUse2);
}
} else {
- /*Utils.LOG_WARNING("(tFuelValue > 0 && tConsumed > 0 && mFluid.amount > tConsumed) && (tFuelValue2 > 0 && tConsumed2 > 0 && mFluid2.amount > tConsumed2)");
- Utils.LOG_WARNING("tFuelValue: "+tFuelValue);
- Utils.LOG_WARNING("tConsumed: "+tConsumed);
- Utils.LOG_WARNING("mFluid.amount: "+mFluid.amount);
- Utils.LOG_WARNING("mFluid.amount > tConsumed: "+(mFluid.amount > tConsumed));
-
- Utils.LOG_WARNING("=========================================================");
-
- Utils.LOG_WARNING("tFuelValue2: "+tFuelValue2);
- Utils.LOG_WARNING("tConsumed2: "+tConsumed2);
- Utils.LOG_WARNING("mFluid2.amount: "+mFluid2.amount);
- Utils.LOG_WARNING("mFluid2.amount > tConsumed2: "+(mFluid2.amount > tConsumed2)); */
+ /*
+ * Utils.
+ * LOG_WARNING("(tFuelValue > 0 && tConsumed > 0 && mFluid.amount > tConsumed) && (tFuelValue2 > 0 && tConsumed2 > 0 && mFluid2.amount > tConsumed2)"
+ * ); Utils.LOG_WARNING("tFuelValue: "+tFuelValue); Utils.LOG_WARNING("tConsumed: "+tConsumed);
+ * Utils.LOG_WARNING("mFluid.amount: "+mFluid.amount);
+ * Utils.LOG_WARNING("mFluid.amount > tConsumed: "+(mFluid.amount > tConsumed));
+ * Utils.LOG_WARNING("=========================================================");
+ * Utils.LOG_WARNING("tFuelValue2: "+tFuelValue2); Utils.LOG_WARNING("tConsumed2: "+tConsumed2);
+ * Utils.LOG_WARNING("mFluid2.amount: "+mFluid2.amount);
+ * Utils.LOG_WARNING("mFluid2.amount > tConsumed2: "+(mFluid2.amount > tConsumed2));
+ */
}
} else {
Logger.WARNING("One mFluid is null");
@@ -401,8 +393,8 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
}
if (aBaseMetaTileEntity.isServerSide()) {
- aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork()
- && (aBaseMetaTileEntity.getUniversalEnergyStored()
+ aBaseMetaTileEntity.setActive(
+ aBaseMetaTileEntity.isAllowedToWork() && (aBaseMetaTileEntity.getUniversalEnergyStored()
>= (this.maxEUOutput() + this.getMinimumStoredEU())));
}
}
@@ -425,10 +417,8 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
for (final GT_Recipe tFuel : tRecipeList) {
if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null) {
if (aLiquid.isFluidEqual(tLiquid)) {
- return (int) (((long) tFuel.mSpecialValue
- * this.getEfficiency()
- * this.consumedFluidPerOperation(tLiquid))
- / 100);
+ return (int) (((long) tFuel.mSpecialValue * this.getEfficiency()
+ * this.consumedFluidPerOperation(tLiquid)) / 100);
}
}
}
@@ -440,8 +430,8 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
if (GT_Utility.isStackInvalid(aStack) || (this.getRecipes() == null)) {
return 0;
}
- final GT_Recipe tFuel =
- this.getRecipes().findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+ final GT_Recipe tFuel = this.getRecipes()
+ .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
if (tFuel != null) {
return (int) ((tFuel.mSpecialValue * 1000L * this.getEfficiency()) / 100);
}
@@ -452,8 +442,8 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
if (GT_Utility.isStackInvalid(aStack) || (this.getRecipes() == null)) {
return null;
}
- final GT_Recipe tFuel =
- this.getRecipes().findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+ final GT_Recipe tFuel = this.getRecipes()
+ .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
if (tFuel != null) {
return GT_Utility.copy(tFuel.getOutput(0));
}
@@ -461,11 +451,10 @@ public abstract class GregtechDoubleFuelGeneratorBase extends GT_MetaTileEntity_
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
- return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)
- && ((this.getFuelValue(aStack) > 0)
- || (this.getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0));
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
+ return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack) && ((this.getFuelValue(aStack) > 0)
+ || (this.getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0));
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java
index 5d5c28e375..ddda79e51e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java
@@ -1,5 +1,14 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -12,16 +21,9 @@ import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.math.MathUtils;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidHandler;
public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank {
+
public int mTemperature = 20;
public int mProcessingEnergy = 0;
public int mLossTimer = 0;
@@ -29,33 +31,24 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
public boolean mHadNoWater = false;
public long RI = MathUtils.randLong(5L, 30L);
- public GregtechMetaBoilerBase(
- final int aID,
- final String aName,
- final String aNameRegional,
- final String aDescription,
- final ITexture... aTextures) {
+ public GregtechMetaBoilerBase(final int aID, final String aName, final String aNameRegional,
+ final String aDescription, final ITexture... aTextures) {
super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures);
}
- public GregtechMetaBoilerBase(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GregtechMetaBoilerBase(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 4, aDescription, aTextures);
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- ITexture[] tmp =
- this.mTextures[aSide >= 2 ? aSide != aFacing ? 2 : ((byte) (aActive ? 4 : 3)) : aSide][aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ ITexture[] tmp = this.mTextures[aSide >= 2 ? aSide != aFacing ? 2 : ((byte) (aActive ? 4 : 3))
+ : aSide][aColorIndex + 1];
// mTextures[(aSide==aFacing?(aActive?4:3):aSide==GT_Utility.getOppositeSide(aFacing)?2:aSide==0?0:aSide==1?1:2)][aColorIndex+1];
if ((aSide != aFacing) && (tmp.length == 2)) {
- tmp = new ITexture[] {tmp[0]};
+ tmp = new ITexture[] { tmp[0] };
}
return tmp;
}
@@ -186,8 +179,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
if (this.mSteam != null) {
try {
aNBT.setTag("mSteam", this.mSteam.writeToNBT(new NBTTagCompound()));
- } catch (final Throwable e) {
- }
+ } catch (final Throwable e) {}
}
}
@@ -215,16 +207,16 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
if (i != aBaseMetaTileEntity.getFrontFacing()) {
final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
if (tTileEntity != null) {
- final FluidStack tDrained = aBaseMetaTileEntity.drain(
- ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
+ final FluidStack tDrained = aBaseMetaTileEntity
+ .drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
if (tDrained != null) {
- final int tFilledAmount = tTileEntity.fill(
- ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
+ final int tFilledAmount = tTileEntity
+ .fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
if (tFilledAmount > 0) {
tTileEntity.fill(
ForgeDirection.getOrientation(i).getOpposite(),
- aBaseMetaTileEntity.drain(
- ForgeDirection.getOrientation(i), tFilledAmount, true),
+ aBaseMetaTileEntity
+ .drain(ForgeDirection.getOrientation(i), tFilledAmount, true),
true);
}
}
@@ -257,53 +249,60 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
this.sendSound((byte) 1);
this.mSteam.amount = getSteamCapacity() * 3 / 4;
}
- if ((this.mProcessingEnergy <= 0)
- && (aBaseMetaTileEntity.isAllowedToWork())
+ if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork())
&& (this.mInventory[2] != null)) {
- if ((GT_OreDictUnificator.isItemStackInstanceOf(
- this.mInventory[2], OrePrefixes.gem.get(Materials.Coal)))
- || (GT_OreDictUnificator.isItemStackInstanceOf(
- this.mInventory[2], OrePrefixes.dust.get(Materials.Coal)))
- || (GT_OreDictUnificator.isItemStackInstanceOf(
- this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Coal)))
- || (GT_OreDictUnificator.isItemStackInstanceOf(
- this.mInventory[2], OrePrefixes.crushed.get(Materials.Coal)))) {
- this.mProcessingEnergy += 160;
- aBaseMetaTileEntity.decrStackSize(2, 1);
- if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
- aBaseMetaTileEntity.addStackToSlot(
- 3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
- }
- } else if (GT_OreDictUnificator.isItemStackInstanceOf(
- this.mInventory[2], OrePrefixes.gem.get(Materials.Charcoal))) {
+ if ((GT_OreDictUnificator
+ .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal)))
+ || (GT_OreDictUnificator
+ .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Coal)))
+ || (GT_OreDictUnificator
+ .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Coal)))
+ || (GT_OreDictUnificator
+ .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Coal)))) {
this.mProcessingEnergy += 160;
aBaseMetaTileEntity.decrStackSize(2, 1);
if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
aBaseMetaTileEntity.addStackToSlot(
- 3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
- }
- } else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")) {
- this.mProcessingEnergy += 640;
- aBaseMetaTileEntity.decrStackSize(2, 1);
- if (aBaseMetaTileEntity.getRandomNumber(2) == 0) {
- aBaseMetaTileEntity.addStackToSlot(
- 3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
- }
- } else if ((GT_OreDictUnificator.isItemStackInstanceOf(
- this.mInventory[2], OrePrefixes.gem.get(Materials.Lignite)))
- || (GT_OreDictUnificator.isItemStackInstanceOf(
- this.mInventory[2], OrePrefixes.dust.get(Materials.Lignite)))
- || (GT_OreDictUnificator.isItemStackInstanceOf(
- this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Lignite)))
- || (GT_OreDictUnificator.isItemStackInstanceOf(
- this.mInventory[2], OrePrefixes.crushed.get(Materials.Lignite)))) {
- this.mProcessingEnergy += 40;
- aBaseMetaTileEntity.decrStackSize(2, 1);
- if (aBaseMetaTileEntity.getRandomNumber(8) == 0) {
- aBaseMetaTileEntity.addStackToSlot(
- 3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+ 3,
+ GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
}
- }
+ } else if (GT_OreDictUnificator
+ .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Charcoal))) {
+ this.mProcessingEnergy += 160;
+ aBaseMetaTileEntity.decrStackSize(2, 1);
+ if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
+ aBaseMetaTileEntity.addStackToSlot(
+ 3,
+ GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
+ }
+ } else
+ if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")) {
+ this.mProcessingEnergy += 640;
+ aBaseMetaTileEntity.decrStackSize(2, 1);
+ if (aBaseMetaTileEntity.getRandomNumber(2) == 0) {
+ aBaseMetaTileEntity.addStackToSlot(
+ 3,
+ GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
+ }
+ } else if ((GT_OreDictUnificator
+ .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Lignite)))
+ || (GT_OreDictUnificator
+ .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Lignite)))
+ || (GT_OreDictUnificator.isItemStackInstanceOf(
+ this.mInventory[2],
+ OrePrefixes.dustImpure.get(Materials.Lignite)))
+ || (GT_OreDictUnificator.isItemStackInstanceOf(
+ this.mInventory[2],
+ OrePrefixes.crushed.get(Materials.Lignite)))) {
+ this.mProcessingEnergy += 40;
+ aBaseMetaTileEntity.decrStackSize(2, 1);
+ if (aBaseMetaTileEntity.getRandomNumber(8) == 0) {
+ aBaseMetaTileEntity.addStackToSlot(
+ 3,
+ GT_OreDictUnificator
+ .get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+ }
+ }
}
if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && ((aTick % 12L) == 0L)) {
this.mProcessingEnergy -= 2;
@@ -317,20 +316,19 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
// Since this type of machine can have different water and steam capacities, we need to override getTankInfo() to
// support returning those different capacities.
public FluidTankInfo[] getTankInfo(ForgeDirection aSide) {
- return new FluidTankInfo[] {
- new FluidTankInfo(this.mFluid, getCapacity()), new FluidTankInfo(this.mSteam, getSteamCapacity())
- };
+ return new FluidTankInfo[] { new FluidTankInfo(this.mFluid, getCapacity()),
+ new FluidTankInfo(this.mSteam, getSteamCapacity()) };
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return (aIndex == 1) || (aIndex == 3);
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return aIndex == 2;
}
@@ -339,16 +337,14 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank
if (aIndex == 1) {
GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(Integer.valueOf(4)), 2, 1.0F, aX, aY, aZ);
for (int l = 0; l < 8; l++) {
- this.getBaseMetaTileEntity()
- .getWorld()
- .spawnParticle(
- "largesmoke",
- (aX - 0.5D) + Math.random(),
- aY,
- (aZ - 0.5D) + Math.random(),
- 0.0D,
- 0.0D,
- 0.0D);
+ this.getBaseMetaTileEntity().getWorld().spawnParticle(
+ "largesmoke",
+ (aX - 0.5D) + Math.random(),
+ aY,
+ (aZ - 0.5D) + Math.random(),
+ 0.0D,
+ 0.0D,
+ 0.0D);
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java
index e4a6d4bd44..f76bb372ce 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java
@@ -2,13 +2,14 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generat
import static gregtech.api.enums.GT_Values.V;
+import net.minecraft.entity.player.EntityPlayer;
+
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
import gregtech.api.util.GT_Utility;
-import net.minecraft.entity.player.EntityPlayer;
public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_BasicTank {
@@ -18,18 +19,13 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic
public int mLossTimer = 0;
public static int sEnergyPerTick = 16;
- public GregtechMetaSolarGenerator(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final ITexture... aTextures) {
+ public GregtechMetaSolarGenerator(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final String aDescription, final ITexture... aTextures) {
super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
}
- public GregtechMetaSolarGenerator(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GregtechMetaSolarGenerator(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 3, aDescription, aTextures);
}
@@ -52,26 +48,16 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, "Efficiency: " + this.getEfficiency() + "%"};
+ return new String[] { this.mDescription, "Efficiency: " + this.getEfficiency() + "%" };
}
@Override
@@ -84,23 +70,23 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getFrontActive(final byte aColor) {
@@ -165,8 +151,7 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic
@Override
public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
- if (aBaseMetaTileEntity.isServerSide()
- && aBaseMetaTileEntity.isAllowedToWork()
+ if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork()
&& (aTick > 20L)
&& (aBaseMetaTileEntity.getUniversalEnergyStored()
< (this.maxEUOutput() + aBaseMetaTileEntity.getEUCapacity()))) {
@@ -182,8 +167,7 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic
if ((aTick % 25L) == 0L) {
if (this.mSolarCharge > 100) {
- if ((this.mProcessingEnergy > 0)
- && (aBaseMetaTileEntity.isAllowedToWork())
+ if ((this.mProcessingEnergy > 0) && (aBaseMetaTileEntity.isAllowedToWork())
&& ((aTick % 256L) == 0L)
&& (!aBaseMetaTileEntity.getWorld().isThundering()
&& (aBaseMetaTileEntity.getUniversalEnergyStored()
@@ -199,21 +183,19 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic
this.mSolarCharge += 1;
}
- if ((this.mProcessingEnergy <= 0)
- && (aBaseMetaTileEntity.isAllowedToWork())
+ if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork())
&& ((aTick % 256L) == 0L)
&& (!aBaseMetaTileEntity.getWorld().isThundering())) {
- final boolean bRain =
- aBaseMetaTileEntity.getWorld().isRaining() && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F);
+ final boolean bRain = aBaseMetaTileEntity.getWorld().isRaining()
+ && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F);
this.mProcessingEnergy += (bRain && (aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4))
- || !aBaseMetaTileEntity.getSkyAtSide((byte) 1)
- ? 0
- : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
+ || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0
+ : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
}
if (aBaseMetaTileEntity.isServerSide()) {
- aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork()
- && (aBaseMetaTileEntity.getUniversalEnergyStored()
+ aBaseMetaTileEntity.setActive(
+ aBaseMetaTileEntity.isAllowedToWork() && (aBaseMetaTileEntity.getUniversalEnergyStored()
>= (this.maxEUOutput() + this.getMinimumStoredEU())));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
index db9527c144..bd88b5cb82 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
@@ -2,6 +2,13 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generat
import static gregtech.api.enums.GT_Values.V;
+import java.util.Collection;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.interfaces.ITexture;
@@ -13,24 +20,14 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import java.util.Collection;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_BasicTank {
private boolean useFuel = false;
protected int pollMin, pollMax;
- public GregtechRocketFuelGeneratorBase(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final ITexture... aTextures) {
+ public GregtechRocketFuelGeneratorBase(final int aID, final String aName, final String aNameRegional,
+ final int aTier, final String aDescription, final ITexture... aTextures) {
super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures);
pollMin = (int) (CORE.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator
* CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
@@ -38,8 +35,8 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
* CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
}
- public GregtechRocketFuelGeneratorBase(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GregtechRocketFuelGeneratorBase(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 3, aDescription, aTextures);
pollMin = (int) (CORE.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator
* CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]);
@@ -66,29 +63,18 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
@Override
public String[] getDescription() {
String aPollution = "Causes between " + pollMin + " and " + pollMax + " Pollution per second";
- return new String[] {
- this.mDescription, "Fuel Efficiency: " + this.getEfficiency() + "%", aPollution, CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Fuel Efficiency: " + this.getEfficiency() + "%", aPollution,
+ CORE.GT_Tooltip };
}
@Override
@@ -98,23 +84,23 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1] };
}
public ITexture[] getFrontActive(final byte aColor) {
@@ -217,53 +203,33 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
// super.onPostTick(aBaseMetaTileEntity, aTick);
- /*if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aTick % 10L == 0L) {
- int tFuelValue;
- if (this.mFluid == null) {
- if (aBaseMetaTileEntity.getUniversalEnergyStored() < this.maxEUOutput() + this.getMinimumStoredEU()) {
- this.mInventory[this.getStackDisplaySlot()] = null;
- } else {
- if (this.mInventory[this.getStackDisplaySlot()] == null) {
- this.mInventory[this.getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
- }
-
- this.mInventory[this.getStackDisplaySlot()].setStackDisplayName("Generating: "
- + (aBaseMetaTileEntity.getUniversalEnergyStored() - this.getMinimumStoredEU()) + " EU");
- }
- } else {
- tFuelValue = this.getFuelValue(this.mFluid);
- int tConsumed = this.consumedFluidPerOperation(this.mFluid);
- if (tFuelValue > 0 && tConsumed > 0 && this.mFluid.amount > tConsumed) {
- long tFluidAmountToUse = Math.min((long) (this.mFluid.amount / tConsumed),
- (this.maxEUStore() - aBaseMetaTileEntity.getUniversalEnergyStored()) / (long) tFuelValue);
- if (tFluidAmountToUse > 0L && aBaseMetaTileEntity
- .increaseStoredEnergyUnits(tFluidAmountToUse * (long) tFuelValue, true)) {
- PollutionUtils.addPollution(this.getBaseMetaTileEntity(), 10 * this.getPollution());
- this.mFluid.amount = (int) ((long) this.mFluid.amount - tFluidAmountToUse * (long) tConsumed);
- }
- }
- }
-
- if (this.mInventory[this.getInputSlot()] != null
- && aBaseMetaTileEntity.getUniversalEnergyStored() < this.maxEUOutput() * 20L
- + this.getMinimumStoredEU()
- && GT_Utility.getFluidForFilledItem(this.mInventory[this.getInputSlot()], true) == null) {
- tFuelValue = this.getFuelValue(this.mInventory[this.getInputSlot()]);
- if (tFuelValue > 0) {
- ItemStack tEmptyContainer = this.getEmptyContainer(this.mInventory[this.getInputSlot()]);
- if (aBaseMetaTileEntity.addStackToSlot(this.getOutputSlot(), tEmptyContainer)) {
- aBaseMetaTileEntity.increaseStoredEnergyUnits((long) tFuelValue, true);
- aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
- PollutionUtils.addPollution(this.getBaseMetaTileEntity(), 10 * this.getPollution());
- }
- }
- }
- }
-
- if (aBaseMetaTileEntity.isServerSide()) {
- aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity
- .getUniversalEnergyStored() >= this.maxEUOutput() + this.getMinimumStoredEU());
- }*/
+ /*
+ * if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aTick % 10L == 0L) { int
+ * tFuelValue; if (this.mFluid == null) { if (aBaseMetaTileEntity.getUniversalEnergyStored() <
+ * this.maxEUOutput() + this.getMinimumStoredEU()) { this.mInventory[this.getStackDisplaySlot()] = null; } else
+ * { if (this.mInventory[this.getStackDisplaySlot()] == null) { this.mInventory[this.getStackDisplaySlot()] =
+ * new ItemStack(Blocks.fire, 1); }
+ * this.mInventory[this.getStackDisplaySlot()].setStackDisplayName("Generating: " +
+ * (aBaseMetaTileEntity.getUniversalEnergyStored() - this.getMinimumStoredEU()) + " EU"); } } else { tFuelValue
+ * = this.getFuelValue(this.mFluid); int tConsumed = this.consumedFluidPerOperation(this.mFluid); if (tFuelValue
+ * > 0 && tConsumed > 0 && this.mFluid.amount > tConsumed) { long tFluidAmountToUse = Math.min((long)
+ * (this.mFluid.amount / tConsumed), (this.maxEUStore() - aBaseMetaTileEntity.getUniversalEnergyStored()) /
+ * (long) tFuelValue); if (tFluidAmountToUse > 0L && aBaseMetaTileEntity
+ * .increaseStoredEnergyUnits(tFluidAmountToUse * (long) tFuelValue, true)) {
+ * PollutionUtils.addPollution(this.getBaseMetaTileEntity(), 10 * this.getPollution()); this.mFluid.amount =
+ * (int) ((long) this.mFluid.amount - tFluidAmountToUse * (long) tConsumed); } } } if
+ * (this.mInventory[this.getInputSlot()] != null && aBaseMetaTileEntity.getUniversalEnergyStored() <
+ * this.maxEUOutput() * 20L + this.getMinimumStoredEU() &&
+ * GT_Utility.getFluidForFilledItem(this.mInventory[this.getInputSlot()], true) == null) { tFuelValue =
+ * this.getFuelValue(this.mInventory[this.getInputSlot()]); if (tFuelValue > 0) { ItemStack tEmptyContainer =
+ * this.getEmptyContainer(this.mInventory[this.getInputSlot()]); if
+ * (aBaseMetaTileEntity.addStackToSlot(this.getOutputSlot(), tEmptyContainer)) {
+ * aBaseMetaTileEntity.increaseStoredEnergyUnits((long) tFuelValue, true);
+ * aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1);
+ * PollutionUtils.addPollution(this.getBaseMetaTileEntity(), 10 * this.getPollution()); } } } } if
+ * (aBaseMetaTileEntity.isServerSide()) { aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork() &&
+ * aBaseMetaTileEntity .getUniversalEnergyStored() >= this.maxEUOutput() + this.getMinimumStoredEU()); }
+ */
if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && ((aTick % 10) == 0)) {
if (this.mFluid == null) {
@@ -273,8 +239,10 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
if (this.mInventory[this.getStackDisplaySlot()] == null) {
this.mInventory[this.getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
}
- this.mInventory[this.getStackDisplaySlot()].setStackDisplayName("Generating: "
- + (aBaseMetaTileEntity.getUniversalEnergyStored() - this.getMinimumStoredEU()) + " EU");
+ this.mInventory[this.getStackDisplaySlot()].setStackDisplayName(
+ "Generating: "
+ + (aBaseMetaTileEntity.getUniversalEnergyStored() - this.getMinimumStoredEU())
+ + " EU");
}
} else {
final int tFuelValue = this.getFuelValue(this.mFluid),
@@ -283,8 +251,7 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
final long tFluidAmountToUse = Math.min(
this.mFluid.amount / tConsumed,
(((this.maxEUOutput() * 20) + this.getMinimumStoredEU())
- - aBaseMetaTileEntity.getUniversalEnergyStored())
- / tFuelValue);
+ - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue);
if ((tFluidAmountToUse > 0)
&& aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) {
int aSafeFloor = (int) Math.max(((tFluidAmountToUse * tConsumed) / 3), 1);
@@ -310,8 +277,8 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
}
if (aBaseMetaTileEntity.isServerSide()) {
- aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork()
- && (aBaseMetaTileEntity.getUniversalEnergyStored()
+ aBaseMetaTileEntity.setActive(
+ aBaseMetaTileEntity.isAllowedToWork() && (aBaseMetaTileEntity.getUniversalEnergyStored()
>= (this.maxEUOutput() + this.getMinimumStoredEU())));
}
}
@@ -361,8 +328,8 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
if (GT_Utility.isStackInvalid(aStack) || (this.getRecipes() == null)) {
return 0;
}
- final GT_Recipe tFuel =
- this.getRecipes().findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+ final GT_Recipe tFuel = this.getRecipes()
+ .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
if (tFuel != null) {
return (int) ((tFuel.mSpecialValue * 1000L * this.getEfficiency()) / 100);
}
@@ -373,8 +340,8 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
if (GT_Utility.isStackInvalid(aStack) || (this.getRecipes() == null)) {
return null;
}
- final GT_Recipe tFuel =
- this.getRecipes().findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
+ final GT_Recipe tFuel = this.getRecipes()
+ .findRecipe(this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, null, aStack);
if (tFuel != null) {
return GT_Utility.copy(tFuel.getOutput(0));
}
@@ -382,11 +349,10 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
- return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)
- && ((this.getFuelValue(aStack) > 0)
- || (this.getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0));
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
+ return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack) && ((this.getFuelValue(aStack) > 0)
+ || (this.getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0));
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
index 5ad0a611a5..efd2a123db 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
@@ -2,6 +2,12 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machine
import static gregtech.api.enums.GT_Values.V;
+import java.util.UUID;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.interfaces.ITexture;
@@ -12,68 +18,75 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.player.PlayerCache;
-import java.util.UUID;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_TieredMachineBlock {
+
public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bUnbreakable = false;
public int mSuccess = 0, mTargetStackSize = 0;
public UUID ownerUUID;
// UnbreakableBlockManager Xasda = new UnbreakableBlockManager();
private boolean value_last = false, value_current = false;
- public GregtechMetaSafeBlockBase(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription) {
+ public GregtechMetaSafeBlockBase(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final int aInvSlotCount, final String aDescription) {
super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
}
- public GregtechMetaSafeBlockBase(
- final String aName,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription,
- final ITexture[][][] aTextures) {
+ public GregtechMetaSafeBlockBase(final String aName, final int aTier, final int aInvSlotCount,
+ final String aDescription, final ITexture[][][] aTextures) {
super(aName, aTier, aInvSlotCount, aDescription, aTextures);
}
@Override
public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
final ITexture[][][] rTextures = new ITexture[6][17][];
- final ITexture tIcon = this.getOverlayIcon(),
- tOut = new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_QCHEST),
+ final ITexture tIcon = this.getOverlayIcon(), tOut = new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_QCHEST),
tUp = new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT);
for (byte i = -1; i < 16; i++) {
- rTextures[0][i + 1] =
- new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tUp, tIcon}; // Back
- rTextures[1][i + 1] = new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tIcon
- }; // Right, Strangely The top side as well when facing East?
- rTextures[2][i + 1] = new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tIcon
- }; // Top And Bottom, When Facing South (What the hell?)
- rTextures[3][i + 1] = new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tIcon
- }; // Left, Top if facing West and Bottom if facing east?
- rTextures[4][i + 1] = new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tIcon
- }; // Top and Bottom when Facing North..
- rTextures[5][i + 1] =
- new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tOut}; // Front
+ rTextures[0][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tUp, tIcon }; // Back
+ rTextures[1][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tIcon }; // Right,
+ // Strangely
+ // The
+ // top
+ // side
+ // as
+ // well
+ // when
+ // facing
+ // East?
+ rTextures[2][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tIcon }; // Top
+ // And
+ // Bottom,
+ // When
+ // Facing
+ // South
+ // (What
+ // the
+ // hell?)
+ rTextures[3][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tIcon }; // Left,
+ // Top
+ // if
+ // facing
+ // West
+ // and
+ // Bottom
+ // if
+ // facing
+ // east?
+ rTextures[4][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tIcon }; // Top
+ // and
+ // Bottom
+ // when
+ // Facing
+ // North..
+ rTextures[5][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tOut }; // Front
}
return rTextures;
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == aFacing) {
return this.mTextures[5][aColorIndex + 1];
}
@@ -219,16 +232,19 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
}
if (aPlayer != null) {
final UUID tempUUID = aPlayer.getUniqueID();
- /*if (!aPlayer.worldObj.isRemote){
- //PlayerCache.appendParamChanges(aPlayer.getDisplayName(), aPlayer.getUniqueID().toString());
- }*/
+ /*
+ * if (!aPlayer.worldObj.isRemote){ //PlayerCache.appendParamChanges(aPlayer.getDisplayName(),
+ * aPlayer.getUniqueID().toString()); }
+ */
// Utils.LOG_INFO("test");
if (this.ownerUUID == null) {
Logger.INFO("No owner yet for this block.");
} else {
// Utils.LOG_INFO("test");
- Logger.INFO("Current Owner: " + PlayerCache.lookupPlayerByUUID(this.ownerUUID) + " - UUID: "
- + this.ownerUUID);
+ Logger.INFO(
+ "Current Owner: " + PlayerCache.lookupPlayerByUUID(this.ownerUUID)
+ + " - UUID: "
+ + this.ownerUUID);
}
Logger.WARNING("Is ownerUUID Null");
if (this.ownerUUID == null) {
@@ -250,19 +266,21 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
} else {
PlayerUtils.messagePlayer(aPlayer, "Access Denied, This does not belong to you.");
PlayerUtils.messagePlayer(
- aPlayer, "it is owned by: " + PlayerCache.lookupPlayerByUUID(this.ownerUUID));
+ aPlayer,
+ "it is owned by: " + PlayerCache.lookupPlayerByUUID(this.ownerUUID));
Logger.WARNING("Expecting Player : " + PlayerCache.lookupPlayerByUUID(this.ownerUUID));
Logger.ERROR("Access Denied.");
return true;
}
}
- /*else {
- Utils.LOG_ERROR("This is NOT good. Tell Draknyte1 your safe broke.");
- }*/
- /*Utils.LOG_WARNING("Clicky Clicky.");
- Utils.messagePlayer(aPlayer, "Owner of this safe, now set.");
- aBaseMetaTileEntity.openGUI(aPlayer); */
+ /*
+ * else { Utils.LOG_ERROR("This is NOT good. Tell Draknyte1 your safe broke."); }
+ */
+ /*
+ * Utils.LOG_WARNING("Clicky Clicky."); Utils.messagePlayer(aPlayer, "Owner of this safe, now set.");
+ * aBaseMetaTileEntity.openGUI(aPlayer);
+ */
}
return true;
@@ -299,14 +317,14 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return aSide != aBaseMetaTileEntity.getBackFacing();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java
index 39d61acebc..01a5c38aef 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java
@@ -1,34 +1,27 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
public abstract class GregtechMetaTreeFarmerBase extends GT_MetaTileEntity_TieredMachineBlock {
+
public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bUnbreakable = false;
public int mSuccess = 0, mTargetStackSize = 0;
- public GregtechMetaTreeFarmerBase(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription) {
+ public GregtechMetaTreeFarmerBase(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final int aInvSlotCount, final String aDescription) {
super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
}
- public GregtechMetaTreeFarmerBase(
- final String aName,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription,
- final ITexture[][][] aTextures) {
+ public GregtechMetaTreeFarmerBase(final String aName, final int aTier, final int aInvSlotCount,
+ final String aDescription, final ITexture[][][] aTextures) {
super(aName, aTier, aInvSlotCount, aDescription, aTextures);
}
@@ -51,21 +44,11 @@ public abstract class GregtechMetaTreeFarmerBase extends GT_MetaTileEntity_Tiere
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
@Override
@@ -146,35 +129,35 @@ public abstract class GregtechMetaTreeFarmerBase extends GT_MetaTileEntity_Tiere
public abstract ITexture getOverlayIcon();
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Podzol)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Podzol) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager) };
}
public ITexture[] getFrontActive(final byte aColor) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
index 46666114c1..77fc114b02 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
@@ -1,12 +1,13 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.objects.GT_RenderedTexture;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_NbtConsumable {
@@ -24,17 +25,17 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst) };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst) };
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, CORE.GT_Tooltip};
+ return new String[] { this.mDescription, CORE.GT_Tooltip };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
index 265088a9e0..e73a70d1eb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
@@ -1,12 +1,13 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.objects.GT_RenderedTexture;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatch_NbtConsumable {
@@ -24,17 +25,17 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc
@Override
public ITexture[] getTexturesActive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls) };
}
@Override
public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
- return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls)};
+ return new ITexture[] { aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls) };
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, CORE.GT_Tooltip};
+ return new String[] { this.mDescription, CORE.GT_Tooltip };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java
index 552386e72c..5bfe3f21f6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java
@@ -1,10 +1,16 @@
package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
+import java.lang.reflect.Constructor;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.SlotGroup;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.modularui.IAddGregtechLogo;
@@ -18,9 +24,6 @@ import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
-import java.lang.reflect.Constructor;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileEntity_Hatch
implements IAddGregtechLogo {
@@ -30,40 +33,24 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
private final int mTotalSlotCount;
private final boolean mAllowDuplicateUsageTypes;
- public GT_MetaTileEntity_Hatch_NbtConsumable(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- int aInputSlots,
- String aDescription,
- boolean aAllowDuplicateTypes) {
+ public GT_MetaTileEntity_Hatch_NbtConsumable(int aID, String aName, String aNameRegional, int aTier,
+ int aInputSlots, String aDescription, boolean aAllowDuplicateTypes) {
super(aID, aName, aNameRegional, aTier, aInputSlots * 2, aDescription);
mInputslotCount = getInputSlotCount();
mTotalSlotCount = getInputSlotCount() * 2;
mAllowDuplicateUsageTypes = aAllowDuplicateTypes;
}
- public GT_MetaTileEntity_Hatch_NbtConsumable(
- String aName,
- int aTier,
- int aInputSlots,
- String aDescription,
- boolean aAllowDuplicateTypes,
- ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_NbtConsumable(String aName, int aTier, int aInputSlots, String aDescription,
+ boolean aAllowDuplicateTypes, ITexture[][][] aTextures) {
super(aName, aTier, aInputSlots * 2, aDescription, aTextures);
mInputslotCount = getInputSlotCount();
mTotalSlotCount = getInputSlotCount() * 2;
mAllowDuplicateUsageTypes = aAllowDuplicateTypes;
}
- public GT_MetaTileEntity_Hatch_NbtConsumable(
- String aName,
- int aTier,
- int aInputSlots,
- String[] aDescription,
- boolean aAllowDuplicateTypes,
- ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Hatch_NbtConsumable(String aName, int aTier, int aInputSlots, String[] aDescription,
+ boolean aAllowDuplicateTypes, ITexture[][][] aTextures) {
super(aName, aTier, aInputSlots * 2, aDescription, aTextures);
mInputslotCount = getInputSlotCount();
mTotalSlotCount = getInputSlotCount() * 2;
@@ -101,9 +88,11 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
@Override
public final MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
Constructor<?> aConstructor = ReflectionUtils.getConstructor(
- getHatchEntityClass(), new Class[] {String.class, String[].class, ITexture[][][].class});
+ getHatchEntityClass(),
+ new Class[] { String.class, String[].class, ITexture[][][].class });
GT_MetaTileEntity_Hatch_NbtConsumable aInstance = ReflectionUtils.createNewInstanceFromConstructor(
- aConstructor, new Object[] {mName, StaticFields59.getDescriptionArray(this), mTextures});
+ aConstructor,
+ new Object[] { mName, StaticFields59.getDescriptionArray(this), mTextures });
if (aInstance instanceof GT_MetaTileEntity_Hatch_NbtConsumable) {
GT_MetaTileEntity_Hatch_NbtConsumable aMetaTile = (GT_MetaTileEntity_Hatch_NbtConsumable) aInstance;
return aMetaTile;
@@ -269,29 +258,30 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
}
@Override
- public final boolean allowPullStack(
- IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+ public final boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide,
+ ItemStack aStack) {
return false;
}
@Override
- public final boolean allowPutStack(
- IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
- return aSide == getBaseMetaTileEntity().getFrontFacing()
- && isItemValidForUsageSlot(aStack)
+ public final boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide,
+ ItemStack aStack) {
+ return aSide == getBaseMetaTileEntity().getFrontFacing() && isItemValidForUsageSlot(aStack)
&& aIndex < mInputslotCount;
}
/**
- * Items that get compared when checking for Usage Slot validity.
- * Can return an empty map if isItemValidForUsageSlot() is overridden.
+ * Items that get compared when checking for Usage Slot validity. Can return an empty map if
+ * isItemValidForUsageSlot() is overridden.
+ *
* @return
*/
public abstract AutoMap<ItemStack> getItemsValidForUsageSlots();
/**
- * Checks if the given item is valid for Usage Slots.
- * Can be overridden for easier handling if you already have methods to check this.
+ * Checks if the given item is valid for Usage Slots. Can be overridden for easier handling if you already have
+ * methods to check this.
+ *
* @param aStack
* @return
*/
@@ -316,16 +306,14 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
switch (mTotalSlotCount) {
case 8:
case 18:
- builder.widget(new DrawableWidget()
- .setDrawable(getGUITextureSet().getGregTechLogo())
- .setSize(17, 17)
- .setPos(152, 63));
+ builder.widget(
+ new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17)
+ .setPos(152, 63));
break;
case 32:
- builder.widget(new DrawableWidget()
- .setDrawable(getGUITextureSet().getGregTechLogo())
- .setSize(17, 17)
- .setPos(79, 35));
+ builder.widget(
+ new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17)
+ .setPos(79, 35));
break;
}
}
@@ -334,55 +322,32 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
switch (mTotalSlotCount) {
case 8:
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 2)
- .startFromSlot(0)
- .endAtSlot(3)
- .build()
- .setPos(25, 25));
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 2)
- .startFromSlot(4)
- .endAtSlot(7)
- .canInsert(false)
- .build()
- .setPos(115, 25));
- builder.widget(new TextWidget("Stock")
- .setDefaultColor(COLOR_TEXT_GRAY.get())
- .setPos(25, 16))
- .widget(new TextWidget("Active")
- .setDefaultColor(COLOR_TEXT_GRAY.get())
- .setPos(115, 16));
+ builder.widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 2).startFromSlot(0).endAtSlot(3).build()
+ .setPos(25, 25));
+ builder.widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 2).startFromSlot(4).endAtSlot(7).canInsert(false)
+ .build().setPos(115, 25));
+ builder.widget(new TextWidget("Stock").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(25, 16))
+ .widget(new TextWidget("Active").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(115, 16));
break;
case 18:
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 3)
- .startFromSlot(0)
- .endAtSlot(8)
- .build()
- .setPos(25, 19));
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 3)
- .startFromSlot(9)
- .endAtSlot(17)
- .canInsert(false)
- .build()
- .setPos(97, 19));
- builder.widget(new TextWidget("Stock")
- .setDefaultColor(COLOR_TEXT_GRAY.get())
- .setPos(25, 14))
- .widget(new TextWidget("Active")
- .setDefaultColor(COLOR_TEXT_GRAY.get())
- .setPos(15, 14));
+ builder.widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(0).endAtSlot(8).build()
+ .setPos(25, 19));
+ builder.widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(9).endAtSlot(17).canInsert(false)
+ .build().setPos(97, 19));
+ builder.widget(new TextWidget("Stock").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(25, 14))
+ .widget(new TextWidget("Active").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(15, 14));
break;
case 32:
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 4)
- .startFromSlot(0)
- .endAtSlot(15)
- .build()
- .setPos(7, 7));
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 4)
- .startFromSlot(16)
- .endAtSlot(31)
- .canInsert(false)
- .build()
- .setPos(96, 7));
+ builder.widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(0).endAtSlot(15).build()
+ .setPos(7, 7));
+ builder.widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(16).endAtSlot(31).canInsert(false)
+ .build().setPos(96, 7));
break;
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
index 5336b60fc7..6a780d227c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
@@ -1,11 +1,13 @@
package gtPlusPlus.xmod.gregtech.api.objects;
+import net.minecraft.block.Block;
+
import gregtech.api.enums.Dyes;
import gregtech.api.objects.GT_CopiedBlockTexture;
-import net.minecraft.block.Block;
/**
* Made this to get rid of deprecation warnings <i>everywhere</i>.
+ *
* @author Alkalus
*
*/
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
index 6764a1e206..0da0136193 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
@@ -6,6 +6,7 @@ import gregtech.api.objects.GT_RenderedTexture;
/**
* Made this to get rid of deprecation warnings <i>everywhere</i>.
+ *
* @author Alkalus
*
*/
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java
index 40699aa108..32783ec437 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java
@@ -1,10 +1,12 @@
package gtPlusPlus.xmod.gregtech.api.objects;
+import net.minecraftforge.fluids.Fluid;
+
import gregtech.api.GregTech_API;
import gtPlusPlus.core.lib.CORE;
-import net.minecraftforge.fluids.Fluid;
public class GregtechFluid extends Fluid implements Runnable {
+
public final String mTextureName;
private final short[] mRGBa;
@@ -17,8 +19,7 @@ public class GregtechFluid 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)
+ 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]));
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
index a26cfbb192..787299ef6b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
@@ -1,12 +1,15 @@
package gtPlusPlus.xmod.gregtech.api.objects;
+import java.util.*;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.objects.GT_ArrayList;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import java.util.*;
-import net.minecraft.item.ItemStack;
public class GregtechItemData {
+
private static final GregtechMaterialStack[] EMPTY_GT_MaterialStack_ARRAY = new GregtechMaterialStack[0];
public final List<Object> mExtraData = new GT_ArrayList<>(false, 1);
@@ -16,14 +19,14 @@ public class GregtechItemData {
public boolean mBlackListed = false;
public ItemStack mUnificationTarget = null;
- public GregtechItemData(
- final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final boolean aBlackListed) {
+ public GregtechItemData(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial,
+ final boolean aBlackListed) {
this.mPrefix = aPrefix;
this.mMaterial = aMaterial == null ? null : new GregtechMaterialStack(aMaterial, aPrefix.mMaterialAmount);
this.mBlackListed = aBlackListed;
this.mByProducts = (aPrefix.mSecondaryMaterial == null) || (aPrefix.mSecondaryMaterial.mMaterial == null)
? EMPTY_GT_MaterialStack_ARRAY
- : new GregtechMaterialStack[] {aPrefix.mSecondaryMaterial.clone()};
+ : new GregtechMaterialStack[] { aPrefix.mSecondaryMaterial.clone() };
}
public GregtechItemData(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial) {
@@ -37,8 +40,7 @@ public class GregtechItemData {
if (aByProducts == null) {
this.mByProducts = EMPTY_GT_MaterialStack_ARRAY;
} else {
- final GregtechMaterialStack[] tByProducts = aByProducts.length < 1
- ? EMPTY_GT_MaterialStack_ARRAY
+ final GregtechMaterialStack[] tByProducts = aByProducts.length < 1 ? EMPTY_GT_MaterialStack_ARRAY
: new GregtechMaterialStack[aByProducts.length];
int j = 0;
for (int i = 0; i < aByProducts.length; i++) {
@@ -53,15 +55,12 @@ public class GregtechItemData {
}
}
- public GregtechItemData(
- final GT_Materials aMaterial, final long aAmount, final GregtechMaterialStack... aByProducts) {
+ public GregtechItemData(final GT_Materials aMaterial, final long aAmount,
+ final GregtechMaterialStack... aByProducts) {
this(new GregtechMaterialStack(aMaterial, aAmount), aByProducts);
}
- public GregtechItemData(
- final GT_Materials aMaterial,
- final long aAmount,
- final GT_Materials aByProduct,
+ public GregtechItemData(final GT_Materials aMaterial, final long aAmount, final GT_Materials aByProduct,
final long aByProductAmount) {
this(new GregtechMaterialStack(aMaterial, aAmount), new GregtechMaterialStack(aByProduct, aByProductAmount));
}
@@ -100,6 +99,7 @@ public class GregtechItemData {
}
Collections.sort(rList, new Comparator<GregtechMaterialStack>() {
+
@Override
public int compare(final GregtechMaterialStack a, final GregtechMaterialStack b) {
return a.mAmount == b.mAmount ? 0 : a.mAmount > b.mAmount ? -1 : +1;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
index 107202a027..5ffdc4d20e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.api.objects;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
public class GregtechMaterialStack implements Cloneable {
+
public long mAmount;
public GT_Materials mMaterial;
@@ -33,8 +34,7 @@ public class GregtechMaterialStack implements Cloneable {
}
if (aObject instanceof GregtechMaterialStack) {
return (((GregtechMaterialStack) aObject).mMaterial == this.mMaterial)
- && ((this.mAmount < 0)
- || (((GregtechMaterialStack) aObject).mAmount < 0)
+ && ((this.mAmount < 0) || (((GregtechMaterialStack) aObject).mAmount < 0)
|| (((GregtechMaterialStack) aObject).mAmount == this.mAmount));
}
return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java
index ce73d1495f..7f2fda6dd8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java
@@ -1,32 +1,26 @@
package gtPlusPlus.xmod.gregtech.api.recipe;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.interfaces.IOreRecipeRegistrator;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import net.minecraft.item.ItemStack;
public class ProcessingSkookumChoocherToolRecipes implements IOreRecipeRegistrator {
+
public ProcessingSkookumChoocherToolRecipes() {
// GregtechOrePrefixes.toolSkookumChoocher.add(this);
}
@Override
- public void registerOre(
- final OrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
GT_ModHandler.addShapelessCraftingRecipe(
MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(7734, 1, aMaterial, aMaterial, null),
- new Object[] {
- aOreDictName,
- OrePrefixes.stick.get(aMaterial),
- OrePrefixes.screw.get(aMaterial),
- ToolDictNames.craftingToolScrewdriver
- });
+ new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial), OrePrefixes.screw.get(aMaterial),
+ ToolDictNames.craftingToolScrewdriver });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java
index ee4892e11a..cffeb41776 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java
@@ -2,14 +2,16 @@ package gtPlusPlus.xmod.gregtech.api.util;
import static gregtech.api.enums.GT_Values.E;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
+import gregtech.api.GregTech_API;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+
public class GTPP_Config implements Runnable {
+
public static boolean troll = false;
public static Configuration sConfigFileIDs;
@@ -23,8 +25,8 @@ public class GTPP_Config implements Runnable {
public static int addIDConfig(Object aCategory, String aName, int aDefault) {
if (GT_Utility.isStringInvalid(aName)) return aDefault;
- Property tProperty =
- sConfigFileIDs.get(aCategory.toString().replaceAll("\\|", "."), aName.replaceAll("\\|", "."), aDefault);
+ Property tProperty = sConfigFileIDs
+ .get(aCategory.toString().replaceAll("\\|", "."), aName.replaceAll("\\|", "."), aDefault);
int rResult = tProperty.getInt(aDefault);
if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) sConfigFileIDs.save();
return rResult;
@@ -37,7 +39,7 @@ public class GTPP_Config implements Runnable {
try {
if (GT_Utility.isStringValid(rName = aStack.getUnlocalizedName())) return rName.toString();
} catch (Throwable e) {
- /*Do nothing*/
+ /* Do nothing */
}
String sName = aStack.getItem().toString();
String[] tmp = sName.split("@");
@@ -53,7 +55,9 @@ public class GTPP_Config implements Runnable {
public boolean get(Object aCategory, String aName, boolean aDefault) {
if (GT_Utility.isStringInvalid(aName)) return aDefault;
Property tProperty = mConfig.get(
- aCategory.toString().replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault);
+ aCategory.toString().replaceAll("\\|", "_"),
+ (aName + "_" + aDefault).replaceAll("\\|", "_"),
+ aDefault);
boolean rResult = tProperty.getBoolean(aDefault);
if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
return rResult;
@@ -66,7 +70,9 @@ public class GTPP_Config implements Runnable {
public int get(Object aCategory, String aName, int aDefault) {
if (GT_Utility.isStringInvalid(aName)) return aDefault;
Property tProperty = mConfig.get(
- aCategory.toString().replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault);
+ aCategory.toString().replaceAll("\\|", "_"),
+ (aName + "_" + aDefault).replaceAll("\\|", "_"),
+ aDefault);
int rResult = tProperty.getInt(aDefault);
if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
return rResult;
@@ -79,7 +85,9 @@ public class GTPP_Config implements Runnable {
public double get(Object aCategory, String aName, double aDefault) {
if (GT_Utility.isStringInvalid(aName)) return aDefault;
Property tProperty = mConfig.get(
- aCategory.toString().replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault);
+ aCategory.toString().replaceAll("\\|", "_"),
+ (aName + "_" + aDefault).replaceAll("\\|", "_"),
+ aDefault);
double rResult = tProperty.getDouble(aDefault);
if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
return rResult;
@@ -92,7 +100,9 @@ public class GTPP_Config implements Runnable {
public String get(Object aCategory, String aName, String aDefault) {
if (GT_Utility.isStringInvalid(aName)) return aDefault;
Property tProperty = mConfig.get(
- aCategory.toString().replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault);
+ aCategory.toString().replaceAll("\\|", "_"),
+ (aName + "_" + aDefault).replaceAll("\\|", "_"),
+ aDefault);
String rResult = tProperty.getString();
if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save();
return rResult;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java
index c5671b88b9..52950e1ae0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java
@@ -2,6 +2,16 @@ package gtPlusPlus.xmod.gregtech.api.util;
import static gregtech.api.enums.GT_Values.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.Materials;
@@ -14,21 +24,12 @@ import gregtech.api.objects.MaterialStack;
import gregtech.api.util.*;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
public class GregtechOreDictUnificator {
private static final Map<String, ItemStack> sName2StackMap = new HashMap<String, ItemStack>();
private static final Map<GT_ItemStack, ItemData> sItemStack2DataMap = new HashMap<GT_ItemStack, ItemData>();
- private static final Map<GT_ItemStack, List<ItemStack>> sUnificationTable =
- new HashMap<GT_ItemStack, List<ItemStack>>();
+ private static final Map<GT_ItemStack, List<ItemStack>> sUnificationTable = new HashMap<GT_ItemStack, List<ItemStack>>();
private static final GT_HashSet<GT_ItemStack> sNoUnificationList = new GT_HashSet<GT_ItemStack>();
private static int isRegisteringOre = 0, isAddingOre = 0;
@@ -41,8 +42,8 @@ public class GregtechOreDictUnificator {
}
/**
- * The Blacklist just prevents the Item from being unificated into something else.
- * Useful if you have things like the Industrial Diamond, which is better than regular Diamond, but also usable in absolutely all Diamond Recipes.
+ * The Blacklist just prevents the Item from being unificated into something else. Useful if you have things like
+ * the Industrial Diamond, which is better than regular Diamond, but also usable in absolutely all Diamond Recipes.
*/
public static void addToBlacklist(ItemStack aStack) {
if (GT_Utility.isStackValid(aStack) && !GT_Utility.isStackInList(aStack, sNoUnificationList))
@@ -61,23 +62,17 @@ public class GregtechOreDictUnificator {
set(aPrefix, aMaterial, aStack, true, false);
}
- public static void set(
- OrePrefixes aPrefix,
- Materials aMaterial,
- ItemStack aStack,
- boolean aOverwrite,
+ public static void set(OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack, boolean aOverwrite,
boolean aAlreadyRegistered) {
- if (aMaterial == null
- || aPrefix == null
+ if (aMaterial == null || aPrefix == null
|| GT_Utility.isStackInvalid(aStack)
- || Items.feather.getDamage(aStack) == W) return;
+ || Items.feather.getDamage(aStack) == W)
+ return;
isAddingOre++;
aStack = GT_Utility.copyAmount(1, aStack);
if (!aAlreadyRegistered) registerOre(aPrefix.get(aMaterial), aStack);
addAssociation(aPrefix, aMaterial, aStack, isBlacklisted(aStack));
- if (aOverwrite
- || GT_Utility.isStackInvalid(
- sName2StackMap.get(aPrefix.get(aMaterial).toString())))
+ if (aOverwrite || GT_Utility.isStackInvalid(sName2StackMap.get(aPrefix.get(aMaterial).toString())))
sName2StackMap.put(aPrefix.get(aMaterial).toString(), aStack);
isAddingOre--;
}
@@ -105,21 +100,18 @@ public class GregtechOreDictUnificator {
// if (Materials.mDefaultComponents.contains(aPrefix) && !aPrefix.mDynamicItems.contains((Materials)aMaterial))
// aPrefix.mDynamicItems.add((Materials) aMaterial);
if (StaticFields59.geOrePrefixesBooleanPreventableComponents().contains(aPrefix)
- && StaticFields59.getOrePrefixesBooleanDisabledItems().contains(aMaterial)) return aReplacement;
+ && StaticFields59.getOrePrefixesBooleanDisabledItems().contains(aMaterial))
+ return aReplacement;
return get(aPrefix.get(aMaterial), aReplacement, aAmount, false, true);
}
- public static ItemStack get(
- Object aName,
- ItemStack aReplacement,
- long aAmount,
- boolean aMentionPossibleTypos,
+ public static ItemStack get(Object aName, ItemStack aReplacement, long aAmount, boolean aMentionPossibleTypos,
boolean aNoInvalidAmounts) {
if (aNoInvalidAmounts && aAmount < 1) return null;
if (!sName2StackMap.containsKey(aName.toString()) && aMentionPossibleTypos)
GT_Log.err.println("Unknown Key for Unification, Typo? " + aName);
- return GT_Utility.copyAmount(
- aAmount, sName2StackMap.get(aName.toString()), getFirstOre(aName, aAmount), aReplacement);
+ return GT_Utility
+ .copyAmount(aAmount, sName2StackMap.get(aName.toString()), getFirstOre(aName, aAmount), aReplacement);
}
public static ItemStack[] setStackArray(boolean aUseBlackList, ItemStack... aStacks) {
@@ -158,9 +150,9 @@ public class GregtechOreDictUnificator {
if (GT_Utility.isStackInvalid(aStack)) return null;
ItemData tPrefixMaterial = getAssociation(aStack);
ItemStack rStack = null;
- if (tPrefixMaterial == null
- || !tPrefixMaterial.hasValidPrefixMaterialData()
- || (aUseBlackList && tPrefixMaterial.mBlackListed)) return GT_Utility.copy(aStack);
+ if (tPrefixMaterial == null || !tPrefixMaterial.hasValidPrefixMaterialData()
+ || (aUseBlackList && tPrefixMaterial.mBlackListed))
+ return GT_Utility.copy(aStack);
if (aUseBlackList && !GregTech_API.sUnificationEntriesRegistered && isBlacklisted(aStack)) {
tPrefixMaterial.mBlackListed = true;
return GT_Utility.copy(aStack);
@@ -192,7 +184,7 @@ public class GregtechOreDictUnificator {
}
}
ItemStack[] aStacks = {};
- if (obj instanceof ItemStack) aStacks = new ItemStack[] {(ItemStack) obj};
+ if (obj instanceof ItemStack) aStacks = new ItemStack[] { (ItemStack) obj };
else if (obj instanceof ItemStack[]) aStacks = (ItemStack[]) obj;
else if (obj instanceof List) aStacks = (ItemStack[]) ((List) obj).toArray(new ItemStack[0]);
List<ItemStack> rList = new ArrayList<ItemStack>();
@@ -218,9 +210,8 @@ public class GregtechOreDictUnificator {
if (GT_Utility.isStackInvalid(aStack) || aData == null) return;
ItemData tData = getItemData(aStack);
if (tData == null || !tData.hasValidPrefixMaterialData()) {
- if (tData != null)
- for (Object tObject : tData.mExtraData)
- if (!aData.mExtraData.contains(tObject)) aData.mExtraData.add(tObject);
+ if (tData != null) for (Object tObject : tData.mExtraData)
+ if (!aData.mExtraData.contains(tObject)) aData.mExtraData.add(tObject);
if (aStack.stackSize > 1) {
if (aData.mMaterial != null) aData.mMaterial.mAmount /= aStack.stackSize;
for (MaterialStack tMaterial : aData.mByProducts) tMaterial.mAmount /= aStack.stackSize;
@@ -228,12 +219,10 @@ public class GregtechOreDictUnificator {
}
sItemStack2DataMap.put(new GT_ItemStack(aStack), aData);
if (aData.hasValidMaterialData()) {
- long tValidMaterialAmount = aData.mMaterial.mMaterial.contains(SubTag.NO_RECYCLING)
- ? 0
+ long tValidMaterialAmount = aData.mMaterial.mMaterial.contains(SubTag.NO_RECYCLING) ? 0
: aData.mMaterial.mAmount >= 0 ? aData.mMaterial.mAmount : M;
for (MaterialStack tMaterial : aData.mByProducts)
- tValidMaterialAmount += tMaterial.mMaterial.contains(SubTag.NO_RECYCLING)
- ? 0
+ tValidMaterialAmount += tMaterial.mMaterial.contains(SubTag.NO_RECYCLING) ? 0
: tMaterial.mAmount >= 0 ? tMaterial.mAmount : M;
if (tValidMaterialAmount < M) GT_ModHandler.addToRecyclerBlackList(aStack);
}
@@ -242,8 +231,8 @@ public class GregtechOreDictUnificator {
mRunThroughTheList = false;
for (Entry<GT_ItemStack, ItemData> tEntry : sItemStack2DataMap.entrySet())
if (!tEntry.getValue().hasValidPrefixData() || tEntry.getValue().mPrefix.mAllowNormalRecycling)
- GT_RecipeRegistrator.registerMaterialRecycling(
- tEntry.getKey().toStack(), tEntry.getValue());
+ GT_RecipeRegistrator
+ .registerMaterialRecycling(tEntry.getKey().toStack(), tEntry.getValue());
}
} else {
if (!aData.hasValidPrefixData() || aData.mPrefix.mAllowNormalRecycling)
@@ -255,13 +244,11 @@ public class GregtechOreDictUnificator {
}
}
- public static void addAssociation(
- OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack, boolean aBlackListed) {
+ public static void addAssociation(OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack,
+ boolean aBlackListed) {
if (aPrefix == null || aMaterial == null || GT_Utility.isStackInvalid(aStack)) return;
- if (Items.feather.getDamage(aStack) == W)
- for (byte i = 0; i < 16; i++)
- setItemData(
- GT_Utility.copyAmountAndMetaData(1, i, aStack), new ItemData(aPrefix, aMaterial, aBlackListed));
+ if (Items.feather.getDamage(aStack) == W) for (byte i = 0; i < 16; i++)
+ setItemData(GT_Utility.copyAmountAndMetaData(1, i, aStack), new ItemData(aPrefix, aMaterial, aBlackListed));
setItemData(aStack, new ItemData(aPrefix, aMaterial, aBlackListed));
}
@@ -388,8 +375,7 @@ public class GregtechOreDictUnificator {
public static ItemStack getIngotOrDust(MaterialStack aMaterial) {
ItemStack rStack = getIngot(aMaterial);
- if (aMaterial != null
- && aMaterial.mMaterial != null
+ if (aMaterial != null && aMaterial.mMaterial != null
&& (aMaterial.mMaterial == Materials.Naquadah || aMaterial.mMaterial == Materials.NaquadahEnriched))
rStack = getDust(aMaterial);
if (rStack == null) rStack = getDust(aMaterial);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java
index d03d4da099..51987d84fd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java
@@ -1,12 +1,14 @@
package gtPlusPlus.xmod.gregtech.api.util;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.util.GT_Utility;
import java.util.HashMap;
+
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.api.util.GT_Utility;
+
public class SpecialBehaviourTooltipHandler {
private static final HashMap<ItemStack, String> mTooltipCache = new HashMap<ItemStack, String>();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java
index 6f58823eb1..bfbd4e6da3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java
@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
+
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
@@ -30,15 +31,8 @@ public abstract class GTPP_Worldgen {
* @param aChunkZ zCoord of the Chunk
* @return if the Worldgeneration has been successfully completed
*/
- public boolean executeWorldgen(
- World aWorld,
- Random aRandom,
- String aBiome,
- int aDimensionType,
- int aChunkX,
- int aChunkZ,
- IChunkProvider aChunkGenerator,
- IChunkProvider aChunkProvider) {
+ public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
return false;
}
@@ -51,15 +45,8 @@ public abstract class GTPP_Worldgen {
* @param aChunkZ zCoord of the Chunk
* @return if the Worldgeneration has been successfully completed
*/
- public boolean executeCavegen(
- World aWorld,
- Random aRandom,
- String aBiome,
- int aDimensionType,
- int aChunkX,
- int aChunkZ,
- IChunkProvider aChunkGenerator,
- IChunkProvider aChunkProvider) {
+ public boolean executeCavegen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
return false;
}
@@ -67,8 +54,8 @@ public abstract class GTPP_Worldgen {
String aDimName = aWorld.provider.getDimensionName();
Boolean tAllowed = mDimensionMap.get(aDimName);
if (tAllowed == null) {
- boolean tValue = sCustomWorldgenFile.get(
- "worldgen.dimensions." + mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType);
+ boolean tValue = sCustomWorldgenFile
+ .get("worldgen.dimensions." + mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType);
mDimensionMap.put(aDimName, tValue);
return tValue;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java
index 26f1b38084..ffb1baf9f0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java
@@ -1,27 +1,20 @@
package gtPlusPlus.xmod.gregtech.api.world;
-import gtPlusPlus.core.lib.CORE;
import java.util.Collection;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
+import gtPlusPlus.core.lib.CORE;
+
public class GTPP_Worldgen_Boulder extends GTPP_Worldgen_Ore {
- public GTPP_Worldgen_Boulder(
- String aName,
- boolean aDefault,
- Block aBlock,
- int aBlockMeta,
- int aDimensionType,
- int aAmount,
- int aSize,
- int aProbability,
- int aMinY,
- int aMaxY,
- Collection<String> aBiomeList,
+
+ public GTPP_Worldgen_Boulder(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType,
+ int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList,
boolean aAllowToGenerateinVoid) {
super(
aName,
@@ -39,25 +32,16 @@ public class GTPP_Worldgen_Boulder extends GTPP_Worldgen_Ore {
}
@Override
- public boolean executeWorldgen(
- World aWorld,
- Random aRandom,
- String aBiome,
- int aDimensionType,
- int aChunkX,
- int aChunkZ,
- IChunkProvider aChunkGenerator,
- IChunkProvider aChunkProvider) {
+ public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType)
&& (mBiomeList.isEmpty() || mBiomeList.contains(aBiome))
&& (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
for (int i = 0; i < mAmount; i++) {
- int tX = aChunkX + aRandom.nextInt(16),
- tY = mMinY + aRandom.nextInt(mMaxY - mMinY),
+ int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY),
tZ = aChunkZ + aRandom.nextInt(16);
Block tBlock = aWorld.getBlock(tX, tY - 7, tZ);
- if (tBlock != null
- && tBlock.isOpaqueCube()
+ if (tBlock != null && tBlock.isOpaqueCube()
&& aWorld.getBlock(tX, tY - 6, tZ).isAir(aWorld, tX, tY - 6, tZ)) {
float math_pi = CORE.PI;
float var6 = aRandom.nextFloat() * math_pi;
@@ -101,11 +85,9 @@ public class GTPP_Worldgen_Boulder extends GTPP_Worldgen_Ore {
for (int var44 = var34; var44 <= var37; ++var44) {
float var45 = (var44 + 0.5F - var24) / (var28);
Block block = aWorld.getBlock(var38, var41, var44);
- if (var14b + var45 * var45 < 1.0F
- && ((mAllowToGenerateinVoid
- && aWorld.getBlock(var38, var41, var44)
- .isAir(aWorld, var38, var41, var44))
- || (block != null && !(block instanceof BlockContainer)))) {
+ if (var14b + var45 * var45 < 1.0F && ((mAllowToGenerateinVoid && aWorld
+ .getBlock(var38, var41, var44).isAir(aWorld, var38, var41, var44))
+ || (block != null && !(block instanceof BlockContainer)))) {
aWorld.setBlock(var38, var41, var44, mBlock, mBlockMeta, 0);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
index 0dbd354547..e3f33f45e4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
@@ -2,22 +2,25 @@ package gtPlusPlus.xmod.gregtech.api.world;
import static gtPlusPlus.xmod.gregtech.HANDLER_GT.sCustomWorldgenFile;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.Materials;
-import gregtech.common.blocks.GT_TileEntity_Ores;
-import gregtech.loaders.misc.GT_Achievements;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Random;
+
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.loaders.misc.GT_Achievements;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+
public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
+
public static ArrayList<GTPP_Worldgen_GT_Ore_Layer> sList = new ArrayList<GTPP_Worldgen_GT_Ore_Layer>();
public static int sWeight = 0;
public final short mMinY;
@@ -33,37 +36,27 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
public final boolean mDarkWorld;
public final String aTextWorldgen = "worldgen.gtpp.";
- public GTPP_Worldgen_GT_Ore_Layer(
- String aName,
- boolean aDefault,
- int aMinY,
- int aMaxY,
- int aWeight,
- int aDensity,
- int aSize,
- boolean aOverworld,
- Materials aPrimary,
- Materials aSecondary,
- Materials aBetween,
+ public GTPP_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity,
+ int aSize, boolean aOverworld, Materials aPrimary, Materials aSecondary, Materials aBetween,
Materials aSporadic) {
super(aName, sList, aDefault);
this.mDarkWorld = sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld);
this.mMinY = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY));
- this.mMaxY = ((short) Math.max(
- this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY)));
+ this.mMaxY = ((short) Math
+ .max(this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY)));
this.mWeight = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight));
this.mDensity = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Density", aDensity));
this.mSize = ((short) Math.max(1, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize)));
- this.mPrimaryMeta = ((short) sCustomWorldgenFile.get(
- aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary.mMetaItemSubID));
- this.mSecondaryMeta = ((short) sCustomWorldgenFile.get(
- aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID));
- this.mBetweenMeta = ((short) sCustomWorldgenFile.get(
- aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID));
- this.mSporadicMeta = ((short) sCustomWorldgenFile.get(
- aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID));
- this.mRestrictBiome =
- sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None");
+ this.mPrimaryMeta = ((short) sCustomWorldgenFile
+ .get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary.mMetaItemSubID));
+ this.mSecondaryMeta = ((short) sCustomWorldgenFile
+ .get(aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID));
+ this.mBetweenMeta = ((short) sCustomWorldgenFile
+ .get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID));
+ this.mSporadicMeta = ((short) sCustomWorldgenFile
+ .get(aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID));
+ this.mRestrictBiome = sCustomWorldgenFile
+ .get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None");
if (this.mEnabled) {
GT_Achievements.registerOre(
@@ -102,65 +95,53 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
}
}
- public GTPP_Worldgen_GT_Ore_Layer(
- String aName,
- boolean aDefault,
- int aMinY,
- int aMaxY,
- int aWeight,
- int aDensity,
- int aSize,
- Material aPrimary,
- Material aSecondary,
- Material aBetween,
- Material aSporadic) {
+ public GTPP_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity,
+ int aSize, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) {
super(aName, sList, aDefault);
this.mDarkWorld = sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Darkworld", true);
this.mMinY = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY));
- this.mMaxY = ((short) Math.max(
- this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY)));
+ this.mMaxY = ((short) Math
+ .max(this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY)));
this.mWeight = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight));
this.mDensity = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Density", aDensity));
this.mSize = ((short) Math.max(1, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize)));
- /*this.mPrimaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary.mMetaItemSubID));
- this.mSecondaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID));
- this.mBetweenMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID));
- this.mSporadicMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID));
- */ this.mRestrictBiome =
- sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None");
+ /*
+ * this.mPrimaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer",
+ * aPrimary.mMetaItemSubID)); this.mSecondaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen +
+ * this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID)); this.mBetweenMeta = ((short)
+ * sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween",
+ * aBetween.mMetaItemSubID)); this.mSporadicMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen +
+ * this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID));
+ */ this.mRestrictBiome = sCustomWorldgenFile
+ .get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None");
if (this.mEnabled) {
- /* GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
- GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSecondaryMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
- GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mBetweenMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
- GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSporadicMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false);
+ /*
+ * GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)], aMinY, aMaxY,
+ * aWeight, false, false, false);
+ * GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSecondaryMeta % 1000)], aMinY, aMaxY,
+ * aWeight, false, false, false); GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mBetweenMeta
+ * % 1000)], aMinY, aMaxY, aWeight, false, false, false);
+ * GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSporadicMeta % 1000)], aMinY, aMaxY,
+ * aWeight, false, false, false);
*/ sWeight += this.mWeight;
}
}
@Override
- public boolean executeWorldgen(
- World aWorld,
- Random aRandom,
- String aBiome,
- int aDimensionType,
- int aChunkX,
- int aChunkZ,
- IChunkProvider aChunkGenerator,
- IChunkProvider aChunkProvider) {
+ public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
if (!this.mRestrictBiome.equals("None") && !(this.mRestrictBiome.equals(aBiome))) {
return false; // Not the correct biome for ore mix
}
if (!isGenerationAllowed(
aWorld,
aDimensionType,
- ((aDimensionType == -1) && (false))
- || ((aDimensionType == 0) && (this.mDarkWorld))
- || ((aDimensionType == 1) && (false))
- || ((aWorld.provider.getDimensionName().equals("Moon")) && (false))
- || ((aWorld.provider.getDimensionName().equals("Mars")) && (false))
- ? aDimensionType
- : aDimensionType ^ 0xFFFFFFFF)) {
+ ((aDimensionType == -1) && (false)) || ((aDimensionType == 0) && (this.mDarkWorld))
+ || ((aDimensionType == 1) && (false))
+ || ((aWorld.provider.getDimensionName().equals("Moon")) && (false))
+ || ((aWorld.provider.getDimensionName().equals("Mars")) && (false)) ? aDimensionType
+ : aDimensionType ^ 0xFFFFFFFF)) {
return false;
}
int tMinY = this.mMinY + aRandom.nextInt(this.mMaxY - this.mMinY - 5);
@@ -173,12 +154,14 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
for (int tZ = cZ; tZ <= eZ; tZ++) {
if (this.mSecondaryMeta > 0) {
for (int i = tMinY - 1; i < tMinY + 2; i++) {
- if ((aRandom.nextInt(Math.max(
- 1,
- Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ))
- / this.mDensity))
- == 0)
- || (aRandom.nextInt(Math.max(
+ if ((aRandom.nextInt(
+ Math.max(
+ 1,
+ Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ))
+ / this.mDensity))
+ == 0)
+ || (aRandom.nextInt(
+ Math.max(
1,
Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX))
/ this.mDensity))
@@ -187,27 +170,27 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
}
}
}
- if ((this.mBetweenMeta > 0)
- && ((aRandom.nextInt(Math.max(
- 1,
- Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ))
- / this.mDensity))
- == 0)
- || (aRandom.nextInt(Math.max(
- 1,
- Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX))
- / this.mDensity))
- == 0))) {
+ if ((this.mBetweenMeta > 0) && ((aRandom.nextInt(
+ Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity))
+ == 0)
+ || (aRandom.nextInt(
+ Math.max(
+ 1,
+ Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX))
+ / this.mDensity))
+ == 0))) {
setOreBlock(aWorld, tX, tMinY + 2 + aRandom.nextInt(2), tZ, this.mBetweenMeta, false);
}
if (this.mPrimaryMeta > 0) {
for (int i = tMinY + 3; i < tMinY + 6; i++) {
- if ((aRandom.nextInt(Math.max(
- 1,
- Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ))
- / this.mDensity))
- == 0)
- || (aRandom.nextInt(Math.max(
+ if ((aRandom.nextInt(
+ Math.max(
+ 1,
+ Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ))
+ / this.mDensity))
+ == 0)
+ || (aRandom.nextInt(
+ Math.max(
1,
Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX))
/ this.mDensity))
@@ -216,17 +199,15 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
}
}
}
- if ((this.mSporadicMeta > 0)
- && ((aRandom.nextInt(Math.max(
- 1,
- Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ))
- / this.mDensity))
- == 0)
- || (aRandom.nextInt(Math.max(
- 1,
- Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX))
- / this.mDensity))
- == 0))) {
+ if ((this.mSporadicMeta > 0) && ((aRandom.nextInt(
+ Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity))
+ == 0)
+ || (aRandom.nextInt(
+ Math.max(
+ 1,
+ Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX))
+ / this.mDensity))
+ == 0))) {
setOreBlock(aWorld, tX, tMinY - 1 + aRandom.nextInt(7), tZ, this.mSporadicMeta, false);
}
}
@@ -244,13 +225,18 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
if (mSetOre == null) {
try {
mSetOre = GT_TileEntity_Ores.class.getMethod(
- "setOreBlock", World.class, int.class, int.class, int.class, int.class, boolean.class);
+ "setOreBlock",
+ World.class,
+ int.class,
+ int.class,
+ int.class,
+ int.class,
+ boolean.class);
} catch (SecurityException | NoSuchMethodException e) {
try {
- mSetOre = GT_TileEntity_Ores.class.getMethod(
- "setOreBlock", World.class, int.class, int.class, int.class, int.class);
- } catch (SecurityException | NoSuchMethodException r) {
- }
+ mSetOre = GT_TileEntity_Ores.class
+ .getMethod("setOreBlock", World.class, int.class, int.class, int.class, int.class);
+ } catch (SecurityException | NoSuchMethodException r) {}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java
index b295d5be82..8ed90b799f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java
@@ -28,17 +28,8 @@ public class GTPP_Worldgen_Handler implements Runnable {
ore.aSporadic);
}
- private final GTPP_Worldgen_GT_Ore_Layer generateNewVein(
- String mOreMixName,
- int minY,
- int maxY,
- int weight,
- int density,
- int size,
- Material aPrimary,
- Material aSecondary,
- Material aBetween,
- Material aSporadic) {
+ private final GTPP_Worldgen_GT_Ore_Layer generateNewVein(String mOreMixName, int minY, int maxY, int weight,
+ int density, int size, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) {
return new GTPP_Worldgen_GT_Ore_Layer(
"ore.mix." + mOreMixName, // String aName,
true, // boolean aDefault,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java
index e93a6c6d38..22b64d6cfc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java
@@ -2,30 +2,23 @@ package gtPlusPlus.xmod.gregtech.api.world;
import static gtPlusPlus.xmod.gregtech.HANDLER_GT.sCustomWorldgenFile;
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
import java.util.ArrayList;
import java.util.Collection;
+
import net.minecraft.block.Block;
+import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+
public abstract class GTPP_Worldgen_Ore extends GTPP_Worldgen {
+
public final int mBlockMeta, mAmount, mSize, mMinY, mMaxY, mProbability, mDimensionType;
public final Block mBlock;
public final Collection<String> mBiomeList;
public final boolean mAllowToGenerateinVoid;
private final String aTextWorldgen = "worldgen.";
- public GTPP_Worldgen_Ore(
- String aName,
- boolean aDefault,
- Block aBlock,
- int aBlockMeta,
- int aDimensionType,
- int aAmount,
- int aSize,
- int aProbability,
- int aMinY,
- int aMaxY,
- Collection<String> aBiomeList,
+ public GTPP_Worldgen_Ore(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType,
+ int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList,
boolean aAllowToGenerateinVoid) {
super(aName, HANDLER_GT.sCustomWorldgenList, aDefault);
mDimensionType = aDimensionType;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java
index 3f0a6d48c9..b8113d5f86 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java
@@ -1,27 +1,20 @@
package gtPlusPlus.xmod.gregtech.api.world;
-import gtPlusPlus.core.lib.CORE;
import java.util.Collection;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
+import gtPlusPlus.core.lib.CORE;
+
public class GTPP_Worldgen_Ore_Normal extends GTPP_Worldgen_Ore {
- public GTPP_Worldgen_Ore_Normal(
- String aName,
- boolean aDefault,
- Block aBlock,
- int aBlockMeta,
- int aDimensionType,
- int aAmount,
- int aSize,
- int aProbability,
- int aMinY,
- int aMaxY,
- Collection<String> aBiomeList,
+
+ public GTPP_Worldgen_Ore_Normal(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType,
+ int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList,
boolean aAllowToGenerateinVoid) {
super(
aName,
@@ -39,21 +32,13 @@ public class GTPP_Worldgen_Ore_Normal extends GTPP_Worldgen_Ore {
}
@Override
- public boolean executeWorldgen(
- World aWorld,
- Random aRandom,
- String aBiome,
- int aDimensionType,
- int aChunkX,
- int aChunkZ,
- IChunkProvider aChunkGenerator,
- IChunkProvider aChunkProvider) {
+ public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType)
&& (mBiomeList.isEmpty() || mBiomeList.contains(aBiome))
&& (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
for (int i = 0; i < mAmount; i++) {
- int tX = aChunkX + aRandom.nextInt(16),
- tY = mMinY + aRandom.nextInt(mMaxY - mMinY),
+ int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY),
tZ = aChunkZ + aRandom.nextInt(16);
if (mAllowToGenerateinVoid || aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ)) {
float math_pi = CORE.PI;
@@ -98,29 +83,26 @@ public class GTPP_Worldgen_Ore_Normal extends GTPP_Worldgen_Ore {
for (int var44 = var34; var44 <= var37; ++var44) {
float var45 = (var44 + 0.5F - var24) / (var28);
Block block = aWorld.getBlock(var38, var41, var44);
- if (var14b + var45 * var45 < 1.0F
- && ((mAllowToGenerateinVoid
- && aWorld.getBlock(var38, var41, var44)
- .isAir(aWorld, var38, var41, var44))
- || (block != null
- && (block.isReplaceableOreGen(
- aWorld,
- var38,
- var41,
- var44,
- Blocks.stone)
- || block.isReplaceableOreGen(
- aWorld,
- var38,
- var41,
- var44,
- Blocks.end_stone)
- || block.isReplaceableOreGen(
- aWorld,
- var38,
- var41,
- var44,
- Blocks.netherrack))))) {
+ if (var14b + var45 * var45 < 1.0F && ((mAllowToGenerateinVoid && aWorld
+ .getBlock(var38, var41, var44).isAir(aWorld, var38, var41, var44))
+ || (block != null && (block.isReplaceableOreGen(
+ aWorld,
+ var38,
+ var41,
+ var44,
+ Blocks.stone)
+ || block.isReplaceableOreGen(
+ aWorld,
+ var38,
+ var41,
+ var44,
+ Blocks.end_stone)
+ || block.isReplaceableOreGen(
+ aWorld,
+ var38,
+ var41,
+ var44,
+ Blocks.netherrack))))) {
aWorld.setBlock(var38, var41, var44, mBlock, mBlockMeta, 0);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java
index c6e9e6c92a..65813693b3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java
@@ -14,17 +14,8 @@ public class GT_OreVein_Object {
final Material aBetween; // Materials aBetween,
final Material aSporadic; // Materials aSporadic
- GT_OreVein_Object(
- String mOreMixName,
- int minY,
- int maxY,
- int weight,
- int density,
- int size,
- Material aPrimary,
- Material aSecondary,
- Material aBetween,
- Material aSporadic) {
+ GT_OreVein_Object(String mOreMixName, int minY, int maxY, int weight, int density, int size, Material aPrimary,
+ Material aSecondary, Material aBetween, Material aSporadic) {
this.mOreMixName = mOreMixName;
this.minY = minY;
this.maxY = maxY;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java
index 78f04269cf..5ca61cf4d7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java
@@ -1,9 +1,10 @@
package gtPlusPlus.xmod.gregtech.api.world;
-import gtPlusPlus.core.material.Material;
import java.util.ArrayList;
import java.util.List;
+import gtPlusPlus.core.material.Material;
+
public class WorldGenUtils {
static List<GT_OreVein_Object> mOresToRegister = new ArrayList<GT_OreVein_Object>();
@@ -12,19 +13,19 @@ public class WorldGenUtils {
mOresToRegister.add(newVein);
}
- public static boolean generateNewOreVeinObject(
- String mOreMixName,
- int minY,
- int maxY,
- int weight,
- int density,
- int size,
- Material aPrimary,
- Material aSecondary,
- Material aBetween,
- Material aSporadic) {
+ public static boolean generateNewOreVeinObject(String mOreMixName, int minY, int maxY, int weight, int density,
+ int size, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) {
GT_OreVein_Object newVein = new GT_OreVein_Object(
- mOreMixName, minY, maxY, weight, density, size, aPrimary, aSecondary, aBetween, aSporadic);
+ mOreMixName,
+ minY,
+ maxY,
+ weight,
+ density,
+ size,
+ aPrimary,
+ aSecondary,
+ aBetween,
+ aSporadic);
addNewOreMixForWorldgen(newVein);
return true;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index 535b4b7169..2ae449e012 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -1,5 +1,23 @@
package gtPlusPlus.xmod.gregtech.common;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.apache.commons.lang3.ArrayUtils;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
@@ -27,21 +45,6 @@ import gtPlusPlus.xmod.gregtech.common.helpers.MachineUpdateHandler;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator;
import ic2.core.init.BlocksItems;
import ic2.core.init.InternalName;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import org.apache.commons.lang3.ArrayUtils;
public class Meta_GT_Proxy {
@@ -60,8 +63,7 @@ public class Meta_GT_Proxy {
public static AchievementHandler mAssemblyAchievements;
- public static final Map<String, FormattedTooltipString> mCustomGregtechMetaTooltips =
- new LinkedHashMap<String, FormattedTooltipString>();
+ public static final Map<String, FormattedTooltipString> mCustomGregtechMetaTooltips = new LinkedHashMap<String, FormattedTooltipString>();
/**
* Does this feature exist within GT? Saves loading useless content if not.
@@ -152,32 +154,13 @@ public class Meta_GT_Proxy {
}
}
- String[] aLangs = new String[] {
- "de_DE", "en_US", "en_GB", "en_IC", "es_AR", "es_ES", "es_MX", "es_UY", "es_VE", "fr_CA", "fr_FR",
- "it_IT", "ko_KR", "pt_BR", "pt_PT", "ru_RU", "sv_SE", "tr_TR", "zh_CN", "zh_TW",
- };
- String[] aLangValues = new String[] {
- "Erhitztes Wasser",
- "Heated Water",
- "Heated Water",
- "Heated Water",
- "Agua caliente",
- "Agua caliente",
- "Agua caliente",
- "Agua caliente",
- "Agua caliente",
- "Eau chauffée",
- "Eau chauffée",
- "Acqua riscaldata",
- "온수",
- "Água aquecida",
- "Água aquecida",
- "Вода с подогревом",
- "Uppvärmt vatten",
- "Isıtılmış Su",
- "热水",
- "热水",
- };
+ String[] aLangs = new String[] { "de_DE", "en_US", "en_GB", "en_IC", "es_AR", "es_ES", "es_MX", "es_UY",
+ "es_VE", "fr_CA", "fr_FR", "it_IT", "ko_KR", "pt_BR", "pt_PT", "ru_RU", "sv_SE", "tr_TR", "zh_CN",
+ "zh_TW", };
+ String[] aLangValues = new String[] { "Erhitztes Wasser", "Heated Water", "Heated Water", "Heated Water",
+ "Agua caliente", "Agua caliente", "Agua caliente", "Agua caliente", "Agua caliente", "Eau chauffée",
+ "Eau chauffée", "Acqua riscaldata", "온수", "Água aquecida", "Água aquecida", "Вода с подогревом",
+ "Uppvärmt vatten", "Isıtılmış Su", "热水", "热水", };
for (int i = 0; i < aLangs.length; i++) {
Logger.REFLECTION(
"Trying to inject new lang data for " + aLangs[i] + ", using value: " + aLangValues[i]);
@@ -248,9 +231,12 @@ public class Meta_GT_Proxy {
// Skip this material
if (aMoltenFluid == null || aPlasma == null || aPlasma.isFluidEqual(NULL_PLASMA)) {
- Logger.INFO("Could not generate Advanced Vacuum Freezer recipe. Cooling " + s
- + " plasma. Molten Form Exists? " + (aMoltenFluid != null) + " | Plasma Exists? "
- + (aPlasma != null));
+ Logger.INFO(
+ "Could not generate Advanced Vacuum Freezer recipe. Cooling " + s
+ + " plasma. Molten Form Exists? "
+ + (aMoltenFluid != null)
+ + " | Plasma Exists? "
+ + (aPlasma != null));
continue;
} else {
// Build a new plasma recipe
@@ -260,9 +246,9 @@ public class Meta_GT_Proxy {
new ItemStack[] {},
new ItemStack[] {},
null,
- new int[] {10000},
- new FluidStack[] {aPlasma, FluidUtils.getFluidStack("cryotheum", aTotalTickTime)},
- new FluidStack[] {aMoltenFluid},
+ new int[] { 10000 },
+ new FluidStack[] { aPlasma, FluidUtils.getFluidStack("cryotheum", aTotalTickTime) },
+ new FluidStack[] { aMoltenFluid },
aTotalTickTime,
(int) GT_Values.V[4 + aAtomicTier],
aAtomicMass);
@@ -316,12 +302,8 @@ public class Meta_GT_Proxy {
Constructor<?> g = BaseCustomTileEntity.class.getConstructors()[0];
g.setAccessible(true);
return (BaseCustomTileEntity) g.newInstance();
- } catch (InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException
- | SecurityException e) {
- }
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | SecurityException e) {}
}
}
try {
@@ -332,13 +314,10 @@ public class Meta_GT_Proxy {
Constructor<?> g = BaseCustomTileEntity.class.getConstructors()[0];
g.setAccessible(true);
return (BaseCustomTileEntity) g.newInstance();
- } catch (InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException
- | SecurityException e) {
- GT_Log.err.println(
- "GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | SecurityException e) {
+ GT_Log.err
+ .println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
e.printStackTrace(GT_Log.err);
CORE.crash(
"GT++ Mod: Fatal Error ocurred while initializing custom BaseMetaTileEntities, crashing Minecraft.");
@@ -357,11 +336,8 @@ public class Meta_GT_Proxy {
Constructor<?> g = BaseCustomPower_MTE.class.getConstructors()[0];
g.setAccessible(true);
return (BaseCustomPower_MTE) g.newInstance();
- } catch (InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException
- | SecurityException e) {
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | SecurityException e) {
// e.printStackTrace();
}
}
@@ -375,13 +351,10 @@ public class Meta_GT_Proxy {
Constructor<?> g = BaseCustomPower_MTE.class.getConstructors()[0];
g.setAccessible(true);
return (BaseCustomPower_MTE) g.newInstance();
- } catch (InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException
- | SecurityException e) {
- GT_Log.err.println(
- "GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | SecurityException e) {
+ GT_Log.err
+ .println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
e.printStackTrace(GT_Log.err);
CORE.crash(
"GT++ Mod: Fatal Error ocurred while initializing custom BaseMetaTileEntities, crashing Minecraft.");
@@ -410,8 +383,8 @@ public class Meta_GT_Proxy {
}
}
} else {
- GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames =
- ArrayUtils.add(GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames, aClassName);
+ GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames = ArrayUtils
+ .add(GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames, aClassName);
return true;
}
return false;
@@ -452,8 +425,8 @@ public class Meta_GT_Proxy {
mCustomGregtechMetaTooltips.put(aNbtTagName, aData);
}
- public static void conStructGtTileBlockTooltip(
- ItemStack aStack, EntityPlayer aPlayer, List<Object> aList, boolean par4) {
+ public static void conStructGtTileBlockTooltip(ItemStack aStack, EntityPlayer aPlayer, List<Object> aList,
+ boolean par4) {
try {
int tDamage = aStack.getItemDamage();
if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) {
@@ -471,18 +444,18 @@ public class Meta_GT_Proxy {
if (tString.length >= 2) {
StringBuffer tBuffer = new StringBuffer();
Object tRep[] = new String[tString.length / 2];
- for (int j = 0; j < tString.length; j++)
- if (j % 2 == 0) tBuffer.append(tString[j]);
- else {
- tBuffer.append(" %s");
- tRep[j / 2] = tString[j];
- }
- aList.add(String.format(
- GT_LanguageManager.addStringLocalization(
- "TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++,
- tBuffer.toString(),
- !GregTech_API.sPostloadFinished),
- tRep));
+ for (int j = 0; j < tString.length; j++) if (j % 2 == 0) tBuffer.append(tString[j]);
+ else {
+ tBuffer.append(" %s");
+ tRep[j / 2] = tString[j];
+ }
+ aList.add(
+ String.format(
+ GT_LanguageManager.addStringLocalization(
+ "TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++,
+ tBuffer.toString(),
+ !GregTech_API.sPostloadFinished),
+ tRep));
}
} else {
String tTranslated = GT_LanguageManager.addStringLocalization(
@@ -506,26 +479,37 @@ public class Meta_GT_Proxy {
if ((aOffset) <= 10) {
tTier -= 2;
aList.add(EnumChatFormatting.BOLD + "16" + " Fuse Slots" + EnumChatFormatting.GRAY);
- aList.add("Per each fuse, you may insert " + EnumChatFormatting.YELLOW
- + (GT_Values.V[tTier]) + EnumChatFormatting.GRAY + " EU/t");
- aList.add("However this " + EnumChatFormatting.ITALIC + EnumChatFormatting.RED + "MUST"
- + EnumChatFormatting.GRAY + " be in a single Amp");
- aList.add("This machine can accept upto a single amp of "
- + GT_Values.VN[Math.min(tTier + 2, 12)] + " as a result");
- aList.add(GT_LanguageManager.addStringLocalization(
+ aList.add(
+ "Per each fuse, you may insert " + EnumChatFormatting.YELLOW
+ + (GT_Values.V[tTier])
+ + EnumChatFormatting.GRAY
+ + " EU/t");
+ aList.add(
+ "However this " + EnumChatFormatting.ITALIC
+ + EnumChatFormatting.RED
+ + "MUST"
+ + EnumChatFormatting.GRAY
+ + " be in a single Amp");
+ aList.add(
+ "This machine can accept upto a single amp of "
+ + GT_Values.VN[Math.min(tTier + 2, 12)]
+ + " as a result");
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
"TileEntity_Breaker_Loss",
- "Breaker Loss: " + EnumChatFormatting.RED + ""
+ "Breaker Loss: " + EnumChatFormatting.RED
+ + ""
+ (GT_Values.V[Math.max(tTier - 1, 0)] / 10)
- + EnumChatFormatting.GRAY + " EU/t",
- !GregTech_API.sPostloadFinished)
- + EnumChatFormatting.GRAY);
+ + EnumChatFormatting.GRAY
+ + " EU/t",
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY);
}
- aList.add(GT_LanguageManager.addStringLocalization(
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
"TileEntity_Special_Power_1",
EnumChatFormatting.RED + "Special Power Handling, please read manual",
- !GregTech_API.sPostloadFinished)
- + EnumChatFormatting.GRAY);
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY);
// aList.add(GT_LanguageManager.addStringLocalization("TileEntity_BreakerBox_2",
// EnumChatFormatting.RED+"Special Power Handling, please read manual",
// !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY);
@@ -537,92 +521,126 @@ public class Meta_GT_Proxy {
if (tTileEntity.getInputVoltage() > 0L) {
String inA = "0";
if (tTileEntity.getInputAmperage() >= 1L) {
- inA = " at " + EnumChatFormatting.YELLOW + tTileEntity.getInputAmperage()
- + EnumChatFormatting.GRAY + " Amps";
+ inA = " at " + EnumChatFormatting.YELLOW
+ + tTileEntity.getInputAmperage()
+ + EnumChatFormatting.GRAY
+ + " Amps";
} else {
- inA = " at " + EnumChatFormatting.WHITE + tTileEntity.getInputAmperage()
- + EnumChatFormatting.GRAY + " Amps";
+ inA = " at " + EnumChatFormatting.WHITE
+ + tTileEntity.getInputAmperage()
+ + EnumChatFormatting.GRAY
+ + " Amps";
}
- String a1 = "Voltage IN: " + EnumChatFormatting.GREEN + tTileEntity.getInputVoltage()
- + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())] + ")"
- + EnumChatFormatting.GRAY + inA;
+ String a1 = "Voltage IN: " + EnumChatFormatting.GREEN
+ + tTileEntity.getInputVoltage()
+ + " ("
+ + GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())]
+ + ")"
+ + EnumChatFormatting.GRAY
+ + inA;
aList.add(a1);
}
if (tTileEntity.getOutputVoltage() > 0L) {
String outA = "0";
if (tTileEntity.getOutputAmperage() >= 1L) {
- outA = " at " + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage()
- + EnumChatFormatting.GRAY + " Amps";
+ outA = " at " + EnumChatFormatting.YELLOW
+ + tTileEntity.getOutputAmperage()
+ + EnumChatFormatting.GRAY
+ + " Amps";
} else {
- outA = " at " + EnumChatFormatting.WHITE + tTileEntity.getOutputAmperage()
- + EnumChatFormatting.GRAY + " Amps";
+ outA = " at " + EnumChatFormatting.WHITE
+ + tTileEntity.getOutputAmperage()
+ + EnumChatFormatting.GRAY
+ + " Amps";
}
- String a1 = "Voltage OUT: " + EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage()
- + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())] + ")"
- + EnumChatFormatting.GRAY + outA;
+ String a1 = "Voltage OUT: " + EnumChatFormatting.GREEN
+ + tTileEntity.getOutputVoltage()
+ + " ("
+ + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())]
+ + ")"
+ + EnumChatFormatting.GRAY
+ + outA;
aList.add(a1);
}
if (tTileEntity.getOutputVoltage() > 0L) {
- aList.add(GT_LanguageManager.addStringLocalization(
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
"TileEntity_Lossess_EU",
- "Transmission Loss: " + EnumChatFormatting.DARK_BLUE + ""
+ "Transmission Loss: " + EnumChatFormatting.DARK_BLUE
+ + ""
+ (tDamage < 30500 && tDamage >= 30400 ? 0 : 1),
- !GregTech_API.sPostloadFinished)
- + EnumChatFormatting.GRAY);
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY);
}
if (tTileEntity.getEUCapacity() > 0) {
- aList.add(GT_LanguageManager.addStringLocalization(
- "TileEntity_EUp_STORE2", "Internal Capacity: ", !GregTech_API.sPostloadFinished)
- + EnumChatFormatting.BLUE
- + tTileEntity.getEUCapacity() + EnumChatFormatting.GRAY + " EU");
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
+ "TileEntity_EUp_STORE2",
+ "Internal Capacity: ",
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.BLUE
+ + tTileEntity.getEUCapacity()
+ + EnumChatFormatting.GRAY
+ + " EU");
}
}
- /*if (tTileEntity.getEUCapacity() > 0L) {
- if (tTileEntity.getInputVoltage() > 0L) {
- aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getInputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())] + ")" + EnumChatFormatting.GRAY);
- }
- if (tTileEntity.getOutputVoltage() > 0L) {
- aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())] + ")" + EnumChatFormatting.GRAY);
- }
- if (tTileEntity.getOutputAmperage() > 1L) {
- aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage() + EnumChatFormatting.GRAY);
- }
- aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.BLUE + tTileEntity.getEUCapacity() + EnumChatFormatting.GRAY);
- }*/
+ /*
+ * if (tTileEntity.getEUCapacity() > 0L) { if (tTileEntity.getInputVoltage() > 0L) {
+ * aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ",
+ * !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getInputVoltage() + " (" +
+ * GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())] + ")" + EnumChatFormatting.GRAY); }
+ * if (tTileEntity.getOutputVoltage() > 0L) {
+ * aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ",
+ * !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage() + " ("
+ * + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())] + ")" + EnumChatFormatting.GRAY);
+ * } if (tTileEntity.getOutputAmperage() > 1L) {
+ * aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ",
+ * !GregTech_API.sPostloadFinished ) + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage() +
+ * EnumChatFormatting.GRAY); }
+ * aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ",
+ * !GregTech_API.sPostloadFinished ) + EnumChatFormatting.BLUE + tTileEntity.getEUCapacity() +
+ * EnumChatFormatting.GRAY); }
+ */
}
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
if (aNBT.getBoolean("mMuffler")) {
- aList.add(GT_LanguageManager.addStringLocalization(
- "GT_TileEntity_MUFFLER", "has Muffler Upgrade", !GregTech_API.sPostloadFinished));
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
+ "GT_TileEntity_MUFFLER",
+ "has Muffler Upgrade",
+ !GregTech_API.sPostloadFinished));
}
if (aNBT.getBoolean("mSteamConverter")) {
- aList.add(GT_LanguageManager.addStringLocalization(
- "GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade", !GregTech_API.sPostloadFinished));
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
+ "GT_TileEntity_STEAMCONVERTER",
+ "has Steam Upgrade",
+ !GregTech_API.sPostloadFinished));
}
int tAmount = 0;
if ((tAmount = aNBT.getByte("mSteamTanks")) > 0) {
- aList.add(tAmount + " "
- + GT_LanguageManager.addStringLocalization(
- "GT_TileEntity_STEAMTANKS",
- "Steam Tank Upgrades",
- !GregTech_API.sPostloadFinished));
+ aList.add(
+ tAmount + " "
+ + GT_LanguageManager.addStringLocalization(
+ "GT_TileEntity_STEAMTANKS",
+ "Steam Tank Upgrades",
+ !GregTech_API.sPostloadFinished));
}
- FluidStack afluid =
- net.minecraftforge.fluids.FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
+ FluidStack afluid = net.minecraftforge.fluids.FluidStack
+ .loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
if (afluid != null) {
int tFluidAmount = afluid.amount;
if (tFluidAmount > 0) {
- aList.add(GT_LanguageManager.addStringLocalization(
- "GT_TileEntity_FLUIDTANK",
- "Tank Fluid: " + tFluidAmount + "L " + afluid.getLocalizedName() + "",
- !GregTech_API.sPostloadFinished));
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
+ "GT_TileEntity_FLUIDTANK",
+ "Tank Fluid: " + tFluidAmount + "L " + afluid.getLocalizedName() + "",
+ !GregTech_API.sPostloadFinished));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
index 0f98d8ab55..502674fb18 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
@@ -1,5 +1,17 @@
package gtPlusPlus.xmod.gregtech.common;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
@@ -17,16 +29,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.reflect.ProxyFinder;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
public class StaticFields59 {
@@ -88,14 +90,19 @@ public class StaticFields59 {
mPyrolyseRecipes = null;
}
- mCalculatePollutionReduction =
- getMethod(GT_MetaTileEntity_Hatch_Muffler.class, "calculatePollutionReduction", int.class);
+ mCalculatePollutionReduction = getMethod(
+ GT_MetaTileEntity_Hatch_Muffler.class,
+ "calculatePollutionReduction",
+ int.class);
Logger.INFO("[SH] Got Method: calculatePollutionReduction");
// Yep...
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
mAddFurnaceRecipe = getMethod(
- GT_ModHandler.class, "addSmeltingAndAlloySmeltingRecipe", ItemStack.class, ItemStack.class);
+ GT_ModHandler.class,
+ "addSmeltingAndAlloySmeltingRecipe",
+ ItemStack.class,
+ ItemStack.class);
Logger.INFO("[SH] Got Method: addSmeltingAndAlloySmeltingRecipe");
} else {
mAddFurnaceRecipe = getMethod(
@@ -182,7 +189,7 @@ public class StaticFields59 {
try {
return (String[]) mDescriptionArray.get(aTile);
} catch (IllegalArgumentException | IllegalAccessException e) {
- return new String[] {aTile.mDescription};
+ return new String[] { aTile.mDescription };
}
}
@@ -211,8 +218,7 @@ public class StaticFields59 {
proxyGT = Meta_GT_Proxy.mProxies[1];
} else {
try {
- proxyGT = (client
- ? ProxyFinder.getClientProxy(GT_Mod.instance)
+ proxyGT = (client ? ProxyFinder.getClientProxy(GT_Mod.instance)
: ProxyFinder.getServerProxy(GT_Mod.instance));
} catch (final ReflectiveOperationException e1) {
proxyGT = null;
@@ -228,8 +234,7 @@ public class StaticFields59 {
if (proxyGT != null && proxyGT instanceof GT_Proxy) {
try {
return ReflectionUtils.getField(proxyGT.getClass(), fieldName).get(proxyGT);
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
}
return null;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java
index 83cbc0065c..a408663ee0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java
@@ -1,24 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.interfaces.IDebugableBlock;
-import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_Generic_Block;
-import gregtech.api.metatileentity.BaseMetaPipeEntity;
-import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.metatileentity.BaseTileEntity;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Material_Machines;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
-import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock;
import java.util.ArrayList;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -41,7 +25,26 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Textures.BlockIcons;
+import gregtech.api.interfaces.IDebugableBlock;
+import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_Generic_Block;
+import gregtech.api.metatileentity.BaseMetaPipeEntity;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
+import gregtech.api.metatileentity.BaseTileEntity;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Material_Machines;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.random.XSTR;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
+import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock;
+
public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableBlock, ITileEntityProvider {
+
public static ThreadLocal<IGregTechTileEntity> mTemporaryTileEntity = new ThreadLocal<IGregTechTileEntity>();
public GTPP_Block_Machines() {
@@ -104,8 +107,7 @@ public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableB
}
public String getLocalizedName() {
- String aName = StatCollector.translateToLocal(this.getUnlocalizedName() + ".name");
- ;
+ String aName = StatCollector.translateToLocal(this.getUnlocalizedName() + ".name");;
if (aName.toLowerCase().contains(".name")) {
aName = StatCollector.translateToLocal(getUnlocalizedName() + ".name");
}
@@ -128,8 +130,7 @@ public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableB
}
public int getRenderType() {
- return GTPP_Render_MachineBlock.INSTANCE == null
- ? super.getRenderType()
+ return GTPP_Render_MachineBlock.INSTANCE == null ? super.getRenderType()
: GTPP_Render_MachineBlock.INSTANCE.mRenderID;
}
@@ -195,8 +196,8 @@ public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableB
return tTileEntity != null ? tTileEntity.receiveClientEvent(aData1, aData2) : false;
}
- public void addCollisionBoxesToList(
- World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List outputAABB, Entity collider) {
+ public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List outputAABB,
+ Entity collider) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
if (tTileEntity instanceof IGregTechTileEntity
&& ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null) {
@@ -210,18 +211,18 @@ public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableB
public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
return tTileEntity instanceof IGregTechTileEntity
- && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null
- ? ((IGregTechTileEntity) tTileEntity).getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ)
- : super.getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
+ && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null
+ ? ((IGregTechTileEntity) tTileEntity).getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ)
+ : super.getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
}
@SideOnly(Side.CLIENT)
public AxisAlignedBB getSelectedBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
return tTileEntity instanceof IGregTechTileEntity
- && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null
- ? ((IGregTechTileEntity) tTileEntity).getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ)
- : super.getSelectedBoundingBoxFromPool(aWorld, aX, aY, aZ);
+ && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null
+ ? ((IGregTechTileEntity) tTileEntity).getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ)
+ : super.getSelectedBoundingBoxFromPool(aWorld, aX, aY, aZ);
}
public void setBlockBoundsBasedOnState(IBlockAccess blockAccess, int aX, int aY, int aZ) {
@@ -264,15 +265,13 @@ public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableB
public float getPlayerRelativeBlockHardness(EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
- return tTileEntity instanceof BaseMetaTileEntity
- && ((BaseMetaTileEntity) tTileEntity).privateAccess()
- && !((BaseMetaTileEntity) tTileEntity).playerOwnsThis(aPlayer, true)
- ? -1.0F
- : super.getPlayerRelativeBlockHardness(aPlayer, aWorld, aX, aY, aZ);
+ return tTileEntity instanceof BaseMetaTileEntity && ((BaseMetaTileEntity) tTileEntity).privateAccess()
+ && !((BaseMetaTileEntity) tTileEntity).playerOwnsThis(aPlayer, true) ? -1.0F
+ : super.getPlayerRelativeBlockHardness(aPlayer, aWorld, aX, aY, aZ);
}
- public boolean onBlockActivated(
- World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1, float par2, float par3) {
+ public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1,
+ float par2, float par3) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
if (tTileEntity == null) {
return false;
@@ -289,13 +288,11 @@ public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableB
}
}
- return tTileEntity instanceof IGregTechTileEntity
- ? (((IGregTechTileEntity) tTileEntity).getTimer() < 50L
- ? false
- : (!aWorld.isRemote && !((IGregTechTileEntity) tTileEntity).isUseableByPlayer(aPlayer)
- ? true
- : ((IGregTechTileEntity) tTileEntity)
- .onRightclick(aPlayer, (byte) aSide, par1, par2, par3)))
+ return tTileEntity instanceof IGregTechTileEntity ? (((IGregTechTileEntity) tTileEntity).getTimer() < 50L
+ ? false
+ : (!aWorld.isRemote && !((IGregTechTileEntity) tTileEntity).isUseableByPlayer(aPlayer) ? true
+ : ((IGregTechTileEntity) tTileEntity)
+ .onRightclick(aPlayer, (byte) aSide, par1, par2, par3)))
: false;
}
}
@@ -339,8 +336,7 @@ public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableB
(double) ((float) aZ + tRandom.nextFloat() * 0.8F + 0.1F),
new ItemStack(tItem.getItem(), tItem.stackSize, tItem.getItemDamage()));
if (tItem.hasTagCompound()) {
- tItemEntity.getEntityItem().setTagCompound((NBTTagCompound)
- tItem.getTagCompound().copy());
+ tItemEntity.getEntityItem().setTagCompound((NBTTagCompound) tItem.getTagCompound().copy());
}
tItemEntity.motionX = tRandom.nextGaussian() * 0.0500000007450581D;
@@ -359,10 +355,8 @@ public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableB
public ArrayList<ItemStack> getDrops(World aWorld, int aX, int aY, int aZ, int aMeta, int aFortune) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
- return tTileEntity instanceof IGregTechTileEntity
- ? ((IGregTechTileEntity) tTileEntity).getDrops()
- : (mTemporaryTileEntity.get() == null
- ? new ArrayList()
+ return tTileEntity instanceof IGregTechTileEntity ? ((IGregTechTileEntity) tTileEntity).getDrops()
+ : (mTemporaryTileEntity.get() == null ? new ArrayList()
: ((IGregTechTileEntity) mTemporaryTileEntity.get()).getDrops());
}
@@ -436,10 +430,8 @@ public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableB
public int getLightOpacity(IBlockAccess aWorld, int aX, int aY, int aZ) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
- return tTileEntity == null
- ? 0
- : (tTileEntity instanceof IGregTechTileEntity
- ? ((IGregTechTileEntity) tTileEntity).getLightOpacity()
+ return tTileEntity == null ? 0
+ : (tTileEntity instanceof IGregTechTileEntity ? ((IGregTechTileEntity) tTileEntity).getLightOpacity()
: (aWorld.getBlockMetadata(aX, aY, aZ) == 0 ? 255 : 0));
}
@@ -449,21 +441,12 @@ public class GTPP_Block_Machines extends GT_Generic_Block implements IDebugableB
}
public TileEntity createTileEntity(World aWorld, int aMeta) {
- return (TileEntity)
- (aMeta >= 4
- ? Meta_GT_Proxy.constructBaseMetaTileEntity()
- : Meta_GT_Proxy.constructBaseMetaTileEntityCustomPower());
- }
-
- public float getExplosionResistance(
- Entity par1Entity,
- World aWorld,
- int aX,
- int aY,
- int aZ,
- double explosionX,
- double explosionY,
- double explosionZ) {
+ return (TileEntity) (aMeta >= 4 ? Meta_GT_Proxy.constructBaseMetaTileEntity()
+ : Meta_GT_Proxy.constructBaseMetaTileEntityCustomPower());
+ }
+
+ public float getExplosionResistance(Entity par1Entity, World aWorld, int aX, int aY, int aZ, double explosionX,
+ double explosionY, double explosionZ) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
return tTileEntity instanceof IGregTechTileEntity
? ((IGregTechTileEntity) tTileEntity).getBlastResistance((byte) 6)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java
index 9e732d2443..0a4c5bd4a4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java
@@ -1,14 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_ItsNotMyFaultException;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
@@ -17,7 +10,17 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_ItsNotMyFaultException;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
+
public class GTPP_Item_Machines extends ItemBlock {
+
public GTPP_Item_Machines(Block par1) {
super(par1);
this.setMaxDamage(0);
@@ -40,33 +43,12 @@ public class GTPP_Item_Machines extends ItemBlock {
final long tVoltage = aNBT.getInputVoltage();
byte tTier = (byte) ((byte) Math.max(1, GT_Utility.getTier(tVoltage)));
- /*if (aNBT.getDescription() != null) {
- int tAmount = 0;
- String[] arg7 = aNBT.getDescription();
- int arg8 = arg7.length-1;
-
- if (arg7 != null && arg7.length > 0) {
- for (String t : arg7) {
- aList.add(t);
- }
-
- }
- else {
- aList.add("ERROR");
- }
-
- for (int y = 0; y < arg8; y++) {
- String tDescription = arg7[y];
-
- if (tDescription != null) {
- aList.add(tDescription+"|"+arg8);
- continue;
- }
- else {
- continue;
- }
- }
- }*/
+ /*
+ * if (aNBT.getDescription() != null) { int tAmount = 0; String[] arg7 = aNBT.getDescription(); int arg8
+ * = arg7.length-1; if (arg7 != null && arg7.length > 0) { for (String t : arg7) { aList.add(t); } }
+ * else { aList.add("ERROR"); } for (int y = 0; y < arg8; y++) { String tDescription = arg7[y]; if
+ * (tDescription != null) { aList.add(tDescription+"|"+arg8); continue; } else { continue; } } }
+ */
if (aNBT.getEUCapacity() > 0L) {
@@ -76,26 +58,37 @@ public class GTPP_Item_Machines extends ItemBlock {
if ((e - 30400) <= 10) {
tTier -= 2;
aList.add(EnumChatFormatting.BOLD + "16" + " Fuse Slots" + EnumChatFormatting.GRAY);
- aList.add("Per each fuse, you may insert " + EnumChatFormatting.YELLOW
- + (GT_Values.V[tTier]) + EnumChatFormatting.GRAY + " EU/t");
- aList.add("However this " + EnumChatFormatting.ITALIC + EnumChatFormatting.RED + "MUST"
- + EnumChatFormatting.GRAY + " be in a single Amp");
- aList.add("This machine can accept upto a single amp of "
- + GT_Values.VN[Math.min(tTier + 2, 12)] + " as a result");
- aList.add(GT_LanguageManager.addStringLocalization(
+ aList.add(
+ "Per each fuse, you may insert " + EnumChatFormatting.YELLOW
+ + (GT_Values.V[tTier])
+ + EnumChatFormatting.GRAY
+ + " EU/t");
+ aList.add(
+ "However this " + EnumChatFormatting.ITALIC
+ + EnumChatFormatting.RED
+ + "MUST"
+ + EnumChatFormatting.GRAY
+ + " be in a single Amp");
+ aList.add(
+ "This machine can accept upto a single amp of "
+ + GT_Values.VN[Math.min(tTier + 2, 12)]
+ + " as a result");
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
"TileEntity_Breaker_Loss",
- "Breaker Loss: " + EnumChatFormatting.RED + ""
+ "Breaker Loss: " + EnumChatFormatting.RED
+ + ""
+ (GT_Values.V[Math.max(tTier - 1, 0)] / 10)
- + EnumChatFormatting.GRAY + " EU/t",
- !GregTech_API.sPostloadFinished)
- + EnumChatFormatting.GRAY);
+ + EnumChatFormatting.GRAY
+ + " EU/t",
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY);
}
- aList.add(GT_LanguageManager.addStringLocalization(
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
"TileEntity_Special_Power_1",
EnumChatFormatting.RED + "Special Power Handling, please read manual",
- !GregTech_API.sPostloadFinished)
- + EnumChatFormatting.GRAY);
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY);
// aList.add(GT_LanguageManager.addStringLocalization("TileEntity_BreakerBox_2",
// EnumChatFormatting.RED+"Special Power Handling, please read manual",
// !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY);
@@ -107,66 +100,93 @@ public class GTPP_Item_Machines extends ItemBlock {
if (aNBT.getInputVoltage() > 0L) {
String inA = "0";
if (aNBT.getInputAmperage() >= 1L) {
- inA = " at " + EnumChatFormatting.YELLOW + aNBT.getInputAmperage() + EnumChatFormatting.GRAY
+ inA = " at " + EnumChatFormatting.YELLOW
+ + aNBT.getInputAmperage()
+ + EnumChatFormatting.GRAY
+ " Amps";
} else {
- inA = " at " + EnumChatFormatting.WHITE + aNBT.getInputAmperage() + EnumChatFormatting.GRAY
+ inA = " at " + EnumChatFormatting.WHITE
+ + aNBT.getInputAmperage()
+ + EnumChatFormatting.GRAY
+ " Amps";
}
- String a1 = "Voltage IN: " + EnumChatFormatting.GREEN + aNBT.getInputVoltage()
- + " (" + GT_Values.VN[GT_Utility.getTier(aNBT.getInputVoltage())] + ")"
- + EnumChatFormatting.GRAY + inA;
+ String a1 = "Voltage IN: " + EnumChatFormatting.GREEN
+ + aNBT.getInputVoltage()
+ + " ("
+ + GT_Values.VN[GT_Utility.getTier(aNBT.getInputVoltage())]
+ + ")"
+ + EnumChatFormatting.GRAY
+ + inA;
aList.add(a1);
}
if (aNBT.getOutputVoltage() > 0L) {
String outA = "0";
if (aNBT.getOutputAmperage() >= 1L) {
- outA = " at " + EnumChatFormatting.YELLOW + aNBT.getOutputAmperage()
- + EnumChatFormatting.GRAY + " Amps";
+ outA = " at " + EnumChatFormatting.YELLOW
+ + aNBT.getOutputAmperage()
+ + EnumChatFormatting.GRAY
+ + " Amps";
} else {
- outA = " at " + EnumChatFormatting.WHITE + aNBT.getOutputAmperage()
- + EnumChatFormatting.GRAY + " Amps";
+ outA = " at " + EnumChatFormatting.WHITE
+ + aNBT.getOutputAmperage()
+ + EnumChatFormatting.GRAY
+ + " Amps";
}
- String a1 = "Voltage OUT: " + EnumChatFormatting.GREEN + aNBT.getOutputVoltage()
- + " (" + GT_Values.VN[GT_Utility.getTier(aNBT.getOutputVoltage())] + ")"
- + EnumChatFormatting.GRAY + outA;
+ String a1 = "Voltage OUT: " + EnumChatFormatting.GREEN
+ + aNBT.getOutputVoltage()
+ + " ("
+ + GT_Values.VN[GT_Utility.getTier(aNBT.getOutputVoltage())]
+ + ")"
+ + EnumChatFormatting.GRAY
+ + outA;
aList.add(a1);
}
- aList.add(GT_LanguageManager.addStringLocalization(
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
"TileEntity_Lossess_EU",
"Transmission Loss: " + EnumChatFormatting.DARK_BLUE + "0",
- !GregTech_API.sPostloadFinished)
- + EnumChatFormatting.GRAY);
-
- aList.add(GT_LanguageManager.addStringLocalization(
- "TileEntity_EUp_STORE2", "Internal Capacity: ", !GregTech_API.sPostloadFinished)
- + EnumChatFormatting.BLUE + aNBT.getEUCapacity()
- + EnumChatFormatting.GRAY + " EU");
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.GRAY);
+
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
+ "TileEntity_EUp_STORE2",
+ "Internal Capacity: ",
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.BLUE
+ + aNBT.getEUCapacity()
+ + EnumChatFormatting.GRAY
+ + " EU");
}
}
NBTTagCompound arg16 = aStack.getTagCompound();
if (arg16 != null) {
if (arg16.getBoolean("mMuffler")) {
- aList.add(GT_LanguageManager.addStringLocalization(
- "GT_TileEntity_MUFFLER", "has Muffler Upgrade", !GregTech_API.sPostloadFinished));
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
+ "GT_TileEntity_MUFFLER",
+ "has Muffler Upgrade",
+ !GregTech_API.sPostloadFinished));
}
if (arg16.getBoolean("mSteamConverter")) {
- aList.add(GT_LanguageManager.addStringLocalization(
- "GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade", !GregTech_API.sPostloadFinished));
+ aList.add(
+ GT_LanguageManager.addStringLocalization(
+ "GT_TileEntity_STEAMCONVERTER",
+ "has Steam Upgrade",
+ !GregTech_API.sPostloadFinished));
}
boolean arg17 = false;
byte arg18;
if ((arg18 = arg16.getByte("mSteamTanks")) > 0) {
- aList.add(arg18 + " "
- + GT_LanguageManager.addStringLocalization(
- "GT_TileEntity_STEAMTANKS",
- "Steam Tank Upgrades",
- !GregTech_API.sPostloadFinished));
+ aList.add(
+ arg18 + " "
+ + GT_LanguageManager.addStringLocalization(
+ "GT_TileEntity_STEAMTANKS",
+ "Steam Tank Upgrades",
+ !GregTech_API.sPostloadFinished));
}
}
@@ -177,17 +197,8 @@ public class GTPP_Item_Machines extends ItemBlock {
}
}
- public boolean onItemUseFirst(
- ItemStack stack,
- EntityPlayer player,
- World world,
- int x,
- int y,
- int z,
- int side,
- float hitX,
- float hitY,
- float hitZ) {
+ public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
+ float hitX, float hitY, float hitZ) {
return false;
}
@@ -209,18 +220,8 @@ public class GTPP_Item_Machines extends ItemBlock {
}
}
- public boolean placeBlockAt(
- ItemStack aStack,
- EntityPlayer aPlayer,
- World aWorld,
- int aX,
- int aY,
- int aZ,
- int side,
- float hitX,
- float hitY,
- float hitZ,
- int aMeta) {
+ public boolean placeBlockAt(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int side,
+ float hitX, float hitY, float hitZ, int aMeta) {
short tDamage = (short) ((short) this.getDamage(aStack) + 30400); // Add Offset;
if (tDamage > 0) {
if (GregTech_API.METATILEENTITIES[tDamage] == null) {
@@ -229,8 +230,12 @@ public class GTPP_Item_Machines extends ItemBlock {
byte tMetaData = 32;
// byte tMetaData = GregTech_API.METATILEENTITIES[tDamage].getTileEntityBaseType();
- Logger.INFO("Using Meta: " + tMetaData + " for ID " + tDamage + " | "
- + GregTech_API.METATILEENTITIES[tDamage].getInventoryName());
+ Logger.INFO(
+ "Using Meta: " + tMetaData
+ + " for ID "
+ + tDamage
+ + " | "
+ + GregTech_API.METATILEENTITIES[tDamage].getInventoryName());
if (!aWorld.setBlock(aX, aY, aZ, this.field_150939_a, tMetaData, 3)) {
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index 026d3d471f..533676f75b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.TAE;
@@ -8,9 +12,6 @@ import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract {
@@ -26,12 +27,11 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract {
}
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Centrifuge Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".2.name", "Heat Resistant Coke Oven Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); // 60
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".4.name", "Material Press Machine Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Heat Resistant Coke Oven Casing");
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); // 60
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Material Press Machine Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Electrolyzer Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Wire Factory Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Maceration Stack Casing");
@@ -41,8 +41,8 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract {
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Multitank Exterior Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Hastelloy-N Reactor Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Zeron-100 Reactor Shielding");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".14.name", "Blast Smelter Heat Containment Coil ");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".14.name", "Blast Smelter Heat Containment Coil ");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Blast Smelter Casing Block");
GregtechItemList.Casing_Centrifuge1.set(new ItemStack(this, 1, 0));
GregtechItemList.Casing_CokeOven.set(new ItemStack(this, 1, 1));
@@ -69,8 +69,8 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract {
@Override
@SideOnly(Side.CLIENT)
- public IIcon getIcon(
- final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide) {
+ public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide) {
final GregtechMetaCasingBlocks i = this;
return CasingTextureHandler.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, i);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
index 3c55d2fa95..320fefb583 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
@@ -1,5 +1,12 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
import gregtech.api.enums.TAE;
import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Utility;
@@ -8,11 +15,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler2;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
public class GregtechMetaCasingBlocks2 extends GregtechMetaCasingBlocksAbstract {
@@ -47,13 +49,13 @@ public class GregtechMetaCasingBlocks2 extends GregtechMetaCasingBlocksAbstract
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Thermal Processing Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Hastelloy-N Sealant Block");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Hastelloy-X Structural Block");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".3.name", "Incoloy-DS Fluid Containment Block");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Incoloy-DS Fluid Containment Block");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Wash Plant Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Industrial Sieve Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Large Sieve Grate");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (EV)");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (EV)");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Sub-Station External Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Cyclotron Coil");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Cyclotron Outer Casing");
@@ -61,8 +63,9 @@ public class GregtechMetaCasingBlocks2 extends GregtechMetaCasingBlocksAbstract
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Bulk Production Frame");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Cutting Factory Frame");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", ""); // Unused
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".15.name", "Sterile Farm Casing"); // Tree Farmer Textures
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Sterile Farm Casing"); // Tree
+ // Farmer
+ // Textures
GregtechItemList.Casing_ThermalCentrifuge.set(new ItemStack(this, 1, 0));
GregtechItemList.Casing_Refinery_External.set(new ItemStack(this, 1, 1));
GregtechItemList.Casing_Refinery_Structural.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index 59bcfa5347..de7e6aa953 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.TAE;
@@ -11,12 +19,6 @@ import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler3;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract {
@@ -54,25 +56,26 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel Reinforced Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Multi-Use Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Trinium Plated Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".4.name", "Vanadium Redox Power Cell (IV)");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".5.name", "Vanadium Redox Power Cell (LuV)");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".6.name", "Vanadium Redox Power Cell (ZPM)");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Vanadium Redox Power Cell (IV)");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".5.name", "Vanadium Redox Power Cell (LuV)");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".6.name", "Vanadium Redox Power Cell (ZPM)");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".12.name", "Fusion Machine Casing MK III");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion Machine Casing MK III");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Advanced Fusion Coil");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".14.name",
- "Unnamed"); // Can Use, don't change texture (Used for Fusion MK4)
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Unnamed"); // Can Use, don't
+ // change texture
+ // (Used for Fusion
+ // MK4)
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Containment Casing");
GregtechItemList.Casing_FishPond.set(new ItemStack(this, 1, 0));
GregtechItemList.Casing_Extruder.set(new ItemStack(this, 1, 1));
@@ -98,8 +101,8 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract
@SideOnly(Side.CLIENT)
@Override
- public IIcon getIcon(
- final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide) {
+ public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide) {
final Block thisBlock = aWorld.getBlock(xCoord, yCoord, zCoord);
final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
if ((tMeta != 12) || !GregtechMetaCasingBlocks3.mConnectedMachineTextures) {
@@ -108,19 +111,18 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract
final int tStartIndex = 0;
if (tMeta == 12) {
final boolean[] tConnectedSides = {
- aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock
- && aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta,
- aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock
- && aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta,
- aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock
- && aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta,
- aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock
- && aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta,
- aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock
- && aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta,
- aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock
- && aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta
- };
+ aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock
+ && aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta,
+ aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock
+ && aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta,
+ aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock
+ && aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta,
+ aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock
+ && aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta,
+ aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock
+ && aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta,
+ aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock
+ && aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta };
switch (aSide) {
case 0: {
if (tConnectedSides[0]) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
index 8256f1aa64..b637bd2113 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
import gregtech.api.util.GT_LanguageManager;
@@ -7,8 +10,6 @@ import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
public class GregtechMetaCasingBlocks4 extends GregtechMetaCasingBlocksAbstract {
@@ -24,8 +25,8 @@ public class GregtechMetaCasingBlocks4 extends GregtechMetaCasingBlocksAbstract
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reactor Piping");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Naquadah Containment Chamber");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Tempered Arc Furnace Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".4.name", "Quantum Force Transformer Coil Casings"); // Unused
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Quantum Force Transformer Coil Casings"); // Unused
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", ""); // Unused
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", ""); // Unused
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", ""); // Unused
@@ -48,12 +49,12 @@ public class GregtechMetaCasingBlocks4 extends GregtechMetaCasingBlocksAbstract
// private static final LargeTurbineTextureHandler mTurbineTextures = new LargeTurbineTextureHandler();
- /*@Override
- @SideOnly(Side.CLIENT)
- public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide) {
- final GregtechMetaCasingBlocks4 i = this;
- return mTurbineTextures.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, i);
- }*/
+ /*
+ * @Override
+ * @SideOnly(Side.CLIENT) public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final
+ * int zCoord, final int aSide) { final GregtechMetaCasingBlocks4 i = this; return
+ * mTurbineTextures.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, i); }
+ */
@Override
public IIcon getIcon(final int aSide, final int aMeta) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
index 68d8349ef3..700e14c711 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.TAE;
@@ -10,9 +14,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGrinderMultiblock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract {
@@ -23,34 +24,34 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract
public GregtechMetaCasingBlocks5() {
super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.5", GT_Material_Casings.INSTANCE);
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".0.name", "IsaMill Exterior Casing"); // IsaMill Casing
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "IsaMill Exterior Casing"); // IsaMill
+ // Casing
TAE.registerTexture(0, 2, new GTPP_CopiedBlockTexture(this, 6, 0));
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".1.name", "IsaMill Piping"); // IsaMill Pipe
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".2.name", "IsaMill Gearbox"); // IsaMill Gearbox
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".3.name", "Elemental Confinement Shell"); // Duplicator Casing
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "IsaMill Piping"); // IsaMill
+ // Pipe
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "IsaMill Gearbox"); // IsaMill
+ // Gearbox
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Elemental Confinement Shell"); // Duplicator
+ // Casing
TAE.registerTexture(0, 3, new GTPP_CopiedBlockTexture(this, 6, 3));
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".4.name", "Sparge Tower Exterior Casing"); // Sparge Tower Casing
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Sparge Tower Exterior Casing"); // Sparge
+ // Tower
+ // Casing
TAE.registerTexture(0, 4, new GTPP_CopiedBlockTexture(this, 6, 4));
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".5.name", "Sturdy Printer Casing"); // Unused
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Sturdy Printer Casing"); // Unused
TAE.registerTexture(1, 10, new GTPP_CopiedBlockTexture(this, 6, 5));
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".6.name", "Forge Casing"); // Forge Hammer Casing
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Forge Casing"); // Forge Hammer
+ // Casing
TAE.registerTexture(1, 11, new GTPP_CopiedBlockTexture(this, 6, 6));
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Neutron Pulse Manipulator");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Cosmic Fabric Manipulator");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Infinity Infused Manipulator");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "SpaceTime Continuum Ripper");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Neutron Shielding Core");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".12.name", "Cosmic Fabric Shielding Core");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".13.name", "Infinity Infused Shielding Core");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".12.name", "Cosmic Fabric Shielding Core");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".13.name", "Infinity Infused Shielding Core");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "SpaceTime Bending Core");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Force Field Glass");
@@ -134,8 +135,8 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract
@Override
@SideOnly(Side.CLIENT)
- public IIcon getIcon(
- final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide) {
+ public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide) {
final GregtechMetaCasingBlocks5 i = this;
return mGrinderOverlayHandler.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, i);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
index 683159de98..2d4973aa9f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
@@ -1,13 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Block_Casings_Abstract;
-import gtPlusPlus.core.creative.AddToCreativeTab;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,15 +17,23 @@ import net.minecraft.util.StatCollector;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.GregTech_API;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.common.blocks.GT_Block_Casings_Abstract;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+
public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_Abstract {
- public GregtechMetaCasingBlocksAbstract(
- final Class<? extends ItemBlock> aItemClass, final String aName, final Material aMaterial) {
+
+ public GregtechMetaCasingBlocksAbstract(final Class<? extends ItemBlock> aItemClass, final String aName,
+ final Material aMaterial) {
super(aItemClass, aName, aMaterial);
this.setStepSound(soundTypeMetal);
this.setCreativeTab(AddToCreativeTab.tabMachines);
GregTech_API.registerMachineBlock(this, -1);
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
}
@Override
@@ -101,16 +104,16 @@ public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_
}
@Override
- public void breakBlock(
- final World aWorld, final int aX, final int aY, final int aZ, final Block aBlock, final int aMetaData) {
+ public void breakBlock(final World aWorld, final int aX, final int aY, final int aZ, final Block aBlock,
+ final int aMetaData) {
if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
}
}
@Override
- public boolean canCreatureSpawn(
- final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+ public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
+ final int z) {
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java
index 22c1d87b4e..90fff051eb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
+import java.util.HashMap;
+
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.Textures;
@@ -7,9 +12,6 @@ import gregtech.api.util.GT_LanguageManager;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.HashMap;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlocksAbstract {
@@ -19,8 +21,8 @@ public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlock
super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.pipesgears", GT_Material_Casings.INSTANCE);
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Eglin Steel Gear Box Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel-792 Gear Box Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".2.name", "Incoloy MA956 Gear Box Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Incoloy MA956 Gear Box Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Nitinol-60 Gear Box Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Zeron-100 Gear Box Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Pikyonium Gear Box Casing");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
index 9927060164..f86c6af265 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
import net.minecraft.block.Block;
public class GregtechMetaCasingItems extends GregtechMetaItemCasingsAbstract {
+
public GregtechMetaCasingItems(final Block par1) {
super(par1);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
index ba4929c011..13d58aac5f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
@@ -1,18 +1,20 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
public class GregtechMetaItemCasings1 extends GregtechMetaItemCasingsAbstract {
+
public GregtechMetaItemCasings1(final Block par1) {
super(par1);
}
@Override
- public void addInformation(
- final ItemStack aStack, final EntityPlayer aPlayer, final List aList, final boolean aF3_H) {
+ public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList,
+ final boolean aF3_H) {
super.addInformation(aStack, aPlayer, aList, aF3_H);
switch (this.getDamage(aStack)) {
case 0:
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
index d9102f0994..d6ebda4199 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
@@ -1,26 +1,28 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
-import gregtech.api.util.GT_LanguageManager;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
+import gregtech.api.util.GT_LanguageManager;
+
public abstract class GregtechMetaItemCasingsAbstract extends ItemBlock {
- protected final String mCasing_Centrifuge = GT_LanguageManager.addStringLocalization(
- "mu.centrifugecasing", "Warning! Standing in the Centrifuge not recommended");
- protected final String mCasing_CokeOven =
- GT_LanguageManager.addStringLocalization("mu.cokeoven", "Sturdy and Strong");
- protected final String mCasing_CokeCoil1 =
- GT_LanguageManager.addStringLocalization("mu.coil01tooltip", "Base Heating Capacity = 1350 Kelvin");
- protected final String mCasing_CokeCoil2 =
- GT_LanguageManager.addStringLocalization("mu.coil02tooltip", "Base Heating Capacity = 2275 Kelvin");
- protected final String mNoMobsToolTip =
- GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
- protected final String mNoTileEntityToolTip =
- GT_LanguageManager.addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!");
+ protected final String mCasing_Centrifuge = GT_LanguageManager
+ .addStringLocalization("mu.centrifugecasing", "Warning! Standing in the Centrifuge not recommended");
+ protected final String mCasing_CokeOven = GT_LanguageManager
+ .addStringLocalization("mu.cokeoven", "Sturdy and Strong");
+ protected final String mCasing_CokeCoil1 = GT_LanguageManager
+ .addStringLocalization("mu.coil01tooltip", "Base Heating Capacity = 1350 Kelvin");
+ protected final String mCasing_CokeCoil2 = GT_LanguageManager
+ .addStringLocalization("mu.coil02tooltip", "Base Heating Capacity = 2275 Kelvin");
+ protected final String mNoMobsToolTip = GT_LanguageManager
+ .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
+ protected final String mNoTileEntityToolTip = GT_LanguageManager
+ .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!");
public GregtechMetaItemCasingsAbstract(final Block par1) {
super(par1);
@@ -40,8 +42,8 @@ public abstract class GregtechMetaItemCasingsAbstract extends ItemBlock {
}
@Override
- public void addInformation(
- final ItemStack aStack, final EntityPlayer aPlayer, final List aList, final boolean aF3_H) {
+ public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList,
+ final boolean aF3_H) {
super.addInformation(aStack, aPlayer, aList, aF3_H);
switch (this.getDamage(aStack)) {
case 0:
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
index f0a69e49d3..5c386fe59a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
@@ -1,5 +1,12 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
import gregtech.api.util.GT_LanguageManager;
@@ -7,11 +14,6 @@ import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksAbstract {
@@ -38,13 +40,13 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA
// Don't register these Textures, They already exist within vanilla GT. (May not exist in 5.08)
}
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Strong Bronze Machine Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".1.name", "Sturdy Aluminium Machine Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".2.name", "Vigorous Laurenium Machine Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".1.name", "Sturdy Aluminium Machine Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Vigorous Laurenium Machine Casing");
TAE.registerTexture(84, new GTPP_CopiedBlockTexture(this, 6, 2));
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".3.name", "Rugged Botmium Machine Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Rugged Botmium Machine Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
index 47b9d9b093..3d1aa88f6c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.TAE;
@@ -10,12 +18,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.turbine.LargeTurbineTextureHandler;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbstract {
@@ -38,29 +40,29 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
public GregtechMetaSpecialMultiCasings() {
super(SpecialCasingItemBlock.class, "gtplusplus.blockspecialcasings.1", GT_Material_Casings.INSTANCE);
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Turbine Shaft");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".1.name", "Reinforced Steam Turbine Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".2.name", "Reinforced HP Steam Turbine Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".3.name", "Reinforced Gas Turbine Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".4.name", "Reinforced Plasma Turbine Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reinforced Steam Turbine Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".2.name", "Reinforced HP Steam Turbine Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".3.name", "Reinforced Gas Turbine Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".4.name", "Reinforced Plasma Turbine Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Tesla Containment Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Structural Solar Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Salt Containment Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Thermally Insulated Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Flotation Cell Casings");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Reinforced Engine Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".11.name", "Molecular Containment Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".12.name", "High Voltage Current Capacitor");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".11.name", "Molecular Containment Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".12.name", "High Voltage Current Capacitor");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Particle Containment Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".14.name", "Reinforced Heat Exchanger Casing");
- GT_LanguageManager.addStringLocalization(
- this.getUnlocalizedName() + ".15.name", "Reinforced SC Turbine Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".14.name", "Reinforced Heat Exchanger Casing");
+ GT_LanguageManager
+ .addStringLocalization(this.getUnlocalizedName() + ".15.name", "Reinforced SC Turbine Casing");
TAE.registerTexture(1, 12, new GTPP_CopiedBlockTexture(this, 6, 14));
GregtechItemList.Casing_Turbine_Shaft.set(new ItemStack(this, 1, 0));
@@ -83,8 +85,8 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
@Override
@SideOnly(Side.CLIENT)
- public IIcon getIcon(
- final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide) {
+ public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide) {
return LargeTurbineTextureHandler.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, this);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java
index 664f949b30..6237ce7a9e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.Textures;
@@ -7,12 +15,6 @@ import gregtech.api.util.GT_LanguageManager;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class GregtechMetaSpecialMultiCasings2 extends GregtechMetaCasingBlocksAbstract {
@@ -70,8 +72,8 @@ public class GregtechMetaSpecialMultiCasings2 extends GregtechMetaCasingBlocksAb
@Override
@SideOnly(Side.CLIENT)
- public IIcon getIcon(
- final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide) {
+ public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide) {
return getStaticIcon((byte) aSide, (byte) aWorld.getBlockMetadata(xCoord, yCoord, zCoord));
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
index b511926137..39171a1c05 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
@@ -1,16 +1,18 @@
package gtPlusPlus.xmod.gregtech.common.blocks;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gregtech.api.util.GT_LanguageManager;
import gregtech.common.blocks.GT_Material_Casings;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbstract {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index 7ffa95c081..f42768c451 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.blocks.fluid;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.api.objects.Logger;
@@ -8,8 +11,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidRegistry;
public class GregtechFluidHandler {
@@ -21,20 +22,32 @@ public class GregtechFluidHandler {
private static void start() {
- /* Meta_GT_Proxy.addFluid("lubricant", "Lubricant", Materials.Lubricant, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("creosote", "Creosote Oil", Materials.Creosote, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("seedoil", "Seed Oil", Materials.SeedOil, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("fishoil", "Fish Oil", Materials.FishOil, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("oil", "Oil", Materials.Oil, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("fuel", "Diesel", Materials.Fuel, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("for.honey", "Honey", Materials.Honey, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("biomass", "Biomass", Materials.Biomass, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("bioethanol", "Bio Ethanol", Materials.Ethanol, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("sulfuricacid", "Sulfuric Acid", Materials.SulfuricAcid, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("milk", "Milk", Materials.Milk, 1, 290, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("mcguffium", "Mc Guffium 239", Materials.McGuffium239, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), ItemUtils.getEmptyCell(), 1000);
- Meta_GT_Proxy.addFluid("glue", "Glue", Materials.Glue, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemUtils.getEmptyCell(), 1000);
- */
+ /*
+ * Meta_GT_Proxy.addFluid("lubricant", "Lubricant", Materials.Lubricant, 1, 295,
+ * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L), ItemUtils.getEmptyCell(), 1000);
+ * Meta_GT_Proxy.addFluid("creosote", "Creosote Oil", Materials.Creosote, 1, 295,
+ * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L), ItemUtils.getEmptyCell(), 1000);
+ * Meta_GT_Proxy.addFluid("seedoil", "Seed Oil", Materials.SeedOil, 1, 295,
+ * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L), ItemUtils.getEmptyCell(), 1000);
+ * Meta_GT_Proxy.addFluid("fishoil", "Fish Oil", Materials.FishOil, 1, 295,
+ * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L), ItemUtils.getEmptyCell(), 1000);
+ * Meta_GT_Proxy.addFluid("oil", "Oil", Materials.Oil, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell,
+ * Materials.Oil, 1L), ItemUtils.getEmptyCell(), 1000); Meta_GT_Proxy.addFluid("fuel", "Diesel", Materials.Fuel,
+ * 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L), ItemUtils.getEmptyCell(), 1000);
+ * Meta_GT_Proxy.addFluid("for.honey", "Honey", Materials.Honey, 1, 295,
+ * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L), ItemUtils.getEmptyCell(), 1000);
+ * Meta_GT_Proxy.addFluid("biomass", "Biomass", Materials.Biomass, 1, 295,
+ * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L), ItemUtils.getEmptyCell(), 1000);
+ * Meta_GT_Proxy.addFluid("bioethanol", "Bio Ethanol", Materials.Ethanol, 1, 295,
+ * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), ItemUtils.getEmptyCell(), 1000);
+ * Meta_GT_Proxy.addFluid("sulfuricacid", "Sulfuric Acid", Materials.SulfuricAcid, 1, 295,
+ * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L), ItemUtils.getEmptyCell(), 1000);
+ * Meta_GT_Proxy.addFluid("milk", "Milk", Materials.Milk, 1, 290, GT_OreDictUnificator.get(OrePrefixes.cell,
+ * Materials.Milk, 1L), ItemUtils.getEmptyCell(), 1000); Meta_GT_Proxy.addFluid("mcguffium", "Mc Guffium 239",
+ * Materials.McGuffium239, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L),
+ * ItemUtils.getEmptyCell(), 1000); Meta_GT_Proxy.addFluid("glue", "Glue", Materials.Glue, 1, 295,
+ * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemUtils.getEmptyCell(), 1000);
+ */
if (!LoadedMods.ThermalFoundation) {
@@ -90,7 +103,10 @@ public class GregtechFluidHandler {
generateIC2FluidCell("HydrofluoricAcid");
FluidUtils.generateFluidNoPrefix(
- "SulfurDioxide", "High Quality Sulfur Dioxide", 263, GT_Materials.SulfurDioxide.mRGBa);
+ "SulfurDioxide",
+ "High Quality Sulfur Dioxide",
+ 263,
+ GT_Materials.SulfurDioxide.mRGBa);
FluidUtils.addGtFluid(
"sulfurousAcid",
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
index 467602ce04..ef2d25cf3e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
@@ -1,10 +1,11 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
-import gregtech.api.enums.Textures;
-import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
+import gregtech.api.enums.Textures;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+
public class CasingTextureHandler {
// private static final TexturesGregtech59 gregtech59 = new TexturesGregtech59();
@@ -14,46 +15,46 @@ public class CasingTextureHandler {
public static IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's. case 0 == ID[57]
if ((aMeta >= 0) && (aMeta < 16)) {
switch (aMeta) {
- // Centrifuge
+ // Centrifuge
case 0:
return TexturesGtBlock.Casing_Material_Centrifuge.getIcon();
- // Coke Oven Frame
+ // Coke Oven Frame
case 1:
return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
- // Coke Oven Casing Tier 1
+ // Coke Oven Casing Tier 1
case 2:
return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon();
- // Coke Oven Casing Tier 2
+ // Coke Oven Casing Tier 2
case 3:
return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon();
- // Material Press Casings
+ // Material Press Casings
case 4:
return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
- // Electrolyzer Casings
+ // Electrolyzer Casings
case 5:
return TexturesGtBlock.Casing_Material_Potin.getIcon();
- // Broken Blue Fusion Casings
+ // Broken Blue Fusion Casings
case 6:
return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
- // Maceration Stack Casings
+ // Maceration Stack Casings
case 7:
return TexturesGtBlock.Casing_Material_Tumbaga.getIcon();
- // Broken Pink Fusion Casings
+ // Broken Pink Fusion Casings
case 8:
return TexturesGtBlock.TEXTURE_ORGANIC_PANEL_A_GLOWING.getIcon();
- // Matter Fabricator Casings
+ // Matter Fabricator Casings
case 9:
return TexturesGtBlock.TEXTURE_METAL_PANEL_F.getIcon();
- // Iron Blast Fuance Textures
+ // Iron Blast Fuance Textures
case 10:
return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
- // Multitank Exterior Casing
+ // Multitank Exterior Casing
case 11:
return TexturesGtBlock.Casing_Material_Grisium.getIcon();
- // Reactor Casing I
+ // Reactor Casing I
case 12:
return TexturesGtBlock.Casing_Material_Stellite.getIcon();
- // Reactor Casing II
+ // Reactor Casing II
case 13:
return TexturesGtBlock.Casing_Material_Zeron100.getIcon();
case 14:
@@ -68,17 +69,13 @@ public class CasingTextureHandler {
return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon();
}
- public static IIcon handleCasingsGT(
- final IBlockAccess aWorld,
- final int xCoord,
- final int yCoord,
- final int zCoord,
- final int aSide,
- final GregtechMetaCasingBlocks thisBlock) {
- /*if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
- return gregtech59.handleCasingsGT59(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
- }
- return gregtech58.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);*/
+ public static IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide, final GregtechMetaCasingBlocks thisBlock) {
+ /*
+ * if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ return gregtech59.handleCasingsGT59(aWorld, xCoord, yCoord,
+ * zCoord, aSide, thisBlock); } return gregtech58.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide,
+ * thisBlock);
+ */
return gregtechX.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
index 20519c0bb1..1d0f5e0699 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
@@ -1,8 +1,9 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
-import gregtech.api.enums.Textures;
import net.minecraft.util.IIcon;
+import gregtech.api.enums.Textures;
+
public class CasingTextureHandler2 {
public static IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's. case 0 == ID[57]
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
index da2a09c7d2..c3d2e90c12 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
@@ -1,8 +1,9 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
-import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks3;
import net.minecraft.util.IIcon;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks3;
+
public class CasingTextureHandler3 {
public static IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's. case 0 == ID[57]
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
index 2eef9d37f0..129dbd13cc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
@@ -1,13 +1,14 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class TexturesCentrifugeMultiblock {
@@ -49,37 +50,15 @@ public class TexturesCentrifugeMultiblock {
private static CustomIcon frontFace_8 = (GT8_9);
private static CustomIcon frontFaceActive_8 = (GT8_9_Active);
- CustomIcon[] CENTRIFUGE = new CustomIcon[] {
- frontFace_0,
- frontFace_1,
- frontFace_2,
- frontFace_3,
- frontFace_4,
- frontFace_5,
- frontFace_6,
- frontFace_7,
- frontFace_8
- };
+ CustomIcon[] CENTRIFUGE = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4,
+ frontFace_5, frontFace_6, frontFace_7, frontFace_8 };
- CustomIcon[] CENTRIFUGE_ACTIVE = new CustomIcon[] {
- frontFaceActive_0,
- frontFaceActive_1,
- frontFaceActive_2,
- frontFaceActive_3,
- frontFaceActive_4,
- frontFaceActive_5,
- frontFaceActive_6,
- frontFaceActive_7,
- frontFaceActive_8
- };
+ CustomIcon[] CENTRIFUGE_ACTIVE = new CustomIcon[] { frontFaceActive_0, frontFaceActive_1, frontFaceActive_2,
+ frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, frontFaceActive_6, frontFaceActive_7,
+ frontFaceActive_8 };
- public IIcon handleCasingsGT(
- final IBlockAccess aWorld,
- final int xCoord,
- final int yCoord,
- final int zCoord,
- final int aSide,
- final GregtechMetaCasingBlocks thisBlock) {
+ public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide, final GregtechMetaCasingBlocks thisBlock) {
return this.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
}
@@ -88,17 +67,13 @@ public class TexturesCentrifugeMultiblock {
if (!(tTileEntity instanceof IGregTechTileEntity)) return 0;
IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity;
if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialCentrifuge
- && tTile.getFrontFacing() == aSide) return tTile.isActive() ? 1 : 2;
+ && tTile.getFrontFacing() == aSide)
+ return tTile.isActive() ? 1 : 2;
return 0;
}
- public IIcon handleCasingsGT58(
- final IBlockAccess aWorld,
- final int xCoord,
- final int yCoord,
- final int zCoord,
- final int aSide,
- final GregtechMetaCasingBlocks thisBlock) {
+ public IIcon handleCasingsGT58(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide, final GregtechMetaCasingBlocks thisBlock) {
final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
if (tMeta != 0) {
return CasingTextureHandler.getIcon(aSide, tMeta);
@@ -110,9 +85,8 @@ public class TexturesCentrifugeMultiblock {
for (int j = -1; j < 2; j++) {
if (i == 0 && j == 0) continue;
if (isCentrifugeControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide) != 0) {
- IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity)
- aWorld.getTileEntity(xCoord + j, yCoord, zCoord + i))
- .getMetaTileEntity();
+ IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld
+ .getTileEntity(xCoord + j, yCoord, zCoord + i)).getMetaTileEntity();
return getIconByIndex(tMetaTileEntity, 4 - i * 3 - j);
}
}
@@ -123,9 +97,8 @@ public class TexturesCentrifugeMultiblock {
for (int j = -1; j < 2; j++) {
if (i == 0 && j == 0) continue;
if (isCentrifugeControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide) != 0) {
- IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity)
- aWorld.getTileEntity(xCoord + j, yCoord + i, zCoord))
- .getMetaTileEntity();
+ IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld
+ .getTileEntity(xCoord + j, yCoord + i, zCoord)).getMetaTileEntity();
return getIconByIndex(tMetaTileEntity, 4 + i * 3 - j * tInvertLeftRightMod);
}
}
@@ -136,9 +109,8 @@ public class TexturesCentrifugeMultiblock {
for (int j = -1; j < 2; j++) {
if (i == 0 && j == 0) continue;
if (isCentrifugeControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide) != 0) {
- IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity)
- aWorld.getTileEntity(xCoord, yCoord + i, zCoord + j))
- .getMetaTileEntity();
+ IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld
+ .getTileEntity(xCoord, yCoord + i, zCoord + j)).getMetaTileEntity();
return getIconByIndex(tMetaTileEntity, 4 + i * 3 + j * tInvertLeftRightMod);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
index 2298e0731e..d8c84f1886 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
@@ -1,42 +1,43 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class TexturesGregtech58 {
- private static Textures.BlockIcons.CustomIcon GT8_1_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE1");
+ private static Textures.BlockIcons.CustomIcon GT8_1_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ACTIVE1");
private static Textures.BlockIcons.CustomIcon GT8_1 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE1");
- private static Textures.BlockIcons.CustomIcon GT8_2_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE2");
+ private static Textures.BlockIcons.CustomIcon GT8_2_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ACTIVE2");
private static Textures.BlockIcons.CustomIcon GT8_2 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE2");
- private static Textures.BlockIcons.CustomIcon GT8_3_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE3");
+ private static Textures.BlockIcons.CustomIcon GT8_3_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ACTIVE3");
private static Textures.BlockIcons.CustomIcon GT8_3 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE3");
- private static Textures.BlockIcons.CustomIcon GT8_4_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE4");
+ private static Textures.BlockIcons.CustomIcon GT8_4_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ACTIVE4");
private static Textures.BlockIcons.CustomIcon GT8_4 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE4");
- private static Textures.BlockIcons.CustomIcon GT8_5_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE5");
+ private static Textures.BlockIcons.CustomIcon GT8_5_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ACTIVE5");
private static Textures.BlockIcons.CustomIcon GT8_5 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE5");
- private static Textures.BlockIcons.CustomIcon GT8_6_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE6");
+ private static Textures.BlockIcons.CustomIcon GT8_6_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ACTIVE6");
private static Textures.BlockIcons.CustomIcon GT8_6 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE6");
- private static Textures.BlockIcons.CustomIcon GT8_7_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE7");
+ private static Textures.BlockIcons.CustomIcon GT8_7_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ACTIVE7");
private static Textures.BlockIcons.CustomIcon GT8_7 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE7");
- private static Textures.BlockIcons.CustomIcon GT8_8_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE8");
+ private static Textures.BlockIcons.CustomIcon GT8_8_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ACTIVE8");
private static Textures.BlockIcons.CustomIcon GT8_8 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE8");
- private static Textures.BlockIcons.CustomIcon GT8_9_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE9");
+ private static Textures.BlockIcons.CustomIcon GT8_9_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ACTIVE9");
private static Textures.BlockIcons.CustomIcon GT8_9 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE9");
private static Textures.BlockIcons.CustomIcon frontFace_0 = (GT8_1);
@@ -58,47 +59,20 @@ public class TexturesGregtech58 {
private static Textures.BlockIcons.CustomIcon frontFace_8 = (GT8_9);
private static Textures.BlockIcons.CustomIcon frontFaceActive_8 = (GT8_9_Active);
- Textures.BlockIcons.CustomIcon[] TURBINE = new Textures.BlockIcons.CustomIcon[] {
- frontFace_0,
- frontFace_1,
- frontFace_2,
- frontFace_3,
- frontFace_4,
- frontFace_5,
- frontFace_6,
- frontFace_7,
- frontFace_8
- };
+ Textures.BlockIcons.CustomIcon[] TURBINE = new Textures.BlockIcons.CustomIcon[] { frontFace_0, frontFace_1,
+ frontFace_2, frontFace_3, frontFace_4, frontFace_5, frontFace_6, frontFace_7, frontFace_8 };
- Textures.BlockIcons.CustomIcon[] TURBINE_ACTIVE = new Textures.BlockIcons.CustomIcon[] {
- frontFaceActive_0,
- frontFaceActive_1,
- frontFaceActive_2,
- frontFaceActive_3,
- frontFaceActive_4,
- frontFaceActive_5,
- frontFaceActive_6,
- frontFaceActive_7,
- frontFaceActive_8
- };
+ Textures.BlockIcons.CustomIcon[] TURBINE_ACTIVE = new Textures.BlockIcons.CustomIcon[] { frontFaceActive_0,
+ frontFaceActive_1, frontFaceActive_2, frontFaceActive_3, frontFaceActive_4, frontFaceActive_5,
+ frontFaceActive_6, frontFaceActive_7, frontFaceActive_8 };
- public IIcon handleCasingsGT(
- final IBlockAccess aWorld,
- final int xCoord,
- final int yCoord,
- final int zCoord,
- final int aSide,
- final GregtechMetaCasingBlocks thisBlock) {
+ public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide, final GregtechMetaCasingBlocks thisBlock) {
return this.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
}
- public IIcon handleCasingsGT58(
- final IBlockAccess aWorld,
- final int xCoord,
- final int yCoord,
- final int zCoord,
- final int aSide,
- final GregtechMetaCasingBlocks thisBlock) {
+ public IIcon handleCasingsGT58(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide, final GregtechMetaCasingBlocks thisBlock) {
final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
if (((tMeta != 6) && (tMeta != 8) && (tMeta != 0))) {
return CasingTextureHandler.getIcon(aSide, tMeta);
@@ -275,19 +249,18 @@ public class TexturesGregtech58 {
return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
}
final boolean[] tConnectedSides = {
- (aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta),
- (aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta),
- (aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta),
- (aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta),
- (aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta),
- (aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta)
- };
+ (aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta),
+ (aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta),
+ (aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta),
+ (aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta),
+ (aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta),
+ (aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta) };
switch (aSide) {
case 0:
if (tConnectedSides[0]) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java
index 990db20285..45de7da05f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java
@@ -1,52 +1,53 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class TexturesGregtech59 {
- private static Textures.BlockIcons.CustomIcon GT8_1_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE1");
- private static Textures.BlockIcons.CustomIcon GT8_1 =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST1");
- private static Textures.BlockIcons.CustomIcon GT8_2_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE2");
- private static Textures.BlockIcons.CustomIcon GT8_2 =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST2");
- private static Textures.BlockIcons.CustomIcon GT8_3_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE3");
- private static Textures.BlockIcons.CustomIcon GT8_3 =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST3");
- private static Textures.BlockIcons.CustomIcon GT8_4_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE4");
- private static Textures.BlockIcons.CustomIcon GT8_4 =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST4");
- private static Textures.BlockIcons.CustomIcon GT8_5_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE5");
- private static Textures.BlockIcons.CustomIcon GT8_5 =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST5");
- private static Textures.BlockIcons.CustomIcon GT8_6_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE6");
- private static Textures.BlockIcons.CustomIcon GT8_6 =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST6");
- private static Textures.BlockIcons.CustomIcon GT8_7_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE7");
- private static Textures.BlockIcons.CustomIcon GT8_7 =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST7");
- private static Textures.BlockIcons.CustomIcon GT8_8_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE8");
- private static Textures.BlockIcons.CustomIcon GT8_8 =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST8");
- private static Textures.BlockIcons.CustomIcon GT8_9_Active =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE9");
- private static Textures.BlockIcons.CustomIcon GT8_9 =
- new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST9");
+ private static Textures.BlockIcons.CustomIcon GT8_1_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST_ACTIVE1");
+ private static Textures.BlockIcons.CustomIcon GT8_1 = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST1");
+ private static Textures.BlockIcons.CustomIcon GT8_2_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST_ACTIVE2");
+ private static Textures.BlockIcons.CustomIcon GT8_2 = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST2");
+ private static Textures.BlockIcons.CustomIcon GT8_3_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST_ACTIVE3");
+ private static Textures.BlockIcons.CustomIcon GT8_3 = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST3");
+ private static Textures.BlockIcons.CustomIcon GT8_4_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST_ACTIVE4");
+ private static Textures.BlockIcons.CustomIcon GT8_4 = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST4");
+ private static Textures.BlockIcons.CustomIcon GT8_5_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST_ACTIVE5");
+ private static Textures.BlockIcons.CustomIcon GT8_5 = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST5");
+ private static Textures.BlockIcons.CustomIcon GT8_6_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST_ACTIVE6");
+ private static Textures.BlockIcons.CustomIcon GT8_6 = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST6");
+ private static Textures.BlockIcons.CustomIcon GT8_7_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST_ACTIVE7");
+ private static Textures.BlockIcons.CustomIcon GT8_7 = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST7");
+ private static Textures.BlockIcons.CustomIcon GT8_8_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST_ACTIVE8");
+ private static Textures.BlockIcons.CustomIcon GT8_8 = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST8");
+ private static Textures.BlockIcons.CustomIcon GT8_9_Active = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST_ACTIVE9");
+ private static Textures.BlockIcons.CustomIcon GT8_9 = new Textures.BlockIcons.CustomIcon(
+ "iconsets/LARGETURBINE_ST9");
private static Textures.BlockIcons.CustomIcon frontFace_0 = (GT8_1);
private static Textures.BlockIcons.CustomIcon frontFaceActive_0 = (GT8_1_Active);
@@ -67,47 +68,20 @@ public class TexturesGregtech59 {
private static Textures.BlockIcons.CustomIcon frontFace_8 = (GT8_9);
private static Textures.BlockIcons.CustomIcon frontFaceActive_8 = (GT8_9_Active);
- Textures.BlockIcons.CustomIcon[] TURBINE = new Textures.BlockIcons.CustomIcon[] {
- frontFace_0,
- frontFace_1,
- frontFace_2,
- frontFace_3,
- frontFace_4,
- frontFace_5,
- frontFace_6,
- frontFace_7,
- frontFace_8
- };
+ Textures.BlockIcons.CustomIcon[] TURBINE = new Textures.BlockIcons.CustomIcon[] { frontFace_0, frontFace_1,
+ frontFace_2, frontFace_3, frontFace_4, frontFace_5, frontFace_6, frontFace_7, frontFace_8 };
- Textures.BlockIcons.CustomIcon[] TURBINE_ACTIVE = new Textures.BlockIcons.CustomIcon[] {
- frontFaceActive_0,
- frontFaceActive_1,
- frontFaceActive_2,
- frontFaceActive_3,
- frontFaceActive_4,
- frontFaceActive_5,
- frontFaceActive_6,
- frontFaceActive_7,
- frontFaceActive_8
- };
+ Textures.BlockIcons.CustomIcon[] TURBINE_ACTIVE = new Textures.BlockIcons.CustomIcon[] { frontFaceActive_0,
+ frontFaceActive_1, frontFaceActive_2, frontFaceActive_3, frontFaceActive_4, frontFaceActive_5,
+ frontFaceActive_6, frontFaceActive_7, frontFaceActive_8 };
- public IIcon handleCasingsGT(
- final IBlockAccess aWorld,
- final int xCoord,
- final int yCoord,
- final int zCoord,
- final int aSide,
- final GregtechMetaCasingBlocks thisBlock) {
+ public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide, final GregtechMetaCasingBlocks thisBlock) {
return this.handleCasingsGT59(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
}
- public IIcon handleCasingsGT59(
- final IBlockAccess aWorld,
- final int xCoord,
- final int yCoord,
- final int zCoord,
- final int aSide,
- final GregtechMetaCasingBlocks thisBlock) {
+ public IIcon handleCasingsGT59(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide, final GregtechMetaCasingBlocks thisBlock) {
final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
if (((tMeta != 6) && (tMeta != 8) && (tMeta != 0))) {
return CasingTextureHandler.getIcon(aSide, tMeta);
@@ -284,19 +258,18 @@ public class TexturesGregtech59 {
return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
}
final boolean[] tConnectedSides = {
- (aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta),
- (aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta),
- (aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta),
- (aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta),
- (aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta),
- (aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock)
- && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta)
- };
+ (aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta),
+ (aWorld.getBlock(xCoord, yCoord + 1, zCoord) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta),
+ (aWorld.getBlock(xCoord + 1, yCoord, zCoord) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta),
+ (aWorld.getBlock(xCoord, yCoord, zCoord + 1) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta),
+ (aWorld.getBlock(xCoord - 1, yCoord, zCoord) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta),
+ (aWorld.getBlock(xCoord, yCoord, zCoord - 1) == thisBlock)
+ && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta) };
switch (aSide) {
case 0:
if (tConnectedSides[0]) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
index e2d304572a..9e6c66fd93 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
@@ -1,13 +1,14 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks5;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IsaMill;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class TexturesGrinderMultiblock {
@@ -49,29 +50,12 @@ public class TexturesGrinderMultiblock {
private static CustomIcon frontFace_8 = (GT8_9);
private static CustomIcon frontFaceActive_8 = (GT8_9_Active);
- CustomIcon[] GRINDER = new CustomIcon[] {
- frontFace_0,
- frontFace_1,
- frontFace_2,
- frontFace_3,
- frontFace_4,
- frontFace_5,
- frontFace_6,
- frontFace_7,
- frontFace_8
- };
+ CustomIcon[] GRINDER = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4,
+ frontFace_5, frontFace_6, frontFace_7, frontFace_8 };
- CustomIcon[] GRINDER_ACTIVE = new CustomIcon[] {
- frontFaceActive_0,
- frontFaceActive_1,
- frontFaceActive_2,
- frontFaceActive_3,
- frontFaceActive_4,
- frontFaceActive_5,
- frontFaceActive_6,
- frontFaceActive_7,
- frontFaceActive_8
- };
+ CustomIcon[] GRINDER_ACTIVE = new CustomIcon[] { frontFaceActive_0, frontFaceActive_1, frontFaceActive_2,
+ frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, frontFaceActive_6, frontFaceActive_7,
+ frontFaceActive_8 };
private static int isIsaControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
@@ -82,13 +66,8 @@ public class TexturesGrinderMultiblock {
return 0;
}
- public IIcon handleCasingsGT(
- final IBlockAccess aWorld,
- final int xCoord,
- final int yCoord,
- final int zCoord,
- final int aSide,
- final GregtechMetaCasingBlocks5 ii) {
+ public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide, final GregtechMetaCasingBlocks5 ii) {
final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
if (tMeta != 1) {
return GregtechMetaCasingBlocks5.getStaticIcon(aSide, tMeta);
@@ -100,9 +79,8 @@ public class TexturesGrinderMultiblock {
for (int j = -1; j < 2; j++) {
if (i == 0 && j == 0) continue;
if (isIsaControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide) != 0) {
- IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity)
- aWorld.getTileEntity(xCoord + j, yCoord, zCoord + i))
- .getMetaTileEntity();
+ IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld
+ .getTileEntity(xCoord + j, yCoord, zCoord + i)).getMetaTileEntity();
return getIconByIndex(tMetaTileEntity, 4 - i * 3 - j);
}
}
@@ -113,9 +91,8 @@ public class TexturesGrinderMultiblock {
for (int j = -1; j < 2; j++) {
if (i == 0 && j == 0) continue;
if (isIsaControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide) != 0) {
- IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity)
- aWorld.getTileEntity(xCoord + j, yCoord + i, zCoord))
- .getMetaTileEntity();
+ IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld
+ .getTileEntity(xCoord + j, yCoord + i, zCoord)).getMetaTileEntity();
return getIconByIndex(tMetaTileEntity, 4 + i * 3 - j * tInvertLeftRightMod);
}
}
@@ -126,9 +103,8 @@ public class TexturesGrinderMultiblock {
for (int j = -1; j < 2; j++) {
if (i == 0 && j == 0) continue;
if (isIsaControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide) != 0) {
- IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity)
- aWorld.getTileEntity(xCoord, yCoord + i, zCoord + j))
- .getMetaTileEntity();
+ IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld
+ .getTileEntity(xCoord, yCoord + i, zCoord + j)).getMetaTileEntity();
return getIconByIndex(tMetaTileEntity, 4 + i * 3 + j * tInvertLeftRightMod);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index 9ee32bcaa6..aede466688 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
@@ -7,9 +11,6 @@ import gregtech.api.objects.GT_RenderedTexture;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
public class TexturesGtBlock {
@@ -17,8 +18,7 @@ public class TexturesGtBlock {
private static AutoMap<Runnable> mCustomiconMap = new AutoMap<Runnable>();
- static {
- }
+ static {}
// public static ITexture[] CASING_BLOCKS_GTPP = new ITexture[256];
@@ -27,6 +27,7 @@ public class TexturesGtBlock {
*/
public static class CustomIcon implements IIconContainer, Runnable {
+
protected IIcon mIcon;
protected String mIconName;
protected String mModID;
@@ -56,8 +57,7 @@ public class TexturesGtBlock {
@Override
public void run() {
this.mIcon = GregTech_API.sBlockIcons.registerIcon(this.mModID + ":" + this.mIconName);
- Logger.WARNING(
- "FIND ME _ Processing texture: " + this.getTextureFile().getResourcePath());
+ Logger.WARNING("FIND ME _ Processing texture: " + this.getTextureFile().getResourcePath());
}
@Override
@@ -67,6 +67,7 @@ public class TexturesGtBlock {
}
public static class VanillaIcon implements IIconContainer, Runnable {
+
protected IIcon mIcon;
protected String mIconName;
@@ -103,9 +104,8 @@ public class TexturesGtBlock {
}
/*
- * Add Some Custom Textures below.
- * I am not sure whether or not I need to declare them as such, but better to be safe than sorry.
- * Right?
+ * Add Some Custom Textures below. I am not sure whether or not I need to declare them as such, but better to be
+ * safe than sorry. Right?
*/
// Vanilla Textures
@@ -117,15 +117,15 @@ public class TexturesGtBlock {
// Energy overlays
public static final CustomIcon OVERLAY_ENERGY_OUT_BUFFER = new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_BUFFER");
- public static final CustomIcon OVERLAY_ENERGY_OUT_MULTI_BUFFER =
- new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER");
+ public static final CustomIcon OVERLAY_ENERGY_OUT_MULTI_BUFFER = new CustomIcon(
+ "iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER");
// Wooden Shelf and Compartment Overlays
public static final CustomIcon OVERLAY_WOODEN_SHELF_FRONT = new CustomIcon("TileEntities/Compartment/wood_shelf");
- public static final CustomIcon OVERLAY_WOODEN_SHELF_CANS_FRONT =
- new CustomIcon("TileEntities/Compartment/wood_shelf_cans");
- public static final CustomIcon OVERLAY_WOODEN_SHELF_PAPER_FRONT =
- new CustomIcon("TileEntities/Compartment/wood_shelf_paper");
+ public static final CustomIcon OVERLAY_WOODEN_SHELF_CANS_FRONT = new CustomIcon(
+ "TileEntities/Compartment/wood_shelf_cans");
+ public static final CustomIcon OVERLAY_WOODEN_SHELF_PAPER_FRONT = new CustomIcon(
+ "TileEntities/Compartment/wood_shelf_paper");
public static final CustomIcon OVERLAY_CABINET_1 = new CustomIcon("TileEntities/Compartment/0");
public static final CustomIcon OVERLAY_CABINET_2 = new CustomIcon("TileEntities/Compartment/1");
public static final CustomIcon OVERLAY_CABINET_3 = new CustomIcon("TileEntities/Compartment/2");
@@ -160,19 +160,19 @@ public class TexturesGtBlock {
public static final CustomIcon OVERLAY_COMPARTMENT_16 = new CustomIcon("TileEntities/Compartment/31");
// Controllers
- private static final CustomIcon Internal_Casing_Fusion_Simple_Front =
- new CustomIcon("TileEntities/MACHINE_CASING_FUSION_FRONT");
+ private static final CustomIcon Internal_Casing_Fusion_Simple_Front = new CustomIcon(
+ "TileEntities/MACHINE_CASING_FUSION_FRONT");
public static final CustomIcon Casing_Fusion_Simple_Front = Internal_Casing_Fusion_Simple_Front;
- private static final CustomIcon Internal_Casing_Fusion_Simple_Front_Active =
- new CustomIcon("TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE");
+ private static final CustomIcon Internal_Casing_Fusion_Simple_Front_Active = new CustomIcon(
+ "TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE");
public static final CustomIcon Casing_Fusion_Simple_Front_Active = Internal_Casing_Fusion_Simple_Front_Active;
// Machine Casings
// Simple
private static final CustomIcon Internal_Casing_Machine_Simple_Top = new CustomIcon("TileEntities/machine_top");
public static final CustomIcon Casing_Machine_Simple_Top = Internal_Casing_Machine_Simple_Top;
- private static final CustomIcon Internal_Casing_Machine_Simple_Bottom =
- new CustomIcon("TileEntities/machine_bottom");
+ private static final CustomIcon Internal_Casing_Machine_Simple_Bottom = new CustomIcon(
+ "TileEntities/machine_bottom");
public static final CustomIcon Casing_Machine_Simple_Bottom = Internal_Casing_Machine_Simple_Bottom;
// Advanced and Ultra
private static final CustomIcon Internal_Casing_Machine_Advanced = new CustomIcon("TileEntities/high_adv_machine");
@@ -180,90 +180,90 @@ public class TexturesGtBlock {
private static final CustomIcon Internal_Casing_Machine_Ultra = new CustomIcon("TileEntities/adv_machine_lesu");
public static final CustomIcon Casing_Machine_Ultra = Internal_Casing_Machine_Ultra;
// Dimensional - Non Overlay
- private static final CustomIcon Internal_Casing_Machine_Dimensional =
- new CustomIcon("TileEntities/adv_machine_dimensional");
+ private static final CustomIcon Internal_Casing_Machine_Dimensional = new CustomIcon(
+ "TileEntities/adv_machine_dimensional");
public static final CustomIcon Casing_Machine_Dimensional = Internal_Casing_Machine_Dimensional;
- private static final CustomIcon Internal_Casing_Machine_Dimensional_Adv =
- new CustomIcon("TileEntities/high_adv_machine_dimensional");
+ private static final CustomIcon Internal_Casing_Machine_Dimensional_Adv = new CustomIcon(
+ "TileEntities/high_adv_machine_dimensional");
public static final CustomIcon Casing_Machine_Dimensional_Adv = Internal_Casing_Machine_Dimensional_Adv;
// Material Casings
- private static final CustomIcon Internal_Casing_Tantalloy61 =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TANTALLOY61");
+ private static final CustomIcon Internal_Casing_Tantalloy61 = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_TANTALLOY61");
public static final CustomIcon Casing_Material_Tantalloy61 = Internal_Casing_Tantalloy61;
- private static final CustomIcon Internal_Casing_MaragingSteel =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL");
+ private static final CustomIcon Internal_Casing_MaragingSteel = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL");
public static final CustomIcon Casing_Material_MaragingSteel = Internal_Casing_MaragingSteel;
- private static final CustomIcon Internal_Casing_Stellite =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_STELLITE");
+ private static final CustomIcon Internal_Casing_Stellite = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_STELLITE");
public static final CustomIcon Casing_Material_Stellite = Internal_Casing_Stellite;
- private static final CustomIcon Internal_Casing_Talonite =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TALONITE");
+ private static final CustomIcon Internal_Casing_Talonite = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_TALONITE");
public static final CustomIcon Casing_Material_Talonite = Internal_Casing_Talonite;
private static final CustomIcon Internal_Turbine_SC_Casing = new TexturesGtBlock.CustomIcon("iconsets/SC_TURBINE");
public static final CustomIcon Turbine_SC_Material_Casing = Internal_Turbine_SC_Casing;
- private static final CustomIcon Internal_Casing_Tumbaga =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TUMBAGA");
+ private static final CustomIcon Internal_Casing_Tumbaga = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_TUMBAGA");
public static final CustomIcon Casing_Material_Tumbaga = Internal_Casing_Tumbaga;
- private static final CustomIcon Internal_Casing_Zeron100 =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_ZERON100");
+ private static final CustomIcon Internal_Casing_Zeron100 = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_ZERON100");
public static final CustomIcon Casing_Material_Zeron100 = Internal_Casing_Zeron100;
private static final CustomIcon Internal_Casing_Potin = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_POTIN");
public static final CustomIcon Casing_Material_Potin = Internal_Casing_Potin;
- private static final CustomIcon Internal_Casing_Grisium =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_GRISIUM");
+ private static final CustomIcon Internal_Casing_Grisium = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_GRISIUM");
public static final CustomIcon Casing_Material_Grisium = Internal_Casing_Grisium;
- private static final CustomIcon Internal_Casing_RedSteel =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_RED_STEEL");
+ private static final CustomIcon Internal_Casing_RedSteel = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_RED_STEEL");
public static final CustomIcon Casing_Material_RedSteel = Internal_Casing_RedSteel;
- private static final CustomIcon Internal_Casing_Incoloy020 =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_INCOLOY_020");
+ private static final CustomIcon Internal_Casing_Incoloy020 = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_INCOLOY_020");
public static final CustomIcon Casing_Material_Incoloy020 = Internal_Casing_Incoloy020;
- private static final CustomIcon Internal_Casing_IncoloyDS =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS");
+ private static final CustomIcon Internal_Casing_IncoloyDS = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS");
public static final CustomIcon Casing_Material_IncoloyDS = Internal_Casing_IncoloyDS;
- private static final CustomIcon Internal_Casing_IncoloyMA956 =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956");
+ private static final CustomIcon Internal_Casing_IncoloyMA956 = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956");
public static final CustomIcon Casing_Material_IncoloyMA956 = Internal_Casing_IncoloyMA956;
- private static final CustomIcon Internal_Casing_ZirconiumCarbide =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE");
+ private static final CustomIcon Internal_Casing_ZirconiumCarbide = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE");
public static final CustomIcon Casing_Material_ZirconiumCarbide = Internal_Casing_ZirconiumCarbide;
- private static final CustomIcon Internal_Casing_HastelloyX =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X");
+ private static final CustomIcon Internal_Casing_HastelloyX = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X");
public static final CustomIcon Casing_Material_HastelloyX = Internal_Casing_HastelloyX;
- private static final CustomIcon Internal_Casing_HastelloyN =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N");
+ private static final CustomIcon Internal_Casing_HastelloyN = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N");
public static final CustomIcon Casing_Material_HastelloyN = Internal_Casing_HastelloyN;
- private static final CustomIcon Internal_Casing_Fluid_IncoloyDS =
- new CustomIcon("TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS");
+ private static final CustomIcon Internal_Casing_Fluid_IncoloyDS = new CustomIcon(
+ "TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS");
public static final CustomIcon Casing_Material_Fluid_IncoloyDS = Internal_Casing_Fluid_IncoloyDS;
private static final CustomIcon Internal_Casing_Laurenium = new CustomIcon("TileEntities/MACHINE_CASING_LAURENIUM");
public static final CustomIcon Casing_Material_Laurenium = Internal_Casing_Laurenium;
// Trinium Alloys
- public static final CustomIcon Casing_Trinium_Titanium =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM");
- public static final CustomIcon Casing_Trinium_Naquadah =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH");
- public static final CustomIcon Casing_Trinium_Naquadah_Vent =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT");
- public static final CustomIcon Casing_Trinium_Naquadah_Carbon =
- new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON");
+ public static final CustomIcon Casing_Trinium_Titanium = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM");
+ public static final CustomIcon Casing_Trinium_Naquadah = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH");
+ public static final CustomIcon Casing_Trinium_Naquadah_Vent = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT");
+ public static final CustomIcon Casing_Trinium_Naquadah_Carbon = new CustomIcon(
+ "TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON");
// Material Machine/Firebox Casings
- private static final CustomIcon Internal_Casing_Staballoy_Firebox =
- new CustomIcon("TileEntities/MACHINE_CASING_FIREBOX_STABALLOY");
+ private static final CustomIcon Internal_Casing_Staballoy_Firebox = new CustomIcon(
+ "TileEntities/MACHINE_CASING_FIREBOX_STABALLOY");
public static final CustomIcon Casing_Staballoy_Firebox = Internal_Casing_Staballoy_Firebox;
// Misc Casings
- private static final CustomIcon Internal_Casing_Machine_Redstone_Off =
- new CustomIcon("TileEntities/cover_redstone_conductor");
+ private static final CustomIcon Internal_Casing_Machine_Redstone_Off = new CustomIcon(
+ "TileEntities/cover_redstone_conductor");
public static final CustomIcon Casing_Machine_Redstone_Off = Internal_Casing_Machine_Redstone_Off;
- private static final CustomIcon Internal_Casing_Machine_Redstone_On =
- new CustomIcon("TileEntities/cover_redstone_emitter");
+ private static final CustomIcon Internal_Casing_Machine_Redstone_On = new CustomIcon(
+ "TileEntities/cover_redstone_emitter");
public static final CustomIcon Casing_Machine_Redstone_On = Internal_Casing_Machine_Redstone_On;
// Redox Cells
@@ -287,8 +287,8 @@ public class TexturesGtBlock {
public static final CustomIcon Casing_Modulator_4 = new CustomIcon("special/block_8");
// Centrifuge Casing
- private static final CustomIcon Internal_Casing_Centrifuge =
- new CustomIcon("TileEntities/MACHINE_CASING_CENTRIFUGE");
+ private static final CustomIcon Internal_Casing_Centrifuge = new CustomIcon(
+ "TileEntities/MACHINE_CASING_CENTRIFUGE");
public static final CustomIcon Casing_Material_Centrifuge = Internal_Casing_Centrifuge;
// Quantum Force Transformer Casing
@@ -311,8 +311,8 @@ public class TexturesGtBlock {
// MACHINE_CASING_FARM_MANAGER_STRUCTURAL
// Farm Manager Casings
- private static final CustomIcon Internal_Casing_Machine_Farm_Manager =
- new CustomIcon("TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+ private static final CustomIcon Internal_Casing_Machine_Farm_Manager = new CustomIcon(
+ "TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
public static final CustomIcon Casing_Machine_Farm_Manager = Internal_Casing_Machine_Farm_Manager;
// Acacia_Log
private static final CustomIcon Internal_Casing_Machine_Acacia_Log = new CustomIcon("TileEntities/log_acacia_top");
@@ -324,8 +324,8 @@ public class TexturesGtBlock {
// Structural Blocks
private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A = new CustomIcon("chrono/MetalGrate");
public static final CustomIcon Casing_Machine_Metal_Grate_A = Internal_Casing_Machine_Metal_Grate_A;
- private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A_Solid =
- new CustomIcon("chrono/MetalGrateA_Solid");
+ private static final CustomIcon Internal_Casing_Machine_Metal_Grate_A_Solid = new CustomIcon(
+ "chrono/MetalGrateA_Solid");
public static final CustomIcon Casing_Machine_Metal_Grate_A_Solid = Internal_Casing_Machine_Metal_Grate_A_Solid;
private static final CustomIcon Internal_Casing_Machine_Metal_Grate_B = new CustomIcon("chrono/MetalGrate2");
public static final CustomIcon Casing_Machine_Metal_Grate_B = Internal_Casing_Machine_Metal_Grate_B;
@@ -361,59 +361,59 @@ public class TexturesGtBlock {
public static final CustomIcon Overlay_Machine_Cyber_B = Internal_Overlay_Machine_Cyber_B;
public static final CustomIcon TEXTURE_CASING_AMAZON = new CustomIcon("TileEntities/CASING_AMAZON");
- public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC =
- new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC");
- public static final CustomIcon TEXTURE_CASING_ADVANCED_VOLCNUS =
- new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS");
+ public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon(
+ "TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC");
+ public static final CustomIcon TEXTURE_CASING_ADVANCED_VOLCNUS = new CustomIcon(
+ "TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS");
public static final CustomIcon TEXTURE_CASING_ROCKETDYNE = new CustomIcon("TileEntities/MACHINE_CASING_ROCKETDYNE");
- public static final CustomIcon TEXTURE_CASING_GRINDING_MILL =
- new CustomIcon("TileEntities/MACHINE_CASING_GRINDING_FACTORY");
+ public static final CustomIcon TEXTURE_CASING_GRINDING_MILL = new CustomIcon(
+ "TileEntities/MACHINE_CASING_GRINDING_FACTORY");
public static final CustomIcon TEXTURE_CASING_FLOTATION = new CustomIcon("TileEntities/MACHINE_CASING_FLOTATION");
// Custom Pipes
public static final CustomIcon TEXTURE_PIPE_GRINDING_MILL = new CustomIcon("TileEntities/MACHINE_CASING_PIPE_T1");
public static final CustomIcon TEXTURE_PIPE_GENERIC = new CustomIcon("iconsets/MACHINE_CASING_PIPE_GENERIC");
- public static final CustomIcon TEXTURE_PIPE_T1_BABBIT_ALLOY =
- new CustomIcon("iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY");
- public static final CustomIcon TEXTURE_PIPE_T2_INCONEL_690 =
- new CustomIcon("iconsets/MACHINE_CASING_PIPE_INCONEL_690");
+ public static final CustomIcon TEXTURE_PIPE_T1_BABBIT_ALLOY = new CustomIcon(
+ "iconsets/MACHINE_CASING_PIPE_BABBIT_ALLOY");
+ public static final CustomIcon TEXTURE_PIPE_T2_INCONEL_690 = new CustomIcon(
+ "iconsets/MACHINE_CASING_PIPE_INCONEL_690");
public static final CustomIcon TEXTURE_PIPE_T3_STELLITE = new CustomIcon("iconsets/MACHINE_CASING_PIPE_STELLITE");
- public static final CustomIcon TEXTURE_PIPE_T4_NITINOL_60 =
- new CustomIcon("iconsets/MACHINE_CASING_PIPE_NITINOL_60");
+ public static final CustomIcon TEXTURE_PIPE_T4_NITINOL_60 = new CustomIcon(
+ "iconsets/MACHINE_CASING_PIPE_NITINOL_60");
public static final CustomIcon TEXTURE_PIPE_T5_LAFIUM = new CustomIcon("iconsets/MACHINE_CASING_PIPE_LAFIUM");
public static final CustomIcon TEXTURE_PIPE_T6_CINOBITE = new CustomIcon("iconsets/MACHINE_CASING_PIPE_CINOBITE");
- public static final CustomIcon TEXTURE_PIPE_T7_TITANSTEEL =
- new CustomIcon("iconsets/MACHINE_CASING_PIPE_TITANSTEEL");
+ public static final CustomIcon TEXTURE_PIPE_T7_TITANSTEEL = new CustomIcon(
+ "iconsets/MACHINE_CASING_PIPE_TITANSTEEL");
public static final CustomIcon TEXTURE_PIPE_T8_ABYSSAL = new CustomIcon("iconsets/MACHINE_CASING_PIPE_ABYSSAL");
// Custom Gearboxes
- public static final CustomIcon TEXTURE_GEARBOX_GRINDING_MILL =
- new CustomIcon("TileEntities/MACHINE_CASING_GEARBOX_T1");
+ public static final CustomIcon TEXTURE_GEARBOX_GRINDING_MILL = new CustomIcon(
+ "TileEntities/MACHINE_CASING_GEARBOX_T1");
public static final CustomIcon TEXTURE_GEARBOX_GENERIC = new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_GENERIC");
- public static final CustomIcon TEXTURE_GEARBOX_T1_EGLIN_STEEL =
- new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_EGLIN_STEEL");
- public static final CustomIcon TEXTURE_GEARBOX_T2_INCONEL_792 =
- new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_INCONEL_792");
- public static final CustomIcon TEXTURE_GEARBOX_T3_INCOLOY_MA956 =
- new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_INCOLOY_MA956");
- public static final CustomIcon TEXTURE_GEARBOX_T4_NITINOL_60 =
- new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_NITINOL_60");
- public static final CustomIcon TEXTURE_GEARBOX_T5_ZERON_100 =
- new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_ZERON_100");
- public static final CustomIcon TEXTURE_GEARBOX_T6_PIKYONIUM =
- new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_PIKYONIUM");
- public static final CustomIcon TEXTURE_GEARBOX_T7_TITANSTEEL =
- new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_TITANSTEEL");
- public static final CustomIcon TEXTURE_GEARBOX_T8_ABYSSAL =
- new CustomIcon("iconsets/MACHINE_CASING_GEARBOX_ABYSSAL");
+ public static final CustomIcon TEXTURE_GEARBOX_T1_EGLIN_STEEL = new CustomIcon(
+ "iconsets/MACHINE_CASING_GEARBOX_EGLIN_STEEL");
+ public static final CustomIcon TEXTURE_GEARBOX_T2_INCONEL_792 = new CustomIcon(
+ "iconsets/MACHINE_CASING_GEARBOX_INCONEL_792");
+ public static final CustomIcon TEXTURE_GEARBOX_T3_INCOLOY_MA956 = new CustomIcon(
+ "iconsets/MACHINE_CASING_GEARBOX_INCOLOY_MA956");
+ public static final CustomIcon TEXTURE_GEARBOX_T4_NITINOL_60 = new CustomIcon(
+ "iconsets/MACHINE_CASING_GEARBOX_NITINOL_60");
+ public static final CustomIcon TEXTURE_GEARBOX_T5_ZERON_100 = new CustomIcon(
+ "iconsets/MACHINE_CASING_GEARBOX_ZERON_100");
+ public static final CustomIcon TEXTURE_GEARBOX_T6_PIKYONIUM = new CustomIcon(
+ "iconsets/MACHINE_CASING_GEARBOX_PIKYONIUM");
+ public static final CustomIcon TEXTURE_GEARBOX_T7_TITANSTEEL = new CustomIcon(
+ "iconsets/MACHINE_CASING_GEARBOX_TITANSTEEL");
+ public static final CustomIcon TEXTURE_GEARBOX_T8_ABYSSAL = new CustomIcon(
+ "iconsets/MACHINE_CASING_GEARBOX_ABYSSAL");
public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II = new CustomIcon("iconsets/MACHINE_CASING_FUSION_3");
- public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_INNER =
- new CustomIcon("iconsets/MACHINE_CASING_FUSION_COIL_II");
- public static final CustomIcon TEXTURE_CASING_FUSION_CASING_ULTRA =
- new CustomIcon("iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA");
+ public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_INNER = new CustomIcon(
+ "iconsets/MACHINE_CASING_FUSION_COIL_II");
+ public static final CustomIcon TEXTURE_CASING_FUSION_CASING_ULTRA = new CustomIcon(
+ "iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA");
//
public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_1 = new CustomIcon("iconsets/FUSIONIII_1");
public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_2 = new CustomIcon("iconsets/FUSIONIII_2");
@@ -430,133 +430,129 @@ public class TexturesGtBlock {
// Overlays
// Fan Textures
- private static final CustomIcon Internal_Overlay_Machine_Vent =
- new CustomIcon("TileEntities/machine_top_vent_rotating");
+ private static final CustomIcon Internal_Overlay_Machine_Vent = new CustomIcon(
+ "TileEntities/machine_top_vent_rotating");
public static final CustomIcon Overlay_Machine_Vent = Internal_Overlay_Machine_Vent;
- private static final CustomIcon Internal_Overlay_Machine_Vent_Fast =
- new CustomIcon("TileEntities/machine_top_vent_rotating_fast");
+ private static final CustomIcon Internal_Overlay_Machine_Vent_Fast = new CustomIcon(
+ "TileEntities/machine_top_vent_rotating_fast");
public static final CustomIcon Overlay_Machine_Vent_Fast = Internal_Overlay_Machine_Vent_Fast;
- private static final CustomIcon Internal_Overlay_Machine_Vent_Adv =
- new CustomIcon("TileEntities/adv_machine_vent_rotating");
+ private static final CustomIcon Internal_Overlay_Machine_Vent_Adv = new CustomIcon(
+ "TileEntities/adv_machine_vent_rotating");
public static final CustomIcon Overlay_Machine_Vent_Adv = Internal_Overlay_Machine_Vent_Adv;
- private static final CustomIcon Internal_Overlay_Machine_Turbine_Active =
- new CustomIcon("TileEntities/STEAM_TURBINE_SIDE_ACTIVE");
+ private static final CustomIcon Internal_Overlay_Machine_Turbine_Active = new CustomIcon(
+ "TileEntities/STEAM_TURBINE_SIDE_ACTIVE");
public static final CustomIcon Overlay_Machine_Turbine_Active = Internal_Overlay_Machine_Turbine_Active;
// Grate Texture
public static final CustomIcon OVERLAY_GRATE_A = new CustomIcon("metro/OVERLAY_GRATE_A");
// Speaker Texture
private static final CustomIcon Internal_Overlay_Machine_Sound = new CustomIcon("TileEntities/audio_out");
public static final CustomIcon Overlay_Machine_Sound = Internal_Overlay_Machine_Sound;
- private static final CustomIcon Internal_Overlay_Machine_Sound_Active =
- new CustomIcon("TileEntities/audio_out_active");
+ private static final CustomIcon Internal_Overlay_Machine_Sound_Active = new CustomIcon(
+ "TileEntities/audio_out_active");
public static final CustomIcon Overlay_Machine_Sound_Active = Internal_Overlay_Machine_Sound_Active;
// Diesel Engines
- private static final CustomIcon Internal_Overlay_Machine_Diesel_Vertical =
- new CustomIcon("TileEntities/machine_top_dieselmotor");
+ private static final CustomIcon Internal_Overlay_Machine_Diesel_Vertical = new CustomIcon(
+ "TileEntities/machine_top_dieselmotor");
public static final CustomIcon Overlay_Machine_Diesel_Vertical = Internal_Overlay_Machine_Diesel_Vertical;
- private static final CustomIcon Internal_Overlay_Machine_Diesel_Horizontal =
- new CustomIcon("TileEntities/machine_top_dieselmotor2");
+ private static final CustomIcon Internal_Overlay_Machine_Diesel_Horizontal = new CustomIcon(
+ "TileEntities/machine_top_dieselmotor2");
public static final CustomIcon Overlay_Machine_Diesel_Horizontal = Internal_Overlay_Machine_Diesel_Horizontal;
- private static final CustomIcon Internal_Overlay_Machine_Diesel_Vertical_Active =
- new CustomIcon("TileEntities/machine_top_dieselmotor_active");
- public static final CustomIcon Overlay_Machine_Diesel_Vertical_Active =
- Internal_Overlay_Machine_Diesel_Vertical_Active;
- private static final CustomIcon Internal_Overlay_Machine_Diesel_Horizontal_Active =
- new CustomIcon("TileEntities/machine_top_dieselmotor2_active");
- public static final CustomIcon Overlay_Machine_Diesel_Horizontal_Active =
- Internal_Overlay_Machine_Diesel_Horizontal_Active;
+ private static final CustomIcon Internal_Overlay_Machine_Diesel_Vertical_Active = new CustomIcon(
+ "TileEntities/machine_top_dieselmotor_active");
+ public static final CustomIcon Overlay_Machine_Diesel_Vertical_Active = Internal_Overlay_Machine_Diesel_Vertical_Active;
+ private static final CustomIcon Internal_Overlay_Machine_Diesel_Horizontal_Active = new CustomIcon(
+ "TileEntities/machine_top_dieselmotor2_active");
+ public static final CustomIcon Overlay_Machine_Diesel_Horizontal_Active = Internal_Overlay_Machine_Diesel_Horizontal_Active;
// Computer Screens
- private static final CustomIcon Internal_Casing_Machine_Screen_1 =
- new CustomIcon("TileEntities/adv_machine_screen_random1");
+ private static final CustomIcon Internal_Casing_Machine_Screen_1 = new CustomIcon(
+ "TileEntities/adv_machine_screen_random1");
public static final CustomIcon Casing_Machine_Screen_1 = Internal_Casing_Machine_Screen_1;
- private static final CustomIcon Internal_Casing_Machine_Screen_2 =
- new CustomIcon("TileEntities/adv_machine_screen_random2");
+ private static final CustomIcon Internal_Casing_Machine_Screen_2 = new CustomIcon(
+ "TileEntities/adv_machine_screen_random2");
public static final CustomIcon Casing_Machine_Screen_2 = Internal_Casing_Machine_Screen_2;
- private static final CustomIcon Internal_Casing_Machine_Screen_3 =
- new CustomIcon("TileEntities/adv_machine_screen_random3");
+ private static final CustomIcon Internal_Casing_Machine_Screen_3 = new CustomIcon(
+ "TileEntities/adv_machine_screen_random3");
public static final CustomIcon Casing_Machine_Screen_3 = Internal_Casing_Machine_Screen_3;
- private static final CustomIcon Internal_Casing_Machine_Screen_Frequency =
- new CustomIcon("TileEntities/adv_machine_screen_frequency");
+ private static final CustomIcon Internal_Casing_Machine_Screen_Frequency = new CustomIcon(
+ "TileEntities/adv_machine_screen_frequency");
public static final CustomIcon Casing_Machine_Screen_Frequency = Internal_Casing_Machine_Screen_Frequency;
- private static final CustomIcon Internal_Overlay_Machine_Screen_Logo =
- new CustomIcon("TileEntities/adv_machine_screen_logo");
+ private static final CustomIcon Internal_Overlay_Machine_Screen_Logo = new CustomIcon(
+ "TileEntities/adv_machine_screen_logo");
public static final CustomIcon Overlay_Machine_Screen_Logo = Internal_Overlay_Machine_Screen_Logo;
private static final CustomIcon Internal_Overlay_Machine_Cyber_Interface = new CustomIcon("chrono/Overlay_Cyber");
public static final CustomIcon Overlay_Machine_Cyber_Interface = Internal_Overlay_Machine_Cyber_Interface;
// Machine Controller Overlays
- private static final CustomIcon Internal_Overlay_Machine_Controller_Default =
- new CustomIcon("iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED");
+ private static final CustomIcon Internal_Overlay_Machine_Controller_Default = new CustomIcon(
+ "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED");
public static final CustomIcon Overlay_Machine_Controller_Default = Internal_Overlay_Machine_Controller_Default;
- private static final CustomIcon Internal_Overlay_Machine_Controller_Default_Active =
- new CustomIcon("iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE");
- public static final CustomIcon Overlay_Machine_Controller_Default_Active =
- Internal_Overlay_Machine_Controller_Default_Active;
+ private static final CustomIcon Internal_Overlay_Machine_Controller_Default_Active = new CustomIcon(
+ "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE");
+ public static final CustomIcon Overlay_Machine_Controller_Default_Active = Internal_Overlay_Machine_Controller_Default_Active;
- private static final CustomIcon Internal_Overlay_Machine_Controller_Advanced =
- new CustomIcon("iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED");
+ private static final CustomIcon Internal_Overlay_Machine_Controller_Advanced = new CustomIcon(
+ "iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED");
public static final CustomIcon Overlay_Machine_Controller_Advanced = Internal_Overlay_Machine_Controller_Advanced;
- private static final CustomIcon Internal_Overlay_Machine_Controller_Advanced_Active =
- new CustomIcon("iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE");
- public static final CustomIcon Overlay_Machine_Controller_Advanced_Active =
- Internal_Overlay_Machine_Controller_Advanced_Active;
+ private static final CustomIcon Internal_Overlay_Machine_Controller_Advanced_Active = new CustomIcon(
+ "iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE");
+ public static final CustomIcon Overlay_Machine_Controller_Advanced_Active = Internal_Overlay_Machine_Controller_Advanced_Active;
// Fluid Reactor Overlays
- public static final CustomIcon Overlay_FluidReactor_Front =
- new CustomIcon("TileEntities/FluidReactor/OVERLAY_FRONT");
+ public static final CustomIcon Overlay_FluidReactor_Front = new CustomIcon(
+ "TileEntities/FluidReactor/OVERLAY_FRONT");
public static final CustomIcon Overlay_FluidReactor_Side = new CustomIcon("TileEntities/FluidReactor/OVERLAY_SIDE");
public static final CustomIcon Overlay_FluidReactor_Top = new CustomIcon("TileEntities/FluidReactor/OVERLAY_TOP");
- public static final CustomIcon Overlay_FluidReactor_Front_Active =
- new CustomIcon("TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE");
- public static final CustomIcon Overlay_FluidReactor_Side_Active =
- new CustomIcon("TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE");
- public static final CustomIcon Overlay_FluidReactor_Top_Active =
- new CustomIcon("TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE");
+ public static final CustomIcon Overlay_FluidReactor_Front_Active = new CustomIcon(
+ "TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE");
+ public static final CustomIcon Overlay_FluidReactor_Side_Active = new CustomIcon(
+ "TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE");
+ public static final CustomIcon Overlay_FluidReactor_Top_Active = new CustomIcon(
+ "TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE");
// Crafting Overlays
public static final CustomIcon Overlay_Crafting_Bronze = new CustomIcon("TileEntities/bronze_top_crafting");
public static final CustomIcon Overlay_Crafting_Steel = new CustomIcon("TileEntities/cover_crafting");
- public static final CustomIcon Casing_Workbench_Crafting_Overlay =
- new CustomIcon("TileEntities/gt4/bronze_top_crafting");
+ public static final CustomIcon Casing_Workbench_Crafting_Overlay = new CustomIcon(
+ "TileEntities/gt4/bronze_top_crafting");
public static final CustomIcon Casing_Workbench_Top = new CustomIcon("TileEntities/gt4/bronze_top");
public static final CustomIcon Casing_Workbench_Side = new CustomIcon("TileEntities/gt4/bronze_side");
public static final CustomIcon Casing_Workbench_Bottom = new CustomIcon("TileEntities/gt4/bronze_bottom");
- public static final CustomIcon Casing_Adv_Workbench_Crafting_Overlay =
- new CustomIcon("TileEntities/gt4/machine_top_crafting");
+ public static final CustomIcon Casing_Adv_Workbench_Crafting_Overlay = new CustomIcon(
+ "TileEntities/gt4/machine_top_crafting");
public static final CustomIcon Casing_Adv_Workbench_Top = new CustomIcon("TileEntities/gt4/machine_top");
public static final CustomIcon Casing_Adv_Workbench_Side = new CustomIcon("TileEntities/gt4/machine_side");
public static final CustomIcon Casing_Adv_Workbench_Bottom = new CustomIcon("TileEntities/gt4/machine_bottom");
- public static final CustomIcon Casing_Redstone_Top_Off =
- new CustomIcon("TileEntities/gt4/redstone/machine_top_redstone_off");
- public static final CustomIcon Casing_Redstone_Top_Main_Off =
- new CustomIcon("TileEntities/gt4/redstone/machine_top_redstone_main_off");
- public static final CustomIcon Casing_Redstone_Top_On =
- new CustomIcon("TileEntities/gt4/redstone/machine_top_redstone_on");
- public static final CustomIcon Casing_Redstone_Top_Main_On =
- new CustomIcon("TileEntities/gt4/redstone/machine_top_redstone_main_on");
-
- public static final CustomIcon Casing_Redstone_Side_Off =
- new CustomIcon("TileEntities/gt4/redstone/machine_side_redstone_off");
- public static final CustomIcon Casing_Redstone_Side_Main_Off =
- new CustomIcon("TileEntities/gt4/redstone/machine_side_redstone_main_off");
- public static final CustomIcon Casing_Redstone_Side_On =
- new CustomIcon("TileEntities/gt4/redstone/machine_side_redstone_on");
- public static final CustomIcon Casing_Redstone_Side_Main_On =
- new CustomIcon("TileEntities/gt4/redstone/machine_side_redstone_main_on");
-
- public static final CustomIcon Casing_Redstone_Bottom_Off =
- new CustomIcon("TileEntities/gt4/redstone/machine_bottom_redstone_off");
- public static final CustomIcon Casing_Redstone_Bottom_Main_Off =
- new CustomIcon("TileEntities/gt4/redstone/machine_bottom_redstone_main_off");
- public static final CustomIcon Casing_Redstone_Bottom_On =
- new CustomIcon("TileEntities/gt4/redstone/machine_bottom_redstone_on");
- public static final CustomIcon Casing_Redstone_Bottom_Main_On =
- new CustomIcon("TileEntities/gt4/redstone/machine_bottom_redstone_main_on");
-
- public static final CustomIcon Casing_Electric_Auto_Workbench_Side =
- new CustomIcon("TileEntities/gt4/OVERLAY_SIDE_CABINET");
+ public static final CustomIcon Casing_Redstone_Top_Off = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_top_redstone_off");
+ public static final CustomIcon Casing_Redstone_Top_Main_Off = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_top_redstone_main_off");
+ public static final CustomIcon Casing_Redstone_Top_On = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_top_redstone_on");
+ public static final CustomIcon Casing_Redstone_Top_Main_On = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_top_redstone_main_on");
+
+ public static final CustomIcon Casing_Redstone_Side_Off = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_side_redstone_off");
+ public static final CustomIcon Casing_Redstone_Side_Main_Off = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_side_redstone_main_off");
+ public static final CustomIcon Casing_Redstone_Side_On = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_side_redstone_on");
+ public static final CustomIcon Casing_Redstone_Side_Main_On = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_side_redstone_main_on");
+
+ public static final CustomIcon Casing_Redstone_Bottom_Off = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_bottom_redstone_off");
+ public static final CustomIcon Casing_Redstone_Bottom_Main_Off = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_bottom_redstone_main_off");
+ public static final CustomIcon Casing_Redstone_Bottom_On = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_bottom_redstone_on");
+ public static final CustomIcon Casing_Redstone_Bottom_Main_On = new CustomIcon(
+ "TileEntities/gt4/redstone/machine_bottom_redstone_main_on");
+
+ public static final CustomIcon Casing_Electric_Auto_Workbench_Side = new CustomIcon(
+ "TileEntities/gt4/OVERLAY_SIDE_CABINET");
public static final CustomIcon Casing_Computer_Cube = new CustomIcon("TileEntities/gt4/computer");
public static final CustomIcon Casing_CropHarvester_Cutter = new CustomIcon("TileEntities/gt4/OVERLAY_CROP");
@@ -569,18 +565,18 @@ public class TexturesGtBlock {
public static final CustomIcon Casing_InventoryManagaer_Yellow = new CustomIcon("TileEntities/gt4/OVERLAY_YELLOW");
public static final CustomIcon Casing_InventoryManagaer_Blue = new CustomIcon("TileEntities/gt4/OVERLAY_BLUE");
- public static final CustomIcon Casing_InventoryManagaer_Cyan_Redstone =
- new CustomIcon("TileEntities/gt4/OVERLAY_CYAN_REDSTONE");
- public static final CustomIcon Casing_InventoryManagaer_Green_Redstone =
- new CustomIcon("TileEntities/gt4/OVERLAY_GREEN_REDSTONE");
- public static final CustomIcon Casing_InventoryManagaer_Purple_Redstone =
- new CustomIcon("TileEntities/gt4/OVERLAY_PURPLE_REDSTONE");
- public static final CustomIcon Casing_InventoryManagaer_Red_Redstone =
- new CustomIcon("TileEntities/gt4/OVERLAY_RED_REDSTONE");
- public static final CustomIcon Casing_InventoryManagaer_Yellow_Redstone =
- new CustomIcon("TileEntities/gt4/OVERLAY_YELLOW_REDSTONE");
- public static final CustomIcon Casing_InventoryManagaer_Blue_Redstone =
- new CustomIcon("TileEntities/gt4/OVERLAY_BLUE_REDSTONE");
+ public static final CustomIcon Casing_InventoryManagaer_Cyan_Redstone = new CustomIcon(
+ "TileEntities/gt4/OVERLAY_CYAN_REDSTONE");
+ public static final CustomIcon Casing_InventoryManagaer_Green_Redstone = new CustomIcon(
+ "TileEntities/gt4/OVERLAY_GREEN_REDSTONE");
+ public static final CustomIcon Casing_InventoryManagaer_Purple_Redstone = new CustomIcon(
+ "TileEntities/gt4/OVERLAY_PURPLE_REDSTONE");
+ public static final CustomIcon Casing_InventoryManagaer_Red_Redstone = new CustomIcon(
+ "TileEntities/gt4/OVERLAY_RED_REDSTONE");
+ public static final CustomIcon Casing_InventoryManagaer_Yellow_Redstone = new CustomIcon(
+ "TileEntities/gt4/OVERLAY_YELLOW_REDSTONE");
+ public static final CustomIcon Casing_InventoryManagaer_Blue_Redstone = new CustomIcon(
+ "TileEntities/gt4/OVERLAY_BLUE_REDSTONE");
private static final CustomIcon Casing_Test_1 = new CustomIcon("number/1");
private static final CustomIcon Casing_Test_2 = new CustomIcon("number/2");
@@ -599,12 +595,9 @@ public class TexturesGtBlock {
private static final CustomIcon Casing_Test_15 = new CustomIcon("number/15");
private static final CustomIcon Casing_Test_16 = new CustomIcon("number/16");
- public static final CustomIcon[] TEST_NUMBER = new CustomIcon[] {
- Casing_Test_1, Casing_Test_2, Casing_Test_3, Casing_Test_4,
- Casing_Test_5, Casing_Test_6, Casing_Test_7, Casing_Test_8,
- Casing_Test_9, Casing_Test_10, Casing_Test_11, Casing_Test_12,
- Casing_Test_13, Casing_Test_14, Casing_Test_15, Casing_Test_16
- };
+ public static final CustomIcon[] TEST_NUMBER = new CustomIcon[] { Casing_Test_1, Casing_Test_2, Casing_Test_3,
+ Casing_Test_4, Casing_Test_5, Casing_Test_6, Casing_Test_7, Casing_Test_8, Casing_Test_9, Casing_Test_10,
+ Casing_Test_11, Casing_Test_12, Casing_Test_13, Casing_Test_14, Casing_Test_15, Casing_Test_16 };
// Covers
private static final CustomIcon Internal_Overlay_Overflow_Valve = new CustomIcon("iconsets/OVERLAY_OVERFLOW_VALVE");
@@ -621,12 +614,12 @@ public class TexturesGtBlock {
private static final CustomIcon Internal_Overlay_Hatch_Muffler_Adv = new CustomIcon("iconsets/OVERLAY_MUFFLER_ADV");
public static final CustomIcon Overlay_Hatch_Muffler_Adv = Internal_Overlay_Hatch_Muffler_Adv;
// Control Core Bus
- private static final CustomIcon Internal_Overlay_Hatch_Control_Core =
- new CustomIcon("iconsets/OVERLAY_CONTROL_CORE_BUS");
+ private static final CustomIcon Internal_Overlay_Hatch_Control_Core = new CustomIcon(
+ "iconsets/OVERLAY_CONTROL_CORE_BUS");
public static final CustomIcon Overlay_Hatch_Control_Core = Internal_Overlay_Hatch_Control_Core;
// Milling Ball Bus
- private static final CustomIcon Internal_Overlay_Bus_Milling_Balls =
- new CustomIcon("iconsets/OVERLAY_MILLING_BALL_BUS");
+ private static final CustomIcon Internal_Overlay_Bus_Milling_Balls = new CustomIcon(
+ "iconsets/OVERLAY_MILLING_BALL_BUS");
public static final CustomIcon Overlay_Bus_Milling_Balls = Internal_Overlay_Bus_Milling_Balls;
// Catalyst Bus
private static final CustomIcon Internal_Overlay_Bus_Catalyst = new CustomIcon("iconsets/OVERLAY_CATALYSTS");
@@ -651,24 +644,24 @@ public class TexturesGtBlock {
public static final CustomIcon Overlay_Hatch_RTG_On = Internal_Overlay_Hatch_RTG_On;
// Dimensional
- private static final CustomIcon Internal_Overlay_Machine_Dimensional_Blue =
- new CustomIcon("TileEntities/adv_machine_dimensional_cover_blue");
+ private static final CustomIcon Internal_Overlay_Machine_Dimensional_Blue = new CustomIcon(
+ "TileEntities/adv_machine_dimensional_cover_blue");
public static final CustomIcon Overlay_Machine_Dimensional_Blue = Internal_Overlay_Machine_Dimensional_Blue;
- private static final CustomIcon Internal_Overlay_Machine_Dimensional_Orange =
- new CustomIcon("TileEntities/adv_machine_dimensional_cover_orange");
+ private static final CustomIcon Internal_Overlay_Machine_Dimensional_Orange = new CustomIcon(
+ "TileEntities/adv_machine_dimensional_cover_orange");
public static final CustomIcon Overlay_Machine_Dimensional_Orange = Internal_Overlay_Machine_Dimensional_Orange;
// Icons
private static final CustomIcon Internal_Overlay_MatterFab = new CustomIcon("TileEntities/adv_machine_matterfab");
public static final CustomIcon Overlay_MatterFab = Internal_Overlay_MatterFab;
- private static final CustomIcon Internal_Overlay_MatterFab_Active =
- new CustomIcon("TileEntities/adv_machine_matterfab_active");
+ private static final CustomIcon Internal_Overlay_MatterFab_Active = new CustomIcon(
+ "TileEntities/adv_machine_matterfab_active");
public static final CustomIcon Overlay_MatterFab_Active = Internal_Overlay_MatterFab_Active;
- private static final CustomIcon Internal_Overlay_MatterFab_Animated =
- new CustomIcon("TileEntities/adv_machine_matterfab_animated");
+ private static final CustomIcon Internal_Overlay_MatterFab_Animated = new CustomIcon(
+ "TileEntities/adv_machine_matterfab_animated");
public static final CustomIcon Overlay_MatterFab_Animated = Internal_Overlay_MatterFab_Animated;
- private static final CustomIcon Internal_Overlay_MatterFab_Active_Animated =
- new CustomIcon("TileEntities/adv_machine_matterfab_active_animated");
+ private static final CustomIcon Internal_Overlay_MatterFab_Active_Animated = new CustomIcon(
+ "TileEntities/adv_machine_matterfab_active_animated");
public static final CustomIcon Overlay_MatterFab_Active_Animated = Internal_Overlay_MatterFab_Active_Animated;
private static final CustomIcon Internal_Overlay_Oil = new CustomIcon("TileEntities/adv_machine_oil");
@@ -705,8 +698,8 @@ public class TexturesGtBlock {
public static final CustomIcon TEXTURE_MAGIC_PANEL_B = new CustomIcon("metro/TEXTURE_MAGIC_B");
public static final CustomIcon TEXTURE_ORGANIC_PANEL_A = new CustomIcon("metro/TEXTURE_ORGANIC_PANEL_A");
- public static final CustomIcon TEXTURE_ORGANIC_PANEL_A_GLOWING =
- new CustomIcon("metro/TEXTURE_ORGANIC_PANEL_A_GLOWING");
+ public static final CustomIcon TEXTURE_ORGANIC_PANEL_A_GLOWING = new CustomIcon(
+ "metro/TEXTURE_ORGANIC_PANEL_A_GLOWING");
public static final CustomIcon TEXTURE_STONE_BIRD_A = new CustomIcon("metro/TEXTURE_STONE_BIRD_A");
public static final CustomIcon TEXTURE_STONE_BIRD_A_LEFT = new CustomIcon("metro/TEXTURE_STONE_BIRD_A_LEFT");
@@ -751,122 +744,111 @@ public class TexturesGtBlock {
public static final CustomIcon TEXTURE_TECH_PANEL_H = new CustomIcon("metro/TEXTURE_TECH_PANEL_H");
public static final CustomIcon TEXTURE_TECH_PANEL_I = new CustomIcon("metro/TEXTURE_TECH_PANEL_I");
- public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE =
- new CustomIcon("TileEntities/DecayablesChest_bottom");
- public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE_ALT =
- new CustomIcon("TileEntities/DecayablesChest_top");
+ public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE = new CustomIcon(
+ "TileEntities/DecayablesChest_bottom");
+ public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE_ALT = new CustomIcon(
+ "TileEntities/DecayablesChest_top");
// LFTR Single blocks
- public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT =
- new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_FRONT");
- public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE =
- new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE");
- public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE =
- new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_SIDE");
- public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE =
- new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE");
- public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP =
- new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_TOP");
- public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE =
- new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE");
-
- public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT =
- new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_FRONT");
- public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE =
- new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE");
- public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE =
- new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_SIDE");
- public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE =
- new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE");
- public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP =
- new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_TOP");
- public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE =
- new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE");
+ public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT = new CustomIcon(
+ "TileEntities/ReactorColdTrap/OVERLAY_FRONT");
+ public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE = new CustomIcon(
+ "TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE");
+ public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE = new CustomIcon(
+ "TileEntities/ReactorColdTrap/OVERLAY_SIDE");
+ public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE = new CustomIcon(
+ "TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE");
+ public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP = new CustomIcon(
+ "TileEntities/ReactorColdTrap/OVERLAY_TOP");
+ public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE = new CustomIcon(
+ "TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE");
+
+ public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT = new CustomIcon(
+ "TileEntities/ReactorProcessingUnit/OVERLAY_FRONT");
+ public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE = new CustomIcon(
+ "TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE");
+ public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE = new CustomIcon(
+ "TileEntities/ReactorProcessingUnit/OVERLAY_SIDE");
+ public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE = new CustomIcon(
+ "TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE");
+ public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP = new CustomIcon(
+ "TileEntities/ReactorProcessingUnit/OVERLAY_TOP");
+ public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE = new CustomIcon(
+ "TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE");
// Overlay Arrays
public static ITexture[] OVERLAYS_ENERGY_OUT_BUFFER = new ITexture[] {
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {255, 100, 0, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {255, 255, 30, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {128, 128, 128, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0})
- };
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 220, 220, 220, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 220, 220, 220, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 255, 100, 0, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 255, 255, 30, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 128, 128, 128, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] { 240, 240, 245, 0 }) };
public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[] {
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {220, 220, 220, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {255, 100, 0, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {255, 255, 30, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {128, 128, 128, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0})
- };
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 220, 220, 220, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 100, 0, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 255, 255, 30, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 128, 128, 128, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] { 240, 240, 245, 0 }),
+ new GT_RenderedTexture(
+ (IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER,
+ new short[] { 240, 240, 245, 0 }) };
public static ITexture[] OVERLAYS_CABINET_FRONT = new ITexture[] {
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_1, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_2, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_3, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_4, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_5, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_6, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_7, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_8, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_9, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_10, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_11, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_12, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_13, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_14, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_15, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_16, new short[] {255, 255, 255, 0}),
- };
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_1, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_2, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_3, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_4, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_5, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_6, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_7, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_8, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_9, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_10, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_11, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_12, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_13, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_14, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_15, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_16, new short[] { 255, 255, 255, 0 }), };
public static ITexture[] OVERLAYS_COMPARTMENT_FRONT = new ITexture[] {
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_1, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_2, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_3, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_4, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_5, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_6, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_7, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_8, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_9, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_10, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_11, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_12, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_13, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_14, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_15, new short[] {255, 255, 255, 0}),
- new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_16, new short[] {255, 255, 255, 0}),
- };
-
- public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[] {
- TEXTURE_CASING_FUSION_COIL_II_1, TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3,
- TEXTURE_CASING_FUSION_COIL_II_4, TEXTURE_CASING_FUSION_COIL_II_5, TEXTURE_CASING_FUSION_COIL_II_6,
- TEXTURE_CASING_FUSION_COIL_II_7, TEXTURE_CASING_FUSION_COIL_II_8, TEXTURE_CASING_FUSION_COIL_II_9,
- TEXTURE_CASING_FUSION_COIL_II_10, TEXTURE_CASING_FUSION_COIL_II_11, TEXTURE_CASING_FUSION_COIL_II_12
- };
-
- public static IIconContainer[] TIERED_MACHINE_HULLS = new IIconContainer[] {
- TEXTURE_CASING_TIERED_ULV,
- TEXTURE_CASING_TIERED_LV,
- TEXTURE_CASING_TIERED_MV,
- TEXTURE_CASING_TIERED_HV,
- TEXTURE_CASING_TIERED_EV,
- TEXTURE_CASING_TIERED_IV,
- TEXTURE_CASING_TIERED_LuV,
- TEXTURE_CASING_TIERED_ZPM,
- TEXTURE_CASING_TIERED_UV,
- TEXTURE_CASING_TIERED_MAX
- };
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_1, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_2, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_3, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_4, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_5, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_6, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_7, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_8, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_9, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_10, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_11, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_12, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_13, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_14, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_15, new short[] { 255, 255, 255, 0 }),
+ new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_16, new short[] { 255, 255, 255, 0 }), };
+
+ public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[] { TEXTURE_CASING_FUSION_COIL_II_1,
+ TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3, TEXTURE_CASING_FUSION_COIL_II_4,
+ TEXTURE_CASING_FUSION_COIL_II_5, TEXTURE_CASING_FUSION_COIL_II_6, TEXTURE_CASING_FUSION_COIL_II_7,
+ TEXTURE_CASING_FUSION_COIL_II_8, TEXTURE_CASING_FUSION_COIL_II_9, TEXTURE_CASING_FUSION_COIL_II_10,
+ TEXTURE_CASING_FUSION_COIL_II_11, TEXTURE_CASING_FUSION_COIL_II_12 };
+
+ public static IIconContainer[] TIERED_MACHINE_HULLS = new IIconContainer[] { TEXTURE_CASING_TIERED_ULV,
+ TEXTURE_CASING_TIERED_LV, TEXTURE_CASING_TIERED_MV, TEXTURE_CASING_TIERED_HV, TEXTURE_CASING_TIERED_EV,
+ TEXTURE_CASING_TIERED_IV, TEXTURE_CASING_TIERED_LuV, TEXTURE_CASING_TIERED_ZPM, TEXTURE_CASING_TIERED_UV,
+ TEXTURE_CASING_TIERED_MAX };
public static Object Casing_Material_Turbine;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java
index bb09531d10..03afcfaa27 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java
@@ -16,18 +16,21 @@ public class TexturesGtCutomCovers {
private static void generateZTones() {
// ZTONES
- String[] aZtoneCoverTextureNames = new String[] {"agon", "iszm", "korp", "jelt", "bitt"};
+ String[] aZtoneCoverTextureNames = new String[] { "agon", "iszm", "korp", "jelt", "bitt" };
int aArrayIndex = 0;
- CustomIcon[][] aArrays = new CustomIcon[][] {
- TEXTURE_ZTONES_AGON, TEXTURE_ZTONES_ISZM, TEXTURE_ZTONES_KORP, TEXTURE_ZTONES_JELT, TEXTURE_ZTONES_BITT
- };
+ CustomIcon[][] aArrays = new CustomIcon[][] { TEXTURE_ZTONES_AGON, TEXTURE_ZTONES_ISZM, TEXTURE_ZTONES_KORP,
+ TEXTURE_ZTONES_JELT, TEXTURE_ZTONES_BITT };
for (CustomIcon[] t : aArrays) {
for (int s = 0; s < 16; s++) {
t[s] = new CustomIcon(
"Ztones",
- "sets/" + aZtoneCoverTextureNames[aArrayIndex] + "/" + aZtoneCoverTextureNames[aArrayIndex]
- + "_ (" + s + ")");
+ "sets/" + aZtoneCoverTextureNames[aArrayIndex]
+ + "/"
+ + aZtoneCoverTextureNames[aArrayIndex]
+ + "_ ("
+ + s
+ + ")");
}
aArrayIndex++;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
index b068d12d26..8f9f57110e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
@@ -1,12 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
public final class TexturesGtTools {
@@ -17,6 +18,7 @@ public final class TexturesGtTools {
public static final CustomIcon ELECTRIC_BUTCHER_KNIFE = new CustomIcon("iconsets/ELECTRIC_BUTCHER_KNIFE");
public static final class CustomIcon implements IIconContainer, Runnable {
+
protected IIcon mIcon, mOverlay;
protected final String mIconName;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java
index b136ad496a..a56acd41c7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java
@@ -74,155 +74,82 @@ import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE8;
import static gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE9;
import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.*;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine;
import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaSpecialMultiCasings;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
public class LargeTurbineTextureHandler {
/**
* LP Turbines
*/
- public static IIcon[] OVERLAY_LP_TURBINE = new IIcon[] {
- LARGETURBINE_ST1.getIcon(),
- LARGETURBINE_ST2.getIcon(),
- LARGETURBINE_ST3.getIcon(),
- LARGETURBINE_ST4.getIcon(),
- LARGETURBINE_ST5.getIcon(),
- LARGETURBINE_ST6.getIcon(),
- LARGETURBINE_ST7.getIcon(),
- LARGETURBINE_ST8.getIcon(),
- LARGETURBINE_ST9.getIcon(),
- };
+ public static IIcon[] OVERLAY_LP_TURBINE = new IIcon[] { LARGETURBINE_ST1.getIcon(), LARGETURBINE_ST2.getIcon(),
+ LARGETURBINE_ST3.getIcon(), LARGETURBINE_ST4.getIcon(), LARGETURBINE_ST5.getIcon(),
+ LARGETURBINE_ST6.getIcon(), LARGETURBINE_ST7.getIcon(), LARGETURBINE_ST8.getIcon(),
+ LARGETURBINE_ST9.getIcon(), };
- public static IIcon[] OVERLAY_LP_TURBINE_ACTIVE = new IIcon[] {
- LARGETURBINE_ST_ACTIVE1.getIcon(),
- LARGETURBINE_ST_ACTIVE2.getIcon(),
- LARGETURBINE_ST_ACTIVE3.getIcon(),
- LARGETURBINE_ST_ACTIVE4.getIcon(),
- LARGETURBINE_ST_ACTIVE5.getIcon(),
- LARGETURBINE_ST_ACTIVE6.getIcon(),
- LARGETURBINE_ST_ACTIVE7.getIcon(),
- LARGETURBINE_ST_ACTIVE8.getIcon(),
- LARGETURBINE_ST_ACTIVE9.getIcon(),
- };
+ public static IIcon[] OVERLAY_LP_TURBINE_ACTIVE = new IIcon[] { LARGETURBINE_ST_ACTIVE1.getIcon(),
+ LARGETURBINE_ST_ACTIVE2.getIcon(), LARGETURBINE_ST_ACTIVE3.getIcon(), LARGETURBINE_ST_ACTIVE4.getIcon(),
+ LARGETURBINE_ST_ACTIVE5.getIcon(), LARGETURBINE_ST_ACTIVE6.getIcon(), LARGETURBINE_ST_ACTIVE7.getIcon(),
+ LARGETURBINE_ST_ACTIVE8.getIcon(), LARGETURBINE_ST_ACTIVE9.getIcon(), };
/**
* HP Turbines
*/
- public static IIcon[] OVERLAY_HP_TURBINE = new IIcon[] {
- LARGETURBINE_TI1.getIcon(),
- LARGETURBINE_TI2.getIcon(),
- LARGETURBINE_TI3.getIcon(),
- LARGETURBINE_TI4.getIcon(),
- LARGETURBINE_TI5.getIcon(),
- LARGETURBINE_TI6.getIcon(),
- LARGETURBINE_TI7.getIcon(),
- LARGETURBINE_TI8.getIcon(),
- LARGETURBINE_TI9.getIcon(),
- };
+ public static IIcon[] OVERLAY_HP_TURBINE = new IIcon[] { LARGETURBINE_TI1.getIcon(), LARGETURBINE_TI2.getIcon(),
+ LARGETURBINE_TI3.getIcon(), LARGETURBINE_TI4.getIcon(), LARGETURBINE_TI5.getIcon(),
+ LARGETURBINE_TI6.getIcon(), LARGETURBINE_TI7.getIcon(), LARGETURBINE_TI8.getIcon(),
+ LARGETURBINE_TI9.getIcon(), };
- public static IIcon[] OVERLAY_HP_TURBINE_ACTIVE = new IIcon[] {
- LARGETURBINE_TI_ACTIVE1.getIcon(),
- LARGETURBINE_TI_ACTIVE2.getIcon(),
- LARGETURBINE_TI_ACTIVE3.getIcon(),
- LARGETURBINE_TI_ACTIVE4.getIcon(),
- LARGETURBINE_TI_ACTIVE5.getIcon(),
- LARGETURBINE_TI_ACTIVE6.getIcon(),
- LARGETURBINE_TI_ACTIVE7.getIcon(),
- LARGETURBINE_TI_ACTIVE8.getIcon(),
- LARGETURBINE_TI_ACTIVE9.getIcon(),
- };
+ public static IIcon[] OVERLAY_HP_TURBINE_ACTIVE = new IIcon[] { LARGETURBINE_TI_ACTIVE1.getIcon(),
+ LARGETURBINE_TI_ACTIVE2.getIcon(), LARGETURBINE_TI_ACTIVE3.getIcon(), LARGETURBINE_TI_ACTIVE4.getIcon(),
+ LARGETURBINE_TI_ACTIVE5.getIcon(), LARGETURBINE_TI_ACTIVE6.getIcon(), LARGETURBINE_TI_ACTIVE7.getIcon(),
+ LARGETURBINE_TI_ACTIVE8.getIcon(), LARGETURBINE_TI_ACTIVE9.getIcon(), };
/**
* Gas Turbines
*/
- public static IIcon[] OVERLAY_GAS_TURBINE = new IIcon[] {
- LARGETURBINE_SS1.getIcon(),
- LARGETURBINE_SS2.getIcon(),
- LARGETURBINE_SS3.getIcon(),
- LARGETURBINE_SS4.getIcon(),
- LARGETURBINE_SS5.getIcon(),
- LARGETURBINE_SS6.getIcon(),
- LARGETURBINE_SS7.getIcon(),
- LARGETURBINE_SS8.getIcon(),
- LARGETURBINE_SS9.getIcon(),
- };
+ public static IIcon[] OVERLAY_GAS_TURBINE = new IIcon[] { LARGETURBINE_SS1.getIcon(), LARGETURBINE_SS2.getIcon(),
+ LARGETURBINE_SS3.getIcon(), LARGETURBINE_SS4.getIcon(), LARGETURBINE_SS5.getIcon(),
+ LARGETURBINE_SS6.getIcon(), LARGETURBINE_SS7.getIcon(), LARGETURBINE_SS8.getIcon(),
+ LARGETURBINE_SS9.getIcon(), };
- public static IIcon[] OVERLAY_GAS_TURBINE_ACTIVE = new IIcon[] {
- LARGETURBINE_SS_ACTIVE1.getIcon(),
- LARGETURBINE_SS_ACTIVE2.getIcon(),
- LARGETURBINE_SS_ACTIVE3.getIcon(),
- LARGETURBINE_SS_ACTIVE4.getIcon(),
- LARGETURBINE_SS_ACTIVE5.getIcon(),
- LARGETURBINE_SS_ACTIVE6.getIcon(),
- LARGETURBINE_SS_ACTIVE7.getIcon(),
- LARGETURBINE_SS_ACTIVE8.getIcon(),
- LARGETURBINE_SS_ACTIVE9.getIcon(),
- };
+ public static IIcon[] OVERLAY_GAS_TURBINE_ACTIVE = new IIcon[] { LARGETURBINE_SS_ACTIVE1.getIcon(),
+ LARGETURBINE_SS_ACTIVE2.getIcon(), LARGETURBINE_SS_ACTIVE3.getIcon(), LARGETURBINE_SS_ACTIVE4.getIcon(),
+ LARGETURBINE_SS_ACTIVE5.getIcon(), LARGETURBINE_SS_ACTIVE6.getIcon(), LARGETURBINE_SS_ACTIVE7.getIcon(),
+ LARGETURBINE_SS_ACTIVE8.getIcon(), LARGETURBINE_SS_ACTIVE9.getIcon(), };
/**
* Plasma Turbines
*/
- public static IIcon[] OVERLAY_PLASMA_TURBINE = new IIcon[] {
- LARGETURBINE_TU1.getIcon(),
- LARGETURBINE_TU2.getIcon(),
- LARGETURBINE_TU3.getIcon(),
- LARGETURBINE_TU4.getIcon(),
- LARGETURBINE_TU5.getIcon(),
- LARGETURBINE_TU6.getIcon(),
- LARGETURBINE_TU7.getIcon(),
- LARGETURBINE_TU8.getIcon(),
- LARGETURBINE_TU9.getIcon(),
- };
+ public static IIcon[] OVERLAY_PLASMA_TURBINE = new IIcon[] { LARGETURBINE_TU1.getIcon(), LARGETURBINE_TU2.getIcon(),
+ LARGETURBINE_TU3.getIcon(), LARGETURBINE_TU4.getIcon(), LARGETURBINE_TU5.getIcon(),
+ LARGETURBINE_TU6.getIcon(), LARGETURBINE_TU7.getIcon(), LARGETURBINE_TU8.getIcon(),
+ LARGETURBINE_TU9.getIcon(), };
- public static IIcon[] OVERLAY_PLASMA_TURBINE_ACTIVE = new IIcon[] {
- LARGETURBINE_TU_ACTIVE1.getIcon(),
- LARGETURBINE_TU_ACTIVE2.getIcon(),
- LARGETURBINE_TU_ACTIVE3.getIcon(),
- LARGETURBINE_TU_ACTIVE4.getIcon(),
- LARGETURBINE_TU_ACTIVE5.getIcon(),
- LARGETURBINE_TU_ACTIVE6.getIcon(),
- LARGETURBINE_TU_ACTIVE7.getIcon(),
- LARGETURBINE_TU_ACTIVE8.getIcon(),
- LARGETURBINE_TU_ACTIVE9.getIcon(),
- };
+ public static IIcon[] OVERLAY_PLASMA_TURBINE_ACTIVE = new IIcon[] { LARGETURBINE_TU_ACTIVE1.getIcon(),
+ LARGETURBINE_TU_ACTIVE2.getIcon(), LARGETURBINE_TU_ACTIVE3.getIcon(), LARGETURBINE_TU_ACTIVE4.getIcon(),
+ LARGETURBINE_TU_ACTIVE5.getIcon(), LARGETURBINE_TU_ACTIVE6.getIcon(), LARGETURBINE_TU_ACTIVE7.getIcon(),
+ LARGETURBINE_TU_ACTIVE8.getIcon(), LARGETURBINE_TU_ACTIVE9.getIcon(), };
- public static IIcon[] OVERLAY_SC_TURBINE = new IIcon[] {
- OVERLAY_SC_TURBINE1.getIcon(),
- OVERLAY_SC_TURBINE2.getIcon(),
- OVERLAY_SC_TURBINE3.getIcon(),
- OVERLAY_SC_TURBINE4.getIcon(),
- OVERLAY_SC_TURBINE5.getIcon(),
- OVERLAY_SC_TURBINE6.getIcon(),
- OVERLAY_SC_TURBINE7.getIcon(),
- OVERLAY_SC_TURBINE8.getIcon(),
- OVERLAY_SC_TURBINE9.getIcon(),
- };
+ public static IIcon[] OVERLAY_SC_TURBINE = new IIcon[] { OVERLAY_SC_TURBINE1.getIcon(),
+ OVERLAY_SC_TURBINE2.getIcon(), OVERLAY_SC_TURBINE3.getIcon(), OVERLAY_SC_TURBINE4.getIcon(),
+ OVERLAY_SC_TURBINE5.getIcon(), OVERLAY_SC_TURBINE6.getIcon(), OVERLAY_SC_TURBINE7.getIcon(),
+ OVERLAY_SC_TURBINE8.getIcon(), OVERLAY_SC_TURBINE9.getIcon(), };
- public static IIcon[] OVERLAY_SC_TURBINE_ACTIVE = new IIcon[] {
- OVERLAY_SC_TURBINE1_ACTIVE.getIcon(),
- OVERLAY_SC_TURBINE2_ACTIVE.getIcon(),
- OVERLAY_SC_TURBINE3_ACTIVE.getIcon(),
- OVERLAY_SC_TURBINE4_ACTIVE.getIcon(),
- OVERLAY_SC_TURBINE5_ACTIVE.getIcon(),
- OVERLAY_SC_TURBINE6_ACTIVE.getIcon(),
- OVERLAY_SC_TURBINE7_ACTIVE.getIcon(),
- OVERLAY_SC_TURBINE8_ACTIVE.getIcon(),
- OVERLAY_SC_TURBINE9_ACTIVE.getIcon(),
- };
+ public static IIcon[] OVERLAY_SC_TURBINE_ACTIVE = new IIcon[] { OVERLAY_SC_TURBINE1_ACTIVE.getIcon(),
+ OVERLAY_SC_TURBINE2_ACTIVE.getIcon(), OVERLAY_SC_TURBINE3_ACTIVE.getIcon(),
+ OVERLAY_SC_TURBINE4_ACTIVE.getIcon(), OVERLAY_SC_TURBINE5_ACTIVE.getIcon(),
+ OVERLAY_SC_TURBINE6_ACTIVE.getIcon(), OVERLAY_SC_TURBINE7_ACTIVE.getIcon(),
+ OVERLAY_SC_TURBINE8_ACTIVE.getIcon(), OVERLAY_SC_TURBINE9_ACTIVE.getIcon(), };
- public static IIcon handleCasingsGT(
- final IBlockAccess aWorld,
- final int xCoord,
- final int yCoord,
- final int zCoord,
- final int aSide,
- final GregtechMetaSpecialMultiCasings i) {
+ public static IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
+ final int aSide, final GregtechMetaSpecialMultiCasings i) {
final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
// 0 shaft
@@ -436,9 +363,7 @@ public class LargeTurbineTextureHandler {
if (aTile != null) {
final IMetaTileEntity aMetaTileEntity = aTile.getMetaTileEntity();
if (aMetaTileEntity != null && aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine) {
- aVal = ((GT_MetaTileEntity_Hatch_Turbine) aMetaTileEntity)
- .getBaseMetaTileEntity()
- .isActive();
+ aVal = ((GT_MetaTileEntity_Hatch_Turbine) aMetaTileEntity).getBaseMetaTileEntity().isActive();
// Logger.INFO("Returning "+aVal+" as Rotor Assembly controller status");
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_ComputerCube_Setup.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_ComputerCube_Setup.java
index 4c6dee9c2f..a3cf7e8219 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_ComputerCube_Setup.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_ComputerCube_Setup.java
@@ -2,6 +2,10 @@ package gtPlusPlus.xmod.gregtech.common.computer;
import static gtPlusPlus.xmod.gregtech.common.tileentities.misc.GT_TileEntity_ComputerCube.sReactorList;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+
import Ic2ExpReactorPlanner.ComponentFactory;
import gregtech.api.enums.ItemList;
import gregtech.api.objects.GT_ItemStack;
@@ -12,40 +16,25 @@ import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.bartworks.BW_Utils;
import gtPlusPlus.xmod.goodgenerator.GG_Utils;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
public class GT_ComputerCube_Setup {
public static void init() {
- Logger.INFO("[Reactor Simulator] Added " + ComponentFactory.getComponentCount()
- + " components to ComponentFactory.");
+ Logger.INFO(
+ "[Reactor Simulator] Added " + ComponentFactory.getComponentCount()
+ + " components to ComponentFactory.");
if (sReactorList == null) {
sReactorList = new ArrayList<GT_ItemStack>();
- String[] aIc2Items = new String[] {
- "reactorUraniumSimple",
- "reactorUraniumDual",
- "reactorUraniumQuad", /*"reactorIsotopeCell",*/
- "reactorReflector",
- "reactorReflectorThick",
- "reactorCoolantSimple",
- "reactorCoolantTriple",
- "reactorCoolantSix",
- "reactorCondensator",
- "reactorCondensatorLap",
- "reactorPlating",
- "reactorPlatingHeat",
- "reactorPlatingExplosive",
- "reactorVent",
- "reactorVentCore",
- "reactorVentGold",
- "reactorVentSpread",
- "reactorVentDiamond",
- "reactorHeatSwitch",
- "reactorHeatSwitchCore",
- "reactorHeatSwitchSpread",
- "reactorHeatSwitchDiamond", /*"reactorHeatpack",*/
+ String[] aIc2Items = new String[] { "reactorUraniumSimple", "reactorUraniumDual", "reactorUraniumQuad", /*
+ * "reactorIsotopeCell",
+ */
+ "reactorReflector", "reactorReflectorThick", "reactorCoolantSimple", "reactorCoolantTriple",
+ "reactorCoolantSix", "reactorCondensator", "reactorCondensatorLap", "reactorPlating",
+ "reactorPlatingHeat", "reactorPlatingExplosive", "reactorVent", "reactorVentCore",
+ "reactorVentGold", "reactorVentSpread", "reactorVentDiamond", "reactorHeatSwitch",
+ "reactorHeatSwitchCore", "reactorHeatSwitchSpread",
+ "reactorHeatSwitchDiamond", /* "reactorHeatpack", */
};
for (String aItem : aIc2Items) {
@@ -58,31 +47,14 @@ public class GT_ComputerCube_Setup {
}
}
- ItemList[] aGtItems = new ItemList[] {
- ItemList.Neutron_Reflector,
- ItemList.Moxcell_1,
- ItemList.Moxcell_2,
- ItemList.Moxcell_4, /*ItemList.Uraniumcell_1, ItemList.Uraniumcell_2, ItemList.Uraniumcell_4,*/
- ItemList.NaquadahCell_1,
- ItemList.NaquadahCell_2,
- ItemList.NaquadahCell_4,
- ItemList.ThoriumCell_1,
- ItemList.ThoriumCell_2,
- ItemList.ThoriumCell_4,
- ItemList.MNqCell_1,
- ItemList.MNqCell_2,
- ItemList.MNqCell_4,
- ItemList.Reactor_Coolant_He_1,
- ItemList.Reactor_Coolant_He_3,
- ItemList.Reactor_Coolant_He_6,
- ItemList.Reactor_Coolant_NaK_1,
- ItemList.Reactor_Coolant_NaK_3,
- ItemList.Reactor_Coolant_NaK_6,
- ItemList.Reactor_Coolant_Sp_1,
- ItemList.Reactor_Coolant_Sp_2,
- ItemList.Reactor_Coolant_Sp_3,
- ItemList.Reactor_Coolant_Sp_6
- };
+ ItemList[] aGtItems = new ItemList[] { ItemList.Neutron_Reflector, ItemList.Moxcell_1, ItemList.Moxcell_2,
+ ItemList.Moxcell_4, /* ItemList.Uraniumcell_1, ItemList.Uraniumcell_2, ItemList.Uraniumcell_4, */
+ ItemList.NaquadahCell_1, ItemList.NaquadahCell_2, ItemList.NaquadahCell_4, ItemList.ThoriumCell_1,
+ ItemList.ThoriumCell_2, ItemList.ThoriumCell_4, ItemList.MNqCell_1, ItemList.MNqCell_2,
+ ItemList.MNqCell_4, ItemList.Reactor_Coolant_He_1, ItemList.Reactor_Coolant_He_3,
+ ItemList.Reactor_Coolant_He_6, ItemList.Reactor_Coolant_NaK_1, ItemList.Reactor_Coolant_NaK_3,
+ ItemList.Reactor_Coolant_NaK_6, ItemList.Reactor_Coolant_Sp_1, ItemList.Reactor_Coolant_Sp_2,
+ ItemList.Reactor_Coolant_Sp_3, ItemList.Reactor_Coolant_Sp_6 };
for (ItemList aItem : aGtItems) {
sReactorList.add(new GT_ItemStack(aItem.get(1)));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_Computercube_Description.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_Computercube_Description.java
index 18ae44ab79..2e7a7c7ffb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_Computercube_Description.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_Computercube_Description.java
@@ -1,15 +1,18 @@
package gtPlusPlus.xmod.gregtech.common.computer;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
public class GT_Computercube_Description {
+
public static ArrayList<GT_Computercube_Description> sDescriptions = new ArrayList<GT_Computercube_Description>();
public String[] mDescription;
@@ -25,510 +28,267 @@ public class GT_Computercube_Description {
public static void addStandardDescriptions() {
Logger.INFO("Adding Default Description Set of the Computer Cube");
new GT_Computercube_Description(
- new String[] {
- "Lightning Rod",
- "Also known as the Bane of",
- "Alblaka. The Lightning Rod",
- "enables you to gain Energy",
- "from Lightning! To set it up",
- "you just need the Block",
- "itself, 4 HV-Transformers",
- "and a crapton of Ironfences,",
- "which you then place on top",
- "of it. After that you have to",
- "wait for a Thunderstorm and",
- "when you are lucky you get",
- "2.5 MFSU of Energy out of",
- "it. If a Rod is high enough",
- "then Rain is also enough to",
- "get stroke, but with less",
- "probability ofcourse."
- },
- new ItemStack[] {
- GT_ModHandler.getIC2Item("ironFence", 1),
- GT_ModHandler.getIC2Item("ironFence", 1),
- GT_ModHandler.getIC2Item("ironFence", 1),
- GT_ModHandler.getIC2Item("ironFence", 1),
- ItemList.Machine_IV_LightningRod.get(1),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null
- });
+ new String[] { "Lightning Rod", "Also known as the Bane of", "Alblaka. The Lightning Rod",
+ "enables you to gain Energy", "from Lightning! To set it up", "you just need the Block",
+ "itself, 4 HV-Transformers", "and a crapton of Ironfences,", "which you then place on top",
+ "of it. After that you have to", "wait for a Thunderstorm and", "when you are lucky you get",
+ "2.5 MFSU of Energy out of", "it. If a Rod is high enough", "then Rain is also enough to",
+ "get stroke, but with less", "probability ofcourse." },
+ new ItemStack[] { GT_ModHandler.getIC2Item("ironFence", 1), GT_ModHandler.getIC2Item("ironFence", 1),
+ GT_ModHandler.getIC2Item("ironFence", 1), GT_ModHandler.getIC2Item("ironFence", 1),
+ ItemList.Machine_IV_LightningRod.get(1), null, null, null, null, null, null, null, null,
+ null });
new GT_Computercube_Description(
- new String[] {
- "Quantum Chest",
- "You want to store tons of",
- "Materials into your Chests",
- "but you hate the Item limit",
- "of them? Not anymore! The",
- "Quantum Chest is able to",
- "store an INFINITE* amount",
- "of one single Item type per",
- "Chest.",
- "This Chest stores your Items",
- "like Data and ever has a",
- "Stack of the Item ready for",
- "extraction. It is compatible",
- "with any Item that doesnt",
- "have a NBT-Tag. You ask what",
- "NBT is? I know it, thats enough.",
- "Up to 2147483391*"
- },
- new ItemStack[] {
- ItemList.Quantum_Chest_IV.get(1),
- ItemList.Quantum_Chest_EV.get(1),
- ItemList.Quantum_Chest_HV.get(1),
- ItemList.Quantum_Chest_MV.get(1),
- ItemList.Quantum_Chest_LV.get(1),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null
- });
+ new String[] { "Quantum Chest", "You want to store tons of", "Materials into your Chests",
+ "but you hate the Item limit", "of them? Not anymore! The", "Quantum Chest is able to",
+ "store an INFINITE* amount", "of one single Item type per", "Chest.",
+ "This Chest stores your Items", "like Data and ever has a", "Stack of the Item ready for",
+ "extraction. It is compatible", "with any Item that doesnt", "have a NBT-Tag. You ask what",
+ "NBT is? I know it, thats enough.", "Up to 2147483391*" },
+ new ItemStack[] { ItemList.Quantum_Chest_IV.get(1), ItemList.Quantum_Chest_EV.get(1),
+ ItemList.Quantum_Chest_HV.get(1), ItemList.Quantum_Chest_MV.get(1),
+ ItemList.Quantum_Chest_LV.get(1), null, null, null, null, null, null, null, null, null });
new GT_Computercube_Description(
- new String[] {
- "Quantum Tank",
- "You want to store tons of",
- "Fluids into your Tanks",
- "but you hate the capacity",
- "of them? Not anymore! The",
- "Quantum Tank is able to",
- "store an INFINITE* amount",
- "of one single Fluid type per",
- "Tank.",
- "This Tank stores your Fluids",
- "like Data and ever has a",
- "Stack of the Fluid ready for",
- "extraction. It is compatible",
- "with any Fluid. ",
- "You ask what",
- "NBT is? I know it, thats enough.",
- "* = 2147483391"
- },
- new ItemStack[] {
- ItemList.Quantum_Tank_IV.get(1),
- ItemList.Quantum_Tank_EV.get(1),
- ItemList.Quantum_Tank_HV.get(1),
- ItemList.Quantum_Tank_MV.get(1),
- ItemList.Quantum_Tank_LV.get(1),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null
- });
+ new String[] { "Quantum Tank", "You want to store tons of", "Fluids into your Tanks",
+ "but you hate the capacity", "of them? Not anymore! The", "Quantum Tank is able to",
+ "store an INFINITE* amount", "of one single Fluid type per", "Tank.",
+ "This Tank stores your Fluids", "like Data and ever has a", "Stack of the Fluid ready for",
+ "extraction. It is compatible", "with any Fluid. ", "You ask what",
+ "NBT is? I know it, thats enough.", "* = 2147483391" },
+ new ItemStack[] { ItemList.Quantum_Tank_IV.get(1), ItemList.Quantum_Tank_EV.get(1),
+ ItemList.Quantum_Tank_HV.get(1), ItemList.Quantum_Tank_MV.get(1),
+ ItemList.Quantum_Tank_LV.get(1), null, null, null, null, null, null, null, null, null });
new GT_Computercube_Description(
- new String[] {
- "Computer Cube",
- "The Device you are",
- "currently using. This Computer",
- "is running the G.L.A.D.-OS,",
- "which is containing many",
- "usefull Apps:",
- "- Reactor Planner",
- "- Seedbag Scanner",
- "- Recipelists for GT-Devices",
- "- ",
- "- ",
- "- ",
- "- ",
- "- ",
- "And the Description List you",
- "are currently reading.",
- "~This Device has private Access~"
- },
- new ItemStack[] {
- null,
- null,
- null,
- null,
- GregtechItemList.Gregtech_Computer_Cube_Machine.get(1),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null
- });
- /* new GT_Computercube_Description(new String[] {
- "UUM-Assembler", "It's like an automatic", "Crafting Table just for UUM", "It can store 20 UUM-Recipes", "and produces those on demand", "It costs 512EU per used piece", "of Universal-Usable-Matter(TM).", "The integrated Quantum Chest", "allows it to store all your", "UUM inside it.",
- "Top and Bottom are for Input,", "while the Output is on the", "Sides. The Output is designed,", "to work with RP-Managers, so", "build it into your recursive", "Autocraftingsystem.", "" }, new ItemStack[] {
- null, null, null, GT_ModHandler.getIC2Item("matter", 1), new ItemStack(GregTech_API.sBlockList[1], 1, 5), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Sonictron", "You like Music? Then the", "Sonictron 9001 is your best", "choice! You can compose Alarms,", "Doorbell Sounds or boring", "Elevator Music, with the 64 Slots", "inside it. Just leftclick them", "to switch the Sound, rightclick", "them to switch the modulation", "and shiftclick to remove it.",
- "Then apply Redstone to play", "With the mobile Version you can", "play sounds everywhere, after", "you copied them from a normal", "Sonictron via rightclicking", "Sneakrightclicking pastes", "Emits Redstone when finished." }, new ItemStack[] {
- null, null, null, GregTech_API.getGregTechItem(32, 1, 0), new ItemStack(GregTech_API.sBlockList[1], 1, 6), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "L.E.S.U.", "The unlaggiest Multiblock ever!", "One Controllerblock, and as many", "'stupid' Storageblocks as you want.", "To use it, place one Controller", "and then place the LESU-Storages", "adjacent to it or other placed", "LESU-Storages. The Tier (max EU/t)", "of it depends on the amount of", "adjacent Storages. The",
- "Storageblocks are NOT TileEntities,", "what means that they cause as much", "Lag as a random Dirtblock. And the", "Controller Block only checks ONCE", "for the Storages, so no", "Blockiterationlag, AT. ALL. Anyone,", "who says that they lag gets murdered!" }, new ItemStack[] {
- null, null, null, new ItemStack(GregTech_API.sBlockList[0], 1, 6), new ItemStack(GregTech_API.sBlockList[1], 1, 7), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "I.D.S.U.", "The Interdimensional Storage Unit", "is a Device, which is like a", "wireless, crossdimensional and", "enderchestlike EU-Storage Block", "", "Every Player has one Network of", "these. The ID is determined by", "the Hashcode of the Name from the", "first Player, who opens it's GUI",
- "", "It stores up to 1 Billion EU", "and emits EV. But you need at", "least two of them for Energy", "Transfer", "", "" }, new ItemStack[] {
- null, null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 8), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "A.E.S.U.", "The Adjustable Energy Storage Unit", "is like 10 MFSU and has an", "adjustable Output between 0 and", "2048EU/t. You could use it as a", "Transformer. It is Tier-IV, so", "it's basically needed to charge", "Energy Orbs and Lapotron Packs", "", "Not much else to say about it.",
- "", "", "", "", "", "", "" }, new ItemStack[] {
- null, null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 9), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Charge-O-Mat", "An automatable Charging Bench", "It puts (de-)charged Tools into", "the right Outputslots, which are", "accessible on the Sides of it.", "", "The Energy Orb inside stores enough", "to charge your QSuit almost instantly", "", "This is a Tier-V Charging Station",
- "even when the Max-IN/OUT is only", "2048EU/t. It also charges your Armor", "when you are standing close to it.", "", "If you apply Redstone, then it", "decharges instead.", "" }, new ItemStack[] {
- null, null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 10), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Centrifuge", "This is a Machine to seperate", "Isotopes.", "", "It has a maximum Consumption Rate", "of 5EU/t, and its Maxinput is", "32EU/t. The time it needs depends", "on the Recipe you use.", "", "It needs Tin Cells for some Recipes,",
- "which you put in the Top Left Slot", "", "Top = Input", "Bottom = Tin Cells", "Side = Output", "", "You can pipe Lava into this Device" }, new ItemStack[] {
- null, null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 11), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Electrolyzer", "This is a Machine to seperate", "Molecules and electrolyze", "Watercells.", "", "It has a maximum Consumption Rate", "of 128EU/t, and its Maxinput is", "128EU/t. The time it needs depends", "on the Recipe you use.", "",
- "It needs Tin Cells for some Recipes,", "which you put in the Bottom Left Slot", "", "Top = Input", "Bottom = Tin Cells", "Side = Output", "" }, new ItemStack[] {
- null, null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 25), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Grinder", "This Machines purpose is to", "macerate and grind Ores.", "It can ONLY grind Ores, don't", "try regular Macerator Recipes.", "It has a fixed Consumption Rate", "of 128EU/t, and its Maxinput is", "128EU/t. The time it needs is", "5 seconds per Ore Block", "It needs Water for most Recipes,",
- "which you put in the Bottom Left Slot", "Top = Input", "Bottom = Water", "Side = Output", "Its a lagfree Multiblock Structure,", "so you need a special Machine Casing", "for this Device. (see GUI)" }, new ItemStack[] {
- null, new ItemStack(Block.field_71943_B, 1), new ItemStack(GregTech_API.sBlockList[0], 1, 14), new ItemStack(GregTech_API.sBlockList[0], 1, 13), new ItemStack(GregTech_API.sBlockList[1], 1, 28), null, null, null, null, null,
- null, null, null, null });*/
+ new String[] { "Computer Cube", "The Device you are", "currently using. This Computer",
+ "is running the G.L.A.D.-OS,", "which is containing many", "usefull Apps:", "- Reactor Planner",
+ "- Seedbag Scanner", "- Recipelists for GT-Devices", "- ", "- ", "- ", "- ", "- ",
+ "And the Description List you", "are currently reading.", "~This Device has private Access~" },
+ new ItemStack[] { null, null, null, null, GregtechItemList.Gregtech_Computer_Cube_Machine.get(1), null,
+ null, null, null, null, null, null, null, null });
+ /*
+ * new GT_Computercube_Description(new String[] { "UUM-Assembler", "It's like an automatic",
+ * "Crafting Table just for UUM", "It can store 20 UUM-Recipes", "and produces those on demand",
+ * "It costs 512EU per used piece", "of Universal-Usable-Matter(TM).", "The integrated Quantum Chest",
+ * "allows it to store all your", "UUM inside it.", "Top and Bottom are for Input,",
+ * "while the Output is on the", "Sides. The Output is designed,", "to work with RP-Managers, so",
+ * "build it into your recursive", "Autocraftingsystem.", "" }, new ItemStack[] { null, null, null,
+ * GT_ModHandler.getIC2Item("matter", 1), new ItemStack(GregTech_API.sBlockList[1], 1, 5), null, null, null,
+ * null, null, null, null, null, null }); new GT_Computercube_Description(new String[] { "Sonictron",
+ * "You like Music? Then the", "Sonictron 9001 is your best", "choice! You can compose Alarms,",
+ * "Doorbell Sounds or boring", "Elevator Music, with the 64 Slots", "inside it. Just leftclick them",
+ * "to switch the Sound, rightclick", "them to switch the modulation", "and shiftclick to remove it.",
+ * "Then apply Redstone to play", "With the mobile Version you can", "play sounds everywhere, after",
+ * "you copied them from a normal", "Sonictron via rightclicking", "Sneakrightclicking pastes",
+ * "Emits Redstone when finished." }, new ItemStack[] { null, null, null, GregTech_API.getGregTechItem(32, 1,
+ * 0), new ItemStack(GregTech_API.sBlockList[1], 1, 6), null, null, null, null, null, null, null, null, null });
+ * new GT_Computercube_Description(new String[] { "L.E.S.U.", "The unlaggiest Multiblock ever!",
+ * "One Controllerblock, and as many", "'stupid' Storageblocks as you want.", "To use it, place one Controller",
+ * "and then place the LESU-Storages", "adjacent to it or other placed", "LESU-Storages. The Tier (max EU/t)",
+ * "of it depends on the amount of", "adjacent Storages. The", "Storageblocks are NOT TileEntities,",
+ * "what means that they cause as much", "Lag as a random Dirtblock. And the",
+ * "Controller Block only checks ONCE", "for the Storages, so no", "Blockiterationlag, AT. ALL. Anyone,",
+ * "who says that they lag gets murdered!" }, new ItemStack[] { null, null, null, new
+ * ItemStack(GregTech_API.sBlockList[0], 1, 6), new ItemStack(GregTech_API.sBlockList[1], 1, 7), null, null,
+ * null, null, null, null, null, null, null }); new GT_Computercube_Description(new String[] { "I.D.S.U.",
+ * "The Interdimensional Storage Unit", "is a Device, which is like a", "wireless, crossdimensional and",
+ * "enderchestlike EU-Storage Block", "", "Every Player has one Network of", "these. The ID is determined by",
+ * "the Hashcode of the Name from the", "first Player, who opens it's GUI", "", "It stores up to 1 Billion EU",
+ * "and emits EV. But you need at", "least two of them for Energy", "Transfer", "", "" }, new ItemStack[] {
+ * null, null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 8), null, null, null, null, null, null,
+ * null, null, null }); new GT_Computercube_Description(new String[] { "A.E.S.U.",
+ * "The Adjustable Energy Storage Unit", "is like 10 MFSU and has an", "adjustable Output between 0 and",
+ * "2048EU/t. You could use it as a", "Transformer. It is Tier-IV, so", "it's basically needed to charge",
+ * "Energy Orbs and Lapotron Packs", "", "Not much else to say about it.", "", "", "", "", "", "", "" }, new
+ * ItemStack[] { null, null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 9), null, null, null,
+ * null, null, null, null, null, null }); new GT_Computercube_Description(new String[] { "Charge-O-Mat",
+ * "An automatable Charging Bench", "It puts (de-)charged Tools into", "the right Outputslots, which are",
+ * "accessible on the Sides of it.", "", "The Energy Orb inside stores enough",
+ * "to charge your QSuit almost instantly", "", "This is a Tier-V Charging Station",
+ * "even when the Max-IN/OUT is only", "2048EU/t. It also charges your Armor",
+ * "when you are standing close to it.", "", "If you apply Redstone, then it", "decharges instead.", "" }, new
+ * ItemStack[] { null, null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 10), null, null, null,
+ * null, null, null, null, null, null }); new GT_Computercube_Description(new String[] { "Centrifuge",
+ * "This is a Machine to seperate", "Isotopes.", "", "It has a maximum Consumption Rate",
+ * "of 5EU/t, and its Maxinput is", "32EU/t. The time it needs depends", "on the Recipe you use.", "",
+ * "It needs Tin Cells for some Recipes,", "which you put in the Top Left Slot", "", "Top = Input",
+ * "Bottom = Tin Cells", "Side = Output", "", "You can pipe Lava into this Device" }, new ItemStack[] { null,
+ * null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 11), null, null, null, null, null, null, null,
+ * null, null }); new GT_Computercube_Description(new String[] { "Electrolyzer",
+ * "This is a Machine to seperate", "Molecules and electrolyze", "Watercells.", "",
+ * "It has a maximum Consumption Rate", "of 128EU/t, and its Maxinput is", "128EU/t. The time it needs depends",
+ * "on the Recipe you use.", "", "It needs Tin Cells for some Recipes,",
+ * "which you put in the Bottom Left Slot", "", "Top = Input", "Bottom = Tin Cells", "Side = Output", "" }, new
+ * ItemStack[] { null, null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 25), null, null, null,
+ * null, null, null, null, null, null }); new GT_Computercube_Description(new String[] { "Grinder",
+ * "This Machines purpose is to", "macerate and grind Ores.", "It can ONLY grind Ores, don't",
+ * "try regular Macerator Recipes.", "It has a fixed Consumption Rate", "of 128EU/t, and its Maxinput is",
+ * "128EU/t. The time it needs is", "5 seconds per Ore Block", "It needs Water for most Recipes,",
+ * "which you put in the Bottom Left Slot", "Top = Input", "Bottom = Water", "Side = Output",
+ * "Its a lagfree Multiblock Structure,", "so you need a special Machine Casing", "for this Device. (see GUI)"
+ * }, new ItemStack[] { null, new ItemStack(Block.field_71943_B, 1), new ItemStack(GregTech_API.sBlockList[0],
+ * 1, 14), new ItemStack(GregTech_API.sBlockList[0], 1, 13), new ItemStack(GregTech_API.sBlockList[1], 1, 28),
+ * null, null, null, null, null, null, null, null, null });
+ */
new GT_Computercube_Description(
- new String[] {
- "Electric Blast Furnace",
- "You may know the Blast Furnace",
- "of Railcraft. This one works",
- "similar, as it can also produce",
- "Steel out of Iron and Coal.",
- "",
- "Its heat Capacity depends on the",
- "used Machine Casings for building",
- "it. The better they are, the more",
- "Heat it can achieve.",
- "",
- "Top = Input 1",
- "Bottom = Input 2",
- "Side = Output",
- "Its a lagfree Multiblock Structure,",
- "so you need a special Machine Casing",
- "for this Device. (see GUI)"
- },
- new ItemStack[] {
- null,
- null,
- null,
- ItemList.Casing_HeatProof.get(1),
- ItemList.Machine_Multi_BlastFurnace.get(1),
- ItemList.Casing_Coil_Cupronickel.get(1),
- ItemList.Casing_Coil_Kanthal.get(1),
- ItemList.Casing_Coil_Nichrome.get(1),
- ItemList.Casing_Coil_TungstenSteel.get(1),
- ItemList.Casing_Coil_HSSG.get(1),
- ItemList.Casing_Coil_HSSS.get(1),
- ItemList.Casing_Coil_Naquadah.get(1),
- ItemList.Casing_Coil_NaquadahAlloy.get(1),
- null
- });
- /* new GT_Computercube_Description(new String[] {
- "Sawmill", "This Device turns your Logs", "into more Planks, than a normal", "Steve can produce with his Hands.", "", "Its byproduct, Wood Pulp, can be", "compressed into special Planks,", "which are burning like Charcoal.", "", "It needs Water for most Recipes,",
- "which you put in the Bottom Left Slot", "Top = Input", "Water Sides = Water", "Saw Side = Output", "Its a lagfree Multiblock Structure,", "so you need a special Machine Casing", "for this Device. (see GUI)" }, new ItemStack[] {
- null, null, GT_MetaItem_Material.instance.getStack(15, 1), GT_MetaItem_Dust.instance.getStack(15, 1), new ItemStack(GregTech_API.sBlockList[1], 1, 32), null, null, null, null, null,
- null, null, null, null });*/
+ new String[] { "Electric Blast Furnace", "You may know the Blast Furnace",
+ "of Railcraft. This one works", "similar, as it can also produce",
+ "Steel out of Iron and Coal.", "", "Its heat Capacity depends on the",
+ "used Machine Casings for building", "it. The better they are, the more",
+ "Heat it can achieve.", "", "Top = Input 1", "Bottom = Input 2", "Side = Output",
+ "Its a lagfree Multiblock Structure,", "so you need a special Machine Casing",
+ "for this Device. (see GUI)" },
+ new ItemStack[] { null, null, null, ItemList.Casing_HeatProof.get(1),
+ ItemList.Machine_Multi_BlastFurnace.get(1), ItemList.Casing_Coil_Cupronickel.get(1),
+ ItemList.Casing_Coil_Kanthal.get(1), ItemList.Casing_Coil_Nichrome.get(1),
+ ItemList.Casing_Coil_TungstenSteel.get(1), ItemList.Casing_Coil_HSSG.get(1),
+ ItemList.Casing_Coil_HSSS.get(1), ItemList.Casing_Coil_Naquadah.get(1),
+ ItemList.Casing_Coil_NaquadahAlloy.get(1), null });
+ /*
+ * new GT_Computercube_Description(new String[] { "Sawmill", "This Device turns your Logs",
+ * "into more Planks, than a normal", "Steve can produce with his Hands.", "",
+ * "Its byproduct, Wood Pulp, can be", "compressed into special Planks,", "which are burning like Charcoal.",
+ * "", "It needs Water for most Recipes,", "which you put in the Bottom Left Slot", "Top = Input",
+ * "Water Sides = Water", "Saw Side = Output", "Its a lagfree Multiblock Structure,",
+ * "so you need a special Machine Casing", "for this Device. (see GUI)" }, new ItemStack[] { null, null,
+ * GT_MetaItem_Material.instance.getStack(15, 1), GT_MetaItem_Dust.instance.getStack(15, 1), new
+ * ItemStack(GregTech_API.sBlockList[1], 1, 32), null, null, null, null, null, null, null, null, null });
+ */
new GT_Computercube_Description(
- new String[] {
- "Implosion Compressor",
- "You need to turn Dusts back",
- "into Gems? Or do you just want",
- "to make Iridium Plates?",
- "With a bit ITNT you can achieve",
- "that in this Device!",
- "",
- "We strongly recommend to use",
- "Flint Dust instead of Flints",
- "for making the ITNT.",
- "",
- "Top = Input",
- "Explosion Sides = Output",
- "ITNT Side = ITNT Input",
- "Its a lagfree Multiblock Structure,",
- "so you need a special Machine Casing",
- "for this Device. (see GUI)"
- },
- new ItemStack[] {
- null,
- null,
- null,
- GT_ModHandler.getIC2Item("industrialTnt", 1, new ItemStack(net.minecraft.init.Blocks.tnt, 1)),
- ItemList.Machine_Multi_ImplosionCompressor.get(1),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null
- });
- /* new GT_Computercube_Description(new String[] {
- "Superconductor", "Expensive, but superconducting", "nearly infinite EU/p and it has", "no Cableloss!", "Do not confuse this with the", "Superconductor Item!", "", "Supercondensator", "This is a special kind of Transformer", "It allows you to convert anything down",
- "to 8192 EU/t, what is like a normal HVT.", "But if you apply Redstone to it then it", "outputs friggin 1000000EU/t!!!", "", "You also need it for the Fusion Reactor.", "Some Machines will require that high", "Voltage in a short period of time." }, new ItemStack[] {
- null, null, GregTech_API.getGregTechItem(3, 1, 2), new ItemStack(GregTech_API.sBlockList[1], 1, 12), new ItemStack(GregTech_API.sBlockList[1], 1, 15), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Player Detector", "This nice little Device is able", "to detect Players in a Range of", "16-Spherical Meters and a", "EU-Consumption of 2.5EU/t.", "", "It can be switched to 3 Diffrent", "Modes, to detect YOURSELF, OTHERS", "and ALL Players by Rightclicking it.", "",
- "It doesnt detect regular Mobs.", "", "", "", "", "", "~This Device has private Access~" }, new ItemStack[] {
- null, null, null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 13), null, null, null, null, null,
- null, null, null, null });*/
+ new String[] { "Implosion Compressor", "You need to turn Dusts back", "into Gems? Or do you just want",
+ "to make Iridium Plates?", "With a bit ITNT you can achieve", "that in this Device!", "",
+ "We strongly recommend to use", "Flint Dust instead of Flints", "for making the ITNT.", "",
+ "Top = Input", "Explosion Sides = Output", "ITNT Side = ITNT Input",
+ "Its a lagfree Multiblock Structure,", "so you need a special Machine Casing",
+ "for this Device. (see GUI)" },
+ new ItemStack[] { null, null, null,
+ GT_ModHandler.getIC2Item("industrialTnt", 1, new ItemStack(net.minecraft.init.Blocks.tnt, 1)),
+ ItemList.Machine_Multi_ImplosionCompressor.get(1), null, null, null, null, null, null, null,
+ null, null });
+ /*
+ * new GT_Computercube_Description(new String[] { "Superconductor", "Expensive, but superconducting",
+ * "nearly infinite EU/p and it has", "no Cableloss!", "Do not confuse this with the", "Superconductor Item!",
+ * "", "Supercondensator", "This is a special kind of Transformer", "It allows you to convert anything down",
+ * "to 8192 EU/t, what is like a normal HVT.", "But if you apply Redstone to it then it",
+ * "outputs friggin 1000000EU/t!!!", "", "You also need it for the Fusion Reactor.",
+ * "Some Machines will require that high", "Voltage in a short period of time." }, new ItemStack[] { null, null,
+ * GregTech_API.getGregTechItem(3, 1, 2), new ItemStack(GregTech_API.sBlockList[1], 1, 12), new
+ * ItemStack(GregTech_API.sBlockList[1], 1, 15), null, null, null, null, null, null, null, null, null }); new
+ * GT_Computercube_Description(new String[] { "Player Detector", "This nice little Device is able",
+ * "to detect Players in a Range of", "16-Spherical Meters and a", "EU-Consumption of 2.5EU/t.", "",
+ * "It can be switched to 3 Diffrent", "Modes, to detect YOURSELF, OTHERS",
+ * "and ALL Players by Rightclicking it.", "", "It doesnt detect regular Mobs.", "", "", "", "", "",
+ * "~This Device has private Access~" }, new ItemStack[] { null, null, null, null, new
+ * ItemStack(GregTech_API.sBlockList[1], 1, 13), null, null, null, null, null, null, null, null, null });
+ */
new GT_Computercube_Description(
- new String[] {
- "Matter Fabricator",
- "The Matter Fabricator is nothing",
- "else than a Mass Fabricator, which",
- "can ONLY run on Scrap and other",
- "Amplifiers.",
- "",
- "With the Default Config it is 100",
- "times more expensive than normal.",
- "Of course you can set the Config",
- "to 166666, to get your normal",
- "Massfabricationrate back, or you",
- "could make Mass Fabrication even",
- "cheaper, if you really want to",
- "make Mass Fabrication that easy",
- "",
- "",
- ""
- },
- new ItemStack[] {
- null,
- null,
- null,
- GT_Utility.getFluidDisplayStack(FluidUtils.getUUM(1), false),
- ItemList.Machine_LV_Massfab.get(1),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null
- });
+ new String[] { "Matter Fabricator", "The Matter Fabricator is nothing",
+ "else than a Mass Fabricator, which", "can ONLY run on Scrap and other", "Amplifiers.", "",
+ "With the Default Config it is 100", "times more expensive than normal.",
+ "Of course you can set the Config", "to 166666, to get your normal",
+ "Massfabricationrate back, or you", "could make Mass Fabrication even",
+ "cheaper, if you really want to", "make Mass Fabrication that easy", "", "", "" },
+ new ItemStack[] { null, null, null, GT_Utility.getFluidDisplayStack(FluidUtils.getUUM(1), false),
+ ItemList.Machine_LV_Massfab.get(1), null, null, null, null, null, null, null, null, null });
new GT_Computercube_Description(
- new String[] {
- "Electric Autocrafting Tables",
- "These are Crafting Tables for the",
- "common need of autocrafting in",
- "Factories. One Craft needs 5000EU to",
- "be performed, so you have actually to",
- "lay Wires to it. This Table is",
- "unique as its also able, to give you",
- "the used Capsulecellcontainers, made",
- "by Industrial Corp, back.",
- "You may use that behaviour to",
- "craft anything releated to chemics,",
- "like the 2xKNO3-Recipe for Saltpeter.",
- "The 5 Modes are the following:",
- "1. Craft Recipe, 2. All 5 Modes",
- "3. Craft all as single Items",
- "4. 2x2-Grid and 5. a 3x3-Grid.",
- "It accepts only 32EU/p as Input."
- },
- new ItemStack[] {
- null,
- null,
- null,
- null,
- GregtechItemList.GT4_Electric_Auto_Workbench_LV.get(1),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null
- });
- /* new GT_Computercube_Description(new String[] {
- "Automation with GregTech", "Translocators and Buffers are the", "newest Way to automate your Machines.", "Screw Buildcraft, these EU-wasting", "Devices are much more awesome.", "They output 32EU/t to their directed", "IN- and OUT-puts, making them usefull", "for things, like saving wires.", "Translocators are taking Stuff from", "the Block at their green Inputfacing",
- "and putting it into the Block at the", "red Outputfacing. Buffers do the same,", "but the grab Items from their own", "Inventory, what makes them usefull", "as Pipe-replacement.", "Buffers also have Redstone Intelligence,", "which you can configure in their GUI." }, new ItemStack[] {
- null, null, new ItemStack(GregTech_API.sBlockList[1], 1, 19), new ItemStack(GregTech_API.sBlockList[1], 1, 18), new ItemStack(GregTech_API.sBlockList[1], 1, 17), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Silver Ore", "It's rarity is similar to Gold", "Silver can be used, to make", "Circuits cheaper, or you can use", "it for Redpowerstuff.", "", "", "", "", "",
- "", "", "", "", "", "", "" }, new ItemStack[] {
- null, null, GT_OreDictUnificator.get("dustSilver", 1), GregTech_API.getGregTechItem(0, 1, 17), new ItemStack(GregTech_API.sBlockList[2], 1, 1), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Sapphires and Rubys", "These spawn exactly like Emeralds.", "But Rubies are found in Deserts,", "while Sapphires can be found in", "Oceans.", "", "They currently make only a cheaper", "Recipe for Energycrystals and", "Lapotroncrystals, but they are", "Redpower Compatible.",
- "", "They also sometimes drop random", "other Gems, like Garnet for Ruby", "or green Sapphire for Sapphire", "in addition.", "", "" }, new ItemStack[] {
- null, GregTech_API.getGregTechItem(0, 1, 32), new ItemStack(GregTech_API.sBlockList[2], 1, 3), GregTech_API.getGregTechItem(0, 1, 33), new ItemStack(GregTech_API.sBlockList[2], 1, 4), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Bauxite Ore", "The Stuff out of which you can", "produce Aluminium and also", "Titanium.", "You find this Ore in Plains and", "Forests.", "", "If you think Aluminium is useless", "then note, that mobs NEVER spawn", "ontop of an Aluminium Block",
- "(Same applies also for Silver-,", "Gem- and Iridium Blocks)", "Production Chain:", "macerating Bauxite Ore", "electrolyzing 24 Bauxite Dust", "smelting Aluminium Dust in a", "Blast Furnace" }, new ItemStack[] {
- new ItemStack(GregTech_API.sBlockList[0], 1, 7), GregTech_API.getGregTechItem(0, 1, 18), GregTech_API.getGregTechItem(1, 1, 18), GregTech_API.getGregTechItem(1, 1, 17), new ItemStack(GregTech_API.sBlockList[2], 1, 5), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Titanium", "Produced by centrifuging Bauxitedust", "as a byproduct, this Material can make", "anything much more resistant against", "damage, like Explosions.", "Blocks made of Titaniumingots have a", "large Blastresistance", "", "It can also be used to craft tons of", "mixed Metal Ingots",
- "", "", "", "", "", "", "" }, new ItemStack[] {
- new ItemStack(GregTech_API.sBlockList[0], 1, 8), GregTech_API.getGregTechItem(0, 1, 19), GregTech_API.getGregTechItem(1, 1, 19), GregTech_API.getGregTechItem(1, 1, 17), new ItemStack(GregTech_API.sBlockList[2], 1, 5), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Iridium Ore", "You can find it only when you", "stripmine very large Areas with", "Quarries and such. There is only", "one in every 5th-10th Chunk.", "It's even more rare in Oceans!", "", "Some people disable the UUM-Recipe", "for Iridium, for making getting it", "an Achievement.",
- "", "However Iridium Ore contains traces", "of Platinum, so it's best to use the", "Industrial Grinder for this Ore.", "", "", "" }, new ItemStack[] {
- null, null, GT_OreDictUnificator.get("plateAlloyIridium", 1), GT_ModHandler.getIC2Item("iridiumOre", 1), new ItemStack(GregTech_API.sBlockList[2], 1, 2), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Helium Coolant Cell", "These are just cheaper, than the", "Water based Coolant Cells, and can", "also hold six times more Heat.", "", "Helium Cells can also be used for", "making Luminators and Mininglasers", "", "", "",
- "", "", "", "", "", "", "" }, new ItemStack[] {
- GregTech_API.getGregTechItem(2, 1, 6), GregTech_API.getGregTechItem(2, 1, 3), GregTech_API.getGregTechItem(34, 1, 0), GregTech_API.getGregTechItem(35, 1, 0), GregTech_API.getGregTechItem(36, 1, 0), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Destructopack", "Open its GUI via rightclick and", "dump all the useless Stuff from", "your Inventory into it, instead of", "littering Items into the World.", "", "", "", "", "",
- "", "", "", "", "", "", "" }, new ItemStack[] {
- null, null, null, null, GregTech_API.getGregTechItem(33, 1, 0), null, null, null, null, null,
- null, null, null, null });*/
+ new String[] { "Electric Autocrafting Tables", "These are Crafting Tables for the",
+ "common need of autocrafting in", "Factories. One Craft needs 5000EU to",
+ "be performed, so you have actually to", "lay Wires to it. This Table is",
+ "unique as its also able, to give you", "the used Capsulecellcontainers, made",
+ "by Industrial Corp, back.", "You may use that behaviour to",
+ "craft anything releated to chemics,", "like the 2xKNO3-Recipe for Saltpeter.",
+ "The 5 Modes are the following:", "1. Craft Recipe, 2. All 5 Modes",
+ "3. Craft all as single Items", "4. 2x2-Grid and 5. a 3x3-Grid.",
+ "It accepts only 32EU/p as Input." },
+ new ItemStack[] { null, null, null, null, GregtechItemList.GT4_Electric_Auto_Workbench_LV.get(1), null,
+ null, null, null, null, null, null, null, null });
+ /*
+ * new GT_Computercube_Description(new String[] { "Automation with GregTech",
+ * "Translocators and Buffers are the", "newest Way to automate your Machines.",
+ * "Screw Buildcraft, these EU-wasting", "Devices are much more awesome.",
+ * "They output 32EU/t to their directed", "IN- and OUT-puts, making them usefull",
+ * "for things, like saving wires.", "Translocators are taking Stuff from",
+ * "the Block at their green Inputfacing", "and putting it into the Block at the",
+ * "red Outputfacing. Buffers do the same,", "but the grab Items from their own",
+ * "Inventory, what makes them usefull", "as Pipe-replacement.", "Buffers also have Redstone Intelligence,",
+ * "which you can configure in their GUI." }, new ItemStack[] { null, null, new
+ * ItemStack(GregTech_API.sBlockList[1], 1, 19), new ItemStack(GregTech_API.sBlockList[1], 1, 18), new
+ * ItemStack(GregTech_API.sBlockList[1], 1, 17), null, null, null, null, null, null, null, null, null }); new
+ * GT_Computercube_Description(new String[] { "Silver Ore", "It's rarity is similar to Gold",
+ * "Silver can be used, to make", "Circuits cheaper, or you can use", "it for Redpowerstuff.", "", "", "", "",
+ * "", "", "", "", "", "", "", "" }, new ItemStack[] { null, null, GT_OreDictUnificator.get("dustSilver", 1),
+ * GregTech_API.getGregTechItem(0, 1, 17), new ItemStack(GregTech_API.sBlockList[2], 1, 1), null, null, null,
+ * null, null, null, null, null, null }); new GT_Computercube_Description(new String[] { "Sapphires and Rubys",
+ * "These spawn exactly like Emeralds.", "But Rubies are found in Deserts,", "while Sapphires can be found in",
+ * "Oceans.", "", "They currently make only a cheaper", "Recipe for Energycrystals and",
+ * "Lapotroncrystals, but they are", "Redpower Compatible.", "", "They also sometimes drop random",
+ * "other Gems, like Garnet for Ruby", "or green Sapphire for Sapphire", "in addition.", "", "" }, new
+ * ItemStack[] { null, GregTech_API.getGregTechItem(0, 1, 32), new ItemStack(GregTech_API.sBlockList[2], 1, 3),
+ * GregTech_API.getGregTechItem(0, 1, 33), new ItemStack(GregTech_API.sBlockList[2], 1, 4), null, null, null,
+ * null, null, null, null, null, null }); new GT_Computercube_Description(new String[] { "Bauxite Ore",
+ * "The Stuff out of which you can", "produce Aluminium and also", "Titanium.",
+ * "You find this Ore in Plains and", "Forests.", "", "If you think Aluminium is useless",
+ * "then note, that mobs NEVER spawn", "ontop of an Aluminium Block", "(Same applies also for Silver-,",
+ * "Gem- and Iridium Blocks)", "Production Chain:", "macerating Bauxite Ore", "electrolyzing 24 Bauxite Dust",
+ * "smelting Aluminium Dust in a", "Blast Furnace" }, new ItemStack[] { new
+ * ItemStack(GregTech_API.sBlockList[0], 1, 7), GregTech_API.getGregTechItem(0, 1, 18),
+ * GregTech_API.getGregTechItem(1, 1, 18), GregTech_API.getGregTechItem(1, 1, 17), new
+ * ItemStack(GregTech_API.sBlockList[2], 1, 5), null, null, null, null, null, null, null, null, null }); new
+ * GT_Computercube_Description(new String[] { "Titanium", "Produced by centrifuging Bauxitedust",
+ * "as a byproduct, this Material can make", "anything much more resistant against", "damage, like Explosions.",
+ * "Blocks made of Titaniumingots have a", "large Blastresistance", "", "It can also be used to craft tons of",
+ * "mixed Metal Ingots", "", "", "", "", "", "", "" }, new ItemStack[] { new
+ * ItemStack(GregTech_API.sBlockList[0], 1, 8), GregTech_API.getGregTechItem(0, 1, 19),
+ * GregTech_API.getGregTechItem(1, 1, 19), GregTech_API.getGregTechItem(1, 1, 17), new
+ * ItemStack(GregTech_API.sBlockList[2], 1, 5), null, null, null, null, null, null, null, null, null }); new
+ * GT_Computercube_Description(new String[] { "Iridium Ore", "You can find it only when you",
+ * "stripmine very large Areas with", "Quarries and such. There is only", "one in every 5th-10th Chunk.",
+ * "It's even more rare in Oceans!", "", "Some people disable the UUM-Recipe",
+ * "for Iridium, for making getting it", "an Achievement.", "", "However Iridium Ore contains traces",
+ * "of Platinum, so it's best to use the", "Industrial Grinder for this Ore.", "", "", "" }, new ItemStack[] {
+ * null, null, GT_OreDictUnificator.get("plateAlloyIridium", 1), GT_ModHandler.getIC2Item("iridiumOre", 1), new
+ * ItemStack(GregTech_API.sBlockList[2], 1, 2), null, null, null, null, null, null, null, null, null }); new
+ * GT_Computercube_Description(new String[] { "Helium Coolant Cell", "These are just cheaper, than the",
+ * "Water based Coolant Cells, and can", "also hold six times more Heat.", "",
+ * "Helium Cells can also be used for", "making Luminators and Mininglasers", "", "", "", "", "", "", "", "",
+ * "", "" }, new ItemStack[] { GregTech_API.getGregTechItem(2, 1, 6), GregTech_API.getGregTechItem(2, 1, 3),
+ * GregTech_API.getGregTechItem(34, 1, 0), GregTech_API.getGregTechItem(35, 1, 0),
+ * GregTech_API.getGregTechItem(36, 1, 0), null, null, null, null, null, null, null, null, null }); new
+ * GT_Computercube_Description(new String[] { "Destructopack", "Open its GUI via rightclick and",
+ * "dump all the useless Stuff from", "your Inventory into it, instead of", "littering Items into the World.",
+ * "", "", "", "", "", "", "", "", "", "", "", "" }, new ItemStack[] { null, null, null, null,
+ * GregTech_API.getGregTechItem(33, 1, 0), null, null, null, null, null, null, null, null, null });
+ */
new GT_Computercube_Description(
- new String[] {
- "Data Orbs",
- "They store Data.",
- "",
- "Rightclick on a Computer Cube, to",
- "extract a Reactorplan",
- "",
- "Sneak-Rightclick on it, to insert",
- "a Reactorplan",
- "",
- "Works also with Sonictrons",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- },
- new ItemStack[] {
- null,
- null,
- null,
- null,
- ItemList.Tool_DataOrb.get(1),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null
- });
+ new String[] { "Data Orbs", "They store Data.", "", "Rightclick on a Computer Cube, to",
+ "extract a Reactorplan", "", "Sneak-Rightclick on it, to insert", "a Reactorplan", "",
+ "Works also with Sonictrons", "", "", "", "", "", "", "" },
+ new ItemStack[] { null, null, null, null, ItemList.Tool_DataOrb.get(1), null, null, null, null, null,
+ null, null, null, null });
new GT_Computercube_Description(
- new String[] {
- "Energy Orbs",
- "100 Million EU in one Orb!",
- "",
- "This is a Tier-IV-Energystorage",
- "So a MFSU is not enough for it!",
- "",
- "Use it to create a Lapotron Pack,",
- "which is like an ultimate Lap Pack!",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- },
- new ItemStack[] {
- null,
- null,
- null,
- null,
- ItemList.Energy_LapotronicOrb.get(1),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null
- });
+ new String[] { "Energy Orbs", "100 Million EU in one Orb!", "", "This is a Tier-IV-Energystorage",
+ "So a MFSU is not enough for it!", "", "Use it to create a Lapotron Pack,",
+ "which is like an ultimate Lap Pack!", "", "", "", "", "", "", "", "", "" },
+ new ItemStack[] { null, null, null, null, ItemList.Energy_LapotronicOrb.get(1), null, null, null, null,
+ null, null, null, null, null });
new GT_Computercube_Description(
- new String[] {
- "Iridium Neutron Reflector",
- "It's used for Fusion Reactor Coils,",
- "and works like a normal one",
- "inside a Reactor, but it's also",
- "INDESTRUCTIBLE*.",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "* = for weardown"
- },
- new ItemStack[] {
- null,
- null,
- null,
- null,
- ItemList.Neutron_Reflector.get(1),
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null
- });
- /*new GT_Computercube_Description(new String[] {
- "Rock Cutter", "You want to get whole Blocks, but", "your Drill is not enchantable?", "The Rock Cutter has an awesome", "SilkTouch-III-Function!", "", "It works like a Drill, but you", "get the whole Block instead of", "'macerated' Ores!", "",
- "Put those Blocks into a Macerator", "and double your Diamond Income!", "", "Or better. Use the Industrial", "Grinder to get even more", "Resources!", "" }, new ItemStack[] {
- null, null, null, null, GregTech_API.getGregTechItem(46, 1, 0), null, null, null, null, null,
- null, null, null, null });
- new GT_Computercube_Description(new String[] {
- "Tesla Staff", "This completly untested PvP-Weapon", "destroys electric Armor in one hit", "", "The Energy Orb inside it must be", "fully charged to let this work.", "", "We are not responsible for any", "Electrocution Damage to yourself,", "while using it.",
- "", "We also dont even know, if this", "Weapon has any effect AT ALL.", "", "", "", "" }, new ItemStack[] {
- null, null, null, null, GregTech_API.getGregTechItem(47, 1, 0), null, null, null, null, null,
- null, null, null, null });*/
+ new String[] { "Iridium Neutron Reflector", "It's used for Fusion Reactor Coils,",
+ "and works like a normal one", "inside a Reactor, but it's also", "INDESTRUCTIBLE*.", "", "",
+ "", "", "", "", "", "", "", "", "", "* = for weardown" },
+ new ItemStack[] { null, null, null, null, ItemList.Neutron_Reflector.get(1), null, null, null, null,
+ null, null, null, null, null });
+ /*
+ * new GT_Computercube_Description(new String[] { "Rock Cutter", "You want to get whole Blocks, but",
+ * "your Drill is not enchantable?", "The Rock Cutter has an awesome", "SilkTouch-III-Function!", "",
+ * "It works like a Drill, but you", "get the whole Block instead of", "'macerated' Ores!", "",
+ * "Put those Blocks into a Macerator", "and double your Diamond Income!", "", "Or better. Use the Industrial",
+ * "Grinder to get even more", "Resources!", "" }, new ItemStack[] { null, null, null, null,
+ * GregTech_API.getGregTechItem(46, 1, 0), null, null, null, null, null, null, null, null, null }); new
+ * GT_Computercube_Description(new String[] { "Tesla Staff", "This completly untested PvP-Weapon",
+ * "destroys electric Armor in one hit", "", "The Energy Orb inside it must be",
+ * "fully charged to let this work.", "", "We are not responsible for any", "Electrocution Damage to yourself,",
+ * "while using it.", "", "We also dont even know, if this", "Weapon has any effect AT ALL.", "", "", "", "" },
+ * new ItemStack[] { null, null, null, null, GregTech_API.getGregTechItem(47, 1, 0), null, null, null, null,
+ * null, null, null, null, null });
+ */
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_Computercube_Simulator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_Computercube_Simulator.java
index fc57930dda..31f378066f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_Computercube_Simulator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/computer/GT_Computercube_Simulator.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.computer;
+import java.util.ArrayList;
+import java.util.HashMap;
+
import Ic2ExpReactorPlanner.AutomationSimulator;
import Ic2ExpReactorPlanner.Reactor;
import Ic2ExpReactorPlanner.SimulationData;
@@ -9,13 +12,10 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.common.tileentities.misc.GT_TileEntity_ComputerCube;
-import java.util.ArrayList;
-import java.util.HashMap;
public class GT_Computercube_Simulator {
- private static final HashMap<Integer, Pair<Integer, Integer>> sSlotPositions =
- new HashMap<Integer, Pair<Integer, Integer>>();
+ private static final HashMap<Integer, Pair<Integer, Integer>> sSlotPositions = new HashMap<Integer, Pair<Integer, Integer>>();
static {
int aSlot = 4;
@@ -48,14 +48,13 @@ public class GT_Computercube_Simulator {
public void slotClick(int aSlot, GT_ItemStack aStack) {
- /*if (selection != null) {
- componentToPlace = ComponentFactory.createComponent(selection.getActionCommand());
- if (componentToPlace != null) {
- componentToPlace.setInitialHeat(((Number)componentHeatSpinner.getValue()).intValue());
- componentToPlace.setAutomationThreshold(((Number)placingThresholdSpinner.getValue()).intValue());
- componentToPlace.setReactorPause(((Number)placingReactorPauseSpinner.getValue()).intValue());
- }
- }*/
+ /*
+ * if (selection != null) { componentToPlace = ComponentFactory.createComponent(selection.getActionCommand());
+ * if (componentToPlace != null) {
+ * componentToPlace.setInitialHeat(((Number)componentHeatSpinner.getValue()).intValue());
+ * componentToPlace.setAutomationThreshold(((Number)placingThresholdSpinner.getValue()).intValue());
+ * componentToPlace.setReactorPause(((Number)placingReactorPauseSpinner.getValue()).intValue()); } }
+ */
if (aSlot >= 4 && aSlot < 58) {
Pair<Integer, Integer> aSpot = sSlotPositions.get(aSlot);
ReactorItem aItem;
@@ -63,10 +62,14 @@ public class GT_Computercube_Simulator {
aItem = null;
} else {
- Logger.INFO("Using lookup key: " + ItemUtils.getModId(aStack.toStack()) + "."
- + aStack.mItem.getUnlocalizedName() + "." + aStack.mMetaData);
- aItem = ReactorItem.sComponentMap.get(ItemUtils.getModId(aStack.toStack()) + "."
- + aStack.mItem.getUnlocalizedName() + "." + aStack.mMetaData);
+ Logger.INFO(
+ "Using lookup key: " + ItemUtils.getModId(
+ aStack.toStack()) + "." + aStack.mItem.getUnlocalizedName() + "." + aStack.mMetaData);
+ aItem = ReactorItem.sComponentMap.get(
+ ItemUtils.getModId(aStack.toStack()) + "."
+ + aStack.mItem.getUnlocalizedName()
+ + "."
+ + aStack.mMetaData);
}
int aRow = aSpot.getKey();
int aColumn = aSpot.getValue();
@@ -86,9 +89,9 @@ public class GT_Computercube_Simulator {
}
public void simulate() {
- /*if (Utils.isClient()) {
- return;
- }*/
+ /*
+ * if (Utils.isClient()) { return; }
+ */
if (simulator != null && simulator.isRunning()) {
Logger.INFO("Simulator Running, Stopping.");
simulator.cancel();
@@ -129,22 +132,21 @@ public class GT_Computercube_Simulator {
private void clearGrid() {
reactor.clearGrid();
- /*for (int i = 0; i < reactorButtons.length; i++) {
- for (int j = 0; j < reactorButtons[i].length; j++) {
- reactorButtons[i][j].setIcon(null);
- reactorButtons[i][j].setToolTipText(null);
- reactorButtonPanels[i][j].setBackground(Color.LIGHT_GRAY);
- }
- }*/
+ /*
+ * for (int i = 0; i < reactorButtons.length; i++) { for (int j = 0; j < reactorButtons[i].length; j++) {
+ * reactorButtons[i][j].setIcon(null); reactorButtons[i][j].setToolTipText(null);
+ * reactorButtonPanels[i][j].setBackground(Color.LIGHT_GRAY); } }
+ */
output.clear();
- /*materialsArea.setText(reactor.getMaterials().toString());
- componentListArea.setText(reactor.getComponentList().toString());
- maxHeatLabel.setText(formatI18n("UI.MaxHeatSpecific", reactor.getMaxHeat()));
- heatSpinnerModel.setMaximum(reactor.getMaxHeat() - 1);
- heatSpinnerModel.setValue(Math.min(((Number) heatSpinnerModel.getValue()).intValue(), reactor.getMaxHeat() - 1));
- temperatureEffectsLabel.setText(formatI18n("UI.TemperatureEffectsSpecific", (int)(reactor.getMaxHeat() * 0.4), (int)(reactor.getMaxHeat() * 0.5), (int)(reactor.getMaxHeat() * 0.7), (int)(reactor.getMaxHeat() * 0.85), (int)(reactor.getMaxHeat() * 1.0)));
- lockCode = true;
- codeField.setText(null);
- lockCode = false;*/
+ /*
+ * materialsArea.setText(reactor.getMaterials().toString());
+ * componentListArea.setText(reactor.getComponentList().toString());
+ * maxHeatLabel.setText(formatI18n("UI.MaxHeatSpecific", reactor.getMaxHeat()));
+ * heatSpinnerModel.setMaximum(reactor.getMaxHeat() - 1); heatSpinnerModel.setValue(Math.min(((Number)
+ * heatSpinnerModel.getValue()).intValue(), reactor.getMaxHeat() - 1));
+ * temperatureEffectsLabel.setText(formatI18n("UI.TemperatureEffectsSpecific", (int)(reactor.getMaxHeat() *
+ * 0.4), (int)(reactor.getMaxHeat() * 0.5), (int)(reactor.getMaxHeat() * 0.7), (int)(reactor.getMaxHeat() *
+ * 0.85), (int)(reactor.getMaxHeat() * 1.0))); lockCode = true; codeField.setText(null); lockCode = false;
+ */
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java
index 9e507048ed..9a5cf5f64c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java
@@ -34,113 +34,69 @@ public class CoverManager {
Cover_Gt_Machine_Casing = new MetaItemCoverCasings();
if (Loader.isModLoaded("Ztones")) {
- String[] aZtoneCoverTextureNames = new String[] {"agon", "iszm", "korp", "jelt", "bitt"};
- MetaCustomCoverItem[] aZtoneCoverItems =
- new MetaCustomCoverItem[] {Cover_Agon, Cover_Iszm, Cover_Korp, Cover_Jelt, Cover_Bitt};
- CustomIcon[][] aArrays = new CustomIcon[][] {
- TEXTURE_ZTONES_AGON, TEXTURE_ZTONES_ISZM, TEXTURE_ZTONES_KORP, TEXTURE_ZTONES_JELT, TEXTURE_ZTONES_BITT
- };
- short[][][] aRGB =
- new short[][][] {ZTONES.RGB_AGON, ZTONES.RGB_ISZM, ZTONES.RGB_KORP, ZTONES.RGB_JELT, ZTONES.RGB_BITT
- };
+ String[] aZtoneCoverTextureNames = new String[] { "agon", "iszm", "korp", "jelt", "bitt" };
+ MetaCustomCoverItem[] aZtoneCoverItems = new MetaCustomCoverItem[] { Cover_Agon, Cover_Iszm, Cover_Korp,
+ Cover_Jelt, Cover_Bitt };
+ CustomIcon[][] aArrays = new CustomIcon[][] { TEXTURE_ZTONES_AGON, TEXTURE_ZTONES_ISZM, TEXTURE_ZTONES_KORP,
+ TEXTURE_ZTONES_JELT, TEXTURE_ZTONES_BITT };
+ short[][][] aRGB = new short[][][] { ZTONES.RGB_AGON, ZTONES.RGB_ISZM, ZTONES.RGB_KORP, ZTONES.RGB_JELT,
+ ZTONES.RGB_BITT };
for (int y = 0; y < aZtoneCoverTextureNames.length; y++) {
- aZtoneCoverItems[y] =
- new MetaCustomCoverItem("Ztones", 16, aZtoneCoverTextureNames[y], aArrays[y], aRGB[y]);
+ aZtoneCoverItems[y] = new MetaCustomCoverItem(
+ "Ztones",
+ 16,
+ aZtoneCoverTextureNames[y],
+ aArrays[y],
+ aRGB[y]);
}
}
}
static final class ZTONES {
- private static final short[][] RGB_AGON = new short[][] {
- VanillaColours.DYE_WHITE.getAsShort(),
- VanillaColours.DYE_YELLOW.getAsShort(),
- VanillaColours.DYE_LIME.getAsShort(),
- VanillaColours.DYE_GREEN.getAsShort(),
- VanillaColours.DYE_CYAN.getAsShort(),
- VanillaColours.DYE_LIGHT_BLUE.getAsShort(),
- VanillaColours.DYE_DARK_BLUE.getAsShort(),
- VanillaColours.DYE_DARK_PURPLE.getAsShort(),
- VanillaColours.DYE_LIGHT_PURPLE.getAsShort(),
- VanillaColours.DYE_PINK.getAsShort(),
- VanillaColours.DYE_RED.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_BROWN.getAsShort(),
- VanillaColours.DYE_BLACK.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_LIGHT_GRAY.getAsShort(),
- };
- private static final short[][] RGB_ISZM = new short[][] {
- VanillaColours.DYE_LIGHT_GRAY.getAsShort(),
- VanillaColours.DYE_WHITE.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_BLUE.getAsShort(),
- VanillaColours.DYE_YELLOW.getAsShort(),
- VanillaColours.DYE_DARK_BLUE.getAsShort(),
- VanillaColours.DYE_RED.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_CYAN.getAsShort(),
- VanillaColours.DYE_YELLOW.getAsShort(),
- VanillaColours.DYE_RED.getAsShort(),
- VanillaColours.DYE_CYAN.getAsShort(),
- VanillaColours.DYE_GREEN.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_LIGHT_BLUE.getAsShort(),
- VanillaColours.DYE_DARK_PURPLE.getAsShort(),
- };
- private static final short[][] RGB_KORP = new short[][] {
- new short[] {125, 125, 125},
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- new short[] {22, 156, 156},
- new short[] {22, 156, 156},
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- VanillaColours.DYE_DARK_GRAY.getAsShort(),
- };
- private static final short[][] RGB_JELT = new short[][] {
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- };
- private static final short[][] RGB_BITT = new short[][] {
- VanillaColours.DYE_BLACK.getAsShort(),
- VanillaColours.DYE_WHITE.getAsShort(),
- VanillaColours.DYE_YELLOW.getAsShort(),
- VanillaColours.DYE_LIME.getAsShort(),
- VanillaColours.DYE_GREEN.getAsShort(),
- VanillaColours.DYE_CYAN.getAsShort(),
- VanillaColours.DYE_LIGHT_BLUE.getAsShort(),
- VanillaColours.DYE_LIGHT_BLUE.getAsShort(),
- VanillaColours.DYE_DARK_BLUE.getAsShort(),
- VanillaColours.DYE_DARK_PURPLE.getAsShort(),
- VanillaColours.DYE_LIGHT_PURPLE.getAsShort(),
- VanillaColours.DYE_PINK.getAsShort(),
- VanillaColours.DYE_RED.getAsShort(),
- VanillaColours.DYE_RED.getAsShort(),
- VanillaColours.DYE_ORANGE.getAsShort(),
- VanillaColours.DYE_BROWN.getAsShort(),
- };
+ private static final short[][] RGB_AGON = new short[][] { VanillaColours.DYE_WHITE.getAsShort(),
+ VanillaColours.DYE_YELLOW.getAsShort(), VanillaColours.DYE_LIME.getAsShort(),
+ VanillaColours.DYE_GREEN.getAsShort(), VanillaColours.DYE_CYAN.getAsShort(),
+ VanillaColours.DYE_LIGHT_BLUE.getAsShort(), VanillaColours.DYE_DARK_BLUE.getAsShort(),
+ VanillaColours.DYE_DARK_PURPLE.getAsShort(), VanillaColours.DYE_LIGHT_PURPLE.getAsShort(),
+ VanillaColours.DYE_PINK.getAsShort(), VanillaColours.DYE_RED.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_BROWN.getAsShort(),
+ VanillaColours.DYE_BLACK.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+ VanillaColours.DYE_LIGHT_GRAY.getAsShort(), };
+ private static final short[][] RGB_ISZM = new short[][] { VanillaColours.DYE_LIGHT_GRAY.getAsShort(),
+ VanillaColours.DYE_WHITE.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+ VanillaColours.DYE_DARK_BLUE.getAsShort(), VanillaColours.DYE_YELLOW.getAsShort(),
+ VanillaColours.DYE_DARK_BLUE.getAsShort(), VanillaColours.DYE_RED.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_CYAN.getAsShort(),
+ VanillaColours.DYE_YELLOW.getAsShort(), VanillaColours.DYE_RED.getAsShort(),
+ VanillaColours.DYE_CYAN.getAsShort(), VanillaColours.DYE_GREEN.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_LIGHT_BLUE.getAsShort(),
+ VanillaColours.DYE_DARK_PURPLE.getAsShort(), };
+ private static final short[][] RGB_KORP = new short[][] { new short[] { 125, 125, 125 },
+ VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+ VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+ VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+ VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+ VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+ VanillaColours.DYE_DARK_GRAY.getAsShort(), new short[] { 22, 156, 156 }, new short[] { 22, 156, 156 },
+ VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(), };
+ private static final short[][] RGB_JELT = new short[][] { VanillaColours.DYE_ORANGE.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+ VanillaColours.DYE_ORANGE.getAsShort(), };
+ private static final short[][] RGB_BITT = new short[][] { VanillaColours.DYE_BLACK.getAsShort(),
+ VanillaColours.DYE_WHITE.getAsShort(), VanillaColours.DYE_YELLOW.getAsShort(),
+ VanillaColours.DYE_LIME.getAsShort(), VanillaColours.DYE_GREEN.getAsShort(),
+ VanillaColours.DYE_CYAN.getAsShort(), VanillaColours.DYE_LIGHT_BLUE.getAsShort(),
+ VanillaColours.DYE_LIGHT_BLUE.getAsShort(), VanillaColours.DYE_DARK_BLUE.getAsShort(),
+ VanillaColours.DYE_DARK_PURPLE.getAsShort(), VanillaColours.DYE_LIGHT_PURPLE.getAsShort(),
+ VanillaColours.DYE_PINK.getAsShort(), VanillaColours.DYE_RED.getAsShort(),
+ VanillaColours.DYE_RED.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+ VanillaColours.DYE_BROWN.getAsShort(), };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java
index 4e2f758d61..fc7c2e83d8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java
@@ -1,10 +1,19 @@
package gtPlusPlus.xmod.gregtech.common.covers;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidHandler;
+
import com.gtnewhorizons.modularui.api.drawable.Text;
import com.gtnewhorizons.modularui.api.math.MathExpression;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
import com.gtnewhorizons.modularui.common.widget.textfield.BaseTextFieldWidget;
+
import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.util.GT_CoverBehavior;
@@ -13,12 +22,6 @@ import gregtech.api.util.ISerializableObject;
import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
import gregtech.common.gui.modularui.widget.CoverDataFollower_TextFieldWidget;
import gtPlusPlus.core.util.minecraft.LangUtils;
-import java.util.concurrent.atomic.AtomicBoolean;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidHandler;
public class GTPP_Cover_Overflow extends GT_CoverBehavior {
@@ -32,8 +35,8 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
this.mMaxTransferRate = aTransferRate * 1000;
}
- public int doCoverThings(
- byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
+ public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+ long aTimer) {
if (aCoverVariable == 0) {
return aCoverVariable;
}
@@ -68,15 +71,8 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
return aCoverVariable;
}
- public int onCoverScrewdriverclick(
- byte aSide,
- int aCoverID,
- int aCoverVariable,
- ICoverable aTileEntity,
- EntityPlayer aPlayer,
- float aX,
- float aY,
- float aZ) {
+ public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+ EntityPlayer aPlayer, float aX, float aY, float aZ) {
if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) {
aCoverVariable += (mMaxTransferRate * (aPlayer.isSneaking() ? 0.1f : 0.01f));
} else {
@@ -89,19 +85,13 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
aCoverVariable = mMaxTransferRate;
}
GT_Utility.sendChatToPlayer(
- aPlayer, LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L"));
+ aPlayer,
+ LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L"));
return aCoverVariable;
}
- public boolean onCoverRightclick(
- byte aSide,
- int aCoverID,
- int aCoverVariable,
- ICoverable aTileEntity,
- EntityPlayer aPlayer,
- float aX,
- float aY,
- float aZ) {
+ public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+ EntityPlayer aPlayer, float aX, float aY, float aZ) {
boolean aShift = aPlayer.isSneaking();
int aAmount = aShift ? 128 : 8;
if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) {
@@ -116,7 +106,8 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
aCoverVariable = mMaxTransferRate;
}
GT_Utility.sendChatToPlayer(
- aPlayer, LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L"));
+ aPlayer,
+ LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L"));
aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);
return true;
}
@@ -194,40 +185,42 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior {
protected void addUIWidgets(ModularWindow.Builder builder) {
AtomicBoolean warn = new AtomicBoolean(false);
- builder.widget(new CoverDataControllerWidget<>(
- this::getCoverData, this::setCoverData, GTPP_Cover_Overflow.this)
+ builder.widget(
+ new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GTPP_Cover_Overflow.this)
.addFollower(
new CoverDataFollower_TextFieldWidget<>(),
coverData -> String.valueOf(convert(coverData)),
(coverData, state) -> new ISerializableObject.LegacyCoverData(
(int) MathExpression.parseMathExpression(state)),
- widget -> widget.setOnScrollNumbersLong(1, 5, 50)
- .setNumbersLong(val -> {
- warn.set(false);
- if (val > mMaxTransferRate) {
- val = (long) mMaxTransferRate;
- warn.set(true);
- } else if (val < 0) {
- val = 0L;
- }
- return val;
- })
- .setPattern(BaseTextFieldWidget.NATURAL_NUMS)
- .setFocusOnGuiOpen(true)
+ widget -> widget.setOnScrollNumbersLong(1, 5, 50).setNumbersLong(val -> {
+ warn.set(false);
+ if (val > mMaxTransferRate) {
+ val = (long) mMaxTransferRate;
+ warn.set(true);
+ } else if (val < 0) {
+ val = 0L;
+ }
+ return val;
+ }).setPattern(BaseTextFieldWidget.NATURAL_NUMS).setFocusOnGuiOpen(true)
.setPos(startX + spaceX * 0, startY + spaceY * 0 + 8)
.setSize(spaceX * 4 - 3, 12)))
- .widget(new TextWidget(GT_Utility.trans("323", "L"))
- .setDefaultColor(COLOR_TEXT_GRAY.get())
- .setPos(startX + spaceX * 4, 4 + startY + spaceY * 0 + 8))
- .widget(TextWidget.dynamicText(() -> new Text((warn.get()
- ? GT_Utility.trans("325", "Max")
- : GT_Utility.trans("324", "Now"))
- + ": " + convert(getCoverData())
- + "/" + mMaxTransferRate + " "
- + GT_Utility.trans("323", "L"))
- .color(warn.get() ? COLOR_TEXT_WARN.get() : COLOR_TEXT_GRAY.get()))
- .setSynced(false)
- .setPos(startX + spaceX * 0, 4 + startY + spaceY * 1 + 6));
+ .widget(
+ new TextWidget(GT_Utility.trans("323", "L")).setDefaultColor(COLOR_TEXT_GRAY.get())
+ .setPos(startX + spaceX * 4, 4 + startY + spaceY * 0 + 8))
+ .widget(
+ TextWidget
+ .dynamicText(
+ () -> new Text(
+ (warn.get() ? GT_Utility.trans("325", "Max")
+ : GT_Utility.trans("324", "Now")) + ": "
+ + convert(getCoverData())
+ + "/"
+ + mMaxTransferRate
+ + " "
+ + GT_Utility.trans("323", "L")).color(
+ warn.get() ? COLOR_TEXT_WARN.get()
+ : COLOR_TEXT_GRAY.get()))
+ .setSynced(false).setPos(startX + spaceX * 0, 4 + startY + spaceY * 1 + 6));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java
index 46a6e9d600..27cd5be67e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java
@@ -1,5 +1,12 @@
package gtPlusPlus.xmod.gregtech.common.covers;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -8,11 +15,6 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.LangUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior {
@@ -27,11 +29,11 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior {
static {
sQuantumChest = ReflectionUtils.getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest");
- sSuperChestGTPP = ReflectionUtils.getClass(
- "gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest");
+ sSuperChestGTPP = ReflectionUtils
+ .getClass("gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest");
if (CORE.GTNH) {
- sSuperChestGTNH =
- ReflectionUtils.getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest");
+ sSuperChestGTNH = ReflectionUtils
+ .getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest");
} else {
sSuperChestGTNH = null;
}
@@ -54,15 +56,15 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior {
this.mMaxItemCapacity = aCapacity * 1000;
}
- public int doCoverThings(
- byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
+ public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+ long aTimer) {
if (aCoverVariable == 0) {
return aCoverVariable;
}
// Get the IGTTile
- IGregTechTileEntity aGtTileEntity = aTileEntity.getIGregTechTileEntity(
- aTileEntity.getXCoord(), aTileEntity.getYCoord(), aTileEntity.getZCoord());
+ IGregTechTileEntity aGtTileEntity = aTileEntity
+ .getIGregTechTileEntity(aTileEntity.getXCoord(), aTileEntity.getYCoord(), aTileEntity.getZCoord());
if (aGtTileEntity == null) {
return aCoverVariable;
}
@@ -101,15 +103,8 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior {
return true;
}
- public int onCoverScrewdriverclick(
- byte aSide,
- int aCoverID,
- int aCoverVariable,
- ICoverable aTileEntity,
- EntityPlayer aPlayer,
- float aX,
- float aY,
- float aZ) {
+ public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+ EntityPlayer aPlayer, float aX, float aY, float aZ) {
if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) {
aCoverVariable += (mMaxItemCapacity * (aPlayer.isSneaking() ? 0.1f : 0.01f));
} else {
@@ -122,19 +117,13 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior {
aCoverVariable = mMaxItemCapacity;
}
GT_Utility.sendChatToPlayer(
- aPlayer, LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L"));
+ aPlayer,
+ LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L"));
return aCoverVariable;
}
- public boolean onCoverRightclick(
- byte aSide,
- int aCoverID,
- int aCoverVariable,
- ICoverable aTileEntity,
- EntityPlayer aPlayer,
- float aX,
- float aY,
- float aZ) {
+ public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+ EntityPlayer aPlayer, float aX, float aY, float aZ) {
boolean aShift = aPlayer.isSneaking();
int aAmount = aShift ? 128 : 8;
if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) {
@@ -149,7 +138,8 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior {
aCoverVariable = mMaxItemCapacity;
}
GT_Utility.sendChatToPlayer(
- aPlayer, LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L"));
+ aPlayer,
+ LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L"));
aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);
return true;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
index b8b130e987..eccbf78c8a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
@@ -1,5 +1,14 @@
package gtPlusPlus.xmod.gregtech.common.covers;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+
import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.util.GT_CoverBehavior;
@@ -8,13 +17,6 @@ import gtPlusPlus.api.objects.minecraft.BlockPos;
import gtPlusPlus.api.objects.random.XSTR;
import gtPlusPlus.core.util.minecraft.LangUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
@@ -30,35 +32,20 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
ForgeDirection aDir = ForgeDirection.getOrientation(aSide);
String s = aEntity.getInventoryName() + "." + aPos.getUniqueIdentifier() + aDir.name();
return s;
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
XSTR x = new XSTR();
return "ERROR." + x.getSeed() + x.hashCode() + x.nextDouble() + ".ID";
}
- public boolean onCoverRightclick(
- byte aSide,
- int aCoverID,
- int aCoverVariable,
- ICoverable aTileEntity,
- EntityPlayer aPlayer,
- float aX,
- float aY,
- float aZ) {
- PlayerUtils.messagePlayer(
- aPlayer, LangUtils.trans("756", "Connectable: ") + getConnectionState(aCoverVariable));
+ public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+ EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ PlayerUtils
+ .messagePlayer(aPlayer, LangUtils.trans("756", "Connectable: ") + getConnectionState(aCoverVariable));
return super.onCoverRightclick(aSide, aCoverID, aCoverVariable, aTileEntity, aPlayer, aX, aY, aZ);
}
- public int onCoverScrewdriverclick(
- byte aSide,
- int aCoverID,
- int aCoverVariable,
- ICoverable aTileEntity,
- EntityPlayer aPlayer,
- float aX,
- float aY,
- float aZ) {
+ public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+ EntityPlayer aPlayer, float aX, float aY, float aZ) {
return super.onCoverScrewdriverclick(aSide, aCoverID, aCoverVariable, aTileEntity, aPlayer, aX, aY, aZ);
}
@@ -95,8 +82,8 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
}
@Override
- public int doCoverThings(
- byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
+ public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+ long aTimer) {
try {
String aKey = generateUniqueKey(aSide, aTileEntity);
Integer b = sConnectionStateForEntityMap.get(aKey);
@@ -131,8 +118,8 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
}
@Override
- public byte getRedstoneInput(
- byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+ public byte getRedstoneInput(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable,
+ ICoverable aTileEntity) {
if (!getConnectionState(aCoverVariable)) {
return 0;
}
@@ -153,8 +140,8 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
}
@Override
- public boolean onCoverRemoval(
- byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, boolean aForced) {
+ public boolean onCoverRemoval(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+ boolean aForced) {
String aKey = generateUniqueKey(aSide, aTileEntity);
sConnectionStateForEntityMap.remove(aKey);
// Logger.INFO("Unmapping key "+aKey+".");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
index a55cae39ea..ac30942a5f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
@@ -2,6 +2,15 @@ package gtPlusPlus.xmod.gregtech.common.helpers;
import static gregtech.api.GregTech_API.mEUtoRF;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
+
import cofh.api.energy.IEnergyContainerItem;
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -21,20 +30,11 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
public class ChargingHelper {
- private static Map<String, Pair<GregtechMetaWirelessCharger, Byte>> mValidPlayers =
- new HashMap<String, Pair<GregtechMetaWirelessCharger, Byte>>();
- protected static Map<BlockPos, GregtechMetaWirelessCharger> mChargerMap =
- new HashMap<BlockPos, GregtechMetaWirelessCharger>();
+ private static Map<String, Pair<GregtechMetaWirelessCharger, Byte>> mValidPlayers = new HashMap<String, Pair<GregtechMetaWirelessCharger, Byte>>();
+ protected static Map<BlockPos, GregtechMetaWirelessCharger> mChargerMap = new HashMap<BlockPos, GregtechMetaWirelessCharger>();
private int mTickTimer = 0;
private final int mTickMultiplier = 20;
@@ -66,9 +66,8 @@ public class ChargingHelper {
for (GregtechMetaWirelessCharger mEntityTemp : mChargerMap.values()) {
if (mEntityTemp != null) {
if (mEntityTemp.getBaseMetaTileEntity() == null
- || !mEntityTemp
- .getBaseMetaTileEntity()
- .isAllowedToWork()) continue;
+ || !mEntityTemp.getBaseMetaTileEntity().isAllowedToWork())
+ continue;
if (mPlayerMan.getEntityWorld().provider.dimensionId
== mEntityTemp.getDimensionID()) {
mVoltage = mEntityTemp.maxEUInput();
@@ -85,32 +84,48 @@ public class ChargingHelper {
if (!LR.isEmpty()
&& LR.containsKey(mPlayerMan.getDisplayName())) {
mCurrentEu = chargeItems(
- mEntityTemp, mArmourContents, mPlayerMan);
+ mEntityTemp,
+ mArmourContents,
+ mPlayerMan);
mCurrentEu = chargeItems(
- mEntityTemp, mInventoryContents, mPlayerMan);
+ mEntityTemp,
+ mInventoryContents,
+ mPlayerMan);
}
} else if (mEntityTemp.getMode() == 1) {
if (!LO.isEmpty()
&& LO.containsKey(mPlayerMan.getDisplayName())) {
mCurrentEu = chargeItems(
- mEntityTemp, mArmourContents, mPlayerMan);
+ mEntityTemp,
+ mArmourContents,
+ mPlayerMan);
mCurrentEu = chargeItems(
- mEntityTemp, mInventoryContents, mPlayerMan);
+ mEntityTemp,
+ mInventoryContents,
+ mPlayerMan);
}
} else {
if (!LR.isEmpty()
&& LR.containsKey(mPlayerMan.getDisplayName())) {
mCurrentEu = chargeItems(
- mEntityTemp, mArmourContents, mPlayerMan);
+ mEntityTemp,
+ mArmourContents,
+ mPlayerMan);
mCurrentEu = chargeItems(
- mEntityTemp, mInventoryContents, mPlayerMan);
+ mEntityTemp,
+ mInventoryContents,
+ mPlayerMan);
}
if (!LO.isEmpty()
&& LO.containsKey(mPlayerMan.getDisplayName())) {
mCurrentEu = chargeItems(
- mEntityTemp, mArmourContents, mPlayerMan);
+ mEntityTemp,
+ mArmourContents,
+ mPlayerMan);
mCurrentEu = chargeItems(
- mEntityTemp, mInventoryContents, mPlayerMan);
+ mEntityTemp,
+ mInventoryContents,
+ mPlayerMan);
}
}
@@ -125,13 +140,14 @@ public class ChargingHelper {
mMaxDistance = (4 * GT_Values.V[mEntityTemp.getTier()] / 2);
}
double mDistance = calculateDistance(mEntityTemp, mPlayerMan);
- long mVoltageCost = MathUtils.findPercentageOfInt(
- mMaxDistance, (float) mDistance);
+ long mVoltageCost = MathUtils
+ .findPercentageOfInt(mMaxDistance, (float) mDistance);
if (mVoltageCost > 0) {
if (mVoltageCost > mEntityTemp.maxEUInput()) {
- mEntityTemp.setEUVar((mEntityTemp.getEUVar()
- - mEntityTemp.maxEUInput()));
+ mEntityTemp.setEUVar(
+ (mEntityTemp.getEUVar()
+ - mEntityTemp.maxEUInput()));
} else {
mEntityTemp.setEUVar(
(mEntityTemp.getEUVar() - mVoltageCost));
@@ -202,8 +218,9 @@ public class ChargingHelper {
return false;
} else {
Logger.WARNING("key not found, adding");
- Pair<GregtechMetaWirelessCharger, Byte> mEntry =
- new Pair<GregtechMetaWirelessCharger, Byte>(mEntity, (byte) mEntity.getMode());
+ Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<GregtechMetaWirelessCharger, Byte>(
+ mEntity,
+ (byte) mEntity.getMode());
if (mValidPlayers.put(mPlayer.getDisplayName(), mEntry) == null) {
Logger.WARNING("Added a Player to the Tick Map.");
return true;
@@ -221,8 +238,9 @@ public class ChargingHelper {
Logger.WARNING("trying to remove player from map");
if (mValidPlayers.containsKey(mPlayer.getDisplayName())) {
Logger.WARNING("key found, removing");
- Pair<GregtechMetaWirelessCharger, Byte> mEntry =
- new Pair<GregtechMetaWirelessCharger, Byte>(mEntity, (byte) mEntity.getMode());
+ Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<GregtechMetaWirelessCharger, Byte>(
+ mEntity,
+ (byte) mEntity.getMode());
if (mValidPlayers.remove(mPlayer, mEntry)) {
Logger.WARNING("Removed a Player to the Tick Map.");
return true;
@@ -241,7 +259,8 @@ public class ChargingHelper {
return 0;
}
return mEntityTemp.getDistanceBetweenTwoPositions(
- mEntityTemp.getTileEntityPosition(), mEntityTemp.getPositionOfEntity(mPlayerMan));
+ mEntityTemp.getTileEntityPosition(),
+ mEntityTemp.getPositionOfEntity(mPlayerMan));
}
public long chargeItems(GregtechMetaWirelessCharger mEntity, ItemStack[] mItems, EntityPlayer mPlayer) {
@@ -305,10 +324,7 @@ public class ChargingHelper {
|| mTemp.getItem() instanceof GT_MetaGenerated_Item_02
|| ReflectionUtils.getClass("gregtech.common.items.GT_MetaGenerated_Item_03")
.isInstance(mTemp.getItem())
- || mTemp.getItem()
- .getClass()
- .getName()
- .toLowerCase()
+ || mTemp.getItem().getClass().getName().toLowerCase()
.equals(("gregtech.common.items.GT_MetaGenerated_Tool_01").toLowerCase())) {
if (!NBTUtils.hasKey(mTemp, "GT.ItemCharge")) {
if (!mTemp.getDisplayName().toLowerCase().contains("battery")) {
@@ -341,13 +357,14 @@ public class ChargingHelper {
mMulti = 20;
} else if ((mitemCurrentCharge + (mVoltageIncrease * 10))
<= (mItemMaxCharge - (mVoltageIncrease * 10))) {
- mMulti = 10;
- } else if ((mitemCurrentCharge + (mVoltageIncrease * 5))
- <= (mItemMaxCharge - (mVoltageIncrease * 5))) {
- mMulti = 5;
- } else {
- mMulti = 1;
- }
+ mMulti = 10;
+ } else
+ if ((mitemCurrentCharge + (mVoltageIncrease * 5))
+ <= (mItemMaxCharge - (mVoltageIncrease * 5))) {
+ mMulti = 5;
+ } else {
+ mMulti = 1;
+ }
Logger.WARNING("5");
int mMultiVoltage = (int) (mMulti * mVoltageIncrease);
@@ -359,9 +376,8 @@ public class ChargingHelper {
> 0) {
Logger.WARNING("6.5 - " + g + " - " + mMulti);
for (int i = 0; i < mMulti; i++) {
- if (ElectricItem.manager.charge(
- mTemp, mVoltageIncrease, Integer.MAX_VALUE, false, false)
- > 0) {
+ if (ElectricItem.manager
+ .charge(mTemp, mVoltageIncrease, Integer.MAX_VALUE, false, false) > 0) {
continue;
}
}
@@ -370,11 +386,22 @@ public class ChargingHelper {
Logger.WARNING("7");
mEntity.setEUVar(mEuStored - (mVoltage * mMulti));
mEuStored = mEntity.getEUVar();
- Logger.WARNING("Charged " + mTemp.getDisplayName() + " | Slot: " + mItemSlot
- + " | EU Multiplier: " + mMulti + " | EU/t input: " + mVoltageIncrease
- + " | EU/t consumed by Tile: " + mVoltage + " | Item Max Charge: " + mItemMaxCharge
- + " | Item Start Charge: " + mitemCurrentCharge + " | Item New Charge"
- + ElectricItem.manager.getCharge(mTemp));
+ Logger.WARNING(
+ "Charged " + mTemp.getDisplayName()
+ + " | Slot: "
+ + mItemSlot
+ + " | EU Multiplier: "
+ + mMulti
+ + " | EU/t input: "
+ + mVoltageIncrease
+ + " | EU/t consumed by Tile: "
+ + mVoltage
+ + " | Item Max Charge: "
+ + mItemMaxCharge
+ + " | Item Start Charge: "
+ + mitemCurrentCharge
+ + " | Item New Charge"
+ + ElectricItem.manager.getCharge(mTemp));
mChargedItems++;
}
}
@@ -391,11 +418,22 @@ public class ChargingHelper {
Logger.WARNING("9");
mEntity.setEUVar(mEntity.getEUVar() - (xDif));
mEuStored = mEntity.getEUVar();
- Logger.WARNING("Charged " + mTemp.getDisplayName() + " | Slot: " + mItemSlot
- + " | EU Multiplier: " + mMulti + " | EU/t input: " + mVoltageIncrease
- + " | EU/t consumed by Tile: " + mVoltage + " | Item Max Charge: "
- + mItemMaxCharge + " | Item Start Charge: " + mitemCurrentCharge
- + " | Item New Charge" + ElectricItem.manager.getCharge(mTemp));
+ Logger.WARNING(
+ "Charged " + mTemp.getDisplayName()
+ + " | Slot: "
+ + mItemSlot
+ + " | EU Multiplier: "
+ + mMulti
+ + " | EU/t input: "
+ + mVoltageIncrease
+ + " | EU/t consumed by Tile: "
+ + mVoltage
+ + " | Item Max Charge: "
+ + mItemMaxCharge
+ + " | Item Start Charge: "
+ + mitemCurrentCharge
+ + " | Item New Charge"
+ + ElectricItem.manager.getCharge(mTemp));
mChargedItems++;
}
}
@@ -408,7 +446,9 @@ public class ChargingHelper {
rfItem.getMaxEnergyStored(mTemp) - rfItem.getEnergyStored(mTemp),
mEntity.getEUVar() * mEUtoRF / 100L);
chargedPower = rfItem.receiveEnergy(
- mTemp, chargedPower > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) chargedPower, false);
+ mTemp,
+ chargedPower > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) chargedPower,
+ false);
chargedPower = chargedPower * 100L / mEUtoRF;
mEntity.setEUVar(Math.max(mEntity.getEUVar() - chargedPower, 0));
mChargedItems++;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java
index bb81c349a0..0d85d6299f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java
@@ -1,12 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.helpers;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.world.World;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Container;
import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Utils;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.world.World;
public class CraftingHelper {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
index bb8dac49d7..58a4aba71c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
@@ -1,13 +1,15 @@
package gtPlusPlus.xmod.gregtech.common.helpers;
+import java.util.HashMap;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.sys.Log;
import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
-import java.util.HashMap;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
public class FlotationRecipeHandler {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java
index 0b60e057f4..0c0baf4723 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java
@@ -1,16 +1,18 @@
package gtPlusPlus.xmod.gregtech.common.helpers;
-import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.metatileentity.MetaTileEntity;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
+import gregtech.api.enums.Textures.BlockIcons;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class GT_MethodHelper {
private static final Method mGetTexture;
@@ -46,28 +48,25 @@ public class GT_MethodHelper {
Field aColor = ReflectionUtils.getField(BaseMetaTileEntity.class, "mColor");
Field aActive = ReflectionUtils.getField(BaseMetaTileEntity.class, "mActive");
Field aMetaTile = ReflectionUtils.getField(BaseMetaTileEntity.class, "mMetaTileEntity");
- Method aHasValidTile = ReflectionUtils.getMethod(
- BaseMetaTileEntity.class, "hasValidMetaTileEntity", new Class[] {});
+ Method aHasValidTile = ReflectionUtils
+ .getMethod(BaseMetaTileEntity.class, "hasValidMetaTileEntity", new Class[] {});
boolean hasValidTileObj = (boolean) aHasValidTile.invoke(aTile, new Object[] {});
boolean aActiveObj = aActive.getBoolean(aTile);
byte aFacingObj = aFacing.getByte(aTile);
- byte aColorObj = aColor.getByte(aTile);
- ;
+ byte aColorObj = aColor.getByte(aTile);;
MetaTileEntity aMetaTileObj = (MetaTileEntity) aMetaTile.get(aTile);
if (rIcon != null) {
- return new ITexture[] {rIcon};
+ return new ITexture[] { rIcon };
} else {
- return hasValidTileObj
- ? aMetaTileObj.getTexture(
- aTile,
- aSide,
- aFacingObj,
- (byte) (aColorObj - 1),
- aActiveObj,
- aTile.getOutputRedstoneSignal(aSide) > 0)
- : BlockIcons.ERROR_RENDERING;
+ return hasValidTileObj ? aMetaTileObj.getTexture(
+ aTile,
+ aSide,
+ aFacingObj,
+ (byte) (aColorObj - 1),
+ aActiveObj,
+ aTile.getOutputRedstoneSignal(aSide) > 0) : BlockIcons.ERROR_RENDERING;
}
} catch (Throwable t) {
t.printStackTrace();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java
index 8263243474..2710f5dc78 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java
@@ -1,11 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.helpers;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.GregTech_API;
import java.util.HashMap;
+
import net.minecraft.block.Block;
import net.minecraftforge.event.world.BlockEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.api.GregTech_API;
+
public class MachineUpdateHandler {
private static final HashMap<String, Block> mBlockCache = new HashMap<String, Block>();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index d054e5da3b..7ce06c7974 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -2,7 +2,37 @@ package gtPlusPlus.xmod.gregtech.common.helpers;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableTreeFarmerParticles;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.Stack;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockAir;
+import net.minecraft.block.IGrowable;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.play.server.S23PacketBlockChange;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.ChunkPosition;
+import net.minecraft.world.World;
+import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.BonemealEvent;
+import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import com.google.common.collect.Lists;
+
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.eventhandler.Event.Result;
@@ -30,33 +60,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.particles.BlockBreakParticles;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-import java.util.Stack;
-import java.util.concurrent.ConcurrentHashMap;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockAir;
-import net.minecraft.block.IGrowable;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.play.server.S23PacketBlockChange;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.ChunkPosition;
-import net.minecraft.world.World;
-import net.minecraftforge.common.ForgeHooks;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.player.BonemealEvent;
-import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
public class TreeFarmHelper {
@@ -83,23 +86,23 @@ public class TreeFarmHelper {
}
public static ITexture[] getFront(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] };
}
public static ITexture[] getBack(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] };
}
public static ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] };
}
public static ITexture[] getTop(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] };
}
public static ITexture[] getSides(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] };
}
public static ITexture[] getFrontActive(final byte aColor) {
@@ -122,13 +125,8 @@ public class TreeFarmHelper {
return getSides(aColor);
}
- public static boolean applyBonemeal(
- final EntityPlayer player,
- final World world,
- final int intX,
- final int intY,
- final int intZ,
- final short multiplier) {
+ public static boolean applyBonemeal(final EntityPlayer player, final World world, final int intX, final int intY,
+ final int intZ, final short multiplier) {
final Block block = world.getBlock(intX, intY, intZ);
int roll;
@@ -183,14 +181,10 @@ public class TreeFarmHelper {
public static boolean cleanUp(final IGregTechTileEntity aBaseMetaTileEntity) {
Logger.MACHINE_INFO("called cleanUp()");
int cleanedUp = 0;
- final int xDir =
- net.minecraftforge.common.util.ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing())
- .offsetX
- * 11;
- final int zDir =
- net.minecraftforge.common.util.ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing())
- .offsetZ
- * 11;
+ final int xDir = net.minecraftforge.common.util.ForgeDirection
+ .getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 11;
+ final int zDir = net.minecraftforge.common.util.ForgeDirection
+ .getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 11;
for (int h = 1; h < 175; h++) {
for (int i = -11; i <= 11; i++) {
@@ -198,12 +192,10 @@ public class TreeFarmHelper {
final Block testBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j);
- if ((((i == -8) || (i == 8))
- || ((i == -9) || (i == 9))
- || ((i == -10) || (i == 10))
- || ((i == -11) || (i == 11)))
- && (((j == -8) || (j == 8))
- || ((j == -9) || (j == 9))
+ if ((((i == -8) || (i == 8)) || ((i == -9) || (i == 9))
+ || ((i == -10) || (i == 10))
+ || ((i == -11) || (i == 11)))
+ && (((j == -8) || (j == 8)) || ((j == -9) || (j == 9))
|| ((j == -10) || (j == 10))
|| ((j == -11) || (j == 11)))) {
@@ -211,34 +203,54 @@ public class TreeFarmHelper {
|| !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) {
// Logger.WARNING("5:"+testBlock.getUnlocalizedName());
} else {
- aBaseMetaTileEntity
- .getWorld()
- .setBlock(
- aBaseMetaTileEntity.getXCoord() + xDir + i,
- aBaseMetaTileEntity.getYCoord() + h,
- aBaseMetaTileEntity.getZCoord() + zDir + j,
- Blocks.bookshelf);
+ aBaseMetaTileEntity.getWorld().setBlock(
+ aBaseMetaTileEntity.getXCoord() + xDir + i,
+ aBaseMetaTileEntity.getYCoord() + h,
+ aBaseMetaTileEntity.getZCoord() + zDir + j,
+ Blocks.bookshelf);
}
}
// If not in the middle - don't know how else to check this one without lots of !=
- if ((i != 7) && (i != -7) && (j != 7) && (j != -7) && (i != 6) && (i != -6) && (j != 6) && (j != -6)
- && (i != 5) && (i != -5) && (j != 5) && (j != -5) && (i != 4) && (i != -4) && (j != 4)
- && (j != -4) && (i != 3) && (i != -3) && (j != 3) && (j != -3) && (i != 2) && (i != -2)
- && (j != 2) && (j != -2) && (i != 1) && (i != -1) && (j != 1) && (j != -1) && (i != 0)
+ if ((i != 7) && (i != -7)
+ && (j != 7)
+ && (j != -7)
+ && (i != 6)
+ && (i != -6)
+ && (j != 6)
+ && (j != -6)
+ && (i != 5)
+ && (i != -5)
+ && (j != 5)
+ && (j != -5)
+ && (i != 4)
+ && (i != -4)
+ && (j != 4)
+ && (j != -4)
+ && (i != 3)
+ && (i != -3)
+ && (j != 3)
+ && (j != -3)
+ && (i != 2)
+ && (i != -2)
+ && (j != 2)
+ && (j != -2)
+ && (i != 1)
+ && (i != -1)
+ && (j != 1)
+ && (j != -1)
+ && (i != 0)
&& (j != 0)) {
if (!testBlock.getUnlocalizedName().toLowerCase().contains("air")
|| !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) {
// Logger.WARNING("0:"+testBlock.getUnlocalizedName());
} else {
- aBaseMetaTileEntity
- .getWorld()
- .setBlock(
- aBaseMetaTileEntity.getXCoord() + xDir + i,
- aBaseMetaTileEntity.getYCoord() + h,
- aBaseMetaTileEntity.getZCoord() + zDir + j,
- Blocks.melon_block);
+ aBaseMetaTileEntity.getWorld().setBlock(
+ aBaseMetaTileEntity.getXCoord() + xDir + i,
+ aBaseMetaTileEntity.getYCoord() + h,
+ aBaseMetaTileEntity.getZCoord() + zDir + j,
+ Blocks.melon_block);
}
if (isLeaves(testBlock) || isWoodLog(testBlock)) {
@@ -295,8 +307,7 @@ public class TreeFarmHelper {
if (aDmg >= 32120 && aDmg <= 32128) {
return ToolType.Unbreakable;
}
- Logger.INFO(
- "bad Tool in Slot 2 | " + aStack.getUnlocalizedName().toLowerCase() + " | " + aDmg);
+ Logger.INFO("bad Tool in Slot 2 | " + aStack.getUnlocalizedName().toLowerCase() + " | " + aDmg);
return null;
}
@@ -372,9 +383,8 @@ public class TreeFarmHelper {
}
return (OrePrefixes.log.contains(new ItemStack(log, 1)) && ((tTool != null) && (tTool.equals("axe"))))
- || (log.getMaterial() != Material.wood)
- ? false
- : (OrePrefixes.fence.contains(new ItemStack(log, 1)) ? false : true);
+ || (log.getMaterial() != Material.wood) ? false
+ : (OrePrefixes.fence.contains(new ItemStack(log, 1)) ? false : true);
}
public static boolean isLeaves(final Block log) {
@@ -390,8 +400,7 @@ public class TreeFarmHelper {
if (log.getLocalizedName().toLowerCase().contains("leaves")) {
return true;
}
- return OrePrefixes.leaves.contains(new ItemStack(log, 1))
- || log.getMaterial() == Material.leaves
+ return OrePrefixes.leaves.contains(new ItemStack(log, 1)) || log.getMaterial() == Material.leaves
|| OrePrefixes.treeLeaves.contains(new ItemStack(log, 1))
|| log.getMaterial() == Material.vine
|| OrePrefixes.mushroom.contains(new ItemStack(log, 1))
@@ -412,18 +421,14 @@ public class TreeFarmHelper {
}
public static boolean isDirtBlock(final Block dirt) {
- return (dirt == Blocks.dirt
- ? true
+ return (dirt == Blocks.dirt ? true
: (dirt == Blocks.grass ? true : (getHumus() == null ? false : (dirt == blockHumus ? true : false))));
}
public static boolean isFenceBlock(final Block fence) {
- return (fence == Blocks.fence
- ? true
- : (fence == Blocks.fence_gate
- ? true
- : (fence == Blocks.nether_brick_fence
- ? true
+ return (fence == Blocks.fence ? true
+ : (fence == Blocks.fence_gate ? true
+ : (fence == Blocks.nether_brick_fence ? true
: (OrePrefixes.fence.contains(new ItemStack(fence, 1)) ? true : false))));
}
@@ -438,19 +443,16 @@ public class TreeFarmHelper {
return (air == Blocks.air ? true : (air instanceof BlockAir ? true : false));
}
- /*public static boolean isSaplingBlock(Block sapling){
- return (sapling == Blocks.sapling ? true : (sapling == Blocks.))
- }*/
+ /*
+ * public static boolean isSaplingBlock(Block sapling){ return (sapling == Blocks.sapling ? true : (sapling ==
+ * Blocks.)) }
+ */
public static BlockPos checkForLogsInGrowArea(final IGregTechTileEntity aBaseMetaTileEntity) {
- final int xDir =
- net.minecraftforge.common.util.ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing())
- .offsetX
- * 7;
- final int zDir =
- net.minecraftforge.common.util.ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing())
- .offsetZ
- * 7;
+ final int xDir = net.minecraftforge.common.util.ForgeDirection
+ .getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 7;
+ final int zDir = net.minecraftforge.common.util.ForgeDirection
+ .getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 7;
for (int i = -7; i <= 7; i++) {
for (int j = -7; j <= 7; j++) {
for (int h = 0; h <= 1; h++) {
@@ -731,8 +733,8 @@ public class TreeFarmHelper {
final Block block = mWorld.getBlock(h.xPos, h.yPos, h.zPos);
if (block != null) {
final int dropMeta = mWorld.getBlockMetadata(h.xPos, h.yPos, h.zPos);
- final ArrayList<ItemStack> blockDrops =
- block.getDrops(mWorld, h.xPos, h.yPos, h.zPos, dropMeta, 0);
+ final ArrayList<ItemStack> blockDrops = block
+ .getDrops(mWorld, h.xPos, h.yPos, h.zPos, dropMeta, 0);
final ItemStack[] drops = ItemUtils.getBlockDrops(blockDrops);
mDrops.put(drops);
// Remove drop that was added to the bus.
@@ -804,13 +806,12 @@ public class TreeFarmHelper {
if (wood == null) {
return false;
}
- if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge)
- if (detectTree(world, x, y, z)) {
- TreeChopTask chopper = new TreeChopTask(new ChunkPosition(x, y, z), checkFakePlayer(world), 128);
- FMLCommonHandler.instance().bus().register(chopper);
- // custom block breaking code, don't call vanilla code
- return true;
- }
+ if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge) if (detectTree(world, x, y, z)) {
+ TreeChopTask chopper = new TreeChopTask(new ChunkPosition(x, y, z), checkFakePlayer(world), 128);
+ FMLCommonHandler.instance().bus().register(chopper);
+ // custom block breaking code, don't call vanilla code
+ return true;
+ }
// return onBlockStartBreak(stack, x, y, z, player);
return false;
}
@@ -852,8 +853,7 @@ public class TreeFarmHelper {
for (int offX = 0; offX < d; offX++) {
for (int offY = 0; offY < d; offY++) {
for (int offZ = 0; offZ < d; offZ++) {
- int xPos = pos.chunkPosX - 1 + offX,
- yPos = pos.chunkPosY - 1 + offY,
+ int xPos = pos.chunkPosX - 1 + offX, yPos = pos.chunkPosY - 1 + offY,
zPos = pos.chunkPosZ - 1 + offZ;
Block leaf = world.getBlock(xPos, yPos, zPos);
if (leaf != null && leaf.isLeaves(world, xPos, yPos, zPos)) {
@@ -912,7 +912,7 @@ public class TreeFarmHelper {
ChunkPosition pos;
while (left > 0) {
// completely done or can't do our job anymore?!
- if (blocks.isEmpty() /* || tags.getBoolean("Broken")*/) {
+ if (blocks.isEmpty() /* || tags.getBoolean("Broken") */) {
finish();
return;
}
@@ -956,8 +956,8 @@ public class TreeFarmHelper {
}
}
- public static void breakExtraBlock(
- World world, int x, int y, int z, int sidehit, EntityPlayer playerEntity, int refX, int refY, int refZ) {
+ public static void breakExtraBlock(World world, int x, int y, int z, int sidehit, EntityPlayer playerEntity,
+ int refX, int refY, int refZ) {
// prevent calling that stuff for air blocks, could lead to unexpected behaviour since it fires events
if (world.isAirBlock(x, y, z)) return;
@@ -981,8 +981,8 @@ public class TreeFarmHelper {
if (!ForgeHooks.canHarvestBlock(block, player, meta) || refStrength / strength > 10f) return;
// send the blockbreak event
- BlockEvent.BreakEvent event =
- ForgeHooks.onBlockBreakEvent(world, player.theItemInWorldManager.getGameType(), player, x, y, z);
+ BlockEvent.BreakEvent event = ForgeHooks
+ .onBlockBreakEvent(world, player.theItemInWorldManager.getGameType(), player, x, y, z);
if (event.isCanceled()) return;
if (player.capabilities.isCreativeMode) {
@@ -1007,8 +1007,8 @@ public class TreeFarmHelper {
// ItemInWorldManager.removeBlock
block.onBlockHarvested(world, x, y, z, meta, player);
- if (block.removedByPlayer(
- world, player, x, y, z, true)) // boolean is if block can be harvested, checked above
+ if (block.removedByPlayer(world, player, x, y, z, true)) // boolean is if block can be harvested, checked
+ // above
{
block.onBlockDestroyedByPlayer(world, x, y, z, meta);
block.harvestBlock(world, player, x, y, z, meta);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
index 72d6111b8a..52aeb864dd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
@@ -1,17 +1,19 @@
package gtPlusPlus.xmod.gregtech.common.helpers;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
+
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
+
public class VolumetricFlaskHelper {
private static final Class sClassVolumetricFlask;
@@ -89,8 +91,8 @@ public class VolumetricFlaskHelper {
if (aStack != null && sMethodGetFlaskMaxCapacity != null) {
Item aItem = aStack.getItem();
if (sClassVolumetricFlask.isInstance(aItem)) {
- int aMaxCapacity =
- (int) ReflectionUtils.invokeNonBool(aItem, sMethodGetFlaskMaxCapacity, new Object[] {});
+ int aMaxCapacity = (int) ReflectionUtils
+ .invokeNonBool(aItem, sMethodGetFlaskMaxCapacity, new Object[] {});
return aMaxCapacity;
}
}
@@ -168,11 +170,11 @@ public class VolumetricFlaskHelper {
}
public static Item generateNewFlask(String unlocalized, String english, int maxCapacity) {
- Constructor aFlask = ReflectionUtils.getConstructor(
- sClassVolumetricFlask, new Class[] {String.class, String.class, int.class});
+ Constructor aFlask = ReflectionUtils
+ .getConstructor(sClassVolumetricFlask, new Class[] { String.class, String.class, int.class });
if (aFlask != null) {
- Object aInstance = ReflectionUtils.createNewInstanceFromConstructor(
- aFlask, new Object[] {unlocalized, english, maxCapacity});
+ Object aInstance = ReflectionUtils
+ .createNewInstanceFromConstructor(aFlask, new Object[] { unlocalized, english, maxCapacity });
if (aInstance != null && aInstance instanceof Item) {
Item aNewFlaskItem = (Item) aInstance;
return aNewFlaskItem;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java
index 165941b1d2..f31337228b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java
@@ -1,6 +1,5 @@
package gtPlusPlus.xmod.gregtech.common.helpers.autocrafter;
-import gtPlusPlus.api.objects.Logger;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.*;
@@ -8,7 +7,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.world.World;
+import gtPlusPlus.api.objects.Logger;
+
public class AC_Helper_Container extends Container {
+
/** The crafting matrix inventory (3x3). */
public InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3);
@@ -62,7 +64,8 @@ public class AC_Helper_Container extends Container {
@Override
public void onCraftMatrixChanged(IInventory p_75130_1_) {
this.craftResult.setInventorySlotContents(
- 0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj));
+ 0,
+ CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj));
Logger.INFO("Crafted " + this.craftResult.getStackInSlot(0));
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java
index 6b8452eeed..6a2175f151 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java
@@ -1,15 +1,15 @@
package gtPlusPlus.xmod.gregtech.common.helpers.autocrafter;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter;
import java.util.*;
import java.util.Map.Entry;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter;
+
public class AC_Helper_Utils {
// AC maps
- public static final Map<Integer, GT4Entity_AutoCrafter> sAutocrafterMap =
- new HashMap<Integer, GT4Entity_AutoCrafter>();
+ public static final Map<Integer, GT4Entity_AutoCrafter> sAutocrafterMap = new HashMap<Integer, GT4Entity_AutoCrafter>();
// Add Crafter
public static final int addCrafter(GT4Entity_AutoCrafter AC) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
index f4eb274179..e490c3dd81 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
@@ -2,13 +2,15 @@ package gtPlusPlus.xmod.gregtech.common.helpers.tesseract;
import static gtPlusPlus.core.lib.CORE.*;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
import java.util.*;
import java.util.Map.Entry;
+
import net.minecraft.entity.player.EntityPlayer;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
+import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
+
public class TesseractHelper {
/**
@@ -19,8 +21,8 @@ public class TesseractHelper {
*/
// Checks if a Generator is owned by a player.
- public static final boolean isGeneratorOwnedByPlayer(
- EntityPlayer player, GT_MetaTileEntity_TesseractGenerator generator) {
+ public static final boolean isGeneratorOwnedByPlayer(EntityPlayer player,
+ GT_MetaTileEntity_TesseractGenerator generator) {
if (player == null) {
Logger.WARNING("Failed. [isGeneratorOwnedByPlayer]");
return false;
@@ -46,26 +48,25 @@ public class TesseractHelper {
}
// Saves A Generator to the Players UUID map along with the Freq.
- public static final boolean setGeneratorOwnershipByPlayer(
- EntityPlayer player, int freq, GT_MetaTileEntity_TesseractGenerator generator) {
+ public static final boolean setGeneratorOwnershipByPlayer(EntityPlayer player, int freq,
+ GT_MetaTileEntity_TesseractGenerator generator) {
if (player == null) {
return false;
}
UUID playerIdentifier = player.getUniqueID();
Logger.WARNING("Setting Generator on " + freq + " for " + player.getDisplayName() + ".");
if (playerIdentifier != null) {
- Map<Integer, GT_MetaTileEntity_TesseractGenerator> playerOwned =
- sTesseractGeneratorOwnershipMap.get(playerIdentifier);
+ Map<Integer, GT_MetaTileEntity_TesseractGenerator> playerOwned = sTesseractGeneratorOwnershipMap
+ .get(playerIdentifier);
if (playerOwned == null || playerOwned.isEmpty()) {
- Map<Integer, GT_MetaTileEntity_TesseractGenerator> newOwnershipMap =
- new HashMap<Integer, GT_MetaTileEntity_TesseractGenerator>();
+ Map<Integer, GT_MetaTileEntity_TesseractGenerator> newOwnershipMap = new HashMap<Integer, GT_MetaTileEntity_TesseractGenerator>();
newOwnershipMap.put(freq, generator);
sTesseractGeneratorOwnershipMap.put(playerIdentifier, newOwnershipMap);
Logger.WARNING("Success! [Empty Map]");
return true;
} else if (sTesseractGeneratorOwnershipMap.containsKey(playerIdentifier)) {
- Map<Integer, GT_MetaTileEntity_TesseractGenerator> ownershipMap =
- sTesseractGeneratorOwnershipMap.get(playerIdentifier);
+ Map<Integer, GT_MetaTileEntity_TesseractGenerator> ownershipMap = sTesseractGeneratorOwnershipMap
+ .get(playerIdentifier);
if (!ownershipMap.containsKey(freq)) {
ownershipMap.put(freq, generator);
}
@@ -127,8 +128,8 @@ public class TesseractHelper {
*/
// Checks if a Terminal is owned by a player.
- public static final boolean isTerminalOwnedByPlayer(
- EntityPlayer player, GT_MetaTileEntity_TesseractTerminal generator) {
+ public static final boolean isTerminalOwnedByPlayer(EntityPlayer player,
+ GT_MetaTileEntity_TesseractTerminal generator) {
if (player == null) {
return false;
}
@@ -148,26 +149,25 @@ public class TesseractHelper {
}
// Saves A Terminal to the Players UUID map along with the Freq.
- public static final boolean setTerminalOwnershipByPlayer(
- EntityPlayer player, int freq, GT_MetaTileEntity_TesseractTerminal generator) {
+ public static final boolean setTerminalOwnershipByPlayer(EntityPlayer player, int freq,
+ GT_MetaTileEntity_TesseractTerminal generator) {
if (player == null) {
return false;
}
UUID playerIdentifier = player.getUniqueID();
if (playerIdentifier != null) {
Logger.WARNING("Setting Terminal on " + freq + " for " + player.getDisplayName() + ".");
- Map<Integer, GT_MetaTileEntity_TesseractTerminal> playerOwned =
- sTesseractTerminalOwnershipMap.get(playerIdentifier);
+ Map<Integer, GT_MetaTileEntity_TesseractTerminal> playerOwned = sTesseractTerminalOwnershipMap
+ .get(playerIdentifier);
if (playerOwned == null || playerOwned.isEmpty()) {
- Map<Integer, GT_MetaTileEntity_TesseractTerminal> newOwnershipMap =
- new HashMap<Integer, GT_MetaTileEntity_TesseractTerminal>();
+ Map<Integer, GT_MetaTileEntity_TesseractTerminal> newOwnershipMap = new HashMap<Integer, GT_MetaTileEntity_TesseractTerminal>();
newOwnershipMap.put(freq, generator);
sTesseractTerminalOwnershipMap.put(playerIdentifier, newOwnershipMap);
Logger.WARNING("Success! [Empty Map]");
return true;
} else if (sTesseractTerminalOwnershipMap.containsKey(playerIdentifier)) {
- Map<Integer, GT_MetaTileEntity_TesseractTerminal> ownershipMap =
- sTesseractTerminalOwnershipMap.get(playerIdentifier);
+ Map<Integer, GT_MetaTileEntity_TesseractTerminal> ownershipMap = sTesseractTerminalOwnershipMap
+ .get(playerIdentifier);
if (!ownershipMap.containsKey(freq)) {
ownershipMap.put(freq, generator);
}
@@ -225,8 +225,8 @@ public class TesseractHelper {
EntityPlayer player) {
UUID playerIdentifier = player.getUniqueID();
if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
- Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>> players =
- sTesseractGeneratorOwnershipMap.entrySet();
+ Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>> players = sTesseractGeneratorOwnershipMap
+ .entrySet();
Iterator<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>> i = players.iterator();
while (i.hasNext()) {
Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> current = i.next();
@@ -242,8 +242,8 @@ public class TesseractHelper {
EntityPlayer player) {
UUID playerIdentifier = player.getUniqueID();
if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
- Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>> players =
- sTesseractTerminalOwnershipMap.entrySet();
+ Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>> players = sTesseractTerminalOwnershipMap
+ .entrySet();
Iterator<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>> i = players.iterator();
while (i.hasNext()) {
Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> current = i.next();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java
index 1e45b7c60b..b9ba13fa3f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java
@@ -1,12 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.helpers.treefarm;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.minecraft.FakeBlockPos;
-import gtPlusPlus.api.objects.minecraft.FakeWorld;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.math.MathUtils;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling;
import net.minecraft.block.material.Material;
@@ -17,6 +12,13 @@ import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenAbstractTree;
import net.minecraftforge.common.util.ForgeDirection;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.FakeBlockPos;
+import gtPlusPlus.api.objects.minecraft.FakeWorld;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+
public class TreeGenerator {
private static final FakeTreeInFakeWorldGenerator mTreeData;
@@ -43,6 +45,7 @@ public class TreeGenerator {
}
public static class FakeTreeInFakeWorldGenerator extends WorldGenAbstractTree {
+
/** The minimum height of a generated tree. */
private final int minTreeHeight;
/** True if this tree should grow Vines. */
@@ -64,8 +67,8 @@ public class TreeGenerator {
this(4, 0, 0, false, 5000);
}
- public FakeTreeInFakeWorldGenerator(
- int aMinHeight, int aWoodMeta, int aLeafMeta, boolean aVines, int aTreeCount) {
+ public FakeTreeInFakeWorldGenerator(int aMinHeight, int aWoodMeta, int aLeafMeta, boolean aVines,
+ int aTreeCount) {
super(false);
this.minTreeHeight = aMinHeight;
this.metaWood = aWoodMeta;
@@ -93,8 +96,7 @@ public class TreeGenerator {
@Override
protected boolean func_150523_a(Block p_150523_1_) {
- return p_150523_1_.getMaterial() == Material.air
- || p_150523_1_.getMaterial() == Material.leaves
+ return p_150523_1_.getMaterial() == Material.air || p_150523_1_.getMaterial() == Material.leaves
|| p_150523_1_ == Blocks.grass
|| p_150523_1_ == Blocks.dirt
|| p_150523_1_ == Blocks.log
@@ -107,8 +109,7 @@ public class TreeGenerator {
protected boolean isReplaceable(World world, int x, int y, int z) {
FakeWorld aWorld = getWorld();
Block block = aWorld.getBlock(x, y, z);
- return block.isAir(null, x, y, z)
- || block.isLeaves(null, x, y, z)
+ return block.isAir(null, x, y, z) || block.isLeaves(null, x, y, z)
|| block.isWood(null, x, y, z)
|| func_150523_a(block);
}
@@ -201,12 +202,17 @@ public class TreeGenerator {
FakeBlockPos aBlockToGrowPlantOn = aWorld.getBlockAtCoords(aWorldX, aWorldY - 1, aWorldZ);
boolean isSoil = block2.canSustainPlant(
- aWorld, aWorldX, aWorldY - 1, aWorldZ, ForgeDirection.UP, (BlockSapling) Blocks.sapling);
+ aWorld,
+ aWorldX,
+ aWorldY - 1,
+ aWorldZ,
+ ForgeDirection.UP,
+ (BlockSapling) Blocks.sapling);
if (
- /*isSoil &&*/ aWorldY < 256 - l - 1) {
+ /* isSoil && */ aWorldY < 256 - l - 1) {
Logger.WARNING("Stepping through generateTree [4]");
- aBlockToGrowPlantOn.onPlantGrow(
- aWorld, aWorldX, aWorldY - 1, aWorldZ, aWorldX, aWorldY, aWorldZ);
+ aBlockToGrowPlantOn
+ .onPlantGrow(aWorld, aWorldX, aWorldY - 1, aWorldZ, aWorldX, aWorldY, aWorldZ);
b0 = 3;
byte b1 = 0;
int l1;
@@ -224,14 +230,18 @@ public class TreeGenerator {
for (int k2 = aWorldZ - l1; k2 <= aWorldZ + l1; ++k2) {
int l2 = k2 - aWorldZ;
- if (Math.abs(j2) != l1
- || Math.abs(l2) != l1
+ if (Math.abs(j2) != l1 || Math.abs(l2) != l1
|| CORE.RANDOM.nextInt(2) != 0 && i3 != 0) {
Block block1 = aWorld.getBlock(i2, k1, k2);
if (block1.isAir(null, i2, k1, k2) || block1.isLeaves(null, i2, k1, k2)) {
this.setBlockAndNotifyAdequately(
- aWorld, i2, k1, k2, Blocks.leaves, this.metaLeaves);
+ aWorld,
+ i2,
+ k1,
+ k2,
+ Blocks.leaves,
+ this.metaLeaves);
}
}
}
@@ -245,31 +255,56 @@ public class TreeGenerator {
if (block.isAir(null, aWorldX, aWorldY + k1, aWorldZ)
|| block.isLeaves(null, aWorldX, aWorldY + k1, aWorldZ)) {
this.setBlockAndNotifyAdequately(
- aWorld, aWorldX, aWorldY + k1, aWorldZ, Blocks.log, this.metaWood);
+ aWorld,
+ aWorldX,
+ aWorldY + k1,
+ aWorldZ,
+ Blocks.log,
+ this.metaWood);
if (this.vinesGrow && k1 > 0) {
if (CORE.RANDOM.nextInt(3) > 0
&& aWorld.isAirBlock(aWorldX - 1, aWorldY + k1, aWorldZ)) {
this.setBlockAndNotifyAdequately(
- aWorld, aWorldX - 1, aWorldY + k1, aWorldZ, Blocks.vine, 8);
+ aWorld,
+ aWorldX - 1,
+ aWorldY + k1,
+ aWorldZ,
+ Blocks.vine,
+ 8);
}
if (CORE.RANDOM.nextInt(3) > 0
&& aWorld.isAirBlock(aWorldX + 1, aWorldY + k1, aWorldZ)) {
this.setBlockAndNotifyAdequately(
- aWorld, aWorldX + 1, aWorldY + k1, aWorldZ, Blocks.vine, 2);
+ aWorld,
+ aWorldX + 1,
+ aWorldY + k1,
+ aWorldZ,
+ Blocks.vine,
+ 2);
}
if (CORE.RANDOM.nextInt(3) > 0
&& aWorld.isAirBlock(aWorldX, aWorldY + k1, aWorldZ - 1)) {
this.setBlockAndNotifyAdequately(
- aWorld, aWorldX, aWorldY + k1, aWorldZ - 1, Blocks.vine, 1);
+ aWorld,
+ aWorldX,
+ aWorldY + k1,
+ aWorldZ - 1,
+ Blocks.vine,
+ 1);
}
if (CORE.RANDOM.nextInt(3) > 0
&& aWorld.isAirBlock(aWorldX, aWorldY + k1, aWorldZ + 1)) {
this.setBlockAndNotifyAdequately(
- aWorld, aWorldX, aWorldY + k1, aWorldZ + 1, Blocks.vine, 4);
+ aWorld,
+ aWorldX,
+ aWorldY + k1,
+ aWorldZ + 1,
+ Blocks.vine,
+ 4);
}
}
}
@@ -286,26 +321,22 @@ public class TreeGenerator {
for (j2 = aWorldZ - l1; j2 <= aWorldZ + l1; ++j2) {
if (aWorld.getBlock(i2, k1, j2).isLeaves(null, i2, k1, j2)) {
if (CORE.RANDOM.nextInt(4) == 0
- && aWorld.getBlock(i2 - 1, k1, j2)
- .isAir(null, i2 - 1, k1, j2)) {
+ && aWorld.getBlock(i2 - 1, k1, j2).isAir(null, i2 - 1, k1, j2)) {
this.growVines(aWorld, i2 - 1, k1, j2, 8);
}
if (CORE.RANDOM.nextInt(4) == 0
- && aWorld.getBlock(i2 + 1, k1, j2)
- .isAir(null, i2 + 1, k1, j2)) {
+ && aWorld.getBlock(i2 + 1, k1, j2).isAir(null, i2 + 1, k1, j2)) {
this.growVines(aWorld, i2 + 1, k1, j2, 2);
}
if (CORE.RANDOM.nextInt(4) == 0
- && aWorld.getBlock(i2, k1, j2 - 1)
- .isAir(null, i2, k1, j2 - 1)) {
+ && aWorld.getBlock(i2, k1, j2 - 1).isAir(null, i2, k1, j2 - 1)) {
this.growVines(aWorld, i2, k1, j2 - 1, 1);
}
if (CORE.RANDOM.nextInt(4) == 0
- && aWorld.getBlock(i2, k1, j2 + 1)
- .isAir(null, i2, k1, j2 + 1)) {
+ && aWorld.getBlock(i2, k1, j2 + 1).isAir(null, i2, k1, j2 + 1)) {
this.growVines(aWorld, i2, k1, j2 + 1, 4);
}
}
@@ -361,8 +392,16 @@ public class TreeGenerator {
protected void setBlockAndNotifyAdequately(FakeWorld aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) {
if (aBlock != null && (aMeta >= 0 && aMeta <= Short.MAX_VALUE)) {
- Logger.WARNING("Setting block " + aX + ", " + aY + ", " + aZ + " | " + aBlock.getLocalizedName() + " | "
- + aMeta);
+ Logger.WARNING(
+ "Setting block " + aX
+ + ", "
+ + aY
+ + ", "
+ + aZ
+ + " | "
+ + aBlock.getLocalizedName()
+ + " | "
+ + aMeta);
aWorld.setBlockAtCoords(aX, aY, aZ, aBlock, aMeta);
// aOutputsFromGenerator.put(ItemUtils.simpleMetaStack(aBlock, aMeta, 1));
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
index 7012f6d0f7..4fe1fda076 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
@@ -1,5 +1,18 @@
package gtPlusPlus.xmod.gregtech.common.items;
+import java.util.List;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+import org.apache.commons.lang3.StringUtils;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
@@ -13,16 +26,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.sys.KeyboardUtils;
import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual;
-import java.util.List;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import org.apache.commons.lang3.StringUtils;
public class MetaCustomCoverItem extends Item {
@@ -32,8 +35,8 @@ public class MetaCustomCoverItem extends Item {
protected final IIconContainer[] mTextures;
private final short[][] mRGB;
- public MetaCustomCoverItem(
- String aModId, int aTextureCount, String aTextureSetName, IIconContainer[] aTextures, short[][] aRGB) {
+ public MetaCustomCoverItem(String aModId, int aTextureCount, String aTextureSetName, IIconContainer[] aTextures,
+ short[][] aRGB) {
super();
icons = new IIcon[aTextureCount];
mModID = aModId;
@@ -48,8 +51,13 @@ public class MetaCustomCoverItem extends Item {
this.setMaxStackSize(1);
GameRegistry.registerItem(this, unlocalizedName);
registerCover();
- Logger.INFO("[Covers] Generated Custom covers for " + mModID + " using " + aTextureCount + " textures from "
- + mTextureSetName + ".");
+ Logger.INFO(
+ "[Covers] Generated Custom covers for " + mModID
+ + " using "
+ + aTextureCount
+ + " textures from "
+ + mTextureSetName
+ + ".");
}
public boolean hide() {
@@ -65,17 +73,15 @@ public class MetaCustomCoverItem extends Item {
}
GregTech_API.registerCover(
thisStack,
- new GT_MultiTexture(new ITexture[] {new GT_RenderedTexture(mTextures[i])}),
+ new GT_MultiTexture(new ITexture[] { new GT_RenderedTexture(mTextures[i]) }),
new GTPP_Cover_ToggleVisual());
}
}
/*
- * @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i <
- * icons.length; i++) { this.icons[i] = mTextures[i].getIcon(); } }
- *
- * @Override public IIcon getIconFromDamage(int meta) { return this.icons[meta];
- * }
+ * @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i < icons.length; i++) { this.icons[i] =
+ * mTextures[i].getIcon(); } }
+ * @Override public IIcon getIconFromDamage(int meta) { return this.icons[meta]; }
*/
@Override
@@ -92,8 +98,7 @@ public class MetaCustomCoverItem extends Item {
@Override
public String getItemStackDisplayName(final ItemStack tItem) {
- return StringUtils.capitalize(mTextureSetName) + " (" + tItem.getItemDamage()
- + ")"; // super.getItemStackDisplayName(tItem);
+ return StringUtils.capitalize(mTextureSetName) + " (" + tItem.getItemDamage() + ")"; // super.getItemStackDisplayName(tItem);
}
private static boolean createNBT(ItemStack rStack) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 9ff348ddcc..4ccec0bb93 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.items;
import static gtPlusPlus.core.util.Utils.getTcAspectStack;
+import net.minecraft.item.EnumAction;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
@@ -35,7 +37,6 @@ import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow;
import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual;
-import net.minecraft.item.EnumAction;
public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
@@ -46,7 +47,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
}
public MetaGeneratedGregtechItems() {
- super("MU-metaitem.01", new OrePrefixes[] {null});
+ super("MU-metaitem.01", new OrePrefixes[] { null });
}
public void generateMetaItems() {
@@ -59,60 +60,60 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
Logger.INFO(
"Gregtech 5.09 not found, using fallback components. (I like how I have to add compat to something I added first and had stolen.)");
GregtechItemList.Electric_Pump_LuV.set(
- this.addItem(tLastID = 0, "Electric Pump (LuV)", "163920 L/sec (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.ITER, 1L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ this.addItem(
+ tLastID = 0,
+ "Electric Pump (LuV)",
+ "163920 L/sec (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ getTcAspectStack(TC_Aspects.AQUA, 1L) }));
GregtechItemList.Electric_Pump_ZPM.set(
- this.addItem(tLastID = 1, "Electric Pump (ZPM)", "655680 L/sec (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.ITER, 2L),
- getTcAspectStack(TC_Aspects.AQUA, 2L)
- }));
+ this.addItem(
+ tLastID = 1,
+ "Electric Pump (ZPM)",
+ "655680 L/sec (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
+ getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.ITER, 2L),
+ getTcAspectStack(TC_Aspects.AQUA, 2L) }));
GregtechItemList.Electric_Pump_UV.set(
- this.addItem(tLastID = 2, "Electric Pump (UV)", "2622720 L/sec (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.ITER, 4L),
- getTcAspectStack(TC_Aspects.AQUA, 4L)
- }));
+ this.addItem(
+ tLastID = 2,
+ "Electric Pump (UV)",
+ "2622720 L/sec (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
+ getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.ITER, 4L),
+ getTcAspectStack(TC_Aspects.AQUA, 4L) }));
GregtechItemList.Electric_Pump_MAX.set(
- this.addItem(tLastID = 3, "Electric Pump (MAX)", "10490880 L/sec (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.ITER, 8L),
- getTcAspectStack(TC_Aspects.AQUA, 8L)
- }));
+ this.addItem(
+ tLastID = 3,
+ "Electric Pump (MAX)",
+ "10490880 L/sec (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L),
+ getTcAspectStack(TC_Aspects.AQUA, 8L) }));
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_LuV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[5][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
new GT_Cover_Pump(8196));
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_ZPM.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[6][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[6][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
new GT_Cover_Pump(32768));
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_UV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[7][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[7][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
new GT_Cover_Pump(131072));
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[8][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
new GT_Cover_Pump(524288));
// GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_LuV.get(1L),
// //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
@@ -146,26 +147,38 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// OrePrefixes.cableGt01.get(Materials.Aluminium), Character.valueOf('P'),
// OrePrefixes.pipeMedium.get(Materials.Titanium)});
tLastID = 4;
- GregtechItemList.Electric_Motor_LuV.set(this.addItem(tLastID = 4, "Electric Motor (LuV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.MOTUS, 1L)
- }));
- GregtechItemList.Electric_Motor_ZPM.set(this.addItem(tLastID = 5, "Electric Motor (ZPM)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.MOTUS, 2L)
- }));
- GregtechItemList.Electric_Motor_UV.set(this.addItem(tLastID = 6, "Electric Motor (UV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.MOTUS, 4L)
- }));
- GregtechItemList.Electric_Motor_MAX.set(this.addItem(tLastID = 7, "Electric Motor (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.MOTUS, 8L)
- }));
+ GregtechItemList.Electric_Motor_LuV.set(
+ this.addItem(
+ tLastID = 4,
+ "Electric Motor (LuV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L),
+ getTcAspectStack(TC_Aspects.MOTUS, 1L) }));
+ GregtechItemList.Electric_Motor_ZPM.set(
+ this.addItem(
+ tLastID = 5,
+ "Electric Motor (ZPM)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
+ getTcAspectStack(TC_Aspects.MACHINA, 2L),
+ getTcAspectStack(TC_Aspects.MOTUS, 2L) }));
+ GregtechItemList.Electric_Motor_UV.set(
+ this.addItem(
+ tLastID = 6,
+ "Electric Motor (UV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
+ getTcAspectStack(TC_Aspects.MACHINA, 4L),
+ getTcAspectStack(TC_Aspects.MOTUS, 4L) }));
+ GregtechItemList.Electric_Motor_MAX.set(
+ this.addItem(
+ tLastID = 7,
+ "Electric Motor (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L),
+ getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
// GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_LuV.get(1L),
// //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
// //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
@@ -196,30 +209,34 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// OrePrefixes.cableGt01.get(Materials.Nichrome)});
tLastID = 8;
- GregtechItemList.Conveyor_Module_LuV.set(this.addItem(
- tLastID = 8, "Conveyor Module (LuV)", "1 Stack every 20 secs (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.ITER, 1L)
- }));
+ GregtechItemList.Conveyor_Module_LuV.set(
+ this.addItem(
+ tLastID = 8,
+ "Conveyor Module (LuV)",
+ "1 Stack every 20 secs (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L) }));
GregtechItemList.Conveyor_Module_ZPM.set(
- this.addItem(tLastID = 9, "Conveyor Module (ZPM)", "1 Stack every 5 secs (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.ITER, 2L)
- }));
+ this.addItem(
+ tLastID = 9,
+ "Conveyor Module (ZPM)",
+ "1 Stack every 5 secs (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
+ getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.ITER, 2L) }));
GregtechItemList.Conveyor_Module_UV.set(
- this.addItem(tLastID = 10, "Conveyor Module (UV)", "1 Stack every 1 sec (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.ITER, 4L)
- }));
- GregtechItemList.Conveyor_Module_MAX.set(this.addItem(
- tLastID = 11, "Conveyor Module (MAX)", "1 Stack every 1/5 sec (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.ITER, 8L)
- }));
+ this.addItem(
+ tLastID = 10,
+ "Conveyor Module (UV)",
+ "1 Stack every 1 sec (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
+ getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.ITER, 4L) }));
+ GregtechItemList.Conveyor_Module_MAX.set(
+ this.addItem(
+ tLastID = 11,
+ "Conveyor Module (MAX)",
+ "1 Stack every 1/5 sec (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L) }));
// GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_LuV.get(1L),
// //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
// //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
@@ -244,57 +261,61 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// OrePrefixes.plate.get(Materials.Rubber)});
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_LuV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[1][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
new GT_Cover_Conveyor(400));
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_ZPM.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[2][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
new GT_Cover_Conveyor(100));
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_UV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[3][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[3][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
new GT_Cover_Conveyor(20));
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
new GT_Cover_Conveyor(4));
tLastID = 12;
GregtechItemList.Electric_Piston_LuV.set(
- this.addItem(tLastID = 12, "Electric Piston (LuV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.MOTUS, 1L)
- }));
+ this.addItem(
+ tLastID = 12,
+ "Electric Piston (LuV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 2L),
+ getTcAspectStack(TC_Aspects.MOTUS, 1L) }));
GregtechItemList.Electric_Piston_ZPM.set(
- this.addItem(tLastID = 13, "Electric Piston (ZPM)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.MOTUS, 2L)
- }));
+ this.addItem(
+ tLastID = 13,
+ "Electric Piston (ZPM)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
+ getTcAspectStack(TC_Aspects.MACHINA, 4L),
+ getTcAspectStack(TC_Aspects.MOTUS, 2L) }));
GregtechItemList.Electric_Piston_UV.set(
- this.addItem(tLastID = 14, "Electric Piston (UV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.MOTUS, 4L)
- }));
+ this.addItem(
+ tLastID = 14,
+ "Electric Piston (UV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L),
+ getTcAspectStack(TC_Aspects.MOTUS, 4L) }));
GregtechItemList.Electric_Piston_MAX.set(
- this.addItem(tLastID = 15, "Electric Piston (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 16L),
- getTcAspectStack(TC_Aspects.MOTUS, 8L)
- }));
+ this.addItem(
+ tLastID = 15,
+ "Electric Piston (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 16L),
+ getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
// GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Piston_LuV.get(1L),
// //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
// //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'),
@@ -325,34 +346,38 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// GregtechItemList.Electric_Motor_MAX, Character.valueOf('C'),
// OrePrefixes.cableGt01.get(Materials.Aluminium)});
tLastID = 16;
- GregtechItemList.Robot_Arm_LuV.set(this.addItem(
- tLastID = 16, "Robot Arm (LuV)", "Inserts into specific Slots (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.MOTUS, 1L),
- Utils.getTcAspectStack("COGNITIO", 1L)
- }));
- GregtechItemList.Robot_Arm_ZPM.set(this.addItem(
- tLastID = 17, "Robot Arm (ZPM)", "Inserts into specific Slots (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.MOTUS, 2L),
- getTcAspectStack("COGNITIO", 2L)
- }));
- GregtechItemList.Robot_Arm_UV.set(this.addItem(
- tLastID = 18, "Robot Arm (UV)", "Inserts into specific Slots (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.MOTUS, 4L),
- getTcAspectStack("COGNITIO", 4L)
- }));
- GregtechItemList.Robot_Arm_MAX.set(this.addItem(
- tLastID = 19, "Robot Arm (MAX)", "Inserts into specific Slots (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 16L),
- getTcAspectStack(TC_Aspects.MOTUS, 8L),
- getTcAspectStack("COGNITIO", 8L)
- }));
+ GregtechItemList.Robot_Arm_LuV.set(
+ this.addItem(
+ tLastID = 16,
+ "Robot Arm (LuV)",
+ "Inserts into specific Slots (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L),
+ Utils.getTcAspectStack("COGNITIO", 1L) }));
+ GregtechItemList.Robot_Arm_ZPM.set(
+ this.addItem(
+ tLastID = 17,
+ "Robot Arm (ZPM)",
+ "Inserts into specific Slots (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
+ getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.MOTUS, 2L),
+ getTcAspectStack("COGNITIO", 2L) }));
+ GregtechItemList.Robot_Arm_UV.set(
+ this.addItem(
+ tLastID = 18,
+ "Robot Arm (UV)",
+ "Inserts into specific Slots (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.MOTUS, 4L),
+ getTcAspectStack("COGNITIO", 4L) }));
+ GregtechItemList.Robot_Arm_MAX.set(
+ this.addItem(
+ tLastID = 19,
+ "Robot Arm (MAX)",
+ "Inserts into specific Slots (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 16L), getTcAspectStack(TC_Aspects.MOTUS, 8L),
+ getTcAspectStack("COGNITIO", 8L) }));
// GT_ModHandler.addCraftingRecipe(GregtechItemList.Robot_Arm_LuV.get(1L),
// //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
// //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CCC", "MSM", "PES", Character.valueOf('S'),
@@ -383,57 +408,61 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// OrePrefixes.cableGt01.get(Materials.Aluminium)});
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_LuV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[1][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
new GT_Cover_Arm(400));
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_ZPM.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[2][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
new GT_Cover_Arm(100));
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_UV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[3][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[3][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
new GT_Cover_Arm(20));
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
new GT_Cover_Arm(4));
tLastID = 20;
GregtechItemList.Field_Generator_LuV.set(
- this.addItem(tLastID = 20, "Field Generator (LuV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.TUTAMEN, 1L)
- }));
+ this.addItem(
+ tLastID = 20,
+ "Field Generator (LuV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L),
+ getTcAspectStack(TC_Aspects.TUTAMEN, 1L) }));
GregtechItemList.Field_Generator_ZPM.set(
- this.addItem(tLastID = 21, "Field Generator (ZPM)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.TUTAMEN, 2L)
- }));
+ this.addItem(
+ tLastID = 21,
+ "Field Generator (ZPM)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
+ getTcAspectStack(TC_Aspects.MACHINA, 2L),
+ getTcAspectStack(TC_Aspects.TUTAMEN, 2L) }));
GregtechItemList.Field_Generator_UV.set(
- this.addItem(tLastID = 22, "Field Generator (UV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.TUTAMEN, 4L)
- }));
+ this.addItem(
+ tLastID = 22,
+ "Field Generator (UV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 4L),
+ getTcAspectStack(TC_Aspects.TUTAMEN, 4L) }));
GregtechItemList.Field_Generator_MAX.set(
- this.addItem(tLastID = 23, "Field Generator (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.TUTAMEN, 8L)
- }));
+ this.addItem(
+ tLastID = 23,
+ "Field Generator (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L),
+ getTcAspectStack(TC_Aspects.TUTAMEN, 8L) }));
// GT_ModHandler.addCraftingRecipe(GregtechItemList.Field_Generator_LuV.get(1L),
// //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
// //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WCW", "CGC", "WCW", Character.valueOf('G'),
@@ -458,26 +487,34 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
// OrePrefixes.wireGt08.get(Materials.Osmium)});
tLastID = 24;
- GregtechItemList.Emitter_LuV.set(this.addItem(tLastID = 24, "Emitter (LuV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.LUX, 1L)
- }));
- GregtechItemList.Emitter_ZPM.set(this.addItem(tLastID = 25, "Emitter (ZPM)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.LUX, 2L)
- }));
- GregtechItemList.Emitter_UV.set(this.addItem(tLastID = 26, "Emitter (UV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.LUX, 4L)
- }));
- GregtechItemList.Emitter_MAX.set(this.addItem(tLastID = 27, "Emitter (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.LUX, 8L)
- }));
+ GregtechItemList.Emitter_LuV.set(
+ this.addItem(
+ tLastID = 24,
+ "Emitter (LuV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.LUX, 1L) }));
+ GregtechItemList.Emitter_ZPM.set(
+ this.addItem(
+ tLastID = 25,
+ "Emitter (ZPM)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
+ getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.LUX, 2L) }));
+ GregtechItemList.Emitter_UV.set(
+ this.addItem(
+ tLastID = 26,
+ "Emitter (UV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
+ getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.LUX, 4L) }));
+ GregtechItemList.Emitter_MAX.set(
+ this.addItem(
+ tLastID = 27,
+ "Emitter (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.LUX, 8L) }));
// GT_ModHandler.addCraftingRecipe(GregtechItemList.Emitter_LuV.get(1L),
// //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
// //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SSC", "WQS", "CWS", Character.valueOf('Q'),
@@ -505,26 +542,38 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
// OrePrefixes.cableGt01.get(Materials.Aluminium)});
tLastID = 28;
- GregtechItemList.Sensor_LuV.set(this.addItem(tLastID = 28, "Sensor (LuV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.SENSUS, 1L)
- }));
- GregtechItemList.Sensor_ZPM.set(this.addItem(tLastID = 29, "Sensor (ZPM)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.SENSUS, 2L)
- }));
- GregtechItemList.Sensor_UV.set(this.addItem(tLastID = 30, "Sensor (UV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
- getTcAspectStack(TC_Aspects.MACHINA, 4L),
- getTcAspectStack(TC_Aspects.SENSUS, 4L)
- }));
- GregtechItemList.Sensor_MAX.set(this.addItem(tLastID = 31, "Sensor (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.SENSUS, 8L)
- }));
+ GregtechItemList.Sensor_LuV.set(
+ this.addItem(
+ tLastID = 28,
+ "Sensor (LuV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L),
+ getTcAspectStack(TC_Aspects.SENSUS, 1L) }));
+ GregtechItemList.Sensor_ZPM.set(
+ this.addItem(
+ tLastID = 29,
+ "Sensor (ZPM)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
+ getTcAspectStack(TC_Aspects.MACHINA, 2L),
+ getTcAspectStack(TC_Aspects.SENSUS, 2L) }));
+ GregtechItemList.Sensor_UV.set(
+ this.addItem(
+ tLastID = 30,
+ "Sensor (UV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
+ getTcAspectStack(TC_Aspects.MACHINA, 4L),
+ getTcAspectStack(TC_Aspects.SENSUS, 4L) }));
+ GregtechItemList.Sensor_MAX.set(
+ this.addItem(
+ tLastID = 31,
+ "Sensor (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L),
+ getTcAspectStack(TC_Aspects.SENSUS, 8L) }));
// GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_LuV.get(1L),
// //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
// //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'),
@@ -562,96 +611,123 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
}
// Extruder Shape
- GregtechItemList.Shape_Extruder_WindmillShaft.set(
- this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts"));
+ GregtechItemList.Shape_Extruder_WindmillShaft
+ .set(this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts"));
// GTNH Already adds this.
if (!CORE.GTNH) {
- GregtechItemList.Shape_Extruder_SmallGear.set(
- this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears"));
+ GregtechItemList.Shape_Extruder_SmallGear
+ .set(this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears"));
}
// Batteries
GregtechItemList.Battery_RE_EV_Sodium.set(
- this.addItem(tLastID = 50, "Quad Cell Sodium Battery", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.METALLUM, 2L),
- getTcAspectStack(TC_Aspects.POTENTIA, 2L)
- }));
+ this.addItem(
+ tLastID = 50,
+ "Quad Cell Sodium Battery",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
+ getTcAspectStack(TC_Aspects.METALLUM, 2L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 2L) }));
this.setElectricStats(32000 + tLastID, 3200000L, GT_Values.V[4], 4L, -3L, true);
GregtechItemList.Battery_RE_EV_Cadmium.set(
- this.addItem(tLastID = 52, "Quad Cell Cadmium Battery", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.METALLUM, 1L),
- getTcAspectStack(TC_Aspects.POTENTIA, 1L)
- }));
+ this.addItem(
+ tLastID = 52,
+ "Quad Cell Cadmium Battery",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.METALLUM, 1L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 1L) }));
this.setElectricStats(32000 + tLastID, 4800000L, GT_Values.V[4], 4L, -3L, true);
GregtechItemList.Battery_RE_EV_Lithium.set(
- this.addItem(tLastID = 54, "Quad Cell Lithium Battery", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 3L),
- getTcAspectStack(TC_Aspects.METALLUM, 3L),
- getTcAspectStack(TC_Aspects.POTENTIA, 3L)
- }));
+ this.addItem(
+ tLastID = 54,
+ "Quad Cell Lithium Battery",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 3L),
+ getTcAspectStack(TC_Aspects.METALLUM, 3L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 3L) }));
this.setElectricStats(32000 + tLastID, 6400000L, GT_Values.V[4], 4L, -3L, true);
/**
* Power Gems
*/
- GregtechItemList.Battery_Gem_1.set(this.addItem(tLastID = 66, "Proton Cell", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.METALLUM, 24L),
- getTcAspectStack(TC_Aspects.POTENTIA, 16L)
- }));
+ GregtechItemList.Battery_Gem_1.set(
+ this.addItem(
+ tLastID = 66,
+ "Proton Cell",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.METALLUM, 24L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 16L) }));
this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 20 * 300 / 4, GT_Values.V[6], 6L, -3L, false);
- GregtechItemList.Battery_Gem_2.set(this.addItem(tLastID = 68, "Electron Cell", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
- getTcAspectStack(TC_Aspects.METALLUM, 32L),
- getTcAspectStack(TC_Aspects.POTENTIA, 32L)
- }));
+ GregtechItemList.Battery_Gem_2.set(
+ this.addItem(
+ tLastID = 68,
+ "Electron Cell",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
+ getTcAspectStack(TC_Aspects.METALLUM, 32L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 32L) }));
this.setElectricStats(32000 + tLastID, GT_Values.V[7] * 20 * 300 / 4, GT_Values.V[7], 7L, -3L, false);
- GregtechItemList.Battery_Gem_3.set(this.addItem(tLastID = 70, "Quark Entanglement", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 32L),
- getTcAspectStack(TC_Aspects.METALLUM, 48L),
- getTcAspectStack(TC_Aspects.POTENTIA, 64L)
- }));
+ GregtechItemList.Battery_Gem_3.set(
+ this.addItem(
+ tLastID = 70,
+ "Quark Entanglement",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 32L),
+ getTcAspectStack(TC_Aspects.METALLUM, 48L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 64L) }));
this.setElectricStats(32000 + tLastID, GT_Values.V[8] * 20 * 300 / 4, GT_Values.V[8], 8L, -3L, false);
// ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_1.get(1), "batteryFutureBasic");
// ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_2.get(1), "batteryFutureGood");
// ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_3.get(1), "batteryFutureAdvanced");
- /*GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Acid Battery", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)}));
- setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true);
-
- GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Mercury Battery", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)}));
- setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true);*/
+ /*
+ * GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Acid Battery", "Reusable", new
+ * Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L),
+ * getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L,
+ * -3L, true); GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Mercury Battery",
+ * "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM,
+ * 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L,
+ * GT_Values.V[2], 4L, -3L, true);
+ */
// RTG Pellet
GregtechItemList.Pellet_RTG_PU238.set(
- this.addItem(41, StringUtils.superscript("238") + "Pu Pellet", "", new Object[] {
- getTcAspectStack(TC_Aspects.RADIO, 4L),
- getTcAspectStack(TC_Aspects.POTENTIA, 2L),
- getTcAspectStack(TC_Aspects.METALLUM, 2L)
- }));
+ this.addItem(
+ 41,
+ StringUtils.superscript("238") + "Pu Pellet",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 2L),
+ getTcAspectStack(TC_Aspects.METALLUM, 2L) }));
GregtechItemList.Pellet_RTG_SR90.set(
- this.addItem(42, StringUtils.superscript("90") + "Sr Pellet", "", new Object[] {
- getTcAspectStack(TC_Aspects.RADIO, 4L),
- getTcAspectStack(TC_Aspects.POTENTIA, 2L),
- getTcAspectStack(TC_Aspects.METALLUM, 2L)
- }));
+ this.addItem(
+ 42,
+ StringUtils.superscript("90") + "Sr Pellet",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 2L),
+ getTcAspectStack(TC_Aspects.METALLUM, 2L) }));
GregtechItemList.Pellet_RTG_PO210.set(
- this.addItem(43, StringUtils.superscript("210") + "Po Pellet", "", new Object[] {
- getTcAspectStack(TC_Aspects.RADIO, 4L),
- getTcAspectStack(TC_Aspects.POTENTIA, 2L),
- getTcAspectStack(TC_Aspects.METALLUM, 2L)
- }));
+ this.addItem(
+ 43,
+ StringUtils.superscript("210") + "Po Pellet",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 2L),
+ getTcAspectStack(TC_Aspects.METALLUM, 2L) }));
GregtechItemList.Pellet_RTG_AM241.set(
- this.addItem(44, StringUtils.superscript("241") + "Am Pellet", "", new Object[] {
- getTcAspectStack(TC_Aspects.RADIO, 4L),
- getTcAspectStack(TC_Aspects.POTENTIA, 2L),
- getTcAspectStack(TC_Aspects.METALLUM, 2L)
- }));
+ this.addItem(
+ 44,
+ StringUtils.superscript("241") + "Am Pellet",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 2L),
+ getTcAspectStack(TC_Aspects.METALLUM, 2L) }));
CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PU238.get(1), MathUtils.roundToClosestInt(87.7f), 64);
CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_SR90.get(1), MathUtils.roundToClosestInt(28.8f), 32);
@@ -661,193 +737,207 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// Computer Cube
GregtechItemList.Gregtech_Computer_Cube.set(
- this.addItem(tLastID = 55, "Gregtech Computer Cube", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.METALLUM, 8L),
- getTcAspectStack(TC_Aspects.POTENTIA, 8L)
- }));
+ this.addItem(
+ tLastID = 55,
+ "Gregtech Computer Cube",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.METALLUM, 8L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, true);
// FOOOOOOOOOOOOOOD
GregtechItemList.Food_Baked_Raisin_Bread.set(
- this.addItem(tLastID = 60, "Raisin Bread", "Extra Raisins, Just for ImQ009", new Object[] {
- new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]),
- getTcAspectStack(TC_Aspects.CORPUS, 1L),
- getTcAspectStack(TC_Aspects.FAMES, 1L),
- getTcAspectStack(TC_Aspects.IGNIS, 1L)
- }));
+ this.addItem(
+ tLastID = 60,
+ "Raisin Bread",
+ "Extra Raisins, Just for ImQ009",
+ new Object[] { new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]),
+ getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L),
+ getTcAspectStack(TC_Aspects.IGNIS, 1L) }));
if (!CORE.GTNH) {
- GregtechItemList.Fluid_Cell_144L.set(this.addItem(
- tLastID = 61, "144L Invar Fluid Cell", "Holds exactly one dust worth of liquid.", new Object[] {
- new ItemData(
- Materials.Invar,
- (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount),
- new MaterialStack[0]),
- getTcAspectStack(TC_Aspects.VACUOS, 2L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ GregtechItemList.Fluid_Cell_144L.set(
+ this.addItem(
+ tLastID = 61,
+ "144L Invar Fluid Cell",
+ "Holds exactly one dust worth of liquid.",
+ new Object[] {
+ new ItemData(
+ Materials.Invar,
+ (OrePrefixes.plate.mMaterialAmount * 8L)
+ + (4L * OrePrefixes.ring.mMaterialAmount),
+ new MaterialStack[0]),
+ getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
this.setFluidContainerStats(32000 + tLastID, 144L, 64L);
- GregtechItemList.Fluid_Cell_36L.set(this.addItem(
- tLastID = 62,
- "36L Brass Fluid Cell",
- "Holds exactly one small dust worth of liquid.",
- new Object[] {
- new ItemData(
- Materials.Brass,
- (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount),
- new MaterialStack[0]),
- getTcAspectStack(TC_Aspects.VACUOS, 2L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ GregtechItemList.Fluid_Cell_36L.set(
+ this.addItem(
+ tLastID = 62,
+ "36L Brass Fluid Cell",
+ "Holds exactly one small dust worth of liquid.",
+ new Object[] {
+ new ItemData(
+ Materials.Brass,
+ (OrePrefixes.plate.mMaterialAmount * 8L)
+ + (4L * OrePrefixes.ring.mMaterialAmount),
+ new MaterialStack[0]),
+ getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
this.setFluidContainerStats(32000 + tLastID, 36L, 64L);
- GregtechItemList.Fluid_Cell_16L.set(this.addItem(
- tLastID = 63,
- "16L Bronze Fluid Cell",
- "Holds exactly one tiny dust / nugget worth of liquid.",
- new Object[] {
- new ItemData(
- Materials.Bronze,
- (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount),
- new MaterialStack[0]),
- getTcAspectStack(TC_Aspects.VACUOS, 2L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ GregtechItemList.Fluid_Cell_16L.set(
+ this.addItem(
+ tLastID = 63,
+ "16L Bronze Fluid Cell",
+ "Holds exactly one tiny dust / nugget worth of liquid.",
+ new Object[] {
+ new ItemData(
+ Materials.Bronze,
+ (OrePrefixes.plate.mMaterialAmount * 8L)
+ + (4L * OrePrefixes.ring.mMaterialAmount),
+ new MaterialStack[0]),
+ getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
this.setFluidContainerStats(32000 + tLastID, 16L, 64L);
- GregtechItemList.Fluid_Cell_1L.set(this.addItem(
- tLastID = 64,
- "1L Wrought Iron Fluid Cell",
- "Holds exactly one litre worth of liquid.",
- new Object[] {
- new ItemData(
- Materials.WroughtIron,
- (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount),
- new MaterialStack[0]),
- getTcAspectStack(TC_Aspects.VACUOS, 2L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ GregtechItemList.Fluid_Cell_1L.set(
+ this.addItem(
+ tLastID = 64,
+ "1L Wrought Iron Fluid Cell",
+ "Holds exactly one litre worth of liquid.",
+ new Object[] {
+ new ItemData(
+ Materials.WroughtIron,
+ (OrePrefixes.plate.mMaterialAmount * 8L)
+ + (4L * OrePrefixes.ring.mMaterialAmount),
+ new MaterialStack[0]),
+ getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) }));
this.setFluidContainerStats(32000 + tLastID, 1L, 64L);
}
GregtechItemList.Cover_Overflow_ULV.set(
- this.addItem(71, "Overflow Valve (ULV)", "Maximum void amount: 8000", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.ITER, 1L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ this.addItem(
+ 71,
+ "Overflow Valve (ULV)",
+ "Maximum void amount: 8000",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ getTcAspectStack(TC_Aspects.AQUA, 1L) }));
GregtechItemList.Cover_Overflow_LV.set(
- this.addItem(72, "Overflow Valve (LV)", "Maximum void amount: 64000", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.ITER, 1L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ this.addItem(
+ 72,
+ "Overflow Valve (LV)",
+ "Maximum void amount: 64000",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ getTcAspectStack(TC_Aspects.AQUA, 1L) }));
GregtechItemList.Cover_Overflow_MV.set(
- this.addItem(73, "Overflow Valve (MV)", "Maximum void amount: 512000", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.ITER, 1L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ this.addItem(
+ 73,
+ "Overflow Valve (MV)",
+ "Maximum void amount: 512000",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ getTcAspectStack(TC_Aspects.AQUA, 1L) }));
GregtechItemList.Cover_Overflow_HV.set(
- this.addItem(74, "Overflow Valve (HV)", "Maximum void amount: 4096000", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.ITER, 1L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ this.addItem(
+ 74,
+ "Overflow Valve (HV)",
+ "Maximum void amount: 4096000",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ getTcAspectStack(TC_Aspects.AQUA, 1L) }));
GregtechItemList.Cover_Overflow_EV.set(
- this.addItem(75, "Overflow Valve (EV)", "Maximum void amount: 32768000", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.ITER, 1L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ this.addItem(
+ 75,
+ "Overflow Valve (EV)",
+ "Maximum void amount: 32768000",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ getTcAspectStack(TC_Aspects.AQUA, 1L) }));
GregtechItemList.Cover_Overflow_IV.set(
- this.addItem(76, "Overflow Valve (IV)", "Maximum void amount: 262144000", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.ITER, 1L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
+ this.addItem(
+ 76,
+ "Overflow Valve (IV)",
+ "Maximum void amount: 262144000",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ getTcAspectStack(TC_Aspects.AQUA, 1L) }));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_ULV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }),
new GTPP_Cover_Overflow(8));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_LV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }),
new GTPP_Cover_Overflow(64));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_MV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[5][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }),
new GTPP_Cover_Overflow(512));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_HV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[5][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }),
new GTPP_Cover_Overflow(4096));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_EV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[8][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }),
new GTPP_Cover_Overflow(32768));
GregTech_API.registerCover(
GregtechItemList.Cover_Overflow_IV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[8][0],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }),
new GTPP_Cover_Overflow(262144));
// Fusion Reactor MK4 Singularity
- GregtechItemList.Compressed_Fusion_Reactor.set(this.addItem(
- 100, "Hypervisor Matrix (Fusion)", "A memory unit containing an RI (Restricted Intelligence)"));
+ GregtechItemList.Compressed_Fusion_Reactor.set(
+ this.addItem(
+ 100,
+ "Hypervisor Matrix (Fusion)",
+ "A memory unit containing an RI (Restricted Intelligence)"));
// NanoTubes
- GregtechItemList.NanoTube_Base_Substrate.set(
- this.addItem(101, "Silicon Base Substrate", "Used in the production of Carbon Nanotubes"));
+ GregtechItemList.NanoTube_Base_Substrate
+ .set(this.addItem(101, "Silicon Base Substrate", "Used in the production of Carbon Nanotubes"));
GregtechItemList.NanoTube_Finished.set(
this.addItem(102, "Carbon Nanotubes", "Multi-walled Zigzag nanotubes, possibly Carbon's final form"));
- GregtechItemList.Carbyne_Tube_Finished.set(this.addItem(
- 103,
- "Linear Acetylenic Carbon (LAC/Carbyne)",
- "LAC chains grown inside Multi-walled Carbon Nanotubes, highly stable"));
- GregtechItemList.Carbyne_Sheet_Finished.set(this.addItem(
- 104,
- "Carbyne Composite Panel",
- "Nanotubes which contain LAC, arranged side by side and compressed further"));
- GregtechItemList.Laser_Lens_Special.set(
- this.addItem(105, "Quantum Anomaly", "Probably should shoot it with lasers"));
+ GregtechItemList.Carbyne_Tube_Finished.set(
+ this.addItem(
+ 103,
+ "Linear Acetylenic Carbon (LAC/Carbyne)",
+ "LAC chains grown inside Multi-walled Carbon Nanotubes, highly stable"));
+ GregtechItemList.Carbyne_Sheet_Finished.set(
+ this.addItem(
+ 104,
+ "Carbyne Composite Panel",
+ "Nanotubes which contain LAC, arranged side by side and compressed further"));
+ GregtechItemList.Laser_Lens_Special
+ .set(this.addItem(105, "Quantum Anomaly", "Probably should shoot it with lasers"));
GregtechItemList.Battery_Casing_Gem_1.set(this.addItem(106, "Containment Unit I", "Used in crafting"));
GregtechItemList.Battery_Casing_Gem_2.set(this.addItem(107, "Containment Unit II", "Used in crafting"));
GregtechItemList.Battery_Casing_Gem_3.set(this.addItem(108, "Advanced Containment Unit", "Used in crafting"));
GregtechItemList.Battery_Casing_Gem_4.set(this.addItem(109, "Exotic Containment Unit", "Used in crafting"));
- GregtechItemList.Battery_Gem_4.set(this.addItem(tLastID = 110, "Graviton Anomaly", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 64L),
- getTcAspectStack(TC_Aspects.METALLUM, 64L),
- getTcAspectStack(TC_Aspects.POTENTIA, 64L)
- }));
+ GregtechItemList.Battery_Gem_4.set(
+ this.addItem(
+ tLastID = 110,
+ "Graviton Anomaly",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 64L),
+ getTcAspectStack(TC_Aspects.METALLUM, 64L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 64L) }));
this.setElectricStats(32000 + tLastID, (64000000000L * 16), GT_Values.V[9], 9L, -3L, false);
/*
@@ -855,8 +945,8 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
*/
GregtechItemList.Bomb_Cast.set(this.addItem(111, "Bomb Cast", "Used in the production of Bombs"));
GregtechItemList.Bomb_Cast_Molten.set(this.addItem(112, "Bomb Cast (Hot)", "Consider cooling this off"));
- GregtechItemList.Bomb_Cast_Set.set(
- this.addItem(113, "Bomb Cast (Set)", "Break it open for the goodies inside!"));
+ GregtechItemList.Bomb_Cast_Set
+ .set(this.addItem(113, "Bomb Cast (Set)", "Break it open for the goodies inside!"));
GregtechItemList.Bomb_Cast_Broken.set(this.addItem(114, "Bomb Cast (Broken)", "This is probably just junk"));
GregtechItemList.Bomb_Cast_Mold.set(this.addItem(115, "Mold (Bomb Cast)", "Used in the production of Bombs"));
@@ -864,255 +954,311 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
* High Tier 'Saws' for the tree Farm
*/
GregtechItemList.Farm_Processor_EV.set(
- this.addItem(tLastID = 120, "Farm Processor [EV]", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.METALLUM, 8L),
- getTcAspectStack(TC_Aspects.POTENTIA, 8L)
- }));
+ this.addItem(
+ tLastID = 120,
+ "Farm Processor [EV]",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.METALLUM, 8L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
this.setElectricStats(32000 + tLastID, GT_Values.V[5] * 10 * 60 * 20, GT_Values.V[4], 4L, -3L, false);
GregtechItemList.Farm_Processor_IV.set(
- this.addItem(tLastID = 122, "Farm Processor [IV]", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.METALLUM, 8L),
- getTcAspectStack(TC_Aspects.POTENTIA, 8L)
- }));
+ this.addItem(
+ tLastID = 122,
+ "Farm Processor [IV]",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.METALLUM, 8L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, false);
GregtechItemList.Farm_Processor_LuV.set(
- this.addItem(tLastID = 124, "Farm Processor [LuV]", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.METALLUM, 8L),
- getTcAspectStack(TC_Aspects.POTENTIA, 8L)
- }));
+ this.addItem(
+ tLastID = 124,
+ "Farm Processor [LuV]",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.METALLUM, 8L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
this.setElectricStats(32000 + tLastID, GT_Values.V[7] * 10 * 60 * 20, GT_Values.V[6], 6L, -3L, false);
GregtechItemList.Farm_Processor_ZPM.set(
- this.addItem(tLastID = 126, "Farm Processor [ZPM]", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.METALLUM, 8L),
- getTcAspectStack(TC_Aspects.POTENTIA, 8L)
- }));
+ this.addItem(
+ tLastID = 126,
+ "Farm Processor [ZPM]",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.METALLUM, 8L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
this.setElectricStats(32000 + tLastID, GT_Values.V[8] * 10 * 60 * 20, GT_Values.V[7], 7L, -3L, false);
GregtechItemList.Farm_Processor_UV.set(
- this.addItem(tLastID = 128, "Farm Processor [UV]", "Reusable", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.METALLUM, 8L),
- getTcAspectStack(TC_Aspects.POTENTIA, 8L)
- }));
+ this.addItem(
+ tLastID = 128,
+ "Farm Processor [UV]",
+ "Reusable",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.METALLUM, 8L),
+ getTcAspectStack(TC_Aspects.POTENTIA, 8L) }));
this.setElectricStats(32000 + tLastID, GT_Values.V[9] * 10 * 60 * 20, GT_Values.V[8], 8L, -3L, false);
String aTierName;
int aFirstMachineCasingID = 130;
- GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] {
- GregtechItemList.FakeMachineCasingPlate_ULV,
- GregtechItemList.FakeMachineCasingPlate_LV,
- GregtechItemList.FakeMachineCasingPlate_MV,
- GregtechItemList.FakeMachineCasingPlate_HV,
- GregtechItemList.FakeMachineCasingPlate_EV,
- GregtechItemList.FakeMachineCasingPlate_IV,
- GregtechItemList.FakeMachineCasingPlate_LuV,
- GregtechItemList.FakeMachineCasingPlate_ZPM,
- GregtechItemList.FakeMachineCasingPlate_UV,
- GregtechItemList.FakeMachineCasingPlate_MAX,
- };
+ GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { GregtechItemList.FakeMachineCasingPlate_ULV,
+ GregtechItemList.FakeMachineCasingPlate_LV, GregtechItemList.FakeMachineCasingPlate_MV,
+ GregtechItemList.FakeMachineCasingPlate_HV, GregtechItemList.FakeMachineCasingPlate_EV,
+ GregtechItemList.FakeMachineCasingPlate_IV, GregtechItemList.FakeMachineCasingPlate_LuV,
+ GregtechItemList.FakeMachineCasingPlate_ZPM, GregtechItemList.FakeMachineCasingPlate_UV,
+ GregtechItemList.FakeMachineCasingPlate_MAX, };
for (int i = 0; i < 10; i++) {
if (i == 10) {
break;
} else {
aTierName = GT_Values.VN[i];
- mMachineCasingCovers[i].set(this.addItem(
- aFirstMachineCasingID++,
- aTierName + " Machine Plate Cover",
- "Deprecated - Shapeless Craft to new version",
- new Object[] {}));
+ mMachineCasingCovers[i].set(
+ this.addItem(
+ aFirstMachineCasingID++,
+ aTierName + " Machine Plate Cover",
+ "Deprecated - Shapeless Craft to new version",
+ new Object[] {}));
GregTech_API.registerCover(
mMachineCasingCovers[i].get(1L),
- new GT_MultiTexture(new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[i][0]}),
+ new GT_MultiTexture(new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[i][0] }),
new GTPP_Cover_ToggleVisual());
}
}
- GregtechItemList.Laser_Lens_WoodsGlass.set(this.addItem(
- 140, "Wood's Glass Lens", "Allows UV & IF to pass through, blocks visible light spectrums"));
+ GregtechItemList.Laser_Lens_WoodsGlass.set(
+ this.addItem(
+ 140,
+ "Wood's Glass Lens",
+ "Allows UV & IF to pass through, blocks visible light spectrums"));
int aStartID = 141;
- GregtechItemList[] aTransParts = new GregtechItemList[] {
- GregtechItemList.TransmissionComponent_ULV,
- GregtechItemList.TransmissionComponent_LV,
- GregtechItemList.TransmissionComponent_MV,
- GregtechItemList.TransmissionComponent_HV,
- GregtechItemList.TransmissionComponent_EV,
- GregtechItemList.TransmissionComponent_IV,
- GregtechItemList.TransmissionComponent_LuV,
- GregtechItemList.TransmissionComponent_ZPM,
- GregtechItemList.TransmissionComponent_UV,
- GregtechItemList.TransmissionComponent_MAX,
- };
+ GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV,
+ GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV,
+ GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV,
+ GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV,
+ GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV,
+ GregtechItemList.TransmissionComponent_MAX, };
for (int aIndex = 0; aIndex < 10; aIndex++) {
aTransParts[aIndex].set(
- this.addItem(aStartID++, "Transmission Component (" + GT_Values.VN[aIndex] + ")", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, aIndex),
- getTcAspectStack(TC_Aspects.MACHINA, aIndex),
- getTcAspectStack(TC_Aspects.MAGNETO, aIndex)
- }));
+ this.addItem(
+ aStartID++,
+ "Transmission Component (" + GT_Values.VN[aIndex] + ")",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, aIndex),
+ getTcAspectStack(TC_Aspects.MACHINA, aIndex),
+ getTcAspectStack(TC_Aspects.MAGNETO, aIndex) }));
}
// Distillus Chip
- GregtechItemList.Distillus_Upgrade_Chip.set(
- this.addItem(151, "Upgrade Chip", "Used to upgrade Distillus to Tier 2"));
+ GregtechItemList.Distillus_Upgrade_Chip
+ .set(this.addItem(151, "Upgrade Chip", "Used to upgrade Distillus to Tier 2"));
- GregtechItemList.Chip_MultiNerf_NoOutputBonus.set(
- this.addItem(160, "No-Bonus Chip", "You won't like using this"));
- GregtechItemList.Chip_MultiNerf_NoSpeedBonus.set(
- this.addItem(161, "No-Bonus Chip", "You won't like using this"));
+ GregtechItemList.Chip_MultiNerf_NoOutputBonus
+ .set(this.addItem(160, "No-Bonus Chip", "You won't like using this"));
+ GregtechItemList.Chip_MultiNerf_NoSpeedBonus
+ .set(this.addItem(161, "No-Bonus Chip", "You won't like using this"));
GregtechItemList.Chip_MultiNerf_NoEuBonus.set(this.addItem(162, "No-Bonus Chip", "You won't like using this"));
/*
- GregtechItemList.Cover_Overflow_Item_ULV.set(this.addItem(165, "Item Overflow Valve (ULV)", "Maximum void amount: 8000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
- GregtechItemList.Cover_Overflow_Item_LV.set(this.addItem(166, "Item Overflow Valve (LV)", "Maximum void amount: 64000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
- GregtechItemList.Cover_Overflow_Item_MV.set(this.addItem(167, "Item Overflow Valve (MV)", "Maximum void amount: 512000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
- GregtechItemList.Cover_Overflow_Item_HV.set(this.addItem(168, "Item Overflow Valve (HV)", "Maximum void amount: 4096000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
- GregtechItemList.Cover_Overflow_Item_EV.set(this.addItem(169, "Item Overflow Valve (EV)", "Maximum void amount: 32768000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
- GregtechItemList.Cover_Overflow_Item_IV.set(this.addItem(170, "Item Overflow Valve (IV)", "Maximum void amount: 262144000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
-
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_ULV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(8));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_LV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(64));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_MV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(512));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_HV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(4096));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_EV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(32768));
- GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_IV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(262144));
- */
+ * GregtechItemList.Cover_Overflow_Item_ULV.set(this.addItem(165, "Item Overflow Valve (ULV)",
+ * "Maximum void amount: 8000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ * getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ * getTcAspectStack(TC_Aspects.AQUA, 1L)})); GregtechItemList.Cover_Overflow_Item_LV.set(this.addItem(166,
+ * "Item Overflow Valve (LV)", "Maximum void amount: 64000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM,
+ * 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ * getTcAspectStack(TC_Aspects.AQUA, 1L)})); GregtechItemList.Cover_Overflow_Item_MV.set(this.addItem(167,
+ * "Item Overflow Valve (MV)", "Maximum void amount: 512000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM,
+ * 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ * getTcAspectStack(TC_Aspects.AQUA, 1L)})); GregtechItemList.Cover_Overflow_Item_HV.set(this.addItem(168,
+ * "Item Overflow Valve (HV)", "Maximum void amount: 4096000", new
+ * Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L),
+ * getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
+ * GregtechItemList.Cover_Overflow_Item_EV.set(this.addItem(169, "Item Overflow Valve (EV)",
+ * "Maximum void amount: 32768000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ * getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ * getTcAspectStack(TC_Aspects.AQUA, 1L)})); GregtechItemList.Cover_Overflow_Item_IV.set(this.addItem(170,
+ * "Item Overflow Valve (IV)", "Maximum void amount: 262144000", new
+ * Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L),
+ * getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)}));
+ * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_ULV.get(1L), new GT_MultiTexture(new
+ * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new
+ * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(8));
+ * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_LV.get(1L), new GT_MultiTexture(new
+ * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new
+ * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(64));
+ * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_MV.get(1L), new GT_MultiTexture(new
+ * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new
+ * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(512));
+ * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_HV.get(1L), new GT_MultiTexture(new
+ * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new
+ * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(4096));
+ * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_EV.get(1L), new GT_MultiTexture(new
+ * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new
+ * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(32768));
+ * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_IV.get(1L), new GT_MultiTexture(new
+ * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new
+ * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(262144));
+ */
}
private boolean registerComponents_ULV() {
GregtechItemList.Electric_Pump_ULV.set(
- this.addItem(32, "Electric Pump (ULV)", "160 L/sec (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.ITER, 1L),
- getTcAspectStack(TC_Aspects.AQUA, 1L)
- }));
- GregtechItemList.Electric_Motor_ULV.set(this.addItem(33, "Electric Motor (ULV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.MOTUS, 1L)
- }));
+ this.addItem(
+ 32,
+ "Electric Pump (ULV)",
+ "160 L/sec (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
+ getTcAspectStack(TC_Aspects.AQUA, 1L) }));
+ GregtechItemList.Electric_Motor_ULV.set(
+ this.addItem(
+ 33,
+ "Electric Motor (ULV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.MOTUS, 1L) }));
GregtechItemList.Conveyor_Module_ULV.set(
- this.addItem(34, "Conveyor Module (ULV)", "1 Stack every 80 secs (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.ITER, 1L)
- }));
- GregtechItemList.Electric_Piston_ULV.set(this.addItem(35, "Electric Piston (ULV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.MOTUS, 1L)
- }));
+ this.addItem(
+ 34,
+ "Conveyor Module (ULV)",
+ "1 Stack every 80 secs (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L) }));
+ GregtechItemList.Electric_Piston_ULV.set(
+ this.addItem(
+ 35,
+ "Electric Piston (ULV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L) }));
GregtechItemList.Robot_Arm_ULV.set(
- this.addItem(36, "Robot Arm (ULV)", "Inserts into specific Slots (as Cover)", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 2L),
- getTcAspectStack(TC_Aspects.MOTUS, 1L),
- Utils.getTcAspectStack("COGNITIO", 1L)
- }));
- GregtechItemList.Field_Generator_ULV.set(this.addItem(37, "Field Generator (ULV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.TUTAMEN, 1L)
- }));
- GregtechItemList.Emitter_ULV.set(this.addItem(38, "Emitter (ULV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.LUX, 1L)
- }));
- GregtechItemList.Sensor_ULV.set(this.addItem(39, "Sensor (ULV)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
- getTcAspectStack(TC_Aspects.MACHINA, 1L),
- getTcAspectStack(TC_Aspects.SENSUS, 1L)
- }));
+ this.addItem(
+ 36,
+ "Robot Arm (ULV)",
+ "Inserts into specific Slots (as Cover)",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L),
+ Utils.getTcAspectStack("COGNITIO", 1L) }));
+ GregtechItemList.Field_Generator_ULV.set(
+ this.addItem(
+ 37,
+ "Field Generator (ULV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.TUTAMEN, 1L) }));
+ GregtechItemList.Emitter_ULV.set(
+ this.addItem(
+ 38,
+ "Emitter (ULV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.LUX, 1L) }));
+ GregtechItemList.Sensor_ULV.set(
+ this.addItem(
+ 39,
+ "Sensor (ULV)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
+ getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.SENSUS, 1L) }));
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_ULV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[5][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
new GT_Cover_Pump(8));
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_ULV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[1][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
new GT_Cover_Conveyor(1600));
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_ULV.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[1][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
new GT_Cover_Arm(1600));
return true;
}
private boolean registerComponents_MAX() {
- GregtechItemList.Electric_Pump_MAX.set(this.addItem(3, "Electric Pump (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.ITER, 8L),
- getTcAspectStack(TC_Aspects.AQUA, 8L)
- }));
- GregtechItemList.Electric_Motor_MAX.set(this.addItem(7, "Electric Motor (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.MOTUS, 8L)
- }));
- GregtechItemList.Conveyor_Module_MAX.set(this.addItem(11, "Conveyor Module (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.ITER, 8L)
- }));
- GregtechItemList.Electric_Piston_MAX.set(this.addItem(15, "Electric Piston (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 16L),
- getTcAspectStack(TC_Aspects.MOTUS, 8L)
- }));
- GregtechItemList.Robot_Arm_MAX.set(this.addItem(19, "Robot Arm (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 16L),
- getTcAspectStack(TC_Aspects.MOTUS, 8L),
- getTcAspectStack("COGNITIO", 8L)
- }));
- GregtechItemList.Field_Generator_MAX.set(this.addItem(23, "Field Generator (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.TUTAMEN, 8L)
- }));
- GregtechItemList.Emitter_MAX.set(this.addItem(27, "Emitter (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.LUX, 8L)
- }));
- GregtechItemList.Sensor_MAX.set(this.addItem(31, "Sensor (MAX)", "", new Object[] {
- getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
- getTcAspectStack(TC_Aspects.MACHINA, 8L),
- getTcAspectStack(TC_Aspects.SENSUS, 8L)
- }));
+ GregtechItemList.Electric_Pump_MAX.set(
+ this.addItem(
+ 3,
+ "Electric Pump (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L),
+ getTcAspectStack(TC_Aspects.AQUA, 8L) }));
+ GregtechItemList.Electric_Motor_MAX.set(
+ this.addItem(
+ 7,
+ "Electric Motor (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
+ GregtechItemList.Conveyor_Module_MAX.set(
+ this.addItem(
+ 11,
+ "Conveyor Module (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L) }));
+ GregtechItemList.Electric_Piston_MAX.set(
+ this.addItem(
+ 15,
+ "Electric Piston (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 16L), getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
+ GregtechItemList.Robot_Arm_MAX.set(
+ this.addItem(
+ 19,
+ "Robot Arm (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 16L), getTcAspectStack(TC_Aspects.MOTUS, 8L),
+ getTcAspectStack("COGNITIO", 8L) }));
+ GregtechItemList.Field_Generator_MAX.set(
+ this.addItem(
+ 23,
+ "Field Generator (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.TUTAMEN, 8L) }));
+ GregtechItemList.Emitter_MAX.set(
+ this.addItem(
+ 27,
+ "Emitter (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.LUX, 8L) }));
+ GregtechItemList.Sensor_MAX.set(
+ this.addItem(
+ 31,
+ "Sensor (MAX)",
+ "",
+ new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
+ getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.SENSUS, 8L) }));
GregTech_API.registerCover(
GregtechItemList.Electric_Pump_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
new GT_Cover_Pump(524288));
GregTech_API.registerCover(
GregtechItemList.Conveyor_Module_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
new GT_Cover_Conveyor(4));
GregTech_API.registerCover(
GregtechItemList.Robot_Arm_MAX.get(1L),
- new GT_MultiTexture(new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[4][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM)
- }),
+ new GT_MultiTexture(
+ new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }),
new GT_Cover_Arm(4));
return true;
@@ -1122,69 +1268,93 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
// Enable Old Circuits
Logger.INFO("[Old Feature - Circuits] Enabling Pre-5.09.28 Circuits and Data Storage.");
- GregtechItemList.Old_Circuit_Primitive.set(this.addItem(
- 200, "NAND Chip", "A very simple Circuit", new Object[] {OrePrefixes.circuit.get(Materials.Primitive)
- }));
+ GregtechItemList.Old_Circuit_Primitive.set(
+ this.addItem(
+ 200,
+ "NAND Chip",
+ "A very simple Circuit",
+ new Object[] { OrePrefixes.circuit.get(Materials.Primitive) }));
GregtechItemList.Old_Circuit_Basic.set(
- this.addItem(201, "Basic Electronic Circuit", "A basic Circuit", new Object[] {
- OrePrefixes.circuit.get(Materials.Basic)
- }));
- GregtechItemList.Old_Circuit_Good.set(this.addItem(
- 202, "Good Electronic Circuit", "A good Circuit", new Object[] {OrePrefixes.circuit.get(Materials.Good)
- }));
+ this.addItem(
+ 201,
+ "Basic Electronic Circuit",
+ "A basic Circuit",
+ new Object[] { OrePrefixes.circuit.get(Materials.Basic) }));
+ GregtechItemList.Old_Circuit_Good.set(
+ this.addItem(
+ 202,
+ "Good Electronic Circuit",
+ "A good Circuit",
+ new Object[] { OrePrefixes.circuit.get(Materials.Good) }));
GregtechItemList.Old_Circuit_Advanced.set(
- this.addItem(203, "Advanced Circuit", "An advanced Circuit", new Object[] {
- OrePrefixes.circuit.get(Materials.Advanced)
- }));
+ this.addItem(
+ 203,
+ "Advanced Circuit",
+ "An advanced Circuit",
+ new Object[] { OrePrefixes.circuit.get(Materials.Advanced) }));
GregtechItemList.Old_Circuit_Data.set(
- this.addItem(204, "Data Storage Circuit", "A Data Storage Chip", new Object[] {
- OrePrefixes.circuit.get(Materials.Data)
- }));
- GregtechItemList.Old_Circuit_Elite.set(this.addItem(
- 205, "Data Control Circuit", "A Processor", new Object[] {OrePrefixes.circuit.get(Materials.Elite)}));
+ this.addItem(
+ 204,
+ "Data Storage Circuit",
+ "A Data Storage Chip",
+ new Object[] { OrePrefixes.circuit.get(Materials.Data) }));
+ GregtechItemList.Old_Circuit_Elite.set(
+ this.addItem(
+ 205,
+ "Data Control Circuit",
+ "A Processor",
+ new Object[] { OrePrefixes.circuit.get(Materials.Elite) }));
GregtechItemList.Old_Circuit_Master.set(
- this.addItem(206, "Energy Flow Circuit", "A High Voltage Processor", new Object[] {
- OrePrefixes.circuit.get(Materials.Master)
- }));
+ this.addItem(
+ 206,
+ "Energy Flow Circuit",
+ "A High Voltage Processor",
+ new Object[] { OrePrefixes.circuit.get(Materials.Master) }));
GregtechItemList.Old_Tool_DataOrb.set(
- this.addItem(207, "Data Orb [GT++]", "A High Capacity Data Storage", new Object[] {
- OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, new Behaviour_DataOrb()
- }));
+ this.addItem(
+ 207,
+ "Data Orb [GT++]",
+ "A High Capacity Data Storage",
+ new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION,
+ new Behaviour_DataOrb() }));
GregtechItemList.Old_Circuit_Ultimate.set(GregtechItemList.Old_Tool_DataOrb.get(1L));
GT_ModHandler.addShapelessCraftingRecipe(
GregtechItemList.Old_Tool_DataOrb.get(1L),
GT_ModHandler.RecipeBits.NOT_REMOVABLE,
- new Object[] {GregtechItemList.Old_Tool_DataOrb.get(1L)});
+ new Object[] { GregtechItemList.Old_Tool_DataOrb.get(1L) });
GregtechItemList.Old_Tool_DataStick.set(
- this.addItem(208, "Data Stick [GT++]", "A Low Capacity Data Storage", new Object[] {
- OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, new Behaviour_DataStick()
- }));
+ this.addItem(
+ 208,
+ "Data Stick [GT++]",
+ "A Low Capacity Data Storage",
+ new Object[] { OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION,
+ new Behaviour_DataStick() }));
GT_ModHandler.addShapelessCraftingRecipe(
GregtechItemList.Old_Tool_DataStick.get(1L),
GT_ModHandler.RecipeBits.NOT_REMOVABLE,
- new Object[] {GregtechItemList.Old_Tool_DataStick.get(1L)});
+ new Object[] { GregtechItemList.Old_Tool_DataStick.get(1L) });
GregtechItemList.Old_Circuit_Board_Basic.set(this.addItem(210, "Basic Circuit Board", "A basic Board"));
- GregtechItemList.Old_Circuit_Board_Advanced.set(
- this.addItem(211, "Advanced Circuit Board", "An advanced Board"));
+ GregtechItemList.Old_Circuit_Board_Advanced
+ .set(this.addItem(211, "Advanced Circuit Board", "An advanced Board"));
GregtechItemList.Old_Circuit_Board_Elite.set(this.addItem(212, "Processor Board", "A Processor Board"));
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.set(
- this.addItem(213, "Engraved Crystal Chip", "Needed for Circuits"));
- GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.set(
- this.addItem(214, "Engraved Lapotron Chip", "Needed for Circuits"));
- GregtechItemList.Old_Circuit_Parts_Advanced.set(
- this.addItem(215, "Advanced Circuit Parts", "Advanced Circuit Parts"));
- GregtechItemList.Old_Circuit_Parts_Wiring_Basic.set(
- this.addItem(216, "Etched Medium Voltage Wiring", "Part of Circuit Boards"));
- GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.set(
- this.addItem(217, "Etched High Voltage Wiring", "Part of Circuit Boards"));
- GregtechItemList.Old_Circuit_Parts_Wiring_Elite.set(
- this.addItem(218, "Etched Extreme Voltage Wiring", "Part of Circuit Boards"));
+ GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite
+ .set(this.addItem(213, "Engraved Crystal Chip", "Needed for Circuits"));
+ GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master
+ .set(this.addItem(214, "Engraved Lapotron Chip", "Needed for Circuits"));
+ GregtechItemList.Old_Circuit_Parts_Advanced
+ .set(this.addItem(215, "Advanced Circuit Parts", "Advanced Circuit Parts"));
+ GregtechItemList.Old_Circuit_Parts_Wiring_Basic
+ .set(this.addItem(216, "Etched Medium Voltage Wiring", "Part of Circuit Boards"));
+ GregtechItemList.Old_Circuit_Parts_Wiring_Advanced
+ .set(this.addItem(217, "Etched High Voltage Wiring", "Part of Circuit Boards"));
+ GregtechItemList.Old_Circuit_Parts_Wiring_Elite
+ .set(this.addItem(218, "Etched Extreme Voltage Wiring", "Part of Circuit Boards"));
GregtechItemList.Old_Empty_Board_Basic.set(this.addItem(219, "Empty Circuit Board", "A Board Part"));
- GregtechItemList.Old_Empty_Board_Elite.set(
- this.addItem(220, "Empty Processor Board", "A Processor Board Part"));
+ GregtechItemList.Old_Empty_Board_Elite
+ .set(this.addItem(220, "Empty Processor Board", "A Processor Board Part"));
return true;
}
@@ -1192,39 +1362,45 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
public boolean registerCustomCircuits() {
if (CORE.ConfigSwitches.enableCustomCircuits) {
GregtechItemList.Circuit_IV.set(
- this.addItem(704, "Symbiotic Circuit (IV)", "A Symbiotic Data Processor", new Object[] {
- GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic)
- }));
+ this.addItem(
+ 704,
+ "Symbiotic Circuit (IV)",
+ "A Symbiotic Data Processor",
+ new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic) }));
GregtechItemList.Circuit_LuV.set(
- this.addItem(705, "Neutronic Circuit (LuV)", "A Neutron Particle Processor", new Object[] {
- GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic)
- }));
+ this.addItem(
+ 705,
+ "Neutronic Circuit (LuV)",
+ "A Neutron Particle Processor",
+ new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic) }));
GregtechItemList.Circuit_ZPM.set(
- this.addItem(706, "Quantum Circuit (ZPM)", "A Singlularity Processor", new Object[] {
- GregtechOrePrefixes.circuit.get(GT_Materials.Quantum)
- }));
- GregtechItemList.Circuit_Board_IV.set(
- this.addItem(710, "IV Circuit Board", "An IV Voltage Rated Circuit Board"));
- GregtechItemList.Circuit_Board_LuV.set(
- this.addItem(711, "LuV Circuit Board", "An LuV Voltage Rated Circuit Board"));
- GregtechItemList.Circuit_Board_ZPM.set(
- this.addItem(712, "ZPM Processor Board", "A ZPM Voltage Rated Processor Board"));
- GregtechItemList.Circuit_Parts_Crystal_Chip_IV.set(
- this.addItem(713, "(IV) Energized Crystal Chip", "Needed for Circuits"));
- GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.set(
- this.addItem(714, "(LuV) Neutron based Microchip", "Needed for Circuits"));
- GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.set(
- this.addItem(715, "(ZPM) Quantum Chip", "Needed for Circuits"));
+ this.addItem(
+ 706,
+ "Quantum Circuit (ZPM)",
+ "A Singlularity Processor",
+ new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Quantum) }));
+ GregtechItemList.Circuit_Board_IV
+ .set(this.addItem(710, "IV Circuit Board", "An IV Voltage Rated Circuit Board"));
+ GregtechItemList.Circuit_Board_LuV
+ .set(this.addItem(711, "LuV Circuit Board", "An LuV Voltage Rated Circuit Board"));
+ GregtechItemList.Circuit_Board_ZPM
+ .set(this.addItem(712, "ZPM Processor Board", "A ZPM Voltage Rated Processor Board"));
+ GregtechItemList.Circuit_Parts_Crystal_Chip_IV
+ .set(this.addItem(713, "(IV) Energized Crystal Chip", "Needed for Circuits"));
+ GregtechItemList.Circuit_Parts_Crystal_Chip_LuV
+ .set(this.addItem(714, "(LuV) Neutron based Microchip", "Needed for Circuits"));
+ GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM
+ .set(this.addItem(715, "(ZPM) Quantum Chip", "Needed for Circuits"));
GregtechItemList.Circuit_Parts_IV.set(this.addItem(716, "(IV) Energized Circuit Parts", "Circuit Parts"));
- GregtechItemList.Circuit_Parts_LuV.set(
- this.addItem(717, "(LuV) Neutron-based Circuit Parts", "Circuit Parts"));
+ GregtechItemList.Circuit_Parts_LuV
+ .set(this.addItem(717, "(LuV) Neutron-based Circuit Parts", "Circuit Parts"));
GregtechItemList.Circuit_Parts_ZPM.set(this.addItem(718, "(ZPM) Quantum Circuit Parts", "Circuit Parts"));
- GregtechItemList.Circuit_Parts_Wiring_IV.set(
- this.addItem(719, "Etched IV Voltage Wiring", "Part of Circuit Boards"));
- GregtechItemList.Circuit_Parts_Wiring_LuV.set(
- this.addItem(720, "Etched LuV Voltage Wiring", "Part of Circuit Boards"));
- GregtechItemList.Circuit_Parts_Wiring_ZPM.set(
- this.addItem(721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards"));
+ GregtechItemList.Circuit_Parts_Wiring_IV
+ .set(this.addItem(719, "Etched IV Voltage Wiring", "Part of Circuit Boards"));
+ GregtechItemList.Circuit_Parts_Wiring_LuV
+ .set(this.addItem(720, "Etched LuV Voltage Wiring", "Part of Circuit Boards"));
+ GregtechItemList.Circuit_Parts_Wiring_ZPM
+ .set(this.addItem(721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards"));
ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_IV.get(1), "circuitSuperconductor");
ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_LuV.get(1), "circuitInfinite");
return true;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index 0e937a9485..e59c71c5bd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.items;
+import java.lang.reflect.Field;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TC_Aspects;
import gregtech.api.enums.ToolDictNames;
@@ -13,7 +15,6 @@ import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricButcherKnife;
import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricLighter;
import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricSnips;
-import java.lang.reflect.Field;
public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
@@ -41,14 +42,11 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
"Skookum Choocher",
"Can Really Chooch. Does a Skookum job at Hammering and Wrenching stuff.",
new TOOL_Gregtech_Choocher(),
- new Object[] {
- GregtechToolDictNames.craftingToolSkookumChoocher,
- ToolDictNames.craftingToolHardHammer,
- ToolDictNames.craftingToolWrench,
- new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
- new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
- new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)
- }),
+ new Object[] { GregtechToolDictNames.craftingToolSkookumChoocher,
+ ToolDictNames.craftingToolHardHammer, ToolDictNames.craftingToolWrench,
+ new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
+ new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+ new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }),
GregTech_API.sWrenchList);
// Electric File
@@ -57,13 +55,10 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
"Angle Grinder",
"Hand-held electric filing device",
new TOOL_Gregtech_AngleGrinder(),
- new Object[] {
- GregtechToolDictNames.craftingToolAngleGrinder,
- ToolDictNames.craftingToolFile,
- new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
- new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
- new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)
- });
+ new Object[] { GregtechToolDictNames.craftingToolAngleGrinder, ToolDictNames.craftingToolFile,
+ new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
+ new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+ new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) });
GT_HashSet<GT_ItemStack> aWireCutterList = new GT_HashSet<GT_ItemStack>();
// Does not exist prior to 5.09.32, use an empty field if we can't find the existing one.
@@ -89,23 +84,23 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
"Automatic Snips",
"Hand-held electric wire cutter",
new TOOL_Gregtech_ElectricSnips(),
- new Object[] {
- GregtechToolDictNames.craftingToolElectricSnips,
- ToolDictNames.craftingToolWireCutter,
- new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L),
- new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L),
- new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L)
- }),
+ new Object[] { GregtechToolDictNames.craftingToolElectricSnips,
+ ToolDictNames.craftingToolWireCutter,
+ new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L),
+ new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L),
+ new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L) }),
aWireCutterList);
// Electric Lighter
this.addTool(
- ELECTRIC_LIGHTER, "Pyromatic 9k", "Electric Fire!", new TOOL_Gregtech_ElectricLighter(), new Object[] {
- GregtechToolDictNames.craftingToolElectricLighter,
- new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
- new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
- new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)
- });
+ ELECTRIC_LIGHTER,
+ "Pyromatic 9k",
+ "Electric Fire!",
+ new TOOL_Gregtech_ElectricLighter(),
+ new Object[] { GregtechToolDictNames.craftingToolElectricLighter,
+ new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
+ new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+ new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) });
// Electric Butcher Knife
this.addTool(
@@ -113,12 +108,9 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
"Meat-o-matic",
"Electric butcher knife",
new TOOL_Gregtech_ElectricButcherKnife(),
- new Object[] {
- GregtechToolDictNames.craftingToolElectricButcherKnife,
- ToolDictNames.craftingToolKnife,
- new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L),
- new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
- new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)
- });
+ new Object[] { GregtechToolDictNames.craftingToolElectricButcherKnife, ToolDictNames.craftingToolKnife,
+ new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L),
+ new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+ new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
index ef72c5edd4..9d27818686 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.gregtech.common.items.behaviours;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
import gregtech.api.items.GT_MetaBase_Item;
import gregtech.api.util.GT_LanguageManager;
import gregtech.common.items.behaviors.Behaviour_None;
@@ -7,39 +13,27 @@ import gregtech.common.items.behaviors.Behaviour_Wrench;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.NBTUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
public class Behaviour_Choocher extends Behaviour_None {
+
private boolean isWrench = true;
private final Behaviour_Wrench wrench = new Behaviour_Wrench(150);
private final Behaviour_Prospecting_Ex prospecting = new Behaviour_Prospecting_Ex(10, 1250);
- private final String mTooltip1 =
- GT_LanguageManager.addStringLocalization("gt.behaviour.choochering1", "Current tool mode: ");
- private final String mTooltip2 = GT_LanguageManager.addStringLocalization(
- "gt.behaviour.choochering2", "Change tool mode using Shift+Rightclick.");
- private final String mTooltipH = GT_LanguageManager.addStringLocalization(
- "gt.behaviour.prospectingEx", "Usable for Prospecting large areas.");
- private final String mTooltipW =
- GT_LanguageManager.addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick.");
+ private final String mTooltip1 = GT_LanguageManager
+ .addStringLocalization("gt.behaviour.choochering1", "Current tool mode: ");
+ private final String mTooltip2 = GT_LanguageManager
+ .addStringLocalization("gt.behaviour.choochering2", "Change tool mode using Shift+Rightclick.");
+ private final String mTooltipH = GT_LanguageManager
+ .addStringLocalization("gt.behaviour.prospectingEx", "Usable for Prospecting large areas.");
+ private final String mTooltipW = GT_LanguageManager
+ .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick.");
public Behaviour_Choocher() {}
@Override
- public boolean onItemUseFirst(
- final GT_MetaBase_Item aItem,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final World aWorld,
- final int aX,
- final int aY,
- final int aZ,
- final int aSide,
- final float hitX,
- final float hitY,
- final float hitZ) {
+ public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
+ final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX,
+ final float hitY, final float hitZ) {
if (aWorld.isRemote) {
return false;
}
@@ -59,18 +53,18 @@ public class Behaviour_Choocher extends Behaviour_None {
return true;
} else {
if (inWrenchMode) {
- return this.wrench.onItemUseFirst(
- aItem, aStack, aPlayer, aWorld, aSide, aSide, aSide, aSide, hitZ, hitZ, hitZ);
+ return this.wrench
+ .onItemUseFirst(aItem, aStack, aPlayer, aWorld, aSide, aSide, aSide, aSide, hitZ, hitZ, hitZ);
} else {
- return this.prospecting.onItemUseFirst(
- aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+ return this.prospecting
+ .onItemUseFirst(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
}
}
}
@Override
- public List<String> getAdditionalToolTips(
- final GT_MetaBase_Item aItem, final List<String> aList, final ItemStack aStack) {
+ public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList,
+ final ItemStack aStack) {
boolean inWrenchMode;
if (NBTUtils.hasKey(aStack, "aMode")) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
index 922c09c1eb..ce393beccb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
@@ -1,5 +1,16 @@
package gtPlusPlus.xmod.gregtech.common.items.behaviours;
+import java.util.List;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
import codechicken.lib.math.MathHelper;
import gregtech.api.GregTech_API;
import gregtech.api.items.GT_MetaBase_Item;
@@ -15,24 +26,15 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
import ic2.api.item.IElectricItemManager;
-import java.util.List;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.monster.EntityCreeper;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
public class Behaviour_Electric_Lighter extends Behaviour_None {
- private final String mTooltip =
- GT_LanguageManager.addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire");
- private final String mTooltipUses =
- GT_LanguageManager.addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:");
- private final String mTooltipUnstackable =
- GT_LanguageManager.addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!");
+ private final String mTooltip = GT_LanguageManager
+ .addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire");
+ private final String mTooltipUses = GT_LanguageManager
+ .addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:");
+ private final String mTooltipUnstackable = GT_LanguageManager
+ .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!");
public Behaviour_Electric_Lighter() {}
@@ -59,18 +61,8 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
}
}
- public boolean onItemUse(
- GT_MetaBase_Item aItem,
- ItemStack aStack,
- EntityPlayer aPlayer,
- World aWorld,
- int aX,
- int aY,
- int aZ,
- int aSide,
- float hitX,
- float hitY,
- float hitZ) {
+ public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+ int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) {
if (aPlayer.isSneaking()) {
Logger.INFO("Changing Mode");
@@ -88,7 +80,10 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
if (aCurrentMode) {
// Shoot Lightning Attack
aWorld.playSoundAtEntity(
- aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F));
+ aPlayer,
+ "random.bow",
+ 0.5F,
+ 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F));
if (!aWorld.isRemote) {
aWorld.spawnEntityInWorld(new EntityLightningAttack(aWorld, aPlayer, hitX, hitY, hitZ));
}
@@ -105,7 +100,13 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
Logger.WARNING("Preparing Lighter c");
GT_Utility.sendSoundToPlayers(
- aWorld, (String) GregTech_API.sSoundList.get(6), 1.0F, 1.0F, aX, aY, aZ);
+ aWorld,
+ (String) GregTech_API.sSoundList.get(6),
+ 1.0F,
+ 1.0F,
+ aX,
+ aY,
+ aZ);
aWorld.setBlock(aX, aY, aZ, Blocks.fire);
rOutput = true;
// ItemNBT.setLighterFuel(aStack, tFuelAmount);
@@ -119,18 +120,8 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
return false;
}
- public boolean onItemUseFirst(
- GT_MetaBase_Item aItem,
- ItemStack aStack,
- EntityPlayer aPlayer,
- World aWorld,
- int aX,
- int aY,
- int aZ,
- int aSide,
- float hitX,
- float hitY,
- float hitZ) {
+ public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+ int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) {
if (aPlayer.isSneaking()) {
Logger.INFO("Changing Mode");
@@ -148,7 +139,10 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
if (aCurrentMode) {
// Shoot Lightning Attack
aWorld.playSoundAtEntity(
- aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F));
+ aPlayer,
+ "random.bow",
+ 0.5F,
+ 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F));
if (!aWorld.isRemote) {
aWorld.spawnEntityInWorld(new EntityLightningAttack(aWorld, aPlayer, hitX, hitY, hitZ));
}
@@ -165,7 +159,13 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
Logger.WARNING("Preparing Lighter c");
GT_Utility.sendSoundToPlayers(
- aWorld, (String) GregTech_API.sSoundList.get(6), 1.0F, 1.0F, aX, aY, aZ);
+ aWorld,
+ (String) GregTech_API.sSoundList.get(6),
+ 1.0F,
+ 1.0F,
+ aX,
+ aY,
+ aZ);
aWorld.setBlock(aX, aY, aZ, Blocks.fire);
rOutput = true;
// ItemNBT.setLighterFuel(aStack, tFuelAmount);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java
index a2106fe679..cb892da129 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java
@@ -1,9 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.items.behaviours;
-import gregtech.api.enums.SubTag;
-import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.items.GT_MetaBase_Item;
import java.util.List;
+
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -12,6 +10,10 @@ import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import gregtech.api.enums.SubTag;
+import gregtech.api.interfaces.IItemBehaviour;
+import gregtech.api.items.GT_MetaBase_Item;
+
public class Behaviour_Grinder implements IItemBehaviour<GT_MetaBase_Item> {
@Override
@@ -21,35 +23,15 @@ public class Behaviour_Grinder implements IItemBehaviour<GT_MetaBase_Item> {
}
@Override
- public boolean onItemUse(
- GT_MetaBase_Item var1,
- ItemStack var2,
- EntityPlayer var3,
- World var4,
- int var5,
- int var6,
- int var7,
- int var8,
- float var9,
- float var10,
- float var11) {
+ public boolean onItemUse(GT_MetaBase_Item var1, ItemStack var2, EntityPlayer var3, World var4, int var5, int var6,
+ int var7, int var8, float var9, float var10, float var11) {
// TODO Auto-generated method stub
return false;
}
@Override
- public boolean onItemUseFirst(
- GT_MetaBase_Item var1,
- ItemStack var2,
- EntityPlayer var3,
- World var4,
- int var5,
- int var6,
- int var7,
- int var8,
- float var9,
- float var10,
- float var11) {
+ public boolean onItemUseFirst(GT_MetaBase_Item var1, ItemStack var2, EntityPlayer var3, World var4, int var5,
+ int var6, int var7, int var8, float var9, float var10, float var11) {
// TODO Auto-generated method stub
return false;
}
@@ -97,15 +79,15 @@ public class Behaviour_Grinder implements IItemBehaviour<GT_MetaBase_Item> {
}
@Override
- public EntityArrow getProjectile(
- GT_MetaBase_Item var1, SubTag var2, ItemStack var3, World var4, double var5, double var7, double var9) {
+ public EntityArrow getProjectile(GT_MetaBase_Item var1, SubTag var2, ItemStack var3, World var4, double var5,
+ double var7, double var9) {
// TODO Auto-generated method stub
return null;
}
@Override
- public EntityArrow getProjectile(
- GT_MetaBase_Item var1, SubTag var2, ItemStack var3, World var4, EntityLivingBase var5, float var6) {
+ public EntityArrow getProjectile(GT_MetaBase_Item var1, SubTag var2, ItemStack var3, World var4,
+ EntityLivingBase var5, float var6) {
// TODO Auto-generated method stub
return null;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
index 514e1070ac..307cde3233 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
@@ -1,5 +1,16 @@
package gtPlusPlus.xmod.gregtech.common.items.behaviours;
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.IFluidBlock;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.items.GT_MetaBase_Item;
@@ -11,17 +22,9 @@ import gregtech.api.util.GT_Utility;
import gregtech.common.blocks.GT_Block_Ores;
import gregtech.common.blocks.GT_TileEntity_Ores;
import gregtech.common.items.behaviors.Behaviour_Prospecting;
-import java.util.Random;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.IFluidBlock;
public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
+
private final int mVanillaCosts;
private final int mEUCosts;
@@ -32,18 +35,9 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
}
@Override
- public boolean onItemUseFirst(
- final GT_MetaBase_Item aItem,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final World aWorld,
- final int aX,
- final int aY,
- final int aZ,
- final int aSide,
- final float hitX,
- final float hitY,
- final float hitZ) {
+ public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
+ final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX,
+ final float hitY, final float hitZ) {
if (aWorld.isRemote) {
return false;
}
@@ -56,9 +50,16 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta));
if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
GT_Utility.sendChatToPlayer(
- aPlayer, "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
+ aPlayer,
+ "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(1)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
return true;
}
if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone))
@@ -69,15 +70,20 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
|| (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.grass))) {
if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
GT_Utility.sendSoundToPlayers(
- aWorld, GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ);
+ aWorld,
+ GregTech_API.sSoundList.get(Integer.valueOf(1)),
+ 1.0F,
+ -1.0F,
+ aX,
+ aY,
+ aZ);
int tX = aX;
int tY = aY;
int tZ = aZ;
int tMetaID = 0;
final int tQuality = ((aItem instanceof GT_MetaGenerated_Tool)
- ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "")
- : 0)
- * 3;
+ ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "")
+ : 0) * 3;
int i = 0;
for (final int j = 6 + tQuality; i < j; i++) {
@@ -90,8 +96,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Block.");
break;
}
- if ((tBlock == Blocks.water)
- || (tBlock == Blocks.flowing_water)
+ if ((tBlock == Blocks.water) || (tBlock == Blocks.flowing_water)
|| ((tBlock instanceof IFluidBlock))) {
GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Block.");
break;
@@ -118,19 +123,19 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
if ((tBlock instanceof GT_Block_Ores)) {
final TileEntity tTileEntity = aWorld.getTileEntity(tX, tY, tZ);
if ((tTileEntity instanceof GT_TileEntity_Ores)) {
- final Materials tMaterial = GregTech_API.sGeneratedMaterials[
- (((GT_TileEntity_Ores) tTileEntity).mMetaData % 1000)];
+ final Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData
+ % 1000)];
if ((tMaterial != null) && (tMaterial != Materials._NULL)) {
GT_Utility.sendChatToPlayer(
- aPlayer, "Found traces of " + tMaterial.mDefaultLocalName + " Ore.");
+ aPlayer,
+ "Found traces of " + tMaterial.mDefaultLocalName + " Ore.");
return true;
}
}
} else {
tMetaID = aWorld.getBlockMetadata(tX, tY, tZ);
tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
- if ((tAssotiation != null)
- && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
+ if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
GT_Utility.sendChatToPlayer(
aPlayer,
"Found traces of " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
index b1f2309b69..e34ca2b77f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
@@ -1,14 +1,15 @@
package gtPlusPlus.xmod.gregtech.common.items.covers;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
public class MetaItemCoverCasings extends MetaCustomCoverItem {
@@ -40,8 +41,8 @@ public class MetaItemCoverCasings extends MetaCustomCoverItem {
@Override
public String getItemStackDisplayName(final ItemStack tItem) {
return EnumChatFormatting.LIGHT_PURPLE
- + GT_Values.VOLTAGE_NAMES[
- MathUtils.balance(tItem.getItemDamage(), 0, GT_Values.VOLTAGE_NAMES.length - 1)]
+ + GT_Values.VOLTAGE_NAMES[MathUtils
+ .balance(tItem.getItemDamage(), 0, GT_Values.VOLTAGE_NAMES.length - 1)]
+ " Machine Plate Cover"; // super.getItemStackDisplayName(tItem);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
index 384e264dcb..b8eb41274a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
@@ -1,21 +1,11 @@
package gtPlusPlus.xmod.gregtech.common.render;
-import com.mojang.authlib.GameProfile;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.proxy.ClientProxy;
-import gtPlusPlus.core.util.data.AES;
-import gtPlusPlus.core.util.data.FileUtils;
-import gtPlusPlus.core.util.math.MathUtils;
import java.io.*;
import java.net.URL;
import java.util.Date;
import java.util.List;
import java.util.UUID;
+
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.entity.RenderManager;
@@ -25,18 +15,30 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderPlayerEvent;
+
import org.apache.commons.io.IOUtils;
import org.lwjgl.opengl.GL11;
+import com.mojang.authlib.GameProfile;
+
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE.ConfigSwitches;
+import gtPlusPlus.core.proxy.ClientProxy;
+import gtPlusPlus.core.util.data.AES;
+import gtPlusPlus.core.util.data.FileUtils;
+import gtPlusPlus.core.util.math.MathUtils;
+
public class GTPP_CapeRenderer extends RenderPlayer {
- private static final ResourceLocation[] mCapes = {
- new ResourceLocation("miscutils:textures/OrangeHD.png"),
- new ResourceLocation("miscutils:textures/FancyCapeHD.png"),
- new ResourceLocation("miscutils:textures/TesterCapeHD.png"),
- new ResourceLocation("miscutils:textures/PatreonCapeHD.png"),
- new ResourceLocation("miscutils:textures/DevCapeHD.png"),
- };
+ private static final ResourceLocation[] mCapes = { new ResourceLocation("miscutils:textures/OrangeHD.png"),
+ new ResourceLocation("miscutils:textures/FancyCapeHD.png"),
+ new ResourceLocation("miscutils:textures/TesterCapeHD.png"),
+ new ResourceLocation("miscutils:textures/PatreonCapeHD.png"),
+ new ResourceLocation("miscutils:textures/DevCapeHD.png"), };
private final boolean mInit;
@@ -93,8 +95,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
if (!hasResourceChecked) {
// Get players UUID
- String aPlayerUUID =
- aPlayer != null ? aPlayer.getGameProfile().getId().toString() : "BAD";
+ String aPlayerUUID = aPlayer != null ? aPlayer.getGameProfile().getId().toString() : "BAD";
// If for whatever reason this fails, we just exit early.
if (aPlayerUUID.equals("BAD")) {
@@ -173,10 +174,8 @@ public class GTPP_CapeRenderer extends RenderPlayer {
}
// If player is invisible, don't render.
- if (GT_Utility.getFullInvisibility(aPlayer)
- || aPlayer.isInvisible()
- || GT_Utility.getPotion(
- aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) {
+ if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible()
+ || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) {
aEvent.setCanceled(true);
return false;
}
@@ -185,14 +184,11 @@ public class GTPP_CapeRenderer extends RenderPlayer {
bindTexture(tResource);
GL11.glPushMatrix();
GL11.glTranslatef(0.0F, 0.0F, 0.125F);
- double d0 = aPlayer.field_71091_bM
- + (aPlayer.field_71094_bP - aPlayer.field_71091_bM) * aPartialTicks
+ double d0 = aPlayer.field_71091_bM + (aPlayer.field_71094_bP - aPlayer.field_71091_bM) * aPartialTicks
- (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX) * aPartialTicks);
- double d1 = aPlayer.field_71096_bN
- + (aPlayer.field_71095_bQ - aPlayer.field_71096_bN) * aPartialTicks
+ double d1 = aPlayer.field_71096_bN + (aPlayer.field_71095_bQ - aPlayer.field_71096_bN) * aPartialTicks
- (aPlayer.prevPosY + (aPlayer.posY - aPlayer.prevPosY) * aPartialTicks);
- double d2 = aPlayer.field_71097_bO
- + (aPlayer.field_71085_bR - aPlayer.field_71097_bO) * aPartialTicks
+ double d2 = aPlayer.field_71097_bO + (aPlayer.field_71085_bR - aPlayer.field_71097_bO) * aPartialTicks
- (aPlayer.prevPosZ + (aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks);
float f6 = aPlayer.prevRenderYawOffset
+ (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks;
@@ -211,9 +207,9 @@ public class GTPP_CapeRenderer extends RenderPlayer {
f8 = 0.0F;
}
float f10 = aPlayer.prevCameraYaw + (aPlayer.cameraYaw - aPlayer.prevCameraYaw) * aPartialTicks;
- f7 += MathHelper.sin((aPlayer.prevDistanceWalkedModified
- + (aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified)
- * aPartialTicks)
+ f7 += MathHelper.sin(
+ (aPlayer.prevDistanceWalkedModified
+ + (aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified) * aPartialTicks)
* 6.0F)
* 32.0F
* f10;
@@ -238,6 +234,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
@Deprecated
/**
* Should be able to get the username from a UUID
+ *
* @param name - Players Name
* @param uuid - Players known UUID
* @return - The newest Player name
@@ -250,8 +247,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
UUID g = UUID.fromString(uuid);
if (g != null) {
Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + ".");
- GameProfile profile =
- MinecraftServer.getServer().func_152358_ax().func_152652_a(g);
+ GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152652_a(g);
if (profile != null) {
Logger.WARNING("[Capes++] Found for UUID check: " + profile.getName() + ".");
return profile.getName();
@@ -260,8 +256,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
g = UUID.fromString(uuid.replace("-", ""));
if (g != null) {
Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + ".");
- GameProfile profile =
- MinecraftServer.getServer().func_152358_ax().func_152652_a(g);
+ GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152652_a(g);
if (profile != null) {
Logger.WARNING("[Capes++] Found for UUID check 2: " + profile.getName() + ".");
return profile.getName();
@@ -273,8 +268,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
if (name != null) {
if (name.length() > 0) {
Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + ".");
- GameProfile profile =
- MinecraftServer.getServer().func_152358_ax().func_152655_a(name);
+ GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152655_a(name);
if (profile != null) {
Logger.WARNING("[Capes++] Found for name check: " + profile.getName() + ".");
return profile.getName();
@@ -282,8 +276,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
}
}
Logger.WORLD("[Capes++] Failed UUID check for " + name + ".");
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
return name;
}
@@ -356,8 +349,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
}
private static final boolean isDownloadedCapeListBigger(File aFile) {
- double aExistingFileSize =
- (doesCapeCacheExistLocally() ? getCapeCache().length() : 0);
+ double aExistingFileSize = (doesCapeCacheExistLocally() ? getCapeCache().length() : 0);
double aNewFileSize = aFile.length();
if (aNewFileSize > aExistingFileSize) {
return true;
@@ -405,8 +397,8 @@ public class GTPP_CapeRenderer extends RenderPlayer {
e.printStackTrace();
}
if (tempFile == null) {
- tempFile = FileUtils.createFile(
- "", "gtpp-" + MathUtils.randInt(Short.MAX_VALUE, (Integer.MAX_VALUE / 2)), "tmp");
+ tempFile = FileUtils
+ .createFile("", "gtpp-" + MathUtils.randInt(Short.MAX_VALUE, (Integer.MAX_VALUE / 2)), "tmp");
}
tempFile.deleteOnExit();
return tempFile;
@@ -439,36 +431,50 @@ public class GTPP_CapeRenderer extends RenderPlayer {
int aCapeTypeID = aCapeTypeID2;
Pair<String, String> aFinalString = new Pair<String, String>(
"UUID: " + aSplitData[1],
- "Username: "
- + (aSplitData[2] != null && aSplitData[0].length() > 0
- ? aSplitData[2]
- : "Not Specified"));
+ "Username: " + (aSplitData[2] != null && aSplitData[0].length() > 0
+ ? aSplitData[2]
+ : "Not Specified"));
Logger.INFO("Cape Type: " + aCapeTypeID);
switch (aCapeTypeID) {
case 0:
aCapeType1.add(aFinalString);
- Logger.INFO("Added user to map " + aCapeTypeID + ", map now holds "
- + aCapeType1.size() + " users.");
+ Logger.INFO(
+ "Added user to map " + aCapeTypeID
+ + ", map now holds "
+ + aCapeType1.size()
+ + " users.");
break;
case 1:
aCapeType2.add(aFinalString);
- Logger.INFO("Added user to map " + aCapeTypeID + ", map now holds "
- + aCapeType2.size() + " users.");
+ Logger.INFO(
+ "Added user to map " + aCapeTypeID
+ + ", map now holds "
+ + aCapeType2.size()
+ + " users.");
break;
case 2:
aCapeType3.add(aFinalString);
- Logger.INFO("Added user to map " + aCapeTypeID + ", map now holds "
- + aCapeType3.size() + " users.");
+ Logger.INFO(
+ "Added user to map " + aCapeTypeID
+ + ", map now holds "
+ + aCapeType3.size()
+ + " users.");
break;
case 3:
aCapeType4.add(aFinalString);
- Logger.INFO("Added user to map " + aCapeTypeID + ", map now holds "
- + aCapeType4.size() + " users.");
+ Logger.INFO(
+ "Added user to map " + aCapeTypeID
+ + ", map now holds "
+ + aCapeType4.size()
+ + " users.");
break;
case 4:
aCapeType5.add(aFinalString);
- Logger.INFO("Added user to map " + aCapeTypeID + ", map now holds "
- + aCapeType5.size() + " users.");
+ Logger.INFO(
+ "Added user to map " + aCapeTypeID
+ + ", map now holds "
+ + aCapeType5.size()
+ + " users.");
break;
default:
break;
@@ -477,8 +483,7 @@ public class GTPP_CapeRenderer extends RenderPlayer {
}
}
}
- if (!aCapeType1.isEmpty()
- || !aCapeType2.isEmpty()
+ if (!aCapeType1.isEmpty() || !aCapeType2.isEmpty()
|| !aCapeType3.isEmpty()
|| !aCapeType4.isEmpty()
|| !aCapeType5.isEmpty()) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java
index 1d4e367c4f..6267609aba 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java
@@ -1,9 +1,5 @@
package gtPlusPlus.xmod.gregtech.common.render;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.common.items.GT_VolumetricFlask;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import ic2.core.util.DrawUtil;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
@@ -13,8 +9,14 @@ import net.minecraft.util.IIcon;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.fluids.FluidStack;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.common.items.GT_VolumetricFlask;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import ic2.core.util.DrawUtil;
+
@SideOnly(cpw.mods.fml.relauncher.Side.CLIENT)
public final class GTPP_FlaskRenderer implements net.minecraftforge.client.IItemRenderer {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java
index 1a5117ac2e..5d7209b203 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.render;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.client.registry.RenderingRegistry;
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.ITexture;
@@ -11,12 +19,6 @@ import gregtech.common.blocks.GT_Block_Machines;
import gregtech.common.render.GT_Renderer_Block;
import gtPlusPlus.xmod.gregtech.common.blocks.GTPP_Block_Machines;
import gtPlusPlus.xmod.gregtech.common.helpers.GT_MethodHelper;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-import org.lwjgl.opengl.GL11;
public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
@@ -28,8 +30,8 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
RenderingRegistry.registerBlockHandler(this);
}
- private static ITexture[] getTexture(
- IMetaTileEntity arg0, int arg1, int arg2, int arg3, boolean arg4, boolean arg5) {
+ private static ITexture[] getTexture(IMetaTileEntity arg0, int arg1, int arg2, int arg3, boolean arg4,
+ boolean arg5) {
IGregTechTileEntity arg0b = arg0.getBaseMetaTileEntity();
return arg0.getTexture(arg0b, (byte) arg1, (byte) arg2, (byte) arg3, arg4, arg5);
}
@@ -43,8 +45,8 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
if (tMetaTileEntity.getBaseMetaTileEntity() instanceof IPipeRenderedTileEntity) {
- float tThickness =
- ((IPipeRenderedTileEntity) tMetaTileEntity.getBaseMetaTileEntity()).getThickNess();
+ float tThickness = ((IPipeRenderedTileEntity) tMetaTileEntity.getBaseMetaTileEntity())
+ .getThickNess();
float sp = (1.0F - tThickness) / 2.0F;
aBlock.setBlockBounds(0.0F, sp, sp, 1.0F, sp + tThickness, sp + tThickness);
aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -202,24 +204,29 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
}
}
- public static boolean renderStandardBlock(
- IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, RenderBlocks aRenderer) {
+ public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
+ RenderBlocks aRenderer) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
return tTileEntity instanceof ITexturedTileEntity
- ? renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer, new ITexture[][] {
- GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 0),
- GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 1),
- GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 2),
- GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 3),
- GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 4),
- GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 5)
- })
+ ? renderStandardBlock(
+ aWorld,
+ aX,
+ aY,
+ aZ,
+ aBlock,
+ aRenderer,
+ new ITexture[][] { GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 0),
+ GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 1),
+ GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 2),
+ GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 3),
+ GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 4),
+ GT_MethodHelper.getTexture(tTileEntity, aBlock, (byte) 5) })
: false;
}
- public static boolean renderStandardBlock(
- IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, RenderBlocks aRenderer, ITexture[][] aTextures) {
+ public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
+ RenderBlocks aRenderer, ITexture[][] aTextures) {
aBlock.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
aRenderer.setRenderBoundsFromBlock(aBlock);
renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, aTextures[0], true);
@@ -231,14 +238,8 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
return true;
}
- public static boolean renderPipeBlock(
- IBlockAccess aWorld,
- int aX,
- int aY,
- int aZ,
- Block aBlock,
- IPipeRenderedTileEntity aTileEntity,
- RenderBlocks aRenderer) {
+ public static boolean renderPipeBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
+ IPipeRenderedTileEntity aTileEntity, RenderBlocks aRenderer) {
byte aConnections = aTileEntity.getConnections();
if ((aConnections & 192) != 0) {
return renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer);
@@ -564,22 +565,15 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
}
}
- public static void renderNegativeYFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderNegativeYFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if (aFullBlock && !aBlock.shouldSideBeRendered(aWorld, aX, aY - 1, aZ, 0)) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ));
}
if (aIcon != null) {
@@ -593,22 +587,15 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
aRenderer.flipTexture = false;
}
- public static void renderPositiveYFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderPositiveYFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if (aFullBlock && !aBlock.shouldSideBeRendered(aWorld, aX, aY + 1, aZ, 1)) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ));
}
if (aIcon != null) {
@@ -622,22 +609,15 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
aRenderer.flipTexture = false;
}
- public static void renderNegativeZFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderNegativeZFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if (aFullBlock && !aBlock.shouldSideBeRendered(aWorld, aX, aY, aZ - 1, 2)) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ));
}
aRenderer.flipTexture = !aFullBlock;
@@ -652,22 +632,15 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
aRenderer.flipTexture = false;
}
- public static void renderPositiveZFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderPositiveZFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if (aFullBlock && !aBlock.shouldSideBeRendered(aWorld, aX, aY, aZ + 1, 3)) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ));
}
if (aIcon != null) {
@@ -681,22 +654,15 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
aRenderer.flipTexture = false;
}
- public static void renderNegativeXFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderNegativeXFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if (aFullBlock && !aBlock.shouldSideBeRendered(aWorld, aX - 1, aY, aZ, 4)) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ));
}
if (aIcon != null) {
@@ -710,22 +676,15 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
aRenderer.flipTexture = false;
}
- public static void renderPositiveXFacing(
- IBlockAccess aWorld,
- RenderBlocks aRenderer,
- Block aBlock,
- int aX,
- int aY,
- int aZ,
- ITexture[] aIcon,
- boolean aFullBlock) {
+ public static void renderPositiveXFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY,
+ int aZ, ITexture[] aIcon, boolean aFullBlock) {
if (aWorld != null) {
if (aFullBlock && !aBlock.shouldSideBeRendered(aWorld, aX + 1, aY, aZ, 5)) {
return;
}
- Tessellator.instance.setBrightness(
- aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ));
+ Tessellator.instance
+ .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ));
}
aRenderer.flipTexture = !aFullBlock;
@@ -743,8 +702,7 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
public void renderInventoryBlock(Block aBlock, int aMeta, int aModelID, RenderBlocks aRenderer) {
aMeta += 30400;
if (aBlock instanceof GT_Block_Machines || aBlock instanceof GTPP_Block_Machines) {
- if (aMeta > 0
- && aMeta < GregTech_API.METATILEENTITIES.length
+ if (aMeta > 0 && aMeta < GregTech_API.METATILEENTITIES.length
&& GregTech_API.METATILEENTITIES[aMeta] != null
&& !GregTech_API.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer)) {
renderNormalInventoryMetaTileEntity(aBlock, aMeta, aRenderer);
@@ -755,21 +713,25 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block {
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
- public boolean renderWorldBlock(
- IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) {
+ public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID,
+ RenderBlocks aRenderer) {
TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
- return aTileEntity == null
- ? false
+ return aTileEntity == null ? false
: (aTileEntity instanceof IGregTechTileEntity
- && ((IGregTechTileEntity) aTileEntity).getMetaTileEntity() != null
- && ((IGregTechTileEntity) aTileEntity)
- .getMetaTileEntity()
- .renderInWorld(aWorld, aX, aY, aZ, aBlock, aRenderer)
- ? true
- : (aTileEntity instanceof IPipeRenderedTileEntity
- ? renderPipeBlock(
- aWorld, aX, aY, aZ, aBlock, (IPipeRenderedTileEntity) aTileEntity, aRenderer)
- : renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer)));
+ && ((IGregTechTileEntity) aTileEntity).getMetaTileEntity() != null
+ && ((IGregTechTileEntity) aTileEntity).getMetaTileEntity()
+ .renderInWorld(aWorld, aX, aY, aZ, aBlock, aRenderer)
+ ? true
+ : (aTileEntity instanceof IPipeRenderedTileEntity
+ ? renderPipeBlock(
+ aWorld,
+ aX,
+ aY,
+ aZ,
+ aBlock,
+ (IPipeRenderedTileEntity) aTileEntity,
+ aRenderer)
+ : renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer)));
}
public boolean shouldRender3DInInventory(int aModel) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
index bf56872d52..f02bf0193e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
@@ -1,11 +1,19 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.automation;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.oredict.OreDictionary;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget;
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.SlotGroup;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.Textures;
@@ -25,11 +33,6 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.oredict.OreDictionary;
public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_BasicTank implements IAddGregtechLogo {
@@ -51,8 +54,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")";
}
- public GT_MetaTileEntity_ElectricAutoWorkbench(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_ElectricAutoWorkbench(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 30, aDescription, aTextures);
}
@@ -193,8 +196,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
@Override
public boolean allowCoverOnSide(byte aSide, GT_ItemStack aStack) {
- return aSide != getBaseMetaTileEntity().getFrontFacing()
- && aSide != getBaseMetaTileEntity().getBackFacing();
+ return aSide != getBaseMetaTileEntity().getFrontFacing() && aSide != getBaseMetaTileEntity().getBackFacing();
}
private void switchMode() {
@@ -204,15 +206,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
@Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
super.onPostTick(aBaseMetaTileEntity, aTick);
- if (getBaseMetaTileEntity().isAllowedToWork()
- && getBaseMetaTileEntity().isServerSide()
+ if (getBaseMetaTileEntity().isAllowedToWork() && getBaseMetaTileEntity().isServerSide()
&& getBaseMetaTileEntity().getUniversalEnergyStored() >= (mMode == 5 || mMode == 6 ? 128 : 2048)
&& (getBaseMetaTileEntity().hasWorkJustBeenEnabled() || --mTicksUntilNextUpdate < 1)) {
mTicksUntilNextUpdate = 32;
for (byte i = 19; i < 28; i++) {
- if (mInventory[i] != null
- && mInventory[i].isItemStackDamageable()
+ if (mInventory[i] != null && mInventory[i].isItemStackDamageable()
&& mInventory[i].getItem().hasContainerItem()) {
mInventory[i].setItemDamage(OreDictionary.WILDCARD_VALUE);
}
@@ -223,12 +223,10 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
ItemStack tOutput = GT_Utility.fillFluidContainer(mFluid, mInventory[i], false, true);
if (tOutput != null) {
for (byte j = 0; j < 9; j++) {
- if (mInventory[j] == null
- || (GT_Utility.areStacksEqual(tOutput, mInventory[j])
- && mInventory[j].stackSize + tOutput.stackSize
- <= tOutput.getMaxStackSize())) {
- mFluid.amount -=
- GT_Utility.getFluidForFilledItem(tOutput, true).amount * tOutput.stackSize;
+ if (mInventory[j] == null || (GT_Utility.areStacksEqual(tOutput, mInventory[j])
+ && mInventory[j].stackSize + tOutput.stackSize <= tOutput.getMaxStackSize())) {
+ mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount
+ * tOutput.stackSize;
getBaseMetaTileEntity().decrStackSize(i, 1);
if (mInventory[j] == null) {
mInventory[j] = tOutput;
@@ -287,25 +285,19 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
tTempStack.stackSize = 1;
tRecipe[0] = tTempStack;
- if (GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe)
- == null) {
+ if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
tRecipe[1] = tTempStack;
tRecipe[3] = tTempStack;
tRecipe[4] = tTempStack;
} else break;
- if (GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe)
- == null) {
+ if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
tRecipe[2] = tTempStack;
tRecipe[5] = tTempStack;
tRecipe[6] = tTempStack;
tRecipe[7] = tTempStack;
tRecipe[8] = tTempStack;
} else break;
- if (GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe)
- == null) {
+ if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
if (mInventory[18] == null) {
mInventory[18] = mInventory[mCurrentSlot];
mInventory[mCurrentSlot] = null;
@@ -326,9 +318,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
tTempStack.stackSize = 1;
tRecipe[0] = tTempStack;
- if (GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe)
- == null) {
+ if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
if (mInventory[18] == null) {
mInventory[18] = mInventory[mCurrentSlot];
mInventory[mCurrentSlot] = null;
@@ -352,9 +342,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
tRecipe[1] = tTempStack;
tRecipe[3] = tTempStack;
tRecipe[4] = tTempStack;
- if (GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe)
- == null) {
+ if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
if (mInventory[18] == null) {
mInventory[18] = mInventory[mCurrentSlot];
mInventory[mCurrentSlot] = null;
@@ -383,9 +371,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
tRecipe[6] = tTempStack;
tRecipe[7] = tTempStack;
tRecipe[8] = tTempStack;
- if (GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe)
- == null) {
+ if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
if (mInventory[18] == null) {
mInventory[18] = mInventory[mCurrentSlot];
mInventory[mCurrentSlot] = null;
@@ -435,8 +421,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
tRecipe[1] = tTempStack;
tRecipe[3] = tTempStack;
tRecipe[4] = tTempStack;
- if (GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe)
+ if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
== null) {
if (mInventory[18] == null) {
mInventory[18] = mInventory[mCurrentSlot];
@@ -457,8 +442,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
tRecipe[6] = tTempStack;
tRecipe[7] = tTempStack;
tRecipe[8] = tTempStack;
- if (GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe)
+ if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
== null) {
if (mInventory[18] == null) {
mInventory[18] = mInventory[mCurrentSlot];
@@ -497,9 +481,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
tRecipe[6] = tTempStack;
tRecipe[7] = tTempStack;
tRecipe[8] = tTempStack;
- if (GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe)
- == null) {
+ if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) {
if (mInventory[18] == null) {
mInventory[18] = mInventory[mCurrentSlot];
mInventory[mCurrentSlot] = null;
@@ -522,14 +504,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]);
tTempStack.stackSize = 1;
for (int i = mCurrentSlot + 1; i < 18; i++) {
- if (mInventory[i] != null
- && mInventory[i].getItem() == tTempStack.getItem()
+ if (mInventory[i] != null && mInventory[i].getItem() == tTempStack.getItem()
&& mInventory[mCurrentSlot].getItemDamage() + mInventory[i].getItemDamage()
> tTempStack.getMaxDamage()) {
tRecipe[0] = tTempStack;
tRecipe[1] = GT_Utility.copy(mInventory[i]);
- if (GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe)
+ if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
== null) {
if (mInventory[18] == null) {
mInventory[18] = mInventory[mCurrentSlot];
@@ -550,16 +530,10 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
}
break;
}
- for (byte i = 0, j = 0;
- i < 18
- && j < 9
- && (j < 2
- || GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity()
- .getWorld(),
- tRecipe)
- == null);
- i++) {
+ for (byte i = 0, j = 0; i < 18 && j < 9
+ && (j < 2 || GT_ModHandler
+ .getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe)
+ == null); i++) {
tRecipe[j] = mInventory[(mCurrentSlot + i) % 18];
if (tRecipe[j] != null) {
tRecipe[j] = GT_Utility.copy(tRecipe[j]);
@@ -573,8 +547,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
}
if (tOutput == null)
- tOutput = GT_ModHandler.getAllRecipeOutput(
- getBaseMetaTileEntity().getWorld(), tRecipe);
+ tOutput = GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe);
if (tOutput != null || mMode == 0) mInventory[28] = tOutput;
@@ -621,9 +594,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
} else if (GT_Utility.areStacksEqual(mInventory[k], tStack)
&& mInventory[k].stackSize + tStack.stackSize
<= tStack.getMaxStackSize()) {
- mInventory[k].stackSize += tStack.stackSize;
- break;
- }
+ mInventory[k].stackSize += tStack.stackSize;
+ break;
+ }
}
}
} else {
@@ -636,9 +609,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
}
mInventory[18] = GT_Utility.copy(tOutput);
- getBaseMetaTileEntity()
- .decreaseStoredEnergyUnits(
- mMode == 5 || mMode == 6 || mMode == 7 ? 128 : 2048, true);
+ getBaseMetaTileEntity().decreaseStoredEnergyUnits(
+ mMode == 5 || mMode == 6 || mMode == 7 ? 128 : 2048,
+ true);
mTicksUntilNextUpdate = 1;
} else {
mLastCraftSuccessful = false;
@@ -652,7 +625,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
if (mInventory[18] == null && mThroughPut < 2) {
for (byte i = 0; i < 8; i++) {
- for (byte j = i; ++j < 9; ) {
+ for (byte j = i; ++j < 9;) {
if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j])
&& mInventory[i].getMaxStackSize() > 8) {
mInventory[18] = mInventory[j];
@@ -670,19 +643,17 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
getBaseMetaTileEntity()
.decreaseStoredEnergyUnits(
GT_Utility.moveOneItemStack(
- getBaseMetaTileEntity(),
- getBaseMetaTileEntity()
- .getIInventoryAtSide(getBaseMetaTileEntity()
- .getBackFacing()),
- getBaseMetaTileEntity().getBackFacing(),
- getBaseMetaTileEntity().getFrontFacing(),
- null,
- false,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1)
- * 10,
+ getBaseMetaTileEntity(),
+ getBaseMetaTileEntity()
+ .getIInventoryAtSide(getBaseMetaTileEntity().getBackFacing()),
+ getBaseMetaTileEntity().getBackFacing(),
+ getBaseMetaTileEntity().getFrontFacing(),
+ null,
+ false,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1) * 10,
true);
}
}
@@ -746,14 +717,10 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
return mMode == 0 ? aIndex < 9 : aIndex < 18;
}
- /*@Override
- public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
- if (aSide == aFacing)
- return 112;
- if (GT_Utility.getOppositeSide(aSide) == aFacing)
- return 113;
- return 114;
- }*/
+ /*
+ * @Override public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { if (aSide ==
+ * aFacing) return 112; if (GT_Utility.getOppositeSide(aSide) == aFacing) return 113; return 114; }
+ */
@Override
public int getCapacity() {
@@ -767,11 +734,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
@Override
public String[] getDescription() {
- return new String[] {
- "Automatic Crafting Table Mk III",
- // this.mDescription,
- CORE.GT_Tooltip
- };
+ return new String[] { "Automatic Crafting Table Mk III",
+ // this.mDescription,
+ CORE.GT_Tooltip };
}
@Override
@@ -793,13 +758,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == aFacing) {
return this.mTextures[0][aColorIndex + 1];
} else if (GT_Utility.getOppositeSide(aSide) == aFacing) {
@@ -807,41 +767,34 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
} else {
return this.mTextures[4][aColorIndex + 1];
}
- /*return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1];*/
+ /*
+ * return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide ==
+ * GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1];
+ */
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
}
@Override
@@ -851,78 +804,50 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
@Override
public void addGregTechLogo(ModularWindow.Builder builder) {
- builder.widget(new DrawableWidget()
- .setDrawable(getGUITextureSet().getGregTechLogo())
- .setSize(17, 17)
- .setPos(118, 22));
+ builder.widget(
+ new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(118, 22));
}
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 3)
- .endAtSlot(8)
- .build()
- .setPos(7, 4))
- .widget(SlotGroup.ofItemHandler(inventoryHandler, 9)
- .startFromSlot(9)
- .endAtSlot(17)
- .canInsert(false)
- .background(GT_UITextures.SLOT_DARK_GRAY)
- .applyForWidget(SlotWidget::disableShiftInsert)
- .build()
- .setPos(7, 59))
- .widget(new SlotWidget(inventoryHandler, 18)
- .setAccess(true, false)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
- .setPos(151, 40))
- .widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3)
- .setPos(62, 4)
- .setSize(54, 54))
- .widget(SlotGroup.ofItemHandler(inventoryHandler, 3)
- .startFromSlot(19)
- .endAtSlot(27)
- .phantom(true)
- .background(GT_UITextures.TRANSPARENT)
- .build()
- .setPos(62, 4))
- .widget(SlotWidget.phantom(inventoryHandler, 28)
- .disableInteraction()
- .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ARROW_4)
- .setPos(151, 4));
- builder.widget(new CycleButtonWidget()
- .setGetter(() -> mThroughPut)
- .setSetter(val -> mThroughPut = val)
- .setLength(MAX_THROUGHPUT)
- .setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_THROUGHPUT[i])
- .setBackground(GT_UITextures.BUTTON_STANDARD)
- .setPos(120, 4)
- .setSize(18, 18));
- String[] mModeText = new String[] {
- "Normal Crafting Table", "???", "1x1", "2x2", "3x3", "Unifier", "Dust", "???", "Hammer?", "Circle"
- };
- CycleButtonWidget modeButton = new CycleButtonWidget()
- .setGetter(() -> mMode)
- .setSetter(val -> {
- mMode = val;
- switchMode();
- })
- .setLength(MAX_MODES)
- .setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_MODE[i]);
+ builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 3).endAtSlot(8).build().setPos(7, 4))
+ .widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 9).startFromSlot(9).endAtSlot(17).canInsert(false)
+ .background(GT_UITextures.SLOT_DARK_GRAY).applyForWidget(SlotWidget::disableShiftInsert)
+ .build().setPos(7, 59))
+ .widget(
+ new SlotWidget(inventoryHandler, 18).setAccess(true, false)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+ .setPos(151, 40))
+ .widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3).setPos(62, 4)
+ .setSize(54, 54))
+ .widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(19).endAtSlot(27).phantom(true)
+ .background(GT_UITextures.TRANSPARENT).build().setPos(62, 4))
+ .widget(
+ SlotWidget.phantom(inventoryHandler, 28).disableInteraction()
+ .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ARROW_4)
+ .setPos(151, 4));
+ builder.widget(
+ new CycleButtonWidget().setGetter(() -> mThroughPut).setSetter(val -> mThroughPut = val)
+ .setLength(MAX_THROUGHPUT).setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_THROUGHPUT[i])
+ .setBackground(GT_UITextures.BUTTON_STANDARD).setPos(120, 4).setSize(18, 18));
+ String[] mModeText = new String[] { "Normal Crafting Table", "???", "1x1", "2x2", "3x3", "Unifier", "Dust",
+ "???", "Hammer?", "Circle" };
+ CycleButtonWidget modeButton = new CycleButtonWidget().setGetter(() -> mMode).setSetter(val -> {
+ mMode = val;
+ switchMode();
+ }).setLength(MAX_MODES).setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_MODE[i]);
for (int i = 0; i < MAX_MODES; i++) {
modeButton.addTooltip(i, "Mode: " + mModeText[i]);
}
- builder.widget(modeButton
- .setBackground(GT_UITextures.BUTTON_STANDARD)
- .setPos(120, 40)
- .setSize(18, 18));
- builder.widget(new DrawableWidget()
- .setDrawable(GTPP_UITextures.PICTURE_WORKBENCH_CIRCLE)
- .setPos(136, 23)
+ builder.widget(modeButton.setBackground(GT_UITextures.BUTTON_STANDARD).setPos(120, 40).setSize(18, 18));
+ builder.widget(
+ new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_WORKBENCH_CIRCLE).setPos(136, 23)
.setSize(16, 16))
- .widget(new DrawableWidget()
- .setDrawable(GTPP_UITextures.PICTURE_ARROW_WHITE_DOWN)
- .setPos(155, 23)
- .setSize(10, 16));
+ .widget(
+ new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ARROW_WHITE_DOWN).setPos(155, 23)
+ .setSize(10, 16));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java
index 1a15c563ef..b7ff49716b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.automation;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.oredict.OreDictionary;
+
import com.gtnewhorizons.modularui.api.ModularUITextures;
import com.gtnewhorizons.modularui.api.drawable.IDrawable;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
@@ -9,6 +17,7 @@ import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GT_UIInfos;
@@ -25,12 +34,6 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.oredict.OreDictionary;
public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntity_TieredMachineBlock
implements IAddGregtechLogo, IAddUIWidgets {
@@ -50,8 +53,8 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")";
}
- public GT_MetaTileEntity_ElectricInventoryManager(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_ElectricInventoryManager(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 16, aDescription, aTextures);
}
@@ -154,7 +157,10 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GT_MetaTileEntity_ElectricInventoryManager(
- this.mName, this.mTier, this.mDescription, this.mTextures);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures);
}
@Override
@@ -240,25 +246,19 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
@Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
super.onPostTick(aBaseMetaTileEntity, aTick);
- if (getBaseMetaTileEntity().isAllowedToWork()
- && getBaseMetaTileEntity().isServerSide()
+ if (getBaseMetaTileEntity().isAllowedToWork() && getBaseMetaTileEntity().isServerSide()
&& getBaseMetaTileEntity().getUniversalEnergyStored() >= 5000
- && (getBaseMetaTileEntity().hasWorkJustBeenEnabled()
- || getBaseMetaTileEntity().getTimer() % 100 == 0
+ && (getBaseMetaTileEntity().hasWorkJustBeenEnabled() || getBaseMetaTileEntity().getTimer() % 100 == 0
|| mWorkedLastTick
|| getBaseMetaTileEntity().hasInventoryBeenModified())) {
mWorkedLastTick = false;
- IInventory[] tTileEntities = new IInventory[] {
- getBaseMetaTileEntity().getIInventoryAtSide((byte) 0),
- getBaseMetaTileEntity().getIInventoryAtSide((byte) 1),
- getBaseMetaTileEntity().getIInventoryAtSide((byte) 2),
- getBaseMetaTileEntity().getIInventoryAtSide((byte) 3),
- getBaseMetaTileEntity().getIInventoryAtSide((byte) 4),
- getBaseMetaTileEntity().getIInventoryAtSide((byte) 5),
- null,
- null
- };
+ IInventory[] tTileEntities = new IInventory[] { getBaseMetaTileEntity().getIInventoryAtSide((byte) 0),
+ getBaseMetaTileEntity().getIInventoryAtSide((byte) 1),
+ getBaseMetaTileEntity().getIInventoryAtSide((byte) 2),
+ getBaseMetaTileEntity().getIInventoryAtSide((byte) 3),
+ getBaseMetaTileEntity().getIInventoryAtSide((byte) 4),
+ getBaseMetaTileEntity().getIInventoryAtSide((byte) 5), null, null };
int tCost = 0;
@@ -270,176 +270,152 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
tStack = mInventory[3 + i * 3 + 0];
if (tStack == null) {
- if (getSlot1InOut(i))
- tCost += 5
- * GT_Utility.moveOneItemStack(
- getBaseMetaTileEntity(),
- tTileEntities[getRangeDirection(i)],
- getSlot1Direction(i),
- getSlot1Direction(i),
- null,
- false,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- else
- tCost += 5
- * GT_Utility.moveOneItemStack(
- tTileEntities[getRangeDirection(i)],
- getBaseMetaTileEntity(),
- getSlot1Direction(i),
- getSlot1Direction(i),
- null,
- false,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
+ if (getSlot1InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack(
+ getBaseMetaTileEntity(),
+ tTileEntities[getRangeDirection(i)],
+ getSlot1Direction(i),
+ getSlot1Direction(i),
+ null,
+ false,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
+ else tCost += 5 * GT_Utility.moveOneItemStack(
+ tTileEntities[getRangeDirection(i)],
+ getBaseMetaTileEntity(),
+ getSlot1Direction(i),
+ getSlot1Direction(i),
+ null,
+ false,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
} else {
tList.set(0, tStack);
- if (getSlot1InOut(i))
- tCost += 5
- * GT_Utility.moveOneItemStack(
- getBaseMetaTileEntity(),
- tTileEntities[getRangeDirection(i)],
- getSlot1Direction(i),
- getSlot1Direction(i),
- tList,
- false,
- (byte) tStack.stackSize,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- else
- tCost += 5
- * GT_Utility.moveOneItemStack(
- tTileEntities[getRangeDirection(i)],
- getBaseMetaTileEntity(),
- getSlot1Direction(i),
- getSlot1Direction(i),
- tList,
- false,
- (byte) tStack.stackSize,
- (byte) 1,
- (byte) 64,
- (byte) 1);
+ if (getSlot1InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack(
+ getBaseMetaTileEntity(),
+ tTileEntities[getRangeDirection(i)],
+ getSlot1Direction(i),
+ getSlot1Direction(i),
+ tList,
+ false,
+ (byte) tStack.stackSize,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
+ else tCost += 5 * GT_Utility.moveOneItemStack(
+ tTileEntities[getRangeDirection(i)],
+ getBaseMetaTileEntity(),
+ getSlot1Direction(i),
+ getSlot1Direction(i),
+ tList,
+ false,
+ (byte) tStack.stackSize,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
}
tStack = mInventory[3 + i * 3 + 1];
if (tStack == null) {
- if (getSlot2InOut(i))
- tCost += 5
- * GT_Utility.moveOneItemStack(
- getBaseMetaTileEntity(),
- tTileEntities[getRangeDirection(i)],
- getSlot2Direction(i),
- getSlot2Direction(i),
- null,
- false,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- else
- tCost += 5
- * GT_Utility.moveOneItemStack(
- tTileEntities[getRangeDirection(i)],
- getBaseMetaTileEntity(),
- getSlot2Direction(i),
- getSlot2Direction(i),
- null,
- false,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
+ if (getSlot2InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack(
+ getBaseMetaTileEntity(),
+ tTileEntities[getRangeDirection(i)],
+ getSlot2Direction(i),
+ getSlot2Direction(i),
+ null,
+ false,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
+ else tCost += 5 * GT_Utility.moveOneItemStack(
+ tTileEntities[getRangeDirection(i)],
+ getBaseMetaTileEntity(),
+ getSlot2Direction(i),
+ getSlot2Direction(i),
+ null,
+ false,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
} else {
tList.set(0, tStack);
- if (getSlot2InOut(i))
- tCost += 5
- * GT_Utility.moveOneItemStack(
- getBaseMetaTileEntity(),
- tTileEntities[getRangeDirection(i)],
- getSlot2Direction(i),
- getSlot2Direction(i),
- tList,
- false,
- (byte) tStack.stackSize,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- else
- tCost += 5
- * GT_Utility.moveOneItemStack(
- tTileEntities[getRangeDirection(i)],
- getBaseMetaTileEntity(),
- getSlot2Direction(i),
- getSlot2Direction(i),
- tList,
- false,
- (byte) tStack.stackSize,
- (byte) 1,
- (byte) 64,
- (byte) 1);
+ if (getSlot2InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack(
+ getBaseMetaTileEntity(),
+ tTileEntities[getRangeDirection(i)],
+ getSlot2Direction(i),
+ getSlot2Direction(i),
+ tList,
+ false,
+ (byte) tStack.stackSize,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
+ else tCost += 5 * GT_Utility.moveOneItemStack(
+ tTileEntities[getRangeDirection(i)],
+ getBaseMetaTileEntity(),
+ getSlot2Direction(i),
+ getSlot2Direction(i),
+ tList,
+ false,
+ (byte) tStack.stackSize,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
}
tStack = mInventory[3 + i * 3 + 2];
if (tStack == null) {
- if (getSlot3InOut(i))
- tCost += 5
- * GT_Utility.moveOneItemStack(
- getBaseMetaTileEntity(),
- tTileEntities[getRangeDirection(i)],
- getSlot3Direction(i),
- getSlot3Direction(i),
- null,
- false,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- else
- tCost += 5
- * GT_Utility.moveOneItemStack(
- tTileEntities[getRangeDirection(i)],
- getBaseMetaTileEntity(),
- getSlot3Direction(i),
- getSlot3Direction(i),
- null,
- false,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
+ if (getSlot3InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack(
+ getBaseMetaTileEntity(),
+ tTileEntities[getRangeDirection(i)],
+ getSlot3Direction(i),
+ getSlot3Direction(i),
+ null,
+ false,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
+ else tCost += 5 * GT_Utility.moveOneItemStack(
+ tTileEntities[getRangeDirection(i)],
+ getBaseMetaTileEntity(),
+ getSlot3Direction(i),
+ getSlot3Direction(i),
+ null,
+ false,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
} else {
tList.set(0, tStack);
- if (getSlot3InOut(i))
- tCost += 5
- * GT_Utility.moveOneItemStack(
- getBaseMetaTileEntity(),
- tTileEntities[getRangeDirection(i)],
- getSlot3Direction(i),
- getSlot3Direction(i),
- tList,
- false,
- (byte) tStack.stackSize,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- else
- tCost += 5
- * GT_Utility.moveOneItemStack(
- tTileEntities[getRangeDirection(i)],
- getBaseMetaTileEntity(),
- getSlot3Direction(i),
- getSlot3Direction(i),
- tList,
- false,
- (byte) tStack.stackSize,
- (byte) 1,
- (byte) 64,
- (byte) 1);
+ if (getSlot3InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack(
+ getBaseMetaTileEntity(),
+ tTileEntities[getRangeDirection(i)],
+ getSlot3Direction(i),
+ getSlot3Direction(i),
+ tList,
+ false,
+ (byte) tStack.stackSize,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
+ else tCost += 5 * GT_Utility.moveOneItemStack(
+ tTileEntities[getRangeDirection(i)],
+ getBaseMetaTileEntity(),
+ getSlot3Direction(i),
+ getSlot3Direction(i),
+ tList,
+ false,
+ (byte) tStack.stackSize,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
}
}
}
@@ -453,21 +429,15 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
@Override
public String[] getDescription() {
- return new String[] {"It's simpler than you think. I promise.", this.mDescription, CORE.GT_Tooltip};
- }
-
- /*@Override
- public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
- switch (aSide) {
- case 0: return 113 + (aRedstone?8:0);
- case 1: return 112 + (aRedstone?8:0);
- case 2: return 116 + (aRedstone?8:0);
- case 3: return 213 + (aRedstone?8:0);
- case 4: return 212 + (aRedstone?8:0);
- case 5: return 117 + (aRedstone?8:0);
- }
- return 0;
- }*/
+ return new String[] { "It's simpler than you think. I promise.", this.mDescription, CORE.GT_Tooltip };
+ }
+
+ /*
+ * @Override public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { switch
+ * (aSide) { case 0: return 113 + (aRedstone?8:0); case 1: return 112 + (aRedstone?8:0); case 2: return 116 +
+ * (aRedstone?8:0); case 3: return 213 + (aRedstone?8:0); case 4: return 212 + (aRedstone?8:0); case 5: return 117 +
+ * (aRedstone?8:0); } return 0; }
+ */
@Override
public boolean allowCoverOnSide(byte aSide, GT_ItemStack aStack) {
@@ -505,98 +475,69 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
return this.mTextures[!aRedstone ? aSide : aSide + 6][aColorIndex < 0 ? 0 : aColorIndex];
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green) };
}
public ITexture[] getNegativeZ(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue) };
}
public ITexture[] getPositiveZ(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan) };
}
public ITexture[] getNegativeX(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple) };
}
public ITexture[] getPositiveX(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow) };
}
public ITexture[] getBottomRedstone(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) };
}
public ITexture[] getTopRedstone(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green_Redstone)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green_Redstone) };
}
public ITexture[] getNegativeZRedstone(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue_Redstone)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue_Redstone) };
}
public ITexture[] getPositiveZRedstone(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan_Redstone)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan_Redstone) };
}
public ITexture[] getNegativeXRedstone(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple_Redstone)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple_Redstone) };
}
public ITexture[] getPositiveXRedstone(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow_Redstone)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow_Redstone) };
}
@Override
@@ -606,10 +547,8 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
@Override
public void addGregTechLogo(ModularWindow.Builder builder) {
- builder.widget(new DrawableWidget()
- .setDrawable(getGUITextureSet().getGregTechLogo())
- .setSize(17, 17)
- .setPos(154, 59));
+ builder.widget(
+ new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(154, 59));
}
// Internal copy of values stored in this tile. Client will use these to render stuff.
@@ -621,139 +560,116 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
for (int i = 0; i < 3; i++) {
- builder.widget(new SlotWidget(inventoryHandler, i)
- .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_CHEST)
- .setPos(154, 4 + i * 18));
+ builder.widget(
+ new SlotWidget(inventoryHandler, i)
+ .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_CHEST)
+ .setPos(154, 4 + i * 18));
}
- int[] slotXPositions = new int[] {4, 60, 79, 135};
+ int[] slotXPositions = new int[] { 4, 60, 79, 135 };
for (int i = 0; i < 12; i++) {
final int index = i;
- builder.widget(
- new SlotWidget(new BaseSlot(inventoryHandler, i + 3, true)) {
- @Override
- protected void phantomClick(ClickData clickData, ItemStack cursorStack) {
- super.phantomClick(clickData, cursorStack);
- if (clickData.mouseButton != 0
- && cursorStack != null
- && getMcSlot().getHasStack()) {
- getMcSlot().getStack().setItemDamage(OreDictionary.WILDCARD_VALUE);
- }
- }
- }.setControlsAmount(true)
- .disableShiftInsert()
- .setBackground(() -> {
- if (index % 3 == 0) {
- return new IDrawable[] {
- GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]],
- GTPP_UITextures.OVERLAY_SLOT_INVENTORY_MANAGER_COLOR[
- mRangeDirections[index / 3]]
- };
- } else if (index % 3 == 1) {
- return new IDrawable[] {
- GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]],
- GTPP_UITextures.OVERLAY_SLOT_INVENTORY_MANAGER_ARROW[
- mRangeDirections[index / 3]]
- };
- } else {
- return new IDrawable[] {
- GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]]
- };
- }
- })
- .setPos(slotXPositions[i / 3], 4 + (i % 3) * 18));
+ builder.widget(new SlotWidget(new BaseSlot(inventoryHandler, i + 3, true)) {
+
+ @Override
+ protected void phantomClick(ClickData clickData, ItemStack cursorStack) {
+ super.phantomClick(clickData, cursorStack);
+ if (clickData.mouseButton != 0 && cursorStack != null && getMcSlot().getHasStack()) {
+ getMcSlot().getStack().setItemDamage(OreDictionary.WILDCARD_VALUE);
+ }
+ }
+ }.setControlsAmount(true).disableShiftInsert().setBackground(() -> {
+ if (index % 3 == 0) {
+ return new IDrawable[] { GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]],
+ GTPP_UITextures.OVERLAY_SLOT_INVENTORY_MANAGER_COLOR[mRangeDirections[index / 3]] };
+ } else if (index % 3 == 1) {
+ return new IDrawable[] { GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]],
+ GTPP_UITextures.OVERLAY_SLOT_INVENTORY_MANAGER_ARROW[mRangeDirections[index / 3]] };
+ } else {
+ return new IDrawable[] { GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]] };
+ }
+ }).setPos(slotXPositions[i / 3], 4 + (i % 3) * 18));
}
for (int i = 0; i < 4; i++) {
final int index = i;
- builder.widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> switchRangeEnergy(index))
- .setBackground(() -> new IDrawable[] {
- mTargetEnergy[index] ? ModularUITextures.ITEM_SLOT : GT_UITextures.BUTTON_STANDARD,
- GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY
- })
- .setPos(slotXPositions[i], 59)
- .setSize(18, 18));
+ builder.widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> switchRangeEnergy(index)).setBackground(
+ () -> new IDrawable[] {
+ mTargetEnergy[index] ? ModularUITextures.ITEM_SLOT : GT_UITextures.BUTTON_STANDARD,
+ GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY })
+ .setPos(slotXPositions[i], 59).setSize(18, 18));
}
- int[] buttonXPositions = new int[] {23, 41, 98, 116};
+ int[] buttonXPositions = new int[] { 23, 41, 98, 116 };
for (int i = 0; i < 12; i++) {
final int index = i;
- builder.widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> {
- if (index % 3 == 0) {
- if (clickData.mouseButton != 0) {
- switchSlot1InOut(index / 3);
- } else {
- iterateSlot1Direction(index / 3);
- }
- } else if (index % 3 == 1) {
- if (clickData.mouseButton != 0) {
- switchSlot2InOut(index / 3);
- } else {
- iterateSlot2Direction(index / 3);
- }
- } else {
- if (clickData.mouseButton != 0) {
- switchSlot3InOut(index / 3);
- } else {
- iterateSlot3Direction(index / 3);
- }
- }
- })
- .setBackground(() -> new IDrawable[] {
- GT_UITextures.BUTTON_STANDARD,
- GTPP_UITextures.OVERLAY_BUTTON_DIRECTION[mTargetDirections[index]],
- mTargetInOut[index]
- ? GTPP_UITextures.OVERLAY_BUTTON_TIP_RED
- : GTPP_UITextures.OVERLAY_BUTTON_TIP_GREEN
- })
- .setPos(buttonXPositions[i / 3], 4 + (i % 3) * 18)
- .setSize(18, 18));
+ builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> {
+ if (index % 3 == 0) {
+ if (clickData.mouseButton != 0) {
+ switchSlot1InOut(index / 3);
+ } else {
+ iterateSlot1Direction(index / 3);
+ }
+ } else if (index % 3 == 1) {
+ if (clickData.mouseButton != 0) {
+ switchSlot2InOut(index / 3);
+ } else {
+ iterateSlot2Direction(index / 3);
+ }
+ } else {
+ if (clickData.mouseButton != 0) {
+ switchSlot3InOut(index / 3);
+ } else {
+ iterateSlot3Direction(index / 3);
+ }
+ }
+ }).setBackground(
+ () -> new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
+ GTPP_UITextures.OVERLAY_BUTTON_DIRECTION[mTargetDirections[index]],
+ mTargetInOut[index] ? GTPP_UITextures.OVERLAY_BUTTON_TIP_RED
+ : GTPP_UITextures.OVERLAY_BUTTON_TIP_GREEN })
+ .setPos(buttonXPositions[i / 3], 4 + (i % 3) * 18).setSize(18, 18));
}
for (int i = 0; i < 4; i++) {
final int index = i;
- builder.widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> iterateRangeDirection(index))
- .setBackground(() -> new IDrawable[] {
- GT_UITextures.BUTTON_STANDARD,
- GTPP_UITextures.OVERLAY_BUTTON_DIRECTION_GRAY[mRangeDirections[index]]
- })
- .setPos(buttonXPositions[i], 59)
- .setSize(18, 18));
+ builder.widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> iterateRangeDirection(index))
+ .setBackground(
+ () -> new IDrawable[] { GT_UITextures.BUTTON_STANDARD,
+ GTPP_UITextures.OVERLAY_BUTTON_DIRECTION_GRAY[mRangeDirections[index]] })
+ .setPos(buttonXPositions[i], 59).setSize(18, 18));
}
for (int i = 0; i < mTargetDirections.length; i++) {
final int index = i;
- builder.widget(new FakeSyncWidget.ByteSyncer(
- () -> {
- if (index % 3 == 0) {
- return getSlot1Direction(index / 3);
- } else if (index % 3 == 1) {
- return getSlot2Direction(index / 3);
- } else {
- return getSlot3Direction(index / 3);
- }
- },
- val -> mTargetDirections[index] = val));
+ builder.widget(new FakeSyncWidget.ByteSyncer(() -> {
+ if (index % 3 == 0) {
+ return getSlot1Direction(index / 3);
+ } else if (index % 3 == 1) {
+ return getSlot2Direction(index / 3);
+ } else {
+ return getSlot3Direction(index / 3);
+ }
+ }, val -> mTargetDirections[index] = val));
}
for (int i = 0; i < mRangeDirections.length; i++) {
final int index = i;
- builder.widget(new FakeSyncWidget.ByteSyncer(
- () -> getRangeDirection(index), val -> mRangeDirections[index] = val));
+ builder.widget(
+ new FakeSyncWidget.ByteSyncer(
+ () -> getRangeDirection(index),
+ val -> mRangeDirections[index] = val));
}
for (int i = 0; i < mTargetInOut.length; i++) {
final int index = i;
- builder.widget(new FakeSyncWidget.BooleanSyncer(
- () -> {
- if (index % 3 == 0) {
- return getSlot1InOut(index / 3);
- } else if (index % 3 == 1) {
- return getSlot2InOut(index / 3);
- } else {
- return getSlot3InOut(index / 3);
- }
- },
- val -> mTargetInOut[index] = val));
+ builder.widget(new FakeSyncWidget.BooleanSyncer(() -> {
+ if (index % 3 == 0) {
+ return getSlot1InOut(index / 3);
+ } else if (index % 3 == 1) {
+ return getSlot2InOut(index / 3);
+ } else {
+ return getSlot3InOut(index / 3);
+ }
+ }, val -> mTargetInOut[index] = val));
}
for (int i = 0; i < mTargetEnergy.length; i++) {
final int index = i;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
index b990e3c55e..f3c4bf0f18 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
@@ -2,6 +2,19 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.automation;
import static gtPlusPlus.core.lib.CORE.*;
+import java.util.UUID;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.*;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IDigitalChest;
@@ -17,17 +30,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.helpers.tesseract.TesseractHelper;
-import java.util.UUID;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.ISidedInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.*;
public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_BasicTank {
@@ -39,13 +41,13 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
public int mFrequency = 0;
public UUID mOwner;
- public GT_MetaTileEntity_TesseractGenerator(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GT_MetaTileEntity_TesseractGenerator(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier, 3, "");
}
- public GT_MetaTileEntity_TesseractGenerator(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_TesseractGenerator(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 3, aDescription, aTextures);
}
@@ -137,10 +139,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
@Override
public int getProgresstime() {
return (TesseractHelper.getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency)
- == this)
- && (this.isWorking >= 20)
- ? 999
- : 0;
+ == this) && (this.isWorking >= 20) ? 999 : 0;
}
@Override
@@ -186,23 +185,15 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
}
@Override
- public boolean onRightclick(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final EntityPlayer aPlayer,
- final byte aSide,
- final float aX,
- final float aY,
- final float aZ) {
+ public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer,
+ final byte aSide, final float aX, final float aY, final float aZ) {
if (this.mOwner == null) {
if (this.getBaseMetaTileEntity().getOwnerName() != null
&& !this.getBaseMetaTileEntity().getOwnerName().equals("")) {
- if (this.getBaseMetaTileEntity()
- .getOwnerName()
- .toLowerCase()
+ if (this.getBaseMetaTileEntity().getOwnerName().toLowerCase()
.equals(aPlayer.getDisplayName().toLowerCase())) {
- this.mOwner = PlayerUtils.getPlayersUUIDByName(
- this.getBaseMetaTileEntity().getOwnerName());
+ this.mOwner = PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName());
}
}
}
@@ -215,8 +206,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
Logger.WARNING("Freq. -1 | " + this.mFrequency);
try {
CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency -= 1;
break;
@@ -224,8 +214,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
Logger.WARNING("Freq. +1 | " + this.mFrequency);
try {
CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency += 1;
default:
// Utils.LOG_WARNING("Did not click the correct place.");
@@ -233,7 +222,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
}
if (getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this) {
GT_Utility.sendChatToPlayer(
- aPlayer, "Frequency: " + this.mFrequency + EnumChatFormatting.RED + " (Occupied)");
+ aPlayer,
+ "Frequency: " + this.mFrequency + EnumChatFormatting.RED + " (Occupied)");
} else {
GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency);
}
@@ -246,8 +236,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
}
@Override
- public void onScrewdriverRightClick(
- final byte aSide, final EntityPlayer aPlayer, final float aX, final float aY, final float aZ) {
+ public void onScrewdriverRightClick(final byte aSide, final EntityPlayer aPlayer, final float aX, final float aY,
+ final float aZ) {
if (aPlayer.getUniqueID().compareTo(this.mOwner) == 0) {
if (aSide == this.getBaseMetaTileEntity().getFrontFacing()) {
final float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ);
@@ -255,34 +245,31 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
case 0:
try {
CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency -= 64;
break;
case 1:
try {
CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency += 64;
break;
case 2:
try {
CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency -= 512;
break;
case 3:
try {
CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency += 512;
}
if (getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this) {
GT_Utility.sendChatToPlayer(
- aPlayer, "Frequency: " + this.mFrequency + EnumChatFormatting.RED + " (Occupied)");
+ aPlayer,
+ "Frequency: " + this.mFrequency + EnumChatFormatting.RED + " (Occupied)");
} else {
GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency);
}
@@ -300,18 +287,13 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
public String[] getInfoData() {
final TileEntity tTileEntity = this.getBaseMetaTileEntity()
.getTileEntityAtSide(this.getBaseMetaTileEntity().getBackFacing());
- if ((tTileEntity != null)
- && (this.getBaseMetaTileEntity().isAllowedToWork())
+ if ((tTileEntity != null) && (this.getBaseMetaTileEntity().isAllowedToWork())
&& ((tTileEntity instanceof IGregTechDeviceInformation))
&& (((IGregTechDeviceInformation) tTileEntity).isGivingInformation())) {
return ((IGregTechDeviceInformation) tTileEntity).getInfoData();
}
- return new String[] {
- "Tesseract Generator",
- "Freqency:",
- "" + this.mFrequency,
- (getGeneratorEntity() == this) && (this.isWorking >= 20) ? "Active" : "Inactive"
- };
+ return new String[] { "Tesseract Generator", "Freqency:", "" + this.mFrequency,
+ (getGeneratorEntity() == this) && (this.isWorking >= 20) ? "Active" : "Inactive" };
}
@Override
@@ -322,8 +304,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
public boolean isSendingInformation() {
final TileEntity tTileEntity = this.getBaseMetaTileEntity()
.getTileEntityAtSide(this.getBaseMetaTileEntity().getBackFacing());
- if ((tTileEntity != null)
- && (this.getBaseMetaTileEntity().isAllowedToWork())
+ if ((tTileEntity != null) && (this.getBaseMetaTileEntity().isAllowedToWork())
&& ((tTileEntity instanceof IGregTechDeviceInformation))) {
return ((IGregTechDeviceInformation) tTileEntity).isGivingInformation();
}
@@ -334,8 +315,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
public boolean isDigitalChest() {
final TileEntity tTileEntity = this.getBaseMetaTileEntity()
.getTileEntityAtSide(this.getBaseMetaTileEntity().getBackFacing());
- if ((tTileEntity != null)
- && (this.getBaseMetaTileEntity().isAllowedToWork())
+ if ((tTileEntity != null) && (this.getBaseMetaTileEntity().isAllowedToWork())
&& ((tTileEntity instanceof IDigitalChest))) {
return ((IDigitalChest) tTileEntity).isDigitalChest();
}
@@ -346,8 +326,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
public ItemStack[] getStoredItemData() {
final TileEntity tTileEntity = this.getBaseMetaTileEntity()
.getTileEntityAtSide(this.getBaseMetaTileEntity().getBackFacing());
- if ((tTileEntity != null)
- && (this.getBaseMetaTileEntity().isAllowedToWork())
+ if ((tTileEntity != null) && (this.getBaseMetaTileEntity().isAllowedToWork())
&& ((tTileEntity instanceof IDigitalChest))) {
return ((IDigitalChest) tTileEntity).getStoredItemData();
}
@@ -358,8 +337,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
public void setItemCount(final int aCount) {
final TileEntity tTileEntity = this.getBaseMetaTileEntity()
.getTileEntityAtSide(this.getBaseMetaTileEntity().getBackFacing());
- if ((tTileEntity != null)
- && (this.getBaseMetaTileEntity().isAllowedToWork())
+ if ((tTileEntity != null) && (this.getBaseMetaTileEntity().isAllowedToWork())
&& ((tTileEntity instanceof IDigitalChest))) {
((IDigitalChest) tTileEntity).setItemCount(aCount);
}
@@ -369,8 +347,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
public int getMaxItemCount() {
final TileEntity tTileEntity = this.getBaseMetaTileEntity()
.getTileEntityAtSide(this.getBaseMetaTileEntity().getBackFacing());
- if ((tTileEntity != null)
- && (this.getBaseMetaTileEntity().isAllowedToWork())
+ if ((tTileEntity != null) && (this.getBaseMetaTileEntity().isAllowedToWork())
&& ((tTileEntity instanceof IDigitalChest))) {
return ((IDigitalChest) tTileEntity).getMaxItemCount();
}
@@ -554,8 +531,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
if (!this.getBaseMetaTileEntity().isAllowedToWork()) {
return false;
}
- int J = (aTerminal.getBaseMetaTileEntity().getWorld()
- == this.getBaseMetaTileEntity().getWorld()
+ int J = (aTerminal.getBaseMetaTileEntity().getWorld() == this.getBaseMetaTileEntity().getWorld()
? TESSERACT_ENERGY_COST
: TESSERACT_ENERGY_COST_DIMENSIONAL);
@@ -569,11 +545,9 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
}
public boolean isValidTesseractGenerator(final String aOwnerName, final boolean aWorkIrrelevant) {
- return (this.getBaseMetaTileEntity() != null)
- && (!this.getBaseMetaTileEntity().isInvalidTileEntity())
+ return (this.getBaseMetaTileEntity() != null) && (!this.getBaseMetaTileEntity().isInvalidTileEntity())
&& (this.getBaseMetaTileEntity().isAllowedToWork())
- && ((aOwnerName == null)
- || (this.getBaseMetaTileEntity().getOwnerName().equals(aOwnerName)))
+ && ((aOwnerName == null) || (this.getBaseMetaTileEntity().getOwnerName().equals(aOwnerName)))
&& ((aWorkIrrelevant) || (this.isWorking >= 20));
}
@@ -592,8 +566,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
if (PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName()) != null) {
if (this.mOwner == null) {
Logger.WARNING("Setting Generators Owner. 1");
- this.mOwner = PlayerUtils.getPlayersUUIDByName(
- this.getBaseMetaTileEntity().getOwnerName());
+ this.mOwner = PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName());
}
}
@@ -617,7 +590,9 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
.isValidTesseractGenerator(null, true))) {
// Utils.LOG_WARNING("storing TE I think to mFreq map?");
TesseractHelper.setGeneratorOwnershipByPlayer(
- PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency, this);
+ PlayerUtils.getPlayerOnServerFromUUID(mOwner),
+ this.mFrequency,
+ this);
}
} else {
if (getGeneratorEntity(Integer.valueOf(this.mFrequency)) == this) {
@@ -646,25 +621,22 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Generates a Tesseract for the attached Inventory",
- "Connect with pipes to insert items",
- "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers",
- "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Generates a Tesseract for the attached Inventory",
+ "Connect with pipes to insert items",
+ "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers",
+ "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers",
+ CORE.GT_Tooltip };
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@@ -674,22 +646,13 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
return aSide == aFacing
- ? new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency)
- }
- : new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(Textures.BlockIcons.VOID)
- };
+ ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) }
+ : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+ new GT_RenderedTexture(Textures.BlockIcons.VOID) };
}
// To-Do?
@@ -724,8 +687,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
}
private GT_MetaTileEntity_TesseractGenerator getGeneratorEntity() {
- GT_MetaTileEntity_TesseractGenerator thisGenerator =
- TesseractHelper.getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency);
+ GT_MetaTileEntity_TesseractGenerator thisGenerator = TesseractHelper
+ .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency);
if (thisGenerator != null) {
return thisGenerator;
}
@@ -733,8 +696,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
}
private GT_MetaTileEntity_TesseractGenerator getGeneratorEntity(int frequency) {
- GT_MetaTileEntity_TesseractGenerator thisGenerator =
- TesseractHelper.getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), frequency);
+ GT_MetaTileEntity_TesseractGenerator thisGenerator = TesseractHelper
+ .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), frequency);
if (thisGenerator != null) {
return thisGenerator;
}
@@ -745,8 +708,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
public void onCreated(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
if (this.getBaseMetaTileEntity().getOwnerName() != null
&& !this.getBaseMetaTileEntity().getOwnerName().equals("")) {
- this.mOwner = PlayerUtils.getPlayersUUIDByName(
- this.getBaseMetaTileEntity().getOwnerName());
+ this.mOwner = PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName());
Logger.WARNING("Setting Generators Owner. 2");
}
super.onCreated(aStack, aWorld, aPlayer);
@@ -756,8 +718,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
public void onRemoval() {
try {
CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
super.onRemoval();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
index 5d2a9ae009..cfcdc5f6f9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
@@ -1,5 +1,17 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.automation;
+import java.util.UUID;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -12,18 +24,9 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.helpers.tesseract.TesseractHelper;
-import java.util.UUID;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_BasicTank {
+
public int mFrequency = 0;
public UUID mOwner;
public boolean mDidWork = false;
@@ -31,13 +34,13 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
private static int TESSERACT_ENERGY_COST = 128;
private static int TESSERACT_ENERGY_COST_DIMENSIONAL = 512;
- public GT_MetaTileEntity_TesseractTerminal(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GT_MetaTileEntity_TesseractTerminal(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier, 3, "");
}
- public GT_MetaTileEntity_TesseractTerminal(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_TesseractTerminal(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 3, aDescription, aTextures);
}
@@ -141,23 +144,15 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
}
@Override
- public boolean onRightclick(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final EntityPlayer aPlayer,
- final byte aSide,
- final float aX,
- final float aY,
- final float aZ) {
+ public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer,
+ final byte aSide, final float aX, final float aY, final float aZ) {
if (this.mOwner == null) {
if (this.getBaseMetaTileEntity().getOwnerName() != null
&& !this.getBaseMetaTileEntity().getOwnerName().equals("")) {
- if (this.getBaseMetaTileEntity()
- .getOwnerName()
- .toLowerCase()
+ if (this.getBaseMetaTileEntity().getOwnerName().toLowerCase()
.equals(aPlayer.getDisplayName().toLowerCase())) {
- this.mOwner = PlayerUtils.getPlayersUUIDByName(
- this.getBaseMetaTileEntity().getOwnerName());
+ this.mOwner = PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName());
}
}
}
@@ -170,33 +165,27 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
// Utils.LOG_WARNING("Freq. -1 | " + this.mFrequency);
try {
CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency -= 1;
break;
case 1:
// Utils.LOG_WARNING("Freq. +1 | " + this.mFrequency);
try {
CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency += 1;
default:
// Utils.LOG_WARNING("Did not click the correct place.");
try {
CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
break;
}
PlayerUtils.messagePlayer(aPlayer, "Frequency: " + this.mFrequency);
if (this.getTesseract(this.mFrequency, false) != null) {
PlayerUtils.messagePlayer(
aPlayer,
- new StringBuilder()
- .append(EnumChatFormatting.GREEN)
- .append(" (Connected)")
- .toString());
+ new StringBuilder().append(EnumChatFormatting.GREEN).append(" (Connected)").toString());
}
}
} else if (aPlayer.getUniqueID().compareTo(this.mOwner) != 0) {
@@ -206,8 +195,8 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
}
@Override
- public void onScrewdriverRightClick(
- final byte aSide, final EntityPlayer aPlayer, final float aX, final float aY, final float aZ) {
+ public void onScrewdriverRightClick(final byte aSide, final EntityPlayer aPlayer, final float aX, final float aY,
+ final float aZ) {
if (aPlayer.getUniqueID().compareTo(this.mOwner) == 0) {
if (aSide == this.getBaseMetaTileEntity().getFrontFacing()) {
final float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ);
@@ -215,39 +204,32 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
case 0:
try {
CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency -= 64;
break;
case 1:
try {
CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency += 64;
break;
case 2:
try {
CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency -= 512;
break;
case 3:
try {
CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
this.mFrequency += 512;
}
GT_Utility.sendChatToPlayer(
aPlayer,
"Frequency: " + this.mFrequency
- + (this.getTesseract(this.mFrequency, false) == null
- ? ""
- : new StringBuilder()
- .append(EnumChatFormatting.GREEN)
- .append(" (Connected)")
+ + (this.getTesseract(this.mFrequency, false) == null ? ""
+ : new StringBuilder().append(EnumChatFormatting.GREEN).append(" (Connected)")
.toString()));
}
} else if (aPlayer.getUniqueID().compareTo(this.mOwner) != 0) {
@@ -260,8 +242,8 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
}
public GT_MetaTileEntity_TesseractGenerator getTesseract(final int aFrequency, final boolean aWorkIrrelevant) {
- final GT_MetaTileEntity_TesseractGenerator rTesseract =
- TesseractHelper.getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), aFrequency);
+ final GT_MetaTileEntity_TesseractGenerator rTesseract = TesseractHelper
+ .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), aFrequency);
if (rTesseract == null) {
return null;
}
@@ -270,15 +252,16 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
}
if (rTesseract.mFrequency != aFrequency) {
TesseractHelper.setTerminalOwnershipByPlayer(
- PlayerUtils.getPlayerOnServerFromUUID(mOwner), Integer.valueOf(aFrequency), null);
+ PlayerUtils.getPlayerOnServerFromUUID(mOwner),
+ Integer.valueOf(aFrequency),
+ null);
return null;
}
if (!rTesseract.isValidTesseractGenerator(this.getBaseMetaTileEntity().getOwnerName(), aWorkIrrelevant)) {
return null;
}
if ((!sInterDimensionalTesseractAllowed)
- && (rTesseract.getBaseMetaTileEntity().getWorld()
- != this.getBaseMetaTileEntity().getWorld())) {
+ && (rTesseract.getBaseMetaTileEntity().getWorld() != this.getBaseMetaTileEntity().getWorld())) {
return null;
}
return rTesseract;
@@ -287,17 +270,12 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
@Override
public String[] getInfoData() {
final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false);
- if ((tTileEntity != null)
- && (this.getBaseMetaTileEntity().isAllowedToWork())
+ if ((tTileEntity != null) && (this.getBaseMetaTileEntity().isAllowedToWork())
&& (tTileEntity.isSendingInformation())) {
return tTileEntity.getInfoData();
}
- return new String[] {
- "Tesseract Generator",
- "Freqency:",
- "" + this.mFrequency,
- this.getTesseract(this.mFrequency, false) != null ? "Active" : "Inactive"
- };
+ return new String[] { "Tesseract Generator", "Freqency:", "" + this.mFrequency,
+ this.getTesseract(this.mFrequency, false) != null ? "Active" : "Inactive" };
}
@Override
@@ -487,13 +465,11 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
@Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
- if ((this.getBaseMetaTileEntity().isServerSide())
- && (this.getBaseMetaTileEntity().isAllowedToWork())) {
+ if ((this.getBaseMetaTileEntity().isServerSide()) && (this.getBaseMetaTileEntity().isAllowedToWork())) {
// Set owner
if (PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName()) != null) {
if (this.mOwner == null) {
- this.mOwner = PlayerUtils.getPlayersUUIDByName(
- this.getBaseMetaTileEntity().getOwnerName());
+ this.mOwner = PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName());
}
}
final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, true);
@@ -513,26 +489,22 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Accesses Tesseract Generators remotely",
- "Connect with pipes to extract items or fluids",
- "Outputs from the back face",
- "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers",
- "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Accesses Tesseract Generators remotely",
+ "Connect with pipes to extract items or fluids", "Outputs from the back face",
+ "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers",
+ "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers",
+ CORE.GT_Tooltip };
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@@ -542,22 +514,13 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
return aSide == aFacing
- ? new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency)
- }
- : new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(Textures.BlockIcons.VOID)
- };
+ ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) }
+ : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+ new GT_RenderedTexture(Textures.BlockIcons.VOID) };
}
// To-Do?
@@ -595,8 +558,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
public void onCreated(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
if (this.getBaseMetaTileEntity().getOwnerName() != null
&& !this.getBaseMetaTileEntity().getOwnerName().equals("")) {
- this.mOwner = PlayerUtils.getPlayersUUIDByName(
- this.getBaseMetaTileEntity().getOwnerName());
+ this.mOwner = PlayerUtils.getPlayersUUIDByName(this.getBaseMetaTileEntity().getOwnerName());
}
super.onCreated(aStack, aWorld, aPlayer);
}
@@ -605,8 +567,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
public void onRemoval() {
try {
CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
super.onRemoval();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
index 277fc8d873..ed71bcabe7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
@@ -1,7 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntityFurnace;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidTankInfo;
+
import com.gtnewhorizons.modularui.api.drawable.IDrawable;
import com.gtnewhorizons.modularui.api.drawable.UITexture;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -18,10 +24,6 @@ import gregtech.api.util.GT_Utility;
import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntityFurnace;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidTankInfo;
public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
@@ -46,14 +48,10 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Produces " + getPollution() + " pollution/sec",
- "Consumes fuel only when temperature is less than 100C",
- "Fuel with burn time greater than 500 is more efficient.",
- "Doesn't explode if there's no water",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Produces " + getPollution() + " pollution/sec",
+ "Consumes fuel only when temperature is less than 100C",
+ "Fuel with burn time greater than 500 is more efficient.", "Doesn't explode if there's no water",
+ CORE.GT_Tooltip };
}
public ITexture getOverlayIcon() {
@@ -91,25 +89,15 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.tier][aColor + 1], this.getCasingTexture()};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.tier][aColor + 1], this.getCasingTexture() };
}
public ITexture[] getBack(final byte aColor) {
@@ -125,7 +113,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.tier][aColor + 1], this.getCasingTexture()};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.tier][aColor + 1], this.getCasingTexture() };
}
public ITexture[] getFrontActive(final byte aColor) {
@@ -233,9 +221,8 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
// Since this type of machine can have different water and steam capacities, we need to override getTankInfo() to
// support returning those different capacities.
public FluidTankInfo[] getTankInfo(ForgeDirection aSide) {
- return new FluidTankInfo[] {
- new FluidTankInfo(this.mFluid, getCapacity()), new FluidTankInfo(this.mSteam, getSteamCapacity())
- };
+ return new FluidTankInfo[] { new FluidTankInfo(this.mFluid, getCapacity()),
+ new FluidTankInfo(this.mSteam, getSteamCapacity()) };
}
@Override
@@ -306,12 +293,12 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
@Override
protected IDrawable[] getFuelSlotBackground() {
- return new IDrawable[] {getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_COAL};
+ return new IDrawable[] { getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_COAL };
}
@Override
protected IDrawable[] getAshSlotBackground() {
- return new IDrawable[] {getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DUST};
+ return new IDrawable[] { getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DUST };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
index 867623f692..d2a924009f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
@@ -29,27 +29,20 @@ public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base {
@Override
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)
- };
+ return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) };
}
@Override
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Talonite)
- };
+ return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Talonite) };
}
@Override
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- super.getFrontActive(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
- };
+ return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
index 6aeedaa6f3..98dd73a13c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
@@ -29,27 +29,20 @@ public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base {
@Override
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)
- };
+ return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) };
}
@Override
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Potin)
- };
+ return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Potin) };
}
@Override
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- super.getFrontActive(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
- };
+ return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
index 9f329f92da..cb2a5fbbd8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
@@ -29,27 +29,20 @@ public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base {
@Override
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)
- };
+ return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) };
}
@Override
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Tumbaga)
- };
+ return new ITexture[] { super.getTop(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Tumbaga) };
}
@Override
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- super.getFrontActive(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
- };
+ return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
index 888cb6a195..00ce747e4f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidHandler;
+
import gregtech.api.enums.Dyes;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
@@ -9,66 +14,55 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_ModHandler;
import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidHandler;
public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
+
public GT_MetaTileEntity_Boiler_Solar(final int aID, final String aName, final String aNameRegional) {
super(aID, aName, aNameRegional, "Steam Power by the Sun");
}
- public GT_MetaTileEntity_Boiler_Solar(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_Boiler_Solar(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec", CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec",
+ CORE.GT_Tooltip };
}
@Override
public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
final ITexture[][][] rTextures = new ITexture[4][17][];
for (byte i = -1; i < 16; i = (byte) (i + 1)) {
- final ITexture[] tmp0 = {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))
- };
+ final ITexture[] tmp0 = { new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM,
+ Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
rTextures[0][(i + 1)] = tmp0;
final ITexture[] tmp1 = {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR)
- };
+ new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP,
+ Dyes.getModulation(i, Dyes._NULL.mRGBa)),
+ new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR) };
rTextures[1][(i + 1)] = tmp1;
- final ITexture[] tmp2 = {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa))
- };
+ final ITexture[] tmp2 = { new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE,
+ Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
rTextures[2][(i + 1)] = tmp2;
final ITexture[] tmp3 = {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)
- };
+ new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE,
+ Dyes.getModulation(i, Dyes._NULL.mRGBa)),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
rTextures[3][(i + 1)] = tmp3;
}
return rTextures;
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
return this.mTextures[aSide >= 2 ? ((byte) (aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1];
}
@@ -111,11 +105,11 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
final byte i = aBaseMetaTileEntity.getFrontFacing();
final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
if (tTileEntity != null) {
- final FluidStack tDrained = aBaseMetaTileEntity.drain(
- ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
+ final FluidStack tDrained = aBaseMetaTileEntity
+ .drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
if (tDrained != null) {
- final int tFilledAmount = tTileEntity.fill(
- ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
+ final int tFilledAmount = tTileEntity
+ .fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
if (tFilledAmount > 0) {
tTileEntity.fill(
ForgeDirection.getOrientation(i).getOpposite(),
@@ -156,16 +150,14 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
this.sendSound((byte) 1);
this.mSteam.amount = 12000;
}
- if ((this.mProcessingEnergy <= 0)
- && (aBaseMetaTileEntity.isAllowedToWork())
+ if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork())
&& ((aTick % 256L) == 0L)
&& (!aBaseMetaTileEntity.getWorld().isThundering())) {
- final boolean bRain =
- aBaseMetaTileEntity.getWorld().isRaining() && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F);
+ final boolean bRain = aBaseMetaTileEntity.getWorld().isRaining()
+ && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F);
this.mProcessingEnergy += (bRain && (aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4))
- || !aBaseMetaTileEntity.getSkyAtSide((byte) 1)
- ? 0
- : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
+ || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0
+ : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
}
if ((this.mTemperature < 500) && (this.mProcessingEnergy > 0) && ((aTick % 12L) == 0L)) {
this.mProcessingEnergy -= 1;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java
index e077d5ef90..9b0548d95a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java
@@ -2,6 +2,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
import static gregtech.api.enums.GT_Values.V;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.common.util.ForgeDirection;
+
import cofh.api.energy.IEnergyProvider;
import cofh.api.energy.IEnergyReceiver;
import cofh.api.energy.IEnergyStorage;
@@ -22,48 +29,30 @@ import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.common.util.ForgeDirection;
/**
* NEVER INCLUDE THIS FILE IN YOUR MOD!!!
*
- * This is the main construct for my Basic Machines such as the Automatic Extractor
- * Extend this class to make a simple Machine
+ * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
+ * Machine
*/
public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer implements IEnergyReceiver {
- public GT_MetaTileEntity_RfConvertor(
- final String aName,
- final int aTier,
- final String aDescription,
- final ITexture[][][] aTextures,
- final int aSlotCount) {
+ public GT_MetaTileEntity_RfConvertor(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures, final int aSlotCount) {
super(aName, aTier, aDescription, aTextures, aSlotCount);
}
- public GT_MetaTileEntity_RfConvertor(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final int aSlotCount) {
+ public GT_MetaTileEntity_RfConvertor(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final String aDescription, final int aSlotCount) {
super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
}
@Override
public String[] getDescription() {
- return new String[] {
- "Use Screwdriver to change voltage",
- "Hold Shift while using Screwdriver to change amperage",
- EnumChatFormatting.DARK_AQUA + "Variable Output Voltage",
- CORE.GT_Tooltip
- };
+ return new String[] { "Use Screwdriver to change voltage",
+ "Hold Shift while using Screwdriver to change amperage",
+ EnumChatFormatting.DARK_AQUA + "Variable Output Voltage", CORE.GT_Tooltip };
}
@Override
@@ -71,37 +60,36 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl
ITexture[][][] rTextures = new ITexture[12][17][];
GT_RenderedTexture aTex = new GT_RenderedTexture(TexturesGtBlock.Casing_Material_ZirconiumCarbide);
for (byte i = -1; i < 16; i++) {
- rTextures[0][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier]};
- rTextures[1][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier]};
- rTextures[2][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier]};
- rTextures[3][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier]};
- rTextures[4][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier]};
- rTextures[5][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier]};
- rTextures[6][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier]};
- rTextures[7][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier]};
- rTextures[8][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier]};
- rTextures[9][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]};
- rTextures[10][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]};
- rTextures[11][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]};
+ rTextures[0][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
+ rTextures[1][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
+ rTextures[2][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
+ rTextures[3][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] };
+ rTextures[4][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] };
+ rTextures[5][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] };
+ rTextures[6][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] };
+ rTextures[7][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] };
+ rTextures[8][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_IN[mTier] };
+ rTextures[9][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] };
+ rTextures[10][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] };
+ rTextures[11][i + 1] = new ITexture[] { aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] };
}
return rTextures;
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
return mTextures[Math.min(2, aSide) + (aSide == aFacing ? 3 : 0) + (aActive ? 0 : 6)][aColorIndex + 1];
}
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GT_MetaTileEntity_RfConvertor(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mInventory.length);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mInventory.length);
}
@Override
@@ -161,9 +149,8 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl
aBaseMetaTileEntity.setActive(true);
}
if (this.getEUVar() < this.maxEUStore()) {
- for (byte i = 0;
- i < 6 && aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity();
- i++) {
+ for (byte i = 0; i < 6
+ && aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity(); i++) {
if (isInputFacing(i)) {
receiveEnergy(ForgeDirection.getOrientation(i), Integer.MAX_VALUE, false);
}
@@ -174,21 +161,21 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
public String[] getInfoData() {
String[] infoData = super.getInfoData();
- return new String[] {infoData[0], "Converts RF -> GTEU | Tier: " + this.mTier, infoData[1], infoData[2]};
+ return new String[] { infoData[0], "Converts RF -> GTEU | Tier: " + this.mTier, infoData[1], infoData[2] };
}
@Override
@@ -248,8 +235,7 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl
return 0;
}
- Logger.WARNING("Someone is trying to inject RF from " + from + ". Type:"
- + tTileEntity.getClass().getName());
+ Logger.WARNING("Someone is trying to inject RF from " + from + ". Type:" + tTileEntity.getClass().getName());
// Calculate maximum RF we need to consume
int aInputRF = MathUtils.safeInt(this.maxEUOutput() * GregTech_API.mEUtoRF / 100);
@@ -272,57 +258,55 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl
long tEU = 0;
byte aSide = (byte) from.ordinal();
Logger.WARNING("Free: " + aRemainingSpace + "EU");
- if (tTileEntity instanceof IEnergyProvider
- && ((IEnergyProvider) tTileEntity)
- .extractEnergy(
- ForgeDirection.getOrientation(GT_Utility.getOppositeSide(aSide)),
- 1,
- true)
- == 1) {
- tEU = (long) ((IEnergyProvider) tTileEntity)
- .extractEnergy(
- ForgeDirection.getOrientation(GT_Utility.getOppositeSide(aSide)),
- (int) maxEUOutput() * 100 / GregTech_API.mRFtoEU,
- false);
+ if (tTileEntity instanceof IEnergyProvider && ((IEnergyProvider) tTileEntity)
+ .extractEnergy(ForgeDirection.getOrientation(GT_Utility.getOppositeSide(aSide)), 1, true)
+ == 1) {
+ tEU = (long) ((IEnergyProvider) tTileEntity).extractEnergy(
+ ForgeDirection.getOrientation(GT_Utility.getOppositeSide(aSide)),
+ (int) maxEUOutput() * 100 / GregTech_API.mRFtoEU,
+ false);
Logger.WARNING("Drained from IEnergyProvider Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + "");
tEU = tEU * GregTech_API.mRFtoEU / 100;
} else if (tTileEntity instanceof IEnergyStorage
&& ((IEnergyStorage) tTileEntity).extractEnergy(1, true) == 1) {
- tEU = (long) ((IEnergyStorage) tTileEntity)
- .extractEnergy((int) maxEUOutput() * 100 / GregTech_API.mRFtoEU, false);
- Logger.WARNING("Drained from IEnergyStorage Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + "");
- tEU = tEU * GregTech_API.mRFtoEU / 100;
- } else if (GregTech_API.meIOLoaded
- && tTileEntity instanceof IPowerContainer
- && ((IPowerContainer) tTileEntity).getEnergyStored() > 0) {
- int storedRF = ((IPowerContainer) tTileEntity).getEnergyStored();
- int extractRF = (int) maxEUOutput() * 100 / GregTech_API.mRFtoEU;
- tEU = 0;
- if (tTileEntity instanceof TileCapBank) {
- ICapBankNetwork network = ((TileCapBank) tTileEntity).getNetwork();
- if (network != null && network.getEnergyStoredL() > 0) {
- tEU = Math.min(
- (Math.min(
- Math.min(network.getEnergyStoredL(), storedRF - extractRF),
- network.getMaxOutput()))
- * GregTech_API.mRFtoEU
- / 100,
- maxEUOutput());
- Logger.WARNING("Drained from EIO CapBank Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + "");
- network.addEnergy((int) -(tEU * 100 / GregTech_API.mRFtoEU));
- }
- } else {
- if (storedRF > extractRF) {
- ((IPowerContainer) tTileEntity).setEnergyStored(storedRF - extractRF);
- tEU = maxEUOutput();
- Logger.WARNING("Drained from EIO Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + "");
- } else {
- ((IPowerContainer) tTileEntity).setEnergyStored(0);
- tEU = storedRF * GregTech_API.mRFtoEU / 100;
- Logger.WARNING("Drained from EIO Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + "");
- }
- }
- }
+ tEU = (long) ((IEnergyStorage) tTileEntity)
+ .extractEnergy((int) maxEUOutput() * 100 / GregTech_API.mRFtoEU, false);
+ Logger.WARNING(
+ "Drained from IEnergyStorage Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + "");
+ tEU = tEU * GregTech_API.mRFtoEU / 100;
+ } else
+ if (GregTech_API.meIOLoaded && tTileEntity instanceof IPowerContainer
+ && ((IPowerContainer) tTileEntity).getEnergyStored() > 0) {
+ int storedRF = ((IPowerContainer) tTileEntity).getEnergyStored();
+ int extractRF = (int) maxEUOutput() * 100 / GregTech_API.mRFtoEU;
+ tEU = 0;
+ if (tTileEntity instanceof TileCapBank) {
+ ICapBankNetwork network = ((TileCapBank) tTileEntity).getNetwork();
+ if (network != null && network.getEnergyStoredL() > 0) {
+ tEU = Math.min(
+ (Math.min(
+ Math.min(network.getEnergyStoredL(), storedRF - extractRF),
+ network.getMaxOutput())) * GregTech_API.mRFtoEU / 100,
+ maxEUOutput());
+ Logger.WARNING(
+ "Drained from EIO CapBank Tile: " + (tEU * 100 / GregTech_API.mRFtoEU)
+ + "");
+ network.addEnergy((int) -(tEU * 100 / GregTech_API.mRFtoEU));
+ }
+ } else {
+ if (storedRF > extractRF) {
+ ((IPowerContainer) tTileEntity).setEnergyStored(storedRF - extractRF);
+ tEU = maxEUOutput();
+ Logger.WARNING(
+ "Drained from EIO Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + "");
+ } else {
+ ((IPowerContainer) tTileEntity).setEnergyStored(0);
+ tEU = storedRF * GregTech_API.mRFtoEU / 100;
+ Logger.WARNING(
+ "Drained from EIO Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + "");
+ }
+ }
+ }
Logger.WARNING("EU to inject: " + tEU + "EU");
if (!simulate) {
aVal = this.getBaseMetaTileEntity().increaseStoredEnergyUnits(tEU, true);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
index 7d9ecebf2c..502cdd2d7e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
@@ -17,24 +19,23 @@ import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.item.ItemStack;
public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_BasicGenerator {
public int mEfficiency;
- /*public GT_MetaTileEntity_SemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) {
- super(aID, aName, aNameRegional, aTier);
- onConfigLoad();
- }*/
+ /*
+ * public GT_MetaTileEntity_SemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) { super(aID,
+ * aName, aNameRegional, aTier); onConfigLoad(); }
+ */
public GT_MetaTileEntity_SemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, "Requires semi-fluid Fuel", new ITexture[0]);
onConfigLoad();
}
- public GT_MetaTileEntity_SemiFluidGenerator(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_SemiFluidGenerator(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
onConfigLoad();
}
@@ -69,12 +70,8 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Produces " + (this.getPollution()) + " pollution/sec",
- "Fuel Efficiency: " + this.getEfficiency() + "%",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Produces " + (this.getPollution()) + " pollution/sec",
+ "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip };
}
@Override
@@ -111,75 +108,63 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
@Override
public ITexture[] getFront(byte aColor) {
- return new ITexture[] {
- super.getFront(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]
- };
+ return new ITexture[] { super.getFront(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT),
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
}
@Override
public ITexture[] getBack(byte aColor) {
- return new ITexture[] {
- super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP)
- };
+ return new ITexture[] { super.getBack(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) };
}
@Override
public ITexture[] getBottom(byte aColor) {
- return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
- };
+ return new ITexture[] { super.getBottom(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) };
}
@Override
public ITexture[] getTop(byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE)
- };
+ return new ITexture[] { super.getTop(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE) };
}
@Override
public ITexture[] getSides(byte aColor) {
- return new ITexture[] {
- super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP)
- };
+ return new ITexture[] { super.getSides(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP) };
}
@Override
public ITexture[] getFrontActive(byte aColor) {
- return new ITexture[] {
- super.getFrontActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]
- };
+ return new ITexture[] { super.getFrontActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE),
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
}
@Override
public ITexture[] getBackActive(byte aColor) {
- return new ITexture[] {
- super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)
- };
+ return new ITexture[] { super.getBackActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) };
}
@Override
public ITexture[] getBottomActive(byte aColor) {
- return new ITexture[] {
- super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
- };
+ return new ITexture[] { super.getBottomActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) };
}
@Override
public ITexture[] getTopActive(byte aColor) {
- return new ITexture[] {
- super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE)
- };
+ return new ITexture[] { super.getTopActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE) };
}
@Override
public ITexture[] getSidesActive(byte aColor) {
- return new ITexture[] {
- super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)
- };
+ return new ITexture[] { super.getSidesActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
index 2897f621d6..cee2bbff15 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
@@ -14,14 +16,13 @@ import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocketFuelGeneratorBase {
public int mEfficiency;
- public GregtechMetaTileEntityDoubleFuelGeneratorBase(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GregtechMetaTileEntityDoubleFuelGeneratorBase(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(
aID,
aName,
@@ -32,20 +33,16 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
this.onConfigLoad();
}
- public GregtechMetaTileEntityDoubleFuelGeneratorBase(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GregtechMetaTileEntityDoubleFuelGeneratorBase(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
this.onConfigLoad();
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
- "Output Voltage: " + this.getOutputTier() + " EU/t",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
+ "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip };
}
@Override
@@ -56,7 +53,10 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
@Override
public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntityDoubleFuelGeneratorBase(
- this.mName, this.mTier, this.mDescription, this.mTextures);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures);
}
@Override
@@ -71,7 +71,9 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
public void onConfigLoad() {
this.mEfficiency = GregTech_API.sMachineFile.get(
- ConfigCategories.machineconfig, "RocketEngine.efficiency.tier." + this.mTier, (100 - (this.mTier * 8)));
+ ConfigCategories.machineconfig,
+ "RocketEngine.efficiency.tier." + this.mTier,
+ (100 - (this.mTier * 8)));
}
@Override
@@ -98,89 +100,67 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
}
- // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+ // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
}
@Override
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- super.getFront(aColor)[0],
- this.getCasingTexture(),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
- };
+ return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(),
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
}
@Override
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- super.getBack(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent)
- };
+ return new ITexture[] { super.getBack(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent) };
}
@Override
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { super.getBottom(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
@Override
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
- };
+ return new ITexture[] { super.getTop(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off) };
}
@Override
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- super.getSides(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
- };
+ return new ITexture[] { super.getSides(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) };
}
@Override
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- super.getFrontActive(aColor)[0],
- this.getCasingTexture(),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
- };
+ return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(),
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
}
@Override
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- super.getBackActive(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast)
- };
+ return new ITexture[] { super.getBackActive(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast) };
}
@Override
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { super.getBottomActive(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
@Override
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
- };
+ return new ITexture[] { super.getTopActive(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On) };
}
@Override
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- super.getSidesActive(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)
- };
+ return new ITexture[] { super.getSidesActive(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
index 520f960ec9..e116379aef 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
@@ -15,21 +18,19 @@ import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity_BasicGenerator {
public int mEfficiency;
- public GregtechMetaTileEntityGeothermalGenerator(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GregtechMetaTileEntityGeothermalGenerator(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier, "Requires Pahoehoe Lava or Normal Lava as Fuel", new ITexture[0]);
this.onConfigLoad();
}
- public GregtechMetaTileEntityGeothermalGenerator(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GregtechMetaTileEntityGeothermalGenerator(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
this.onConfigLoad();
}
@@ -37,12 +38,8 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
@Override
public String[] getDescription() {
String aPollution = "Causes " + this.getPollution() + " Pollution per second";
- return new String[] {
- this.mDescription,
- "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
- aPollution,
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
+ aPollution, CORE.GT_Tooltip };
}
@Override
@@ -90,83 +87,68 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
@Override
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- super.getFront(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
- };
+ return new ITexture[] { super.getFront(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
}
@Override
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- super.getBack(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical)
- };
+ return new ITexture[] { super.getBack(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical) };
}
@Override
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
- };
+ return new ITexture[] { super.getBottom(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM) };
}
@Override
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER)
- };
+ return new ITexture[] { super.getTop(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER) };
}
@Override
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT)
- };
+ return new ITexture[] { super.getSides(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT) };
}
@Override
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- super.getFrontActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
- };
+ return new ITexture[] { super.getFrontActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE),
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
}
@Override
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- super.getBackActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active)
- };
+ return new ITexture[] { super.getBackActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active) };
}
@Override
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
- };
+ return new ITexture[] { super.getBottomActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE) };
}
@Override
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- super.getTopActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE)
- };
+ return new ITexture[] { super.getTopActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE) };
}
@Override
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE)
- };
+ return new ITexture[] { super.getSidesActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE) };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
index b6c2f27ce6..734f2a8919 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
+import net.minecraft.item.ItemStack;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
@@ -14,20 +16,19 @@ import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFuelGeneratorBase {
public int mEfficiency;
- public GregtechMetaTileEntityRocketFuelGenerator(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GregtechMetaTileEntityRocketFuelGenerator(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier, "Requires GT++ Rocket Fuels", new ITexture[0]);
this.onConfigLoad();
}
- public GregtechMetaTileEntityRocketFuelGenerator(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GregtechMetaTileEntityRocketFuelGenerator(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
this.onConfigLoad();
}
@@ -85,88 +86,66 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
}
- // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+ // return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
}
@Override
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- super.getFront(aColor)[0],
- this.getCasingTexture(),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
- };
+ return new ITexture[] { super.getFront(aColor)[0], this.getCasingTexture(),
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
}
@Override
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- super.getBack(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent)
- };
+ return new ITexture[] { super.getBack(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent) };
}
@Override
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { super.getBottom(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
@Override
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
- };
+ return new ITexture[] { super.getTop(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off) };
}
@Override
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- super.getSides(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
- };
+ return new ITexture[] { super.getSides(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal) };
}
@Override
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- super.getFrontActive(aColor)[0],
- this.getCasingTexture(),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
- };
+ return new ITexture[] { super.getFrontActive(aColor)[0], this.getCasingTexture(),
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
}
@Override
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- super.getBackActive(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast)
- };
+ return new ITexture[] { super.getBackActive(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast) };
}
@Override
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { super.getBottomActive(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
@Override
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
- };
+ return new ITexture[] { super.getTopActive(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On) };
}
@Override
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- super.getSidesActive(aColor)[0],
- this.getCasingTexture(),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)
- };
+ return new ITexture[] { super.getSidesActive(aColor)[0], this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
index 73c8f0adab..7471a0edcc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
@@ -5,6 +5,7 @@ import static gregtech.api.enums.GT_Values.V;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.SteamVariant;
@@ -21,26 +22,22 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generato
public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGenerator {
- public GregtechMetaTileEntitySolarGenerator(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GregtechMetaTileEntitySolarGenerator(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier, "Feasts on the power of the Sun!", new ITexture[0]);
this.onConfigLoad();
}
- public GregtechMetaTileEntitySolarGenerator(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GregtechMetaTileEntitySolarGenerator(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
this.onConfigLoad();
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
- "Output Voltage: " + this.getOutputTier() + " EU/t",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
+ "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip };
}
@Override
@@ -55,13 +52,14 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
public void onConfigLoad() {
this.mEfficiency = GregTech_API.sMachineFile.get(
- ConfigCategories.machineconfig, "SunAbsorber.efficiency.tier." + this.mTier, 100 - (this.mTier * 10));
+ ConfigCategories.machineconfig,
+ "SunAbsorber.efficiency.tier." + this.mTier,
+ 100 - (this.mTier * 10));
}
@Override
public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
- if (aBaseMetaTileEntity.isServerSide()
- && aBaseMetaTileEntity.isAllowedToWork()
+ if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork()
&& (aBaseMetaTileEntity.getUniversalEnergyStored()
< (this.maxEUOutput() + aBaseMetaTileEntity.getEUCapacity()))) {
@@ -78,12 +76,12 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
if ((aTick % 10L) == 0L) {
- Logger.WARNING("getUniversalEnergyStored: " + aBaseMetaTileEntity.getUniversalEnergyStored()
- + " maxEUOutput * 20 + getMinimumStoredEU: "
- + ((this.maxEUOutput() * 20) + this.getMinimumStoredEU()));
+ Logger.WARNING(
+ "getUniversalEnergyStored: " + aBaseMetaTileEntity.getUniversalEnergyStored()
+ + " maxEUOutput * 20 + getMinimumStoredEU: "
+ + ((this.maxEUOutput() * 20) + this.getMinimumStoredEU()));
- if ((this.mSolarCharge > 100)
- && (aBaseMetaTileEntity.isAllowedToWork())
+ if ((this.mSolarCharge > 100) && (aBaseMetaTileEntity.isAllowedToWork())
&& (!aBaseMetaTileEntity.getWorld().isThundering())
&& (aBaseMetaTileEntity.getUniversalEnergyStored()
< (this.maxEUStore() - this.getMinimumStoredEU()))) {
@@ -97,23 +95,21 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
this.mSolarCharge += 1;
}
- if ((this.mProcessingEnergy <= 0)
- && (aBaseMetaTileEntity.isAllowedToWork())
+ if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork())
&& ((aTick % 64L) == 0L)
&& (!aBaseMetaTileEntity.getWorld().isThundering())) {
Logger.WARNING("Adding Processing Energy. Currently " + this.mProcessingEnergy);
- final boolean bRain =
- aBaseMetaTileEntity.getWorld().isRaining() && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F);
+ final boolean bRain = aBaseMetaTileEntity.getWorld().isRaining()
+ && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F);
this.mProcessingEnergy += (bRain && (aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4))
- || !aBaseMetaTileEntity.getSkyAtSide((byte) 1)
- ? 0
- : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
+ || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0
+ : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
}
if (aBaseMetaTileEntity.isServerSide()) {
// Utils.LOG_WARNING("6.");
- aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork()
- && (aBaseMetaTileEntity.getUniversalEnergyStored()
+ aBaseMetaTileEntity.setActive(
+ aBaseMetaTileEntity.isAllowedToWork() && (aBaseMetaTileEntity.getUniversalEnergyStored()
>= (this.maxEUOutput() + this.getMinimumStoredEU())));
}
}
@@ -132,87 +128,75 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
return Math.max(this.getEUVar(), (V[this.mTier] * 16000) + this.getMinimumStoredEU());
}
- ITexture SolarArray[] = {
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LV),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_MV),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_HV),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_EV),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)
- };
+ ITexture SolarArray[] = { new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LV),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_MV),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_HV),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_EV),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL) };
@Override
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- super.getFront(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
- };
+ return new ITexture[] { super.getFront(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT),
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
}
@Override
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
- };
+ return new ITexture[] { super.getBack(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
}
@Override
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
- };
+ return new ITexture[] { super.getBottom(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
}
@Override
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)};
+ return new ITexture[] { super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL) };
}
@Override
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
- };
+ return new ITexture[] { super.getSides(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
}
@Override
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- super.getFrontActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]
- };
+ return new ITexture[] { super.getFrontActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE),
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
}
@Override
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
- };
+ return new ITexture[] { super.getBackActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
}
@Override
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
- };
+ return new ITexture[] { super.getBottomActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
}
@Override
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)};
+ return new ITexture[] { super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL) };
}
@Override
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
- };
+ return new ITexture[] { super.getSidesActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
}
@Override
@@ -227,45 +211,36 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new ProgressBar()
- .setProgress(() -> (float) mProcessingEnergy / 1000)
+ builder.widget(
+ new ProgressBar().setProgress(() -> (float) mProcessingEnergy / 1000)
.setTexture(
GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()),
GT_UITextures.PROGRESSBAR_BOILER_STEAM,
10)
- .setDirection(ProgressBar.Direction.UP)
- .setPos(70, 25)
- .setSize(10, 54))
- .widget(new ProgressBar()
- .setProgress(() -> (float) getBaseMetaTileEntity().getStoredEU())
- .setTexture(
- GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()),
- GT_UITextures.PROGRESSBAR_BOILER_WATER,
- 10)
- .setDirection(ProgressBar.Direction.UP)
- .setPos(83, 25)
- .setSize(10, 54))
- .widget(new ProgressBar()
- .setProgress(() -> (float) mSolarCharge / maxProgresstime())
- .setTexture(
- GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()),
- GT_UITextures.PROGRESSBAR_BOILER_HEAT,
- 10)
- .setDirection(ProgressBar.Direction.UP)
- .setPos(96, 25)
- .setSize(10, 54))
- .widget(new ProgressBar()
- .setProgress(() -> (float) mProcessingEnergy / 1000)
- .setTexture(GT_UITextures.PROGRESSBAR_FUEL_STEAM.get(getSteamVariant()), 14)
- .setDirection(ProgressBar.Direction.UP)
- .setPos(116, 45)
- .setSize(14, 14));
+ .setDirection(ProgressBar.Direction.UP).setPos(70, 25).setSize(10, 54))
+ .widget(
+ new ProgressBar().setProgress(() -> (float) getBaseMetaTileEntity().getStoredEU())
+ .setTexture(
+ GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()),
+ GT_UITextures.PROGRESSBAR_BOILER_WATER,
+ 10)
+ .setDirection(ProgressBar.Direction.UP).setPos(83, 25).setSize(10, 54))
+ .widget(
+ new ProgressBar().setProgress(() -> (float) mSolarCharge / maxProgresstime())
+ .setTexture(
+ GT_UITextures.PROGRESSBAR_BOILER_EMPTY_STEAM.get(getSteamVariant()),
+ GT_UITextures.PROGRESSBAR_BOILER_HEAT,
+ 10)
+ .setDirection(ProgressBar.Direction.UP).setPos(96, 25).setSize(10, 54))
+ .widget(
+ new ProgressBar().setProgress(() -> (float) mProcessingEnergy / 1000)
+ .setTexture(GT_UITextures.PROGRESSBAR_FUEL_STEAM.get(getSteamVariant()), 14)
+ .setDirection(ProgressBar.Direction.UP).setPos(116, 45).setSize(14, 14));
}
@Override
public GUITextureSet getGUITextureSet() {
- return new GUITextureSet()
- .setMainBackground(GT_UITextures.BACKGROUND_STEAM.get(getSteamVariant()))
+ return new GUITextureSet().setMainBackground(GT_UITextures.BACKGROUND_STEAM.get(getSteamVariant()))
.setItemSlot(GT_UITextures.SLOT_ITEM_STEAM.get(getSteamVariant()))
.setCoverTab(
GT_UITextures.TAB_COVER_STEAM_NORMAL.get(getSteamVariant()),
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
index 5e8907073f..f32f9a8a76 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -15,13 +21,9 @@ import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator {
+
public int mEfficiency;
private int mDays;
private long mTicksToBurnFor;
@@ -96,9 +98,12 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
final NBTTagCompound data = list.getCompoundTagAt(0);
ItemStack lastUsedFuel = ItemStack.loadItemStackFromNBT(data);
if (lastUsedFuel != null) {
- this.mCurrentRecipe = getRecipes()
- .findRecipe(
- getBaseMetaTileEntity(), false, 9223372036854775807L, null, new ItemStack[] {lastUsedFuel});
+ this.mCurrentRecipe = getRecipes().findRecipe(
+ getBaseMetaTileEntity(),
+ false,
+ 9223372036854775807L,
+ null,
+ new ItemStack[] { lastUsedFuel });
}
}
@@ -121,8 +126,9 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
} else {
if (this.mInventory[getStackDisplaySlot()] == null)
this.mInventory[getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
- this.mInventory[getStackDisplaySlot()].setStackDisplayName("Generating: "
- + (aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU()) + " EU");
+ this.mInventory[getStackDisplaySlot()].setStackDisplayName(
+ "Generating: " + (aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU())
+ + " EU");
}
} else {
int tFuelValue = getFuelValue(this.mFluid);
@@ -154,25 +160,22 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
}
if ((tProducedEU > 0L) && (getPollution() > 0)) {
PollutionUtils.addPollution(
- aBaseMetaTileEntity, (int) (tProducedEU * getPollution() / 500 * this.mTier + 1L));
+ aBaseMetaTileEntity,
+ (int) (tProducedEU * getPollution() / 500 * this.mTier + 1L));
}
}
- if (aBaseMetaTileEntity.isServerSide())
- aBaseMetaTileEntity.setActive((aBaseMetaTileEntity.isAllowedToWork())
- && (aBaseMetaTileEntity.getUniversalEnergyStored() >= maxEUOutput() + getMinimumStoredEU()));
+ if (aBaseMetaTileEntity.isServerSide()) aBaseMetaTileEntity.setActive(
+ (aBaseMetaTileEntity.isAllowedToWork())
+ && (aBaseMetaTileEntity.getUniversalEnergyStored() >= maxEUOutput() + getMinimumStoredEU()));
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Fuel is measured in minecraft days (Check with Scanner)",
- "RTG changes output voltage depending on fuel",
- "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
- "Output Voltage: " + this.getOutputTier() + " EU/t",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Fuel is measured in minecraft days (Check with Scanner)",
+ "RTG changes output voltage depending on fuel",
+ "Generates power at " + this.getEfficiency() + "% Efficiency per tick",
+ "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip };
}
public GregtechMetaTileEntity_RTG(int aID, String aName, String aNameRegional, int aTier) {
@@ -199,8 +202,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
@Override
public boolean isOutputFacing(byte aSide) {
- return ((aSide > 1)
- && (aSide != getBaseMetaTileEntity().getFrontFacing())
+ return ((aSide > 1) && (aSide != getBaseMetaTileEntity().getFrontFacing())
&& (aSide != getBaseMetaTileEntity().getBackFacing()));
}
@@ -226,86 +228,68 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
@Override
public ITexture[] getFront(byte aColor) {
- return new ITexture[] {
- super.getFront(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB)
- };
+ return new ITexture[] { super.getFront(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB) };
}
@Override
public ITexture[] getBack(byte aColor) {
- return new ITexture[] {
- super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP)
- };
+ return new ITexture[] { super.getBack(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) };
}
@Override
public ITexture[] getBottom(byte aColor) {
- return new ITexture[] {
- super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP)
- };
+ return new ITexture[] { super.getBottom(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) };
}
@Override
public ITexture[] getTop(byte aColor) {
- return new ITexture[] {
- super.getTop(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE)
- };
+ return new ITexture[] { super.getTop(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) };
}
@Override
public ITexture[] getSides(byte aColor) {
- return new ITexture[] {
- gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
- gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()]
- };
+ return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)],
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+ gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] };
}
@Override
public ITexture[] getFrontActive(byte aColor) {
- return new ITexture[] {
- super.getFrontActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE)
- };
+ return new ITexture[] { super.getFrontActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE) };
}
@Override
public ITexture[] getBackActive(byte aColor) {
- return new ITexture[] {
- super.getBackActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE)
- };
+ return new ITexture[] { super.getBackActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) };
}
@Override
public ITexture[] getBottomActive(byte aColor) {
- return new ITexture[] {
- super.getBottomActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE)
- };
+ return new ITexture[] { super.getBottomActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) };
}
@Override
public ITexture[] getTopActive(byte aColor) {
- return new ITexture[] {
- super.getTopActive(aColor)[0],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)
- };
+ return new ITexture[] { super.getTopActive(aColor)[0],
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) };
}
@Override
public ITexture[] getSidesActive(byte aColor) {
- return new ITexture[] {
- gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)],
- new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
- gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()]
- };
+ return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)],
+ new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+ gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] };
}
public int getPollution() {
@@ -316,7 +300,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
public int getFuelValue(ItemStack aStack) {
if ((GT_Utility.isStackInvalid(aStack)) || (getRecipes() == null)) return 0;
GT_Recipe tFuel = getRecipes()
- .findRecipe(getBaseMetaTileEntity(), false, 9223372036854775807L, null, new ItemStack[] {aStack});
+ .findRecipe(getBaseMetaTileEntity(), false, 9223372036854775807L, null, new ItemStack[] { aStack });
if (tFuel != null) {
this.mCurrentRecipe = tFuel;
int voltage = tFuel.mEUt;
@@ -384,16 +368,13 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
@Override
public String[] getInfoData() {
- return new String[] {
- "RTG - Running at tier " + this.mTier,
- "Active: " + this.getBaseMetaTileEntity().isActive(),
- "Current Output: " + this.mVoltage + " EU/t",
- "Days of Fuel remaining: " + (mTicksToBurnFor / 20 / 60 / 20),
- "Hours of Fuel remaining: " + (mTicksToBurnFor / 20 / 60 / 60),
- "Ticks of " + this.mVoltage + "v remaining: " + (mTicksToBurnFor),
- "Current Recipe input: " + this.mCurrentRecipe != null
- ? this.mCurrentRecipe.mInputs[0].getDisplayName() + " x1"
- : "NUll"
- };
+ return new String[] { "RTG - Running at tier " + this.mTier,
+ "Active: " + this.getBaseMetaTileEntity().isActive(), "Current Output: " + this.mVoltage + " EU/t",
+ "Days of Fuel remaining: " + (mTicksToBurnFor / 20 / 60 / 20),
+ "Hours of Fuel remaining: " + (mTicksToBurnFor / 20 / 60 / 60),
+ "Ticks of " + this.mVoltage + "v remaining: " + (mTicksToBurnFor),
+ "Current Recipe input: " + this.mCurrentRecipe != null
+ ? this.mCurrentRecipe.mInputs[0].getDisplayName() + " x1"
+ : "NUll" };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java
index 3398ad0fc6..70bf88ec77 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java
@@ -11,23 +11,20 @@ import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator
import gtPlusPlus.core.lib.CORE;
public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity_DieselGenerator {
+
public GT_MetaTileEntity_ULV_CombustionGenerator(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier);
}
- public GT_MetaTileEntity_ULV_CombustionGenerator(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_ULV_CombustionGenerator(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Produces " + (this.getPollution() * 20) + " pollution/sec",
- "Fuel Efficiency: " + this.getEfficiency() + "%",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec",
+ "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip };
}
@Override
@@ -47,7 +44,7 @@ public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity
@Override
public void onConfigLoad() {
- this.mEfficiency = GregTech_API.sMachineFile.get(
- ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, 95);
+ this.mEfficiency = GregTech_API.sMachineFile
+ .get(ConfigCategories.machineconfig, "DieselGenerator.efficiency.tier." + this.mTier, 95);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java
index b8f8004dad..c4d3340ac0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java
@@ -14,6 +14,7 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbine {
+
public GT_MetaTileEntity_ULV_GasTurbine(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier);
}
@@ -24,12 +25,8 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Produces " + (this.getPollution() * 20) + " pollution/sec",
- "Fuel Efficiency: " + this.getEfficiency() + "%",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec",
+ "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip };
}
@Override
@@ -48,15 +45,13 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi
@Override
public void onConfigLoad() {
- this.mEfficiency = GregTech_API.sMachineFile.get(
- ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, 95);
+ this.mEfficiency = GregTech_API.sMachineFile
+ .get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, 95);
}
@Override
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- super.getSidesActive(aColor)[0],
- new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)
- };
+ return new ITexture[] { super.getSidesActive(aColor)[0],
+ new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java
index 09e3e3201c..a07e69e00c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java
@@ -14,6 +14,7 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamTurbine {
+
public GT_MetaTileEntity_ULV_SteamTurbine(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier);
}
@@ -24,12 +25,8 @@ public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamT
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Produces " + (this.getPollution() * 20) + " pollution/sec",
- "Fuel Efficiency: " + this.getEfficiency() + "%",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec",
+ "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip };
}
@Override
@@ -48,15 +45,13 @@ public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamT
@Override
public void onConfigLoad() {
- this.mEfficiency = GregTech_API.sMachineFile.get(
- ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + 1);
+ this.mEfficiency = GregTech_API.sMachineFile
+ .get(ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + 1);
}
@Override
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- super.getSidesActive(aColor)[0],
- new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)
- };
+ return new ITexture[] { super.getSidesActive(aColor)[0],
+ new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
index d99ff30b20..42fda63282 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
@@ -2,7 +2,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.creative;
import static gregtech.api.enums.GT_Values.V;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
import com.gtnewhorizon.gtnhlib.reflect.Fields;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
@@ -18,51 +25,33 @@ import gtPlusPlus.core.util.sys.KeyboardUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
/**
* NEVER INCLUDE THIS FILE IN YOUR MOD!!!
*
- * This is the main construct for my Basic Machines such as the Automatic
- * Extractor Extend this class to make a simple Machine
+ * This is the main construct for my Basic Machines such as the Automatic Extractor Extend this class to make a simple
+ * Machine
*/
public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
private int mVoltageTier = 3;
- public GregtechMetaCreativeEnergyBuffer(
- final String aName,
- final int aTier,
- final String aDescription,
- final ITexture[][][] aTextures,
- final int aSlotCount) {
+ public GregtechMetaCreativeEnergyBuffer(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures, final int aSlotCount) {
super(aName, aTier, aDescription, aTextures, aSlotCount);
// TODO Auto-generated constructor stub
}
- public GregtechMetaCreativeEnergyBuffer(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final int aSlotCount) {
+ public GregtechMetaCreativeEnergyBuffer(final int aID, final String aName, final String aNameRegional,
+ final int aTier, final String aDescription, final int aSlotCount) {
super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Use Screwdriver to change voltage",
- "Hold Shift while using Screwdriver to change amperage",
- EnumChatFormatting.GREEN + "CREATIVE MACHINE",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Use Screwdriver to change voltage",
+ "Hold Shift while using Screwdriver to change amperage", EnumChatFormatting.GREEN + "CREATIVE MACHINE",
+ CORE.GT_Tooltip };
}
/*
@@ -77,25 +66,17 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
final ITexture[][][] rTextures = new ITexture[2][17][];
k = j ? g : h;
for (byte i = -1; i < 16; i++) {
- rTextures[0][i + 1] = new ITexture[] {new GT_RenderedTexture(k)};
- rTextures[1][i + 1] = new ITexture[] {
- new GT_RenderedTexture(k),
- this.mInventory.length > 4
- ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mVoltageTier]
- : Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mVoltageTier]
- };
+ rTextures[0][i + 1] = new ITexture[] { new GT_RenderedTexture(k) };
+ rTextures[1][i + 1] = new ITexture[] { new GT_RenderedTexture(k),
+ this.mInventory.length > 4 ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mVoltageTier]
+ : Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mVoltageTier] };
}
return rTextures;
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
return this.mTextures[aSide == aFacing ? 1 : 0][aColorIndex + 1];
}
@@ -106,15 +87,19 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
final double roundOff = Math.round(c * 100.00) / 100.00;
PlayerUtils.messagePlayer(
playerIn,
- "Energy: " + GT_Utility.formatNumbers(tempStorage) + " EU at " + V[this.mVoltageTier] + "v (" + roundOff
- + "%)");
+ "Energy: " + GT_Utility
+ .formatNumbers(tempStorage) + " EU at " + V[this.mVoltageTier] + "v (" + roundOff + "%)");
PlayerUtils.messagePlayer(playerIn, "Amperage: " + GT_Utility.formatNumbers(maxAmperesOut()) + "A");
}
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaCreativeEnergyBuffer(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mInventory.length);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mInventory.length);
}
@Override
@@ -170,23 +155,22 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
public String[] getInfoData() {
String[] infoData = super.getInfoData();
- return new String[] {
- infoData[0], "THIS IS A CREATIVE ITEM - FOR TESTING | Tier: " + this.mVoltageTier, infoData[1], infoData[2]
- };
+ return new String[] { infoData[0], "THIS IS A CREATIVE ITEM - FOR TESTING | Tier: " + this.mVoltageTier,
+ infoData[1], infoData[2] };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
index c65c7be917..c9d575cab1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import java.util.*;
+import java.util.Map.Entry;
+
+import net.minecraft.entity.player.*;
+import net.minecraft.item.*;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+
import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
@@ -7,6 +15,7 @@ import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget;
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
import com.gtnewhorizons.modularui.common.widget.SlotGroup;
+
import gregtech.api.enums.*;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.gui.modularui.GT_UITextures;
@@ -24,12 +33,6 @@ import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import ic2.api.crops.*;
import ic2.core.item.DamageHandler;
-import java.util.*;
-import java.util.Map.Entry;
-import net.minecraft.entity.player.*;
-import net.minecraft.item.*;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank {
@@ -51,8 +54,8 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
aDescription);
}
- public GT_MetaTileEntity_CropHarvestor(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_CropHarvestor(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 21, aDescription, aTextures);
}
@@ -185,9 +188,9 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
@Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
super.onPostTick(aBaseMetaTileEntity, aTick);
- if (!getBaseMetaTileEntity().isServerSide()
- || !getBaseMetaTileEntity().isAllowedToWork()
- || (!getBaseMetaTileEntity().hasWorkJustBeenEnabled() && aTick % 100 != 0)) return;
+ if (!getBaseMetaTileEntity().isServerSide() || !getBaseMetaTileEntity().isAllowedToWork()
+ || (!getBaseMetaTileEntity().hasWorkJustBeenEnabled() && aTick % 100 != 0))
+ return;
if (this.getBaseMetaTileEntity().getUniversalEnergyStored() < getMinimumStoredEU()) return;
@@ -328,8 +331,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
if (!this.mModeAlternative) {
return;
}
- if (hasFertilizer()
- && consumeFertilizer(true)
+ if (hasFertilizer() && consumeFertilizer(true)
&& this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU()
&& getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsageSecondary(), true)
&& applyFertilizer(aCrop)) {
@@ -337,14 +339,12 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
// Logger.INFO("Consumed Fert.");
}
}
- if (this.getFluidAmount() > 0
- && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU()
+ if (this.getFluidAmount() > 0 && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU()
&& getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsageSecondary(), true)
&& applyHydration(aCrop)) {
// Logger.INFO("Consumed Water.");
}
- if (hasWeedEX()
- && consumeWeedEX(true)
+ if (hasWeedEX() && consumeWeedEX(true)
&& this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU()
&& getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsageSecondary(), true)
&& applyWeedEx(aCrop)) {
@@ -359,8 +359,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
aCrop.setWeedExStorage(aCrop.getWeedExStorage() + 50);
boolean triggerDecline;
triggerDecline = aCrop.getWorld().rand.nextInt(3) == 0;
- if (aCrop.getCrop() != null
- && aCrop.getCrop().isWeed(aCrop)
+ if (aCrop.getCrop() != null && aCrop.getCrop().isWeed(aCrop)
&& aCrop.getWeedExStorage() >= 75
&& triggerDecline) {
switch (aCrop.getWorld().rand.nextInt(5)) {
@@ -445,8 +444,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
int damageApplied = 0;
ItemStack stack = this.mInventory[aSlot];
Item item = stack.getItem();
- if (stack != null
- && item.isDamageable()
+ if (stack != null && item.isDamageable()
&& (ret == null || stack.getItem() == ret.getItem() && ItemStack.areItemStackTagsEqual(stack, ret))) {
if (simulate) {
stack = stack.copy();
@@ -500,17 +498,13 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
public String[] getDescription() {
int aRadius = 10 + getRange(this.mTier);
int aSide = (aRadius - 1) / 2;
- return new String[] {
- this.mDescription,
- "Secondary mode can Hydrate/Fertilize/Weed-EX",
- "Consumes " + powerUsage() + "eu per harvest",
- "Consumes " + powerUsageSecondary() + "eu per secondary operation",
- "Can harvest 2 blocks above and below",
- "Radius: " + aSide + " each side (" + aRadius + "x3x" + aRadius + ")",
- "Has " + (this.mTier * 5) + "% chance for extra drops",
- "Holds " + this.getCapacity() + "L of Water",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Secondary mode can Hydrate/Fertilize/Weed-EX",
+ "Consumes " + powerUsage() + "eu per harvest",
+ "Consumes " + powerUsageSecondary() + "eu per secondary operation",
+ "Can harvest 2 blocks above and below",
+ "Radius: " + aSide + " each side (" + aRadius + "x3x" + aRadius + ")",
+ "Has " + (this.mTier * 5) + "% chance for extra drops", "Holds " + this.getCapacity() + "L of Water",
+ CORE.GT_Tooltip };
}
@Override
@@ -518,47 +512,17 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
return true;
}
- /*@Override
- public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
- if (aSide == aFacing)
- return 118+(aRedstone?8:0);
- if (GT_Utility.getOppositeSide(aSide) == aFacing)
- return 113+(aRedstone?8:0);
-
- int tIndex = 128+(aRedstone?8:0);
-
- switch (aFacing) {
- case 0:
- return tIndex+64;
- case 1:
- return tIndex+32;
- case 2: switch (aSide) {
- case 0: return tIndex+32;
- case 1: return tIndex+32;
- case 4: return tIndex+16;
- case 5: return tIndex+48;
- }
- case 3: switch (aSide) {
- case 0: return tIndex+64;
- case 1: return tIndex+64;
- case 4: return tIndex+48;
- case 5: return tIndex+16;
- }
- case 4: switch (aSide) {
- case 0: return tIndex+16;
- case 1: return tIndex+16;
- case 2: return tIndex+48;
- case 3: return tIndex+16;
- }
- case 5: switch (aSide) {
- case 0: return tIndex+48;
- case 1: return tIndex+48;
- case 2: return tIndex+16;
- case 3: return tIndex+48;
- }
- }
- return tIndex;
- } */
+ /*
+ * @Override public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { if (aSide ==
+ * aFacing) return 118+(aRedstone?8:0); if (GT_Utility.getOppositeSide(aSide) == aFacing) return
+ * 113+(aRedstone?8:0); int tIndex = 128+(aRedstone?8:0); switch (aFacing) { case 0: return tIndex+64; case 1:
+ * return tIndex+32; case 2: switch (aSide) { case 0: return tIndex+32; case 1: return tIndex+32; case 4: return
+ * tIndex+16; case 5: return tIndex+48; } case 3: switch (aSide) { case 0: return tIndex+64; case 1: return
+ * tIndex+64; case 4: return tIndex+48; case 5: return tIndex+16; } case 4: switch (aSide) { case 0: return
+ * tIndex+16; case 1: return tIndex+16; case 2: return tIndex+48; case 3: return tIndex+16; } case 5: switch (aSide)
+ * { case 0: return tIndex+48; case 1: return tIndex+48; case 2: return tIndex+16; case 3: return tIndex+48; } }
+ * return tIndex; }
+ */
@Override
public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
@@ -579,56 +543,42 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == 0 || aSide == 1) {
return this.mTextures[3][aColorIndex + 1];
} else {
return this.mTextures[4][aColorIndex + 1];
}
- /*return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
- + 1];*/
+ /*
+ * return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide ==
+ * GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1];
+ */
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter) };
}
@Override
@@ -680,47 +630,52 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new CycleButtonWidget()
- .setToggle(() -> mModeAlternative, val -> mModeAlternative = val)
- .setTexture(GTPP_UITextures.OVERLAY_BUTTON_HARVESTER_MODE)
- .addTooltip(0, "Enable Hydration/Fertilizing/Weed-EX")
- .addTooltip(1, "Disable Hydration/Fertilizing/Weed-EX")
- .setBackground(GT_UITextures.BUTTON_STANDARD)
- .setPos(47, 63)
- .setSize(18, 18));
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 2)
- .startFromSlot(SLOT_WEEDEX_1)
+ builder.widget(
+ new CycleButtonWidget().setToggle(() -> mModeAlternative, val -> mModeAlternative = val)
+ .setTexture(GTPP_UITextures.OVERLAY_BUTTON_HARVESTER_MODE)
+ .addTooltip(0, "Enable Hydration/Fertilizing/Weed-EX")
+ .addTooltip(1, "Disable Hydration/Fertilizing/Weed-EX")
+ .setBackground(GT_UITextures.BUTTON_STANDARD).setPos(47, 63).setSize(18, 18));
+ builder.widget(
+ SlotGroup
+ .ofItemHandler(inventoryHandler, 2).startFromSlot(
+ SLOT_WEEDEX_1)
.endAtSlot(SLOT_WEEDEX_2)
- .applyForWidget(widget -> widget.setFilter(stack -> stack != null
- && stack.getItem().getUnlocalizedName().equals("ic2.itemWeedEx"))
- .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_WEED_EX))
- .build()
- .setPos(7, 13))
- .widget(SlotGroup.ofItemHandler(inventoryHandler, 2)
- .startFromSlot(SLOT_FERT_1)
- .endAtSlot(SLOT_FERT_4)
- .applyForWidget(widget -> widget.setFilter(stack -> stack != null
- && stack.getItem().getUnlocalizedName().equals("ic2.itemFertilizer"))
- .setBackground(
- getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_FERTILIZER))
- .build()
- .setPos(7, 31))
- .widget(SlotGroup.ofItemHandler(inventoryHandler, 6)
- .startFromSlot(SLOT_OUTPUT_START)
- .endAtSlot(SLOT_OUTPUT_START + 6 * 3)
- .canInsert(false)
- .build()
- .setPos(61, 7));
- builder.widget(new ProgressBar()
+ .applyForWidget(
+ widget -> widget.setFilter(
+ stack -> stack != null
+ && stack.getItem().getUnlocalizedName().equals("ic2.itemWeedEx"))
+ .setBackground(
+ getGUITextureSet().getItemSlot(),
+ GTPP_UITextures.OVERLAY_SLOT_WEED_EX))
+ .build().setPos(7, 13))
+ .widget(
+ SlotGroup
+ .ofItemHandler(inventoryHandler, 2).startFromSlot(SLOT_FERT_1).endAtSlot(
+ SLOT_FERT_4)
+ .applyForWidget(
+ widget -> widget.setFilter(
+ stack -> stack != null && stack.getItem().getUnlocalizedName()
+ .equals("ic2.itemFertilizer"))
+ .setBackground(
+ getGUITextureSet().getItemSlot(),
+ GTPP_UITextures.OVERLAY_SLOT_FERTILIZER))
+ .build().setPos(7, 31))
+ .widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 6).startFromSlot(SLOT_OUTPUT_START)
+ .endAtSlot(SLOT_OUTPUT_START + 6 * 3).canInsert(false).build().setPos(61, 7));
+ builder.widget(
+ new ProgressBar()
.setTexture(
- GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, GT_UITextures.PROGRESSBAR_BOILER_WATER, 54)
+ GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY,
+ GT_UITextures.PROGRESSBAR_BOILER_WATER,
+ 54)
.setDirection(ProgressBar.Direction.UP)
- .setProgress(() -> (float) getFluidAmount() / getCapacity())
- .setSynced(false, false)
- .dynamicTooltip(() ->
- Collections.singletonList("Water: " + getFluidAmount() + "L / " + getCapacity() + "L"))
- .setPos(47, 7)
- .setSize(10, 54))
+ .setProgress(() -> (float) getFluidAmount() / getCapacity()).setSynced(false, false)
+ .dynamicTooltip(
+ () -> Collections
+ .singletonList("Water: " + getFluidAmount() + "L / " + getCapacity() + "L"))
+ .setPos(47, 7).setSize(10, 54))
.widget(new FakeSyncWidget.FluidStackSyncer(this::getDrainableStack, this::setDrainableStack));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
index 6ba1e373eb..4e5a6e352a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
@@ -2,20 +2,10 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
import static gregtech.api.enums.GT_Values.V;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.Textures;
-import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -25,6 +15,18 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.Textures;
+import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
+import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+
public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_TieredMachineBlock {
public static String[] BlacklistedTileEntiyClassNames;
@@ -35,7 +37,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
private static CustomIcon _mGTIco_Norm_Active;
private static CustomIcon _mGTIco_TE_Idle;
private static CustomIcon _mGTIco_TE_Active;
- private static int[] mAccelerateStatic = {1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 512, 512, 512, 512, 512, 512};
+ private static int[] mAccelerateStatic = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 512, 512, 512, 512, 512, 512 };
@Override
public void registerIcons(IIconRegister aBlockIconRegister) {
@@ -64,18 +66,17 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
@Override
public String[] getDescription() {
return new String[] {
- String.format(
- "Accelerating things (Radius: %d EU/t: %d Speed Bonus: x%d)",
- mTier, getEnergyDemand(mTier, false), mAccelerateStatic[mTier]),
- "Use a screwdriver to change mode",
- "To accelerate TileEntities, this machine has to be adjacent to it",
- "This machine accepts up to 8 Amps",
- "Accelerating TileEntities doubles Energy-Demand"
- };
+ String.format(
+ "Accelerating things (Radius: %d EU/t: %d Speed Bonus: x%d)",
+ mTier,
+ getEnergyDemand(mTier, false),
+ mAccelerateStatic[mTier]),
+ "Use a screwdriver to change mode", "To accelerate TileEntities, this machine has to be adjacent to it",
+ "This machine accepts up to 8 Amps", "Accelerating TileEntities doubles Energy-Demand" };
}
- public GT_MetaTileEntity_WorldAccelerator(
- String pName, int pTier, int pInvSlotCount, String pDescription, ITexture[][][] pTextures) {
+ public GT_MetaTileEntity_WorldAccelerator(String pName, int pTier, int pInvSlotCount, String pDescription,
+ ITexture[][][] pTextures) {
super(pName, pTier, pInvSlotCount, pDescription, pTextures);
}
@@ -90,29 +91,13 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity pBaseMetaTileEntity,
- byte pSide,
- byte pFacing,
- byte pColorIndex,
- boolean pActive,
- boolean pRedstone) {
- if (mMode == 0)
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1],
- (pSide < 2)
- ? null
- : pActive
- ? new GT_RenderedTexture(_mGTIco_Norm_Active)
- : new GT_RenderedTexture(_mGTIco_Norm_Idle)
- };
- else
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1],
- (pSide < 2)
- ? null
- : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle)
- };
+ public ITexture[] getTexture(IGregTechTileEntity pBaseMetaTileEntity, byte pSide, byte pFacing, byte pColorIndex,
+ boolean pActive, boolean pRedstone) {
+ if (mMode == 0) return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], (pSide < 2)
+ ? null
+ : pActive ? new GT_RenderedTexture(_mGTIco_Norm_Active) : new GT_RenderedTexture(_mGTIco_Norm_Idle) };
+ else return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], (pSide < 2) ? null
+ : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle) };
}
@Override
@@ -189,7 +174,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
return 8;
}
- private static String[] mModeStr = {"Blocks", "TileEntities"};
+ private static String[] mModeStr = { "Blocks", "TileEntities" };
@Override
public void onScrewdriverRightClick(byte pSide, EntityPlayer pPlayer, float pX, float pY, float pZ) {
@@ -259,9 +244,9 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
String tSimpleClassName = pTile.getClass().getSimpleName().toLowerCase();
String tCanonicalName = pTile.getClass().getCanonicalName().toLowerCase();
- if (tSimpleClassName.contains("conduit")
- || tSimpleClassName.contains("wire")
- || tSimpleClassName.contains("cable")) return true;
+ if (tSimpleClassName.contains("conduit") || tSimpleClassName.contains("wire")
+ || tSimpleClassName.contains("cable"))
+ return true;
if (tCanonicalName.contains("appeng") || tCanonicalName.contains("gregtech"))
// Don't accelerate ANY Gregtech machines!
return true;
@@ -273,10 +258,9 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
}
/**
- * Accelerate normal blocks. Eats some power and adds randomTicks to every
- * block within its working area (Tier-Number = radius) This does only
- * affect blocks that implement the "RandomTick" method; Which is mostly
- * used for grass growth and plants.
+ * Accelerate normal blocks. Eats some power and adds randomTicks to every block within its working area
+ * (Tier-Number = radius) This does only affect blocks that implement the "RandomTick" method; Which is mostly used
+ * for grass growth and plants.
*
* @param pBaseMetaTileEntity
*/
@@ -295,9 +279,8 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
int tZ1 = tZ - mTier;
int tZ2 = tZ + mTier;
- for (int xi = tX1; xi <= tX2; xi++)
- for (int yi = tY1; yi <= tY2; yi++)
- for (int zi = tZ1; zi <= tZ2; zi++) tryTickBlock(pWorld, xi, yi, zi, rnd);
+ for (int xi = tX1; xi <= tX2; xi++) for (int yi = tY1; yi <= tY2; yi++)
+ for (int zi = tZ1; zi <= tZ2; zi++) tryTickBlock(pWorld, xi, yi, zi, rnd);
}
/**
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
index 19994896e8..2d734b5bf9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
@@ -2,11 +2,23 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
import static gregtech.api.enums.GT_Values.V;
+import java.util.Collections;
+import java.util.HashMap;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+
+import org.apache.commons.lang3.ArrayUtils;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
@@ -32,14 +44,6 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.Collections;
-import java.util.HashMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
-import org.apache.commons.lang3.ArrayUtils;
public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_BasicMachine {
@@ -73,33 +77,38 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
0,
"Recycler.png",
"",
- new ITexture[] {
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB)
- });
+ new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) });
mPollutionEnabled = PollutionUtils.isPollutionEnabled();
}
- public GregtechMetaAtmosphericReconditioner(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+ public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+ String aGUIName, String aNEIName) {
super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName, aNEIName);
mPollutionEnabled = PollutionUtils.isPollutionEnabled();
}
- /*public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
- super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName, aNEIName);
- }*/
+ /*
+ * public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][]
+ * aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName,
+ * aNEIName); }
+ */
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GregtechMetaAtmosphericReconditioner(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mGUIName,
+ this.mNEIName);
}
@Override
@@ -107,26 +116,21 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
boolean highTier = this.mTier >= 7;
- String[] A = new String[] {
- this.mDescription,
- highTier ? "Will attempt to remove 1/4 pollution from 8 surrounding chunks" : "",
- highTier ? "If these chunks are not loaded, they will be ignored" : "",
- "Requires a turbine rotor and an Air Filter [T1/T2] to run.",
- "The turbine rotor must be manually inserted/replaced",
- "Can be configured with a soldering iron to change modes",
- "Low Efficiency: Removes half pollution, Turbine takes 50% dmg",
- "High Efficiency: Removes full pollution, Turbine takes 100% dmg",
- "Turbine Rotor will not break in LE mode",
- "Insert an equal tier Conveyor Module to enable automation"
- };
+ String[] A = new String[] { this.mDescription,
+ highTier ? "Will attempt to remove 1/4 pollution from 8 surrounding chunks" : "",
+ highTier ? "If these chunks are not loaded, they will be ignored" : "",
+ "Requires a turbine rotor and an Air Filter [T1/T2] to run.",
+ "The turbine rotor must be manually inserted/replaced",
+ "Can be configured with a soldering iron to change modes",
+ "Low Efficiency: Removes half pollution, Turbine takes 50% dmg",
+ "High Efficiency: Removes full pollution, Turbine takes 100% dmg",
+ "Turbine Rotor will not break in LE mode",
+ "Insert an equal tier Conveyor Module to enable automation" };
if (!mPollutionEnabled) {
- String[] B = new String[] {
- "===============================================",
- "Pollution is disabled, scrubbers will now have a bonus use",
- "They are now able to remove ALL lingering pollution as GT ignores it",
- "and it will linger forever!",
- "===============================================",
- };
+ String[] B = new String[] { "===============================================",
+ "Pollution is disabled, scrubbers will now have a bonus use",
+ "They are now able to remove ALL lingering pollution as GT ignores it",
+ "and it will linger forever!", "===============================================", };
A = ArrayUtils.addAll(A, B);
}
return A;
@@ -233,18 +237,17 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
Logger.INFO("Set Active.");
aBaseMetaTileEntity.setActive(true);
}
- } else if (!this.mHasPollution
- || mCurrentPollution <= 0
+ } else if (!this.mHasPollution || mCurrentPollution <= 0
|| stackRotor == null
|| stackFilter == null
|| !hasRotor(stackRotor)
|| !hasAirFilter(stackFilter)) {
- if (!this.getBaseMetaTileEntity().isActive()) {
- Logger.INFO("Set Inactive.");
- aBaseMetaTileEntity.setActive(false);
- this.sendSound((byte) -122);
- }
- }
+ if (!this.getBaseMetaTileEntity().isActive()) {
+ Logger.INFO("Set Inactive.");
+ aBaseMetaTileEntity.setActive(false);
+ this.sendSound((byte) -122);
+ }
+ }
// If Active.
if (aBaseMetaTileEntity.isActive()) {
@@ -291,8 +294,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
// If no sides are free, how will you process the atmosphere?
if (mAirSides > 0) {
- reduction += (((Math.max((tTier - 2), 1) * 2) * 50)
- * mAirSides); // Was originally *100
+ reduction += (((Math.max((tTier - 2), 1) * 2) * 50) * mAirSides); // Was
+ // originally
+ // *100
Logger.INFO("mPollutionReduction[1]:" + reduction);
// I stole this code
@@ -344,26 +348,24 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
}
} // End of can work block.
else { // Disable Machine.
- // aBaseMetaTileEntity.setActive(false);
+ // aBaseMetaTileEntity.setActive(false);
}
} // End of 1/sec action block.
else {
- if (hasRotor(stackRotor)
- && hasAirFilter(stackFilter)
+ if (hasRotor(stackRotor) && hasAirFilter(stackFilter)
&& this.mHasPollution
&& !isIdle
&& aBaseMetaTileEntity.isAllowedToWork()) {
aBaseMetaTileEntity.setActive(true);
- } else if (isIdle
- || !this.mHasPollution
+ } else if (isIdle || !this.mHasPollution
|| mCurrentPollution <= 0
|| stackRotor == null
|| stackFilter == null
|| !hasRotor(stackRotor)
|| !hasAirFilter(stackFilter)) {
- aBaseMetaTileEntity.setActive(false);
- }
+ aBaseMetaTileEntity.setActive(false);
+ }
}
if (this.getBaseMetaTileEntity().isActive()) {
if (MathUtils.randInt(0, 5) <= 2) {
@@ -427,14 +429,13 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
if (rotorStack.getItem() instanceof ItemBasicScrubberTurbine) {
// Logger.INFO("Found Basic Turbine Rotor.");
return true;
- } else if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool
- && rotorStack.getItemDamage() >= 170
+ } else if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool && rotorStack.getItemDamage() >= 170
&& rotorStack.getItemDamage() <= 179) {
- // Logger.INFO("Found Turbine Rotor.");
- return true;
- } else {
- // Logger.INFO("Found: "+rotorStack.getDisplayName()+":"+rotorStack.getItemDamage());
- }
+ // Logger.INFO("Found Turbine Rotor.");
+ return true;
+ } else {
+ // Logger.INFO("Found: "+rotorStack.getDisplayName()+":"+rotorStack.getItemDamage());
+ }
}
// Logger.INFO("Found No Turbine Rotor.");
return false;
@@ -482,42 +483,44 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
}
if (mInventory[SLOT_ROTOR].getItem() instanceof GT_MetaGenerated_Tool_01
- && ((GT_MetaGenerated_Tool) mInventory[SLOT_ROTOR].getItem())
- .getToolStats(mInventory[SLOT_ROTOR])
- .getSpeedMultiplier()
- > 0
+ && ((GT_MetaGenerated_Tool) mInventory[SLOT_ROTOR].getItem()).getToolStats(mInventory[SLOT_ROTOR])
+ .getSpeedMultiplier() > 0
&& GT_MetaGenerated_Tool.getPrimaryMaterial(mInventory[SLOT_ROTOR]).mToolSpeed > 0) {
- long damageValue = (long)
- Math.floor(Math.abs(MathUtils.randFloat(1, 2) - MathUtils.randFloat(1, 3)) * (1 + 3 - 1) + 1);
+ long damageValue = (long) Math
+ .floor(Math.abs(MathUtils.randFloat(1, 2) - MathUtils.randFloat(1, 3)) * (1 + 3 - 1) + 1);
double fDam = Math.floor(
Math.abs(MathUtils.randFloat(1f, 2f) - MathUtils.randFloat(1f, 2f)) * (1f + 2f - 1f) + 1f);
damageValue -= fDam;
// Logger.INFO("Trying to do "+damageValue+" damage to the rotor. ["+fDam+"]");
- /*Materials M1 = GT_MetaGenerated_Tool.getPrimaryMaterial(this.mInventory[this.SLOT_ROTOR]);
- Materials M2 = GT_MetaGenerated_Tool.getSecondaryMaterial(this.mInventory[this.SLOT_ROTOR]);
-
- Logger.INFO("Trying to do "+damageValue+" damage to the rotor. [2]");*/
+ /*
+ * Materials M1 = GT_MetaGenerated_Tool.getPrimaryMaterial(this.mInventory[this.SLOT_ROTOR]); Materials
+ * M2 = GT_MetaGenerated_Tool.getSecondaryMaterial(this.mInventory[this.SLOT_ROTOR]);
+ * Logger.INFO("Trying to do "+damageValue+" damage to the rotor. [2]");
+ */
// Damage Rotor
// int rotorDurability = this.mInventory[this.SLOT_ROTOR].getItemDamage();
- long rotorDamage =
- creativeRotor ? 0 : GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
- long rotorDurabilityMax = creativeRotor
- ? Integer.MAX_VALUE
+ long rotorDamage = creativeRotor ? 0
+ : GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
+ long rotorDurabilityMax = creativeRotor ? Integer.MAX_VALUE
: GT_MetaGenerated_Tool.getToolMaxDamage(this.mInventory[this.SLOT_ROTOR]);
long rotorDurability = (rotorDurabilityMax - rotorDamage);
- Logger.INFO("Rotor Damage: " + rotorDamage + " | Max Durability: " + rotorDurabilityMax + " | "
- + " Remaining Durability: " + rotorDurability);
+ Logger.INFO(
+ "Rotor Damage: " + rotorDamage
+ + " | Max Durability: "
+ + rotorDurabilityMax
+ + " | "
+ + " Remaining Durability: "
+ + rotorDurability);
if (rotorDurability >= damageValue) {
if (!mSaveRotor) {
Logger.INFO("Damaging Rotor.");
- if (!creativeRotor)
- GT_ModHandler.damageOrDechargeItem(
- this.mInventory[this.SLOT_ROTOR], (int) damageValue, 0, null);
+ if (!creativeRotor) GT_ModHandler
+ .damageOrDechargeItem(this.mInventory[this.SLOT_ROTOR], (int) damageValue, 0, null);
long tempDur = GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
if (tempDur < rotorDurabilityMax) {
@@ -528,9 +531,11 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
} else {
Logger.INFO("Damaging Rotor.");
if (rotorDurability > 1000) {
- if (!creativeRotor)
- GT_ModHandler.damageOrDechargeItem(
- this.mInventory[this.SLOT_ROTOR], (int) damageValue / 2, 0, null);
+ if (!creativeRotor) GT_ModHandler.damageOrDechargeItem(
+ this.mInventory[this.SLOT_ROTOR],
+ (int) damageValue / 2,
+ 0,
+ null);
long tempDur = GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]);
if (tempDur < rotorDurabilityMax) {
return true;
@@ -586,9 +591,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
public boolean removePollution(int toRemove) {
- if (this == null
- || this.getBaseMetaTileEntity() == null
- || this.getBaseMetaTileEntity().getWorld() == null) {
+ if (this == null || this.getBaseMetaTileEntity() == null || this.getBaseMetaTileEntity().getWorld() == null) {
return false;
}
@@ -603,11 +606,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
int chunksWithRemoval = 0;
int totalRemoved = 0;
AutoMap<Chunk> aSurrounding = new AutoMap<Chunk>();
- Chunk aThisChunk = this.getBaseMetaTileEntity()
- .getWorld()
- .getChunkFromBlockCoords(
- this.getBaseMetaTileEntity().getXCoord(),
- this.getBaseMetaTileEntity().getZCoord());
+ Chunk aThisChunk = this.getBaseMetaTileEntity().getWorld().getChunkFromBlockCoords(
+ this.getBaseMetaTileEntity().getXCoord(),
+ this.getBaseMetaTileEntity().getZCoord());
int mainChunkX = aThisChunk.xPosition;
int mainChunkZ = aThisChunk.zPosition;
@@ -645,8 +646,12 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
continue;
}
- Logger.INFO("Trying to remove pollution from chunk " + r.xPosition + ", " + r.zPosition + " | "
- + startPollution);
+ Logger.INFO(
+ "Trying to remove pollution from chunk " + r.xPosition
+ + ", "
+ + r.zPosition
+ + " | "
+ + startPollution);
int after = 0;
boolean isMainChunk = r.isAtLocation(mainChunkX, mainChunkZ);
@@ -660,8 +665,14 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
if (startPollution - after > 0) {
totalRemoved += (startPollution - after);
}
- Logger.INFO("Removed " + (startPollution - after) + " pollution from chunk " + r.xPosition + ", "
- + r.zPosition + " | " + after);
+ Logger.INFO(
+ "Removed " + (startPollution - after)
+ + " pollution from chunk "
+ + r.xPosition
+ + ", "
+ + r.zPosition
+ + " | "
+ + after);
}
return totalRemoved > 0 && chunksWithRemoval > 0;
}
@@ -741,8 +752,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
if (aStack.getItem() instanceof ItemBasicScrubberTurbine) {
return true;
}
- if (aStack.getItem() instanceof GT_MetaGenerated_Tool
- && aStack.getItemDamage() >= 170
+ if (aStack.getItem() instanceof GT_MetaGenerated_Tool && aStack.getItemDamage() >= 170
&& aStack.getItemDamage() <= 179) {
return true;
}
@@ -757,8 +767,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
}
- public boolean onSolderingToolRightClick(
- byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
+ float aZ) {
this.mSaveRotor = Utils.invertBoolean(mSaveRotor);
if (mSaveRotor) {
PlayerUtils.messagePlayer(aPlayer, "Running in low efficiency mode, rotors will not break.");
@@ -781,9 +791,10 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
} else if (aIndex == -121 || aIndex == -122) {
// GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(108)), 0, 0.5F, aX, aY,
// aZ);
- } /*else if (aIndex == -122) {
- GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(6)), 100, 1.0F, aX, aY, aZ);
- }*/ else {
+ } /*
+ * else if (aIndex == -122) { GT_Utility.doSoundAtClient((String)
+ * GregTech_API.sSoundList.get(Integer.valueOf(6)), 100, 1.0F, aX, aY, aZ); }
+ */ else {
super.doSound((byte) 0, aX, aY, aZ);
}
}
@@ -807,8 +818,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
long tVoltage = maxEUInput();
byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
reduction += (((Math.max((tTier - 2), 1) * 2) * 50) * mAirSides);
- reduction = (MathUtils.safeInt((long) reduction * this.mBaseEff) / 100000)
- * mAirSides
+ reduction = (MathUtils.safeInt((long) reduction * this.mBaseEff) / 100000) * mAirSides
* Math.max((tTier - 2), 1);
reduction = MathUtils.safeInt(((long) reduction / 100) * this.mOptimalAirFlow);
@@ -857,17 +867,20 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
public static ItemStack getTieredTurbine(int aTier) {
if (sGregTurbines == null) {
sGregTurbines = new ItemStack[3];
- sGregTurbines[0] = GT_MetaGenerated_Tool.sInstances
- .get("gt.metatool.01")
+ sGregTurbines[0] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01")
.getToolWithStats(GT_MetaGenerated_Tool_01.TURBINE_SMALL, 1, Materials.Iron, Materials.Iron, null);
- sGregTurbines[1] = GT_MetaGenerated_Tool.sInstances
- .get("gt.metatool.01")
- .getToolWithStats(
- GT_MetaGenerated_Tool_01.TURBINE_SMALL, 1, Materials.Bronze, Materials.Bronze, null);
- sGregTurbines[2] = GT_MetaGenerated_Tool.sInstances
- .get("gt.metatool.01")
- .getToolWithStats(
- GT_MetaGenerated_Tool_01.TURBINE_SMALL, 1, Materials.Steel, Materials.Steel, null);
+ sGregTurbines[1] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(
+ GT_MetaGenerated_Tool_01.TURBINE_SMALL,
+ 1,
+ Materials.Bronze,
+ Materials.Bronze,
+ null);
+ sGregTurbines[2] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(
+ GT_MetaGenerated_Tool_01.TURBINE_SMALL,
+ 1,
+ Materials.Steel,
+ Materials.Steel,
+ null);
} else {
return sGregTurbines[aTier];
}
@@ -879,9 +892,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
if (aStackRotor.getItem() instanceof ItemBasicScrubberTurbine) {
return getBaseEfficiency(getTieredTurbine(aStackRotor.getItemDamage()));
}
- return (int)
- ((50.0F + (10.0F * ((GT_MetaGenerated_Tool) aStackRotor.getItem()).getToolCombatDamage(aStackRotor)))
- * 100);
+ return (int) ((50.0F
+ + (10.0F * ((GT_MetaGenerated_Tool) aStackRotor.getItem()).getToolCombatDamage(aStackRotor))) * 100);
}
public int getOptimalAirFlow(ItemStack aStackRotor) {
@@ -890,9 +902,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
}
return (int) Math.max(
Float.MIN_NORMAL,
- ((GT_MetaGenerated_Tool) aStackRotor.getItem())
- .getToolStats(aStackRotor)
- .getSpeedMultiplier()
+ ((GT_MetaGenerated_Tool) aStackRotor.getItem()).getToolStats(aStackRotor).getSpeedMultiplier()
* GT_MetaGenerated_Tool.getPrimaryMaterial(aStackRotor).mToolSpeed
* 50);
}
@@ -904,32 +914,31 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new SlotWidget(inventoryHandler, SLOT_ROTOR)
- .setFilter(stack -> {
- if (stack.getItem() instanceof ItemBasicScrubberTurbine) {
- return true;
- }
- return stack.getItem() instanceof GT_MetaGenerated_Tool
- && stack.getItemDamage() >= 170
- && stack.getItemDamage() <= 179;
- })
- .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_TURBINE)
- .setPos(52, 24))
- .widget(new SlotWidget(inventoryHandler, SLOT_FILTER)
- .setFilter(stack -> stack.getItem() instanceof ItemAirFilter)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_RECYCLE)
- .setPos(106, 24))
- .widget(new SlotWidget(inventoryHandler, 7)
- .setFilter(stack -> GT_Utility.areStacksEqual(stack, mConveyorMap.get(mTier), true))
- .setPos(124, 62));
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_INFORMATION)
- .dynamicTooltip(() -> Collections.singletonList("Reduction: " + mPollutionReduction + "/s"))
- .attachSyncer(
- new FakeSyncWidget.IntegerSyncer(() -> mPollutionReduction, val -> mPollutionReduction = val),
- builder,
- (widget, val) -> widget.notifyTooltipChange())
- .setPos(163, 5)
- .setSize(7, 18));
+ builder.widget(new SlotWidget(inventoryHandler, SLOT_ROTOR).setFilter(stack -> {
+ if (stack.getItem() instanceof ItemBasicScrubberTurbine) {
+ return true;
+ }
+ return stack.getItem() instanceof GT_MetaGenerated_Tool && stack.getItemDamage() >= 170
+ && stack.getItemDamage() <= 179;
+ }).setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_TURBINE).setPos(52, 24))
+ .widget(
+ new SlotWidget(inventoryHandler, SLOT_FILTER)
+ .setFilter(stack -> stack.getItem() instanceof ItemAirFilter)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_RECYCLE)
+ .setPos(106, 24))
+ .widget(
+ new SlotWidget(inventoryHandler, 7)
+ .setFilter(stack -> GT_Utility.areStacksEqual(stack, mConveyorMap.get(mTier), true))
+ .setPos(124, 62));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_INFORMATION)
+ .dynamicTooltip(() -> Collections.singletonList("Reduction: " + mPollutionReduction + "/s"))
+ .attachSyncer(
+ new FakeSyncWidget.IntegerSyncer(
+ () -> mPollutionReduction,
+ val -> mPollutionReduction = val),
+ builder,
+ (widget, val) -> widget.notifyTooltipChange())
+ .setPos(163, 5).setSize(7, 18));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java
index 17edfd0d4d..c69ae51436 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java
@@ -1,10 +1,15 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidHandler;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.enums.Dyes;
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GT_UITextures;
@@ -19,9 +24,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidHandler;
public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAddGregtechLogo {
@@ -29,49 +31,44 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAd
super(aID, aName, aNameRegional, "A Steam condenser - [IC2->Steam]", new ITexture[0]);
}
- public GregtechMetaCondensor(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GregtechMetaCondensor(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "IC2 Steam + Water = Normal Steam.",
- "Requires no power to run, although it's not very fast.",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "IC2 Steam + Water = Normal Steam.",
+ "Requires no power to run, although it's not very fast.", CORE.GT_Tooltip };
}
@Override
public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
final ITexture[][][] rTextures = new ITexture[5][17][];
for (byte i = -1; i < 16; i++) {
- rTextures[0][(i + 1)] = new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa))
- };
+ rTextures[0][(i + 1)] = new ITexture[] { new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_CASING_VENT,
+ Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)) };
rTextures[1][(i + 1)] = new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)
- };
+ new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_CASING_VENT,
+ Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
rTextures[2][(i + 1)] = new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)
- };
+ new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_CASING_VENT,
+ Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
rTextures[3][(i + 1)] = new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER)
- };
+ new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_CASING_VENT,
+ Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER) };
rTextures[4][(i + 1)] = new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE)
- };
+ new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_CASING_VENT,
+ Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE) };
}
return rTextures;
}
@@ -102,16 +99,16 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAd
if (i != aBaseMetaTileEntity.getFrontFacing()) {
final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
if (tTileEntity != null) {
- final FluidStack tDrained = aBaseMetaTileEntity.drain(
- ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
+ final FluidStack tDrained = aBaseMetaTileEntity
+ .drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
if (tDrained != null) {
- final int tFilledAmount = tTileEntity.fill(
- ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
+ final int tFilledAmount = tTileEntity
+ .fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
if (tFilledAmount > 0) {
tTileEntity.fill(
ForgeDirection.getOrientation(i).getOpposite(),
- aBaseMetaTileEntity.drain(
- ForgeDirection.getOrientation(i), tFilledAmount, true),
+ aBaseMetaTileEntity
+ .drain(ForgeDirection.getOrientation(i), tFilledAmount, true),
true);
}
}
@@ -144,13 +141,13 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAd
this.sendSound((byte) 1);
this.mSteam.amount = getSteamCapacity() * 3 / 4;
}
- /*if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) &&
- (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.bucket.get(IC2.getItemFromBlock(p_150898_0_)))))
- {
- this.mProcessingEnergy += 1000;
- aBaseMetaTileEntity.decrStackSize(2, 1);
- aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L));
- }*/
+ /*
+ * if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) &&
+ * (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2],
+ * OrePrefixes.bucket.get(IC2.getItemFromBlock(p_150898_0_))))) { this.mProcessingEnergy += 1000;
+ * aBaseMetaTileEntity.decrStackSize(2, 1); aBaseMetaTileEntity.addStackToSlot(3,
+ * GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L)); }
+ */
if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && ((aTick % this.RI) == 0L)) {
this.mProcessingEnergy -= 40;
this.mTemperature += 2;
@@ -181,49 +178,49 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAd
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new SlotWidget(inventoryHandler, 0)
- .setPos(43, 25)
+ builder.widget(
+ new SlotWidget(inventoryHandler, 0).setPos(43, 25)
.setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN))
- .widget(new SlotWidget(inventoryHandler, 1)
- .setPos(43, 61)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT))
- .widget(new SlotWidget(inventoryHandler, 2)
- .setPos(115, 61)
- .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_COAL))
- .widget(new SlotWidget(inventoryHandler, 3)
- .setPos(115, 25)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DUST))
- .widget(new ProgressBar()
- .setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity())
- .setTexture(
- GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, GT_UITextures.PROGRESSBAR_BOILER_STEAM, 10)
- .setDirection(ProgressBar.Direction.UP)
- .setPos(70, 25)
- .setSize(10, 54))
- .widget(new ProgressBar()
- .setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity())
- .setTexture(
- GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, GT_UITextures.PROGRESSBAR_BOILER_WATER, 10)
- .setDirection(ProgressBar.Direction.UP)
- .setPos(83, 25)
- .setSize(10, 54))
- .widget(new ProgressBar()
- .setProgress(() -> (float) mTemperature / maxProgresstime())
- .setTexture(GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10)
- .setDirection(ProgressBar.Direction.UP)
- .setPos(96, 25)
- .setSize(10, 54))
- .widget(new ProgressBar()
- // cap minimum so that one can easily see there's fuel remaining
- .setProgress(
- () -> mProcessingEnergy > 0 ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) : 0)
- .setTexture(GTPP_UITextures.PROGRESSBAR_FUEL, 14)
- .setDirection(ProgressBar.Direction.UP)
- .setPos(116, 45)
- .setSize(14, 14))
- .widget(new DrawableWidget()
- .setDrawable(GTPP_UITextures.OVERLAY_SLOT_CANISTER_DARK)
- .setPos(43, 43)
- .setSize(18, 18));
+ .widget(
+ new SlotWidget(inventoryHandler, 1).setPos(43, 61)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT))
+ .widget(
+ new SlotWidget(inventoryHandler, 2).setPos(115, 61)
+ .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_COAL))
+ .widget(
+ new SlotWidget(inventoryHandler, 3).setPos(115, 25)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DUST))
+ .widget(
+ new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity())
+ .setTexture(
+ GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY,
+ GT_UITextures.PROGRESSBAR_BOILER_STEAM,
+ 10)
+ .setDirection(ProgressBar.Direction.UP).setPos(70, 25).setSize(10, 54))
+ .widget(
+ new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity())
+ .setTexture(
+ GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY,
+ GT_UITextures.PROGRESSBAR_BOILER_WATER,
+ 10)
+ .setDirection(ProgressBar.Direction.UP).setPos(83, 25).setSize(10, 54))
+ .widget(
+ new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime())
+ .setTexture(
+ GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY,
+ GT_UITextures.PROGRESSBAR_BOILER_HEAT,
+ 10)
+ .setDirection(ProgressBar.Direction.UP).setPos(96, 25).setSize(10, 54))
+ .widget(
+ new ProgressBar()
+ // cap minimum so that one can easily see there's fuel remaining
+ .setProgress(
+ () -> mProcessingEnergy > 0 ? Math.max((float) mProcessingEnergy / 1000, 1f / 5)
+ : 0)
+ .setTexture(GTPP_UITextures.PROGRESSBAR_FUEL, 14).setDirection(ProgressBar.Direction.UP)
+ .setPos(116, 45).setSize(14, 14))
+ .widget(
+ new DrawableWidget().setDrawable(GTPP_UITextures.OVERLAY_SLOT_CANISTER_DARK).setPos(43, 43)
+ .setSize(18, 18));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java
index f1e0cc7161..ec20c9c088 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -11,10 +16,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity {
@@ -32,14 +33,9 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity {
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Can request the JVM to perform garbage collection",
- "Configurable to run once every 5 minute interval (5-180)",
- "This Machine has no recipe",
- "Admin Tool, Limit one per world if possible",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Can request the JVM to perform garbage collection",
+ "Configurable to run once every 5 minute interval (5-180)", "This Machine has no recipe",
+ "Admin Tool, Limit one per world if possible", CORE.GT_Tooltip };
}
@Override
@@ -61,91 +57,61 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity {
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redox_3)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redox_3) };
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel) };
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redox_3)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redox_3) };
}
@Override
@@ -291,27 +257,26 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity {
private void showPollution(final World worldIn, final EntityPlayer playerIn) {
PlayerUtils.messagePlayer(
playerIn,
- "Running every " + mFrequency + " minutes. Owner: "
- + this.getBaseMetaTileEntity().getOwnerName());
+ "Running every " + mFrequency + " minutes. Owner: " + this.getBaseMetaTileEntity().getOwnerName());
long aDiff = mLocalTickVar - this.mLastCleanup;
PlayerUtils.messagePlayer(playerIn, "Last run: " + Utils.getSecondsFromMillis(aDiff) + " seconds ago.");
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
public String[] getInfoData() {
- return new String[] {this.getLocalName()};
+ return new String[] { this.getLocalName() };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
index ce04d50fab..cde8d8ca4b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -11,10 +16,6 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
@@ -25,28 +26,19 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
private int mTickTimer = 0;
private int mSecondTimer = 0;
- public GregtechMetaPollutionCreator(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final int aSlotCount) {
+ public GregtechMetaPollutionCreator(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final String aDescription, final int aSlotCount) {
super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
}
- public GregtechMetaPollutionCreator(
- final String aName,
- final int aTier,
- final String aDescription,
- final ITexture[][][] aTextures,
- final int aSlotCount) {
+ public GregtechMetaPollutionCreator(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures, final int aSlotCount) {
super(aName, aTier, aSlotCount, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, "A useful debug machine to create pollution.", CORE.GT_Tooltip};
+ return new String[] { this.mDescription, "A useful debug machine to create pollution.", CORE.GT_Tooltip };
}
@Override
@@ -68,91 +60,61 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
@Override
@@ -169,7 +131,11 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaPollutionCreator(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mInventory.length);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mInventory.length);
}
@Override
@@ -303,8 +269,8 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
PlayerUtils.messagePlayer(playerIn, "This block is useless, Pollution is disabled.");
} else {
addPollution();
- PlayerUtils.messagePlayer(
- playerIn, "This chunk now contains " + getCurrentChunkPollution() + " pollution.");
+ PlayerUtils
+ .messagePlayer(playerIn, "This chunk now contains " + getCurrentChunkPollution() + " pollution.");
// PlayerUtils.messagePlayer(playerIn, "Average over last ten minutes: "+getAveragePollutionOverLastTen()+"
// pollution.");
}
@@ -316,14 +282,14 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@@ -337,11 +303,8 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
@Override
public String[] getInfoData() {
- return new String[] {
- this.getLocalName(),
- "Current Pollution: " + this.mCurrentPollution,
- "Average/10 minutes:" + getAveragePollutionOverLastTen()
- };
+ return new String[] { this.getLocalName(), "Current Pollution: " + this.mCurrentPollution,
+ "Average/10 minutes:" + getAveragePollutionOverLastTen() };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
index 9ba3db911a..32e45dde15 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -12,10 +17,6 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
@@ -27,53 +28,30 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
private int mSecondTimer = 0;
private long mRedstoneLevel = 0;
- public GregtechMetaPollutionDetector(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final int aSlotCount) {
+ public GregtechMetaPollutionDetector(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final String aDescription, final int aSlotCount) {
super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
}
- public GregtechMetaPollutionDetector(
- final String aName,
- final int aTier,
- final String aDescription,
- final ITexture[][][] aTextures,
- final int aSlotCount) {
+ public GregtechMetaPollutionDetector(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures, final int aSlotCount) {
super(aName, aTier, aSlotCount, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Right click to check pollution levels.",
- "Configure with screwdriver to set redstone output amount.",
- "Does not use power.",
- CORE.GT_Tooltip
- };
- }
-
- @Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ return new String[] { this.mDescription, "Right click to check pollution levels.",
+ "Configure with screwdriver to set redstone output amount.", "Does not use power.", CORE.GT_Tooltip };
+ }
+
+ @Override
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
return aSide == aFacing
- ? new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency)
- }
- : new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
- new GT_RenderedTexture(Textures.BlockIcons.VOID)
- };
+ ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) }
+ : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+ new GT_RenderedTexture(Textures.BlockIcons.VOID) };
}
@Override
@@ -94,85 +72,71 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
return rTextures;
}
- /*@Override
- public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
- return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1];
- }*/
+ /*
+ * @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final
+ * byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { return
+ * this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 :
+ * aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1]; }
+ */
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaPollutionDetector(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mInventory.length);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mInventory.length);
}
@Override
@@ -309,14 +273,14 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@@ -330,12 +294,9 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
@Override
public String[] getInfoData() {
- return new String[] {
- this.getLocalName(),
- "Current Pollution: " + this.mCurrentPollution,
- "Average/10 Sec: " + this.mAveragePollution,
- "Emit Redstone at pollution level: " + this.mRedstoneLevel
- };
+ return new String[] { this.getLocalName(), "Current Pollution: " + this.mCurrentPollution,
+ "Average/10 Sec: " + this.mAveragePollution,
+ "Emit Redstone at pollution level: " + this.mRedstoneLevel };
}
@Override
@@ -521,8 +482,8 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
}
@Override
- public boolean onRightclick(
- IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
+ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX,
+ float aY, float aZ) {
return super.onRightclick(aBaseMetaTileEntity, aPlayer, aSide, aX, aY, aZ);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
index 4e851b3d6a..92eebb96e7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
@@ -3,7 +3,20 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
import static gregtech.api.enums.GT_Values.V;
import static net.minecraftforge.common.ForgeChunkManager.getMaxChunkDepthFor;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraftforge.common.ForgeChunkManager;
+import net.minecraftforge.common.ForgeChunkManager.Ticket;
+
import com.google.common.collect.MapMaker;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
@@ -16,16 +29,6 @@ import gtPlusPlus.GTplusplus;
import gtPlusPlus.core.chunkloading.GTPP_ChunkManager;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.ChunkCoordIntPair;
-import net.minecraftforge.common.ForgeChunkManager;
-import net.minecraftforge.common.ForgeChunkManager.Ticket;
public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMachine {
@@ -44,8 +47,8 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
new ITexture[] {});
}
- public GregtechMetaTileEntityChunkLoader(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+ public GregtechMetaTileEntityChunkLoader(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+ String aGUIName, String aNEIName) {
super(aName, aTier, 4, aDescription, aTextures, 0, 0, aGUIName, aNEIName);
}
@@ -84,12 +87,8 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
@Override
public String[] getDescription() {
- return new String[] {
- "Loads " + getMaxChunksToLoadForTier(this.mTier) + " chunks when powered",
- "Consumes 2A",
- "Behaves Identically to a Railcraft World Anchor",
- CORE.GT_Tooltip
- };
+ return new String[] { "Loads " + getMaxChunksToLoadForTier(this.mTier) + " chunks when powered", "Consumes 2A",
+ "Behaves Identically to a Railcraft World Anchor", CORE.GT_Tooltip };
}
@Override
@@ -111,101 +110,71 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+ new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+ new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+ new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+ new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+ new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) };
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+ new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) };
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+ new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+ new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+ new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
- new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+ new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) };
}
@Override
@@ -216,18 +185,23 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntityChunkLoader(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mGUIName,
+ this.mNEIName);
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@@ -266,8 +240,7 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
super.onPostTick(aBaseMetaTileEntity, aTick);
if (aBaseMetaTileEntity.isServerSide()) {
- if (aBaseMetaTileEntity.getXCoord() != prevX
- || aBaseMetaTileEntity.getYCoord() != prevY
+ if (aBaseMetaTileEntity.getXCoord() != prevX || aBaseMetaTileEntity.getYCoord() != prevY
|| aBaseMetaTileEntity.getZCoord() != prevZ) {
releaseTicket();
prevX = aBaseMetaTileEntity.getXCoord();
@@ -275,10 +248,8 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
prevZ = aBaseMetaTileEntity.getZCoord();
}
- if (hasActiveTicket()
- && (getTicket().world != aBaseMetaTileEntity.getWorld()
- || refreshTicket
- || !aBaseMetaTileEntity.isAllowedToWork())) {
+ if (hasActiveTicket() && (getTicket().world != aBaseMetaTileEntity.getWorld() || refreshTicket
+ || !aBaseMetaTileEntity.isAllowedToWork())) {
releaseTicket();
}
@@ -409,8 +380,8 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
}
protected Ticket getTicketFromForge() {
- return ForgeChunkManager.requestTicket(
- GTplusplus.instance, getBaseMetaTileEntity().getWorld(), ForgeChunkManager.Type.NORMAL);
+ return ForgeChunkManager
+ .requestTicket(GTplusplus.instance, getBaseMetaTileEntity().getWorld(), ForgeChunkManager.Type.NORMAL);
}
public boolean hasActiveTicket() {
@@ -434,15 +405,9 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
protected void setTicketData(Ticket chunkTicket) {
if (chunkTicket != null) {
- chunkTicket
- .getModData()
- .setInteger("xCoord", getBaseMetaTileEntity().getXCoord());
- chunkTicket
- .getModData()
- .setInteger("yCoord", getBaseMetaTileEntity().getYCoord());
- chunkTicket
- .getModData()
- .setInteger("zCoord", getBaseMetaTileEntity().getZCoord());
+ chunkTicket.getModData().setInteger("xCoord", getBaseMetaTileEntity().getXCoord());
+ chunkTicket.getModData().setInteger("yCoord", getBaseMetaTileEntity().getYCoord());
+ chunkTicket.getModData().setInteger("zCoord", getBaseMetaTileEntity().getZCoord());
chunkTicket.setChunkListDepth(getMaxChunksToLoadForTier(mTier));
}
}
@@ -453,9 +418,7 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
if (ticket != null) {
if (ticket.world == getBaseMetaTileEntity().getWorld()) {
for (ChunkCoordIntPair chunk : ticket.getChunkList()) {
- if (ForgeChunkManager.getPersistentChunksFor(
- getBaseMetaTileEntity().getWorld())
- .keys()
+ if (ForgeChunkManager.getPersistentChunksFor(getBaseMetaTileEntity().getWorld()).keys()
.contains(chunk)) {
ForgeChunkManager.unforceChunk(ticket, chunk);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java
index ea2f47ab8e..21dbbe25f4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -7,34 +11,22 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTileEntity {
- public GregtechMetaTileEntityThaumcraftResearcher(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final int aSlotCount) {
+ public GregtechMetaTileEntityThaumcraftResearcher(final int aID, final String aName, final String aNameRegional,
+ final int aTier, final String aDescription, final int aSlotCount) {
super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
}
- public GregtechMetaTileEntityThaumcraftResearcher(
- final String aName,
- final int aTier,
- final String aDescription,
- final ITexture[][][] aTextures,
- final int aSlotCount) {
+ public GregtechMetaTileEntityThaumcraftResearcher(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures, final int aSlotCount) {
super(aName, aTier, aSlotCount, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, "Generates Thaumcraft research notes, because it's magic."};
+ return new String[] { this.mDescription, "Generates Thaumcraft research notes, because it's magic." };
}
@Override
@@ -56,45 +48,34 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Metal_Grate_A)
- };
+ return new ITexture[] { getSides(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Metal_Grate_A) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Metal_Grate_B)
- };
+ return new ITexture[] { getSides(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Metal_Grate_B) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {getSides(aColor)[0]};
+ return new ITexture[] { getSides(aColor)[0] };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
- };
+ return new ITexture[] { getSides(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel) };
}
public ITexture[] getFrontActive(final byte aColor) {
@@ -110,9 +91,8 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
- };
+ return new ITexture[] { getSides(aColor)[0],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
}
public ITexture[] getSidesActive(final byte aColor) {
@@ -127,7 +107,11 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntityThaumcraftResearcher(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mInventory.length);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mInventory.length);
}
@Override
@@ -224,22 +208,20 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return aSide == this.getBaseMetaTileEntity().getBackFacing();
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return true;
}
@Override
public String[] getInfoData() {
- return new String[] {
- this.getLocalName(),
- };
+ return new String[] { this.getLocalName(), };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
index ea9b161d4e..5952f1f220 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+
+import team.chisel.carving.Carving;
+
import com.gtnewhorizons.modularui.api.drawable.IDrawable;
import com.gtnewhorizons.modularui.api.math.Pos2d;
import com.gtnewhorizons.modularui.api.math.Size;
@@ -7,6 +13,7 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.enums.Textures.BlockIcons;
import gregtech.api.gui.modularui.GT_UITextures;
import gregtech.api.interfaces.ITexture;
@@ -18,9 +25,6 @@ import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.List;
-import net.minecraft.item.ItemStack;
-import team.chisel.carving.Carving;
public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMachine {
@@ -39,37 +43,37 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
1,
"Compressor.png",
"",
- new ITexture[] {
- new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
- new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB),
- new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE),
- new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab),
- new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
- new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB)
- });
- }
-
- public GregtechMetaTileEntity_AutoChisel(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+ new ITexture[] { new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
+ new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB),
+ new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE),
+ new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab),
+ new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
+ new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB) });
+ }
+
+ public GregtechMetaTileEntity_AutoChisel(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+ String aGUIName, String aNEIName) {
super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
}
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntity_AutoChisel(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mGUIName,
+ this.mNEIName);
}
@Override
public String[] getDescription() {
- String[] A = new String[] {
- this.mDescription,
- "What you want to chisel goes in slot 1",
- "What you want to get goes in the special slot (bottom right)",
- "If special slot is empty, first chisel result is used"
- };
+ String[] A = new String[] { this.mDescription, "What you want to chisel goes in slot 1",
+ "What you want to get goes in the special slot (bottom right)",
+ "If special slot is empty, first chisel result is used" };
return A;
}
@@ -99,10 +103,9 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
}
@Override
- protected boolean allowPutStackValidated(
- IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
- return hasValidCache(aStack, this.getSpecialSlot(), false)
- ? true
+ protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide,
+ ItemStack aStack) {
+ return hasValidCache(aStack, this.getSpecialSlot(), false) ? true
: super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, aSide, aStack) && hasChiselResults(aStack);
}
@@ -180,12 +183,13 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
super.addUIWidgets(builder, buildContext);
- builder.widget(createProgressBar(
- GT_UITextures.PROGRESSBAR_COMPRESS,
- 20,
- ProgressBar.Direction.RIGHT,
- new Pos2d(78, 24),
- new Size(20, 18)));
+ builder.widget(
+ createProgressBar(
+ GT_UITextures.PROGRESSBAR_COMPRESS,
+ 20,
+ ProgressBar.Direction.RIGHT,
+ new Pos2d(78, 24),
+ new Size(20, 18)));
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
index 268863ffd2..e25db682b3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -9,8 +12,6 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicMachine {
@@ -26,36 +27,41 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM
1,
"PotionBrewer.png",
"",
- new ITexture[] {
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE),
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER)
- });
+ new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE),
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER) });
}
- public GregtechMetaTileEntity_BasicWasher(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+ public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+ String aGUIName, String aNEIName) {
super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
}
- /*public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
- super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
- }*/
+ /*
+ * public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, ITexture[][][]
+ * aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName,
+ * aNEIName); }
+ */
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip};
+ return new String[] { this.mDescription, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip };
}
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntity_BasicWasher(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mGUIName,
+ this.mNEIName);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
index b8df5ae9ff..26de52f7f4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
@@ -1,5 +1,16 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
@@ -11,15 +22,6 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.slots.SlotChemicalPlantInput;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.List;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidHandler;
public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_BasicMachine {
@@ -41,37 +43,42 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
4,
"ChemicalReactor.png",
"",
- new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Side_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Side),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Front_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Front),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
- new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top)
- });
- }
-
- public GregtechMetaTileEntity_ChemicalReactor(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+ new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Side_Active),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Side),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Front_Active),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Front),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top) });
+ }
+
+ public GregtechMetaTileEntity_ChemicalReactor(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures, String aGUIName, String aNEIName) {
super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
}
- /*public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
- super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
- }*/
+ /*
+ * public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, ITexture[][][]
+ * aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName,
+ * aNEIName); }
+ */
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, "Because why not?", CORE.GT_Tooltip};
+ return new String[] { this.mDescription, "Because why not?", CORE.GT_Tooltip };
}
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
try {
GregtechMetaTileEntity_ChemicalReactor y = new GregtechMetaTileEntity_ChemicalReactor(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mGUIName,
+ this.mNEIName);
return y;
} catch (Throwable t) {
t.printStackTrace();
@@ -225,12 +232,9 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
} else {
if (++this.mProgresstime >= this.mMaxProgresstime) {
for (i = 0; i < this.mOutputItems.length; ++i) {
- for (i = 0;
- i < this.mOutputItems.length
- && !aBaseMetaTileEntity.addStackToSlot(
- this.getOutputSlot() + (i + i) % this.mOutputItems.length,
- this.mOutputItems[i]);
- ++i) {
+ for (i = 0; i < this.mOutputItems.length && !aBaseMetaTileEntity.addStackToSlot(
+ this.getOutputSlot() + (i + i) % this.mOutputItems.length,
+ this.mOutputItems[i]); ++i) {
;
}
}
@@ -266,8 +270,7 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
}
boolean tRemovedOutputFluid = false;
- if (this.doesAutoOutputFluids()
- && this.getDrainableStack() != null
+ if (this.doesAutoOutputFluids() && this.getDrainableStack() != null
&& aBaseMetaTileEntity.getFrontFacing() != this.mMainFacing
&& (tSucceeded || aTick % 20L == 0L)) {
IFluidHandler tTank = aBaseMetaTileEntity.getITankContainerAtSide(aBaseMetaTileEntity.getFrontFacing());
@@ -275,7 +278,9 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
FluidStack tDrained = this.drain(1000, false);
if (tDrained != null) {
int tFilledAmount = tTank.fill(
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()), tDrained, false);
+ ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
+ tDrained,
+ false);
if (tFilledAmount > 0) {
tTank.fill(
ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
@@ -291,19 +296,16 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
}
int j;
- if (this.doesAutoOutput()
- && !this.isOutputEmpty()
+ if (this.doesAutoOutput() && !this.isOutputEmpty()
&& aBaseMetaTileEntity.getFrontFacing() != this.mMainFacing
- && (tSucceeded
- || this.mOutputBlocked % 300 == 1
+ && (tSucceeded || this.mOutputBlocked % 300 == 1
|| aBaseMetaTileEntity.hasInventoryBeenModified()
|| aTick % 600L == 0L)) {
TileEntity tTileEntity2 = aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getFrontFacing());
j = 0;
- for (byte tCosts = 1;
- j < this.mOutputItems.length && tCosts > 0 && aBaseMetaTileEntity.isUniversalEnergyStored(128L);
- ++j) {
+ for (byte tCosts = 1; j < this.mOutputItems.length && tCosts > 0
+ && aBaseMetaTileEntity.isUniversalEnergyStored(128L); ++j) {
tCosts = GT_Utility.moveOneItemStack(
aBaseMetaTileEntity,
tTileEntity2,
@@ -330,10 +332,8 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
}
if (this.allowToCheckRecipe()) {
- if (this.mMaxProgresstime <= 0
- && aBaseMetaTileEntity.isAllowedToWork()
- && (tRemovedOutputFluid
- || tSucceeded
+ if (this.mMaxProgresstime <= 0 && aBaseMetaTileEntity.isAllowedToWork()
+ && (tRemovedOutputFluid || tSucceeded
|| aBaseMetaTileEntity.hasInventoryBeenModified()
|| aTick % 600L == 0L
|| aBaseMetaTileEntity.hasWorkJustBeenEnabled())
@@ -352,7 +352,7 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
}
for (i = 0; i < this.mOutputItems.length; ++i) {
- this.mOutputItems[i] = GT_Utility.copy(new Object[] {this.mOutputItems[i]});
+ this.mOutputItems[i] = GT_Utility.copy(new Object[] { this.mOutputItems[i] });
if (this.mOutputItems[i] != null && this.mOutputItems[i].stackSize > 64) {
this.mOutputItems[i].stackSize = 64;
}
@@ -472,80 +472,20 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
super.onPreTick(aBaseMetaTileEntity, aTick);
- /* if (aBaseMetaTileEntity != null) {
- if (!aBaseMetaTileEntity.getWorld().isRemote) {
- itemslots : for (int i=3;i<7;i++) {
- ItemStack aStack = aBaseMetaTileEntity.getStackInSlot(i);
- if (aStack != null) {
- if (FluidContainerRegistry.isContainer(aStack)) {
- if (this.isItemValidForSlot(i, aStack)) {
- // Add Fluid
- FluidStack aContainerFluid = FluidContainerRegistry.getFluidForFilledItem(aStack);
- if (aContainerFluid != null) {
- fluidslots : for (FluidStack u : mInputFluids) {
- if (u != null && u.isFluidEqual(aContainerFluid)) {
- if (u.amount <= (this.getCapacity() - aContainerFluid.amount)) {
-
- // Matching, not full, let's fill, then continue
- u.amount += aContainerFluid.amount;
-
- // Update stack size
- if (aStack.stackSize > 1) {
- aStack.stackSize--;
- }
- else {
- aStack = null;
- }
-
- // Add Output container
- // TODO
-
- continue itemslots;
- }
- else {
- // Too full
- break fluidslots;
- }
- }
- else {
- if (u == null ) {
-
- // Empty, let's fill, then continue
- u = aContainerFluid.copy();
-
- // Update stack size
- if (aStack.stackSize > 1) {
- aStack.stackSize--;
- }
- else {
- aStack = null;
- }
-
- // Add Output container
- // TODO
-
- continue itemslots;
-
- }
- else {
- // Not empty, doesn't match, check next slot.
- continue fluidslots;
- }
- }
- }
-
-
-
- }
- // Eat Input
-
- // Add Container to Output
- }
- }
- }
- }
- }
- }*/
+ /*
+ * if (aBaseMetaTileEntity != null) { if (!aBaseMetaTileEntity.getWorld().isRemote) { itemslots : for (int
+ * i=3;i<7;i++) { ItemStack aStack = aBaseMetaTileEntity.getStackInSlot(i); if (aStack != null) { if
+ * (FluidContainerRegistry.isContainer(aStack)) { if (this.isItemValidForSlot(i, aStack)) { // Add Fluid
+ * FluidStack aContainerFluid = FluidContainerRegistry.getFluidForFilledItem(aStack); if (aContainerFluid !=
+ * null) { fluidslots : for (FluidStack u : mInputFluids) { if (u != null && u.isFluidEqual(aContainerFluid)) {
+ * if (u.amount <= (this.getCapacity() - aContainerFluid.amount)) { // Matching, not full, let's fill, then
+ * continue u.amount += aContainerFluid.amount; // Update stack size if (aStack.stackSize > 1) {
+ * aStack.stackSize--; } else { aStack = null; } // Add Output container // TODO continue itemslots; } else { //
+ * Too full break fluidslots; } } else { if (u == null ) { // Empty, let's fill, then continue u =
+ * aContainerFluid.copy(); // Update stack size if (aStack.stackSize > 1) { aStack.stackSize--; } else { aStack
+ * = null; } // Add Output container // TODO continue itemslots; } else { // Not empty, doesn't match, check
+ * next slot. continue fluidslots; } } } } // Eat Input // Add Container to Output } } } } } }
+ */
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
index 39c6bb53dd..5de366dfa4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
@@ -1,5 +1,15 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import java.util.ArrayList;
+import java.util.Random;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
@@ -14,14 +24,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeMachine;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.Random;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEntity_DeluxeMachine {
@@ -41,27 +43,27 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
super(aID, aName, aNameRegional, aTier, 1, "It's like a midget Ra.", 1, 1, "PotionBrewer.png", "");
}
- public GregtechMetaTileEntity_CompactFusionReactor(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+ public GregtechMetaTileEntity_CompactFusionReactor(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures, String aGUIName, String aNEIName) {
super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Not Very Fast, but not very big either.",
- "Each side pair in/out puts to different slots.",
- "Top & Bottom Sides are Outputs.",
- "Front & Back are Input Plasma 1.",
- "Sides are Input Plasma 2."
- };
+ return new String[] { this.mDescription, "Not Very Fast, but not very big either.",
+ "Each side pair in/out puts to different slots.", "Top & Bottom Sides are Outputs.",
+ "Front & Back are Input Plasma 1.", "Sides are Input Plasma 2." };
}
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntity_CompactFusionReactor(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mGUIName,
+ this.mNEIName);
}
public int tier() {
@@ -95,21 +97,11 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
@Override
@@ -149,8 +141,10 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
this.mCharging = true;
this.mCanProcessRecipe = false;
if (this.getBaseMetaTileEntity().decreaseStoredEnergyUnits((mFusionPoint / 100), false)) {
- Logger.MACHINE_INFO("Recipe Tick 1.3 - Charging Internal storage. " + (mFusionPoint / 100) + "/"
- + mFusionPoint);
+ Logger.MACHINE_INFO(
+ "Recipe Tick 1.3 - Charging Internal storage. " + (mFusionPoint / 100)
+ + "/"
+ + mFusionPoint);
mChargeConsumed += (mFusionPoint / 100);
}
} else {
@@ -195,14 +189,13 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
}
if (tFluidList.size() > 1) {
FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);
- GT_Recipe tRecipe = getRecipeList()
- .findRecipe(
- this.getBaseMetaTileEntity(),
- this.mLastRecipe,
- false,
- GT_Values.V[8],
- tFluids,
- new ItemStack[] {});
+ GT_Recipe tRecipe = getRecipeList().findRecipe(
+ this.getBaseMetaTileEntity(),
+ this.mLastRecipe,
+ false,
+ GT_Values.V[8],
+ tFluids,
+ new ItemStack[] {});
if (tRecipe == null) {
return false;
}
@@ -275,43 +268,36 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
super.onPreTick(aBaseMetaTileEntity, aTick);
onRunningTickMulti();
- if ((aBaseMetaTileEntity.isClientSide())
- && (aBaseMetaTileEntity.isActive())
+ if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive())
&& (aBaseMetaTileEntity.getFrontFacing() != 1)
&& (aBaseMetaTileEntity.getCoverIDAtSide((byte) 1) == 0)
&& (!aBaseMetaTileEntity.getOpacityAtSide((byte) 1))) {
if (MathUtils.randInt(0, 4) == 4) {
final Random tRandom = aBaseMetaTileEntity.getWorld().rand;
- aBaseMetaTileEntity
- .getWorld()
- .spawnParticle(
- "magicCrit",
- (aBaseMetaTileEntity.getXCoord() + 0.8F) - (tRandom.nextFloat() * 0.6F),
- aBaseMetaTileEntity.getYCoord() + 0.3f + (tRandom.nextFloat() * 0.2F),
- (aBaseMetaTileEntity.getZCoord() + 1.2F) - (tRandom.nextFloat() * 1.6F),
- 0.0D,
- 0.0D,
- 0.0D);
- aBaseMetaTileEntity
- .getWorld()
- .spawnParticle(
- "magicCrit",
- (aBaseMetaTileEntity.getXCoord() + 0.4F) - (tRandom.nextFloat() * 0.3F),
- aBaseMetaTileEntity.getYCoord() + 0.2f + (tRandom.nextFloat() * 0.1F),
- (aBaseMetaTileEntity.getZCoord() + 0.8F) - (tRandom.nextFloat() * 0.6F),
- 0.0D,
- 0.0D,
- 0.0D);
- aBaseMetaTileEntity
- .getWorld()
- .spawnParticle(
- "magicCrit",
- (aBaseMetaTileEntity.getXCoord() + 0.6F) - (tRandom.nextFloat() * 0.9F),
- aBaseMetaTileEntity.getYCoord() + 0.4f + (tRandom.nextFloat() * 0.3F),
- (aBaseMetaTileEntity.getZCoord() + 1.8F) - (tRandom.nextFloat() * 2.6F),
- 0.0D,
- 0.0D,
- 0.0D);
+ aBaseMetaTileEntity.getWorld().spawnParticle(
+ "magicCrit",
+ (aBaseMetaTileEntity.getXCoord() + 0.8F) - (tRandom.nextFloat() * 0.6F),
+ aBaseMetaTileEntity.getYCoord() + 0.3f + (tRandom.nextFloat() * 0.2F),
+ (aBaseMetaTileEntity.getZCoord() + 1.2F) - (tRandom.nextFloat() * 1.6F),
+ 0.0D,
+ 0.0D,
+ 0.0D);
+ aBaseMetaTileEntity.getWorld().spawnParticle(
+ "magicCrit",
+ (aBaseMetaTileEntity.getXCoord() + 0.4F) - (tRandom.nextFloat() * 0.3F),
+ aBaseMetaTileEntity.getYCoord() + 0.2f + (tRandom.nextFloat() * 0.1F),
+ (aBaseMetaTileEntity.getZCoord() + 0.8F) - (tRandom.nextFloat() * 0.6F),
+ 0.0D,
+ 0.0D,
+ 0.0D);
+ aBaseMetaTileEntity.getWorld().spawnParticle(
+ "magicCrit",
+ (aBaseMetaTileEntity.getXCoord() + 0.6F) - (tRandom.nextFloat() * 0.9F),
+ aBaseMetaTileEntity.getYCoord() + 0.4f + (tRandom.nextFloat() * 0.3F),
+ (aBaseMetaTileEntity.getZCoord() + 1.8F) - (tRandom.nextFloat() * 2.6F),
+ 0.0D,
+ 0.0D,
+ 0.0D);
}
}
}
@@ -366,13 +352,9 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
}
}
- return new String[] {
- "Fusion Reactor MK " + tier,
- "EU Required: " + powerRequired + "EU/t",
- "Stored EU: " + this.getEUVar() + " / " + maxEUStore(),
- "Plasma Output: " + plasmaOut + "L/t",
- "Current Recipe: " + fusionName
- };
+ return new String[] { "Fusion Reactor MK " + tier, "EU Required: " + powerRequired + "EU/t",
+ "Stored EU: " + this.getEUVar() + " / " + maxEUStore(), "Plasma Output: " + plasmaOut + "L/t",
+ "Current Recipe: " + fusionName };
}
@Override
@@ -381,48 +363,46 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab)};
+ return new ITexture[] { this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+ return new ITexture[] { this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+ return new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+ return new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
- };
+ return new ITexture[] { this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active)
- };
+ return new ITexture[] { this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active) };
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+ return new ITexture[] { this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+ return new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+ return new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
- };
+ return new ITexture[] { this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue) };
}
@Override
@@ -480,8 +460,7 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
} else {
// Logger.MACHINE_INFO("8");
this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
- if (aTick % 100 == 0
- || aBaseMetaTileEntity.hasWorkJustBeenEnabled()
+ if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled()
|| aBaseMetaTileEntity.hasInventoryBeenModified()) {
Logger.MACHINE_INFO("9");
// turnCasingActive(mMaxProgresstime > 0);
@@ -673,8 +652,8 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
}
@Override
- public boolean onRightclick(
- IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
+ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX,
+ float aY, float aZ) {
// TODO Auto-generated method stub
return super.onRightclick(aBaseMetaTileEntity, aPlayer, aSide, aX, aY, aZ);
}
@@ -704,8 +683,8 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
super.startSoundLoop(aIndex, aX, aY, aZ);
if (aIndex == 1) {
- GT_Utility.doSoundAtClient(
- (String) GregTech_API.sSoundList.get(Integer.valueOf(212)), 10, 1.0F, aX, aY, aZ);
+ GT_Utility
+ .doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(212)), 10, 1.0F, aX, aY, aZ);
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
index 6ac99404ed..51f24f6c5e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
@@ -1,5 +1,15 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import java.util.ArrayList;
+import java.util.Random;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
@@ -15,14 +25,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_DeluxeMachine;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.Random;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_DeluxeMachine {
@@ -42,28 +44,27 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
super(aID, aName, aNameRegional, aTier, 1, "It's like a midget Ra.", 1, 1, "PotionBrewer.png", "");
}
- public GregtechMetaTileEntity_PocketFusion(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+ public GregtechMetaTileEntity_PocketFusion(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+ String aGUIName, String aNEIName) {
super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Not Very Fast, but not very big either.",
- "Each side pair in/out puts to different slots.",
- "Top & Bottom Sides are Outputs.",
- "Front & Back are Input Plasma 1.",
- "Sides are Input Plasma 2.",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Not Very Fast, but not very big either.",
+ "Each side pair in/out puts to different slots.", "Top & Bottom Sides are Outputs.",
+ "Front & Back are Input Plasma 1.", "Sides are Input Plasma 2.", CORE.GT_Tooltip };
}
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntity_PocketFusion(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mGUIName,
+ this.mNEIName);
}
public int tier() {
@@ -97,21 +98,11 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
@Override
@@ -151,8 +142,10 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
this.mCharging = true;
this.mCanProcessRecipe = false;
if (this.getBaseMetaTileEntity().decreaseStoredEnergyUnits((mFusionPoint / 100), false)) {
- Logger.MACHINE_INFO("Recipe Tick 1.3 - Charging Internal storage. " + (mFusionPoint / 100) + "/"
- + mFusionPoint);
+ Logger.MACHINE_INFO(
+ "Recipe Tick 1.3 - Charging Internal storage. " + (mFusionPoint / 100)
+ + "/"
+ + mFusionPoint);
mChargeConsumed += (mFusionPoint / 100);
}
} else {
@@ -197,14 +190,13 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
}
if (tFluidList.size() > 1) {
FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);
- GT_Recipe tRecipe = getRecipeList()
- .findRecipe(
- this.getBaseMetaTileEntity(),
- this.mLastRecipe,
- false,
- GT_Values.V[8],
- tFluids,
- new ItemStack[] {});
+ GT_Recipe tRecipe = getRecipeList().findRecipe(
+ this.getBaseMetaTileEntity(),
+ this.mLastRecipe,
+ false,
+ GT_Values.V[8],
+ tFluids,
+ new ItemStack[] {});
if (tRecipe == null) {
return false;
@@ -279,43 +271,36 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
super.onPreTick(aBaseMetaTileEntity, aTick);
onRunningTickMulti();
- if ((aBaseMetaTileEntity.isClientSide())
- && (aBaseMetaTileEntity.isActive())
+ if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive())
&& (aBaseMetaTileEntity.getFrontFacing() != 1)
&& (aBaseMetaTileEntity.getCoverIDAtSide((byte) 1) == 0)
&& (!aBaseMetaTileEntity.getOpacityAtSide((byte) 1))) {
if (MathUtils.randInt(0, 4) == 4) {
final Random tRandom = aBaseMetaTileEntity.getWorld().rand;
- aBaseMetaTileEntity
- .getWorld()
- .spawnParticle(
- "magicCrit",
- (aBaseMetaTileEntity.getXCoord() + 0.8F) - (tRandom.nextFloat() * 0.6F),
- aBaseMetaTileEntity.getYCoord() + 0.3f + (tRandom.nextFloat() * 0.2F),
- (aBaseMetaTileEntity.getZCoord() + 1.2F) - (tRandom.nextFloat() * 1.6F),
- 0.0D,
- 0.0D,
- 0.0D);
- aBaseMetaTileEntity
- .getWorld()
- .spawnParticle(
- "magicCrit",
- (aBaseMetaTileEntity.getXCoord() + 0.4F) - (tRandom.nextFloat() * 0.3F),
- aBaseMetaTileEntity.getYCoord() + 0.2f + (tRandom.nextFloat() * 0.1F),
- (aBaseMetaTileEntity.getZCoord() + 0.8F) - (tRandom.nextFloat() * 0.6F),
- 0.0D,
- 0.0D,
- 0.0D);
- aBaseMetaTileEntity
- .getWorld()
- .spawnParticle(
- "magicCrit",
- (aBaseMetaTileEntity.getXCoord() + 0.6F) - (tRandom.nextFloat() * 0.9F),
- aBaseMetaTileEntity.getYCoord() + 0.4f + (tRandom.nextFloat() * 0.3F),
- (aBaseMetaTileEntity.getZCoord() + 1.8F) - (tRandom.nextFloat() * 2.6F),
- 0.0D,
- 0.0D,
- 0.0D);
+ aBaseMetaTileEntity.getWorld().spawnParticle(
+ "magicCrit",
+ (aBaseMetaTileEntity.getXCoord() + 0.8F) - (tRandom.nextFloat() * 0.6F),
+ aBaseMetaTileEntity.getYCoord() + 0.3f + (tRandom.nextFloat() * 0.2F),
+ (aBaseMetaTileEntity.getZCoord() + 1.2F) - (tRandom.nextFloat() * 1.6F),
+ 0.0D,
+ 0.0D,
+ 0.0D);
+ aBaseMetaTileEntity.getWorld().spawnParticle(
+ "magicCrit",
+ (aBaseMetaTileEntity.getXCoord() + 0.4F) - (tRandom.nextFloat() * 0.3F),
+ aBaseMetaTileEntity.getYCoord() + 0.2f + (tRandom.nextFloat() * 0.1F),
+ (aBaseMetaTileEntity.getZCoord() + 0.8F) - (tRandom.nextFloat() * 0.6F),
+ 0.0D,
+ 0.0D,
+ 0.0D);
+ aBaseMetaTileEntity.getWorld().spawnParticle(
+ "magicCrit",
+ (aBaseMetaTileEntity.getXCoord() + 0.6F) - (tRandom.nextFloat() * 0.9F),
+ aBaseMetaTileEntity.getYCoord() + 0.4f + (tRandom.nextFloat() * 0.3F),
+ (aBaseMetaTileEntity.getZCoord() + 1.8F) - (tRandom.nextFloat() * 2.6F),
+ 0.0D,
+ 0.0D,
+ 0.0D);
}
}
}
@@ -370,13 +355,9 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
}
}
- return new String[] {
- "Fusion Reactor MK " + tier,
- "EU Required: " + powerRequired + "EU/t",
- "Stored EU: " + this.getEUVar() + " / " + maxEUStore(),
- "Plasma Output: " + plasmaOut + "L/t",
- "Current Recipe: " + fusionName
- };
+ return new String[] { "Fusion Reactor MK " + tier, "EU Required: " + powerRequired + "EU/t",
+ "Stored EU: " + this.getEUVar() + " / " + maxEUStore(), "Plasma Output: " + plasmaOut + "L/t",
+ "Current Recipe: " + fusionName };
}
@Override
@@ -385,48 +366,46 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab)};
+ return new ITexture[] { this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+ return new ITexture[] { this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+ return new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+ return new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
- };
+ return new ITexture[] { this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active)
- };
+ return new ITexture[] { this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active) };
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+ return new ITexture[] { this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+ return new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+ return new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
- };
+ return new ITexture[] { this.getCasingTexture(),
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue) };
}
@Override
@@ -484,8 +463,7 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
} else {
// Logger.MACHINE_INFO("8");
this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
- if (aTick % 100 == 0
- || aBaseMetaTileEntity.hasWorkJustBeenEnabled()
+ if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled()
|| aBaseMetaTileEntity.hasInventoryBeenModified()) {
Logger.MACHINE_INFO("9");
// turnCasingActive(mMaxProgresstime > 0);
@@ -677,8 +655,8 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
}
@Override
- public boolean onRightclick(
- IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
+ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX,
+ float aY, float aZ) {
// TODO Auto-generated method stub
return super.onRightclick(aBaseMetaTileEntity, aPlayer, aSide, aX, aY, aZ);
}
@@ -708,8 +686,8 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
super.startSoundLoop(aIndex, aX, aY, aZ);
if (aIndex == 1) {
- GT_Utility.doSoundAtClient(
- (String) GregTech_API.sSoundList.get(Integer.valueOf(212)), 10, 1.0F, aX, aY, aZ);
+ GT_Utility
+ .doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(212)), 10, 1.0F, aX, aY, aZ);
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
index f9ecc4be18..96f780c36d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
@@ -9,38 +12,50 @@ import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_BasicMachine {
public GregtechMetaTileEntity_ReactorColdTrap(int aID, String aName, String aNameRegional, int aTier) {
- super(aID, aName, aNameRegional, aTier, 1, "Just like the Arctic", 2, 9, "Dehydrator.png", "", new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP)
- });
+ super(
+ aID,
+ aName,
+ aNameRegional,
+ aTier,
+ 1,
+ "Just like the Arctic",
+ 2,
+ 9,
+ "Dehydrator.png",
+ "",
+ new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP) });
}
- public GregtechMetaTileEntity_ReactorColdTrap(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+ public GregtechMetaTileEntity_ReactorColdTrap(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures, String aGUIName, String aNEIName) {
super(aName, aTier, 1, aDescription, aTextures, 2, 9, aGUIName, aNEIName);
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, "Does not require ice cubes", CORE.GT_Tooltip};
+ return new String[] { this.mDescription, "Does not require ice cubes", CORE.GT_Tooltip };
}
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntity_ReactorColdTrap(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mGUIName,
+ this.mNEIName);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
index 8f8711a7fe..034cebc41c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
@@ -9,8 +12,6 @@ import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEntity_BasicMachine {
@@ -26,32 +27,35 @@ public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEnt
9,
"Dehydrator.png",
"",
- new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
- new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP)
- });
+ new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
+ new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP) });
}
- public GregtechMetaTileEntity_ReactorProcessingUnit(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+ public GregtechMetaTileEntity_ReactorProcessingUnit(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures, String aGUIName, String aNEIName) {
super(aName, aTier, 1, aDescription, aTextures, 2, 9, aGUIName, aNEIName);
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, CORE.GT_Tooltip};
+ return new String[] { this.mDescription, CORE.GT_Tooltip };
}
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntity_ReactorProcessingUnit(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mGUIName,
+ this.mNEIName);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
index db74a46f1b..5d4f755408 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+import java.util.*;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
@@ -15,12 +23,6 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
-import java.util.*;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
@@ -29,40 +31,26 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
public int mMode = 0;
public boolean mLocked = true;
- public GregtechMetaWirelessCharger(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final int aSlotCount) {
+ public GregtechMetaWirelessCharger(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final String aDescription, final int aSlotCount) {
super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
}
- public GregtechMetaWirelessCharger(
- final String aName,
- final int aTier,
- final String aDescription,
- final ITexture[][][] aTextures,
- final int aSlotCount) {
+ public GregtechMetaWirelessCharger(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures, final int aSlotCount) {
super(aName, aTier, aSlotCount, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Can be locked to the owner by sneaking with a screwdriver",
- "Can also be locked with a lock upgrade",
- "",
- "3 Modes, Long-Range, Local and Mixed.",
- "Long-Range: Can supply 2A of power to a single player up to " + (GT_Values.V[this.mTier] * 4) + "m away.",
- "Local: Can supply several Amps to each player within " + this.mTier * 20 + "m.",
- "Mixed: Provides both 2A of long range and 1A per player locally.",
- "Mixed mode is more conservative of power and as a result only",
- "Gets half the distances each singular mode gets.",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Can be locked to the owner by sneaking with a screwdriver",
+ "Can also be locked with a lock upgrade", "", "3 Modes, Long-Range, Local and Mixed.",
+ "Long-Range: Can supply 2A of power to a single player up to " + (GT_Values.V[this.mTier] * 4)
+ + "m away.",
+ "Local: Can supply several Amps to each player within " + this.mTier * 20 + "m.",
+ "Mixed: Provides both 2A of long range and 1A per player locally.",
+ "Mixed mode is more conservative of power and as a result only",
+ "Gets half the distances each singular mode gets.", CORE.GT_Tooltip };
}
public int getTier() {
@@ -104,91 +92,61 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2) };
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
@Override
@@ -229,7 +187,11 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaWirelessCharger(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mInventory.length);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mInventory.length);
}
@Override
@@ -362,20 +324,20 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
public String[] getInfoData() {
- return new String[] {this.getLocalName()};
+ return new String[] { this.getLocalName() };
}
@Override
@@ -537,8 +499,8 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
}
}
if (this.mMode == 0 || this.mMode == 2) {
- int tempRange = (int)
- (this.mMode == 0 ? 4 * GT_Values.V[this.mTier] : 2 * GT_Values.V[this.mTier]);
+ int tempRange = (int) (this.mMode == 0 ? 4 * GT_Values.V[this.mTier]
+ : 2 * GT_Values.V[this.mTier]);
if (getDistanceBetweenTwoPositions(getTileEntityPosition(), getPositionOfEntity(mTemp))
<= tempRange) {
if (!mWirelessChargingMap.containsKey(mTemp.getDisplayName())) {
@@ -562,24 +524,19 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
}
}
}
- /*if (this.mMode == 0 || this.mMode == 2){
- int tempRange = (int) (this.mMode == 0 ? 4*GT_Values.V[this.mTier] : 2*GT_Values.V[this.mTier]);
- if (getDistanceBetweenTwoPositions(getTileEntityPosition(), getPositionOfEntity(mTemp)) < tempRange){
- if (!mWirelessChargingMap.containsKey(mTemp)){
- mWirelessChargingMap.put(mTemp, mTemp.getPersistentID());
- PlayerUtils.messagePlayer(mTemp, "You have entered charging range. ["+tempRange+"m].");
- ChargingHelper.addValidPlayer(mTemp, this);
- }
- }
- else {
- if (mWirelessChargingMap.containsKey(mTemp)){
- if (mWirelessChargingMap.remove(mTemp) != null){
- PlayerUtils.messagePlayer(mTemp, "You have left charging range. ["+tempRange+"m].");
- ChargingHelper.removeValidPlayer(mTemp, this);
- }
- }
- }
- } */
+ /*
+ * if (this.mMode == 0 || this.mMode == 2){ int tempRange = (int) (this.mMode == 0 ?
+ * 4*GT_Values.V[this.mTier] : 2*GT_Values.V[this.mTier]); if
+ * (getDistanceBetweenTwoPositions(getTileEntityPosition(), getPositionOfEntity(mTemp)) <
+ * tempRange){ if (!mWirelessChargingMap.containsKey(mTemp)){
+ * mWirelessChargingMap.put(mTemp, mTemp.getPersistentID());
+ * PlayerUtils.messagePlayer(mTemp, "You have entered charging range. ["+tempRange+"m].");
+ * ChargingHelper.addValidPlayer(mTemp, this); } } else { if
+ * (mWirelessChargingMap.containsKey(mTemp)){ if (mWirelessChargingMap.remove(mTemp) !=
+ * null){ PlayerUtils.messagePlayer(mTemp,
+ * "You have left charging range. ["+tempRange+"m].");
+ * ChargingHelper.removeValidPlayer(mTemp, this); } } } }
+ */
}
}
@@ -607,12 +564,13 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
if (objectA == null || objectB == null) {
return 0f;
}
- int[] objectArray1 = new int[] {objectA.xPos, objectA.yPos, objectA.zPos};
- int[] objectArray2 = new int[] {objectB.xPos, objectB.yPos, objectB.zPos};
+ int[] objectArray1 = new int[] { objectA.xPos, objectA.yPos, objectA.zPos };
+ int[] objectArray2 = new int[] { objectB.xPos, objectB.yPos, objectB.zPos };
- final double distance = Math.sqrt((objectArray2[0] - objectArray1[0]) * (objectArray2[0] - objectArray1[0])
- + (objectArray2[1] - objectArray1[1]) * (objectArray2[1] - objectArray1[1])
- + (objectArray2[2] - objectArray1[2]) * (objectArray2[2] - objectArray1[2]));
+ final double distance = Math.sqrt(
+ (objectArray2[0] - objectArray1[0]) * (objectArray2[0] - objectArray1[0])
+ + (objectArray2[1] - objectArray1[1]) * (objectArray2[1] - objectArray1[1])
+ + (objectArray2[2] - objectArray1[2]) * (objectArray2[2] - objectArray1[2]));
return distance;
}
@@ -636,8 +594,8 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
}
@Override
- public boolean onRightclick(
- IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
+ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX,
+ float aY, float aZ) {
int tempRange;
@@ -648,8 +606,8 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
}
if (this.mMode == 2) {
- PlayerUtils.messagePlayer(
- aPlayer, "Mixed Mode | Local: " + this.mTier * 10 + "m | Long: " + tempRange + "m");
+ PlayerUtils
+ .messagePlayer(aPlayer, "Mixed Mode | Local: " + this.mTier * 10 + "m | Long: " + tempRange + "m");
PlayerUtils.messagePlayer(aPlayer, "Players with access:");
for (String name : this.getLocalMap().keySet()) {
PlayerUtils.messagePlayer(aPlayer, "Local: " + name);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
index bf9e9f3d94..a27509b284 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
@@ -6,10 +6,16 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.TAE;
@@ -27,9 +33,6 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_AmazonPackager>
implements ISurvivalConstructable {
@@ -62,18 +65,16 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
public IStructureDefinition<GMTE_AmazonPackager> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GMTE_AmazonPackager>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GMTE_AmazonPackager.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(TAE.getIndexFromPage(2, 9))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.getIndexFromPage(2, 9)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 9))))
.build();
}
@@ -83,26 +84,17 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Amazon Warehouse")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Amazon Warehouse")
.addInfo("This Multiblock is used for EXTREME packaging requirements")
.addInfo("Dust Schematics are inserted into the input busses")
.addInfo("If inserted into the controller, it is shared across all busses")
.addInfo("1x, 2x, 3x & Other Schematics are to be placed into the controller GUI slot")
.addInfo("500% faster than using single block machines of the same voltage")
- .addInfo("Only uses 75% of the EU/t normally required")
- .addInfo("Processes 16 items per voltage tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front center")
- .addCasingInfo("Supply Depot Casings", 10)
- .addInputBus("Any casing", 1)
- .addOutputBus("Any casing", 1)
- .addEnergyHatch("Any casing", 1)
- .addMaintenanceHatch("Any casing", 1)
- .addMufflerHatch("Any casing", 1)
- .toolTipFinisher("GT++");
+ .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes 16 items per voltage tier")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
+ .addController("Front center").addCasingInfo("Supply Depot Casings", 10).addInputBus("Any casing", 1)
+ .addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1)
+ .addMufflerHatch("Any casing", 1).toolTipFinisher("GT++");
return tt;
}
@@ -177,12 +169,11 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
}
public boolean checkRecipe(ItemStack inputStack, ItemStack schematicStack) {
- if (GT_Utility.isStackValid((Object) inputStack)
- && GT_Utility.isStackValid((Object) schematicStack)
+ if (GT_Utility.isStackValid((Object) inputStack) && GT_Utility.isStackValid((Object) schematicStack)
&& GT_Utility.getContainerItem(inputStack, true) == null) {
ItemStack tOutputStack;
if (ItemList.Schematic_1by1.isStackEqual((Object) schematicStack) && inputStack.stackSize >= 1) {
- tOutputStack = GT_ModHandler.getRecipeOutput(new ItemStack[] {inputStack});
+ tOutputStack = GT_ModHandler.getRecipeOutput(new ItemStack[] { inputStack });
if (tOutputStack != null && this.allowPutStack(tOutputStack, schematicStack)) {
final ItemStack input = inputStack;
--input.stackSize;
@@ -195,8 +186,8 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
}
return false;
} else if (ItemList.Schematic_2by2.isStackEqual((Object) schematicStack) && inputStack.stackSize >= 4) {
- tOutputStack = GT_ModHandler.getRecipeOutput(
- new ItemStack[] {inputStack, inputStack, null, inputStack, inputStack});
+ tOutputStack = GT_ModHandler
+ .getRecipeOutput(new ItemStack[] { inputStack, inputStack, null, inputStack, inputStack });
if (tOutputStack != null && this.allowPutStack(tOutputStack, schematicStack)) {
final ItemStack input2 = inputStack;
input2.stackSize -= 4;
@@ -209,17 +200,9 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
}
return false;
} else if (ItemList.Schematic_3by3.isStackEqual((Object) schematicStack) && inputStack.stackSize >= 9) {
- tOutputStack = GT_ModHandler.getRecipeOutput(new ItemStack[] {
- inputStack,
- inputStack,
- inputStack,
- inputStack,
- inputStack,
- inputStack,
- inputStack,
- inputStack,
- inputStack
- });
+ tOutputStack = GT_ModHandler.getRecipeOutput(
+ new ItemStack[] { inputStack, inputStack, inputStack, inputStack, inputStack, inputStack,
+ inputStack, inputStack, inputStack });
if (tOutputStack != null && this.allowPutStack(tOutputStack, schematicStack)) {
final ItemStack input3 = inputStack;
input3.stackSize -= 9;
@@ -245,30 +228,26 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon
}
// Something
if (GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(
- (IHasWorldObjectAndCoords) this.getBaseMetaTileEntity(),
- true,
- GT_Values.V[this.mTier],
- (FluidStack[]) null,
- new ItemStack[] {GT_Utility.copyAmount(64L, new Object[] {aStack}), schematicStack})
- != null) {
+ (IHasWorldObjectAndCoords) this.getBaseMetaTileEntity(),
+ true,
+ GT_Values.V[this.mTier],
+ (FluidStack[]) null,
+ new ItemStack[] { GT_Utility.copyAmount(64L, new Object[] { aStack }), schematicStack }) != null) {
return true;
}
// 1x1
if (ItemList.Schematic_1by1.isStackEqual((Object) schematicStack)
- && GT_ModHandler.getRecipeOutput(new ItemStack[] {aStack}) != null) {
+ && GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack }) != null) {
return true;
}
// 2x2
if (ItemList.Schematic_2by2.isStackEqual((Object) schematicStack)
- && GT_ModHandler.getRecipeOutput(new ItemStack[] {aStack, aStack, null, aStack, aStack}) != null) {
+ && GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack, aStack, null, aStack, aStack }) != null) {
return true;
}
// 3x3
- if (ItemList.Schematic_3by3.isStackEqual((Object) schematicStack)
- && GT_ModHandler.getRecipeOutput(
- new ItemStack[] {aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack
- })
- != null) {
+ if (ItemList.Schematic_3by3.isStackEqual((Object) schematicStack) && GT_ModHandler.getRecipeOutput(
+ new ItemStack[] { aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack }) != null) {
return true;
}
return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
index 1805c3dba4..a5dd84c92d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
@@ -2,7 +2,23 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.misc;
import static gregtech.api.enums.GT_Values.W;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -21,19 +37,6 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase<GregtechMTE_TeslaTower> {
@@ -49,9 +52,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase<Gregtech
protected int mRange;
/**
- * Machine Mode,
- * {@value false} Attacks all entities,
- * {@value true} Only attacks players.
+ * Machine Mode, {@value false} Attacks all entities, {@value true} Only attacks players.
*/
protected volatile boolean mMode = false;
@@ -75,40 +76,28 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase<Gregtech
return "Weaponized Lighting Rod";
}
- /*@Override
- public String[] getTooltip() {
- String casings = getCasingBlockItem().get(0).getDisplayName();
- return new String[]{
- "Controller Block for the Tesla Defence Tower Mk3200",
- "Enemies within "+this.mRange+"m are blasted with a high energy plasma.",
- "This uses 5,000,000EU per blast.",
- "Can screwdriver to toggle mode between Players and all Entities.",
- "Size(WxHxD): 3x7x3", "Controller (Front middle at bottom)",
- "3x1x3 Base of " + casings,
- "1x3x1 " + casings + " pillar (Center of base)",
- "1x3x1 " + MaterialUtils.getMaterialName(getFrameMaterial()) + " Frame Boxes (Each pillar side and on top)",
- "1x Maintenance Hatch (One of base casings)",
- "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)"};
- }*/
+ /*
+ * @Override public String[] getTooltip() { String casings = getCasingBlockItem().get(0).getDisplayName(); return
+ * new String[]{ "Controller Block for the Tesla Defence Tower Mk3200",
+ * "Enemies within "+this.mRange+"m are blasted with a high energy plasma.", "This uses 5,000,000EU per blast.",
+ * "Can screwdriver to toggle mode between Players and all Entities.", "Size(WxHxD): 3x7x3",
+ * "Controller (Front middle at bottom)", "3x1x3 Base of " + casings, "1x3x1 " + casings +
+ * " pillar (Center of base)", "1x3x1 " + MaterialUtils.getMaterialName(getFrameMaterial()) +
+ * " Frame Boxes (Each pillar side and on top)", "1x Maintenance Hatch (One of base casings)", "1x " +
+ * VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)"}; }
+ */
@Override
protected final GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Tesla Defence Tower Mk3200")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Tesla Defence Tower Mk3200")
.addInfo("Enemies within " + this.mRange + "m are blasted with a high energy plasma.")
.addInfo("This uses 5,000,000EU per blast.")
- .addInfo("Can screwdriver to toggle mode between Players and all Entities.")
- .addSeparator()
- .beginStructureBlock(1, 7, 1, false)
- .addController("Top Middle")
- .addCasingInfo("Casing", 360)
- .addOtherStructurePart("Rotor Assembly", "Any 1 dot hint", 1)
- .addInputBus("Any 4 dot hint (min 1)", 4)
- .addInputHatch("Any 4 dot hint(min 1)", 4)
- .addOutputHatch("Any 4 dot hint(min 1)", 4)
- .addEnergyHatch("Any 4 dot hint(min 1)", 4)
- .addMaintenanceHatch("Any 4 dot hint(min 1)", 4)
+ .addInfo("Can screwdriver to toggle mode between Players and all Entities.").addSeparator()
+ .beginStructureBlock(1, 7, 1, false).addController("Top Middle").addCasingInfo("Casing", 360)
+ .addOtherStructurePart("Rotor Assembly", "Any 1 dot hint", 1).addInputBus("Any 4 dot hint (min 1)", 4)
+ .addInputHatch("Any 4 dot hint(min 1)", 4).addOutputHatch("Any 4 dot hint(min 1)", 4)
+ .addEnergyHatch("Any 4 dot hint(min 1)", 4).addMaintenanceHatch("Any 4 dot hint(min 1)", 4)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -181,8 +170,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase<Gregtech
if (xOff == 0 && zOff == 0) continue;
IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xOff, 0, zOff);
- if (!checkCasingBlock(xOff, 0, zOff)
- && !addMaintenanceToMachineList(tTileEntity, casingTextureIndex)
+ if (!checkCasingBlock(xOff, 0, zOff) && !addMaintenanceToMachineList(tTileEntity, casingTextureIndex)
&& !addEnergyInputToMachineList(tTileEntity, casingTextureIndex)) {
Logger.INFO("bad block");
return false;
@@ -226,6 +214,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase<Gregtech
Logger.INFO("Looking For Casing.");
return checkBlockAndMetaOffset(xOff, yOff, zOff, casingBlock, casingMeta);
}
+
// meta of frame is getTileEntityBaseType; frame should be checked using its drops (possible a high weight
// operation)
protected boolean checkFrameBlock(int xOff, int yOff, int zOff) {
@@ -238,8 +227,10 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase<Gregtech
}
private boolean checkBlockAndMeta(int x, int y, int z, Block block, int meta) {
- Logger.INFO("Found: " + getBaseMetaTileEntity().getBlock(x, y, z).getLocalizedName() + " | Meta: "
- + getBaseMetaTileEntity().getMetaID(x, y, z));
+ Logger.INFO(
+ "Found: " + getBaseMetaTileEntity().getBlock(x, y, z).getLocalizedName()
+ + " | Meta: "
+ + getBaseMetaTileEntity().getMetaID(x, y, z));
Logger.INFO("Expected: " + block.getLocalizedName() + " | Meta: " + meta);
return (meta == W || getBaseMetaTileEntity().getMetaID(x, y, z) == meta)
&& getBaseMetaTileEntity().getBlock(x, y, z) == block;
@@ -352,22 +343,17 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase<Gregtech
if (!this.mMode) {
mInRange.put(
new Pair<Long, Long>(
- ((Entity) r)
- .getUniqueID()
- .getMostSignificantBits(),
- ((Entity) r)
- .getUniqueID()
+ ((Entity) r).getUniqueID().getMostSignificantBits(),
+ ((Entity) r).getUniqueID()
.getLeastSignificantBits()),
(Entity) r);
} else {
if (r instanceof EntityPlayer) {
mInRange.put(
new Pair<Long, Long>(
- ((Entity) r)
- .getUniqueID()
+ ((Entity) r).getUniqueID()
.getMostSignificantBits(),
- ((Entity) r)
- .getUniqueID()
+ ((Entity) r).getUniqueID()
.getLeastSignificantBits()),
(Entity) r);
}
@@ -415,13 +401,19 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase<Gregtech
// if (world.canLightningStrikeAt(j1, l1+1, k1)){
// if (isEnergyEnough() && world.addWeatherEffect(new
// EntityTeslaTowerLightning(world, (double)j1, (double)l1, (double)k1))){
- if (isEnergyEnough()
- && world.addWeatherEffect(new EntityTeslaTowerLightning(
- world, (double) j1, (double) l1, (double) k1, f, getOwner()))) {
+ if (isEnergyEnough() && world.addWeatherEffect(
+ new EntityTeslaTowerLightning(
+ world,
+ (double) j1,
+ (double) l1,
+ (double) k1,
+ f,
+ getOwner()))) {
if (f == null || f.isDead || !f.isEntityAlive()) {
- this.mInRange.remove(new Pair<Long, Long>(
- f.getUniqueID().getMostSignificantBits(),
- f.getUniqueID().getLeastSignificantBits()));
+ this.mInRange.remove(
+ new Pair<Long, Long>(
+ f.getUniqueID().getMostSignificantBits(),
+ f.getUniqueID().getLeastSignificantBits()));
}
this.setEUVar(this.getEUVar() - 5000000);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
index 0dc2303a0e..4f09cdcba0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
@@ -7,10 +7,16 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gregtech.api.util.GT_StructureUtility.ofCoil;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.HeatingCoilLevel;
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
@@ -27,13 +33,9 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialAlloySmelter
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialAlloySmelter>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialAlloySmelter extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialAlloySmelter> implements ISurvivalConstructable {
public static int CASING_TEXTURE_ID;
private HeatingCoilLevel mHeatingCapacity;
@@ -102,25 +104,16 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Alloy Smelter")
- .addInfo("Gains one parallel per voltage tier")
- .addInfo("Gains one multiplier per coil tier")
- .addInfo("Parallel = Tier * Coil Tier")
- .addInfo("Gains 5% speed bonus per coil tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 5, 3, true)
- .addController("Bottom center")
- .addCasingInfo("Inconel Reinforced Casings", 8)
- .addCasingInfo("Integral Encasement V", 8)
- .addCasingInfo("Heating Coils", 16)
- .addInputBus("Any Inconel Reinforced Casing", 1)
- .addOutputBus("Any Inconel Reinforced Casing", 1)
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Alloy Smelter")
+ .addInfo("Gains one parallel per voltage tier").addInfo("Gains one multiplier per coil tier")
+ .addInfo("Parallel = Tier * Coil Tier").addInfo("Gains 5% speed bonus per coil tier")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 5, 3, true)
+ .addController("Bottom center").addCasingInfo("Inconel Reinforced Casings", 8)
+ .addCasingInfo("Integral Encasement V", 8).addCasingInfo("Heating Coils", 16)
+ .addInputBus("Any Inconel Reinforced Casing", 1).addOutputBus("Any Inconel Reinforced Casing", 1)
.addEnergyHatch("Any Inconel Reinforced Casing", 1)
.addMaintenanceHatch("Any Inconel Reinforced Casing", 1)
- .addMufflerHatch("Any Inconel Reinforced Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addMufflerHatch("Any Inconel Reinforced Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -128,28 +121,24 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter
public IStructureDefinition<GregtechMetaTileEntity_IndustrialAlloySmelter> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialAlloySmelter>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"HHH", "H-H", "HHH"},
- {"VVV", "V-V", "VVV"},
- {"HHH", "H-H", "HHH"},
- {"C~C", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "HHH", "H-H", "HHH" },
+ { "VVV", "V-V", "VVV" }, { "HHH", "H-H", "HHH" },
+ { "C~C", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialAlloySmelter.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(CASING_TEXTURE_ID)
- .dot(1)
- .buildAndChain(
+ .casingIndex(CASING_TEXTURE_ID).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 1))))
.addElement(
'H',
ofCoil(
GregtechMetaTileEntity_IndustrialAlloySmelter::setCoilLevel,
GregtechMetaTileEntity_IndustrialAlloySmelter::getCoilLevel))
- .addElement('V', ofBlock(ModBlocks.blockCasingsTieredGTPP, 4))
- .build();
+ .addElement('V', ofBlock(ModBlocks.blockCasingsTieredGTPP, 4)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -170,8 +159,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter
mCasing = 0;
mLevel = 0;
setCoilLevel(HeatingCoilLevel.None);
- return checkPiece(mName, 1, 4, 0)
- && mCasing >= 8
+ return checkPiece(mName, 1, 4, 0) && mCasing >= 8
&& getCoilLevel() != HeatingCoilLevel.None
&& (mLevel = getCoilLevel().getTier() + 1) > 0
&& checkHatch();
@@ -210,13 +198,8 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
// Based on the Processing Array. A bit overkill, but very flexible.
// Reset outputs and progress stats
@@ -229,14 +212,13 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter
byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
long tEnergy = getMaxInputEnergy();
- GT_Recipe tRecipe = this.getRecipeMap()
- .findRecipe(
- getBaseMetaTileEntity(),
- mLastRecipe,
- false,
- gregtech.api.enums.GT_Values.V[tTier],
- aFluidInputs,
- aItemInputs);
+ GT_Recipe tRecipe = this.getRecipeMap().findRecipe(
+ getBaseMetaTileEntity(),
+ mLastRecipe,
+ false,
+ gregtech.api.enums.GT_Values.V[tTier],
+ aFluidInputs,
+ aItemInputs);
// Remember last recipe - an optimization for findRecipe()
this.mLastRecipe = tRecipe;
@@ -246,14 +228,9 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter
return false;
}
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -271,19 +248,13 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
.setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel()))
- .enableHeatOC()
- .setRecipeHeat(0)
+ .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).enableHeatOC().setRecipeHeat(0)
// Need to multiple by 2 because heat OC is done only once every 1800 and this one does it once every
// 900
- .setMultiHeat((int) getCoilLevel().getHeat() * 2)
- .calculate();
+ .setMultiHeat((int) getCoilLevel().getHeat() * 2).calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
index 2d9574a315..1fd7beb384 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java
@@ -5,10 +5,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElement
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -23,15 +30,9 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-public class GregtechMetaTileEntity_IndustrialArcFurnace
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialArcFurnace>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialArcFurnace extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialArcFurnace> implements ISurvivalConstructable {
// 862
private static final int mCasingTextureID = TAE.getIndexFromPage(3, 3);
@@ -62,24 +63,14 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for Industrial Arc Furnace")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for Industrial Arc Furnace")
.addInfo("250% faster than using single block machines of the same voltage")
.addInfo("Processes 8 items per voltage tier * W/L")
- .addInfo("Max Size required to process Plasma recipes")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .addController("Top center")
- .addStructureInfo("Size: nx3xn [WxHxL] (Hollow)")
- .addStructureInfo("n can be 3, 5 or 7")
- .addCasingInfo(mCasingName, 10)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ .addInfo("Max Size required to process Plasma recipes").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().addController("Top center").addStructureInfo("Size: nx3xn [WxHxL] (Hollow)")
+ .addStructureInfo("n can be 3, 5 or 7").addCasingInfo(mCasingName, 10).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+ .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -87,29 +78,25 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
@Override
public IStructureDefinition<GregtechMetaTileEntity_IndustrialArcFurnace> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialArcFurnace>builder()
- .addShape(mName + "3", new String[][] {
- {"CCC", "C~C", "CCC"},
- {"CCC", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- })
- .addShape(mName + "5", new String[][] {
- {"CCCCC", "CCCCC", "CC~CC", "CCCCC", "CCCCC"},
- {"CCCCC", "C---C", "C---C", "C---C", "CCCCC"},
- {"CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC"},
- })
- .addShape(mName + "7", new String[][] {
- {"CCCCCCC", "CCCCCCC", "CCCCCCC", "CCC~CCC", "CCCCCCC", "CCCCCCC", "CCCCCCC"},
- {"CCCCCCC", "C-----C", "C-----C", "C-----C", "C-----C", "C-----C", "CCCCCCC"},
- {"CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC"},
- })
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialArcFurnace>builder().addShape(
+ mName + "3",
+ new String[][] { { "CCC", "C~C", "CCC" }, { "CCC", "C-C", "CCC" }, { "CCC", "CCC", "CCC" }, })
+ .addShape(
+ mName + "5",
+ new String[][] { { "CCCCC", "CCCCC", "CC~CC", "CCCCC", "CCCCC" },
+ { "CCCCC", "C---C", "C---C", "C---C", "CCCCC" },
+ { "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC" }, })
+ .addShape(
+ mName + "7",
+ new String[][] {
+ { "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCC~CCC", "CCCCCCC", "CCCCCCC", "CCCCCCC" },
+ { "CCCCCCC", "C-----C", "C-----C", "C-----C", "C-----C", "C-----C", "CCCCCCC" },
+ { "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC", "CCCCCCC" }, })
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialArcFurnace.class)
.atLeast(InputBus, InputHatch, OutputBus, OutputHatch, Maintenance, Energy, Muffler)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings4Misc, 3))))
.build();
}
@@ -148,7 +135,15 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
if (mMachine) return -1;
int size = getSizeFromHint(stackSize);
return survivialBuildPiece(
- mName + size, stackSize, (size - 1) / 2, (size - 1) / 2, 0, elementBudget, env, false, true);
+ mName + size,
+ stackSize,
+ (size - 1) / 2,
+ (size - 1) / 2,
+ 0,
+ elementBudget,
+ env,
+ false,
+ true);
}
@Override
@@ -196,8 +191,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
@Override
public GT_Recipe.GT_Recipe_Map getRecipeMap() {
- return mPlasmaMode
- ? GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes
+ return mPlasmaMode ? GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes
: GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes;
}
@@ -268,19 +262,34 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace
if (mPlasmaMode) {
PlayerUtils.messagePlayer(
aPlayer,
- "[" + EnumChatFormatting.RED + "MODE" + EnumChatFormatting.RESET + "] "
- + EnumChatFormatting.LIGHT_PURPLE + "Plasma" + EnumChatFormatting.RESET);
+ "[" + EnumChatFormatting.RED
+ + "MODE"
+ + EnumChatFormatting.RESET
+ + "] "
+ + EnumChatFormatting.LIGHT_PURPLE
+ + "Plasma"
+ + EnumChatFormatting.RESET);
} else {
PlayerUtils.messagePlayer(
aPlayer,
- "[" + EnumChatFormatting.RED + "MODE" + EnumChatFormatting.RESET + "] "
- + EnumChatFormatting.YELLOW + "Electric" + EnumChatFormatting.RESET);
+ "[" + EnumChatFormatting.RED
+ + "MODE"
+ + EnumChatFormatting.RESET
+ + "] "
+ + EnumChatFormatting.YELLOW
+ + "Electric"
+ + EnumChatFormatting.RESET);
}
} else {
PlayerUtils.messagePlayer(
aPlayer,
- "[" + EnumChatFormatting.RED + "MODE" + EnumChatFormatting.RESET + "] " + EnumChatFormatting.GRAY
- + "Cannot change mode, structure not large enough." + EnumChatFormatting.RESET);
+ "[" + EnumChatFormatting.RED
+ + "MODE"
+ + EnumChatFormatting.RESET
+ + "] "
+ + EnumChatFormatting.GRAY
+ + "Cannot change mode, structure not large enough."
+ + EnumChatFormatting.RESET);
}
mLastRecipe = null;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
index cf41c87018..b9c7983706 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
@@ -6,10 +6,16 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -24,14 +30,9 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-public class GregtechMetaTileEntity_IndustrialCentrifuge
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCentrifuge>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialCentrifuge extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCentrifuge> implements ISurvivalConstructable {
private boolean mIsAnimated;
private static final CustomIcon frontFaceActive = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5");
@@ -63,24 +64,15 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Centrifuge")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Centrifuge")
.addInfo("125% faster than using single block machines of the same voltage")
- .addInfo("Disable animations with a screwdriver")
- .addInfo("Only uses 90% of the EU/t normally required")
- .addInfo("Processes six items per voltage tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front Center")
- .addCasingInfo("Centrifuge Casings", 10)
- .addInputBus("Any Casing except front", 1)
- .addOutputBus("Any Casing except front", 1)
- .addInputHatch("Any Casing except front", 1)
- .addOutputHatch("Any Casing except front", 1)
- .addEnergyHatch("Any Casing except front", 1)
- .addMaintenanceHatch("Any Casing except front", 1)
- .addMufflerHatch("Any Casing except front", 1)
+ .addInfo("Disable animations with a screwdriver").addInfo("Only uses 90% of the EU/t normally required")
+ .addInfo("Processes six items per voltage tier").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().beginStructureBlock(3, 3, 3, true).addController("Front Center")
+ .addCasingInfo("Centrifuge Casings", 10).addInputBus("Any Casing except front", 1)
+ .addOutputBus("Any Casing except front", 1).addInputHatch("Any Casing except front", 1)
+ .addOutputHatch("Any Casing except front", 1).addEnergyHatch("Any Casing except front", 1)
+ .addMaintenanceHatch("Any Casing except front", 1).addMufflerHatch("Any Casing except front", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -89,18 +81,16 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge
public IStructureDefinition<GregtechMetaTileEntity_IndustrialCentrifuge> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCentrifuge>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialCentrifuge.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 0))))
.build();
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
index 4316cf936d..1f9b43873d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
@@ -6,10 +6,20 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+import team.chisel.carving.Carving;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -24,12 +34,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import team.chisel.carving.Carving;
public class GregtechMetaTileEntity_IndustrialChisel
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialChisel> implements ISurvivalConstructable {
@@ -60,22 +64,13 @@ public class GregtechMetaTileEntity_IndustrialChisel
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Factory Grade Auto Chisel")
- .addInfo("Target block goes in GUI slot")
- .addInfo("If no target provided, firdt chisel result is used")
+ tt.addMachineType(getMachineType()).addInfo("Factory Grade Auto Chisel")
+ .addInfo("Target block goes in GUI slot").addInfo("If no target provided, firdt chisel result is used")
.addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 16")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front center")
- .addCasingInfo("Sturdy Printer Casing", 10)
- .addInputBus("Any casing", 1)
- .addOutputBus("Any casing", 1)
- .addEnergyHatch("Any casing", 1)
- .addMaintenanceHatch("Any casing", 1)
- .addMufflerHatch("Any casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
+ .addController("Front center").addCasingInfo("Sturdy Printer Casing", 10).addInputBus("Any casing", 1)
+ .addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1)
+ .addMufflerHatch("Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -83,17 +78,15 @@ public class GregtechMetaTileEntity_IndustrialChisel
public IStructureDefinition<GregtechMetaTileEntity_IndustrialChisel> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialChisel>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialChisel.class)
- .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(90)
- .dot(1)
+ .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler).casingIndex(90).dot(1)
.buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings5Misc, 5))))
.build();
@@ -201,18 +194,17 @@ public class GregtechMetaTileEntity_IndustrialChisel
if (tIsCached || aInput != null && hasChiselResults(aInput)) {
ItemStack tOutput = tIsCached ? mOutputCache.copy() : getChiselOutput(aInput, aTarget);
if (tOutput != null) {
- if (mCachedRecipe != null
- && GT_Utility.areStacksEqual(aInput, mInputCache)
+ if (mCachedRecipe != null && GT_Utility.areStacksEqual(aInput, mInputCache)
&& GT_Utility.areStacksEqual(tOutput, mOutputCache)) {
return mCachedRecipe;
}
// We can chisel this
GTPP_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {ItemUtils.getSimpleStack(aInput, 1)},
- new ItemStack[] {ItemUtils.getSimpleStack(tOutput, 1)},
+ new ItemStack[] { ItemUtils.getSimpleStack(aInput, 1) },
+ new ItemStack[] { ItemUtils.getSimpleStack(tOutput, 1) },
null,
- new int[] {10000},
+ new int[] { 10000 },
new FluidStack[] {},
new FluidStack[] {},
20,
@@ -256,14 +248,9 @@ public class GregtechMetaTileEntity_IndustrialChisel
int aEUPercent = getEuDiscountForParallelism();
int aSpeedBonusPercent = 200;
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -281,14 +268,10 @@ public class GregtechMetaTileEntity_IndustrialChisel
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
.setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel()))
- .calculate();
+ .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
index 95a0024284..922e5f8904 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
@@ -7,10 +7,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -24,11 +27,9 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
-public class GregtechMetaTileEntity_IndustrialCokeOven
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCokeOven>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialCokeOven extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCokeOven> implements ISurvivalConstructable {
private int mLevel = 0;
private int mCasing;
@@ -57,25 +58,16 @@ public class GregtechMetaTileEntity_IndustrialCokeOven
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Processes Logs and Coal into Charcoal and Coal Coke.")
+ tt.addMachineType(getMachineType()).addInfo("Processes Logs and Coal into Charcoal and Coal Coke.")
.addInfo("Controller Block for the Industrial Coke Oven")
.addInfo("Gain 4% energy discount per voltage tier")
.addInfo("Process 12x materials with Heat Resistant Casings")
- .addInfo("Or 24x materials with Heat Proof Casings")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front middle at bottom")
+ .addInfo("Or 24x materials with Heat Proof Casings").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().beginStructureBlock(3, 3, 3, true).addController("Front middle at bottom")
.addCasingInfo("Structural Coke Oven Casings", 8)
- .addCasingInfo("Heat Resistant/Proof Coke Oven Casings", 8)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ .addCasingInfo("Heat Resistant/Proof Coke Oven Casings", 8).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+ .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -84,28 +76,26 @@ public class GregtechMetaTileEntity_IndustrialCokeOven
public IStructureDefinition<GregtechMetaTileEntity_IndustrialCokeOven> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCokeOven>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"HHH", "H-H", "HHH"},
- {"C~C", "CCC", "CCC"},
- }))
- .addShape(mName + "1", transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"aaa", "a-a", "aaa"},
- {"C~C", "CCC", "CCC"},
- }))
- .addShape(mName + "2", transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"bbb", "b-b", "bbb"},
- {"C~C", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "HHH", "H-H", "HHH" },
+ { "C~C", "CCC", "CCC" }, }))
+ .addShape(
+ mName + "1",
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "aaa", "a-a", "aaa" },
+ { "C~C", "CCC", "CCC" }, }))
+ .addShape(
+ mName + "2",
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "bbb", "b-b", "bbb" },
+ { "C~C", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialCokeOven.class)
.atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Energy, Muffler)
- .casingIndex(TAE.GTPP_INDEX(1))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.GTPP_INDEX(1)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 1))))
.addElement(
'H',
@@ -113,8 +103,7 @@ public class GregtechMetaTileEntity_IndustrialCokeOven
onElementPass(x -> ++x.mCasing1, ofBlock(ModBlocks.blockCasingsMisc, 2)),
onElementPass(x -> ++x.mCasing2, ofBlock(ModBlocks.blockCasingsMisc, 3))))
.addElement('a', ofBlock(ModBlocks.blockCasingsMisc, 2))
- .addElement('b', ofBlock(ModBlocks.blockCasingsMisc, 3))
- .build();
+ .addElement('b', ofBlock(ModBlocks.blockCasingsMisc, 3)).build();
}
return STRUCTURE_DEFINITION;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
index 9f1ba02076..ec2d7d647a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
@@ -6,10 +6,16 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -23,21 +29,16 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-public class GregtechMetaTileEntity_IndustrialCuttingMachine
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCuttingMachine>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialCuttingMachine extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialCuttingMachine> implements ISurvivalConstructable {
private boolean mCuttingMode = true;
private int mCasing;
private static IStructureDefinition<GregtechMetaTileEntity_IndustrialCuttingMachine> STRUCTURE_DEFINITION = null;
- public GregtechMetaTileEntity_IndustrialCuttingMachine(
- final int aID, final String aName, final String aNameRegional) {
+ public GregtechMetaTileEntity_IndustrialCuttingMachine(final int aID, final String aName,
+ final String aNameRegional) {
super(aID, aName, aNameRegional);
}
@@ -58,22 +59,13 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Cutting Factory")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Cutting Factory")
.addInfo("200% faster than using single block machines of the same voltage")
- .addInfo("Only uses 75% of the EU/t normally required")
- .addInfo("Processes four items per voltage tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 5, true)
- .addController("Front Center")
- .addCasingInfo("Cutting Factory Frames", 26)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes four items per voltage tier")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 5, true)
+ .addController("Front Center").addCasingInfo("Cutting Factory Frames", 26).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
+ .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -82,18 +74,17 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine
public IStructureDefinition<GregtechMetaTileEntity_IndustrialCuttingMachine> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCuttingMachine>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC", "CCC", "CCC"},
- {"C~C", "C-C", "C-C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC", "CCC", "CCC" },
+ { "C~C", "C-C", "C-C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialCuttingMachine.class)
.atLeast(InputBus, InputHatch, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 13))))
.build();
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java
index 3fd71a56d2..2bfe9ad75f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java
@@ -7,10 +7,16 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gregtech.api.util.GT_StructureUtility.ofCoil;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.HeatingCoilLevel;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -28,14 +34,9 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialDehydrator
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialDehydrator>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialDehydrator extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialDehydrator> implements ISurvivalConstructable {
private static int CASING_TEXTURE_ID;
private static String mCasingName = "Vacuum Casing";
@@ -61,26 +62,17 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Factory Grade Vacuum Furnace")
+ tt.addMachineType(getMachineType()).addInfo("Factory Grade Vacuum Furnace")
.addInfo("Can toggle the operation temperature with a Screwdriver")
.addInfo("All Dehydrator recipes are Low Temp recipes")
.addInfo("Speed: +120% | EU Usage: 50% | Parallel: 4")
.addInfo("Each 900K over the min. Heat Capacity grants 5% speedup (multiplicatively)")
.addInfo("Each 1800K over the min. Heat Capacity allows for one upgraded overclock")
.addInfo("Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 5, 3, true)
- .addController("Bottom Center")
- .addCasingInfo(mCasingName, 5)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 5, 3, true)
+ .addController("Bottom Center").addCasingInfo(mCasingName, 5).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+ .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -88,21 +80,16 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
@Override
public IStructureDefinition<GregtechMetaTileEntity_IndustrialDehydrator> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialDehydrator>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"HHH", "H-H", "HHH"},
- {"HHH", "H-H", "HHH"},
- {"HHH", "H-H", "HHH"},
- {"C~C", "CCC", "CCC"},
- }))
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialDehydrator>builder().addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "HHH", "H-H", "HHH" }, { "HHH", "H-H", "HHH" },
+ { "HHH", "H-H", "HHH" }, { "C~C", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialDehydrator.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
- .casingIndex(CASING_TEXTURE_ID)
- .dot(1)
- .buildAndChain(
+ .casingIndex(CASING_TEXTURE_ID).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings4Misc, 10))))
.addElement(
'H',
@@ -148,8 +135,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
}
public GT_Recipe.GT_Recipe_Map getRecipeMap() {
- return mDehydratorMode
- ? GTPP_Recipe.GTPP_Recipe_Map.sMultiblockChemicalDehydratorRecipes
+ return mDehydratorMode ? GTPP_Recipe.GTPP_Recipe_Map.sMultiblockChemicalDehydratorRecipes
: GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes;
}
@@ -185,13 +171,8 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
// Based on the Processing Array. A bit overkill, but very flexible.
// Reset outputs and progress stats
@@ -204,14 +185,13 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
long tEnergy = getMaxInputEnergy();
- GT_Recipe tRecipe = this.getRecipeMap()
- .findRecipe(
- getBaseMetaTileEntity(),
- mLastRecipe,
- false,
- gregtech.api.enums.GT_Values.V[tTier],
- aFluidInputs,
- aItemInputs);
+ GT_Recipe tRecipe = this.getRecipeMap().findRecipe(
+ getBaseMetaTileEntity(),
+ mLastRecipe,
+ false,
+ gregtech.api.enums.GT_Values.V[tTier],
+ aFluidInputs,
+ aItemInputs);
// Remember last recipe - an optimization for findRecipe()
this.mLastRecipe = tRecipe;
@@ -220,14 +200,9 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
return false;
}
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -245,17 +220,11 @@ public class GregtechMetaTileEntity_IndustrialDehydrator
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
.setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel()))
- .enableHeatOC()
- .enableHeatDiscount()
- .setRecipeHeat(tRecipe.mSpecialValue)
- .setMultiHeat((int) getCoilLevel().getHeat())
+ .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).enableHeatOC()
+ .enableHeatDiscount().setRecipeHeat(tRecipe.mSpecialValue).setMultiHeat((int) getCoilLevel().getHeat())
.calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
index 00cb08ec32..52ad795a3c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
@@ -6,10 +6,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -21,17 +24,15 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
-public class GregtechMetaTileEntity_IndustrialElectrolyzer
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialElectrolyzer>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialElectrolyzer extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialElectrolyzer> implements ISurvivalConstructable {
private int mCasing;
private static IStructureDefinition<GregtechMetaTileEntity_IndustrialElectrolyzer> STRUCTURE_DEFINITION = null;
- public GregtechMetaTileEntity_IndustrialElectrolyzer(
- final int aID, final String aName, final String aNameRegional) {
+ public GregtechMetaTileEntity_IndustrialElectrolyzer(final int aID, final String aName,
+ final String aNameRegional) {
super(aID, aName, aNameRegional);
}
@@ -52,23 +53,13 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Electrolyzer")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Electrolyzer")
.addInfo("180% faster than using single block machines of the same voltage")
- .addInfo("Only uses 90% of the EU/t normally required")
- .addInfo("Processes two items per voltage tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front Center")
- .addCasingInfo("Electrolyzer Casings", 10)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ .addInfo("Only uses 90% of the EU/t normally required").addInfo("Processes two items per voltage tier")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
+ .addController("Front Center").addCasingInfo("Electrolyzer Casings", 10).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+ .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -77,18 +68,16 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer
public IStructureDefinition<GregtechMetaTileEntity_IndustrialElectrolyzer> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialElectrolyzer>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialElectrolyzer.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
- .casingIndex(TAE.GTPP_INDEX(5))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.GTPP_INDEX(5)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 5))))
.build();
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
index 8a14401d20..bdbf4a4aec 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
@@ -6,10 +6,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -23,14 +30,9 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialExtruder
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialExtruder>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialExtruder extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialExtruder> implements ISurvivalConstructable {
private int mCasing;
private static IStructureDefinition<GregtechMetaTileEntity_IndustrialExtruder> STRUCTURE_DEFINITION = null;
@@ -56,23 +58,16 @@ public class GregtechMetaTileEntity_IndustrialExtruder
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Material Extruder")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Material Extruder")
.addInfo("250% faster than using single block machines of the same voltage")
.addInfo("Processes four items per voltage tier")
.addInfo("Extrusion Shape for recipe goes in the Input Bus")
.addInfo("Each Input Bus can have a different shape!")
.addInfo("You can use several input buses per multiblock")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 5, true)
- .addController("Front Center")
- .addCasingInfo("Inconel Reinforced Casings", 14)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Back Center", 2)
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 5, true)
+ .addController("Front Center").addCasingInfo("Inconel Reinforced Casings", 14)
+ .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1)
+ .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Back Center", 2)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -80,20 +75,19 @@ public class GregtechMetaTileEntity_IndustrialExtruder
@Override
public IStructureDefinition<GregtechMetaTileEntity_IndustrialExtruder> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialExtruder>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC", "CCC", "CCC"},
- {"C~C", "C-C", "C-C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC", "CCC", "CCC"},
- }))
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialExtruder>builder().addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC", "CCC", "CCC" },
+ { "C~C", "C-C", "C-C", "C-C", "CCC" }, { "CCC", "CCC", "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialExtruder.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing,
+ ofBlock(getCasingBlock(), getCasingMeta()))))
.build();
}
return STRUCTURE_DEFINITION;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java
index a4e5b15b61..09acde8bcb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java
@@ -6,10 +6,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -21,12 +25,9 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-public class GregtechMetaTileEntity_IndustrialFluidHeater
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialFluidHeater>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialFluidHeater extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialFluidHeater> implements ISurvivalConstructable {
private int mCasing1;
private static IStructureDefinition<GregtechMetaTileEntity_IndustrialFluidHeater> STRUCTURE_DEFINITION = null;
@@ -52,25 +53,17 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Fluid Heater")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Fluid Heater")
.addInfo("120% faster than using single block machines of the same voltage")
.addInfo("Only uses 90% of the EU/t normally required")
- .addInfo("Processes eight items per voltage tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(5, 6, 5, true)
- .addController("Front Center")
+ .addInfo("Processes eight items per voltage tier").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().beginStructureBlock(5, 6, 5, true).addController("Front Center")
.addCasingInfo("Top/Bottom layer: Multi-use Casings", 34)
.addCasingInfo("Middle layers: Thermal Containment Casing", 47)
- .addInputBus("Bottom Layer (optional)", 1)
- .addInputHatch("Bottom Layer", 1)
- .addOutputBus("Top Layer (optional)", 1)
- .addOutputHatch("Top Layer", 1)
- .addEnergyHatch("Any Multi-use Casing", 1)
- .addMaintenanceHatch("Any Multi-use Casing", 1)
- .addMufflerHatch("Any Multi-use Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addInputBus("Bottom Layer (optional)", 1).addInputHatch("Bottom Layer", 1)
+ .addOutputBus("Top Layer (optional)", 1).addOutputHatch("Top Layer", 1)
+ .addEnergyHatch("Any Multi-use Casing", 1).addMaintenanceHatch("Any Multi-use Casing", 1)
+ .addMufflerHatch("Any Multi-use Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -78,31 +71,32 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater
public IStructureDefinition<GregtechMetaTileEntity_IndustrialFluidHeater> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialFluidHeater>builder()
- .addShape(mName, transpose(new String[][] {
- {" TTT ", "TTTTT", "TTTTT", "TTTTT", " TTT "},
- {" XXX ", "X---X", "X---X", "X---X", " XXX "},
- {" XXX ", "X---X", "X---X", "X---X", " XXX "},
- {" XXX ", "X---X", "X---X", "X---X", " XXX "},
- {" X~X ", "X---X", "X---X", "X---X", " XXX "},
- {" BBB ", "BBBBB", "BBBBB", "BBBBB", " BBB "},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { " TTT ", "TTTTT", "TTTTT", "TTTTT", " TTT " },
+ { " XXX ", "X---X", "X---X", "X---X", " XXX " },
+ { " XXX ", "X---X", "X---X", "X---X", " XXX " },
+ { " XXX ", "X---X", "X---X", "X---X", " XXX " },
+ { " X~X ", "X---X", "X---X", "X---X", " XXX " },
+ { " BBB ", "BBBBB", "BBBBB", "BBBBB", " BBB " }, }))
.addElement(
'B',
buildHatchAdder(GregtechMetaTileEntity_IndustrialFluidHeater.class)
.atLeast(InputBus, InputHatch, Maintenance, Energy, Muffler)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing1, ofBlock(getCasingBlock2(), getCasingMeta2()))))
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing1,
+ ofBlock(getCasingBlock2(), getCasingMeta2()))))
.addElement('X', ofBlock(getCasingBlock1(), getCasingMeta1()))
.addElement(
'T',
buildHatchAdder(GregtechMetaTileEntity_IndustrialFluidHeater.class)
.atLeast(OutputBus, OutputHatch, Maintenance, Energy, Muffler)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing1, ofBlock(getCasingBlock2(), getCasingMeta2()))))
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing1,
+ ofBlock(getCasingBlock2(), getCasingMeta2()))))
.build();
}
return STRUCTURE_DEFINITION;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java
index ea3402efb6..476036fc7c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java
@@ -7,10 +7,20 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
@@ -26,17 +36,9 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialForgeHammer
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialForgeHammer>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialForgeHammer extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialForgeHammer> implements ISurvivalConstructable {
private int mCasing;
private int mAnvil;
@@ -64,11 +66,9 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Forge Hammer")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Forge Hammer")
.addInfo("Speed: +100% | EU Usage: 100% | Parallel: Tier x Anvil Tier x 8")
- .addInfo("T1 - Vanilla Anvil")
- .addInfo("Anvil goes in Middle 3x3x3 Structure");
+ .addInfo("T1 - Vanilla Anvil").addInfo("Anvil goes in Middle 3x3x3 Structure");
if (LoadedMods.Railcraft) {
tt.addInfo("T2 - Steel Anvil");
}
@@ -79,17 +79,10 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer
tt.addInfo("T3 - Thaumic Anvil");
tt.addInfo("T4 - Void Anvil");
}
- tt.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front Center")
- .addCasingInfo("Forge Casing", 10)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ tt.addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
+ .addController("Front Center").addCasingInfo("Forge Casing", 10).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+ .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -109,21 +102,18 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer
aBlockMap.put(sVoidAnvil, 0);
}
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialForgeHammer>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "CAC", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "CAC", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialForgeHammer.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(TAE.getIndexFromPage(1, 11))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.getIndexFromPage(1, 11)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings5Misc, 6))))
- .addElement('A', onElementPass(x -> ++x.mAnvil, ofBlocksFlat(aBlockMap, sAnvil, 0)))
- .build();
+ .addElement('A', onElementPass(x -> ++x.mAnvil, ofBlocksFlat(aBlockMap, sAnvil, 0))).build();
}
return STRUCTURE_DEFINITION;
}
@@ -174,8 +164,7 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer
@Override
public boolean checkRecipe(final ItemStack aStack) {
- Block aAnvil = this.getBaseMetaTileEntity()
- .getBlockAtSide(this.getBaseMetaTileEntity().getBackFacing());
+ Block aAnvil = this.getBaseMetaTileEntity().getBlockAtSide(this.getBaseMetaTileEntity().getBackFacing());
if (aAnvil != null) {
int aAnvilTier = getAnvilTier(aAnvil);
if (aAnvilTier > 0) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
index 5aa487344a..c7637a6431 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
@@ -7,10 +7,16 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.Random;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -23,13 +29,9 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.Random;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-public class GregtechMetaTileEntity_IndustrialMacerator
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMacerator>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialMacerator extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMacerator> implements ISurvivalConstructable {
private int mCasing;
private int mPerLayer;
@@ -56,22 +58,14 @@ public class GregtechMetaTileEntity_IndustrialMacerator
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Maceration Stack")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Maceration Stack")
.addInfo("60% faster than using single block machines of the same voltage")
- .addInfo("Processes 8*tier materials at a time")
- .addInfo("ULV = Tier 0, LV = Tier 1, etc.")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 6, 3, true)
- .addController("Bottom Center")
- .addCasingInfo("Maceration Stack Casings", 26)
- .addInputBus("Bottom Casing", 1)
- .addEnergyHatch("Bottom Casing", 1)
- .addMaintenanceHatch("Bottom Casing", 1)
- .addOutputBus("One per layer except bottom layer", 2)
- .addMufflerHatch("Any Casing", 2)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addInfo("Processes 8*tier materials at a time").addInfo("ULV = Tier 0, LV = Tier 1, etc.")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 6, 3, true)
+ .addController("Bottom Center").addCasingInfo("Maceration Stack Casings", 26)
+ .addInputBus("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1)
+ .addMaintenanceHatch("Bottom Casing", 1).addOutputBus("One per layer except bottom layer", 2)
+ .addMufflerHatch("Any Casing", 2).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -79,41 +73,29 @@ public class GregtechMetaTileEntity_IndustrialMacerator
public IStructureDefinition<GregtechMetaTileEntity_IndustrialMacerator> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMacerator>builder()
- .addShape(mName + "top", transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- }))
- .addShape(mName + "mid", transpose(new String[][] {
- {"CCC", "C-C", "CCC"},
- }))
- .addShape(mName + "bottom", transpose(new String[][] {
- {"B~B", "BBB", "BBB"},
- }))
+ .addShape(mName + "top", transpose(new String[][] { { "CCC", "CCC", "CCC" }, }))
+ .addShape(
+ mName + "mid",
+ transpose(new String[][] { { "CCC", "C-C", "CCC" }, }))
+ .addShape(mName + "bottom", transpose(new String[][] { { "B~B", "BBB", "BBB" }, }))
.addElement(
'C',
ofChain(
- buildHatchAdder(GregtechMetaTileEntity_IndustrialMacerator.class)
- .atLeast(OutputBus)
+ buildHatchAdder(GregtechMetaTileEntity_IndustrialMacerator.class).atLeast(OutputBus)
.shouldReject(t -> t.mPerLayer + 1 == t.mOutputBusses.size())
.disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN)
- .casingIndex(TAE.GTPP_INDEX(7))
- .dot(2)
- .build(),
+ .casingIndex(TAE.GTPP_INDEX(7)).dot(2).build(),
buildHatchAdder(GregtechMetaTileEntity_IndustrialMacerator.class)
.atLeast(Energy, Maintenance, Muffler)
.disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN)
- .casingIndex(TAE.GTPP_INDEX(7))
- .dot(2)
- .build(),
+ .casingIndex(TAE.GTPP_INDEX(7)).dot(2).build(),
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 7))))
.addElement(
'B',
ofChain(
buildHatchAdder(GregtechMetaTileEntity_IndustrialMacerator.class)
- .atLeast(Energy, Maintenance, InputBus)
- .disallowOnly(ForgeDirection.UP)
- .casingIndex(TAE.GTPP_INDEX(7))
- .dot(2)
- .build(),
+ .atLeast(Energy, Maintenance, InputBus).disallowOnly(ForgeDirection.UP)
+ .casingIndex(TAE.GTPP_INDEX(7)).dot(2).build(),
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 7))))
.build();
}
@@ -194,22 +176,19 @@ public class GregtechMetaTileEntity_IndustrialMacerator
@Override
public void onPreTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
super.onPreTick(aBaseMetaTileEntity, aTick);
- if ((aBaseMetaTileEntity.isClientSide())
- && (aBaseMetaTileEntity.isActive())
+ if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive())
&& (aBaseMetaTileEntity.getFrontFacing() != 1)
&& (aBaseMetaTileEntity.getCoverIDAtSide((byte) 1) == 0)
&& (!aBaseMetaTileEntity.getOpacityAtSide((byte) 1))) {
final Random tRandom = aBaseMetaTileEntity.getWorld().rand;
- aBaseMetaTileEntity
- .getWorld()
- .spawnParticle(
- "smoke",
- (aBaseMetaTileEntity.getXCoord() + 0.8F) - (tRandom.nextFloat() * 0.6F),
- aBaseMetaTileEntity.getYCoord() + 0.3f + (tRandom.nextFloat() * 0.2F),
- (aBaseMetaTileEntity.getZCoord() + 1.2F) - (tRandom.nextFloat() * 1.6F),
- 0.0D,
- 0.0D,
- 0.0D);
+ aBaseMetaTileEntity.getWorld().spawnParticle(
+ "smoke",
+ (aBaseMetaTileEntity.getXCoord() + 0.8F) - (tRandom.nextFloat() * 0.6F),
+ aBaseMetaTileEntity.getYCoord() + 0.3f + (tRandom.nextFloat() * 0.2F),
+ (aBaseMetaTileEntity.getZCoord() + 1.2F) - (tRandom.nextFloat() * 1.6F),
+ 0.0D,
+ 0.0D,
+ 0.0D);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
index cef60fec54..7730ed73cd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
@@ -6,10 +6,19 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.StatCollector;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -23,12 +32,6 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_IndustrialMixer
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMixer> implements ISurvivalConstructable {
@@ -81,23 +84,13 @@ public class GregtechMetaTileEntity_IndustrialMixer
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Mixer")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Mixer")
.addInfo("250% faster than using single block machines of the same voltage")
- .addInfo("Processes eight recipes per voltage tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 4, 3, false)
- .addController("Second Layer Center")
- .addCasingInfo(mCasingName, 6)
- .addCasingInfo(mCasingName2, 2)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ .addInfo("Processes eight recipes per voltage tier").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().beginStructureBlock(3, 4, 3, false).addController("Second Layer Center")
+ .addCasingInfo(mCasingName, 6).addCasingInfo(mCasingName2, 2).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+ .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -106,22 +99,18 @@ public class GregtechMetaTileEntity_IndustrialMixer
public IStructureDefinition<GregtechMetaTileEntity_IndustrialMixer> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMixer>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"CCC", "CMC", "CCC"},
- {"C~C", "CMC", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "CCC", "CMC", "CCC" },
+ { "C~C", "CMC", "CCC" }, { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialMixer.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
- .casingIndex(CASING_TEXTURE_ID)
- .dot(1)
- .buildAndChain(
+ .casingIndex(CASING_TEXTURE_ID).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 2))))
- .addElement('M', ofBlock(GregTech_API.sBlockCasings4, 11))
- .build();
+ .addElement('M', ofBlock(GregTech_API.sBlockCasings4, 11)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -236,7 +225,8 @@ public class GregtechMetaTileEntity_IndustrialMixer
public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
isBussesSeparate = !isBussesSeparate;
GT_Utility.sendChatToPlayer(
- aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + isBussesSeparate);
+ aPlayer,
+ StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + isBussesSeparate);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java
index 29650598e7..7d9f9274c6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java
@@ -5,11 +5,16 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElement
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -21,9 +26,6 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
public class GregtechMetaTileEntity_IndustrialMolecularTransformer
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMolecularTransformer>
@@ -32,8 +34,8 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer
private static final int CASING_TEXTURE_ID = 48;
private int mCasing = 0;
- public GregtechMetaTileEntity_IndustrialMolecularTransformer(
- final int aID, final String aName, final String aNameRegional) {
+ public GregtechMetaTileEntity_IndustrialMolecularTransformer(final int aID, final String aName,
+ final String aNameRegional) {
super(aID, aName, aNameRegional);
}
@@ -54,61 +56,51 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Changes the structure of items to produce new ones")
- .addInfo("Maximum 1x of each bus/hatch.")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(7, 7, 7, false)
- .addController("Top Center")
- .addCasingInfo("Robust Tungstensteel Machine Casing", 40)
- .addCasingInfo("Tungstensteel Coils", 16)
- .addCasingInfo("Molecular Containment Casing", 52)
- .addCasingInfo("High Voltage Current Capacitor", 32)
- .addCasingInfo("Particle Containment Casing", 4)
- .addCasingInfo("Resonance Chamber I", 5)
- .addCasingInfo("Modulator I", 4)
- .addInputBus("Any Robust Tungstensteel Machine Casing", 1)
+ tt.addMachineType(getMachineType()).addInfo("Changes the structure of items to produce new ones")
+ .addInfo("Maximum 1x of each bus/hatch.").addPollutionAmount(getPollutionPerSecond(null)).addSeparator()
+ .beginStructureBlock(7, 7, 7, false).addController("Top Center")
+ .addCasingInfo("Robust Tungstensteel Machine Casing", 40).addCasingInfo("Tungstensteel Coils", 16)
+ .addCasingInfo("Molecular Containment Casing", 52).addCasingInfo("High Voltage Current Capacitor", 32)
+ .addCasingInfo("Particle Containment Casing", 4).addCasingInfo("Resonance Chamber I", 5)
+ .addCasingInfo("Modulator I", 4).addInputBus("Any Robust Tungstensteel Machine Casing", 1)
.addOutputBus("Any Robust Tungstensteel Machine Casing", 1)
.addEnergyHatch("Any Robust Tungstensteel Machine Casing", 1)
.addMaintenanceHatch("Any Robust Tungstensteel Machine Casing", 1)
- .addMufflerHatch("Any Robust Tungstensteel Machine Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addMufflerHatch("Any Robust Tungstensteel Machine Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
private static final String STRUCTURE_PIECE_MAIN = "main";
- private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMolecularTransformer> STRUCTURE_DEFINITION =
- null;
+ private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMolecularTransformer> STRUCTURE_DEFINITION = null;
@Override
public IStructureDefinition<GregtechMetaTileEntity_IndustrialMolecularTransformer> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMolecularTransformer>builder()
- .addShape(STRUCTURE_PIECE_MAIN, (new String[][] {
- {" ", " ", " xxx ", " x~x ", " xxx ", " ", " "},
- {" ", " xxx ", " xyyyx ", " xyzyx ", " xyyyx ", " xxx ", " "},
- {" ", " xxx ", " xyyyx ", " xyzyx ", " xyyyx ", " xxx ", " "},
- {" ", " xxx ", " xyyyx ", " xyzyx ", " xyyyx ", " xxx ", " "},
- {" t ", " ttxtt ", " tyyyt ", "txyzyxt", " tyyyt ", " ttxtt ", " t "},
- {" c ", " ccecc ", " cxfxc ", "cefefec", " cxfxc ", " ccecc ", " c "},
- {" h ", " hhhhh ", " hhhhh ", "hhhhhhh", " hhhhh ", " hhhhh ", " h "},
- }))
+ .addShape(
+ STRUCTURE_PIECE_MAIN,
+ (new String[][] {
+ { " ", " ", " xxx ", " x~x ", " xxx ", " ", " " },
+ { " ", " xxx ", " xyyyx ", " xyzyx ", " xyyyx ", " xxx ", " " },
+ { " ", " xxx ", " xyyyx ", " xyzyx ", " xyyyx ", " xxx ", " " },
+ { " ", " xxx ", " xyyyx ", " xyzyx ", " xyyyx ", " xxx ", " " },
+ { " t ", " ttxtt ", " tyyyt ", "txyzyxt", " tyyyt ", " ttxtt ", " t " },
+ { " c ", " ccecc ", " cxfxc ", "cefefec", " cxfxc ", " ccecc ", " c " },
+ { " h ", " hhhhh ", " hhhhh ", "hhhhhhh", " hhhhh ", " hhhhh ", " h " }, }))
.addElement('x', ofBlock(getCasingBlock(), getCasingMeta()))
.addElement('y', ofBlock(getCasingBlock(), getCasingMeta2()))
.addElement('z', ofBlock(getCasingBlock(), getCasingMeta3()))
- .addElement('e', ofBlock(getCasingBlock2(), 0))
- .addElement('f', ofBlock(getCasingBlock2(), 4))
+ .addElement('e', ofBlock(getCasingBlock2(), 0)).addElement('f', ofBlock(getCasingBlock2(), 4))
.addElement('c', ofBlock(getCoilBlock(), 3))
.addElement('t', ofBlock(getCasingBlock3(), getTungstenCasingMeta()))
.addElement(
'h',
buildHatchAdder(GregtechMetaTileEntity_IndustrialMolecularTransformer.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing, ofBlock(getCasingBlock3(), getTungstenCasingMeta()))))
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing,
+ ofBlock(getCasingBlock3(), getTungstenCasingMeta()))))
.build();
}
return STRUCTURE_DEFINITION;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
index 8e25769c9c..872c828f05 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
@@ -6,10 +6,21 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -24,18 +35,9 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.Arrays;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialMultiMachine
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMultiMachine>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialMultiMachine extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialMultiMachine> implements ISurvivalConstructable {
protected int mInternalMode = 0;
protected GT_Recipe[] mLastRecipeExtended = new GT_Recipe[9];
@@ -48,7 +50,7 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine
private static final int MODE_LASER = 6;
private static final int MODE_AUTOCLAVE = 7;
private static final int MODE_FLUIDSOLIDIFY = 8;
- private static final int[][] MODE_MAP = new int[][] {{0, 1, 2}, {3, 4, 5}, {6, 7, 8}};
+ private static final int[][] MODE_MAP = new int[][] { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 } };
public static final String[] aToolTipNames = new String[9];
private int mCasing;
private static IStructureDefinition<GregtechMetaTileEntity_IndustrialMultiMachine> STRUCTURE_DEFINITION = null;
@@ -63,8 +65,8 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine
}
}
- public GregtechMetaTileEntity_IndustrialMultiMachine(
- final int aID, final String aName, final String aNameRegional) {
+ public GregtechMetaTileEntity_IndustrialMultiMachine(final int aID, final String aName,
+ final String aNameRegional) {
super(aID, aName, aNameRegional);
}
@@ -90,30 +92,26 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine
aBuiltStrings[2] = aToolTipNames[6] + ", " + aToolTipNames[7] + ", " + aToolTipNames[8];
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Multi-Machine")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Multi-Machine")
.addInfo("250% faster than using single block machines of the same voltage")
- .addInfo("Only uses 80% of the EU/t normally required")
- .addInfo("Processes two items per voltage tier")
- .addInfo("Machine Type: [A] - " + EnumChatFormatting.YELLOW + aBuiltStrings[0]
- + EnumChatFormatting.RESET)
- .addInfo("Machine Type: [B] - " + EnumChatFormatting.YELLOW + aBuiltStrings[1]
- + EnumChatFormatting.RESET)
- .addInfo("Machine Type: [C] - " + EnumChatFormatting.YELLOW + aBuiltStrings[2]
- + EnumChatFormatting.RESET)
+ .addInfo("Only uses 80% of the EU/t normally required").addInfo("Processes two items per voltage tier")
+ .addInfo(
+ "Machine Type: [A] - " + EnumChatFormatting.YELLOW
+ + aBuiltStrings[0]
+ + EnumChatFormatting.RESET)
+ .addInfo(
+ "Machine Type: [B] - " + EnumChatFormatting.YELLOW
+ + aBuiltStrings[1]
+ + EnumChatFormatting.RESET)
+ .addInfo(
+ "Machine Type: [C] - " + EnumChatFormatting.YELLOW
+ + aBuiltStrings[2]
+ + EnumChatFormatting.RESET)
.addInfo("Read Multi-Machine Manual for extra information")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front Center")
- .addCasingInfo("Multi-Use Casings", 6)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
+ .addController("Front Center").addCasingInfo("Multi-Use Casings", 6).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+ .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -122,18 +120,16 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine
public IStructureDefinition<GregtechMetaTileEntity_IndustrialMultiMachine> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialMultiMachine>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialMultiMachine.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
- .casingIndex(getTextureIndex())
- .dot(1)
- .buildAndChain(
+ .casingIndex(getTextureIndex()).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 2))))
.build();
}
@@ -200,8 +196,8 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine
Object[] tempArray = tFluids.toArray(new FluidStack[] {});
FluidStack[] properArray;
- properArray =
- ((tempArray != null && tempArray.length > 0) ? (FluidStack[]) tempArray : new FluidStack[] {});
+ properArray = ((tempArray != null && tempArray.length > 0) ? (FluidStack[]) tempArray
+ : new FluidStack[] {});
// Logger.MACHINE_INFO("4");
if (checkRecipeGeneric(
@@ -210,7 +206,8 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine
(2 * GT_Utility.getTier(this.getMaxInputVoltage())),
80,
250,
- 10000)) return true;
+ 10000))
+ return true;
}
return false;
@@ -308,13 +305,8 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
// Based on the Processing Array. A bit overkill, but very flexible.
@@ -353,14 +345,9 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine
return false;
}
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -378,14 +365,10 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
.setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel()))
- .calculate();
+ .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
@@ -405,8 +388,8 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine
} else {
mInternalMode = 0;
}
- String mModeString =
- (mInternalMode == 0 ? "Metal" : mInternalMode == 1 ? "Fluid" : mInternalMode == 2 ? "Misc." : "null");
+ String mModeString = (mInternalMode == 0 ? "Metal"
+ : mInternalMode == 1 ? "Fluid" : mInternalMode == 2 ? "Misc." : "null");
PlayerUtils.messagePlayer(aPlayer, "Multi-Machine is now in " + mModeString + " mode.");
mLastRecipe = null;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
index 86a9c517a0..6c63b25833 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
@@ -6,10 +6,18 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -24,15 +32,9 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialPlatePress
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialPlatePress>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialPlatePress extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialPlatePress> implements ISurvivalConstructable {
private boolean mFormingMode = false;
private int mCasing;
@@ -59,22 +61,14 @@ public class GregtechMetaTileEntity_IndustrialPlatePress
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for Advanced Bending & Forming")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for Advanced Bending & Forming")
.addInfo("500% faster than using single block machines of the same voltage")
- .addInfo("Processes four items per voltage tier")
- .addInfo("Circuit for recipe goes in the Input Bus")
+ .addInfo("Processes four items per voltage tier").addInfo("Circuit for recipe goes in the Input Bus")
.addInfo("Each Input Bus can have a different Circuit/Shape!")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front Center")
- .addCasingInfo("Material Press Machine Casings", 10)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
+ .addController("Front Center").addCasingInfo("Material Press Machine Casings", 10)
+ .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1)
+ .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -83,17 +77,15 @@ public class GregtechMetaTileEntity_IndustrialPlatePress
public IStructureDefinition<GregtechMetaTileEntity_IndustrialPlatePress> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialPlatePress>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialPlatePress.class)
- .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(50)
- .dot(1)
+ .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler).casingIndex(50).dot(1)
.buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 4))))
.build();
@@ -161,7 +153,8 @@ public class GregtechMetaTileEntity_IndustrialPlatePress
(4 * GT_Utility.getTier(this.getMaxInputVoltage())),
100,
500,
- 10000)) return true;
+ 10000))
+ return true;
}
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
index 3a7fc25f11..672ac578f7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
@@ -6,10 +6,16 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.Random;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -21,9 +27,6 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.Random;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
public class GregtechMetaTileEntity_IndustrialSifter
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialSifter> implements ISurvivalConstructable {
@@ -52,25 +55,14 @@ public class GregtechMetaTileEntity_IndustrialSifter
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Sifter")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Sifter")
.addInfo("400% faster than single-block machines of the same voltage")
- .addInfo("Only uses 75% of the EU/t normally required")
- .addInfo("Processes four items per voltage tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(5, 3, 5, false)
- .addController("Bottom Center")
- .addCasingInfo("Sieve Grate", 18)
- .addCasingInfo("Sieve Casings", 35)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing (x4)", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes four items per voltage tier")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(5, 3, 5, false)
+ .addController("Bottom Center").addCasingInfo("Sieve Grate", 18).addCasingInfo("Sieve Casings", 35)
+ .addInputBus("Any Casing", 1).addOutputBus("Any Casing (x4)", 1).addInputHatch("Any Casing", 1)
+ .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+ .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -78,21 +70,19 @@ public class GregtechMetaTileEntity_IndustrialSifter
public IStructureDefinition<GregtechMetaTileEntity_IndustrialSifter> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialSifter>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCCCC", "CMMMC", "CMMMC", "CMMMC", "CCCCC"},
- {"CCCCC", "CMMMC", "CMMMC", "CMMMC", "CCCCC"},
- {"CC~CC", "CCCCC", "CCCCC", "CCCCC", "CCCCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCCCC", "CMMMC", "CMMMC", "CMMMC", "CCCCC" },
+ { "CCCCC", "CMMMC", "CMMMC", "CMMMC", "CCCCC" },
+ { "CC~CC", "CCCCC", "CCCCC", "CCCCC", "CCCCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialSifter.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
- .casingIndex(TAE.GTPP_INDEX(21))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.GTPP_INDEX(21)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 5))))
- .addElement('M', ofBlock(ModBlocks.blockCasings2Misc, 6))
- .build();
+ .addElement('M', ofBlock(ModBlocks.blockCasings2Misc, 6)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -137,8 +127,7 @@ public class GregtechMetaTileEntity_IndustrialSifter
@Override
public void onPreTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
super.onPreTick(aBaseMetaTileEntity, aTick);
- if ((aBaseMetaTileEntity.isClientSide())
- && (aBaseMetaTileEntity.isActive())
+ if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive())
&& (aBaseMetaTileEntity.getFrontFacing() != 1)
&& (aBaseMetaTileEntity.getCoverIDAtSide((byte) 1) == 0)
&& (!aBaseMetaTileEntity.getOpacityAtSide((byte) 1))) {
@@ -148,16 +137,14 @@ public class GregtechMetaTileEntity_IndustrialSifter
final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 2;
final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 2;
- aBaseMetaTileEntity
- .getWorld()
- .spawnParticle(
- "smoke",
- (aBaseMetaTileEntity.getXCoord() + xDir + 2.1F) - (tRandom.nextFloat() * 3.2F),
- aBaseMetaTileEntity.getYCoord() + 2.5f + (tRandom.nextFloat() * 1.2F),
- (aBaseMetaTileEntity.getZCoord() + zDir + 2.1F) - (tRandom.nextFloat() * 3.2F),
- 0.0,
- 0.0,
- 0.0);
+ aBaseMetaTileEntity.getWorld().spawnParticle(
+ "smoke",
+ (aBaseMetaTileEntity.getXCoord() + xDir + 2.1F) - (tRandom.nextFloat() * 3.2F),
+ aBaseMetaTileEntity.getYCoord() + 2.5f + (tRandom.nextFloat() * 1.2F),
+ (aBaseMetaTileEntity.getZCoord() + zDir + 2.1F) - (tRandom.nextFloat() * 3.2F),
+ 0.0,
+ 0.0,
+ 0.0);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java
index 95672d5e48..5ff238a1f8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java
@@ -1,239 +1,92 @@
/*
-package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
-
-
-public class GregtechMetaTileEntity_IndustrialSinter
-extends GT_MetaTileEntity_MultiBlockBase {
-
-
- RenderBlocks asdasd = RenderBlocks.getInstance();
-
- public GregtechMetaTileEntity_IndustrialSinter(final int aID, final String aName, final String aNameRegional) {
- super(aID, aName, aNameRegional);
- }
-
- public GregtechMetaTileEntity_IndustrialSinter(final String aName) {
- super(aName);
- }
-
- @Override
- public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
- return new GregtechMetaTileEntity_IndustrialSinter(this.mName);
- }
-
- @Override
- public String[] getDescription() {
- return new String[]{
- "Controller Block for the Industrial Sinter Furnace",
- "Size: 3x5x3 [WxLxH] (Hollow)", "Controller (front centered)",
- "2x Input Bus (side centered)",
- "2x Output Bus (side centered)",
- "1x Energy Hatch (top or bottom centered)",
- "1x Maintenance Hatch (back centered)",
- "Sinter Furnace Casings for the rest (32 at least!)",
- "Causes " + 20 * this.getPollutionPerTick(null) + " Pollution per second",
- CORE.GT_Tooltip
- };
- }
-
- @Override
- public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
- if (aSide == aFacing) {
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(7)), new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Controller_Default_Active : TexturesGtBlock.Overlay_Machine_Controller_Default)};
- }
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(7))};
- }
-
- @Override
- public GT_Recipe.GT_Recipe_Map getRecipeMap() {
- return GT_Recipe.GT_Recipe_Map.sWiremillRecipes;
- }
-
- @Override
- public boolean isCorrectMachinePart(final ItemStack aStack) {
- return true;
- }
-
- @Override
- public boolean isFacingValid(final byte aFacing) {
- return aFacing > 1;
- }
-
- @Override
- public boolean checkRecipe(final ItemStack aStack) {
- final ArrayList<ItemStack> tInputList = this.getStoredInputs();
- for (final ItemStack tInput : tInputList) {
- final long tVoltage = this.getMaxInputVoltage();
- final byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
-
- final GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sWiremillRecipes.findRecipe(this.getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], null, new ItemStack[]{tInput});
- if (tRecipe != null) {
- if (tRecipe.isRecipeInputEqual(true, null, new ItemStack[]{tInput})) {
- this.mEfficiency = (10000 - ((this.getIdealStatus() - this.getRepairStatus()) * 1000));
- this.mEfficiencyIncrease = 10000;
- if (tRecipe.mEUt <= 16) {
- this.mEUt = (tRecipe.mEUt * (1 << (tTier - 1)) * (1 << (tTier - 1)));
- this.mMaxProgresstime = (tRecipe.mDuration / (1 << (tTier - 1)));
- } else {
- this.mEUt = tRecipe.mEUt;
- this.mMaxProgresstime = tRecipe.mDuration;
- while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
- this.mEUt *= 4;
- this.mMaxProgresstime /= 2;
- }
- }
- if (this.mEUt > 0) {
- this.mEUt = (-this.mEUt);
- }
- this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
- this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)};
- this.updateSlots();
- return true;
- }
- }
- }
- return false;
- }
-
- @Override
- public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
- final int controllerX = aBaseMetaTileEntity.getXCoord();
- final int controllerY = aBaseMetaTileEntity.getYCoord();
- final int controllerZ = aBaseMetaTileEntity.getZCoord();
-
- final byte tSide = this.getBaseMetaTileEntity().getBackFacing();
- if ((this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 1)) && (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 2) && (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 3)))) {
- int tAirCount = 0;
- for (byte i = -1; i < 2; i = (byte) (i + 1)) {
- for (byte j = -1; j < 2; j = (byte) (j + 1)) {
- for (byte k = -1; k < 2; k = (byte) (k + 1)) {
- if (this.getBaseMetaTileEntity().getAirOffset(i, j, k)) {
- Logger.INFO("Found Air at: "+(controllerX+i)+" "+(controllerY+k)+" "+(controllerZ+k));
- //if (aBaseMetaTileEntity.getWorld().isRemote){
- //asdasd.renderStandardBlock(ModBlocks.MatterFabricatorEffectBlock, (controllerX+i), (controllerY+k), (controllerZ+k));
- //UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), (controllerZ+k), Color.YELLOW_GREEN);
- //}
- tAirCount++;
- }
- }
- }
- }
- if (tAirCount != 10) {
- Logger.INFO("False. Air != 10. Air == "+tAirCount);
- //return false;
- }
- for (byte i = 2; i < 6; i = (byte) (i + 1)) {
- //UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY), (controllerZ), Color.LIME_GREEN);
- IGregTechTileEntity tTileEntity;
- if ((null != (tTileEntity = this.getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(i, 2))) &&
- (tTileEntity.getFrontFacing() == this.getBaseMetaTileEntity().getFrontFacing()) && (tTileEntity.getMetaTileEntity() != null) &&
- ((tTileEntity.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialSinter))) {
- //Utils.LOG_INFO("False 1");
- return false;
- }
- }
- final int tX = this.getBaseMetaTileEntity().getXCoord();
- final int tY = this.getBaseMetaTileEntity().getYCoord();
- final int tZ = this.getBaseMetaTileEntity().getZCoord();
- for (byte i = -1; i < 2; i = (byte) (i + 1)) {
- for (byte j = -1; j < 2; j = (byte) (j + 1)) {
- if ((i != 0) || (j != 0)) {
- for (byte k = 0; k < 5; k = (byte) (k + 1)) {
- //UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), (controllerZ+k), Color.ORANGE);
- if (((i == 0) || (j == 0)) && ((k == 1) || (k == 2) || (k == 3))) {
- //UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), (controllerZ+k), Color.TOMATO);
- if ((this.getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == this.getCasingBlock()) && (this.getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == this.getCasingMeta())) {
- }
- else if (!this.addToMachineList(this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i))) && (!this.addEnergyInputToMachineList(this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i))))) {
- Logger.INFO("False 2");
- return false;
- }
- }
- else if ((this.getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == this.getCasingBlock()) && (this.getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == this.getCasingMeta())) {
- }
- else {
- Logger.INFO("False 3");
- return false;
- }
- }
- }
- }
- }
- if ((this.mOutputHatches.size() != 0) || (this.mInputHatches.size() != 0)) {
- Logger.INFO("Use Busses, Not Hatches for Input/Output.");
- return false;
- }
- if ((this.mInputBusses.size() != 2) || (this.mOutputBusses.size() != 2)) {
- Logger.INFO("Incorrect amount of Input & Output busses.");
- return false;
- }
- this.mMaintenanceHatches.clear();
- final IGregTechTileEntity tTileEntity = this.getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 4);
- if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) {
- if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) {
- this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity());
- ((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = this.getCasingTextureIndex();
- } else {
- Logger.INFO("Maintenance hatch must be in the middle block on the back.");
- return false;
- }
- }
- if ((this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() != 1)) {
- Logger.INFO("Incorrect amount of Maintenance or Energy hatches.");
- return false;
- }
- } else {
- Logger.INFO("False 5");
- return false;
- }
- Logger.INFO("True");
- return true;
- }
-
- @Override
- public int getMaxEfficiency(final ItemStack aStack) {
- return 10000;
- }
-
- @Override
- public int getPollutionPerTick(final ItemStack aStack) {
- return 0;
- }
-
- @Override
- public int getDamageToComponent(final ItemStack aStack) {
- return 0;
- }
-
- public int getAmountOfOutputs() {
- return 1;
- }
-
- @Override
- public boolean explodesOnComponentBreak(final ItemStack aStack) {
- return false;
- }
-
- public Block getCasingBlock() {
- return ModBlocks.blockCasingsMisc;
- }
-
-
- public byte getCasingMeta() {
- return 6;
- }
-
-
- public byte getCasingTextureIndex() {
- return 1; //TODO
- }
-
- private boolean addToMachineList(final IGregTechTileEntity tTileEntity) {
- return ((this.addMaintenanceToMachineList(tTileEntity, this.getCasingTextureIndex())) || (this.addInputToMachineList(tTileEntity, this.getCasingTextureIndex())) || (this.addOutputToMachineList(tTileEntity, this.getCasingTextureIndex())) || (this.addMufflerToMachineList(tTileEntity, this.getCasingTextureIndex())));
- }
-
- private boolean addEnergyInputToMachineList(final IGregTechTileEntity tTileEntity) {
- return ((this.addEnergyInputToMachineList(tTileEntity, this.getCasingTextureIndex())));
- }
-}
-*/
+ * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; public class
+ * GregtechMetaTileEntity_IndustrialSinter extends GT_MetaTileEntity_MultiBlockBase { RenderBlocks asdasd =
+ * RenderBlocks.getInstance(); public GregtechMetaTileEntity_IndustrialSinter(final int aID, final String aName, final
+ * String aNameRegional) { super(aID, aName, aNameRegional); } public GregtechMetaTileEntity_IndustrialSinter(final
+ * String aName) { super(aName); }
+ * @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { return new
+ * GregtechMetaTileEntity_IndustrialSinter(this.mName); }
+ * @Override public String[] getDescription() { return new String[]{
+ * "Controller Block for the Industrial Sinter Furnace", "Size: 3x5x3 [WxLxH] (Hollow)", "Controller (front centered)",
+ * "2x Input Bus (side centered)", "2x Output Bus (side centered)", "1x Energy Hatch (top or bottom centered)",
+ * "1x Maintenance Hatch (back centered)", "Sinter Furnace Casings for the rest (32 at least!)", "Causes " + 20 *
+ * this.getPollutionPerTick(null) + " Pollution per second", CORE.GT_Tooltip }; }
+ * @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte
+ * aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { if (aSide == aFacing) { return new
+ * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(7)), new GT_RenderedTexture(aActive ?
+ * TexturesGtBlock.Overlay_Machine_Controller_Default_Active : TexturesGtBlock.Overlay_Machine_Controller_Default)}; }
+ * return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(7))}; }
+ * @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { return GT_Recipe.GT_Recipe_Map.sWiremillRecipes; }
+ * @Override public boolean isCorrectMachinePart(final ItemStack aStack) { return true; }
+ * @Override public boolean isFacingValid(final byte aFacing) { return aFacing > 1; }
+ * @Override public boolean checkRecipe(final ItemStack aStack) { final ArrayList<ItemStack> tInputList =
+ * this.getStoredInputs(); for (final ItemStack tInput : tInputList) { final long tVoltage = this.getMaxInputVoltage();
+ * final byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); final GT_Recipe tRecipe =
+ * GT_Recipe.GT_Recipe_Map.sWiremillRecipes.findRecipe(this.getBaseMetaTileEntity(), false,
+ * gregtech.api.enums.GT_Values.V[tTier], null, new ItemStack[]{tInput}); if (tRecipe != null) { if
+ * (tRecipe.isRecipeInputEqual(true, null, new ItemStack[]{tInput})) { this.mEfficiency = (10000 -
+ * ((this.getIdealStatus() - this.getRepairStatus()) * 1000)); this.mEfficiencyIncrease = 10000; if (tRecipe.mEUt <= 16)
+ * { this.mEUt = (tRecipe.mEUt * (1 << (tTier - 1)) * (1 << (tTier - 1))); this.mMaxProgresstime = (tRecipe.mDuration /
+ * (1 << (tTier - 1))); } else { this.mEUt = tRecipe.mEUt; this.mMaxProgresstime = tRecipe.mDuration; while (this.mEUt
+ * <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { this.mEUt *= 4; this.mMaxProgresstime /= 2; } } if (this.mEUt > 0)
+ * { this.mEUt = (-this.mEUt); } this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); this.mOutputItems = new
+ * ItemStack[]{tRecipe.getOutput(0)}; this.updateSlots(); return true; } } } return false; }
+ * @Override public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { final
+ * int controllerX = aBaseMetaTileEntity.getXCoord(); final int controllerY = aBaseMetaTileEntity.getYCoord(); final int
+ * controllerZ = aBaseMetaTileEntity.getZCoord(); final byte tSide = this.getBaseMetaTileEntity().getBackFacing(); if
+ * ((this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 1)) &&
+ * (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 2) &&
+ * (this.getBaseMetaTileEntity().getAirAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(), 3)))) { int
+ * tAirCount = 0; for (byte i = -1; i < 2; i = (byte) (i + 1)) { for (byte j = -1; j < 2; j = (byte) (j + 1)) { for
+ * (byte k = -1; k < 2; k = (byte) (k + 1)) { if (this.getBaseMetaTileEntity().getAirOffset(i, j, k)) {
+ * Logger.INFO("Found Air at: "+(controllerX+i)+" "+(controllerY+k)+" "+(controllerZ+k)); //if
+ * (aBaseMetaTileEntity.getWorld().isRemote){ //asdasd.renderStandardBlock(ModBlocks.MatterFabricatorEffectBlock,
+ * (controllerX+i), (controllerY+k), (controllerZ+k)); //UtilsRendering.drawBlockInWorld((controllerX+i),
+ * (controllerY+k), (controllerZ+k), Color.YELLOW_GREEN); //} tAirCount++; } } } } if (tAirCount != 10) {
+ * Logger.INFO("False. Air != 10. Air == "+tAirCount); //return false; } for (byte i = 2; i < 6; i = (byte) (i + 1)) {
+ * //UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY), (controllerZ), Color.LIME_GREEN);
+ * IGregTechTileEntity tTileEntity; if ((null != (tTileEntity =
+ * this.getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(i, 2))) && (tTileEntity.getFrontFacing() ==
+ * this.getBaseMetaTileEntity().getFrontFacing()) && (tTileEntity.getMetaTileEntity() != null) &&
+ * ((tTileEntity.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialSinter))) {
+ * //Utils.LOG_INFO("False 1"); return false; } } final int tX = this.getBaseMetaTileEntity().getXCoord(); final int tY
+ * = this.getBaseMetaTileEntity().getYCoord(); final int tZ = this.getBaseMetaTileEntity().getZCoord(); for (byte i =
+ * -1; i < 2; i = (byte) (i + 1)) { for (byte j = -1; j < 2; j = (byte) (j + 1)) { if ((i != 0) || (j != 0)) { for (byte
+ * k = 0; k < 5; k = (byte) (k + 1)) { //UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k),
+ * (controllerZ+k), Color.ORANGE); if (((i == 0) || (j == 0)) && ((k == 1) || (k == 2) || (k == 3))) {
+ * //UtilsRendering.drawBlockInWorld((controllerX+i), (controllerY+k), (controllerZ+k), Color.TOMATO); if
+ * ((this.getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k :
+ * tSide == 3 ? k : i)) == this.getCasingBlock()) && (this.getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k :
+ * tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == this.getCasingMeta())) { } else if
+ * (!this.addToMachineList(this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide == 4 ? -k :
+ * i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i))) &&
+ * (!this.addEnergyInputToMachineList(this.getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide
+ * == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i))))) { Logger.INFO("False 2"); return false; } }
+ * else if ((this.getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2
+ * ? -k : tSide == 3 ? k : i)) == this.getCasingBlock()) && (this.getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k
+ * : tSide == 4 ? -k : i), tY + j, tZ + (tSide == 2 ? -k : tSide == 3 ? k : i)) == this.getCasingMeta())) { } else {
+ * Logger.INFO("False 3"); return false; } } } } } if ((this.mOutputHatches.size() != 0) || (this.mInputHatches.size()
+ * != 0)) { Logger.INFO("Use Busses, Not Hatches for Input/Output."); return false; } if ((this.mInputBusses.size() !=
+ * 2) || (this.mOutputBusses.size() != 2)) { Logger.INFO("Incorrect amount of Input & Output busses."); return false; }
+ * this.mMaintenanceHatches.clear(); final IGregTechTileEntity tTileEntity =
+ * this.getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(this.getBaseMetaTileEntity().getBackFacing(),
+ * 4); if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) { if ((tTileEntity.getMetaTileEntity()
+ * instanceof GT_MetaTileEntity_Hatch_Maintenance)) { this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)
+ * tTileEntity.getMetaTileEntity()); ((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock =
+ * this.getCasingTextureIndex(); } else { Logger.INFO("Maintenance hatch must be in the middle block on the back.");
+ * return false; } } if ((this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() != 1)) {
+ * Logger.INFO("Incorrect amount of Maintenance or Energy hatches."); return false; } } else { Logger.INFO("False 5");
+ * return false; } Logger.INFO("True"); return true; }
+ * @Override public int getMaxEfficiency(final ItemStack aStack) { return 10000; }
+ * @Override public int getPollutionPerTick(final ItemStack aStack) { return 0; }
+ * @Override public int getDamageToComponent(final ItemStack aStack) { return 0; } public int getAmountOfOutputs() {
+ * return 1; }
+ * @Override public boolean explodesOnComponentBreak(final ItemStack aStack) { return false; } public Block
+ * getCasingBlock() { return ModBlocks.blockCasingsMisc; } public byte getCasingMeta() { return 6; } public byte
+ * getCasingTextureIndex() { return 1; //TODO } private boolean addToMachineList(final IGregTechTileEntity tTileEntity)
+ * { return ((this.addMaintenanceToMachineList(tTileEntity, this.getCasingTextureIndex())) ||
+ * (this.addInputToMachineList(tTileEntity, this.getCasingTextureIndex())) || (this.addOutputToMachineList(tTileEntity,
+ * this.getCasingTextureIndex())) || (this.addMufflerToMachineList(tTileEntity, this.getCasingTextureIndex()))); }
+ * private boolean addEnergyInputToMachineList(final IGregTechTileEntity tTileEntity) { return
+ * ((this.addEnergyInputToMachineList(tTileEntity, this.getCasingTextureIndex()))); } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
index 6359679149..35116fbb13 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
@@ -7,10 +7,14 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -23,8 +27,6 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
public class GregtechMetaTileEntity_IndustrialThermalCentrifuge
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialThermalCentrifuge>
@@ -33,8 +35,8 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge
private int mCasing;
private static IStructureDefinition<GregtechMetaTileEntity_IndustrialThermalCentrifuge> STRUCTURE_DEFINITION = null;
- public GregtechMetaTileEntity_IndustrialThermalCentrifuge(
- final int aID, final String aName, final String aNameRegional) {
+ public GregtechMetaTileEntity_IndustrialThermalCentrifuge(final int aID, final String aName,
+ final String aNameRegional) {
super(aID, aName, aNameRegional);
}
@@ -55,21 +57,14 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Thermal Centrifuge")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Thermal Centrifuge")
.addInfo("150% faster than using single block machines of the same voltage")
.addInfo("Only uses 80% of the EU/t normally required")
- .addInfo("Processes eight items per voltage tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 2, 3, false)
- .addController("Front Center")
- .addCasingInfo("Thermal Processing Casings/Noise Hazard Sign Blocks", 8)
- .addInputBus("Bottom Casing", 1)
- .addOutputBus("Bottom Casing", 1)
- .addEnergyHatch("Bottom Casing", 1)
- .addMaintenanceHatch("Bottom Casing", 1)
- .addMufflerHatch("Bottom Casing", 1)
+ .addInfo("Processes eight items per voltage tier").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().beginStructureBlock(3, 2, 3, false).addController("Front Center")
+ .addCasingInfo("Thermal Processing Casings/Noise Hazard Sign Blocks", 8).addInputBus("Bottom Casing", 1)
+ .addOutputBus("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1)
+ .addMaintenanceHatch("Bottom Casing", 1).addMufflerHatch("Bottom Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -78,18 +73,13 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge
public IStructureDefinition<GregtechMetaTileEntity_IndustrialThermalCentrifuge> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialThermalCentrifuge>builder()
- .addShape(mName, transpose(new String[][] {
- {"X~X", "XXX", "XXX"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(mName, transpose(new String[][] { { "X~X", "XXX", "XXX" }, { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
ofChain(
buildHatchAdder(GregtechMetaTileEntity_IndustrialThermalCentrifuge.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .build(),
+ .casingIndex(getCasingTextureIndex()).dot(1).build(),
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 0)),
onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings3, 9))))
.addElement(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
index ecd1f2403c..c123d449e2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
@@ -7,10 +7,16 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -24,13 +30,9 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialVacuumFreezer
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialVacuumFreezer>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialVacuumFreezer> implements ISurvivalConstructable {
public static int CASING_TEXTURE_ID;
public static String mCryoFuelName = "Gelid Cryotheum";
@@ -42,8 +44,8 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer
private final ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mCryotheumHatches = new ArrayList<>();
- public GregtechMetaTileEntity_IndustrialVacuumFreezer(
- final int aID, final String aName, final String aNameRegional) {
+ public GregtechMetaTileEntity_IndustrialVacuumFreezer(final int aID, final String aName,
+ final String aNameRegional) {
super(aID, aName, aNameRegional);
mFuelStack = FluidUtils.getFluidStack("cryotheum", 1);
CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10);
@@ -67,25 +69,15 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Factory Grade Advanced Vacuum Freezer")
+ tt.addMachineType(getMachineType()).addInfo("Factory Grade Advanced Vacuum Freezer")
.addInfo("Speed: +100% | EU Usage: 100% | Parallel: 4")
.addInfo("Consumes 1L of " + mCryoFuelName + "/t during operation")
.addInfo("Constructed exactly the same as a normal Vacuum Freezer")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front Center")
- .addCasingInfo(mCasingName, 10)
- .addStructureHint(mHatchName, 1)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
+ .addController("Front Center").addCasingInfo(mCasingName, 10).addStructureHint(mHatchName, 1)
+ .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+ .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+ .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -93,33 +85,26 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer
public IStructureDefinition<GregtechMetaTileEntity_IndustrialVacuumFreezer> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialVacuumFreezer>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
ofChain(
buildHatchAdder(GregtechMetaTileEntity_IndustrialVacuumFreezer.class)
.adder(GregtechMetaTileEntity_IndustrialVacuumFreezer::addCryotheumHatch)
- .hatchId(967)
- .shouldReject(t -> !t.mCryotheumHatches.isEmpty())
- .casingIndex(CASING_TEXTURE_ID)
- .dot(1)
- .build(),
- buildHatchAdder(GregtechMetaTileEntity_IndustrialVacuumFreezer.class)
- .atLeast(
- InputBus,
- OutputBus,
- Maintenance,
- Energy,
- Muffler,
- InputHatch,
- OutputHatch)
- .casingIndex(CASING_TEXTURE_ID)
- .dot(1)
- .build(),
+ .hatchId(967).shouldReject(t -> !t.mCryotheumHatches.isEmpty())
+ .casingIndex(CASING_TEXTURE_ID).dot(1).build(),
+ buildHatchAdder(GregtechMetaTileEntity_IndustrialVacuumFreezer.class).atLeast(
+ InputBus,
+ OutputBus,
+ Maintenance,
+ Energy,
+ Muffler,
+ InputHatch,
+ OutputHatch).casingIndex(CASING_TEXTURE_ID).dot(1).build(),
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 10))))
.build();
}
@@ -226,11 +211,10 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer
@Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
- /*if (this.getBaseMetaTileEntity().isActive()) {
- if (!this.depleteInput(mFuelStack.copy())) {
- this.getBaseMetaTileEntity().setActive(false);
- }
- } */
+ /*
+ * if (this.getBaseMetaTileEntity().isActive()) { if (!this.depleteInput(mFuelStack.copy())) {
+ * this.getBaseMetaTileEntity().setActive(false); } }
+ */
super.onPostTick(aBaseMetaTileEntity, aTick);
if (this.mStartUpCheck < 0) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
index f8094e6086..4192515346 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
@@ -4,11 +4,20 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -26,17 +35,9 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.Gregtech
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import ic2.core.init.BlocksItems;
import ic2.core.init.InternalName;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialWashPlant
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialWashPlant>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialWashPlant extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialWashPlant> implements ISurvivalConstructable {
private int mMode = 0;
private int mCasing;
@@ -63,26 +64,16 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Wash Plant")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Wash Plant")
.addInfo("Can be configured with a screwdriver to also do Simple Washer and process Chemical Bathing")
.addInfo("400% faster than using single block machines of the same voltage")
.addInfo("Processes four item per voltage tier")
.addInfo("Always requires an Input Hatch full of water to refill structure")
- .addInfo("Need to be filled with water.")
- .addInfo("Will automatically fill water from input hatch.")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(5, 3, 7, true)
- .addController("Front Center")
- .addCasingInfo("Wash Plant Casings", 40)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ .addInfo("Need to be filled with water.").addInfo("Will automatically fill water from input hatch.")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(5, 3, 7, true)
+ .addController("Front Center").addCasingInfo("Wash Plant Casings", 40).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+ .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -91,21 +82,23 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
public IStructureDefinition<GregtechMetaTileEntity_IndustrialWashPlant> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialWashPlant>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCCCC", "CwwwC", "CwwwC", "CwwwC", "CwwwC", "CwwwC", "CCCCC"},
- {"CC~CC", "CwwwC", "CwwwC", "CwwwC", "CwwwC", "CwwwC", "CCCCC"},
- {"CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCCCC", "CwwwC", "CwwwC", "CwwwC", "CwwwC", "CwwwC", "CCCCC" },
+ { "CC~CC", "CwwwC", "CwwwC", "CwwwC", "CwwwC", "CwwwC", "CCCCC" },
+ { "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialWashPlant.class)
.atLeast(InputBus, InputHatch, OutputHatch, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing,
+ ofBlock(getCasingBlock(), getCasingMeta()))))
.addElement(
- 'w', ofChain(isAir(), ofBlockAnyMeta(Blocks.water), ofBlockAnyMeta(Blocks.flowing_water)))
+ 'w',
+ ofChain(isAir(), ofBlockAnyMeta(Blocks.water), ofBlockAnyMeta(Blocks.flowing_water)))
.build();
}
return STRUCTURE_DEFINITION;
@@ -151,8 +144,7 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
@Override
public GT_Recipe.GT_Recipe_Map getRecipeMap() {
- return mMode == 0
- ? GT_Recipe.GT_Recipe_Map.sOreWasherRecipes
+ return mMode == 0 ? GT_Recipe.GT_Recipe_Map.sOreWasherRecipes
: mMode == 1 ? GTPP_Recipe_Map.sSimpleWasherRecipes : GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes;
}
@@ -237,10 +229,10 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
// if (aBaseMetaTileEntity.fac)
- final int xDir =
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * mCurrentDirectionX;
- final int zDir =
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * mCurrentDirectionZ;
+ final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX
+ * mCurrentDirectionX;
+ final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ
+ * mCurrentDirectionZ;
int tAmount = 0;
for (int i = mOffsetX_Lower + 1; i <= mOffsetX_Upper - 1; ++i) {
@@ -262,13 +254,11 @@ public class GregtechMetaTileEntity_IndustrialWashPlant
if (tBlock == Blocks.water) {
fluidUsed = BlocksItems.getFluidBlock(InternalName.fluidDistilledWater);
}
- aBaseMetaTileEntity
- .getWorld()
- .setBlock(
- aBaseMetaTileEntity.getXCoord() + xDir + i,
- aBaseMetaTileEntity.getYCoord() + h,
- aBaseMetaTileEntity.getZCoord() + zDir + j,
- fluidUsed);
+ aBaseMetaTileEntity.getWorld().setBlock(
+ aBaseMetaTileEntity.getXCoord() + xDir + i,
+ aBaseMetaTileEntity.getYCoord() + h,
+ aBaseMetaTileEntity.getZCoord() + zDir + j,
+ fluidUsed);
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
index 044cdfc963..89bfff5367 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
@@ -6,10 +6,21 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -23,18 +34,9 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialWireMill
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialWireMill>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialWireMill extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialWireMill> implements ISurvivalConstructable {
private int mCasing;
private static IStructureDefinition<GregtechMetaTileEntity_IndustrialWireMill> STRUCTURE_DEFINITION = null;
@@ -61,42 +63,32 @@ public class GregtechMetaTileEntity_IndustrialWireMill
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Wire Factory")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Wire Factory")
.addInfo("200% faster than using single block machines of the same voltage")
- .addInfo("Only uses 75% of the EU/t normally required")
- .addInfo("Processes four items per voltage tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 5, true)
- .addController("Front Center")
- .addCasingInfo("Wire Factory Casings", 20)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes four items per voltage tier")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 5, true)
+ .addController("Front Center").addCasingInfo("Wire Factory Casings", 20).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+ .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@Override
public IStructureDefinition<GregtechMetaTileEntity_IndustrialWireMill> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialWireMill>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC", "CCC", "CCC"},
- {"C~C", "C-C", "C-C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC", "CCC", "CCC"},
- }))
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialWireMill>builder().addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC", "CCC", "CCC" },
+ { "C~C", "C-C", "C-C", "C-C", "CCC" }, { "CCC", "CCC", "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialWireMill.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing,
+ ofBlock(getCasingBlock(), getCasingMeta()))))
.build();
}
return STRUCTURE_DEFINITION;
@@ -150,8 +142,8 @@ public class GregtechMetaTileEntity_IndustrialWireMill
}
@Override
- public boolean checkRecipeGeneric(
- int aMaxParallelRecipes, long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(int aMaxParallelRecipes, long aEUPercent, int aSpeedBonusPercent,
+ int aOutputChanceRoll) {
if (!isBussesSeparate)
return super.checkRecipeGeneric(aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, aOutputChanceRoll);
List<ItemStack> buffer = new ArrayList<>(16);
@@ -163,7 +155,12 @@ public class GregtechMetaTileEntity_IndustrialWireMill
}
ItemStack[] tItemInputs = buffer.toArray(new ItemStack[0]);
if (checkRecipeGeneric(
- tItemInputs, tFluidInputs, aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, aOutputChanceRoll))
+ tItemInputs,
+ tFluidInputs,
+ aMaxParallelRecipes,
+ aEUPercent,
+ aSpeedBonusPercent,
+ aOutputChanceRoll))
return true;
buffer.clear();
}
@@ -173,8 +170,10 @@ public class GregtechMetaTileEntity_IndustrialWireMill
@Override
public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
isBussesSeparate = !isBussesSeparate;
- aPlayer.addChatMessage(new ChatComponentTranslation(
- isBussesSeparate ? "interaction.separateBusses.enabled" : "interaction.separateBusses.disabled"));
+ aPlayer.addChatMessage(
+ new ChatComponentTranslation(
+ isBussesSeparate ? "interaction.separateBusses.enabled"
+ : "interaction.separateBusses.disabled"));
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
index 03c6f813fc..fc6dfb6482 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
@@ -1,9 +1,17 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
@@ -22,19 +30,14 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity implements IAddUIWidgets {
- private static final ITexture[] FACING_SIDE = {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
- private static final ITexture[] FACING_FRONT = {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
- };
- private static final ITexture[] FACING_ACTIVE = {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
- };
+
+ private static final ITexture[] FACING_SIDE = { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
+ private static final ITexture[] FACING_FRONT = {
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off) };
+ private static final ITexture[] FACING_ACTIVE = {
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On) };
public int mMaxProgresstime = 0;
public int mUpdate = 30;
public int mProgresstime = 0;
@@ -53,37 +56,22 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
@Override
public String[] getDescription() {
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return new String[] {
- "Iron is a much better furnace material!",
- "Can be Automated",
- "Multiblock: 3x3x5 hollow with opening on top",
- "Same shape as Bronze/Bricked blast furnace, except one ring of 8 taller.",
- "40 Iron Plated Bricks required",
- };
+ return new String[] { "Iron is a much better furnace material!", "Can be Automated",
+ "Multiblock: 3x3x5 hollow with opening on top",
+ "Same shape as Bronze/Bricked blast furnace, except one ring of 8 taller.",
+ "40 Iron Plated Bricks required", };
} else {
- return new String[] {
- "Sloooowly, Skip the Bronze age, Get some Steel!",
- "Multiblock: 3x3x5 hollow with opening on top",
- "40 Iron Plated Bricks required",
- "----",
- "Even though Iron melts hotter than bronze,",
- "this machine is to help players skip looking",
- "for tin and copper, which are not as common",
- "as Iron is. This machine takes 5x longer than the bronze",
- "blast furnace as a result.",
- "----",
- };
+ return new String[] { "Sloooowly, Skip the Bronze age, Get some Steel!",
+ "Multiblock: 3x3x5 hollow with opening on top", "40 Iron Plated Bricks required", "----",
+ "Even though Iron melts hotter than bronze,", "this machine is to help players skip looking",
+ "for tin and copper, which are not as common",
+ "as Iron is. This machine takes 5x longer than the bronze", "blast furnace as a result.", "----", };
}
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == aFacing) {
return aActive ? FACING_ACTIVE : FACING_FRONT;
}
@@ -199,26 +187,24 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
}
private boolean checkMachine() {
- final int xDir =
- ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX;
- final int zDir =
- ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ;
+ final int xDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX;
+ final int zDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ;
for (int i = -1; i < 2; i++) {
for (int j = -1; j < 4; j++) { // This is height
for (int k = -1; k < 2; k++) {
if (((xDir + i) != 0) || (j != 0) || ((zDir + k) != 0)) {
if ((i != 0) || (j == -1) || (k != 0)) {
if ((this.getBaseMetaTileEntity().getBlockOffset(xDir + i, j, zDir + k)
- != ModBlocks.blockCasingsMisc)
+ != ModBlocks.blockCasingsMisc)
|| (this.getBaseMetaTileEntity().getMetaIDOffset(xDir + i, j, zDir + k) != 10)) {
return false;
}
} else if ((!GT_Utility.arrayContains(
- this.getBaseMetaTileEntity().getBlockOffset(xDir + i, j, zDir + k),
- new Object[] {Blocks.lava, Blocks.flowing_lava, null}))
+ this.getBaseMetaTileEntity().getBlockOffset(xDir + i, j, zDir + k),
+ new Object[] { Blocks.lava, Blocks.flowing_lava, null }))
&& (!this.getBaseMetaTileEntity().getAirOffset(xDir + i, j, zDir + k))) {
- return false;
- }
+ return false;
+ }
}
}
}
@@ -234,16 +220,14 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
@Override
public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTimer) {
if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive())) {
- aBaseMetaTileEntity
- .getWorld()
- .spawnParticle(
- "cloud",
- aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1) + Math.random(),
- aBaseMetaTileEntity.getOffsetY(aBaseMetaTileEntity.getBackFacing(), 1),
- aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1) + Math.random(),
- 0.0D,
- 0.3D,
- 0.0D);
+ aBaseMetaTileEntity.getWorld().spawnParticle(
+ "cloud",
+ aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1) + Math.random(),
+ aBaseMetaTileEntity.getOffsetY(aBaseMetaTileEntity.getBackFacing(), 1),
+ aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1) + Math.random(),
+ 0.0D,
+ 0.3D,
+ 0.0D);
}
if (aBaseMetaTileEntity.isServerSide()) {
if (this.mUpdate-- == 0) {
@@ -259,12 +243,10 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
this.mMaxProgresstime = 0;
try {
GT_Mod.instance.achievements.issueAchievement(
- aBaseMetaTileEntity
- .getWorld()
+ aBaseMetaTileEntity.getWorld()
.getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()),
"steel");
- } catch (final Exception e) {
- }
+ } catch (final Exception e) {}
}
} else if (aBaseMetaTileEntity.isAllowedToWork()) {
this.checkRecipe();
@@ -276,63 +258,53 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
aBaseMetaTileEntity.getYCoord(),
aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1))) {
- aBaseMetaTileEntity
- .getWorld()
- .setBlock(
- aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
- aBaseMetaTileEntity.getYCoord(),
- aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1),
- Blocks.lava,
- 1,
- 2);
+ aBaseMetaTileEntity.getWorld().setBlock(
+ aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
+ aBaseMetaTileEntity.getYCoord(),
+ aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1),
+ Blocks.lava,
+ 1,
+ 2);
this.mUpdate = 1;
}
if (aBaseMetaTileEntity.getAir(
aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
aBaseMetaTileEntity.getYCoord() + 1,
aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1))) {
- aBaseMetaTileEntity
- .getWorld()
- .setBlock(
- aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
- aBaseMetaTileEntity.getYCoord() + 1,
- aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1),
- Blocks.lava,
- 1,
- 2);
+ aBaseMetaTileEntity.getWorld().setBlock(
+ aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
+ aBaseMetaTileEntity.getYCoord() + 1,
+ aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1),
+ Blocks.lava,
+ 1,
+ 2);
this.mUpdate = 1;
}
} else {
if (aBaseMetaTileEntity.getBlock(
- aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
- aBaseMetaTileEntity.getYCoord(),
- aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1))
- == Blocks.lava) {
- aBaseMetaTileEntity
- .getWorld()
- .setBlock(
- aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
- aBaseMetaTileEntity.getYCoord(),
- aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1),
- Blocks.air,
- 0,
- 2);
+ aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
+ aBaseMetaTileEntity.getYCoord(),
+ aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1)) == Blocks.lava) {
+ aBaseMetaTileEntity.getWorld().setBlock(
+ aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
+ aBaseMetaTileEntity.getYCoord(),
+ aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1),
+ Blocks.air,
+ 0,
+ 2);
this.mUpdate = 1;
}
if (aBaseMetaTileEntity.getBlock(
- aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
- aBaseMetaTileEntity.getYCoord() + 1,
- aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1))
- == Blocks.lava) {
- aBaseMetaTileEntity
- .getWorld()
- .setBlock(
- aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
- aBaseMetaTileEntity.getYCoord() + 1,
- aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1),
- Blocks.air,
- 0,
- 2);
+ aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
+ aBaseMetaTileEntity.getYCoord() + 1,
+ aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1)) == Blocks.lava) {
+ aBaseMetaTileEntity.getWorld().setBlock(
+ aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1),
+ aBaseMetaTileEntity.getYCoord() + 1,
+ aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1),
+ Blocks.air,
+ 0,
+ 2);
this.mUpdate = 1;
}
}
@@ -342,7 +314,7 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
private void addOutputProducts() {
if (this.mOutputItem1 != null) {
if (this.mInventory[2] == null) {
- this.mInventory[2] = GT_Utility.copy(new Object[] {this.mOutputItem1});
+ this.mInventory[2] = GT_Utility.copy(new Object[] { this.mOutputItem1 });
} else if (GT_Utility.areStacksEqual(this.mInventory[2], this.mOutputItem1)) {
this.mInventory[2].stackSize = Math.min(
this.mOutputItem1.getMaxStackSize(),
@@ -351,7 +323,7 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
}
if (this.mOutputItem2 != null) {
if (this.mInventory[3] == null) {
- this.mInventory[3] = GT_Utility.copy(new Object[] {this.mOutputItem2});
+ this.mInventory[3] = GT_Utility.copy(new Object[] { this.mOutputItem2 });
} else if (GT_Utility.areStacksEqual(this.mInventory[3], this.mOutputItem2)) {
this.mInventory[3].stackSize = Math.min(
this.mOutputItem2.getMaxStackSize(),
@@ -361,12 +333,10 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
}
private boolean spaceForOutput(final ItemStack aStack1, final ItemStack aStack2) {
- if (((this.mInventory[2] == null)
- || (aStack1 == null)
- || (((this.mInventory[2].stackSize + aStack1.stackSize) <= this.mInventory[2].getMaxStackSize())
- && (GT_Utility.areStacksEqual(this.mInventory[2], aStack1))))
- && ((this.mInventory[3] == null)
- || (aStack2 == null)
+ if (((this.mInventory[2] == null) || (aStack1 == null)
+ || (((this.mInventory[2].stackSize + aStack1.stackSize) <= this.mInventory[2].getMaxStackSize())
+ && (GT_Utility.areStacksEqual(this.mInventory[2], aStack1))))
+ && ((this.mInventory[3] == null) || (aStack2 == null)
|| (((this.mInventory[3].stackSize + aStack2.stackSize) <= this.mInventory[3].getMaxStackSize())
&& (GT_Utility.areStacksEqual(this.mInventory[3], aStack2))))) {
return true;
@@ -390,12 +360,11 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
if ((this.mInventory[0] != null) && (this.mInventory[1] != null) && (this.mInventory[0].stackSize >= 1)) {
if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[0], "dustIron"))
|| (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[0], "ingotIron"))) {
- if ((this.mInventory[1].getItem() == Items.coal)
- && (this.mInventory[1].stackSize >= 4)
+ if ((this.mInventory[1].getItem() == Items.coal) && (this.mInventory[1].stackSize >= 4)
&& (this.spaceForOutput(
this.mOutputItem1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
- this.mOutputItem2 =
- GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 4L)))) {
+ this.mOutputItem2 = GT_OreDictUnificator
+ .get(OrePrefixes.dustTiny, Materials.DarkAsh, 4L)))) {
this.getBaseMetaTileEntity().decrStackSize(0, 1);
this.getBaseMetaTileEntity().decrStackSize(1, 4 * 3);
this.mMaxProgresstime = getProperTime(36000);
@@ -405,8 +374,8 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
&& (this.mInventory[1].stackSize >= 2)
&& (this.spaceForOutput(
this.mOutputItem1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
- this.mOutputItem2 =
- GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 4L)))) {
+ this.mOutputItem2 = GT_OreDictUnificator
+ .get(OrePrefixes.dustTiny, Materials.Ash, 4L)))) {
this.getBaseMetaTileEntity().decrStackSize(0, 1);
this.getBaseMetaTileEntity().decrStackSize(1, 2 * 3);
this.mMaxProgresstime = getProperTime(4800);
@@ -418,20 +387,19 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
&& (this.mInventory[1].stackSize >= 4)
&& (this.spaceForOutput(
this.mOutputItem1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 9L),
- this.mOutputItem2 =
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 4L)))) {
+ this.mOutputItem2 = GT_OreDictUnificator
+ .get(OrePrefixes.dust, Materials.DarkAsh, 4L)))) {
this.getBaseMetaTileEntity().decrStackSize(0, 9);
this.getBaseMetaTileEntity().decrStackSize(1, 4 * 3);
this.mMaxProgresstime = getProperTime(64800);
return true;
}
} else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[0], "dustSteel")) {
- if ((this.mInventory[1].getItem() == Items.coal)
- && (this.mInventory[1].stackSize >= 2)
+ if ((this.mInventory[1].getItem() == Items.coal) && (this.mInventory[1].stackSize >= 2)
&& (this.spaceForOutput(
this.mOutputItem1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
- this.mOutputItem2 =
- GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2L)))) {
+ this.mOutputItem2 = GT_OreDictUnificator
+ .get(OrePrefixes.dustTiny, Materials.DarkAsh, 2L)))) {
this.getBaseMetaTileEntity().decrStackSize(0, 1);
this.getBaseMetaTileEntity().decrStackSize(1, 2 * 3);
this.mMaxProgresstime = getProperTime(3600);
@@ -441,8 +409,8 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
&& (this.mInventory[1].stackSize >= 1)
&& (this.spaceForOutput(
this.mOutputItem1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
- this.mOutputItem2 =
- GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 2L)))) {
+ this.mOutputItem2 = GT_OreDictUnificator
+ .get(OrePrefixes.dustTiny, Materials.Ash, 2L)))) {
this.getBaseMetaTileEntity().decrStackSize(0, 1);
this.getBaseMetaTileEntity().decrStackSize(1, 1 * 3);
this.mMaxProgresstime = getProperTime(2400);
@@ -454,20 +422,19 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
&& (this.mInventory[1].stackSize >= 2)
&& (this.spaceForOutput(
this.mOutputItem1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 9L),
- this.mOutputItem2 =
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 2L)))) {
+ this.mOutputItem2 = GT_OreDictUnificator
+ .get(OrePrefixes.dust, Materials.DarkAsh, 2L)))) {
this.getBaseMetaTileEntity().decrStackSize(0, 9);
this.getBaseMetaTileEntity().decrStackSize(1, 2 * 3);
this.mMaxProgresstime = getProperTime(32400);
return true;
}
} else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[0], "blockIron")) {
- if ((this.mInventory[1].getItem() == Items.coal)
- && (this.mInventory[1].stackSize >= 36)
+ if ((this.mInventory[1].getItem() == Items.coal) && (this.mInventory[1].stackSize >= 36)
&& (this.spaceForOutput(
this.mOutputItem1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 9L),
- this.mOutputItem2 =
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 4L)))) {
+ this.mOutputItem2 = GT_OreDictUnificator
+ .get(OrePrefixes.dust, Materials.DarkAsh, 4L)))) {
this.getBaseMetaTileEntity().decrStackSize(0, 1);
this.getBaseMetaTileEntity().decrStackSize(1, 64);
this.mMaxProgresstime = getProperTime(64800);
@@ -484,12 +451,12 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
return true;
}
if (((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[1], "blockCoal"))
- || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[1], "blockCharcoal")))
+ || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[1], "blockCharcoal")))
&& (this.mInventory[1].stackSize >= 4)
&& (this.spaceForOutput(
this.mOutputItem1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 9L),
- this.mOutputItem2 =
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 4L)))) {
+ this.mOutputItem2 = GT_OreDictUnificator
+ .get(OrePrefixes.dust, Materials.DarkAsh, 4L)))) {
this.getBaseMetaTileEntity().decrStackSize(0, 1);
this.getBaseMetaTileEntity().decrStackSize(1, 4 * 3);
this.mMaxProgresstime = getProperTime(64800);
@@ -508,14 +475,14 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
}
@Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return aIndex > 1;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
if (aIndex < 2) {}
return !GT_Utility.areStacksEqual(aStack, this.mInventory[0]);
}
@@ -532,24 +499,25 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new SlotWidget(inventoryHandler, 0)
+ builder.widget(
+ new SlotWidget(inventoryHandler, 0)
.setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_INGOT)
.setPos(33, 15))
- .widget(new SlotWidget(inventoryHandler, 1)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_FURNACE)
- .setPos(33, 33))
- .widget(new SlotWidget(inventoryHandler, 2)
- .setAccess(true, false)
- .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_INGOT)
- .setPos(85, 24))
- .widget(new SlotWidget(inventoryHandler, 3)
- .setAccess(true, false)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DUST)
- .setPos(103, 24))
- .widget(new ProgressBar()
- .setTexture(GTPP_UITextures.PROGRESSBAR_ARROW_2, 20)
- .setProgress(() -> (float) mProgresstime / mMaxProgresstime)
- .setPos(58, 24)
- .setSize(20, 18));
+ .widget(
+ new SlotWidget(inventoryHandler, 1)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_FURNACE)
+ .setPos(33, 33))
+ .widget(
+ new SlotWidget(inventoryHandler, 2).setAccess(true, false)
+ .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_INGOT)
+ .setPos(85, 24))
+ .widget(
+ new SlotWidget(inventoryHandler, 3).setAccess(true, false)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DUST)
+ .setPos(103, 24))
+ .widget(
+ new ProgressBar().setTexture(GTPP_UITextures.PROGRESSBAR_ARROW_2, 20)
+ .setProgress(() -> (float) mProgresstime / mMaxProgresstime).setPos(58, 24)
+ .setSize(20, 18));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
index 21a8333b03..fae3ab5970 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
@@ -7,10 +7,25 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -32,18 +47,6 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_MillingBalls;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.DamageSource;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IsaMill>
implements ISurvivalConstructable {
@@ -55,8 +58,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
private static final IIconContainer frontFaceActive = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE5");
private static final IIconContainer frontFace = new CustomIcon("iconsets/Grinder/GRINDER5");
- private final ArrayList<GT_MetaTileEntity_Hatch_MillingBalls> mMillingBallBuses =
- new ArrayList<GT_MetaTileEntity_Hatch_MillingBalls>();
+ private final ArrayList<GT_MetaTileEntity_Hatch_MillingBalls> mMillingBallBuses = new ArrayList<GT_MetaTileEntity_Hatch_MillingBalls>();
private static final DamageSource mIsaMillDamageSource = new DamageSource("gtpp.grinder").setDamageBypassesArmor();
public GregtechMetaTileEntity_IsaMill(int aID, String aName, String aNameRegional) {
@@ -70,36 +72,28 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Large Grinding Machine")
- .addInfo("Grind ores.")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 7, false)
- .addController("Front Center")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Large Grinding Machine")
+ .addInfo("Grind ores.").addPollutionAmount(getPollutionPerSecond(null)).addSeparator()
+ .beginStructureBlock(3, 3, 7, false).addController("Front Center")
.addCasingInfo("IsaMill Exterior Casing", 40)
.addOtherStructurePart("IsaMill Gearbox", "5x, Inner Blocks")
.addOtherStructurePart("IsaMill Piping", "8x, ring around controller")
.addStructureInfo("IsaMill Pipings must not be obstructed in front (only air blocks)")
- .addOtherStructurePart("Milling Ball Hatch", "Any Casing")
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addOtherStructurePart("Milling Ball Hatch", "Any Casing").addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+ .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@Override
public IStructureDefinition<GregtechMetaTileEntity_IsaMill> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IsaMill>builder()
- .addShape(mName, transpose(new String[][] {
- {"DDD", "CCC", "CCC", "CCC", "CCC", "CCC", "CCC"},
- {"D~D", "CGC", "CGC", "CGC", "CGC", "CGC", "CCC"},
- {"DDD", "CCC", "CCC", "CCC", "CCC", "CCC", "CCC"},
- }))
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IsaMill>builder().addShape(
+ mName,
+ transpose(
+ new String[][] { { "DDD", "CCC", "CCC", "CCC", "CCC", "CCC", "CCC" },
+ { "D~D", "CGC", "CGC", "CGC", "CGC", "CGC", "CCC" },
+ { "DDD", "CCC", "CCC", "CCC", "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
ofChain(
@@ -107,25 +101,18 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
.adder(GregtechMetaTileEntity_IsaMill::addMillingBallsHatch)
.hatchClass(GT_MetaTileEntity_Hatch_MillingBalls.class)
.shouldReject(t -> !t.mMillingBallBuses.isEmpty())
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .build(),
- buildHatchAdder(GregtechMetaTileEntity_IsaMill.class)
- .atLeast(
- InputBus,
- OutputBus,
- InputHatch,
- OutputHatch,
- Maintenance,
- Energy,
- Muffler)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .build(),
+ .casingIndex(getCasingTextureIndex()).dot(1).build(),
+ buildHatchAdder(GregtechMetaTileEntity_IsaMill.class).atLeast(
+ InputBus,
+ OutputBus,
+ InputHatch,
+ OutputHatch,
+ Maintenance,
+ Energy,
+ Muffler).casingIndex(getCasingTextureIndex()).dot(1).build(),
onElementPass(x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
.addElement('D', ofBlock(getIntakeBlock(), getIntakeMeta()))
- .addElement('G', ofBlock(getGearboxBlock(), getGearboxMeta()))
- .build();
+ .addElement('G', ofBlock(getGearboxBlock(), getGearboxMeta())).build();
}
return STRUCTURE_DEFINITION;
}
@@ -261,7 +248,9 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
}
} else if (aFoundEntity.getHealth() > 0) {
EntityUtils.doDamage(
- aFoundEntity, mIsaMillDamageSource, Math.max(1, (int) (aFoundEntity.getMaxHealth() / 3)));
+ aFoundEntity,
+ mIsaMillDamageSource,
+ Math.max(1, (int) (aFoundEntity.getMaxHealth() / 3)));
if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive())) {
generateParticles(aFoundEntity);
}
@@ -269,6 +258,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
}
}
}
+
// 20 armor points add 80% damage reduction, more points add more damage reduction
private int getPlayerDamageValue(EntityPlayer player, int damage) {
int armorValue = player.getTotalArmorValue();
@@ -406,11 +396,8 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
@Override
public String[] getExtraInfoData() {
- return new String[] {
- "IsaMill Grinding Machine",
- "Current Efficiency: " + (mEfficiency / 100) + "%",
- getIdealStatus() == getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance"
- };
+ return new String[] { "IsaMill Grinding Machine", "Current Efficiency: " + (mEfficiency / 100) + "%",
+ getIdealStatus() == getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance" };
}
@Override
@@ -434,7 +421,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
}
/*
- * Milling Ball Handling
+ * Milling Ball Handling
*/
@Override
@@ -501,14 +488,8 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll,
- GT_Recipe aRecipe) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) {
// Based on the Processing Array. A bit overkill, but very flexible.
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
index 1934a8e610..9136ac4aae 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
@@ -5,11 +5,20 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.interfaces.IHatchElement;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -24,12 +33,6 @@ import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_SpargeTower>
implements ISurvivalConstructable {
@@ -41,35 +44,28 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
private static final IStructureDefinition<GregtechMetaTileEntity_SpargeTower> STRUCTURE_DEFINITION;
static {
- IHatchElement<GregtechMetaTileEntity_SpargeTower> layeredOutputHatch = OutputHatch.withCount(
- GregtechMetaTileEntity_SpargeTower::getCurrentLayerOutputHatchCount)
+ IHatchElement<GregtechMetaTileEntity_SpargeTower> layeredOutputHatch = OutputHatch
+ .withCount(GregtechMetaTileEntity_SpargeTower::getCurrentLayerOutputHatchCount)
.withAdder(GregtechMetaTileEntity_SpargeTower::addLayerOutputHatch);
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SpargeTower>builder()
- .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] {
- {"b~b", "bbb", "bbb"},
- }))
- .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] {{"lll", "lcl", "lll"}}))
- .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] {{"lll", "l-l", "lll"}}))
- .addShape(STRUCTURE_PIECE_TOP_HINT, transpose(new String[][] {{"lll", "lll", "lll"}}))
+ .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] { { "b~b", "bbb", "bbb" }, }))
+ .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] { { "lll", "lcl", "lll" } }))
+ .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] { { "lll", "l-l", "lll" } }))
+ .addShape(STRUCTURE_PIECE_TOP_HINT, transpose(new String[][] { { "lll", "lll", "lll" } }))
.addElement(
'b',
buildHatchAdder(GregtechMetaTileEntity_SpargeTower.class)
- .atLeast(Energy, InputHatch, InputBus, Maintenance)
- .disallowOnly(ForgeDirection.UP)
- .casingIndex(getCasingIndex())
- .dot(1)
- .buildAndChain(onElementPass(
- GregtechMetaTileEntity_SpargeTower::onCasingFound,
- ofBlock(ModBlocks.blockCasings5Misc, 4))))
+ .atLeast(Energy, InputHatch, InputBus, Maintenance).disallowOnly(ForgeDirection.UP)
+ .casingIndex(getCasingIndex()).dot(1).buildAndChain(
+ onElementPass(
+ GregtechMetaTileEntity_SpargeTower::onCasingFound,
+ ofBlock(ModBlocks.blockCasings5Misc, 4))))
.addElement(
'l',
ofChain(
- buildHatchAdder(GregtechMetaTileEntity_SpargeTower.class)
- .atLeast(layeredOutputHatch)
+ buildHatchAdder(GregtechMetaTileEntity_SpargeTower.class).atLeast(layeredOutputHatch)
.disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN)
- .casingIndex(getCasingIndex())
- .dot(2)
- .build(),
+ .casingIndex(getCasingIndex()).dot(2).build(),
ofHatchAdder(
GregtechMetaTileEntity_SpargeTower::addEnergyInputToMachineList,
getCasingIndex(),
@@ -126,16 +122,12 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType("Gas Sparge Tower")
- .addInfo("Controller block for the Sparging Tower")
+ tt.addMachineType("Gas Sparge Tower").addInfo("Controller block for the Sparging Tower")
.addInfo("Fluids are only put out at the correct height")
- .addInfo("The correct height equals the slot number in the NEI recipe")
- .addSeparator()
- .beginStructureBlock(3, 8, 3, true)
- .addController("Front bottom")
+ .addInfo("The correct height equals the slot number in the NEI recipe").addSeparator()
+ .beginStructureBlock(3, 8, 3, true).addController("Front bottom")
.addOtherStructurePart("Sparge Tower Exterior Casing", "45 (minimum)")
- .addEnergyHatch("Any casing", 1, 2)
- .addMaintenanceHatch("Any casing", 1, 2, 3)
+ .addEnergyHatch("Any casing", 1, 2).addMaintenanceHatch("Any casing", 1, 2, 3)
.addInputHatch("2x Input Hatches (Any bottom layer casing)", 1)
.addOutputHatch("6x Output Hatches (At least one per layer except bottom layer)", 2, 3)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
@@ -198,8 +190,11 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
byte tTier = (byte) Math.max(0, GT_Utility.getTier(tVoltage));
FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]);
if (tFluids.length > 0) {
- Logger.INFO("Found " + tFluids.length + " input fluids. Searching "
- + GTPP_Recipe_Map.sSpargeTowerRecipes.mRecipeList.size() + " recipes.");
+ Logger.INFO(
+ "Found " + tFluids.length
+ + " input fluids. Searching "
+ + GTPP_Recipe_Map.sSpargeTowerRecipes.mRecipeList.size()
+ + " recipes.");
GT_Recipe tRecipe = getRecipeMap()
.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids);
if (tRecipe != null) {
@@ -221,8 +216,9 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
int aDevProgress = this.mMaxProgresstime / 10;
this.mMaxProgresstime = Math.max(1, aDevProgress);
this.mOutputItems = new ItemStack[] {};
- ArrayList<FluidStack> aFluidOutputs =
- getByproductsOfSparge(tRecipe.mFluidInputs[0], tRecipe.mFluidInputs[1]);
+ ArrayList<FluidStack> aFluidOutputs = getByproductsOfSparge(
+ tRecipe.mFluidInputs[0],
+ tRecipe.mFluidInputs[1]);
this.mOutputFluids = (FluidStack[]) aFluidOutputs.toArray(new FluidStack[0]);
updateSlots();
Logger.INFO("Done!");
@@ -238,8 +234,8 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
return false;
}
- private static ArrayList<FluidStack> getByproductsOfSparge(
- final FluidStack aSpargeGas, final FluidStack aSpentFuel) {
+ private static ArrayList<FluidStack> getByproductsOfSparge(final FluidStack aSpargeGas,
+ final FluidStack aSpentFuel) {
GasSpargingRecipe aSpargeRecipe = GasSpargingRecipeMap.findRecipe(aSpargeGas, aSpentFuel);
ArrayList<FluidStack> aOutputGases = new ArrayList<FluidStack>();
if (aSpargeRecipe == null) {
@@ -283,14 +279,12 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
}
protected int getCurrentLayerOutputHatchCount() {
- return mOutputHatchesByLayer.size() < mHeight || mHeight <= 0
- ? 0
+ return mOutputHatchesByLayer.size() < mHeight || mHeight <= 0 ? 0
: mOutputHatchesByLayer.get(mHeight - 1).size();
}
protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
- if (aTileEntity == null
- || aTileEntity.isDead()
+ if (aTileEntity == null || aTileEntity.isDead()
|| !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output)) {
Logger.INFO("Bad Output Hatch");
return false;
@@ -402,12 +396,28 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
for (int i = 1; i < tTotalHeight - 1; i++) {
mHeight = i;
built = survivialBuildPiece(
- STRUCTURE_PIECE_LAYER_HINT, stackSize, 1, i, 0, elementBudget, env, false, true);
+ STRUCTURE_PIECE_LAYER_HINT,
+ stackSize,
+ 1,
+ i,
+ 0,
+ elementBudget,
+ env,
+ false,
+ true);
if (built >= 0) return built;
}
mHeight = tTotalHeight - 1;
return survivialBuildPiece(
- STRUCTURE_PIECE_TOP_HINT, stackSize, 1, tTotalHeight - 1, 0, elementBudget, env, false, true);
+ STRUCTURE_PIECE_TOP_HINT,
+ stackSize,
+ 1,
+ tTotalHeight - 1,
+ 0,
+ elementBudget,
+ env,
+ false,
+ true);
}
@Override
@@ -429,15 +439,22 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
public boolean onPlungerRightClick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
int aLayerIndex = 0;
PlayerUtils.messagePlayer(
- aPlayer, "Trying to clear " + mOutputHatchesByLayer.size() + " layers of output hatches.");
+ aPlayer,
+ "Trying to clear " + mOutputHatchesByLayer.size() + " layers of output hatches.");
for (List<GT_MetaTileEntity_Hatch_Output> layer : this.mOutputHatchesByLayer) {
int aHatchIndex = 0;
for (GT_MetaTileEntity_Hatch_Output hatch : layer) {
if (hatch.mFluid != null) {
PlayerUtils.messagePlayer(
aPlayer,
- "Clearing " + hatch.mFluid.amount + "L of " + hatch.mFluid.getLocalizedName()
- + " from hatch " + aHatchIndex + " on layer " + aLayerIndex + ".");
+ "Clearing " + hatch.mFluid.amount
+ + "L of "
+ + hatch.mFluid.getLocalizedName()
+ + " from hatch "
+ + aHatchIndex
+ + " on layer "
+ + aLayerIndex
+ + ".");
hatch.mFluid = null;
}
aHatchIndex++;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java
index ff9c20b08d..0aa94b2bbe 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java
@@ -1,6 +1,16 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced;
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
@@ -19,19 +29,11 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.LangUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import java.util.ArrayList;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_Adv_AssemblyLine
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_AssemblyLine> {
- public ArrayList<GT_MetaTileEntity_Hatch_DataAccess> mDataAccessHatches =
- new ArrayList<GT_MetaTileEntity_Hatch_DataAccess>();
+ public ArrayList<GT_MetaTileEntity_Hatch_DataAccess> mDataAccessHatches = new ArrayList<GT_MetaTileEntity_Hatch_DataAccess>();
public static String[] mCasingName = new String[5];
private final int CASING_TEXTURE_ID = TAE.getIndexFromPage(0, 13);
@@ -59,26 +61,17 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
return new GregtechMetaTileEntity_Adv_AssemblyLine(this.mName);
}
- /* public String[] getTooltip() {
- if (mCasingName[0].toLowerCase().contains(".name")) {
- mCasingName[0] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 0);
- }
- if (mCasingName[1].toLowerCase().contains(".name")) {
- mCasingName[1] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 1);
- }
- if (mCasingName[2].toLowerCase().contains(".name")) {
- mCasingName[2] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 2);
- }
- if (mCasingName[3].toLowerCase().contains(".name")) {
- mCasingName[3] = LangUtils.getLocalizedNameOfBlock(getCasing(3), 15);
- }
- if (mCasingName[4].toLowerCase().contains(".name")) {
- mCasingName[4] = LangUtils.getLocalizedNameOfBlock(getCasing(1), 13);
- }
- return new String[]{
- "Advanced Integrated Assembly Line"
- };
- }*/
+ /*
+ * public String[] getTooltip() { if (mCasingName[0].toLowerCase().contains(".name")) { mCasingName[0] =
+ * LangUtils.getLocalizedNameOfBlock(getCasing(4), 0); } if (mCasingName[1].toLowerCase().contains(".name")) {
+ * mCasingName[1] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 1); } if
+ * (mCasingName[2].toLowerCase().contains(".name")) { mCasingName[2] =
+ * LangUtils.getLocalizedNameOfBlock(getCasing(4), 2); } if (mCasingName[3].toLowerCase().contains(".name")) {
+ * mCasingName[3] = LangUtils.getLocalizedNameOfBlock(getCasing(3), 15); } if
+ * (mCasingName[4].toLowerCase().contains(".name")) { mCasingName[4] =
+ * LangUtils.getLocalizedNameOfBlock(getCasing(1), 13); } return new String[]{ "Advanced Integrated Assembly Line"
+ * }; }
+ */
@Override
protected final GT_Multiblock_Tooltip_Builder createTooltip() {
@@ -133,8 +126,7 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
ItemStack tStack[] = new ItemStack[15];
FluidStack[] tFluids = new FluidStack[4];
boolean findRecipe = false;
- nextDS:
- for (ItemStack tDataStick : tDataStickList) {
+ nextDS: for (ItemStack tDataStick : tDataStickList) {
NBTTagCompound tTag = tDataStick.getTagCompound();
if (tTag == null) continue;
for (int i = 0; i < 15; i++) {
@@ -144,8 +136,7 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
continue nextDS;
}
- ItemStack stackInSlot =
- mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
+ ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
boolean flag = true;
if (count > 0) {
for (int j = 0; j < count; j++) {
@@ -185,8 +176,7 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
continue nextDS;
}
FluidStack fluidInHatch = mInputHatches.get(i).mFluid;
- if (fluidInHatch == null
- || !GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true)
+ if (fluidInHatch == null || !GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true)
|| fluidInHatch.amount < tFluids[i].amount) {
if (GT_Values.D1) System.out.println(i + " not accepted");
continue nextDS;
@@ -196,7 +186,7 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
if (GT_Values.D1) System.out.println("Input accepted, check other values");
if (!tTag.hasKey("output")) continue;
- mOutputItems = new ItemStack[] {GT_Utility.loadItem(tTag, "output")};
+ mOutputItems = new ItemStack[] { GT_Utility.loadItem(tTag, "output") };
if (mOutputItems[0] == null || !GT_Utility.isStackValid(mOutputItems[0])) continue;
if (!tTag.hasKey("time")) continue;
@@ -274,10 +264,20 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
// Layer 1
aShieldingCount += checkOuterRing(aBaseMetaTileEntity, getCasing(1), this.META_Shielding, -6, xDir, zDir);
- aIntegralCasingCount +=
- checkIntegralRing(aBaseMetaTileEntity, getCasing(0), this.META_IntegralCasing, -6, xDir, zDir);
+ aIntegralCasingCount += checkIntegralRing(
+ aBaseMetaTileEntity,
+ getCasing(0),
+ this.META_IntegralCasing,
+ -6,
+ xDir,
+ zDir);
aContainmentChamberCount += checkContainmentRing(
- aBaseMetaTileEntity, getCasing(4), this.META_ContainmentChamberCasing, -6, xDir, zDir);
+ aBaseMetaTileEntity,
+ getCasing(4),
+ this.META_ContainmentChamberCasing,
+ -6,
+ xDir,
+ zDir);
log("Layer 1 is Valid. Moving to Layer 2.");
// Layer 2
@@ -286,14 +286,24 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
log("Layer 2 is Valid. Moving to Layer 3.");
// Layer 3
- aContainmentCasingCount +=
- checkOuterRing(aBaseMetaTileEntity, getCasing(3), this.META_ContainmentCasing, -4, xDir, zDir);
+ aContainmentCasingCount += checkOuterRing(
+ aBaseMetaTileEntity,
+ getCasing(3),
+ this.META_ContainmentCasing,
+ -4,
+ xDir,
+ zDir);
aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4), this.META_PipeCasing, -4, xDir, zDir);
log("Layer 3 is Valid. Moving to Layer 4.");
// Layer 4
- aContainmentCasingCount +=
- checkOuterRing(aBaseMetaTileEntity, getCasing(3), this.META_ContainmentCasing, -3, xDir, zDir);
+ aContainmentCasingCount += checkOuterRing(
+ aBaseMetaTileEntity,
+ getCasing(3),
+ this.META_ContainmentCasing,
+ -3,
+ xDir,
+ zDir);
aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4), this.META_PipeCasing, -3, xDir, zDir);
log("Layer 4 is Valid. Moving to Layer 5.");
@@ -304,10 +314,20 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
// Layer 6
aShieldingCount += checkOuterRing(aBaseMetaTileEntity, getCasing(1), this.META_Shielding, -1, xDir, zDir);
- aIntegralCasingCount +=
- checkIntegralRing(aBaseMetaTileEntity, getCasing(0), this.META_IntegralCasing, -1, xDir, zDir);
+ aIntegralCasingCount += checkIntegralRing(
+ aBaseMetaTileEntity,
+ getCasing(0),
+ this.META_IntegralCasing,
+ -1,
+ xDir,
+ zDir);
aContainmentChamberCount += checkContainmentRing(
- aBaseMetaTileEntity, getCasing(4), this.META_ContainmentChamberCasing, -1, xDir, zDir);
+ aBaseMetaTileEntity,
+ getCasing(4),
+ this.META_ContainmentChamberCasing,
+ -1,
+ xDir,
+ zDir);
log("Layer 6 is Valid. Moving to Top Layer.");
// Top Layer
@@ -366,7 +386,8 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
log("Not enough " + LangUtils.getLocalizedNameOfBlock(getCasing(0), 6) + "s, require 48.");
if (aOwner != null) {
PlayerUtils.messagePlayer(
- aOwner, "Not enough " + LangUtils.getLocalizedNameOfBlock(getCasing(0), 6) + "s, require 48.");
+ aOwner,
+ "Not enough " + LangUtils.getLocalizedNameOfBlock(getCasing(0), 6) + "s, require 48.");
}
return false;
}
@@ -392,8 +413,8 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
return false;
}
- public int checkEntireLayer(
- IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
+ public int checkEntireLayer(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir,
+ int zDir) {
int aCasingCount = 0;
for (int x = -4; x < 5; x++) {
for (int z = -4; z < 5; z++) {
@@ -414,10 +435,16 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
aCasingCount++;
}
- final IGregTechTileEntity tTileEntity =
- aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
+ final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity
+ .getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
if (!isValidBlockForStructure(
- tTileEntity, CASING_TEXTURE_ID, true, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) {
+ tTileEntity,
+ CASING_TEXTURE_ID,
+ true,
+ aCurrentBlock,
+ aCurrentMeta,
+ aBlock,
+ aMeta)) {
log("Layer has error. Height: " + aY);
// this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
return 0;
@@ -427,8 +454,8 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
return aCasingCount;
}
- public int checkOuterRing(
- IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
+ public int checkOuterRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir,
+ int zDir) {
int aCasingCount = 0;
for (int x = -4; x < 5; x++) {
for (int z = -4; z < 5; z++) {
@@ -455,10 +482,16 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
aCasingCount++;
}
- final IGregTechTileEntity tTileEntity =
- aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
+ final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity
+ .getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
if (!isValidBlockForStructure(
- tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) {
+ tTileEntity,
+ CASING_TEXTURE_ID,
+ false,
+ aCurrentBlock,
+ aCurrentMeta,
+ aBlock,
+ aMeta)) {
log("Layer has error. Height: " + aY);
// this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
return 0;
@@ -468,8 +501,8 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
return aCasingCount;
}
- public int checkIntegralRing(
- IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
+ public int checkIntegralRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir,
+ int zDir) {
int aCasingCount = 0;
for (int x = -3; x < 4; x++) {
for (int z = -3; z < 4; z++) {
@@ -496,10 +529,16 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
aCasingCount++;
}
- final IGregTechTileEntity tTileEntity =
- aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
+ final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity
+ .getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
if (!isValidBlockForStructure(
- tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) {
+ tTileEntity,
+ CASING_TEXTURE_ID,
+ false,
+ aCurrentBlock,
+ aCurrentMeta,
+ aBlock,
+ aMeta)) {
log("Layer has error. Height: " + aY);
// this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
return 0;
@@ -509,8 +548,8 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
return aCasingCount;
}
- public int checkPipes(
- IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
+ public int checkPipes(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir,
+ int zDir) {
int aCasingCount = 0;
for (int x = -1; x < 2; x++) {
for (int z = -1; z < 2; z++) {
@@ -518,8 +557,7 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + aY;
int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z;
// Skip the corners
- if ((x == 1 && z == 1)
- || (x == -1 && z == -1)
+ if ((x == 1 && z == 1) || (x == -1 && z == -1)
|| (x == 1 && z == -1)
|| (x == -1 && z == 1)
|| (x == 0 && z == 0)) {
@@ -528,24 +566,29 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
aCasingCount++;
}
- final IGregTechTileEntity tTileEntity =
- aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
+ final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity
+ .getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
if (!isValidBlockForStructure(
- tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) {
+ tTileEntity,
+ CASING_TEXTURE_ID,
+ false,
+ aCurrentBlock,
+ aCurrentMeta,
+ aBlock,
+ aMeta)) {
log("Pipe has error. Height: " + aY);
// this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta,
// 3);
return 0;
- }
- ;
+ } ;
}
}
}
return aCasingCount;
}
- public int checkContainmentRing(
- IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
+ public int checkContainmentRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir,
+ int zDir) {
int aCasingCount = 0;
for (int x = -2; x < 3; x++) {
for (int z = -2; z < 3; z++) {
@@ -562,10 +605,16 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
aCasingCount++;
}
- final IGregTechTileEntity tTileEntity =
- aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
+ final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity
+ .getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
if (!isValidBlockForStructure(
- tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) {
+ tTileEntity,
+ CASING_TEXTURE_ID,
+ false,
+ aCurrentBlock,
+ aCurrentMeta,
+ aBlock,
+ aMeta)) {
log("Layer has error. Height: " + aY);
// this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
return 0;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java
index 66a72aec86..11c9fa94ae 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java
@@ -5,11 +5,21 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IHatchElement;
@@ -27,17 +37,9 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_Adv_DistillationTower
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_DistillationTower>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_Adv_DistillationTower extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_DistillationTower> implements ISurvivalConstructable {
private Mode mMode = Mode.DistillationTower;
private boolean mUpgraded = false;
@@ -69,30 +71,20 @@ public class GregtechMetaTileEntity_Adv_DistillationTower
@Override
public IStructureDefinition<GregtechMetaTileEntity_Adv_DistillationTower> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- IHatchElement<GregtechMetaTileEntity_Adv_DistillationTower> layeredOutputHatch = OutputHatch.withCount(
- GregtechMetaTileEntity_Adv_DistillationTower::getCurrentLayerOutputHatchCount)
+ IHatchElement<GregtechMetaTileEntity_Adv_DistillationTower> layeredOutputHatch = OutputHatch
+ .withCount(GregtechMetaTileEntity_Adv_DistillationTower::getCurrentLayerOutputHatchCount)
.withAdder(GregtechMetaTileEntity_Adv_DistillationTower::addLayerOutputHatch);
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Adv_DistillationTower>builder()
- .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] {
- {"b~b", "bbb", "bbb"},
- }))
- .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] {
- {"lll", "lcl", "lll"},
- }))
- .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] {
- {"lll", "l-l", "lll"},
- }))
- .addShape(STRUCTURE_PIECE_TOP_HINT, transpose(new String[][] {
- {"ttt", "ttt", "ttt"},
- }))
+ .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] { { "b~b", "bbb", "bbb" }, }))
+ .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] { { "lll", "lcl", "lll" }, }))
+ .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] { { "lll", "l-l", "lll" }, }))
+ .addShape(STRUCTURE_PIECE_TOP_HINT, transpose(new String[][] { { "ttt", "ttt", "ttt" }, }))
.addElement(
'b',
ofChain(
buildHatchAdder(GregtechMetaTileEntity_Adv_DistillationTower.class)
.atLeast(Energy, OutputBus, InputHatch, InputBus, Maintenance)
- .disallowOnly(ForgeDirection.UP)
- .casingIndex(getCasingTextureId())
- .dot(1)
+ .disallowOnly(ForgeDirection.UP).casingIndex(getCasingTextureId()).dot(1)
.build(),
ofBlock(GregTech_API.sBlockCasings4, 1)))
.addElement(
@@ -101,14 +93,11 @@ public class GregtechMetaTileEntity_Adv_DistillationTower
buildHatchAdder(GregtechMetaTileEntity_Adv_DistillationTower.class)
.atLeast(layeredOutputHatch, Energy, Maintenance)
.disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN)
- .casingIndex(getCasingTextureId())
- .dot(2)
- .build(),
+ .casingIndex(getCasingTextureId()).dot(2).build(),
onElementPass(
GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound,
ofHatchAdder(
- GregtechMetaTileEntity_Adv_DistillationTower
- ::addMufflerToMachineList,
+ GregtechMetaTileEntity_Adv_DistillationTower::addMufflerToMachineList,
getCasingTextureId(),
3)),
ofBlock(GregTech_API.sBlockCasings4, 1)))
@@ -118,22 +107,19 @@ public class GregtechMetaTileEntity_Adv_DistillationTower
onElementPass(
GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound,
ofHatchAdder(
- GregtechMetaTileEntity_Adv_DistillationTower
- ::addMufflerToMachineList,
+ GregtechMetaTileEntity_Adv_DistillationTower::addMufflerToMachineList,
getCasingTextureId(),
3)),
onElementPass(
GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound,
ofHatchAdder(
- GregtechMetaTileEntity_Adv_DistillationTower
- ::addOutputToMachineList,
+ GregtechMetaTileEntity_Adv_DistillationTower::addOutputToMachineList,
getCasingTextureId(),
3)),
onElementPass(
GregtechMetaTileEntity_Adv_DistillationTower::onTopLayerFound,
ofHatchAdder(
- GregtechMetaTileEntity_Adv_DistillationTower
- ::addMaintenanceToMachineList,
+ GregtechMetaTileEntity_Adv_DistillationTower::addMaintenanceToMachineList,
getCasingTextureId(),
3)),
onElementPass(
@@ -143,10 +129,8 @@ public class GregtechMetaTileEntity_Adv_DistillationTower
.addElement(
't',
buildHatchAdder(GregtechMetaTileEntity_Adv_DistillationTower.class)
- .atLeast(layeredOutputHatch, Muffler)
- .disallowOnly(ForgeDirection.DOWN)
- .casingIndex(getCasingTextureId())
- .dot(2)
+ .atLeast(layeredOutputHatch, Muffler).disallowOnly(ForgeDirection.DOWN)
+ .casingIndex(getCasingTextureId()).dot(2)
.buildAndChain(GregTech_API.sBlockCasings4, 1))
.build();
}
@@ -154,15 +138,14 @@ public class GregtechMetaTileEntity_Adv_DistillationTower
}
protected int getCurrentLayerOutputHatchCount() {
- return mOutputHatchesByLayer.size() < mHeight || mHeight <= 0
- ? 0
+ return mOutputHatchesByLayer.size() < mHeight || mHeight <= 0 ? 0
: mOutputHatchesByLayer.get(mHeight - 1).size();
}
protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
- if (aTileEntity == null
- || aTileEntity.isDead()
- || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output)) return false;
+ if (aTileEntity == null || aTileEntity.isDead()
+ || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output))
+ return false;
while (mOutputHatchesByLayer.size() < mHeight) mOutputHatchesByLayer.add(new ArrayList<>());
GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aTileEntity.getMetaTileEntity();
tHatch.updateTexture(aBaseCasingIndex);
@@ -176,25 +159,16 @@ public class GregtechMetaTileEntity_Adv_DistillationTower
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Advanced Distillation Tower")
- .addInfo("Use 85% less energy in distillery mode")
- .addInfo("250%/100% faster in DT/distillery mode")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Advanced Distillation Tower")
+ .addInfo("Use 85% less energy in distillery mode").addInfo("250%/100% faster in DT/distillery mode")
.addInfo("Right click the controller with screwdriver to change mode.")
- .addInfo("Max parallel dictated by tower tier and mode")
- .addInfo("DTower Mode: T1=4, T2=12")
+ .addInfo("Max parallel dictated by tower tier and mode").addInfo("DTower Mode: T1=4, T2=12")
.addInfo("Distilery Mode: Tower Tier * (4*InputTier)")
- .addInfo("Distilery Mode require a full height tower")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .addCasingInfo("Clean Stainless Steel Machine Casing", 7)
- .addInputBus("Bottom Casing", 1)
- .addOutputBus("Bottom Casing", 1)
- .addInputHatch("Bottom Casing", 1)
- .addMaintenanceHatch("Bottom Casing", 1)
- .addEnergyHatch("Bottom Casing", 1)
- .addOutputHatch("One per layer except bottom", 2)
- .addMufflerHatch("Top Casing", 3)
+ .addInfo("Distilery Mode require a full height tower").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().addCasingInfo("Clean Stainless Steel Machine Casing", 7).addInputBus("Bottom Casing", 1)
+ .addOutputBus("Bottom Casing", 1).addInputHatch("Bottom Casing", 1)
+ .addMaintenanceHatch("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1)
+ .addOutputHatch("One per layer except bottom", 2).addMufflerHatch("Top Casing", 3)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -218,12 +192,28 @@ public class GregtechMetaTileEntity_Adv_DistillationTower
for (int i = 1; i < tTotalHeight - 1; i++) {
mHeight = i;
built = survivialBuildPiece(
- STRUCTURE_PIECE_LAYER_HINT, stackSize, 1, i, 0, elementBudget, env, false, true);
+ STRUCTURE_PIECE_LAYER_HINT,
+ stackSize,
+ 1,
+ i,
+ 0,
+ elementBudget,
+ env,
+ false,
+ true);
if (built >= 0) return built;
}
mHeight = tTotalHeight - 1;
return survivialBuildPiece(
- STRUCTURE_PIECE_TOP_HINT, stackSize, 1, tTotalHeight - 1, 0, elementBudget, env, false, true);
+ STRUCTURE_PIECE_TOP_HINT,
+ stackSize,
+ 1,
+ tTotalHeight - 1,
+ 0,
+ elementBudget,
+ env,
+ false,
+ true);
}
@Override
@@ -241,8 +231,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower
if (!checkPiece(STRUCTURE_PIECE_LAYER, 1, mHeight, 0)) {
return false;
}
- if (mOutputHatchesByLayer.size() < mHeight
- || mOutputHatchesByLayer.get(mHeight - 1).isEmpty())
+ if (mOutputHatchesByLayer.size() < mHeight || mOutputHatchesByLayer.get(mHeight - 1).isEmpty())
// layer without output hatch
return false;
if (mTopLayerFound || !mMufflerHatches.isEmpty()) {
@@ -364,7 +353,12 @@ public class GregtechMetaTileEntity_Adv_DistillationTower
FluidStack tFluid = hatch.getFluid();
if (tFluid != null) {
if (checkRecipeGeneric(
- inputs, new FluidStack[] {tFluid}, getMaxParallelRecipes(), 100, 250, 10000)) {
+ inputs,
+ new FluidStack[] { tFluid },
+ getMaxParallelRecipes(),
+ 100,
+ 250,
+ 10000)) {
return true;
}
}
@@ -430,9 +424,10 @@ public class GregtechMetaTileEntity_Adv_DistillationTower
}
private enum Mode {
+
DistillationTower(GT_Recipe_Map.sDistillationRecipes),
- Distillery(GT_Recipe_Map.sDistilleryRecipes),
- ;
+ Distillery(GT_Recipe_Map.sDistilleryRecipes),;
+
static final Mode[] VALUES = values();
private final GT_Recipe_Map recipeMap;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
index 5d17b2a922..9a2c679b37 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
@@ -8,10 +8,19 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gregtech.api.util.GT_StructureUtility.ofCoil;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.HeatingCoilLevel;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -28,12 +37,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_EBF>
implements ISurvivalConstructable {
@@ -71,23 +74,14 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Factory Grade Advanced Blast Furnace")
+ tt.addMachineType(getMachineType()).addInfo("Factory Grade Advanced Blast Furnace")
.addInfo("Speed: +120% | EU Usage: 90% | Parallel: 8")
.addInfo("Consumes 10L of " + mHotFuelName + " per second during operation")
- .addInfo("Constructed exactly the same as a normal EBF")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .addController("Bottom center")
- .addCasingInfo(mCasingName, 8)
- .addInputHatch("Any Casing", 1)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addStructureHint(mHatchName, 1)
- .addEnergyHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
+ .addInfo("Constructed exactly the same as a normal EBF").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().addController("Bottom center").addCasingInfo(mCasingName, 8)
+ .addInputHatch("Any Casing", 1).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1)
+ .addOutputHatch("Any Casing", 1).addStructureHint(mHatchName, 1).addEnergyHatch("Any Casing", 1)
+ .addMufflerHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -95,34 +89,25 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
@Override
public IStructureDefinition<GregtechMetaTileEntity_Adv_EBF> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Adv_EBF>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"HHH", "H-H", "HHH"},
- {"HHH", "H-H", "HHH"},
- {"C~C", "CCC", "CCC"},
- }))
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Adv_EBF>builder().addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "HHH", "H-H", "HHH" }, { "HHH", "H-H", "HHH" },
+ { "C~C", "CCC", "CCC" }, }))
.addElement(
'C',
ofChain(
buildHatchAdder(GregtechMetaTileEntity_Adv_EBF.class)
- .adder(GregtechMetaTileEntity_Adv_EBF::addPyrotheumHatch)
- .hatchId(968)
- .casingIndex(CASING_TEXTURE_ID)
- .dot(1)
- .build(),
- buildHatchAdder(GregtechMetaTileEntity_Adv_EBF.class)
- .atLeast(
- InputBus,
- OutputBus,
- Maintenance,
- Energy,
- Muffler,
- InputHatch,
- OutputHatch)
- .casingIndex(CASING_TEXTURE_ID)
- .dot(1)
- .build(),
+ .adder(GregtechMetaTileEntity_Adv_EBF::addPyrotheumHatch).hatchId(968)
+ .casingIndex(CASING_TEXTURE_ID).dot(1).build(),
+ buildHatchAdder(GregtechMetaTileEntity_Adv_EBF.class).atLeast(
+ InputBus,
+ OutputBus,
+ Maintenance,
+ Energy,
+ Muffler,
+ InputHatch,
+ OutputHatch).casingIndex(CASING_TEXTURE_ID).dot(1).build(),
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 11))))
.addElement(
'H',
@@ -260,13 +245,8 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
// Based on the Processing Array. A bit overkill, but very flexible.
// Reset outputs and progress stats
@@ -279,14 +259,13 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
long tEnergy = getMaxInputEnergy();
- GT_Recipe tRecipe = this.getRecipeMap()
- .findRecipe(
- getBaseMetaTileEntity(),
- mLastRecipe,
- false,
- gregtech.api.enums.GT_Values.V[tTier],
- aFluidInputs,
- aItemInputs);
+ GT_Recipe tRecipe = this.getRecipeMap().findRecipe(
+ getBaseMetaTileEntity(),
+ mLastRecipe,
+ false,
+ gregtech.api.enums.GT_Values.V[tTier],
+ aFluidInputs,
+ aItemInputs);
// Remember last recipe - an optimization for findRecipe()
this.mLastRecipe = tRecipe;
@@ -294,14 +273,9 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
return false;
}
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -319,17 +293,11 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
.setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel()))
- .enableHeatOC()
- .enableHeatDiscount()
- .setRecipeHeat(tRecipe.mSpecialValue)
- .setMultiHeat((int) getCoilLevel().getHeat())
+ .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).enableHeatOC()
+ .enableHeatDiscount().setRecipeHeat(tRecipe.mSpecialValue).setMultiHeat((int) getCoilLevel().getHeat())
.calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
@@ -378,8 +346,10 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
@Override
public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
isBussesSeparate = !isBussesSeparate;
- aPlayer.addChatMessage(new ChatComponentTranslation(
- isBussesSeparate ? "interaction.separateBusses.enabled" : "interaction.separateBusses.disabled"));
+ aPlayer.addChatMessage(
+ new ChatComponentTranslation(
+ isBussesSeparate ? "interaction.separateBusses.enabled"
+ : "interaction.separateBusses.disabled"));
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
index 8df07d8990..da6b43f82a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced;
+import java.lang.reflect.Method;
+
+import net.minecraft.block.Block;
+
import gregtech.api.enums.Dyes;
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
@@ -19,8 +23,6 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.lang.reflect.Method;
-import net.minecraft.block.Block;
public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_FusionComputer {
@@ -41,18 +43,12 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType("Fusion Reactor")
- .addInfo("HARNESSING THE POWER OF A NEUTRON STAR")
- .addSeparator()
- .beginStructureBlock(15, 3, 15, false)
- .addController("See diagram when placed")
- .addCasingInfo("Fusion Machine Casings MK III", 79)
- .addStructureInfo("Cover the coils with casing")
+ tt.addMachineType("Fusion Reactor").addInfo("HARNESSING THE POWER OF A NEUTRON STAR").addSeparator()
+ .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed")
+ .addCasingInfo("Fusion Machine Casings MK III", 79).addStructureInfo("Cover the coils with casing")
.addOtherStructurePart("Advanced Fusion Coils", "Center part of the ring")
- .addEnergyHatch("1-16, Specified casings", 2)
- .addInputHatch("2-16, Specified casings", 1)
- .addOutputHatch("1-16, Specified casings", 3)
- .addStructureInfo("ALL Hatches must be UHV or better")
+ .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1)
+ .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be UHV or better")
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -103,46 +99,34 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == aFacing) {
return new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)),
- TextureFactory.builder()
- .addIcon(this.getIconOverlay())
- .extFacing()
- .build()
- };
+ new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
+ Dyes.getModulation(-1, Dyes._NULL.mRGBa)),
+ TextureFactory.builder().addIcon(this.getIconOverlay()).extFacing().build() };
} else if (!aActive) {
- return new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa))
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS,
+ Dyes.getModulation(-1, Dyes._NULL.mRGBa)) };
} else {
- return new ITexture[] {
- new GT_RenderedTexture(
- TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA, Dyes.getModulation(-1, Dyes._NULL.mRGBa))
- };
+ return new ITexture[] { new GT_RenderedTexture(
+ TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA,
+ Dyes.getModulation(-1, Dyes._NULL.mRGBa)) };
}
}
@Override
public ITexture getTextureOverlay() {
return new GT_RenderedTexture(
- this.mMaxProgresstime > 0
- ? TexturesGtBlock.Casing_Machine_Screen_3
+ this.mMaxProgresstime > 0 ? TexturesGtBlock.Casing_Machine_Screen_3
: TexturesGtBlock.Casing_Machine_Screen_1);
}
public IIconContainer getIconOverlay() {
- return this.mMaxProgresstime > 0
- ? TexturesGtBlock.Casing_Machine_Screen_3
+ return this.mMaxProgresstime > 0 ? TexturesGtBlock.Casing_Machine_Screen_3
: TexturesGtBlock.Casing_Machine_Screen_1;
}
@@ -181,11 +165,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
}
}
- return new String[] {
- "Fusion Reactor MK " + tier,
- "EU Required: " + powerRequired + "EU/t",
- "Stored EU: " + mEUStore + " / " + maxEUStore(),
- "Plasma Output: " + plasmaOut + "L/t"
- };
+ return new String[] { "Fusion Reactor MK " + tier, "EU Required: " + powerRequired + "EU/t",
+ "Stored EU: " + mEUStore + " / " + maxEUStore(), "Plasma Output: " + plasmaOut + "L/t" };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java
index 00cd8e9c1f..31742df05f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java
@@ -3,9 +3,18 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.a
import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -20,13 +29,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_Adv_HeatExchanger
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_HeatExchanger> {
@@ -34,65 +36,66 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
private static final int CASING_INDEX = TAE.getIndexFromPage(1, 12);
private static final String STRUCTURE_PIECE_MAIN = "main";
- private static final IStructureDefinition<GregtechMetaTileEntity_Adv_HeatExchanger> STRUCTURE_DEFINITION =
- StructureDefinition.<GregtechMetaTileEntity_Adv_HeatExchanger>builder()
- .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][] {
- {" ccc ", "cCCCc", "cCCCc", "cCCCc", " ccc "},
- {" ccc ", "cPPPc", "cPPPc", "cPPPc", " ccc "},
- {" ccc ", "cPPPc", "cPPPc", "cPPPc", " ccc "},
- {" ccc ", "cPPPc", "cPPPc", "cPPPc", " ccc "},
- {" ccc ", "cPPPc", "cPPPc", "cPPPc", " ccc "},
- {" c~c ", "cPPPc", "cPPPc", "cPPPc", " ccc "},
- {" hhh ", "hHHHh", "hHHHh", "hHHHh", " hhh "},
- {" f f ", "f f", " ", "f f", " f f "},
- {" f f ", "f f", " ", "f f", " f f "},
- }))
- .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15))
- .addElement('f', ofBlock(getFrame(), 0))
- .addElement(
- 'C',
- ofChain(
- ofHatchAdder(
- GregtechMetaTileEntity_Adv_HeatExchanger::addColdFluidOutputToMachineList,
- CASING_INDEX,
- 2),
- onElementPass(
- GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
- ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
- .addElement(
- 'H',
- ofChain(
- ofHatchAdder(
- GregtechMetaTileEntity_Adv_HeatExchanger::addHotFluidInputToMachineList,
- CASING_INDEX,
- 3),
- onElementPass(
- GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
- ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
- .addElement(
- 'h',
- ofChain(
- ofHatchAdder(
- GregtechMetaTileEntity_Adv_HeatExchanger::addInputToMachineList,
- CASING_INDEX,
- 1),
- ofHatchAdder(
- GregtechMetaTileEntity_Adv_HeatExchanger::addOutputToMachineList,
- CASING_INDEX,
- 1),
- ofHatchAdder(
- GregtechMetaTileEntity_Adv_HeatExchanger::addMaintenanceToMachineList,
- CASING_INDEX,
- 1),
- onElementPass(
- GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
- ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
- .addElement(
- 'c',
- ofChain(onElementPass(
+ private static final IStructureDefinition<GregtechMetaTileEntity_Adv_HeatExchanger> STRUCTURE_DEFINITION = StructureDefinition
+ .<GregtechMetaTileEntity_Adv_HeatExchanger>builder()
+ .addShape(
+ STRUCTURE_PIECE_MAIN,
+ transpose(
+ new String[][] { { " ccc ", "cCCCc", "cCCCc", "cCCCc", " ccc " },
+ { " ccc ", "cPPPc", "cPPPc", "cPPPc", " ccc " },
+ { " ccc ", "cPPPc", "cPPPc", "cPPPc", " ccc " },
+ { " ccc ", "cPPPc", "cPPPc", "cPPPc", " ccc " },
+ { " ccc ", "cPPPc", "cPPPc", "cPPPc", " ccc " },
+ { " c~c ", "cPPPc", "cPPPc", "cPPPc", " ccc " },
+ { " hhh ", "hHHHh", "hHHHh", "hHHHh", " hhh " },
+ { " f f ", "f f", " ", "f f", " f f " },
+ { " f f ", "f f", " ", "f f", " f f " }, }))
+ .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15)).addElement('f', ofBlock(getFrame(), 0))
+ .addElement(
+ 'C',
+ ofChain(
+ ofHatchAdder(
+ GregtechMetaTileEntity_Adv_HeatExchanger::addColdFluidOutputToMachineList,
+ CASING_INDEX,
+ 2),
+ onElementPass(
+ GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
+ ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
+ .addElement(
+ 'H',
+ ofChain(
+ ofHatchAdder(
+ GregtechMetaTileEntity_Adv_HeatExchanger::addHotFluidInputToMachineList,
+ CASING_INDEX,
+ 3),
+ onElementPass(
+ GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
+ ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
+ .addElement(
+ 'h',
+ ofChain(
+ ofHatchAdder(
+ GregtechMetaTileEntity_Adv_HeatExchanger::addInputToMachineList,
+ CASING_INDEX,
+ 1),
+ ofHatchAdder(
+ GregtechMetaTileEntity_Adv_HeatExchanger::addOutputToMachineList,
+ CASING_INDEX,
+ 1),
+ ofHatchAdder(
+ GregtechMetaTileEntity_Adv_HeatExchanger::addMaintenanceToMachineList,
+ CASING_INDEX,
+ 1),
+ onElementPass(
+ GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
+ ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
+ .addElement(
+ 'c',
+ ofChain(
+ onElementPass(
GregtechMetaTileEntity_Adv_HeatExchanger::onCasingAdded,
ofBlock(ModBlocks.blockSpecialMultiCasings, 14))))
- .build();
+ .build();
public static float penalty_per_config = 0.015f; // penalize 1.5% efficiency per circuitry level (1-25)
private GT_MetaTileEntity_Hatch_Input mInputHotFluidHatch;
@@ -113,30 +116,23 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the XL Heat Exchanger")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the XL Heat Exchanger")
.addInfo("More complicated than a Fusion Reactor. Seriously")
- .addInfo("But you know this by now, right?")
- .addInfo("Works as fast as 16 Large Heat Exchangers")
- .addSeparator()
- .addInfo("Inputs are Hot Coolant or Lava")
+ .addInfo("But you know this by now, right?").addInfo("Works as fast as 16 Large Heat Exchangers")
+ .addSeparator().addInfo("Inputs are Hot Coolant or Lava")
.addInfo("Outputs Coolant or Pahoehoe Lava and SH Steam/Steam")
.addInfo("Outputs SH Steam if input flow is equal to or above a certain value:")
.addInfo("Hot Coolant: 12,800 L/s, maximum 25,600 EU/t, max output 6,400,000 SH Steam/s")
.addInfo("Lava: 16,000 L/s, maximum 32,000 EU/t, max output 2,560,000 SH Steam/s")
.addInfo("A circuit in the controller lowers the SH Steam threshold and efficiency")
- .addInfo("2400 L/s reduction and 1.5% efficiency loss per circuit config over 1")
- .addSeparator()
- .beginStructureBlock(5, 9, 5, false)
- .addController("Front bottom")
+ .addInfo("2400 L/s reduction and 1.5% efficiency loss per circuit config over 1").addSeparator()
+ .beginStructureBlock(5, 9, 5, false).addController("Front bottom")
.addCasingInfo("Reinforced Heat Exchanger Casing", 90)
.addOtherStructurePart("Tungstensteel Pipe Casing", "Center 3x5x3 (45 blocks)")
- .addMaintenanceHatch("Any casing", 1)
- .addInputHatch("Hot fluid, bottom center", 2)
+ .addMaintenanceHatch("Any casing", 1).addInputHatch("Hot fluid, bottom center", 2)
.addInputHatch("Distilled water, any bottom layer casing", 1)
.addOutputHatch("Cold fluid, top center", 3)
- .addOutputHatch("Steam/SH Steam, any bottom layer casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addOutputHatch("Steam/SH Steam, any bottom layer casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -217,12 +213,12 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
return false;
}
- superheated = fluidAmountToConsume
- >= superheated_threshold; // set the internal superheated flag if we have enough hot fluid. Used in the
+ superheated = fluidAmountToConsume >= superheated_threshold; // set the internal superheated flag if we have
+ // enough hot fluid. Used in the
// onRunningTick method.
- fluidAmountToConsume = Math.min(
- fluidAmountToConsume,
- superheated_threshold * 2); // Don't consume too much hot fluid per second, maximum is 2x SH threshold.
+ fluidAmountToConsume = Math.min(fluidAmountToConsume, superheated_threshold * 2); // Don't consume too much hot
+ // fluid per second, maximum
+ // is 2x SH threshold.
mInputHotFluidHatch.drain(fluidAmountToConsume, true);
this.mMaxProgresstime = 20;
this.lEUt = (long) (fluidAmountToConsume * steam_output_multiplier * efficiency);
@@ -245,8 +241,8 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
@Override
public boolean onRunningTick(ItemStack aStack) {
if (this.lEUt > 0) {
- int tGeneratedEU =
- (int) (this.lEUt * 2L * this.mEfficiency / 10000L); // APPROXIMATELY how much steam to generate.
+ int tGeneratedEU = (int) (this.lEUt * 2L * this.mEfficiency / 10000L); // APPROXIMATELY how much steam to
+ // generate.
if (tGeneratedEU > 0) {
if (superheated) tGeneratedEU /= 2; // We produce half as much superheated steam if necessary
@@ -259,8 +255,9 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
if (depleteInput(distilledStack)) // Consume the distilled water
{
if (superheated) {
- addOutput(FluidRegistry.getFluidStack(
- "ic2superheatedsteam", tGeneratedEU)); // Generate superheated steam
+ addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", tGeneratedEU)); // Generate
+ // superheated
+ // steam
} else {
addOutput(GT_ModHandler.getSteam(tGeneratedEU)); // Generate regular steam
}
@@ -344,26 +341,43 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
@Override
public String[] getExtraInfoData() {
return new String[] {
- StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN
- + GT_Utility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / "
- + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s",
- StatCollector.translateToLocal("GT5U.multiblock.usage") + " "
- + StatCollector.translateToLocal("GT5U.LHE.steam") + ": "
- + (superheated ? EnumChatFormatting.RED : EnumChatFormatting.YELLOW)
- + GT_Utility.formatNumbers(superheated ? -2 * lEUt : -lEUt) + EnumChatFormatting.RESET + " EU/t",
- StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " + EnumChatFormatting.RED
- + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " "
- + StatCollector.translateToLocal("GT5U.multiblock.efficiency")
- + ": " + EnumChatFormatting.YELLOW
- + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
- StatCollector.translateToLocal("GT5U.LHE.superheated") + ": "
- + (superheated ? EnumChatFormatting.RED : EnumChatFormatting.BLUE) + superheated
- + EnumChatFormatting.RESET,
- StatCollector.translateToLocal("GT5U.LHE.superheated") + " "
- + StatCollector.translateToLocal("GT5U.LHE.threshold") + ": " + EnumChatFormatting.GREEN
- + GT_Utility.formatNumbers(superheated_threshold) + EnumChatFormatting.RESET
- };
+ StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": "
+ + EnumChatFormatting.GREEN
+ + GT_Utility.formatNumbers(mProgresstime / 20)
+ + EnumChatFormatting.RESET
+ + " s / "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.formatNumbers(mMaxProgresstime / 20)
+ + EnumChatFormatting.RESET
+ + " s",
+ StatCollector.translateToLocal("GT5U.multiblock.usage") + " "
+ + StatCollector.translateToLocal("GT5U.LHE.steam")
+ + ": "
+ + (superheated ? EnumChatFormatting.RED : EnumChatFormatting.YELLOW)
+ + GT_Utility.formatNumbers(superheated ? -2 * lEUt : -lEUt)
+ + EnumChatFormatting.RESET
+ + " EU/t",
+ StatCollector.translateToLocal("GT5U.multiblock.problems") + ": "
+ + EnumChatFormatting.RED
+ + (getIdealStatus() - getRepairStatus())
+ + EnumChatFormatting.RESET
+ + " "
+ + StatCollector.translateToLocal("GT5U.multiblock.efficiency")
+ + ": "
+ + EnumChatFormatting.YELLOW
+ + mEfficiency / 100.0F
+ + EnumChatFormatting.RESET
+ + " %",
+ StatCollector.translateToLocal("GT5U.LHE.superheated") + ": "
+ + (superheated ? EnumChatFormatting.RED : EnumChatFormatting.BLUE)
+ + superheated
+ + EnumChatFormatting.RESET,
+ StatCollector.translateToLocal("GT5U.LHE.superheated") + " "
+ + StatCollector.translateToLocal("GT5U.LHE.threshold")
+ + ": "
+ + EnumChatFormatting.GREEN
+ + GT_Utility.formatNumbers(superheated_threshold)
+ + EnumChatFormatting.RESET };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java
index 5f4f0466c1..72d7e010c7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java
@@ -4,8 +4,11 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.GregTech_API.sBlockCasings4;
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -15,7 +18,6 @@ import gregtech.api.util.*;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.ItemStack;
public class GregtechMetaTileEntity_Adv_Implosion
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Adv_Implosion> {
@@ -43,20 +45,13 @@ public class GregtechMetaTileEntity_Adv_Implosion
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Factory Grade Advanced Implosion Compressor")
+ tt.addMachineType(getMachineType()).addInfo("Factory Grade Advanced Implosion Compressor")
.addInfo("Speed: +100% | EU Usage: 100% | Parallel: ((Tier/2)+1)")
.addInfo("Constructed exactly the same as a normal Implosion Compressor")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front center")
- .addCasingInfo("Robust TungstenSteel Casing", 10)
- .addInputBus("Any casing", 1)
- .addOutputBus("Any casing", 1)
- .addEnergyHatch("Any casing", 1)
- .addMaintenanceHatch("Any casing", 1)
- .addMufflerHatch("Any casing", 1)
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
+ .addController("Front center").addCasingInfo("Robust TungstenSteel Casing", 10)
+ .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1)
+ .addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -65,11 +60,11 @@ public class GregtechMetaTileEntity_Adv_Implosion
public IStructureDefinition<GregtechMetaTileEntity_Adv_Implosion> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Adv_Implosion>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
ofChain(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
index f3c4e4abdf..04e36e7675 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
@@ -7,10 +7,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.GregTech_API.sBlockCasings1;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -19,7 +22,6 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase;
-import net.minecraft.item.ItemStack;
public class GregtechMetaTileEntity_SteamCompressor
extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamCompressor> implements ISurvivalConstructable {
@@ -59,42 +61,31 @@ public class GregtechMetaTileEntity_SteamCompressor
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Steam Compressor")
- .addInfo("Compresses " + getMaxParallelRecipes() + " things at a time")
- .addSeparator()
- .beginStructureBlock(3, 3, 4, true)
- .addController("Front center")
- .addCasingInfo(mCasingName, 28)
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Steam Compressor")
+ .addInfo("Compresses " + getMaxParallelRecipes() + " things at a time").addSeparator()
+ .beginStructureBlock(3, 3, 4, true).addController("Front center").addCasingInfo(mCasingName, 28)
.addOtherStructurePart(TT_steaminputbus, "Any casing", 1)
.addOtherStructurePart(TT_steamoutputbus, "Any casing", 1)
- .addOtherStructurePart(TT_steamhatch, "Any casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addOtherStructurePart(TT_steamhatch, "Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@Override
public IStructureDefinition<GregtechMetaTileEntity_SteamCompressor> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamCompressor>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC", "CCC"},
- {"C~C", "C-C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC", "CCC"},
- }))
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamCompressor>builder().addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC", "CCC" }, { "C~C", "C-C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
ofChain(
- buildSteamInput(GregtechMetaTileEntity_SteamCompressor.class)
- .casingIndex(10)
- .dot(1)
- .build(),
- buildHatchAdder(GregtechMetaTileEntity_SteamCompressor.class)
- .atLeast(
- SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam)
- .casingIndex(10)
- .dot(1)
+ buildSteamInput(GregtechMetaTileEntity_SteamCompressor.class).casingIndex(10).dot(1)
.build(),
+ buildHatchAdder(GregtechMetaTileEntity_SteamCompressor.class).atLeast(
+ SteamHatchElement.InputBus_Steam,
+ SteamHatchElement.OutputBus_Steam).casingIndex(10).dot(1).build(),
onElementPass(x -> ++x.mCasing, ofBlock(sBlockCasings1, 10))))
.build();
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
index 1df761097a..710ff3495b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
@@ -5,10 +5,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
import static gregtech.api.GregTech_API.sBlockCasings1;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -19,7 +22,6 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase;
-import net.minecraft.item.ItemStack;
public class GregtechMetaTileEntity_SteamMacerator
extends GregtechMeta_SteamMultiBase<GregtechMetaTileEntity_SteamMacerator> implements ISurvivalConstructable {
@@ -62,42 +64,31 @@ public class GregtechMetaTileEntity_SteamMacerator
mCasingName = ItemList.Casing_BronzePlatedBricks.get(1).getDisplayName();
}
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Steam Macerator")
- .addInfo("Macerates " + getMaxParallelRecipes() + " ores at a time")
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front center")
- .addCasingInfo(mCasingName, 14)
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Steam Macerator")
+ .addInfo("Macerates " + getMaxParallelRecipes() + " ores at a time").addSeparator()
+ .beginStructureBlock(3, 3, 3, true).addController("Front center").addCasingInfo(mCasingName, 14)
.addOtherStructurePart(TT_steaminputbus, "Any casing", 1)
.addOtherStructurePart(TT_steamoutputbus, "Any casing", 1)
- .addOtherStructurePart(TT_steamhatch, "Any casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addOtherStructurePart(TT_steamhatch, "Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@Override
public IStructureDefinition<GregtechMetaTileEntity_SteamMacerator> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamMacerator>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SteamMacerator>builder().addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
ofChain(
- buildSteamInput(GregtechMetaTileEntity_SteamMacerator.class)
- .casingIndex(10)
- .dot(1)
- .build(),
- buildHatchAdder(GregtechMetaTileEntity_SteamMacerator.class)
- .atLeast(
- SteamHatchElement.InputBus_Steam, SteamHatchElement.OutputBus_Steam)
- .casingIndex(10)
- .dot(1)
+ buildSteamInput(GregtechMetaTileEntity_SteamMacerator.class).casingIndex(10).dot(1)
.build(),
+ buildHatchAdder(GregtechMetaTileEntity_SteamMacerator.class).atLeast(
+ SteamHatchElement.InputBus_Steam,
+ SteamHatchElement.OutputBus_Steam).casingIndex(10).dot(1).build(),
onElementPass(x -> ++x.mCasing, ofBlock(sBlockCasings1, 10))))
.build();
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
index cf69ce12cd..ae51703c00 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
@@ -6,10 +6,20 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
@@ -29,13 +39,6 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.helpers.CraftingHelper;
import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Utils;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.fluids.FluidStack;
public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity_AutoCrafter>
implements ISurvivalConstructable {
@@ -50,6 +53,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
public CraftingHelper mInventoryCrafter;
public static enum MODE {
+
CRAFTING("CIRCUIT", "ASSEMBLY"),
ASSEMBLY("CRAFTING", "DISASSEMBLY"),
DISASSEMBLY("ASSEMBLY", "CIRCUIT"),
@@ -132,23 +136,14 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Highly Advanced Autocrafter")
+ tt.addMachineType(getMachineType()).addInfo("Highly Advanced Autocrafter")
.addInfo("Right Click with a Screwdriver to change mode")
.addInfo("200% faster than using single block machines of the same voltage")
- .addInfo("Processes two items per voltage tier")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front Center")
- .addCasingInfo("Bulk Production Frame", 10)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addInfo("Processes two items per voltage tier").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().beginStructureBlock(3, 3, 3, true).addController("Front Center")
+ .addCasingInfo("Bulk Production Frame", 10).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1)
+ .addInputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+ .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -171,18 +166,16 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
public IStructureDefinition<GT4Entity_AutoCrafter> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GT4Entity_AutoCrafter>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GT4Entity_AutoCrafter.class)
.atLeast(InputBus, OutputBus, InputHatch, Maintenance, Energy, Muffler)
- .casingIndex(TAE.getIndexFromPage(0, 10))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.getIndexFromPage(0, 10)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
.build();
}
@@ -229,8 +222,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
return r;
}
}
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
} else if (this.mMachineMode == MODE.DISASSEMBLY || this.mMachineMode == MODE.CRAFTING) {
return null;
}
@@ -249,16 +241,20 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
mMachineMode = mMachineMode.nextMode();
if (mMachineMode == MODE.CRAFTING) {
PlayerUtils.messagePlayer(
- aPlayer, "Running the Auto-Crafter in mode: " + EnumChatFormatting.AQUA + "AutoCrafting");
+ aPlayer,
+ "Running the Auto-Crafter in mode: " + EnumChatFormatting.AQUA + "AutoCrafting");
} else if (mMachineMode == MODE.ASSEMBLY) {
PlayerUtils.messagePlayer(
- aPlayer, "Running the Auto-Crafter in mode: " + EnumChatFormatting.GREEN + "Assembly");
+ aPlayer,
+ "Running the Auto-Crafter in mode: " + EnumChatFormatting.GREEN + "Assembly");
} else if (mMachineMode == MODE.DISASSEMBLY) {
PlayerUtils.messagePlayer(
- aPlayer, "Running the Auto-Crafter in mode: " + EnumChatFormatting.RED + "Disassembly");
+ aPlayer,
+ "Running the Auto-Crafter in mode: " + EnumChatFormatting.RED + "Disassembly");
} else {
PlayerUtils.messagePlayer(
- aPlayer, "Running the Auto-Crafter in mode: " + EnumChatFormatting.YELLOW + "Circuit Assembly");
+ aPlayer,
+ "Running the Auto-Crafter in mode: " + EnumChatFormatting.YELLOW + "Circuit Assembly");
}
}
// 5.08 support
@@ -287,20 +283,20 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
}
}
- // @Override
- // public boolean checkRecipe(final ItemStack aStack) {
+ // @Override
+ // public boolean checkRecipe(final ItemStack aStack) {
//
- // final long tVoltage = this.getMaxInputVoltage();
- // final byte tTier = this.mTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
+ // final long tVoltage = this.getMaxInputVoltage();
+ // final byte tTier = this.mTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
//
- // if (mMachineMode == MODE.DISASSEMBLY) {
- // return doDisassembly();
- // } else if (mMachineMode == MODE.CRAFTING) {
- // return doCrafting(aStack);
- // } else {
- // return super.checkRecipeGeneric(getMaxParallelRecipes(), 100, 200);
- // }
- // }
+ // if (mMachineMode == MODE.DISASSEMBLY) {
+ // return doDisassembly();
+ // } else if (mMachineMode == MODE.CRAFTING) {
+ // return doCrafting(aStack);
+ // } else {
+ // return super.checkRecipeGeneric(getMaxParallelRecipes(), 100, 200);
+ // }
+ // }
private void setTier() {
long tVoltage = getMaxInputVoltage();
@@ -329,12 +325,17 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
Object[] tempArray = tFluids.toArray(new FluidStack[] {});
FluidStack[] properArray;
- properArray =
- ((tempArray != null && tempArray.length > 0) ? (FluidStack[]) tempArray : new FluidStack[] {});
+ properArray = ((tempArray != null && tempArray.length > 0) ? (FluidStack[]) tempArray
+ : new FluidStack[] {});
// Logger.MACHINE_INFO("4");
if (checkRecipeGeneric(
- tBusItems.toArray(new ItemStack[] {}), properArray, getMaxParallelRecipes(), 100, 200, 10000))
+ tBusItems.toArray(new ItemStack[] {}),
+ properArray,
+ getMaxParallelRecipes(),
+ 100,
+ 200,
+ 10000))
return true;
}
return false;
@@ -441,136 +442,43 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
this.mMaxProgresstime = 0;
return false; // do nothing
/*
- try {
- // Set Crafting input hatch
- if (!doesCrafterHave9SlotInput()) {
- return false;
- }
-
- // Read stored data from encrypted data stick.
- ItemStack storedData_Output[] = NBTUtils.readItemsFromNBT(aStack, "Output");
- ItemStack storedData_Input[] = NBTUtils.readItemsFromNBT(aStack);
- if (storedData_Output != null && storedData_Input != null) {
- ItemStack loadedData[] = new ItemStack[9];
- if (storedData_Input.length >= 1) {
- int number = 0;
- for (ItemStack a : storedData_Input) {
- if (a.getItem() == ModItems.ZZZ_Empty) {
- // Utils.LOG_WARNING("Allocating free memory into crafting manager slot
- // "+number+".");
- loadedData[number] = null;
- } else {
- // Utils.LOG_WARNING("Downloading "+a.getDisplayName()+" into crafting manager
- // slot "+number+".");
- loadedData[number] = a;
- }
- number++;
- }
- }
-
- // Remove inputs here
- ArrayList<ItemStack> mInputArray = new ArrayList<ItemStack>();
- ItemStack allInputs[];
-
- for (GT_MetaTileEntity_Hatch_InputBus x : this.mInputBusses) {
- if (x.mInventory.length > 0) {
- for (ItemStack r : x.mInventory) {
- if (r != null) {
- mInputArray.add(r);
- }
- }
- }
- }
-
- if (mInputArray.isEmpty()) {
- return false;
- } else {
- List<ItemStack> list = mInputArray;
- allInputs = list.toArray(new ItemStack[list.size()]);
-
- if (allInputs != null && allInputs.length > 0) {
-
- this.mEUt = 8 * (1 << this.mTier - 1) * (1 << this.mTier - 1);
- this.mMaxProgresstime = MathUtils.roundToClosestInt((50 - (5
- * MathUtils.randDouble(((this.mTier - 2) <= 0 ? 1 : (this.mTier - 2)), this.mTier))));
-
- Logger.WARNING("MPT: " + mMaxProgresstime + " | " + mEUt);
- this.getBaseMetaTileEntity().setActive(true);
-
- // Setup some vars
- int counter = 0;
-
- ItemStack toUse[] = new ItemStack[9];
-
- outerloop: for (ItemStack inputItem : loadedData) {
- if (inputItem == null) {
- toUse[counter] = null;
- continue outerloop;
- }
- for (ItemStack r : allInputs) {
- if (r != null) {
- // Utils.LOG_WARNING("Input Bus Inventory Iteration - Found:"
- // +r.getDisplayName()+" | "+allInputs.length);
- if (GT_Utility.areStacksEqual(r, inputItem)) {
- if (this.getBaseMetaTileEntity().isServerSide()) {
- toUse[counter] = inputItem;
- counter++;
- continue outerloop;
- }
-
- }
- }
- }
- counter++;
- }
-
- int mCorrectInputs = 0;
- for (ItemStack isValid : toUse) {
- if (isValid == null || this.depleteInput(isValid)) {
- mCorrectInputs++;
- } else {
- Logger.WARNING("Input in Slot " + mCorrectInputs + " was not valid.");
- }
- }
-
- if (this.mTier > 5) {
- this.mMaxProgresstime >>= this.mTier - 5;
- }
- if (this.mEUt > 0)
- this.mEUt = (-this.mEUt);
- this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
- this.mEfficiencyIncrease = 10000;
-
- if (mCorrectInputs == 9) {
- ItemStack mOutputItem = storedData_Output[0];
- NBTUtils.writeItemsToGtCraftingComponents(mOutputItem, loadedData, true);
- this.addOutput(mOutputItem);
- this.updateSlots();
- return true;
- } else {
- return false;
- }
-
- }
- }
- }
- }
- // End Debug
- catch (Throwable t) {
- t.printStackTrace();
- this.mMaxProgresstime = 0;
- }
-
- this.mMaxProgresstime = 0;
- return false;
- */
+ * try { // Set Crafting input hatch if (!doesCrafterHave9SlotInput()) { return false; } // Read stored data
+ * from encrypted data stick. ItemStack storedData_Output[] = NBTUtils.readItemsFromNBT(aStack, "Output");
+ * ItemStack storedData_Input[] = NBTUtils.readItemsFromNBT(aStack); if (storedData_Output != null &&
+ * storedData_Input != null) { ItemStack loadedData[] = new ItemStack[9]; if (storedData_Input.length >= 1) {
+ * int number = 0; for (ItemStack a : storedData_Input) { if (a.getItem() == ModItems.ZZZ_Empty) { //
+ * Utils.LOG_WARNING("Allocating free memory into crafting manager slot // "+number+"."); loadedData[number] =
+ * null; } else { // Utils.LOG_WARNING("Downloading "+a.getDisplayName()+" into crafting manager // slot
+ * "+number+"."); loadedData[number] = a; } number++; } } // Remove inputs here ArrayList<ItemStack> mInputArray
+ * = new ArrayList<ItemStack>(); ItemStack allInputs[]; for (GT_MetaTileEntity_Hatch_InputBus x :
+ * this.mInputBusses) { if (x.mInventory.length > 0) { for (ItemStack r : x.mInventory) { if (r != null) {
+ * mInputArray.add(r); } } } } if (mInputArray.isEmpty()) { return false; } else { List<ItemStack> list =
+ * mInputArray; allInputs = list.toArray(new ItemStack[list.size()]); if (allInputs != null && allInputs.length
+ * > 0) { this.mEUt = 8 * (1 << this.mTier - 1) * (1 << this.mTier - 1); this.mMaxProgresstime =
+ * MathUtils.roundToClosestInt((50 - (5 MathUtils.randDouble(((this.mTier - 2) <= 0 ? 1 : (this.mTier - 2)),
+ * this.mTier)))); Logger.WARNING("MPT: " + mMaxProgresstime + " | " + mEUt);
+ * this.getBaseMetaTileEntity().setActive(true); // Setup some vars int counter = 0; ItemStack toUse[] = new
+ * ItemStack[9]; outerloop: for (ItemStack inputItem : loadedData) { if (inputItem == null) { toUse[counter] =
+ * null; continue outerloop; } for (ItemStack r : allInputs) { if (r != null) { //
+ * Utils.LOG_WARNING("Input Bus Inventory Iteration - Found:" // +r.getDisplayName()+" | "+allInputs.length); if
+ * (GT_Utility.areStacksEqual(r, inputItem)) { if (this.getBaseMetaTileEntity().isServerSide()) { toUse[counter]
+ * = inputItem; counter++; continue outerloop; } } } } counter++; } int mCorrectInputs = 0; for (ItemStack
+ * isValid : toUse) { if (isValid == null || this.depleteInput(isValid)) { mCorrectInputs++; } else {
+ * Logger.WARNING("Input in Slot " + mCorrectInputs + " was not valid."); } } if (this.mTier > 5) {
+ * this.mMaxProgresstime >>= this.mTier - 5; } if (this.mEUt > 0) this.mEUt = (-this.mEUt); this.mEfficiency =
+ * (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; if (mCorrectInputs
+ * == 9) { ItemStack mOutputItem = storedData_Output[0]; NBTUtils.writeItemsToGtCraftingComponents(mOutputItem,
+ * loadedData, true); this.addOutput(mOutputItem); this.updateSlots(); return true; } else { return false; } } }
+ * } } // End Debug catch (Throwable t) { t.printStackTrace(); this.mMaxProgresstime = 0; }
+ * this.mMaxProgresstime = 0; return false;
+ */
}
@Override
public String[] getExtraInfoData() {
final String tRunning = (this.mMaxProgresstime > 0 ? "Auto-Crafter running" : "Auto-Crafter stopped");
- final String tMaintainance =
- (this.getIdealStatus() == this.getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance");
+ final String tMaintainance = (this.getIdealStatus() == this.getRepairStatus() ? "No Maintainance issues"
+ : "Needs Maintainance");
String tSpecialText = "" + (60 + 12 * this.mTier) + "% chance to recover disassembled parts.";
String tMode;
if (mMachineMode == MODE.DISASSEMBLY) {
@@ -588,9 +496,8 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase<GT4Entity
tSpecialText = "Does Auto-Crafter have 9-slot input bus? " + doesCrafterHave9SlotInput();
}
- return new String[] {
- "Large Scale Auto-Asesembler v1.01c", tRunning, tMaintainance, "Mode: " + tMode, tSpecialText
- };
+ return new String[] { "Large Scale Auto-Asesembler v1.01c", tRunning, tMaintainance, "Mode: " + tMode,
+ tSpecialText };
}
private String getMode() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
index 4ba92f8f7e..b9e709e68c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java
@@ -6,10 +6,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.TAE;
@@ -25,11 +32,6 @@ import gtPlusPlus.core.material.MISC_MATERIALS;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Entity_ThermalBoiler>
implements ISurvivalConstructable {
@@ -113,32 +115,32 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
if ((tRecipe.getOutput(0) != null)
&& (getBaseMetaTileEntity().getRandomNumber(loot_MAXCHANCE)
< tRecipe.getOutputChance(0))) {
- this.mOutputItems = new ItemStack[] {GT_Utility.copy(tRecipe.getOutput(0))};
+ this.mOutputItems = new ItemStack[] { GT_Utility.copy(tRecipe.getOutput(0)) };
}
if ((tRecipe.getOutput(1) != null)
&& (getBaseMetaTileEntity().getRandomNumber(loot_MAXCHANCE)
< tRecipe.getOutputChance(1))) {
- this.mOutputItems = new ItemStack[] {GT_Utility.copy(tRecipe.getOutput(1))};
+ this.mOutputItems = new ItemStack[] { GT_Utility.copy(tRecipe.getOutput(1)) };
}
if ((tRecipe.getOutput(2) != null)
&& (getBaseMetaTileEntity().getRandomNumber(loot_MAXCHANCE)
< tRecipe.getOutputChance(2))) {
- this.mOutputItems = new ItemStack[] {GT_Utility.copy(tRecipe.getOutput(2))};
+ this.mOutputItems = new ItemStack[] { GT_Utility.copy(tRecipe.getOutput(2)) };
}
if ((tRecipe.getOutput(3) != null)
&& (getBaseMetaTileEntity().getRandomNumber(loot_MAXCHANCE)
< tRecipe.getOutputChance(3))) {
- this.mOutputItems = new ItemStack[] {GT_Utility.copy(tRecipe.getOutput(3))};
+ this.mOutputItems = new ItemStack[] { GT_Utility.copy(tRecipe.getOutput(3)) };
}
if ((tRecipe.getOutput(4) != null)
&& (getBaseMetaTileEntity().getRandomNumber(loot_MAXCHANCE)
< tRecipe.getOutputChance(4))) {
- this.mOutputItems = new ItemStack[] {GT_Utility.copy(tRecipe.getOutput(4))};
+ this.mOutputItems = new ItemStack[] { GT_Utility.copy(tRecipe.getOutput(4)) };
}
if ((tRecipe.getOutput(5) != null)
&& (getBaseMetaTileEntity().getRandomNumber(loot_MAXCHANCE)
< tRecipe.getOutputChance(5))) {
- this.mOutputItems = new ItemStack[] {GT_Utility.copy(tRecipe.getOutput(5))};
+ this.mOutputItems = new ItemStack[] { GT_Utility.copy(tRecipe.getOutput(5)) };
}
}
// Give Obsidian without Lava Filter
@@ -146,7 +148,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
if ((tRecipe.getOutput(6) != null)
&& (getBaseMetaTileEntity().getRandomNumber(loot_MAXCHANCE)
< tRecipe.getOutputChance(6))) {
- this.mOutputItems = new ItemStack[] {GT_Utility.copy(tRecipe.getOutput(6))};
+ this.mOutputItems = new ItemStack[] { GT_Utility.copy(tRecipe.getOutput(6)) };
}
}
return true;
@@ -234,22 +236,13 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Thermal Boiler Controller")
- .addInfo("Converts Water & Heat into Steam")
- .addInfo("Explodes if water is not supplied")
- .addInfo("Consult user manual for more information")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front Center")
- .addCasingInfo("Thermal Containment Casings", 10)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ tt.addMachineType(getMachineType()).addInfo("Thermal Boiler Controller")
+ .addInfo("Converts Water & Heat into Steam").addInfo("Explodes if water is not supplied")
+ .addInfo("Consult user manual for more information").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().beginStructureBlock(3, 3, 3, true).addController("Front Center")
+ .addCasingInfo("Thermal Containment Casings", 10).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+ .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -273,18 +266,16 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti
public IStructureDefinition<GT4Entity_ThermalBoiler> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GT4Entity_ThermalBoiler>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GT4Entity_ThermalBoiler.class)
.atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Energy, Muffler)
- .casingIndex(TAE.getIndexFromPage(0, 1))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.getIndexFromPage(0, 1)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 11))))
.build();
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java
index cab78ffef4..4b58683a16 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java
@@ -7,8 +7,17 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElement
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Element;
import gregtech.api.enums.Materials;
@@ -30,17 +39,10 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ElementalDataOrbHolder;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase<GregtechMTE_ElementalDuplicator> {
- private final ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder> mReplicatorDataOrbHatches =
- new ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder>();
+ private final ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder> mReplicatorDataOrbHatches = new ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder>();
private static final int CASING_TEXTURE_ID = TAE.getIndexFromPage(0, 3);
private int mCasing = 0;
@@ -65,29 +67,17 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Produces Elemental Material from UU Matter")
- .addInfo("Speed: +100% | EU Usage: 100% | Parallel: 8 * Tier")
- .addInfo("Maximum 1x of each bus/hatch.")
- .addInfo("Does not require both Output Hatch & Bus")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(9, 6, 9, true)
- .addController("Top Center")
- .addCasingInfo("Elemental Confinement Shell", 138)
- .addCasingInfo("Matter Fabricator Casing", 24)
- .addCasingInfo("Particle Containment Casing", 24)
- .addCasingInfo("Matter Generation Coil", 24)
- .addCasingInfo("High Voltage Current Capacitor", 20)
- .addCasingInfo("Resonance Chamber III", 24)
- .addCasingInfo("Modulator III", 16)
- .addOtherStructurePart("Data Orb Repository", "1x", 1)
- .addInputHatch("Any 1 dot hint", 1)
- .addOutputBus("Any 1 dot hint", 1)
- .addOutputHatch("Any 1 dot hint", 1)
- .addEnergyHatch("Any 1 dot hint", 1)
- .addMaintenanceHatch("Any 1 dot hint", 1)
- .addMufflerHatch("Any 1 dot hint", 1)
+ tt.addMachineType(getMachineType()).addInfo("Produces Elemental Material from UU Matter")
+ .addInfo("Speed: +100% | EU Usage: 100% | Parallel: 8 * Tier").addInfo("Maximum 1x of each bus/hatch.")
+ .addInfo("Does not require both Output Hatch & Bus").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().beginStructureBlock(9, 6, 9, true).addController("Top Center")
+ .addCasingInfo("Elemental Confinement Shell", 138).addCasingInfo("Matter Fabricator Casing", 24)
+ .addCasingInfo("Particle Containment Casing", 24).addCasingInfo("Matter Generation Coil", 24)
+ .addCasingInfo("High Voltage Current Capacitor", 20).addCasingInfo("Resonance Chamber III", 24)
+ .addCasingInfo("Modulator III", 16).addOtherStructurePart("Data Orb Repository", "1x", 1)
+ .addInputHatch("Any 1 dot hint", 1).addOutputBus("Any 1 dot hint", 1)
+ .addOutputHatch("Any 1 dot hint", 1).addEnergyHatch("Any 1 dot hint", 1)
+ .addMaintenanceHatch("Any 1 dot hint", 1).addMufflerHatch("Any 1 dot hint", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -112,74 +102,21 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
// f = Resonance III
// g = Modulator III
- .addShape(STRUCTURE_PIECE_MAIN, (new String[][] {
- {
- " ccc ",
- " ccccc ",
- " ccccccc ",
- "ccchhhccc",
- "ccch~hccc",
- "ccchhhccc",
- " ccccccc ",
- " ccccc ",
- " ccc "
- },
- {
- " cac ",
- " abfba ",
- " abfgfba ",
- "cbfgdgfbc",
- "afgdddgfa",
- "cbfgdgfbc",
- " abfgfba ",
- " abfba ",
- " cac "
- },
- {
- " cec ",
- " e e ",
- " e e ",
- "c d c",
- "e ddd e",
- "c d c",
- " e e ",
- " e e ",
- " cec "
- },
- {
- " cec ",
- " e e ",
- " e e ",
- "c d c",
- "e ddd e",
- "c d c",
- " e e ",
- " e e ",
- " cec "
- },
- {
- " cac ",
- " abfba ",
- " abfgfba ",
- "cbfgdgfbc",
- "afgdddgfa",
- "cbfgdgfbc",
- " abfgfba ",
- " abfba ",
- " cac "
- },
- {
- " ccc ",
- " ccccc ",
- " ccccccc ",
- "ccchhhccc",
- "ccchhhccc",
- "ccchhhccc",
- " ccccccc ",
- " ccccc ",
- " ccc "
- },
- }))
+ .addShape(
+ STRUCTURE_PIECE_MAIN,
+ (new String[][] {
+ { " ccc ", " ccccc ", " ccccccc ", "ccchhhccc", "ccch~hccc", "ccchhhccc",
+ " ccccccc ", " ccccc ", " ccc " },
+ { " cac ", " abfba ", " abfgfba ", "cbfgdgfbc", "afgdddgfa", "cbfgdgfbc",
+ " abfgfba ", " abfba ", " cac " },
+ { " cec ", " e e ", " e e ", "c d c", "e ddd e", "c d c",
+ " e e ", " e e ", " cec " },
+ { " cec ", " e e ", " e e ", "c d c", "e ddd e", "c d c",
+ " e e ", " e e ", " cec " },
+ { " cac ", " abfba ", " abfgfba ", "cbfgdgfbc", "afgdddgfa", "cbfgdgfbc",
+ " abfgfba ", " abfba ", " cac " },
+ { " ccc ", " ccccc ", " ccccccc ", "ccchhhccc", "ccchhhccc", "ccchhhccc",
+ " ccccccc ", " ccccc ", " ccc " }, }))
.addElement('a', ofBlock(getCasingBlock4(), getCasingMeta6()))
.addElement('b', ofBlock(getCasingBlock4(), getCasingMeta7()))
.addElement('d', ofBlock(getCasingBlock2(), getCasingMeta2()))
@@ -187,22 +124,26 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
.addElement('f', ofBlock(getCasingBlock3(), getCasingMeta4()))
.addElement('g', ofBlock(getCasingBlock3(), getCasingMeta5()))
.addElement(
- 'c', lazy(t -> onElementPass(x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
+ 'c',
+ lazy(t -> onElementPass(x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
.addElement(
'h',
- lazy(t -> ofChain(
- buildHatchAdder(GregtechMTE_ElementalDuplicator.class)
- .atLeast(InputHatch, OutputBus, OutputHatch, Maintenance, Muffler, Energy)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .build(),
- buildHatchAdder(GregtechMTE_ElementalDuplicator.class)
- .hatchClass(GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.class)
- .adder(GregtechMTE_ElementalDuplicator::addDataOrbHatch)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .build(),
- onElementPass(x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta())))))
+ lazy(
+ t -> ofChain(
+ buildHatchAdder(GregtechMTE_ElementalDuplicator.class).atLeast(
+ InputHatch,
+ OutputBus,
+ OutputHatch,
+ Maintenance,
+ Muffler,
+ Energy).casingIndex(getCasingTextureIndex()).dot(1).build(),
+ buildHatchAdder(GregtechMTE_ElementalDuplicator.class)
+ .hatchClass(GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.class)
+ .adder(GregtechMTE_ElementalDuplicator::addDataOrbHatch)
+ .casingIndex(getCasingTextureIndex()).dot(1).build(),
+ onElementPass(
+ x -> ++x.mCasing,
+ ofBlock(getCasingBlock(), getCasingMeta())))))
.build();
}
return STRUCTURE_DEFINITION;
@@ -217,8 +158,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
mCasing = 0;
boolean aDidBuild = checkPiece(STRUCTURE_PIECE_MAIN, 4, 4, 0);
- if (this.mInputHatches.size() != 1
- || (this.mOutputBusses.size() != 1 && this.mOutputHatches.size() != 0)
+ if (this.mInputHatches.size() != 1 || (this.mOutputBusses.size() != 1 && this.mOutputHatches.size() != 0)
|| this.mEnergyHatches.size() != 1
|| this.mReplicatorDataOrbHatches.size() != 1) {
return false;
@@ -324,14 +264,8 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll,
- GT_Recipe aRecipe) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) {
// Based on the Processing Array. A bit overkill, but very flexible.
// Reset outputs and progress stats
@@ -346,8 +280,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
try {
ItemStack aDataOrbStack = null;
- recipe:
- for (GT_Recipe nRecipe : this.getRecipeMap().mRecipeList) {
+ recipe: for (GT_Recipe nRecipe : this.getRecipeMap().mRecipeList) {
// log("Checking Recipe for: "+(nRecipe.mOutputs.length > 0 && nRecipe.mOutputs[0] != null ?
// nRecipe.mOutputs[0].getDisplayName() : nRecipe.mFluidOutputs[0].getLocalizedName()));
ItemStack aTempStack = getSpecialSlotStack(nRecipe);
@@ -455,24 +388,21 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
/**
* finds a Recipe matching the aFluid and ItemStack Inputs.
*
- * @param aTileEntity an Object representing the current coordinates of the executing Block/Entity/Whatever. This may be null, especially during Startup.
- * @param aRecipe in case this is != null it will try to use this Recipe first when looking things up.
- * @param aNotUnificated if this is T the Recipe searcher will unificate the ItemStack Inputs
- * @param aDontCheckStackSizes if set to false will only return recipes that can be executed at least once with the provided input
- * @param aVoltage Voltage of the Machine or Long.MAX_VALUE if it has no Voltage
- * @param aFluids the Fluid Inputs
- * @param aSpecialSlot the content of the Special Slot, the regular Manager doesn't do anything with this, but some custom ones do.
- * @param aInputs the Item Inputs
+ * @param aTileEntity an Object representing the current coordinates of the executing
+ * Block/Entity/Whatever. This may be null, especially during Startup.
+ * @param aRecipe in case this is != null it will try to use this Recipe first when looking things up.
+ * @param aNotUnificated if this is T the Recipe searcher will unificate the ItemStack Inputs
+ * @param aDontCheckStackSizes if set to false will only return recipes that can be executed at least once with the
+ * provided input
+ * @param aVoltage Voltage of the Machine or Long.MAX_VALUE if it has no Voltage
+ * @param aFluids the Fluid Inputs
+ * @param aSpecialSlot the content of the Special Slot, the regular Manager doesn't do anything with this,
+ * but some custom ones do.
+ * @param aInputs the Item Inputs
* @return the Recipe it has found or null for no matching Recipe
*/
- public GT_Recipe findRecipe(
- IHasWorldObjectAndCoords aTileEntity,
- GT_Recipe aRecipe,
- boolean aNotUnificated,
- boolean aDontCheckStackSizes,
- long aVoltage,
- FluidStack[] aFluids,
- ItemStack aSpecialSlot,
+ public GT_Recipe findRecipe(IHasWorldObjectAndCoords aTileEntity, GT_Recipe aRecipe, boolean aNotUnificated,
+ boolean aDontCheckStackSizes, long aVoltage, FluidStack[] aFluids, ItemStack aSpecialSlot,
ItemStack... aInputs) {
GT_Recipe_Map mRecipeMap = this.getRecipeMap();
@@ -508,8 +438,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
// Check the Recipe which has been used last time in order to not have to search for it again, if possible.
if (aRecipe != null) {
ItemStack aRecipeSpecial = getSpecialSlotStack(aRecipe);
- if (!aRecipe.mFakeRecipe
- && aRecipe.mCanBeBuffered
+ if (!aRecipe.mFakeRecipe && aRecipe.mCanBeBuffered
&& aRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)
&& GT_Utility.areStacksEqual(aRecipeSpecial, aSpecialSlot, false)
&& areDataOrbsEqual(aRecipeSpecial, aSpecialSlot)) {
@@ -518,61 +447,51 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
}
// Now look for the Recipes inside the Item HashMaps, but only when the Recipes usually have Items.
- if (mRecipeMap.mUsualInputCount > 0 && aInputs != null)
- for (ItemStack tStack : aInputs)
- if (tStack != null) {
- Collection<GT_Recipe> tRecipes = mRecipeMap.mRecipeItemMap.get(new GT_ItemStack(tStack));
- if (tRecipes != null) {
- for (GT_Recipe tRecipe : tRecipes) {
- if (!tRecipe.mFakeRecipe
- && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- ItemStack aRecipeSpecial = getSpecialSlotStack(tRecipe);
- if (GT_Utility.areStacksEqual(aRecipeSpecial, aSpecialSlot, false)
- && areDataOrbsEqual(aRecipeSpecial, aSpecialSlot)) {
- return tRecipe.mEnabled && aVoltage * mRecipeMap.mAmperage >= tRecipe.mEUt
- ? tRecipe
- : null;
- }
- }
- tRecipes = mRecipeMap.mRecipeItemMap.get(new GT_ItemStack(tStack, true));
+ if (mRecipeMap.mUsualInputCount > 0 && aInputs != null) for (ItemStack tStack : aInputs) if (tStack != null) {
+ Collection<GT_Recipe> tRecipes = mRecipeMap.mRecipeItemMap.get(new GT_ItemStack(tStack));
+ if (tRecipes != null) {
+ for (GT_Recipe tRecipe : tRecipes) {
+ if (!tRecipe.mFakeRecipe
+ && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
+ ItemStack aRecipeSpecial = getSpecialSlotStack(tRecipe);
+ if (GT_Utility.areStacksEqual(aRecipeSpecial, aSpecialSlot, false)
+ && areDataOrbsEqual(aRecipeSpecial, aSpecialSlot)) {
+ return tRecipe.mEnabled && aVoltage * mRecipeMap.mAmperage >= tRecipe.mEUt ? tRecipe : null;
}
}
- if (tRecipes != null) {
- for (GT_Recipe tRecipe : tRecipes) {
- if (!tRecipe.mFakeRecipe
- && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- ItemStack aRecipeSpecial = getSpecialSlotStack(tRecipe);
- if (GT_Utility.areStacksEqual(aRecipeSpecial, aSpecialSlot, false)
- && areDataOrbsEqual(aRecipeSpecial, aSpecialSlot)) {
- return tRecipe.mEnabled && aVoltage * mRecipeMap.mAmperage >= tRecipe.mEUt
- ? tRecipe
- : null;
- }
- }
+ tRecipes = mRecipeMap.mRecipeItemMap.get(new GT_ItemStack(tStack, true));
+ }
+ }
+ if (tRecipes != null) {
+ for (GT_Recipe tRecipe : tRecipes) {
+ if (!tRecipe.mFakeRecipe
+ && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
+ ItemStack aRecipeSpecial = getSpecialSlotStack(tRecipe);
+ if (GT_Utility.areStacksEqual(aRecipeSpecial, aSpecialSlot, false)
+ && areDataOrbsEqual(aRecipeSpecial, aSpecialSlot)) {
+ return tRecipe.mEnabled && aVoltage * mRecipeMap.mAmperage >= tRecipe.mEUt ? tRecipe : null;
}
}
}
+ }
+ }
// If the minimal Amount of Items for the Recipe is 0, then it could be a Fluid-Only Recipe, so check that Map
// too.
if (mRecipeMap.mMinimalInputItems == 0 && aFluids != null)
- for (FluidStack aFluid : aFluids)
- if (aFluid != null) {
- Collection<GT_Recipe> tRecipes = mRecipeMap.mRecipeFluidMap.get(aFluid.getFluid());
- if (tRecipes != null)
- for (GT_Recipe tRecipe : tRecipes) {
- if (!tRecipe.mFakeRecipe
- && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- ItemStack aRecipeSpecial = getSpecialSlotStack(tRecipe);
- if (GT_Utility.areStacksEqual(aRecipeSpecial, aSpecialSlot, false)
- && areDataOrbsEqual(aRecipeSpecial, aSpecialSlot)) {
- return tRecipe.mEnabled && aVoltage * mRecipeMap.mAmperage >= tRecipe.mEUt
- ? tRecipe
- : null;
- }
- }
+ for (FluidStack aFluid : aFluids) if (aFluid != null) {
+ Collection<GT_Recipe> tRecipes = mRecipeMap.mRecipeFluidMap.get(aFluid.getFluid());
+ if (tRecipes != null) for (GT_Recipe tRecipe : tRecipes) {
+ if (!tRecipe.mFakeRecipe
+ && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
+ ItemStack aRecipeSpecial = getSpecialSlotStack(tRecipe);
+ if (GT_Utility.areStacksEqual(aRecipeSpecial, aSpecialSlot, false)
+ && areDataOrbsEqual(aRecipeSpecial, aSpecialSlot)) {
+ return tRecipe.mEnabled && aVoltage * mRecipeMap.mAmperage >= tRecipe.mEUt ? tRecipe : null;
}
+ }
}
+ }
// And nothing has been found.
return null;
@@ -591,12 +510,8 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase
private static boolean areDataOrbsEqual(ItemStack aOrb1, ItemStack aOrb2) {
if (aOrb1 != null && aOrb2 != null) {
- Materials tMaterial1 = Element.get(Behaviour_DataOrb.getDataName(aOrb1))
- .mLinkedMaterials
- .get(0);
- Materials tMaterial2 = Element.get(Behaviour_DataOrb.getDataName(aOrb2))
- .mLinkedMaterials
- .get(0);
+ Materials tMaterial1 = Element.get(Behaviour_DataOrb.getDataName(aOrb1)).mLinkedMaterials.get(0);
+ Materials tMaterial2 = Element.get(Behaviour_DataOrb.getDataName(aOrb2)).mLinkedMaterials.get(0);
if (tMaterial1.equals(tMaterial2)) {
return true;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java
index 69d93ce06d..62552ad7c8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java
@@ -1,208 +1,48 @@
/*
-package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
-
-
-public class GregtechMTE_FastNeutronReactor
-extends GregtechMeta_MultiBlockBase
-{
-
- private int mSuperEfficencyIncrease = 0;
-
-
- public GregtechMTE_FastNeutronReactor(int aID, String aName, String aNameRegional)
- {
- super(aID, aName, aNameRegional);
- }
-
- public GregtechMTE_FastNeutronReactor(String mName) {
- super(mName);
- }
-
- @Override
- public String getMachineType() {
- return "Reactor";
- }
-
- @Override
- public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
- {
- return new GregtechMTE_FastNeutronReactor(this.mName);
- }
- @Override
- public boolean isFacingValid(byte aFacing)
- {
- return aFacing > 1;
- }
-
- @Override
- public boolean isCorrectMachinePart(ItemStack aStack)
- {
- return true;
- }
-
- @Override
- public int getDamageToComponent(ItemStack aStack){
- return 0;
- }
-
- @Override
- public boolean checkRecipe(final ItemStack aStack) {
- this.mSuperEfficencyIncrease=0;
- if (processing_Stage_1()) {
- if (processing_Stage_2()) {
- if (processing_Stage_3()) {
- if (processing_Stage_4()) {
-
- }
- else {
- //Stage 4
- }
- }
- else {
- //Stage 3
- }
- }
- else {
- //Stage 2
- }
- }
- else {
- //Stage 1
- }
- return false;
- }
-
- @Override
- public int getMaxParallelRecipes() {
- return 1;
- }
-
- @Override
- public int getEuDiscountForParallelism() {
- return 0;
- }
-
- public boolean processing_Stage_1() { //Deplete Water, Add More Progress Time
- for (GT_MetaTileEntity_Hatch_Input tRecipe : this.mInputHatches) {
- if (tRecipe.getFluid() != null){
- FluidStack tFluid = FluidUtils.getFluidStack(tRecipe.getFluid(), 200);
- if (tFluid != null) {
- if (tFluid == GT_ModHandler.getDistilledWater(1)) {
- if (depleteInput(tFluid)) {
- this.mMaxProgresstime = Math.max(1, runtimeBoost(8 * 2));
- this.mEUt = getEUt();
- this.mEfficiencyIncrease = (this.mMaxProgresstime * getEfficiencyIncrease());
- return true;
- }
- }
-
- }
- }
- }
- this.mMaxProgresstime = 0;
- this.mEUt = 0;
- return false;
- }
- public boolean processing_Stage_2() {
- return false;
- }
- public boolean processing_Stage_3() {
- return false;
- }
- public boolean processing_Stage_4() {
- return false;
- }
-
- @Override
- public boolean onRunningTick(ItemStack aStack) {
- if (this.mEUt > 0) {
- if(this.mSuperEfficencyIncrease>0){
- this.mEfficiency = Math.min(10000, this.mEfficiency + this.mSuperEfficencyIncrease);
- }
- int tGeneratedEU = (int) (this.mEUt * 2L * this.mEfficiency / 10000L);
- if (tGeneratedEU > 0) {
- long amount = (tGeneratedEU + 160) / 160;
- if (!depleteInput(GT_ModHandler.getDistilledWater(amount))) {
- explodeMultiblock();
- } else {
- addOutput(GT_ModHandler.getSteam(tGeneratedEU));
- }
- }
- return true;
- }
- return true;
- }
-
- public int getEUt() {
- return 0; //Default 400
- }
-
- public int getEfficiencyIncrease() {
- return 0; //Default 12
- }
-
- int runtimeBoost(int mTime) {
- return mTime * 150 / 100;
- }
-
- @Override
- public boolean explodesOnComponentBreak(ItemStack aStack)
- {
- return true;
- }
-
- @Override
- public int getMaxEfficiency(ItemStack aStack)
- {
- return 10000;
- }
-
- @Override
- public int getPollutionPerTick(ItemStack aStack)
- {
- return 0;
- }
-
- public int getAmountOfOutputs()
- {
- return 1;
- }
-
- @Override
- public String[] getTooltip()
- {
- return new String[]{
- "Fukushima-Daiichi Reactor No. 6",
- "------------------------------------------",
- "Boiling Water Reactor",
- "Harness the power of Nuclear Fission",
- "------------------------------------------",
- "Consult user manual for more information",
- };
- }
-
- @Override
- public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
- if (aSide == aFacing) {
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(1)),
- new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)};
- }
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(1))};
- }
-
- @Override
- public boolean checkMultiblock(IGregTechTileEntity aBaseMetaTileEntity, ItemStack arg1) {
- return true;
- }
-
- public boolean damageFilter(){
- return false;
- }
-
- @Override
- public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
- super.onPostTick(aBaseMetaTileEntity, aTick);
- }
-
-}
-*/
+ * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; public class
+ * GregtechMTE_FastNeutronReactor extends GregtechMeta_MultiBlockBase { private int mSuperEfficencyIncrease = 0; public
+ * GregtechMTE_FastNeutronReactor(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); }
+ * public GregtechMTE_FastNeutronReactor(String mName) { super(mName); }
+ * @Override public String getMachineType() { return "Reactor"; }
+ * @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new
+ * GregtechMTE_FastNeutronReactor(this.mName); }
+ * @Override public boolean isFacingValid(byte aFacing) { return aFacing > 1; }
+ * @Override public boolean isCorrectMachinePart(ItemStack aStack) { return true; }
+ * @Override public int getDamageToComponent(ItemStack aStack){ return 0; }
+ * @Override public boolean checkRecipe(final ItemStack aStack) { this.mSuperEfficencyIncrease=0; if
+ * (processing_Stage_1()) { if (processing_Stage_2()) { if (processing_Stage_3()) { if (processing_Stage_4()) { } else {
+ * //Stage 4 } } else { //Stage 3 } } else { //Stage 2 } } else { //Stage 1 } return false; }
+ * @Override public int getMaxParallelRecipes() { return 1; }
+ * @Override public int getEuDiscountForParallelism() { return 0; } public boolean processing_Stage_1() { //Deplete
+ * Water, Add More Progress Time for (GT_MetaTileEntity_Hatch_Input tRecipe : this.mInputHatches) { if
+ * (tRecipe.getFluid() != null){ FluidStack tFluid = FluidUtils.getFluidStack(tRecipe.getFluid(), 200); if (tFluid !=
+ * null) { if (tFluid == GT_ModHandler.getDistilledWater(1)) { if (depleteInput(tFluid)) { this.mMaxProgresstime =
+ * Math.max(1, runtimeBoost(8 * 2)); this.mEUt = getEUt(); this.mEfficiencyIncrease = (this.mMaxProgresstime *
+ * getEfficiencyIncrease()); return true; } } } } } this.mMaxProgresstime = 0; this.mEUt = 0; return false; } public
+ * boolean processing_Stage_2() { return false; } public boolean processing_Stage_3() { return false; } public boolean
+ * processing_Stage_4() { return false; }
+ * @Override public boolean onRunningTick(ItemStack aStack) { if (this.mEUt > 0) { if(this.mSuperEfficencyIncrease>0){
+ * this.mEfficiency = Math.min(10000, this.mEfficiency + this.mSuperEfficencyIncrease); } int tGeneratedEU = (int)
+ * (this.mEUt * 2L * this.mEfficiency / 10000L); if (tGeneratedEU > 0) { long amount = (tGeneratedEU + 160) / 160; if
+ * (!depleteInput(GT_ModHandler.getDistilledWater(amount))) { explodeMultiblock(); } else {
+ * addOutput(GT_ModHandler.getSteam(tGeneratedEU)); } } return true; } return true; } public int getEUt() { return 0;
+ * //Default 400 } public int getEfficiencyIncrease() { return 0; //Default 12 } int runtimeBoost(int mTime) { return
+ * mTime * 150 / 100; }
+ * @Override public boolean explodesOnComponentBreak(ItemStack aStack) { return true; }
+ * @Override public int getMaxEfficiency(ItemStack aStack) { return 10000; }
+ * @Override public int getPollutionPerTick(ItemStack aStack) { return 0; } public int getAmountOfOutputs() { return 1;
+ * }
+ * @Override public String[] getTooltip() { return new String[]{ "Fukushima-Daiichi Reactor No. 6",
+ * "------------------------------------------", "Boiling Water Reactor", "Harness the power of Nuclear Fission",
+ * "------------------------------------------", "Consult user manual for more information", }; }
+ * @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte
+ * aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { if (aSide == aFacing) { return new
+ * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(1)), new GT_RenderedTexture(aActive ?
+ * Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE :
+ * Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; } return new
+ * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(1))}; }
+ * @Override public boolean checkMultiblock(IGregTechTileEntity aBaseMetaTileEntity, ItemStack arg1) { return true; }
+ * public boolean damageFilter(){ return false; }
+ * @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+ * super.onPostTick(aBaseMetaTileEntity, aTick); } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java
index b27f3d6b25..96cd2d74e7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java
@@ -5,10 +5,18 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElement
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.Objects;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.Constants;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -24,11 +32,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.helpers.FlotationRecipeHandler;
-import java.util.Objects;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.Constants;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<GregtechMTE_FrothFlotationCell>
implements ISurvivalConstructable {
@@ -57,21 +60,13 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Process that milled ore!")
+ tt.addMachineType(getMachineType()).addInfo("Process that milled ore!")
.addInfo("You can only ever process one type of material per controller")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(7, 9, 7, true)
- .addController("Front Center")
- .addCasingInfo("Inconel Reinforced Casing", 68)
- .addCasingInfo("Flotation Casing", 52)
- .addInputBus("Bottom Casing", 1)
- .addInputHatch("Bottom Casing", 1)
- .addOutputHatch("Bottom Casing", 1)
- .addEnergyHatch("Bottom Casing", 1)
- .addMaintenanceHatch("Bottom Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(7, 9, 7, true)
+ .addController("Front Center").addCasingInfo("Inconel Reinforced Casing", 68)
+ .addCasingInfo("Flotation Casing", 52).addInputBus("Bottom Casing", 1).addInputHatch("Bottom Casing", 1)
+ .addOutputHatch("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1)
+ .addMaintenanceHatch("Bottom Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -113,29 +108,25 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
@Override
public IStructureDefinition<GregtechMTE_FrothFlotationCell> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_FrothFlotationCell>builder()
- .addShape(mName, new String[][] {
- {" ", " ", " X ", " X~X ", " X ", " ", " "},
- {" ", " F ", " FFF ", " FF FF ", " FFF ", " F ", " "},
- {" ", " F ", " F F ", " F F ", " F F ", " F ", " "},
- {" ", " F ", " F F ", " F F ", " F F ", " F ", " "},
- {" ", " F ", " F F ", " F F ", " F F ", " F ", " "},
- {" ", " F ", " F F ", " F F ", " F F ", " F ", " "},
- {" ", " F ", " F F ", " F F ", " F F ", " F ", " "},
- {" CCC ", " CCCCC ", "CCCCCCC", "CCCCCCC", "CCCCCCC", " CCCCC ", " CCC "},
- {" CCC ", " CCCCC ", "CCCCCCC", "CCCCCCC", "CCCCCCC", " CCCCC ", " CCC "},
- })
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_FrothFlotationCell>builder().addShape(
+ mName,
+ new String[][] { { " ", " ", " X ", " X~X ", " X ", " ", " " },
+ { " ", " F ", " FFF ", " FF FF ", " FFF ", " F ", " " },
+ { " ", " F ", " F F ", " F F ", " F F ", " F ", " " },
+ { " ", " F ", " F F ", " F F ", " F F ", " F ", " " },
+ { " ", " F ", " F F ", " F F ", " F F ", " F ", " " },
+ { " ", " F ", " F F ", " F F ", " F F ", " F ", " " },
+ { " ", " F ", " F F ", " F F ", " F F ", " F ", " " },
+ { " CCC ", " CCCCC ", "CCCCCCC", "CCCCCCC", "CCCCCCC", " CCCCC ", " CCC " },
+ { " CCC ", " CCCCC ", "CCCCCCC", "CCCCCCC", "CCCCCCC", " CCCCC ", " CCC " }, })
.addElement(
'C',
buildHatchAdder(GregtechMTE_FrothFlotationCell.class)
.atLeast(InputBus, InputHatch, OutputHatch, Maintenance, Energy)
- .casingIndex(getCasingTextureId())
- .dot(1)
- .buildAndChain(
+ .casingIndex(getCasingTextureId()).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings3Misc, 1))))
.addElement('F', ofBlock(ModBlocks.blockSpecialMultiCasings, 9))
- .addElement('X', ofBlock(ModBlocks.blockCasings3Misc, 1))
- .build();
+ .addElement('X', ofBlock(ModBlocks.blockCasings3Misc, 1)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -198,14 +189,8 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll,
- GT_Recipe aRecipe) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) {
// Based on the Processing Array. A bit overkill, but very flexible.
// Reset outputs and progress stats
@@ -233,15 +218,11 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
}
/*
- *
- * Material checks
- * Makes sure we can only ever use one type of material in this flotation cell.
- * We used to depend on Alk's hash, but it's unreliable and user-hostile
- * So we're using unlocalized name of material now.
- *
+ * Material checks Makes sure we can only ever use one type of material in this flotation cell. We used to
+ * depend on Alk's hash, but it's unreliable and user-hostile So we're using unlocalized name of material now.
*/
- Material foundMaterial =
- FlotationRecipeHandler.getMaterialOfMilledProduct(FlotationRecipeHandler.findMilledStack(tRecipe));
+ Material foundMaterial = FlotationRecipeHandler
+ .getMaterialOfMilledProduct(FlotationRecipeHandler.findMilledStack(tRecipe));
String foundMaterialName = null;
if (foundMaterial != null) {
foundMaterialName = foundMaterial.getUnlocalizedName();
@@ -303,6 +284,6 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase<
@Override
public String[] getExtraInfoData() {
- return new String[] {"Locked material: " + lockedMaterialName};
+ return new String[] { "Locked material: " + lockedMaterialName };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java
index 92b3729cc2..92025a337f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java
@@ -1,461 +1,164 @@
/*
-package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
-
-
-public class GregtechMTE_LargeNaqReactor extends GregtechMeta_MultiBlockBase {
-
- public ArrayList<GT_MetaTileEntity_Hatch_Naquadah> mNaqHatches = new ArrayList<GT_MetaTileEntity_Hatch_Naquadah>();
- public static String[] mCasingName = new String[5];
- public static String mHatchName = "Naquadah Fuel Hatch";
-
- private final int CASING_TEXTURE_ID = TAE.getIndexFromPage(0, 13);
- private final int META_BaseCasing = 0; //4
- private final int META_ContainmentCasing = 15; //3
- private final int META_Shielding = 13; //1
- private final int META_PipeCasing = 1; //4
- private final int META_IntegralCasing = 6; //0
- private final int META_ContainmentChamberCasing = 2; //4
-
- public GregtechMTE_LargeNaqReactor(int aID, String aName, String aNameRegional) {
- super(aID, aName, aNameRegional);
- mCasingName[0] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 0);
- mCasingName[1] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 1);
- mCasingName[2] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 2);
- mCasingName[3] = LangUtils.getLocalizedNameOfBlock(getCasing(3), 15);
- mCasingName[4] = LangUtils.getLocalizedNameOfBlock(getCasing(1), 13);
- mHatchName = LangUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 969);
- }
-
- public GregtechMTE_LargeNaqReactor(String aName) {
- super(aName);
- }
-
- public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GregtechMTE_LargeNaqReactor(this.mName);
- }
-
- public String[] getTooltip() {
- if (mCasingName[0].toLowerCase().contains(".name")) {
- mCasingName[0] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 0);
- }
- if (mCasingName[1].toLowerCase().contains(".name")) {
- mCasingName[1] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 1);
- }
- if (mCasingName[2].toLowerCase().contains(".name")) {
- mCasingName[2] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 2);
- }
- if (mCasingName[3].toLowerCase().contains(".name")) {
- mCasingName[3] = LangUtils.getLocalizedNameOfBlock(getCasing(3), 15);
- }
- if (mCasingName[4].toLowerCase().contains(".name")) {
- mCasingName[4] = LangUtils.getLocalizedNameOfBlock(getCasing(1), 13);
- }
- if (mHatchName.toLowerCase().contains(".name")) {
- mHatchName = LangUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 969);
- }
- return new String[]{
- "Naquadah reacts violently with potassium, ",
- "resulting in massive explosions with radioactive potential.",
- "Size: 3x4x12, WxHxL",
- "Bottom Layer: "+mCasingName[0]+"s, (30x min)",
- "Middle Layer: "+mCasingName[2]+"s (10x), with",
- " "+mCasingName[3]+"s on either side",
- " "+mCasingName[3]+"s also on each end (x26)",
- "Middle Layer2: "+mCasingName[1]+" (12x total), with",
- " "+mCasingName[4]+"s on either side (x24)",
- "Top: Single row of "+mCasingName[0]+" along the middle (x12) ",
- "",
- "1x " + mHatchName + " (Any bottom layer casing)",
- "1x " + "Maintenance Hatch" + " (Any bottom layer side casing)",
- "1x " + "Energy Hatch" + " (Any top layer casing)",
-
- };
- }
-
- public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
- boolean aActive, boolean aRedstone) {
- return aSide == aFacing
- ? new ITexture[]{BlockIcons.getCasingTextureForId(TAE.getIndexFromPage(3, 0)),
- new GT_RenderedTexture(aActive
- ? TexturesGtBlock.Overlay_Machine_Controller_Default_Active
- : TexturesGtBlock.Overlay_Machine_Controller_Default)}
- : new ITexture[]{BlockIcons.getCasingTextureForId(TAE.getIndexFromPage(3, 0))};
- }
-
- public GT_Recipe_Map getRecipeMap() {
- return null;
- }
-
- public boolean isCorrectMachinePart(ItemStack aStack) {
- return true;
- }
-
- public boolean isFacingValid(byte aFacing) {
- return aFacing == 1;
- }
-
- public boolean checkRecipe(ItemStack aStack) {
- return false;
- }
-
- @Override
- public int getMaxParallelRecipes() {
- return 1;
- }
-
- @Override
- public int getEuDiscountForParallelism() {
- return 0;
- }
-
- public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
- super.startSoundLoop(aIndex, aX, aY, aZ);
- if (aIndex == 20) {
- GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(212)), 10, 1.0F, aX, aY,
- aZ);
- }
- }
-
- @Override
- public String getSound() {
- return (String) GregTech_API.sSoundList.get(Integer.valueOf(212));
- }
-
- private Block getCasing(int casingID) {
- if (casingID == 1) {
- return ModBlocks.blockCasingsMisc;
- }
- else if (casingID == 2) {
- return ModBlocks.blockCasings2Misc;
- }
- else if (casingID == 3) {
- return ModBlocks.blockCasings3Misc;
- }
- else if (casingID == 4) {
- return ModBlocks.blockCasings4Misc;
- }
- else {
- return ModBlocks.blockCasingsTieredGTPP;
- }
- }
-
-
-
- //Casing3, Meta 10 - "Grate Machine Casing");
- //Casing2, Meta 0 - "Solid Steel Machine Casing"
- //Casing2, Meta 5 - "Assembling Line Casing"
- //Casing2, Meta 9 - "Assembler Machine Casing"
- //Magic Glass - blockAlloyGlass
-
- public boolean checkMultiblock(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
- int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 4;
- int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 4;
-
- // Counts for all Casing Types
- int aBaseCasingCount = 0;
- int aContainmentCasingCount = 0;
- int aShieldingCount = 0;
- int aPipeCount = 0;
- int aIntegralCasingCount = 0;
- int aContainmentChamberCount = 0;
-
- // Bottom Layer
- aBaseCasingCount += checkEntireLayer(aBaseMetaTileEntity, getCasing(4), META_BaseCasing, -7, xDir, zDir);
- log("Bottom Layer is Valid. Moving to Layer 1.");
-
- // Layer 1
- aShieldingCount += checkOuterRing(aBaseMetaTileEntity, getCasing(1), this.META_Shielding, -6, xDir, zDir);
- aIntegralCasingCount += checkIntegralRing(aBaseMetaTileEntity, getCasing(0), this.META_IntegralCasing, -6, xDir, zDir);
- aContainmentChamberCount += checkContainmentRing(aBaseMetaTileEntity, getCasing(4), this.META_ContainmentChamberCasing, -6, xDir, zDir);
- log("Layer 1 is Valid. Moving to Layer 2.");
-
- // Layer 2
- aShieldingCount += checkOuterRing(aBaseMetaTileEntity, getCasing(1), this.META_Shielding, -5, xDir, zDir);
- aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4), this.META_PipeCasing, -5, xDir, zDir);
- log("Layer 2 is Valid. Moving to Layer 3.");
-
- // Layer 3
- aContainmentCasingCount += checkOuterRing(aBaseMetaTileEntity, getCasing(3), this.META_ContainmentCasing, -4, xDir, zDir);
- aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4), this.META_PipeCasing, -4, xDir, zDir);
- log("Layer 3 is Valid. Moving to Layer 4.");
-
- // Layer 4
- aContainmentCasingCount += checkOuterRing(aBaseMetaTileEntity, getCasing(3), this.META_ContainmentCasing, -3, xDir, zDir);
- aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4), this.META_PipeCasing, -3, xDir, zDir);
- log("Layer 4 is Valid. Moving to Layer 5.");
-
- // Layer 5
- aShieldingCount += checkOuterRing(aBaseMetaTileEntity, getCasing(1), this.META_Shielding, -2, xDir, zDir);
- aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4), this.META_PipeCasing, -2, xDir, zDir);
- log("Layer 5 is Valid. Moving to Layer 6.");
-
- // Layer 6
- aShieldingCount += checkOuterRing(aBaseMetaTileEntity, getCasing(1), this.META_Shielding, -1, xDir, zDir);
- aIntegralCasingCount += checkIntegralRing(aBaseMetaTileEntity, getCasing(0), this.META_IntegralCasing, -1, xDir, zDir);
- aContainmentChamberCount += checkContainmentRing(aBaseMetaTileEntity, getCasing(4), this.META_ContainmentChamberCasing, -1, xDir, zDir);
- log("Layer 6 is Valid. Moving to Top Layer.");
-
- // Top Layer
- aBaseCasingCount += checkEntireLayer(aBaseMetaTileEntity, getCasing(4), META_BaseCasing, 0, xDir, zDir);
-
- log("Found "+aBaseCasingCount+" "+mCasingName[0]+"s");
- log("Found "+aShieldingCount+" "+mCasingName[4]+"s");
- log("Found "+aPipeCount+" "+mCasingName[1]+"s");
- log("Found "+aContainmentCasingCount+" "+mCasingName[3]+"s");
- log("Found "+aIntegralCasingCount+" "+LangUtils.getLocalizedNameOfBlock(getCasing(0), 6)+"s");
- log("Found "+aContainmentChamberCount+" "+mCasingName[2]+"s");
-
- // Try mesage player
- String aOwnerName = this.getBaseMetaTileEntity().getOwnerName();
- EntityPlayer aOwner = null;
- if (aOwnerName != null && aOwnerName.length() > 0) {
- aOwner = PlayerUtils.getPlayer(aOwnerName);
- }
-
- if (aShieldingCount != 128) {
- log("Not enough "+mCasingName[4]+"s, require 128.");
- if (aOwner != null) {
- PlayerUtils.messagePlayer(aOwner, "Not enough "+mCasingName[4]+"s, require 128.");
- }
- return false;
- }
- if (aPipeCount != 20) {
- log("Not enough "+mCasingName[1]+"s, require 20.");
- if (aOwner != null) {
- PlayerUtils.messagePlayer(aOwner, "Not enough "+mCasingName[1]+"s, require 20.");
- }
- return false;
- }
- if (aContainmentCasingCount != 64) {
- log("Not enough "+mCasingName[3]+"s, require 64.");
- if (aOwner != null) {
- PlayerUtils.messagePlayer(aOwner, "Not enough "+mCasingName[3]+"s, require 64.");
- }
- return false;
- }
- if (aContainmentChamberCount != 42) {
- log("Not enough "+mCasingName[2]+"s, require 42.");
- if (aOwner != null) {
- PlayerUtils.messagePlayer(aOwner, "Not enough "+mCasingName[2]+"s, require 42.");
- }
- return false;
- }
- if (aBaseCasingCount < 140) {
- log("Not enough "+mCasingName[0]+"s, require 140 at a minimum.");
- if (aOwner != null) {
- PlayerUtils.messagePlayer(aOwner, "Not enough "+mCasingName[0]+"s, require 140 at a minimum.");
- }
- return false;
- }
- if (aIntegralCasingCount != 48) {
- log("Not enough "+LangUtils.getLocalizedNameOfBlock(getCasing(0), 6)+"s, require 48.");
- if (aOwner != null) {
- PlayerUtils.messagePlayer(aOwner, "Not enough "+LangUtils.getLocalizedNameOfBlock(getCasing(0), 6)+"s, require 48.");
- }
- return false;
- }
- log("LNR Formed.");
- if (aOwner != null) {
- PlayerUtils.messagePlayer(aOwner, "Large Naquadah Reactor has formed successfully.");
- }
- return true;
- }
-
- public boolean addNaquadahHatchToMachineInput(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
- if (aTileEntity == null) {
- return false;
- } else {
- IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
- if (aMetaTileEntity == null) {
- return false;
- } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Naquadah) {
- this.updateTexture(aMetaTileEntity, aBaseCasingIndex);
- return this.mNaqHatches.add((GT_MetaTileEntity_Hatch_Naquadah) aMetaTileEntity);
- } else {
- return false;
- }
- }
- }
-
- public int checkEntireLayer(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
- int aCasingCount = 0;
- for (int x = -4; x < 5; x++) {
- for (int z = -4; z < 5; z++) {
- int aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x;
- int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + aY;
- int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z;
- //Skip the corners
- if ((x == 4 && z == 4) || (x == -4 && z == -4) || (x == 4 && z == -4) || (x == -4 && z == 4)) {
- continue;
- }
- // Skip controller
- if (aY == 0 && x == 0 && z == 0) {
- continue;
- }
-
- Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z);
- int aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z);
- if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
- aCasingCount++;
- }
- final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
- if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, true, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) {
- log("Layer has error. Height: "+aY);
- //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
- return 0;
- }
- }
- }
- return aCasingCount;
- }
-
- public int checkOuterRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
- int aCasingCount = 0;
- for (int x = -4; x < 5; x++) {
- for (int z = -4; z < 5; z++) {
- int aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x;
- int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + aY;
- int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z;
- //Skip the corners
- if ((x == 4 && z == 4) || (x == -4 && z == -4) || (x == 4 && z == -4) || (x == -4 && z == 4)) {
- continue;
- }
-
- // If we are on the 5x5 ring, proceed
- if ((x > -4 && x < 4 ) && (z > -4 && z < 4)) {
- if ((x == 3 && z == 3) || (x == -3 && z == -3) || (x == 3 && z == -3) || (x == -3 && z == 3)) {
- //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
- }
- else {
- continue;
- }
- }
-
- Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z);
- int aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z);
- if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
- aCasingCount++;
- }
- final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
- if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) {
- log("Layer has error. Height: "+aY);
- //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
- return 0;
- }
- }
- }
- return aCasingCount;
- }
- public int checkIntegralRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
- int aCasingCount = 0;
- for (int x = -3; x < 4; x++) {
- for (int z = -3; z < 4; z++) {
- int aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x;
- int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + aY;
- int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z;
- //Skip the corners
- if ((x == 3 && z == 3) || (x == -3 && z == -3) || (x == 3 && z == -3) || (x == -3 && z == 3)) {
- continue;
- }
-
- // If we are on the 5x5 ring, proceed
- if ((x > -3 && x < 3 ) && (z > -3 && z < 3)) {
- if ((x == 2 && z == 2) || (x == -2 && z == -2) || (x == 2 && z == -2) || (x == -2 && z == 2)) {
- //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
- }
- else {
- continue;
- }
- }
-
- Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z);
- int aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z);
- if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
- aCasingCount++;
- }
- final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
- if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) {
- log("Layer has error. Height: "+aY);
- //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
- return 0;
- }
- }
- }
- return aCasingCount;
- }
-
- public int checkPipes(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
- int aCasingCount = 0;
- for (int x = -1; x < 2; x++) {
- for (int z = -1; z < 2; z++) {
- int aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x;
- int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + aY;
- int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z;
- //Skip the corners
- if ((x == 1 && z == 1) || (x == -1 && z == -1) || (x == 1 && z == -1) || (x == -1 && z == 1) || (x == 0 && z == 0)) {
- Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z);
- int aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z);
- if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
- aCasingCount++;
- }
- final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
- if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) {
- log("Pipe has error. Height: "+aY);
- //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
- return 0;
- };
- }
- }
- }
- return aCasingCount;
- }
-
- public int checkContainmentRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
- int aCasingCount = 0;
- for (int x = -2; x < 3; x++) {
- for (int z = -2; z < 3; z++) {
- int aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x;
- int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + aY;
- int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z;
- //Skip the corners
- if ((x == 2 && z == 2) || (x == -2 && z == -2) || (x == 2 && z == -2) || (x == -2 && z == 2)) {
- continue;
- }
-
- Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z);
- int aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z);
- if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
- aCasingCount++;
- }
- final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z);
- if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) {
- log("Layer has error. Height: "+aY);
- //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3);
- return 0;
- }
- }
- }
- return aCasingCount;
- }
-
- public int getMaxEfficiency(ItemStack aStack) {
- return 10000;
- }
-
- public int getPollutionPerTick(ItemStack aStack) {
- return 133;
- }
-
- public int getDamageToComponent(ItemStack aStack) {
- return 0;
- }
-
- public boolean explodesOnComponentBreak(ItemStack aStack) {
- return false;
- }
-
- @Override
- public String getMachineType() {
- return "Reactor";
- }
-}*/
+ * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; public class
+ * GregtechMTE_LargeNaqReactor extends GregtechMeta_MultiBlockBase { public ArrayList<GT_MetaTileEntity_Hatch_Naquadah>
+ * mNaqHatches = new ArrayList<GT_MetaTileEntity_Hatch_Naquadah>(); public static String[] mCasingName = new String[5];
+ * public static String mHatchName = "Naquadah Fuel Hatch"; private final int CASING_TEXTURE_ID =
+ * TAE.getIndexFromPage(0, 13); private final int META_BaseCasing = 0; //4 private final int META_ContainmentCasing =
+ * 15; //3 private final int META_Shielding = 13; //1 private final int META_PipeCasing = 1; //4 private final int
+ * META_IntegralCasing = 6; //0 private final int META_ContainmentChamberCasing = 2; //4 public
+ * GregtechMTE_LargeNaqReactor(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional);
+ * mCasingName[0] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 0); mCasingName[1] =
+ * LangUtils.getLocalizedNameOfBlock(getCasing(4), 1); mCasingName[2] = LangUtils.getLocalizedNameOfBlock(getCasing(4),
+ * 2); mCasingName[3] = LangUtils.getLocalizedNameOfBlock(getCasing(3), 15); mCasingName[4] =
+ * LangUtils.getLocalizedNameOfBlock(getCasing(1), 13); mHatchName =
+ * LangUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 969); } public GregtechMTE_LargeNaqReactor(String
+ * aName) { super(aName); } public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new
+ * GregtechMTE_LargeNaqReactor(this.mName); } public String[] getTooltip() { if
+ * (mCasingName[0].toLowerCase().contains(".name")) { mCasingName[0] = LangUtils.getLocalizedNameOfBlock(getCasing(4),
+ * 0); } if (mCasingName[1].toLowerCase().contains(".name")) { mCasingName[1] =
+ * LangUtils.getLocalizedNameOfBlock(getCasing(4), 1); } if (mCasingName[2].toLowerCase().contains(".name")) {
+ * mCasingName[2] = LangUtils.getLocalizedNameOfBlock(getCasing(4), 2); } if
+ * (mCasingName[3].toLowerCase().contains(".name")) { mCasingName[3] = LangUtils.getLocalizedNameOfBlock(getCasing(3),
+ * 15); } if (mCasingName[4].toLowerCase().contains(".name")) { mCasingName[4] =
+ * LangUtils.getLocalizedNameOfBlock(getCasing(1), 13); } if (mHatchName.toLowerCase().contains(".name")) { mHatchName =
+ * LangUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 969); } return new String[]{
+ * "Naquadah reacts violently with potassium, ", "resulting in massive explosions with radioactive potential.",
+ * "Size: 3x4x12, WxHxL", "Bottom Layer: "+mCasingName[0]+"s, (30x min)",
+ * "Middle Layer: "+mCasingName[2]+"s (10x), with", " "+mCasingName[3]+"s on either side",
+ * " "+mCasingName[3]+"s also on each end (x26)", "Middle Layer2: "+mCasingName[1]+" (12x total), with",
+ * " "+mCasingName[4]+"s on either side (x24)",
+ * "Top: Single row of "+mCasingName[0]+" along the middle (x12) ", "", "1x " + mHatchName +
+ * " (Any bottom layer casing)", "1x " + "Maintenance Hatch" + " (Any bottom layer side casing)", "1x " + "Energy Hatch"
+ * + " (Any top layer casing)", }; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide,
+ * byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { return aSide == aFacing ? new
+ * ITexture[]{BlockIcons.getCasingTextureForId(TAE.getIndexFromPage(3, 0)), new GT_RenderedTexture(aActive ?
+ * TexturesGtBlock.Overlay_Machine_Controller_Default_Active : TexturesGtBlock.Overlay_Machine_Controller_Default)} :
+ * new ITexture[]{BlockIcons.getCasingTextureForId(TAE.getIndexFromPage(3, 0))}; } public GT_Recipe_Map getRecipeMap() {
+ * return null; } public boolean isCorrectMachinePart(ItemStack aStack) { return true; } public boolean
+ * isFacingValid(byte aFacing) { return aFacing == 1; } public boolean checkRecipe(ItemStack aStack) { return false; }
+ * @Override public int getMaxParallelRecipes() { return 1; }
+ * @Override public int getEuDiscountForParallelism() { return 0; } public void startSoundLoop(byte aIndex, double aX,
+ * double aY, double aZ) { super.startSoundLoop(aIndex, aX, aY, aZ); if (aIndex == 20) {
+ * GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(212)), 10, 1.0F, aX, aY, aZ); } }
+ * @Override public String getSound() { return (String) GregTech_API.sSoundList.get(Integer.valueOf(212)); } private
+ * Block getCasing(int casingID) { if (casingID == 1) { return ModBlocks.blockCasingsMisc; } else if (casingID == 2) {
+ * return ModBlocks.blockCasings2Misc; } else if (casingID == 3) { return ModBlocks.blockCasings3Misc; } else if
+ * (casingID == 4) { return ModBlocks.blockCasings4Misc; } else { return ModBlocks.blockCasingsTieredGTPP; } }
+ * //Casing3, Meta 10 - "Grate Machine Casing"); //Casing2, Meta 0 - "Solid Steel Machine Casing" //Casing2, Meta 5 -
+ * "Assembling Line Casing" //Casing2, Meta 9 - "Assembler Machine Casing" //Magic Glass - blockAlloyGlass public
+ * boolean checkMultiblock(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { int xDir =
+ * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 4; int zDir =
+ * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 4; // Counts for all Casing Types int
+ * aBaseCasingCount = 0; int aContainmentCasingCount = 0; int aShieldingCount = 0; int aPipeCount = 0; int
+ * aIntegralCasingCount = 0; int aContainmentChamberCount = 0; // Bottom Layer aBaseCasingCount +=
+ * checkEntireLayer(aBaseMetaTileEntity, getCasing(4), META_BaseCasing, -7, xDir, zDir);
+ * log("Bottom Layer is Valid. Moving to Layer 1."); // Layer 1 aShieldingCount += checkOuterRing(aBaseMetaTileEntity,
+ * getCasing(1), this.META_Shielding, -6, xDir, zDir); aIntegralCasingCount += checkIntegralRing(aBaseMetaTileEntity,
+ * getCasing(0), this.META_IntegralCasing, -6, xDir, zDir); aContainmentChamberCount +=
+ * checkContainmentRing(aBaseMetaTileEntity, getCasing(4), this.META_ContainmentChamberCasing, -6, xDir, zDir);
+ * log("Layer 1 is Valid. Moving to Layer 2."); // Layer 2 aShieldingCount += checkOuterRing(aBaseMetaTileEntity,
+ * getCasing(1), this.META_Shielding, -5, xDir, zDir); aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4),
+ * this.META_PipeCasing, -5, xDir, zDir); log("Layer 2 is Valid. Moving to Layer 3."); // Layer 3
+ * aContainmentCasingCount += checkOuterRing(aBaseMetaTileEntity, getCasing(3), this.META_ContainmentCasing, -4, xDir,
+ * zDir); aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4), this.META_PipeCasing, -4, xDir, zDir);
+ * log("Layer 3 is Valid. Moving to Layer 4."); // Layer 4 aContainmentCasingCount +=
+ * checkOuterRing(aBaseMetaTileEntity, getCasing(3), this.META_ContainmentCasing, -3, xDir, zDir); aPipeCount +=
+ * checkPipes(aBaseMetaTileEntity, getCasing(4), this.META_PipeCasing, -3, xDir, zDir);
+ * log("Layer 4 is Valid. Moving to Layer 5."); // Layer 5 aShieldingCount += checkOuterRing(aBaseMetaTileEntity,
+ * getCasing(1), this.META_Shielding, -2, xDir, zDir); aPipeCount += checkPipes(aBaseMetaTileEntity, getCasing(4),
+ * this.META_PipeCasing, -2, xDir, zDir); log("Layer 5 is Valid. Moving to Layer 6."); // Layer 6 aShieldingCount +=
+ * checkOuterRing(aBaseMetaTileEntity, getCasing(1), this.META_Shielding, -1, xDir, zDir); aIntegralCasingCount +=
+ * checkIntegralRing(aBaseMetaTileEntity, getCasing(0), this.META_IntegralCasing, -1, xDir, zDir);
+ * aContainmentChamberCount += checkContainmentRing(aBaseMetaTileEntity, getCasing(4),
+ * this.META_ContainmentChamberCasing, -1, xDir, zDir); log("Layer 6 is Valid. Moving to Top Layer."); // Top Layer
+ * aBaseCasingCount += checkEntireLayer(aBaseMetaTileEntity, getCasing(4), META_BaseCasing, 0, xDir, zDir);
+ * log("Found "+aBaseCasingCount+" "+mCasingName[0]+"s"); log("Found "+aShieldingCount+" "+mCasingName[4]+"s");
+ * log("Found "+aPipeCount+" "+mCasingName[1]+"s"); log("Found "+aContainmentCasingCount+" "+mCasingName[3]+"s");
+ * log("Found "+aIntegralCasingCount+" "+LangUtils.getLocalizedNameOfBlock(getCasing(0), 6)+"s");
+ * log("Found "+aContainmentChamberCount+" "+mCasingName[2]+"s"); // Try mesage player String aOwnerName =
+ * this.getBaseMetaTileEntity().getOwnerName(); EntityPlayer aOwner = null; if (aOwnerName != null &&
+ * aOwnerName.length() > 0) { aOwner = PlayerUtils.getPlayer(aOwnerName); } if (aShieldingCount != 128) {
+ * log("Not enough "+mCasingName[4]+"s, require 128."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner,
+ * "Not enough "+mCasingName[4]+"s, require 128."); } return false; } if (aPipeCount != 20) {
+ * log("Not enough "+mCasingName[1]+"s, require 20."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner,
+ * "Not enough "+mCasingName[1]+"s, require 20."); } return false; } if (aContainmentCasingCount != 64) {
+ * log("Not enough "+mCasingName[3]+"s, require 64."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner,
+ * "Not enough "+mCasingName[3]+"s, require 64."); } return false; } if (aContainmentChamberCount != 42) {
+ * log("Not enough "+mCasingName[2]+"s, require 42."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner,
+ * "Not enough "+mCasingName[2]+"s, require 42."); } return false; } if (aBaseCasingCount < 140) {
+ * log("Not enough "+mCasingName[0]+"s, require 140 at a minimum."); if (aOwner != null) {
+ * PlayerUtils.messagePlayer(aOwner, "Not enough "+mCasingName[0]+"s, require 140 at a minimum."); } return false; } if
+ * (aIntegralCasingCount != 48) { log("Not enough "+LangUtils.getLocalizedNameOfBlock(getCasing(0),
+ * 6)+"s, require 48."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner,
+ * "Not enough "+LangUtils.getLocalizedNameOfBlock(getCasing(0), 6)+"s, require 48."); } return false; }
+ * log("LNR Formed."); if (aOwner != null) { PlayerUtils.messagePlayer(aOwner,
+ * "Large Naquadah Reactor has formed successfully."); } return true; } public boolean
+ * addNaquadahHatchToMachineInput(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null) {
+ * return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity ==
+ * null) { return false; } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Naquadah) {
+ * this.updateTexture(aMetaTileEntity, aBaseCasingIndex); return this.mNaqHatches.add((GT_MetaTileEntity_Hatch_Naquadah)
+ * aMetaTileEntity); } else { return false; } } } public int checkEntireLayer(IGregTechTileEntity aBaseMetaTileEntity,
+ * Block aBlock, int aMeta, int aY, int xDir, int zDir) { int aCasingCount = 0; for (int x = -4; x < 5; x++) { for (int
+ * z = -4; z < 5; z++) { int aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x; int aOffsetY =
+ * this.getBaseMetaTileEntity().getYCoord() + aY; int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z; //Skip
+ * the corners if ((x == 4 && z == 4) || (x == -4 && z == -4) || (x == 4 && z == -4) || (x == -4 && z == 4)) { continue;
+ * } // Skip controller if (aY == 0 && x == 0 && z == 0) { continue; } Block aCurrentBlock =
+ * aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z); int aCurrentMeta = (int)
+ * aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z); if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
+ * aCasingCount++; } final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x,
+ * aY, zDir + z); if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, true, aCurrentBlock, aCurrentMeta,
+ * aBlock, aMeta)) { log("Layer has error. Height: "+aY); //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX,
+ * aOffsetY, aOffsetZ, aBlock, aMeta, 3); return 0; } } } return aCasingCount; } public int
+ * checkOuterRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) { int
+ * aCasingCount = 0; for (int x = -4; x < 5; x++) { for (int z = -4; z < 5; z++) { int aOffsetX =
+ * this.getBaseMetaTileEntity().getXCoord() + x; int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + aY; int
+ * aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z; //Skip the corners if ((x == 4 && z == 4) || (x == -4 && z
+ * == -4) || (x == 4 && z == -4) || (x == -4 && z == 4)) { continue; } // If we are on the 5x5 ring, proceed if ((x > -4
+ * && x < 4 ) && (z > -4 && z < 4)) { if ((x == 3 && z == 3) || (x == -3 && z == -3) || (x == 3 && z == -3) || (x == -3
+ * && z == 3)) { //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3); }
+ * else { continue; } } Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z); int
+ * aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z); if (aCurrentBlock == aBlock &&
+ * aCurrentMeta == aMeta) { aCasingCount++; } final IGregTechTileEntity tTileEntity =
+ * aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z); if (!isValidBlockForStructure(tTileEntity,
+ * CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) { log("Layer has error. Height: "+aY);
+ * //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3); return 0; } } }
+ * return aCasingCount; } public int checkIntegralRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta,
+ * int aY, int xDir, int zDir) { int aCasingCount = 0; for (int x = -3; x < 4; x++) { for (int z = -3; z < 4; z++) { int
+ * aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x; int aOffsetY = this.getBaseMetaTileEntity().getYCoord() +
+ * aY; int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z; //Skip the corners if ((x == 3 && z == 3) || (x ==
+ * -3 && z == -3) || (x == 3 && z == -3) || (x == -3 && z == 3)) { continue; } // If we are on the 5x5 ring, proceed if
+ * ((x > -3 && x < 3 ) && (z > -3 && z < 3)) { if ((x == 2 && z == 2) || (x == -2 && z == -2) || (x == 2 && z == -2) ||
+ * (x == -2 && z == 2)) { //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock,
+ * aMeta, 3); } else { continue; } } Block aCurrentBlock = aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z);
+ * int aCurrentMeta = (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z); if (aCurrentBlock == aBlock &&
+ * aCurrentMeta == aMeta) { aCasingCount++; } final IGregTechTileEntity tTileEntity =
+ * aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x, aY, zDir + z); if (!isValidBlockForStructure(tTileEntity,
+ * CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta, aBlock, aMeta)) { log("Layer has error. Height: "+aY);
+ * //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX, aOffsetY, aOffsetZ, aBlock, aMeta, 3); return 0; } } }
+ * return aCasingCount; } public int checkPipes(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int
+ * aY, int xDir, int zDir) { int aCasingCount = 0; for (int x = -1; x < 2; x++) { for (int z = -1; z < 2; z++) { int
+ * aOffsetX = this.getBaseMetaTileEntity().getXCoord() + x; int aOffsetY = this.getBaseMetaTileEntity().getYCoord() +
+ * aY; int aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z; //Skip the corners if ((x == 1 && z == 1) || (x ==
+ * -1 && z == -1) || (x == 1 && z == -1) || (x == -1 && z == 1) || (x == 0 && z == 0)) { Block aCurrentBlock =
+ * aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z); int aCurrentMeta = (int)
+ * aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z); if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
+ * aCasingCount++; } final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x,
+ * aY, zDir + z); if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta,
+ * aBlock, aMeta)) { log("Pipe has error. Height: "+aY); //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX,
+ * aOffsetY, aOffsetZ, aBlock, aMeta, 3); return 0; }; } } } return aCasingCount; } public int
+ * checkContainmentRing(IGregTechTileEntity aBaseMetaTileEntity, Block aBlock, int aMeta, int aY, int xDir, int zDir) {
+ * int aCasingCount = 0; for (int x = -2; x < 3; x++) { for (int z = -2; z < 3; z++) { int aOffsetX =
+ * this.getBaseMetaTileEntity().getXCoord() + x; int aOffsetY = this.getBaseMetaTileEntity().getYCoord() + aY; int
+ * aOffsetZ = this.getBaseMetaTileEntity().getZCoord() + z; //Skip the corners if ((x == 2 && z == 2) || (x == -2 && z
+ * == -2) || (x == 2 && z == -2) || (x == -2 && z == 2)) { continue; } Block aCurrentBlock =
+ * aBaseMetaTileEntity.getBlockOffset(xDir + x, aY, zDir + z); int aCurrentMeta = (int)
+ * aBaseMetaTileEntity.getMetaIDOffset(xDir + x, aY, zDir + z); if (aCurrentBlock == aBlock && aCurrentMeta == aMeta) {
+ * aCasingCount++; } final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + x,
+ * aY, zDir + z); if (!isValidBlockForStructure(tTileEntity, CASING_TEXTURE_ID, false, aCurrentBlock, aCurrentMeta,
+ * aBlock, aMeta)) { log("Layer has error. Height: "+aY); //this.getBaseMetaTileEntity().getWorld().setBlock(aOffsetX,
+ * aOffsetY, aOffsetZ, aBlock, aMeta, 3); return 0; } } } return aCasingCount; } public int getMaxEfficiency(ItemStack
+ * aStack) { return 10000; } public int getPollutionPerTick(ItemStack aStack) { return 133; } public int
+ * getDamageToComponent(ItemStack aStack) { return 0; } public boolean explodesOnComponentBreak(ItemStack aStack) {
+ * return false; }
+ * @Override public String getMachineType() { return "Reactor"; } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java
index bdbedbc36e..753cbc9d4f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java
@@ -1,351 +1,95 @@
/*
-package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
-
-
-public class GregtechMTE_MiniFusionPlant extends GregtechMeta_MultiBlockBase {
-
- public long currentVoltage = GT_Values.V[7];
- public byte currentTier = 8;
-
- public void upvolt() {
- byte f = currentTier;
- if ((f+1) > 10) {
- f = 8;
- }
- else {
- f++;
- }
- this.currentTier = f;
- updateVoltage();
- }
-
- public void downvolt() {
- byte f = currentTier;
- if ((f-1) < 8) {
- f = 10;
- }
- else {
- f--;
- }
- this.currentTier = f;
- updateVoltage();
- }
-
- private long updateVoltage() {
- this.currentVoltage = GT_Values.V[this.currentTier-1];
- return currentVoltage;
- }
-
- public GregtechMTE_MiniFusionPlant(String aName) {
- super(aName);
- }
-
- public GregtechMTE_MiniFusionPlant(int aID, String aName, String aNameRegional) {
- super(aID, aName, aNameRegional);
- }
-
- @Override
- public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GregtechMTE_MiniFusionPlant(this.mName);
- }
-
- @Override
- public boolean isCorrectMachinePart(ItemStack aStack) {
- return true;
- }
-
- @Override
- public int getDamageToComponent(ItemStack aStack) {
- return 0;
- }
-
- @Override
- public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
- final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
- if (aSide == this.getBaseMetaTileEntity().getBackFacing()) {
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10)),
- Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[(int) this.getInputTier()]};
- }
- if (aSide == 1) {
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10)),
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[(int) this.getOutputTier()]};
- }
- if (aSide == aFacing) {
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10)),
- new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER)};
- }
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10))};
- }
-
-
- @Override
- public GT_Recipe.GT_Recipe_Map getRecipeMap() {
- return GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes;
- }
-
- @Override
- public String getMachineType() {
- return "Fusion Reactor";
- }
-
- @Override
- public String[] getTooltip() {
- return new String[] {
- "Small scale fusion",
- "16x slower than using Multiblock of the same voltage",
- //"Input voltage can be changed within the GUI",
- "Place Input/Output Hatches on sides and bottom",
- "Power can only be inserted into the back",
- //e"Power can only be extracted from the top",
- TAG_HIDE_HATCHES
- };
- }
-
- @Override
- public int getMaxParallelRecipes() {
- return 1;
- }
-
- @Override
- public int getEuDiscountForParallelism() {
- return 0;
- }
-
- @Override
- public boolean checkMultiblock(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
- int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
- int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
- int xDir2 = ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).offsetX;
- int zDir2 = ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).offsetZ;
- int tAmount = 0;
-
- ForgeDirection aDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing());
-
- //Require air in front, I think
- if (!aBaseMetaTileEntity.getAirOffset(xDir2, 0, zDir2)) {
- Logger.INFO("Did not find air in front");
- return false;
- } else {
- for (int i = -1; i < 2; ++i) {
- for (int j = -1; j < 2; ++j) {
- for (int h = -1; h < 2; ++h) {
- if (h != 0 || (xDir + i != 0 || zDir + j != 0) && (i != 0 || j != 0)) {
- IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i,
- h, zDir + j);
- if (this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(10))) {
- tAmount++;
- }
- }
- }
- }
- }
- }
- Logger.INFO("Tanks found: "+tAmount);
- return tAmount == 3;
- }
-
- @Override
- public boolean checkRecipe(ItemStack arg0) {
-
-
- ArrayList tFluidList = this.getStoredFluids();
- int tFluidList_sS = tFluidList.size();
-
- for (int tFluids = 0; tFluids < tFluidList_sS - 1; ++tFluids) {
- for (int tRecipe = tFluids + 1; tRecipe < tFluidList_sS; ++tRecipe) {
- if (GT_Utility.areFluidsEqual((FluidStack) tFluidList.get(tFluids),
- (FluidStack) tFluidList.get(tRecipe))) {
- if (((FluidStack) tFluidList.get(tFluids)).amount < ((FluidStack) tFluidList.get(tRecipe)).amount) {
- tFluidList.remove(tFluids--);
- tFluidList_sS = tFluidList.size();
- break;
- }
-
- tFluidList.remove(tRecipe--);
- tFluidList_sS = tFluidList.size();
- }
- }
- }
- int aStep = 0;
- //Logger.INFO("Step "+aStep++);
- if (tFluidList.size() > 1) {
- //Logger.INFO("Step "+aStep++);
- FluidStack[] arg5 = (FluidStack[]) tFluidList.toArray(new FluidStack[tFluidList.size()]);
- GT_Recipe arg6 = getRecipeMap().findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe,
- false, this.getMaxInputVoltage(), arg5, new ItemStack[0]);
- if (arg6 == null && !this.mRunningOnLoad || (arg6 != null && this.maxEUStore() < (long) arg6.mSpecialValue)) {
- //Logger.INFO("Bad Step "+aStep++);
- //this.turnCasingActive(false);
- this.mLastRecipe = null;
- return false;
- }
- //Logger.INFO("Step "+aStep++);
-
- if (this.mRunningOnLoad || (arg6 != null && arg6.isRecipeInputEqual(true, arg5, new ItemStack[0]))) {
- //Logger.INFO("Step "+aStep++);
- this.mLastRecipe = arg6;
- this.mEUt = this.mLastRecipe.mEUt * 1;
- this.mMaxProgresstime = this.mLastRecipe.mDuration / 1;
- this.mEfficiencyIncrease = 10000;
- this.mOutputFluids = this.mLastRecipe.mFluidOutputs;
- //this.turnCasingActive(true);
- this.mRunningOnLoad = false;
- return true;
- }
- //Logger.INFO("Step "+aStep++);
- }
- //Logger.INFO("Step "+aStep++);
-
- return false;
-
-
-
-
- //return this.checkRecipeGeneric(this.getMaxParallelRecipes(), getEuDiscountForParallelism(), 0);
- }
-
- @Override
- public int getMaxEfficiency(ItemStack arg0) {
- return 10000;
- }
-
- @Override
- public boolean drainEnergyInput(long aEU) {
- // Not applicable to this machine
- return true;
- }
-
- @Override
- public boolean addEnergyOutput(long aEU) {
- // Not applicable to this machine
- return true;
- }
-
- @Override
- public long maxEUStore() {
- return this.getMaxInputVoltage() * 256 * 512;
- }
-
- @Override
- public long getMinimumStoredEU() {
- return 0;
- }
-
- @Override
- public String[] getExtraInfoData() {
- String mode = EnumChatFormatting.BLUE + "" + currentVoltage + EnumChatFormatting.RESET;
- String aOutput = EnumChatFormatting.BLUE + "" + mEUt + EnumChatFormatting.RESET;
- String storedEnergyText;
- if (this.getEUVar() > maxEUStore()) {
- storedEnergyText = EnumChatFormatting.RED + GT_Utility.formatNumbers(this.getEUVar()) + EnumChatFormatting.RESET;
- } else {
- storedEnergyText = EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.getEUVar()) + EnumChatFormatting.RESET;
- }
-
- return new String[]{
- "Stored EU: " + storedEnergyText,
- "Capacity: " + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(this.maxEUStore()) + EnumChatFormatting.RESET,
- "Voltage: " + mode,
- "Output Voltage: " + aOutput
- };
- }
-
- @Override
- public void explodeMultiblock() {
- super.explodeMultiblock();
- }
-
- @Override
- public void doExplosion(long aExplosionPower) {
- super.doExplosion(aExplosionPower);
- }
-
- @Override
- public long getMaxInputVoltage() {
- return updateVoltage();
- }
-
- @Override
- public long getInputTier() {
- return (long) GT_Utility.getTier(maxEUInput());
- }
-
- @Override
- public boolean isElectric() {
- return true;
- }
-
- @Override
- public boolean isEnetInput() {
- return true;
- }
-
- @Override
- public boolean isEnetOutput() {
- return false;
- }
-
- @Override
- public boolean isInputFacing(byte aSide) {
- return (aSide == this.getBaseMetaTileEntity().getBackFacing());
- }
-
- @Override
- public boolean isOutputFacing(byte aSide) {
- return aSide == 1;
- }
-
- @Override
- public long maxAmperesIn() {
- return 32;
- }
-
- @Override
- public long maxAmperesOut() {
- return 1;
- }
-
- @Override
- public long maxEUInput() {
- return updateVoltage();
- }
-
- @Override
- public long maxEUOutput() {
- return mEUt > 0 ? mEUt : 0;
- }
-
- @Override
- public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
- super.onPostTick(aBaseMetaTileEntity, aTick);
- this.mWrench = true;
- this.mScrewdriver = true;
- this.mSoftHammer = true;
- this.mHardHammer = true;
- this.mSolderingTool = true;
- this.mCrowbar = true;
- }
-
- @Override
- public boolean causeMaintenanceIssue() {
- return true;
- }
-
- @Override
- public int getControlCoreTier() {
- return this.currentTier;
- }
-
- @Override
- public int getPollutionPerTick(ItemStack arg0) {
- return 0;
- }
-
- @Override
- public GT_MetaTileEntity_Hatch_ControlCore getControlCoreBus() {
- GT_MetaTileEntity_Hatch_ControlCore x = new GT_MetaTileEntity_Hatch_ControlCore("", 0, "", null);
- return (GT_MetaTileEntity_Hatch_ControlCore) x;
- }
-
-}
-*/
+ * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; public class
+ * GregtechMTE_MiniFusionPlant extends GregtechMeta_MultiBlockBase { public long currentVoltage = GT_Values.V[7]; public
+ * byte currentTier = 8; public void upvolt() { byte f = currentTier; if ((f+1) > 10) { f = 8; } else { f++; }
+ * this.currentTier = f; updateVoltage(); } public void downvolt() { byte f = currentTier; if ((f-1) < 8) { f = 10; }
+ * else { f--; } this.currentTier = f; updateVoltage(); } private long updateVoltage() { this.currentVoltage =
+ * GT_Values.V[this.currentTier-1]; return currentVoltage; } public GregtechMTE_MiniFusionPlant(String aName) {
+ * super(aName); } public GregtechMTE_MiniFusionPlant(int aID, String aName, String aNameRegional) { super(aID, aName,
+ * aNameRegional); }
+ * @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new
+ * GregtechMTE_MiniFusionPlant(this.mName); }
+ * @Override public boolean isCorrectMachinePart(ItemStack aStack) { return true; }
+ * @Override public int getDamageToComponent(ItemStack aStack) { return 0; }
+ * @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte
+ * aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { if (aSide ==
+ * this.getBaseMetaTileEntity().getBackFacing()) { return new
+ * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10)),
+ * Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[(int) this.getInputTier()]}; } if (aSide == 1) { return new
+ * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10)),
+ * Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[(int) this.getOutputTier()]}; } if (aSide == aFacing) { return new
+ * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10)), new GT_RenderedTexture(aActive ?
+ * Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER)}; } return
+ * new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(10))}; }
+ * @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { return GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes; }
+ * @Override public String getMachineType() { return "Fusion Reactor"; }
+ * @Override public String[] getTooltip() { return new String[] { "Small scale fusion",
+ * "16x slower than using Multiblock of the same voltage", //"Input voltage can be changed within the GUI",
+ * "Place Input/Output Hatches on sides and bottom", "Power can only be inserted into the back",
+ * //e"Power can only be extracted from the top", TAG_HIDE_HATCHES }; }
+ * @Override public int getMaxParallelRecipes() { return 1; }
+ * @Override public int getEuDiscountForParallelism() { return 0; }
+ * @Override public boolean checkMultiblock(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { int xDir =
+ * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; int zDir =
+ * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; int xDir2 =
+ * ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).offsetX; int zDir2 =
+ * ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).offsetZ; int tAmount = 0; ForgeDirection aDir =
+ * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()); //Require air in front, I think if
+ * (!aBaseMetaTileEntity.getAirOffset(xDir2, 0, zDir2)) { Logger.INFO("Did not find air in front"); return false; } else
+ * { for (int i = -1; i < 2; ++i) { for (int j = -1; j < 2; ++j) { for (int h = -1; h < 2; ++h) { if (h != 0 || (xDir +
+ * i != 0 || zDir + j != 0) && (i != 0 || j != 0)) { IGregTechTileEntity tTileEntity =
+ * aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); if (this.addToMachineList(tTileEntity,
+ * TAE.GTPP_INDEX(10))) { tAmount++; } } } } } } Logger.INFO("Tanks found: "+tAmount); return tAmount == 3; }
+ * @Override public boolean checkRecipe(ItemStack arg0) { ArrayList tFluidList = this.getStoredFluids(); int
+ * tFluidList_sS = tFluidList.size(); for (int tFluids = 0; tFluids < tFluidList_sS - 1; ++tFluids) { for (int tRecipe =
+ * tFluids + 1; tRecipe < tFluidList_sS; ++tRecipe) { if (GT_Utility.areFluidsEqual((FluidStack)
+ * tFluidList.get(tFluids), (FluidStack) tFluidList.get(tRecipe))) { if (((FluidStack) tFluidList.get(tFluids)).amount <
+ * ((FluidStack) tFluidList.get(tRecipe)).amount) { tFluidList.remove(tFluids--); tFluidList_sS = tFluidList.size();
+ * break; } tFluidList.remove(tRecipe--); tFluidList_sS = tFluidList.size(); } } } int aStep = 0;
+ * //Logger.INFO("Step "+aStep++); if (tFluidList.size() > 1) { //Logger.INFO("Step "+aStep++); FluidStack[] arg5 =
+ * (FluidStack[]) tFluidList.toArray(new FluidStack[tFluidList.size()]); GT_Recipe arg6 =
+ * getRecipeMap().findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, this.getMaxInputVoltage(), arg5, new
+ * ItemStack[0]); if (arg6 == null && !this.mRunningOnLoad || (arg6 != null && this.maxEUStore() < (long)
+ * arg6.mSpecialValue)) { //Logger.INFO("Bad Step "+aStep++); //this.turnCasingActive(false); this.mLastRecipe = null;
+ * return false; } //Logger.INFO("Step "+aStep++); if (this.mRunningOnLoad || (arg6 != null &&
+ * arg6.isRecipeInputEqual(true, arg5, new ItemStack[0]))) { //Logger.INFO("Step "+aStep++); this.mLastRecipe = arg6;
+ * this.mEUt = this.mLastRecipe.mEUt * 1; this.mMaxProgresstime = this.mLastRecipe.mDuration / 1;
+ * this.mEfficiencyIncrease = 10000; this.mOutputFluids = this.mLastRecipe.mFluidOutputs; //this.turnCasingActive(true);
+ * this.mRunningOnLoad = false; return true; } //Logger.INFO("Step "+aStep++); } //Logger.INFO("Step "+aStep++); return
+ * false; //return this.checkRecipeGeneric(this.getMaxParallelRecipes(), getEuDiscountForParallelism(), 0); }
+ * @Override public int getMaxEfficiency(ItemStack arg0) { return 10000; }
+ * @Override public boolean drainEnergyInput(long aEU) { // Not applicable to this machine return true; }
+ * @Override public boolean addEnergyOutput(long aEU) { // Not applicable to this machine return true; }
+ * @Override public long maxEUStore() { return this.getMaxInputVoltage() * 256 * 512; }
+ * @Override public long getMinimumStoredEU() { return 0; }
+ * @Override public String[] getExtraInfoData() { String mode = EnumChatFormatting.BLUE + "" + currentVoltage +
+ * EnumChatFormatting.RESET; String aOutput = EnumChatFormatting.BLUE + "" + mEUt + EnumChatFormatting.RESET; String
+ * storedEnergyText; if (this.getEUVar() > maxEUStore()) { storedEnergyText = EnumChatFormatting.RED +
+ * GT_Utility.formatNumbers(this.getEUVar()) + EnumChatFormatting.RESET; } else { storedEnergyText =
+ * EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.getEUVar()) + EnumChatFormatting.RESET; } return new
+ * String[]{ "Stored EU: " + storedEnergyText, "Capacity: " + EnumChatFormatting.YELLOW +
+ * GT_Utility.formatNumbers(this.maxEUStore()) + EnumChatFormatting.RESET, "Voltage: " + mode, "Output Voltage: " +
+ * aOutput }; }
+ * @Override public void explodeMultiblock() { super.explodeMultiblock(); }
+ * @Override public void doExplosion(long aExplosionPower) { super.doExplosion(aExplosionPower); }
+ * @Override public long getMaxInputVoltage() { return updateVoltage(); }
+ * @Override public long getInputTier() { return (long) GT_Utility.getTier(maxEUInput()); }
+ * @Override public boolean isElectric() { return true; }
+ * @Override public boolean isEnetInput() { return true; }
+ * @Override public boolean isEnetOutput() { return false; }
+ * @Override public boolean isInputFacing(byte aSide) { return (aSide == this.getBaseMetaTileEntity().getBackFacing());
+ * }
+ * @Override public boolean isOutputFacing(byte aSide) { return aSide == 1; }
+ * @Override public long maxAmperesIn() { return 32; }
+ * @Override public long maxAmperesOut() { return 1; }
+ * @Override public long maxEUInput() { return updateVoltage(); }
+ * @Override public long maxEUOutput() { return mEUt > 0 ? mEUt : 0; }
+ * @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+ * super.onPostTick(aBaseMetaTileEntity, aTick); this.mWrench = true; this.mScrewdriver = true; this.mSoftHammer = true;
+ * this.mHardHammer = true; this.mSolderingTool = true; this.mCrowbar = true; }
+ * @Override public boolean causeMaintenanceIssue() { return true; }
+ * @Override public int getControlCoreTier() { return this.currentTier; }
+ * @Override public int getPollutionPerTick(ItemStack arg0) { return 0; }
+ * @Override public GT_MetaTileEntity_Hatch_ControlCore getControlCoreBus() { GT_MetaTileEntity_Hatch_ControlCore x =
+ * new GT_MetaTileEntity_Hatch_ControlCore("", 0, "", null); return (GT_MetaTileEntity_Hatch_ControlCore) x; } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
index d71e4d7933..42cd033829 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
@@ -8,10 +8,17 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gregtech.api.util.GT_StructureUtility.filterByMTETier;
+import java.util.Collection;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
@@ -32,10 +39,6 @@ import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.nuclear.NUCLIDE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import java.util.Collection;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<GregtechMTE_NuclearReactor>
implements ISurvivalConstructable {
@@ -71,48 +74,34 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.")
.addInfo("Produces Heat & Energy from Radioactive Beta Decay.")
.addInfo("Input Li2BeF4 and a molten salt as fuel, and match the 4 Dynamo Hatches:")
.addInfo("LFTR Fuel 1 (4 IV amps), LFTR Fuel 2 (4 LuV amps), LFTR Fuel 3 (4 ZPM amps)")
.addInfo("Outputs U233 every 10 seconds, on average, while the reactor is running")
.addInfo("Check NEI to see the other outputs - they differ between fuels")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(7, 4, 7, true)
- .addController("Bottom Center")
- .addCasingInfo("Hastelloy-N Reactor Casing", 27)
- .addCasingInfo("Zeron-100 Reactor Shielding", 26)
- .addInputHatch("Top or bottom layer edges", 1)
- .addOutputHatch("Top or bottom layer edges", 1)
- .addDynamoHatch("Top or bottom layer edges", 1)
- .addMaintenanceHatch("Top or bottom layer edges", 1)
- .addMufflerHatch("Top 3x3", 2)
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(7, 4, 7, true)
+ .addController("Bottom Center").addCasingInfo("Hastelloy-N Reactor Casing", 27)
+ .addCasingInfo("Zeron-100 Reactor Shielding", 26).addInputHatch("Top or bottom layer edges", 1)
+ .addOutputHatch("Top or bottom layer edges", 1).addDynamoHatch("Top or bottom layer edges", 1)
+ .addMaintenanceHatch("Top or bottom layer edges", 1).addMufflerHatch("Top 3x3", 2)
.addStructureInfo("All dynamos must be between EV and LuV tier.")
.addStructureInfo("All other hatches must be IV+ tier.")
.addStructureInfo("3x Output Hatches, 2x Input Hatches, 4x Dynamo Hatches")
- .addStructureInfo("2x Maintenance Hatches, 4x Mufflers")
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addStructureInfo("2x Maintenance Hatches, 4x Mufflers").toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@Override
public String[] getExtraInfoData() {
final String tRunning = (this.mMaxProgresstime > 0 ? "Reactor running" : "Reactor stopped");
- final String tMaintainance =
- (this.getIdealStatus() == this.getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance");
+ final String tMaintainance = (this.getIdealStatus() == this.getRepairStatus() ? "No Maintainance issues"
+ : "Needs Maintainance");
- return new String[] {
- "Liquid Fluoride Thorium Reactor",
- tRunning,
- tMaintainance,
- "Current Output: " + this.lEUt + " EU/t",
- "Fuel Remaining: " + this.mFuelRemaining + " Litres",
- "Current Efficiency: " + (this.mEfficiency / 5) + "%",
- "Current Efficiency (Raw): " + (this.mEfficiency),
- "It requires you to have 100% Efficiency."
- };
+ return new String[] { "Liquid Fluoride Thorium Reactor", tRunning, tMaintainance,
+ "Current Output: " + this.lEUt + " EU/t", "Fuel Remaining: " + this.mFuelRemaining + " Litres",
+ "Current Efficiency: " + (this.mEfficiency / 5) + "%",
+ "Current Efficiency (Raw): " + (this.mEfficiency), "It requires you to have 100% Efficiency." };
}
@Override
@@ -121,54 +110,29 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
boolean aWarmedUp = this.mEfficiency == this.getMaxEfficiency(null);
if (!aBaseMetaTileEntity.isActive() || !aWarmedUp) {
if (aSide == aFacing) {
- if (aActive)
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)),
- TextureFactory.builder()
- .addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE)
- .extFacing()
- .build()
- };
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)),
- TextureFactory.builder()
- .addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR)
- .extFacing()
- .build()
- };
+ if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)),
+ TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE)
+ .extFacing().build() };
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)), TextureFactory
+ .builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR).extFacing().build() };
}
- return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12))};
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)) };
} else if (aBaseMetaTileEntity.isActive() && aWarmedUp) {
if (aSide == aFacing) {
- if (aActive)
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13)),
- TextureFactory.builder()
- .addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE)
- .extFacing()
- .build()
- };
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13)),
- TextureFactory.builder()
- .addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR)
- .extFacing()
- .build()
- };
+ if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13)),
+ TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE)
+ .extFacing().build() };
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13)), TextureFactory
+ .builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR).extFacing().build() };
}
- return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13))};
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13)) };
}
- return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12))};
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)) };
}
public final boolean addNuclearReactorEdgeList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
@@ -181,14 +145,16 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo
&& (((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier >= 4
&& ((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier <= 6)) {
- return addToMachineList(aTileEntity, aBaseCasingIndex);
- } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input
- && ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier >= 5) {
- return addToMachineList(aTileEntity, aBaseCasingIndex);
- } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output
- && ((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity).mTier >= 5) {
- return addToMachineList(aTileEntity, aBaseCasingIndex);
- }
+ return addToMachineList(aTileEntity, aBaseCasingIndex);
+ } else
+ if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input
+ && ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier >= 5) {
+ return addToMachineList(aTileEntity, aBaseCasingIndex);
+ } else
+ if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output
+ && ((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity).mTier >= 5) {
+ return addToMachineList(aTileEntity, aBaseCasingIndex);
+ }
}
return false;
}
@@ -209,49 +175,37 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
@Override
public IStructureDefinition<GregtechMTE_NuclearReactor> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_NuclearReactor>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCCCCCC", "COOOOOC", "COXXXOC", "COXXXOC", "COXXXOC", "COOOOOC", "CCCCCCC"},
- {"GGGGGGG", "G-----G", "G-----G", "G-----G", "G-----G", "G-----G", "GGGGGGG"},
- {"GGGGGGG", "G-----G", "G-----G", "G-----G", "G-----G", "G-----G", "GGGGGGG"},
- {"CCC~CCC", "COOOOOC", "COOOOOC", "COOOOOC", "COOOOOC", "COOOOOC", "CCCCCCC"},
- }))
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_NuclearReactor>builder().addShape(
+ mName,
+ transpose(
+ new String[][] {
+ { "CCCCCCC", "COOOOOC", "COXXXOC", "COXXXOC", "COXXXOC", "COOOOOC", "CCCCCCC" },
+ { "GGGGGGG", "G-----G", "G-----G", "G-----G", "G-----G", "G-----G", "GGGGGGG" },
+ { "GGGGGGG", "G-----G", "G-----G", "G-----G", "G-----G", "G-----G", "GGGGGGG" },
+ { "CCC~CCC", "COOOOOC", "COOOOOC", "COOOOOC", "COOOOOC", "COOOOOC", "CCCCCCC" }, }))
.addElement(
'C',
ofChain(
- buildHatchAdder(GregtechMTE_NuclearReactor.class)
- .atLeast(Maintenance)
- .casingIndex(TAE.GTPP_INDEX(12))
- .dot(1)
- .build(),
- buildHatchAdder(GregtechMTE_NuclearReactor.class)
- .atLeast(InputHatch, OutputHatch)
+ buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(Maintenance)
+ .casingIndex(TAE.GTPP_INDEX(12)).dot(1).build(),
+ buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(InputHatch, OutputHatch)
.adder(GregtechMTE_NuclearReactor::addNuclearReactorEdgeList)
.hatchItemFilterAnd(t -> filterByMTETier(5, Integer.MAX_VALUE))
- .casingIndex(TAE.GTPP_INDEX(12))
- .dot(1)
- .build(),
- buildHatchAdder(GregtechMTE_NuclearReactor.class)
- .atLeast(Dynamo)
+ .casingIndex(TAE.GTPP_INDEX(12)).dot(1).build(),
+ buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(Dynamo)
.adder(GregtechMTE_NuclearReactor::addNuclearReactorEdgeList)
.hatchItemFilterAnd(t -> filterByMTETier(4, 6))
- .casingIndex(TAE.GTPP_INDEX(12))
- .dot(1)
- .build(),
+ .casingIndex(TAE.GTPP_INDEX(12)).dot(1).build(),
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 12))))
.addElement(
'X',
- buildHatchAdder(GregtechMTE_NuclearReactor.class)
- .atLeast(Muffler)
+ buildHatchAdder(GregtechMTE_NuclearReactor.class).atLeast(Muffler)
.adder(GregtechMTE_NuclearReactor::addNuclearReactorTopList)
.hatchItemFilterAnd(t -> filterByMTETier(5, Integer.MAX_VALUE))
- .casingIndex(TAE.GTPP_INDEX(12))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.GTPP_INDEX(12)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 12))))
.addElement('O', ofBlock(ModBlocks.blockCasingsMisc, 12))
- .addElement('G', ofBlock(ModBlocks.blockCasingsMisc, 13))
- .build();
+ .addElement('G', ofBlock(ModBlocks.blockCasingsMisc, 13)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -271,8 +225,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
mCasing = 0;
if (checkPiece(mName, 3, 3, 0) && mCasing >= 27) {
- if (mOutputHatches.size() >= 3
- && mInputHatches.size() >= 2
+ if (mOutputHatches.size() >= 3 && mInputHatches.size() >= 2
&& mDynamoHatches.size() == 4
&& mMufflerHatches.size() == 4
&& mMaintenanceHatches.size() == 2) {
@@ -291,21 +244,15 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
// Alk's Life Lessons from Greg.
/*
- [23:41:15] <GregoriusTechneticies> xdir and zdir are x2 and not x3
- [23:41:26] <GregoriusTechneticies> thats you issue
- [23:44:33] <Alkalus> mmm?
- [23:44:49] <Alkalus> Should they be x3?
- [23:44:50] <GregoriusTechneticies> you just do a x2, what is for a 5x5 multiblock
- [23:45:01] <GregoriusTechneticies> x3 is for a 7x7 one
- [23:45:06] <Alkalus> I have no idea what that value does, tbh..
- [23:45:15] <GregoriusTechneticies> its the offset
- [23:45:23] <Alkalus> Debugging checkMachine has been a pain and I usually trash designs that don't work straight up..
- [23:45:28] <GregoriusTechneticies> it determines the horizontal middle of the multiblock
- [23:45:47] <GregoriusTechneticies> which is in your case THREE blocks away from the controller
- [23:45:51] <Alkalus> Ahh
- [23:45:57] <GregoriusTechneticies> and not 2
- [23:46:06] <Alkalus> Noted, thanks :D
- */
+ * [23:41:15] <GregoriusTechneticies> xdir and zdir are x2 and not x3 [23:41:26] <GregoriusTechneticies> thats you
+ * issue [23:44:33] <Alkalus> mmm? [23:44:49] <Alkalus> Should they be x3? [23:44:50] <GregoriusTechneticies> you
+ * just do a x2, what is for a 5x5 multiblock [23:45:01] <GregoriusTechneticies> x3 is for a 7x7 one [23:45:06]
+ * <Alkalus> I have no idea what that value does, tbh.. [23:45:15] <GregoriusTechneticies> its the offset [23:45:23]
+ * <Alkalus> Debugging checkMachine has been a pain and I usually trash designs that don't work straight up..
+ * [23:45:28] <GregoriusTechneticies> it determines the horizontal middle of the multiblock [23:45:47]
+ * <GregoriusTechneticies> which is in your case THREE blocks away from the controller [23:45:51] <Alkalus> Ahh
+ * [23:45:57] <GregoriusTechneticies> and not 2 [23:46:06] <Alkalus> Noted, thanks :D
+ */
@Override
public boolean isCorrectMachinePart(final ItemStack aStack) {
@@ -412,8 +359,8 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
if (tFluids.length > 0 && tRecipeList != null && tRecipeList.size() > 0) { // Does input hatch have a LFTR fuel?
Logger.WARNING("Found more than one input fluid and a list of valid recipes.");
// Find a valid recipe
- GT_Recipe aFuelProcessing =
- this.findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, 0, tFluids, new ItemStack[] {});
+ GT_Recipe aFuelProcessing = this
+ .findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, 0, tFluids, new ItemStack[] {});
if (aFuelProcessing == null) {
Logger.WARNING("Did not find valid recipe for given inputs.");
return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java
index 279ab77b9c..3700b28ea1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java
@@ -7,10 +7,16 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo;
+import java.util.*;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -23,9 +29,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.*;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntityGeneratorArray
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntityGeneratorArray> implements ISurvivalConstructable {
@@ -54,20 +57,13 @@ public class GregtechMetaTileEntityGeneratorArray
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Generator Array")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Generator Array")
.addInfo("Runs supplied generators as if placed in the world")
- .addInfo("Place up to 16 Single Block GT Generators into the Controller")
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front center")
- .addCasingInfo("Robust Tungstensteel Machine Casings", 10)
- .addInputBus("Any casing", 1)
- .addOutputBus("Any casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addDynamoHatch("Any casing", 1)
- .addMaintenanceHatch("Any casing", 1)
+ .addInfo("Place up to 16 Single Block GT Generators into the Controller").addSeparator()
+ .beginStructureBlock(3, 3, 3, true).addController("Front center")
+ .addCasingInfo("Robust Tungstensteel Machine Casings", 10).addInputBus("Any casing", 1)
+ .addOutputBus("Any casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+ .addDynamoHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -141,16 +137,16 @@ public class GregtechMetaTileEntityGeneratorArray
private static final int MODE_NAQUADAH = 9;
private static final int MODE_NONE = 100;
- private static final int[] ID_STEAM = new int[] {962, 1120, 1121, 1122};
- private static final int[] ID_GAS = new int[] {961, 1115, 1116, 1117};
- private static final int[] ID_DIESEL = new int[] {960, 1110, 1111, 1112};
- private static final int[] ID_SEMIFLUID = new int[] {837, 838, 839};
- private static final int[] ID_GEOTHERMAL = new int[] {830, 831, 832};
- private static final int[] ID_ROCKETFUEL = new int[] {793, 794, 795};
- private static final int[] ID_MAGIC_A = new int[] {1123, 1124, 1125};
- private static final int[] ID_MAGIC_B_DISABLED = new int[] {1127, 1128, 1129, 1130};
- private static final int[] ID_PLASMA = new int[] {1196, 1197, 1198};
- private static final int[] ID_NAQUADAH = new int[] {1190, 1191, 1192};
+ private static final int[] ID_STEAM = new int[] { 962, 1120, 1121, 1122 };
+ private static final int[] ID_GAS = new int[] { 961, 1115, 1116, 1117 };
+ private static final int[] ID_DIESEL = new int[] { 960, 1110, 1111, 1112 };
+ private static final int[] ID_SEMIFLUID = new int[] { 837, 838, 839 };
+ private static final int[] ID_GEOTHERMAL = new int[] { 830, 831, 832 };
+ private static final int[] ID_ROCKETFUEL = new int[] { 793, 794, 795 };
+ private static final int[] ID_MAGIC_A = new int[] { 1123, 1124, 1125 };
+ private static final int[] ID_MAGIC_B_DISABLED = new int[] { 1127, 1128, 1129, 1130 };
+ private static final int[] ID_PLASMA = new int[] { 1196, 1197, 1198 };
+ private static final int[] ID_NAQUADAH = new int[] { 1190, 1191, 1192 };
private static final int getModeFromInventorySlot(ItemStack aStack) {
@@ -214,82 +210,40 @@ public class GregtechMetaTileEntityGeneratorArray
public boolean checkRecipe(ItemStack aStack) {
return false;
- /** this.resetRecipeMapForAllInputHatches();
- * this.mMode = getModeFromInventorySlot(aStack);
- * if (mMode == MODE_NONE) {
- * Logger.INFO("Did not find valid generator.");
- * return false;
- * }
- * else {
- * Logger.INFO("Changed Mode to "+mMode);
- * }
- * int aMulti = this.getGUIItemStack() != null ? this.getGUIItemStack().stackSize : 0;
- * if (aMulti > 16 || aMulti == 0) {
- * return false;
- * }
+ /**
+ * this.resetRecipeMapForAllInputHatches(); this.mMode = getModeFromInventorySlot(aStack); if (mMode ==
+ * MODE_NONE) { Logger.INFO("Did not find valid generator."); return false; } else { Logger.INFO("Changed Mode
+ * to "+mMode); } int aMulti = this.getGUIItemStack() != null ? this.getGUIItemStack().stackSize : 0; if (aMulti
+ * > 16 || aMulti == 0) { return false; }
*
*
*
* ArrayList<FluidStack> tFluids = this.getStoredFluids();
*
- * Collection<GT_Recipe> tRecipeList = this.getRecipeMap().mRecipeList;
- * Logger.INFO("Got Recipe Map");
- * if (tFluids.size() > 0 && tRecipeList != null) {
- * Logger.INFO("Found Fuels for Map.");
- * Iterator<FluidStack> arg3 = tFluids.iterator();
- * int aCount = 0;
- * while (arg3.hasNext()) {
- * FluidStack hatchFluid1 = (FluidStack) arg3.next();
- * Logger.INFO("Iterating Fluid Found "+(aCount++)+" | "+hatchFluid1.getLocalizedName());
+ * Collection<GT_Recipe> tRecipeList = this.getRecipeMap().mRecipeList; Logger.INFO("Got Recipe Map"); if
+ * (tFluids.size() > 0 && tRecipeList != null) { Logger.INFO("Found Fuels for Map."); Iterator<FluidStack> arg3
+ * = tFluids.iterator(); int aCount = 0; while (arg3.hasNext()) { FluidStack hatchFluid1 = (FluidStack)
+ * arg3.next(); Logger.INFO("Iterating Fluid Found "+(aCount++)+" | "+hatchFluid1.getLocalizedName());
* Iterator<GT_Recipe> arg5 = tRecipeList.iterator();
*
- * int Hatch = 0;
- * int totalFuelValue = 0;
- * while (arg5.hasNext()) {
- * Logger.INFO("Iterating Recipe "+(Hatch++));
- * GT_Recipe aFuel = (GT_Recipe) arg5.next();
- * FluidStack tLiquid;
- * boolean addedFuelOnce = false;
- * for (int a = 0; a < aMulti; a++) {
- * if ((tLiquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null
- * && hatchFluid1.isFluidEqual(tLiquid)) {
- * this.fuelConsumption = tLiquid.amount = this.boostEu
- * ? 4096 / aFuel.mSpecialValue
- * : 2048 / aFuel.mSpecialValue;
- * if (this.depleteInput(tLiquid)) {
- * Logger.INFO("Depleted Fuel");
- * this.boostEu = this.depleteInput(Materials.Oxygen.getGas(2L));
+ * int Hatch = 0; int totalFuelValue = 0; while (arg5.hasNext()) { Logger.INFO("Iterating Recipe "+(Hatch++));
+ * GT_Recipe aFuel = (GT_Recipe) arg5.next(); FluidStack tLiquid; boolean addedFuelOnce = false; for (int a = 0;
+ * a < aMulti; a++) { if ((tLiquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) !=
+ * null && hatchFluid1.isFluidEqual(tLiquid)) { this.fuelConsumption = tLiquid.amount = this.boostEu ? 4096 /
+ * aFuel.mSpecialValue : 2048 / aFuel.mSpecialValue; if (this.depleteInput(tLiquid)) { Logger.INFO("Depleted
+ * Fuel"); this.boostEu = this.depleteInput(Materials.Oxygen.getGas(2L));
*
- * /*if (!tFluids.contains(Materials.Lubricant.getFluid(1L))) {
- * Logger.INFO("No Lube.");
- * return false;
- * }*/
+ * /*if (!tFluids.contains(Materials.Lubricant.getFluid(1L))) { Logger.INFO("No Lube."); return false; }
+ */
/**
* if (this.mRuntime % 72 == 0 || this.mRuntime == 0) {
- * this.depleteInput(Materials.Lubricant.getFluid(this.boostEu ? 2L : 1L));
- * }
- * Logger.INFO("ADDING POWER");
- * this.fuelRemaining = hatchFluid1.amount;
- * totalFuelValue++;
- * }
- * }
- * }
- * //Do things after consuming Fuel
- * if (totalFuelValue == aMulti) {
- * this.fuelValue = aFuel.mSpecialValue*aMulti;
- * this.mEUt = this.mEfficiency < 2000 ? 0 : aFuel.mSpecialValue*aMulti;
- * this.mProgresstime = aMulti;
- * this.mMaxProgresstime = aMulti;
- * this.mEfficiencyIncrease = 15*aMulti;
- * return true;
- * }
- * }
- * }
- * }
+ * this.depleteInput(Materials.Lubricant.getFluid(this.boostEu ? 2L : 1L)); } Logger.INFO("ADDING POWER");
+ * this.fuelRemaining = hatchFluid1.amount; totalFuelValue++; } } } //Do things after consuming Fuel if
+ * (totalFuelValue == aMulti) { this.fuelValue = aFuel.mSpecialValue*aMulti; this.mEUt = this.mEfficiency < 2000
+ * ? 0 : aFuel.mSpecialValue*aMulti; this.mProgresstime = aMulti; this.mMaxProgresstime = aMulti;
+ * this.mEfficiencyIncrease = 15*aMulti; return true; } } } }
*
- * this.mEUt = 0;
- * this.mEfficiency = 0;
- * return false;
+ * this.mEUt = 0; this.mEfficiency = 0; return false;
**/
}
@@ -303,25 +257,21 @@ public class GregtechMetaTileEntityGeneratorArray
public IStructureDefinition<GregtechMetaTileEntityGeneratorArray> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntityGeneratorArray>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
- buildHatchAdder(GregtechMetaTileEntityGeneratorArray.class)
- .atLeast(
- InputHatch,
- OutputHatch,
- InputBus,
- OutputBus,
- Maintenance,
- Dynamo.or(TTDynamo),
- Muffler)
- .casingIndex(48)
- .dot(1)
- .buildAndChain(
+ buildHatchAdder(GregtechMetaTileEntityGeneratorArray.class).atLeast(
+ InputHatch,
+ OutputHatch,
+ InputBus,
+ OutputBus,
+ Maintenance,
+ Dynamo.or(TTDynamo),
+ Muffler).casingIndex(48).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings4, 0))))
.build();
}
@@ -381,7 +331,7 @@ public class GregtechMetaTileEntityGeneratorArray
}
/**
- * Code from single blocks
+ * Code from single blocks
*/
public void tryProcessFuelItems(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a) {
if (a != null
@@ -410,9 +360,8 @@ public class GregtechMetaTileEntityGeneratorArray
long tFluidAmountToUse = Math.min(
(long) (mFluid.amount / tEmptyContainer),
(this.maxEUStore() - aBaseMetaTileEntity.getUniversalEnergyStored()) / (long) tFuelValue);
- if (tFluidAmountToUse > 0L
- && aBaseMetaTileEntity.increaseStoredEnergyUnits(
- tFluidAmountToUse * (long) tFuelValue, true)) {
+ if (tFluidAmountToUse > 0L && aBaseMetaTileEntity
+ .increaseStoredEnergyUnits(tFluidAmountToUse * (long) tFuelValue, true)) {
PollutionUtils.addPollution(this.getBaseMetaTileEntity(), 10 * this.getPollutionPerTick(null));
mFluid.amount = (int) ((long) mFluid.amount - tFluidAmountToUse * (long) tEmptyContainer);
}
@@ -423,8 +372,8 @@ public class GregtechMetaTileEntityGeneratorArray
}
if (aBaseMetaTileEntity.isServerSide()) {
- aBaseMetaTileEntity.setActive(aBaseMetaTileEntity.isAllowedToWork()
- && aBaseMetaTileEntity.getUniversalEnergyStored()
+ aBaseMetaTileEntity.setActive(
+ aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.getUniversalEnergyStored()
>= this.maxEUOutput() + this.getMinimumStoredEU());
}
}
@@ -448,8 +397,7 @@ public class GregtechMetaTileEntityGeneratorArray
FluidStack tLiquid;
if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null
&& aLiquid.isFluidEqual(tLiquid)) {
- return (int) ((long) tFuel.mSpecialValue
- * (long) this.mEfficiency
+ return (int) ((long) tFuel.mSpecialValue * (long) this.mEfficiency
* (long) this.consumedFluidPerOperation(tLiquid)
/ 100L);
}
@@ -464,11 +412,12 @@ public class GregtechMetaTileEntityGeneratorArray
public int getFuelValue(ItemStack aStack) {
if (!GT_Utility.isStackInvalid(aStack) && this.getRecipeMap() != null) {
- GT_Recipe tFuel = this.getRecipeMap()
- .findRecipe(
- this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, (FluidStack[]) null, new ItemStack[] {
- aStack
- });
+ GT_Recipe tFuel = this.getRecipeMap().findRecipe(
+ this.getBaseMetaTileEntity(),
+ false,
+ Long.MAX_VALUE,
+ (FluidStack[]) null,
+ new ItemStack[] { aStack });
return tFuel != null ? (int) ((long) tFuel.mSpecialValue * 1000L * (long) this.mEfficiency / 100L) : 0;
} else {
return 0;
@@ -477,13 +426,13 @@ public class GregtechMetaTileEntityGeneratorArray
public ItemStack getEmptyContainer(ItemStack aStack) {
if (!GT_Utility.isStackInvalid(aStack) && this.getRecipeMap() != null) {
- GT_Recipe tFuel = this.getRecipeMap()
- .findRecipe(
- this.getBaseMetaTileEntity(), false, Long.MAX_VALUE, (FluidStack[]) null, new ItemStack[] {
- aStack
- });
- return tFuel != null
- ? GT_Utility.copy(new Object[] {tFuel.getOutput(0)})
+ GT_Recipe tFuel = this.getRecipeMap().findRecipe(
+ this.getBaseMetaTileEntity(),
+ false,
+ Long.MAX_VALUE,
+ (FluidStack[]) null,
+ new ItemStack[] { aStack });
+ return tFuel != null ? GT_Utility.copy(new Object[] { tFuel.getOutput(0) })
: GT_Utility.getContainerItem(aStack, true);
} else {
return null;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
index bf3fbe0477..82f9f6b712 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
@@ -7,10 +7,21 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTEnergy;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.ITree;
import forestry.api.arboriculture.TreeManager;
@@ -38,20 +49,13 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.helpers.TreeFarmHelper;
-import java.util.ArrayList;
-import java.util.HashMap;
-import javax.annotation.Nonnull;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntityTreeFarm>
implements ISurvivalConstructable {
public static int CASING_TEXTURE_ID;
public static String mCasingName = "Sterile Farm Casing";
- // public static TreeGenerator mTreeData;
+ // public static TreeGenerator mTreeData;
public static HashMap<String, ItemStack> sLogCache = new HashMap<>();
private static final int TICKS_PER_OPERATION = 100;
@@ -87,31 +91,19 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Converts EU to Logs")
- .addInfo("Eu Usage: 100% | Parallel: 1")
- .addInfo("Requires a Saw or Chainsaw in GUI slot")
- .addInfo("Output multiplier:")
- .addInfo("Saw = 1x")
- .addInfo("Buzzsaw = 2x")
- .addInfo("Chainsaw = 4x")
+ tt.addMachineType(getMachineType()).addInfo("Converts EU to Logs").addInfo("Eu Usage: 100% | Parallel: 1")
+ .addInfo("Requires a Saw or Chainsaw in GUI slot").addInfo("Output multiplier:").addInfo("Saw = 1x")
+ .addInfo("Buzzsaw = 2x").addInfo("Chainsaw = 4x")
.addInfo("Add a sapling in the input bus to select wood type output")
.addInfo("Tools can also be fed to the controller via input bus")
.addInfo("The working speed is fixed for 5s")
.addInfo("Production Formula: (2 * tier^2 - 2 * tier + 5) * 5 * saw boost")
.addInfo("When fertilizer is insufficient, sapling production reduced to one-tenth")
.addInfo("Forestry saplings can get increased production")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 3, true)
- .addController("Front center")
- .addCasingInfo("Sterile Farm Casing", 8)
- .addInputBus("Any casing", 1)
- .addOutputBus("Any casing", 1)
- .addEnergyHatch("Any casing", 1)
- .addMaintenanceHatch("Any casing", 1)
- .addMufflerHatch("Any casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
+ .addController("Front center").addCasingInfo("Sterile Farm Casing", 8).addInputBus("Any casing", 1)
+ .addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1)
+ .addMufflerHatch("Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -142,6 +134,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
/**
* Method used to get the boost based on the ordinal of the saw
+ *
* @param sawType type of the saw
* @return an int corresponding to the boost
*/
@@ -168,8 +161,8 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
long tVoltage = getMaxInputVoltage();
byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
- int aOutputAmount =
- ((2 * (tTier * tTier)) - (2 * tTier) + 5) * (TICKS_PER_OPERATION / 20) * getSawBoost(mToolType);
+ int aOutputAmount = ((2 * (tTier * tTier)) - (2 * tTier) + 5) * (TICKS_PER_OPERATION / 20)
+ * getSawBoost(mToolType);
int aFert = hasLiquidFert();
ItemStack[] toOutput;
@@ -178,10 +171,10 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
aOutputAmount /= 10;
}
int amplifiedOutputAmount = (int) (aOutputAmount * saplingsModifier);
- toOutput = new ItemStack[] {ItemUtils.getSimpleStack(mSapling, amplifiedOutputAmount)};
+ toOutput = new ItemStack[] { ItemUtils.getSimpleStack(mSapling, amplifiedOutputAmount) };
} else { // Log
int amplifiedOutputAmount = (int) (aOutputAmount * heightModifier * girthModifier);
- toOutput = new ItemStack[] {ItemUtils.getSimpleStack(mWood, amplifiedOutputAmount)};
+ toOutput = new ItemStack[] { ItemUtils.getSimpleStack(mWood, amplifiedOutputAmount) };
}
GT_Recipe tRecipe = new GT_Recipe(null, toOutput, null, null, null, null, 0, 0, 0);
@@ -241,25 +234,21 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
public IStructureDefinition<GregtechMetaTileEntityTreeFarm> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntityTreeFarm>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"C~C", "C-C", "CCC"},
- {"CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "C~C", "C-C", "CCC" },
+ { "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
- buildHatchAdder(GregtechMetaTileEntityTreeFarm.class)
- .atLeast(
- InputHatch,
- OutputHatch,
- InputBus,
- OutputBus,
- Maintenance,
- Energy.or(TTEnergy),
- Muffler)
- .casingIndex(CASING_TEXTURE_ID)
- .dot(1)
- .buildAndChain(
+ buildHatchAdder(GregtechMetaTileEntityTreeFarm.class).atLeast(
+ InputHatch,
+ OutputHatch,
+ InputBus,
+ OutputBus,
+ Maintenance,
+ Energy.or(TTEnergy),
+ Muffler).casingIndex(CASING_TEXTURE_ID).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 15))))
.build();
}
@@ -278,8 +267,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
@Override
public int getDamageToComponent(final ItemStack aStack) {
- return MathUtils.balance(
- (int) (75 - ((GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).getMass()))), 5, 120);
+ return MathUtils.balance((int) (75 - ((GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).getMass()))), 5, 120);
}
@Override
@@ -336,9 +324,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
this.saplingsModifier = Math.max(tree.getGenome().getFertility() * 20, 1);
this.girthModifier = tree.getGenome().getGirth();
boolean fireproof = ((IAlleleBoolean) tree.getGenome()
- .getChromosomes()[EnumTreeChromosome.FIREPROOF.ordinal()]
- .getActiveAllele())
- .getValue();
+ .getChromosomes()[EnumTreeChromosome.FIREPROOF.ordinal()].getActiveAllele()).getValue();
aWood = sLogCache.get(tree.getIdent() + (fireproof ? "fireproof" : ""));
@@ -355,9 +341,8 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
public static void loadMapWoodFromSapling() {
// galaxySpace
- mapSaplingToLog(
- "GalaxySpace:barnardaCsapling:1",
- GT_ModHandler.getModItem("GalaxySpace", "barnardaClog", 1)); // barnarda c
+ mapSaplingToLog("GalaxySpace:barnardaCsapling:1", GT_ModHandler.getModItem("GalaxySpace", "barnardaClog", 1)); // barnarda
+ // c
// minecraft
mapSaplingToLog("minecraft:sapling:0", new ItemStack(Blocks.log, 1, 0)); // oak
@@ -387,48 +372,32 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
mapSaplingToLog("Natura:Rare Sapling:4", GT_ModHandler.getModItem("Natura", "willow", 1, 0)); // willow
// BOP
- mapSaplingToLog(
- "BiomesOPlenty:colorizedSaplings:0",
- GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 0)); // Sacred Oak
- mapSaplingToLog(
- "BiomesOPlenty:colorizedSaplings:1",
- GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 2)); // Mangrove
- mapSaplingToLog(
- "BiomesOPlenty:colorizedSaplings:2", GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 3)); // Palm
- mapSaplingToLog(
- "BiomesOPlenty:colorizedSaplings:3",
- GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 0)); // Redwood
- mapSaplingToLog(
- "BiomesOPlenty:colorizedSaplings:4",
- GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 1)); // Willow
- mapSaplingToLog(
- "BiomesOPlenty:colorizedSaplings:5", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 0)); // Pine
- mapSaplingToLog(
- "BiomesOPlenty:colorizedSaplings:6",
- GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 3)); // Mahogany
- mapSaplingToLog(
- "BiomesOPlenty:saplings:2", GT_ModHandler.getModItem("BiomesOPlenty", "bamboo", 1, 0)); // Bamboo
+ mapSaplingToLog("BiomesOPlenty:colorizedSaplings:0", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 0)); // Sacred
+ // Oak
+ mapSaplingToLog("BiomesOPlenty:colorizedSaplings:1", GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 2)); // Mangrove
+ mapSaplingToLog("BiomesOPlenty:colorizedSaplings:2", GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 3)); // Palm
+ mapSaplingToLog("BiomesOPlenty:colorizedSaplings:3", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 0)); // Redwood
+ mapSaplingToLog("BiomesOPlenty:colorizedSaplings:4", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 1)); // Willow
+ mapSaplingToLog("BiomesOPlenty:colorizedSaplings:5", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 0)); // Pine
+ mapSaplingToLog("BiomesOPlenty:colorizedSaplings:6", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 3)); // Mahogany
+ mapSaplingToLog("BiomesOPlenty:saplings:2", GT_ModHandler.getModItem("BiomesOPlenty", "bamboo", 1, 0)); // Bamboo
mapSaplingToLog("BiomesOPlenty:saplings:3", GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 1)); // Magic
mapSaplingToLog("BiomesOPlenty:saplings:4", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 2)); // Dark
- mapSaplingToLog(
- "BiomesOPlenty:saplings:5", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 2)); // Dying/Dead
+ mapSaplingToLog("BiomesOPlenty:saplings:5", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 2)); // Dying/Dead
mapSaplingToLog("BiomesOPlenty:saplings:6", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 3)); // Fir
- mapSaplingToLog(
- "BiomesOPlenty:saplings:7", GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 0)); // Ethereal
- mapSaplingToLog(
- "BiomesOPlenty:saplings:10", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 1)); // Pink Cherry
- mapSaplingToLog(
- "BiomesOPlenty:saplings:12", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 1)); // White Cherry
- mapSaplingToLog(
- "BiomesOPlenty:saplings:13", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 1)); // Hellbark
- mapSaplingToLog(
- "BiomesOPlenty:saplings:14", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 2)); // Jacaranda
- mapSaplingToLog(
- "minecraft:yellow_flower:0",
- GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 3)); // Giant Flower Stem
- mapSaplingToLog(
- "minecraft:red_flower:0",
- GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 3)); // Giant Flower Stem
+ mapSaplingToLog("BiomesOPlenty:saplings:7", GT_ModHandler.getModItem("BiomesOPlenty", "logs2", 1, 0)); // Ethereal
+ mapSaplingToLog("BiomesOPlenty:saplings:10", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 1)); // Pink
+ // Cherry
+ mapSaplingToLog("BiomesOPlenty:saplings:12", GT_ModHandler.getModItem("BiomesOPlenty", "logs1", 1, 1)); // White
+ // Cherry
+ mapSaplingToLog("BiomesOPlenty:saplings:13", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 1)); // Hellbark
+ mapSaplingToLog("BiomesOPlenty:saplings:14", GT_ModHandler.getModItem("BiomesOPlenty", "logs4", 1, 2)); // Jacaranda
+ mapSaplingToLog("minecraft:yellow_flower:0", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 3)); // Giant
+ // Flower
+ // Stem
+ mapSaplingToLog("minecraft:red_flower:0", GT_ModHandler.getModItem("BiomesOPlenty", "logs3", 1, 3)); // Giant
+ // Flower
+ // Stem
// Witchery
mapSaplingToLog("witchery:witchsapling:0", GT_ModHandler.getModItem("witchery", "witchlog", 1, 0)); // Rowan
@@ -436,9 +405,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
mapSaplingToLog("witchery:witchsapling:2", GT_ModHandler.getModItem("witchery", "witchlog", 1, 2)); // Hawthorn
// TConstruct
- mapSaplingToLog(
- "TConstruct:slime.sapling:0",
- GT_ModHandler.getModItem("TConstruct", "slime.gel", 1)); // green slime blocks
+ mapSaplingToLog("TConstruct:slime.sapling:0", GT_ModHandler.getModItem("TConstruct", "slime.gel", 1)); // green
+ // slime
+ // blocks
// TaintedMagic
mapSaplingToLog(
@@ -457,14 +426,12 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
mapSaplingToLog(
"miscutils:blockRainforestOakSapling:0",
GT_ModHandler.getModItem("miscutils", "blockRainforestOakLog", 1)); // rainforest
- mapSaplingToLog(
- "miscutils:blockPineSapling:0", GT_ModHandler.getModItem("miscutils", "blockPineLogLog", 1)); // pine
+ mapSaplingToLog("miscutils:blockPineSapling:0", GT_ModHandler.getModItem("miscutils", "blockPineLogLog", 1)); // pine
// Harvestcraft
mapSaplingToLog("harvestcraft:pampistachioSapling:0", new ItemStack(Blocks.log, 1, 3)); // Pistachio
mapSaplingToLog("harvestcraft:pampapayaSapling:0", new ItemStack(Blocks.log, 1, 3)); // Papaya
- mapSaplingToLog(
- "harvestcraft:pammapleSapling:0", GT_ModHandler.getModItem("harvestcraft", "pamMaple", 1)); // Maple
+ mapSaplingToLog("harvestcraft:pammapleSapling:0", GT_ModHandler.getModItem("harvestcraft", "pamMaple", 1)); // Maple
mapSaplingToLog("harvestcraft:pamappleSapling:0", new ItemStack(Blocks.log, 1, 0)); // Apple
mapSaplingToLog("harvestcraft:pamdateSapling:0", new ItemStack(Blocks.log, 1, 3)); // Date
mapSaplingToLog("harvestcraft:pamorangeSapling:0", new ItemStack(Blocks.log, 1, 3)); // Orange
@@ -542,17 +509,12 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
// Thaumic Bases
mapSaplingToLog("thaumicbases:goldenOakSapling:0", new ItemStack(Blocks.log, 1, 0)); // Golden Oak
- mapSaplingToLog(
- "thaumicbases:goldenOakSapling:1",
- GT_ModHandler.getModItem("thaumicbases", "genLogs", 1, 0)); // Peaceful
- mapSaplingToLog(
- "thaumicbases:goldenOakSapling:2", GT_ModHandler.getModItem("thaumicbases", "genLogs", 1, 1)); // Nether
- mapSaplingToLog(
- "thaumicbases:goldenOakSapling:3", GT_ModHandler.getModItem("thaumicbases", "genLogs", 1, 2)); // Ender
+ mapSaplingToLog("thaumicbases:goldenOakSapling:1", GT_ModHandler.getModItem("thaumicbases", "genLogs", 1, 0)); // Peaceful
+ mapSaplingToLog("thaumicbases:goldenOakSapling:2", GT_ModHandler.getModItem("thaumicbases", "genLogs", 1, 1)); // Nether
+ mapSaplingToLog("thaumicbases:goldenOakSapling:3", GT_ModHandler.getModItem("thaumicbases", "genLogs", 1, 2)); // Ender
// Forbidden Magic
- mapSaplingToLog(
- "ForbiddenMagic:TaintSapling:0", GT_ModHandler.getModItem("ForbiddenMagic", "TaintLog", 1)); // Tainted
+ mapSaplingToLog("ForbiddenMagic:TaintSapling:0", GT_ModHandler.getModItem("ForbiddenMagic", "TaintLog", 1)); // Tainted
}
@Override
@@ -580,20 +542,22 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
public static boolean addFakeRecipeToNEI(@Nonnull ItemStack aSapling, ItemStack aLog) {
int aRecipes = GTPP_Recipe_Map.sTreeSimFakeRecipes.mRecipeList.size();
- Logger.INFO("Adding Tree Growth Simulation for " + aSapling.getDisplayName() + " -> "
- + (aLog == null ? "NULL" : aLog.getDisplayName()));
- ItemStack[] aOutput = new ItemStack[] {aLog, aSapling};
+ Logger.INFO(
+ "Adding Tree Growth Simulation for " + aSapling.getDisplayName()
+ + " -> "
+ + (aLog == null ? "NULL" : aLog.getDisplayName()));
+ ItemStack[] aOutput = new ItemStack[] { aLog, aSapling };
String aOutputs = ItemUtils.getArrayStackNames(aOutput);
Logger.INFO("" + aOutputs);
ItemStack inputStack = aSapling.copy();
inputStack.stackSize = 0;
GTPP_Recipe_Map.sTreeSimFakeRecipes.addFakeRecipe(
false,
- new ItemStack[] {inputStack},
+ new ItemStack[] { inputStack },
aOutput,
null,
- new int[] {10000, 1000},
- new FluidStack[] {FluidUtils.getFluidStack(ModItems.fluidFertBasic, 1)},
+ new int[] { 10000, 1000 },
+ new FluidStack[] { FluidUtils.getFluidStack(ModItems.fluidFertBasic, 1) },
new FluidStack[] {},
1,
sRecipeID++,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
index 64f04e530d..7903a86868 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
@@ -6,10 +6,21 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.StatCollector;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -27,18 +38,9 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_AlloyBlastSmelter
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_AlloyBlastSmelter>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_AlloyBlastSmelter extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_AlloyBlastSmelter> implements ISurvivalConstructable {
private int mMode = 0;
private boolean isUsingControllerCircuit = false;
@@ -80,24 +82,15 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Alloy Blast Smelter")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Alloy Blast Smelter")
.addInfo("20% Faster than the Electric Blast Furnace")
- .addInfo("Allows Complex GT++ alloys to be created")
- .addInfo("Accepts only one Energy Hatch")
+ .addInfo("Allows Complex GT++ alloys to be created").addInfo("Accepts only one Energy Hatch")
.addInfo("Circuit for recipe goes in the Input Bus or GUI slot")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 4, 3, true)
- .addController("Bottom Center")
- .addCasingInfo("Blast Smelter Casings", 5)
- .addCasingInfo("Blast Smelter Heat Containment Coils", 16)
- .addInputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 4, 3, true)
+ .addController("Bottom Center").addCasingInfo("Blast Smelter Casings", 5)
+ .addCasingInfo("Blast Smelter Heat Containment Coils", 16).addInputBus("Any Casing", 1)
+ .addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
+ .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -106,22 +99,18 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
public IStructureDefinition<GregtechMetaTileEntity_AlloyBlastSmelter> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_AlloyBlastSmelter>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"HHH", "H-H", "HHH"},
- {"HHH", "H-H", "HHH"},
- {"C~C", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "HHH", "H-H", "HHH" },
+ { "HHH", "H-H", "HHH" }, { "C~C", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_AlloyBlastSmelter.class)
.atLeast(InputBus, InputHatch, OutputBus, OutputHatch, Maintenance, Energy, Muffler)
- .casingIndex(TAE.GTPP_INDEX(15))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.GTPP_INDEX(15)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 15))))
- .addElement('H', ofBlock(ModBlocks.blockCasingsMisc, 14))
- .build();
+ .addElement('H', ofBlock(ModBlocks.blockCasingsMisc, 14)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -245,7 +234,11 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
}
tInputs = tInputList.toArray(new ItemStack[0]);
tRecipe = GTPP_Recipe.GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.findRecipe(
- this.getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs);
+ this.getBaseMetaTileEntity(),
+ false,
+ gregtech.api.enums.GT_Values.V[tTier],
+ tFluids,
+ tInputs);
}
// Validity check
@@ -277,7 +270,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
this.lEUt = (-this.lEUt);
}
this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
- this.mOutputFluids = new FluidStack[] {tRecipe.getFluidOutput(0)};
+ this.mOutputFluids = new FluidStack[] { tRecipe.getFluidOutput(0) };
List<ItemStack> tOutPutItems = new ArrayList<ItemStack>();
for (ItemStack tOut : tRecipe.mOutputs) {
if (ItemUtils.checkForInvalidItems(tOut)) {
@@ -299,7 +292,8 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
isBussesSeparate = !isBussesSeparate;
GT_Utility.sendChatToPlayer(
- aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + isBussesSeparate);
+ aPlayer,
+ StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + isBussesSeparate);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
index 52c8919691..2fced531a5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
@@ -6,10 +6,18 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
@@ -26,11 +34,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Cyclotron>
implements ISurvivalConstructable {
@@ -83,70 +86,31 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
@Override
public IStructureDefinition<GregtechMetaTileEntity_Cyclotron> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Cyclotron>builder()
- .addShape(mName, transpose(new String[][] {
- {
- " ",
- " hhh ",
- " hh hh ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " hh hh ",
- " hhh ",
- " ",
- },
- {
- " hhh ",
- " hhccchh ",
- " hcchhhcch ",
- " hchh hhch ",
- " hch hch ",
- " hch hch ",
- "hch hch",
- "hch hch",
- "hch hch",
- " hch hch ",
- " hch hch ",
- " hchh hhch ",
- " hcch~hcch ",
- " hhccchh ",
- " hhh ",
- },
- {
- " ",
- " hhh ",
- " hh hh ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " h h ",
- " hh hh ",
- " hhh ",
- " ",
- }
- }))
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Cyclotron>builder().addShape(
+ mName,
+ transpose(
+ new String[][] {
+ { " ", " hhh ", " hh hh ", " h h ",
+ " h h ", " h h ", " h h ", " h h ",
+ " h h ", " h h ", " h h ", " h h ",
+ " hh hh ", " hhh ", " ", },
+ { " hhh ", " hhccchh ", " hcchhhcch ", " hchh hhch ",
+ " hch hch ", " hch hch ", "hch hch", "hch hch",
+ "hch hch", " hch hch ", " hch hch ", " hchh hhch ",
+ " hcch~hcch ", " hhccchh ", " hhh ", },
+ { " ", " hhh ", " hh hh ", " h h ",
+ " h h ", " h h ", " h h ", " h h ",
+ " h h ", " h h ", " h h ", " h h ",
+ " hh hh ", " hhh ", " ", } }))
.addElement(
'h',
buildHatchAdder(GregtechMetaTileEntity_Cyclotron.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
- .casingIndex(44)
- .dot(1)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
- .addElement('c', ofBlock(getCyclotronCoil(), getCyclotronCoilMeta()))
- .build();
+ .casingIndex(44).dot(1).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing,
+ ofBlock(getCasingBlock(), getCasingMeta()))))
+ .addElement('c', ofBlock(getCyclotronCoil(), getCyclotronCoilMeta())).build();
}
return STRUCTURE_DEFINITION;
}
@@ -187,29 +151,18 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Super Magnetic Speed Shooter")
- .addSeparator()
+ tt.addMachineType(getMachineType()).addInfo("Super Magnetic Speed Shooter").addSeparator()
.addInfo("Particles are accelerated over 186 revolutions to 80% light speed")
.addInfo("Can produce a continuous beam current of 2.2 mA at 590 MeV")
- .addInfo("Which will be extracted from the Isochronous Cyclotron")
- .addSeparator()
+ .addInfo("Which will be extracted from the Isochronous Cyclotron").addSeparator()
.addInfo("Consists of the same layout as a Fusion Reactor")
.addInfo("Any external casing can be a hatch/bus, unlike Fusion")
.addInfo("Cyclotron Machine Casings around Cyclotron Coil Blocks")
- .addInfo("All Hatches must be IV or better")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .addCasingInfo("Cyclotron Machine Casings", 40)
- .addCasingInfo("Cyclotron Coil", 32)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addInfo("All Hatches must be IV or better").addPollutionAmount(getPollutionPerSecond(null))
+ .addSeparator().addCasingInfo("Cyclotron Machine Casings", 40).addCasingInfo("Cyclotron Coil", 32)
+ .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1)
+ .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
+ .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -243,9 +196,9 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
@Override
public boolean checkRecipe(ItemStack aStack) {
- /*if (CORE.DEVENV) {
- return this.checkRecipeGeneric();
- }*/
+ /*
+ * if (CORE.DEVENV) { return this.checkRecipeGeneric(); }
+ */
this.fixAllMaintenanceIssue();
// log("Recipe Check.");
@@ -257,7 +210,11 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
GT_Recipe tRecipe = GTPP_Recipe.GTPP_Recipe_Map.sCyclotronRecipes.findRecipe(
- getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluidInputs, tItemInputs);
+ getBaseMetaTileEntity(),
+ false,
+ gregtech.api.enums.GT_Values.V[tTier],
+ tFluidInputs,
+ tItemInputs);
if (tRecipe != null) {
if (tRecipe.isRecipeInputEqual(true, tFluidInputs, tItemInputs)) {
@@ -293,18 +250,20 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
if (s.getItem() instanceof IonParticles) {
long aCharge = IonParticles.getChargeState(s);
if (aCharge == 0) {
- IonParticles.setChargeState(s, MathUtils.getRandomFromArray(new int[] {
- -5, -5, -4, -4, -4, -3, -3, -3, -3, -3, -2, -2, -2, -2, -2, -2, -2, -1, -1, -1, -1,
- -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6
- }));
+ IonParticles.setChargeState(
+ s,
+ MathUtils.getRandomFromArray(
+ new int[] { -5, -5, -4, -4, -4, -3, -3, -3, -3, -3, -2, -2, -2, -2, -2,
+ -2, -2, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3,
+ 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6 }));
}
}
}
}
this.mOutputItems = outputs;
- this.mOutputFluids = new FluidStack[] {tRecipe.getFluidOutput(0)};
+ this.mOutputFluids = new FluidStack[] { tRecipe.getFluidOutput(0) };
this.updateSlots();
return true;
}
@@ -332,11 +291,13 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
if (s.getItem() instanceof IonParticles) {
long aCharge = IonParticles.getChargeState(s);
if (aCharge == 0) {
- IonParticles.setChargeState(s, MathUtils.getRandomFromArray(new int[] {
- -5, -5, -4, -4, -4, -3, -3, -3, -3, -3, -2, -2, -2, -2, -2, -2, -2, -1, -1, -1,
- -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6
- }));
+ IonParticles.setChargeState(
+ s,
+ MathUtils.getRandomFromArray(
+ new int[] { -5, -5, -4, -4, -4, -3, -3, -3, -3, -3, -2, -2, -2, -2,
+ -2, -2, -2, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 6, 6 }));
}
}
}
@@ -380,11 +341,8 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
}
}
- return new String[] {
- "COMET - Compact Cyclotron MK " + tier,
- "EU Required: " + powerRequired + "EU/t",
- "Stored EU: " + this.getEUVar() + " / " + maxEUStore()
- };
+ return new String[] { "COMET - Compact Cyclotron MK " + tier, "EU Required: " + powerRequired + "EU/t",
+ "Stored EU: " + this.getEUVar() + " / " + maxEUStore() };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
index 7422426669..1188cbe278 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
@@ -7,11 +7,24 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.WeightedRandomFishable;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
@@ -29,20 +42,9 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import ic2.core.init.BlocksItems;
import ic2.core.init.InternalName;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.WeightedRandomFishable;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialFishingPond
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialFishingPond>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialFishingPond extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialFishingPond> implements ISurvivalConstructable {
private boolean isUsingControllerCircuit = false;
private static final Item circuit = CI.getNumberedCircuit(0).getItem();
@@ -75,26 +77,14 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Fishing Pond")
- .addInfo("Can process (Tier + 1) * 2 recipes")
- .addInfo("Put a numbered circuit into the input bus.")
- .addInfo("Circuit 14 for Fish")
- .addInfo("Circuit 15 for Junk")
- .addInfo("Circuit 16 for Treasure")
- .addInfo("Need to be filled with water.")
- .addInfo("Will automatically fill water from input hatch.")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(9, 3, 9, true)
- .addController("Front Center")
- .addCasingInfo("Aquatic Casings", 64)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Fishing Pond")
+ .addInfo("Can process (Tier + 1) * 2 recipes").addInfo("Put a numbered circuit into the input bus.")
+ .addInfo("Circuit 14 for Fish").addInfo("Circuit 15 for Junk").addInfo("Circuit 16 for Treasure")
+ .addInfo("Need to be filled with water.").addInfo("Will automatically fill water from input hatch.")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(9, 3, 9, true)
+ .addController("Front Center").addCasingInfo("Aquatic Casings", 64).addInputBus("Any Casing", 1)
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
+ .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -109,49 +99,24 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
public IStructureDefinition<GregtechMetaTileEntity_IndustrialFishingPond> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialFishingPond>builder()
- .addShape(mName, transpose(new String[][] {
- {
- "XXXXXXXXX",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "XXXXXXXXX"
- },
- {
- "XXXX~XXXX",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "XXXXXXXXX"
- },
- {
- "XXXXXXXXX",
- "XXXXXXXXX",
- "XXXXXXXXX",
- "XXXXXXXXX",
- "XXXXXXXXX",
- "XXXXXXXXX",
- "XXXXXXXXX",
- "XXXXXXXXX",
- "XXXXXXXXX"
- },
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] {
+ { "XXXXXXXXX", "X X", "X X", "X X", "X X",
+ "X X", "X X", "X X", "XXXXXXXXX" },
+ { "XXXX~XXXX", "X X", "X X", "X X", "X X",
+ "X X", "X X", "X X", "XXXXXXXXX" },
+ { "XXXXXXXXX", "XXXXXXXXX", "XXXXXXXXX", "XXXXXXXXX", "XXXXXXXXX",
+ "XXXXXXXXX", "XXXXXXXXX", "XXXXXXXXX", "XXXXXXXXX" }, }))
.addElement(
'X',
buildHatchAdder(GregtechMetaTileEntity_IndustrialFishingPond.class)
.atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing,
+ ofBlock(getCasingBlock(), getCasingMeta()))))
.build();
}
return STRUCTURE_DEFINITION;
@@ -296,10 +261,10 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
// if (aBaseMetaTileEntity.fac)
- final int xDir =
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * mCurrentDirectionX;
- final int zDir =
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * mCurrentDirectionZ;
+ final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX
+ * mCurrentDirectionX;
+ final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ
+ * mCurrentDirectionZ;
int tAmount = 0;
for (int i = mOffsetX_Lower + 1; i <= mOffsetX_Upper - 1; ++i) {
@@ -315,13 +280,11 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
// Utils.LOG_WARNING("Going to try swap an air block for water from inut bus.");
stored.amount -= 1000;
Block fluidUsed = Blocks.water;
- aBaseMetaTileEntity
- .getWorld()
- .setBlock(
- aBaseMetaTileEntity.getXCoord() + xDir + i,
- aBaseMetaTileEntity.getYCoord() + h,
- aBaseMetaTileEntity.getZCoord() + zDir + j,
- fluidUsed);
+ aBaseMetaTileEntity.getWorld().setBlock(
+ aBaseMetaTileEntity.getXCoord() + xDir + i,
+ aBaseMetaTileEntity.getYCoord() + h,
+ aBaseMetaTileEntity.getZCoord() + zDir + j,
+ fluidUsed);
}
}
}
@@ -346,8 +309,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
}
private boolean isNotStaticWater(Block block, byte meta) {
- return block == Blocks.air
- || block == Blocks.flowing_water
+ return block == Blocks.air || block == Blocks.flowing_water
|| block == BlocksItems.getFluidBlock(InternalName.fluidDistilledWater)
|| (cofhWater != null && cofhWater.isAssignableFrom(block.getClass()) && meta != 0);
}
@@ -418,8 +380,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
}
// reflection map
- private static Map<WeightedRandomFishable, ItemStack> reflectiveFishMap =
- new HashMap<WeightedRandomFishable, ItemStack>();
+ private static Map<WeightedRandomFishable, ItemStack> reflectiveFishMap = new HashMap<WeightedRandomFishable, ItemStack>();
private ItemStack reflectiveFish(WeightedRandomFishable y) {
if (reflectiveFishMap.containsKey(y)) {
@@ -427,13 +388,11 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
}
ItemStack t;
try {
- t = (ItemStack) ReflectionUtils.getField(WeightedRandomFishable.class, "field_150711_b")
- .get(y);
+ t = (ItemStack) ReflectionUtils.getField(WeightedRandomFishable.class, "field_150711_b").get(y);
ItemStack k = ItemUtils.getSimpleStack(t, 1);
reflectiveFishMap.put(y, k);
return t;
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
return null;
}
@@ -441,39 +400,36 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
ItemStack[] mFishOutput = new ItemStack[this.mMax];
if (this.mMode == 14) {
for (int k = 0; k < this.mMax; k++) {
- if (mFishOutput[k] == null)
- for (WeightedRandomFishable g : categoryFish.values()) {
- if (MathUtils.randInt(0, (65 - getMaxParallelRecipes())) <= 2) {
- ItemStack t = reflectiveFish(g);
- if (t != null) {
- mFishOutput[k] = ItemUtils.getSimpleStack(t, 1);
- }
+ if (mFishOutput[k] == null) for (WeightedRandomFishable g : categoryFish.values()) {
+ if (MathUtils.randInt(0, (65 - getMaxParallelRecipes())) <= 2) {
+ ItemStack t = reflectiveFish(g);
+ if (t != null) {
+ mFishOutput[k] = ItemUtils.getSimpleStack(t, 1);
}
}
+ }
}
} else if (this.mMode == 15) {
for (int k = 0; k < this.mMax; k++) {
- if (mFishOutput[k] == null)
- for (WeightedRandomFishable g : categoryJunk.values()) {
- if (MathUtils.randInt(0, 100) <= 1) {
- ItemStack t = reflectiveFish(g);
- if (t != null) {
- mFishOutput[k] = ItemUtils.getSimpleStack(t, 1);
- }
+ if (mFishOutput[k] == null) for (WeightedRandomFishable g : categoryJunk.values()) {
+ if (MathUtils.randInt(0, 100) <= 1) {
+ ItemStack t = reflectiveFish(g);
+ if (t != null) {
+ mFishOutput[k] = ItemUtils.getSimpleStack(t, 1);
}
}
+ }
}
} else if (this.mMode == 16) {
for (int k = 0; k < this.mMax; k++) {
- if (mFishOutput[k] == null)
- for (WeightedRandomFishable g : categoryLoot.values()) {
- if (MathUtils.randInt(0, 1000) <= 2) {
- ItemStack t = reflectiveFish(g);
- if (t != null) {
- mFishOutput[k] = ItemUtils.getSimpleStack(t, 1);
- }
+ if (mFishOutput[k] == null) for (WeightedRandomFishable g : categoryLoot.values()) {
+ if (MathUtils.randInt(0, 1000) <= 2) {
+ ItemStack t = reflectiveFish(g);
+ if (t != null) {
+ mFishOutput[k] = ItemUtils.getSimpleStack(t, 1);
}
}
+ }
}
} else {
mFishOutput = null;
@@ -482,13 +438,8 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
// Control Core to control the Multiblocks behaviour.
int aControlCoreTier = getControlCoreTier();
@@ -517,23 +468,26 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
getCircuit(aItemInputs);
/*
- * GT_Recipe tRecipe = this.getRecipeMap().findRecipe( getBaseMetaTileEntity(),
- * mLastRecipe, false, gregtech.api.enums.GT_Values.V[tTier], aFluidInputs,
- * aItemInputs);
+ * GT_Recipe tRecipe = this.getRecipeMap().findRecipe( getBaseMetaTileEntity(), mLastRecipe, false,
+ * gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs);
*/
ItemStack[] mFishOutput = generateLoot(this.mMode);
mFishOutput = removeNulls(mFishOutput);
GT_Recipe g = new GTPP_Recipe(
- true, new ItemStack[] {}, mFishOutput, null, new int[] {}, aFluidInputs, mOutputFluids, 200, 16, 0);
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(g)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ true,
+ new ItemStack[] {},
+ mFishOutput,
+ null,
+ new int[] {},
+ aFluidInputs,
+ mOutputFluids,
+ 200,
+ 16,
+ 0);
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(g).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -551,14 +505,10 @@ public class GregtechMetaTileEntity_IndustrialFishingPond
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(g.mEUt)
- .setEUt(tEnergy)
- .setDuration(g.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(g.mEUt).setEUt(tEnergy)
+ .setDuration(g.mDuration).setEUtDiscount(aEUPercent / 100.0f)
.setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel()))
- .calculate();
+ .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
index 99c08bd17b..8c2b1dfc0c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
@@ -8,10 +8,19 @@ import static gregtech.api.enums.GT_Values.E;
import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -28,16 +37,9 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.HashSet;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_IndustrialRockBreaker
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialRockBreaker>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_IndustrialRockBreaker extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialRockBreaker> implements ISurvivalConstructable {
private int mCasing;
private static IStructureDefinition<GregtechMetaTileEntity_IndustrialRockBreaker> STRUCTURE_DEFINITION = null;
@@ -63,24 +65,14 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Rock Breaker")
- .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 8")
- .addInfo("Circuit goes in the GUI slot")
- .addInfo("1 = cobble, 2 = stone, 3 = obsidian")
- .addInfo("Supply Water/Lava")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 4, 3, true)
- .addController("Bottom Center")
- .addCasingInfo("Thermal Processing Casing", 9)
- .addCasingInfo("Thermal Containment Casing", 16)
- .addInputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Industrial Rock Breaker")
+ .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 8").addInfo("Circuit goes in the GUI slot")
+ .addInfo("1 = cobble, 2 = stone, 3 = obsidian").addInfo("Supply Water/Lava")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 4, 3, true)
+ .addController("Bottom Center").addCasingInfo("Thermal Processing Casing", 9)
+ .addCasingInfo("Thermal Containment Casing", 16).addInputBus("Any Casing", 1)
+ .addInputHatch("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1)
+ .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -89,22 +81,18 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker
public IStructureDefinition<GregtechMetaTileEntity_IndustrialRockBreaker> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialRockBreaker>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCC", "CCC", "CCC"},
- {"HHH", "H-H", "HHH"},
- {"HHH", "H-H", "HHH"},
- {"C~C", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCC", "CCC", "CCC" }, { "HHH", "H-H", "HHH" },
+ { "HHH", "H-H", "HHH" }, { "C~C", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialRockBreaker.class)
.atLeast(InputBus, InputHatch, OutputBus, Maintenance, Energy, Muffler)
- .casingIndex(TAE.GTPP_INDEX(16))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.GTPP_INDEX(16)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 0))))
- .addElement('H', ofBlock(ModBlocks.blockCasings2Misc, 11))
- .build();
+ .addElement('H', ofBlock(ModBlocks.blockCasings2Misc, 11)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -171,7 +159,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker
if (sRecipe_Cobblestone == null || sRecipe_SmoothStone == null || sRecipe_Redstone == null) {
generateRecipes();
}
- FluidStack[] aInputFluids = new FluidStack[] {FluidUtils.getWater(1000), FluidUtils.getLava(1000)};
+ FluidStack[] aInputFluids = new FluidStack[] { FluidUtils.getWater(1000), FluidUtils.getLava(1000) };
GT_Recipe aTemp = sRecipe_Cobblestone.copy();
aTemp.mFluidInputs = aInputFluids;
sFakeRecipeMap.add(aTemp);
@@ -203,10 +191,10 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker
private static final void generateRecipes() {
sRecipe_Cobblestone = new GTPP_Recipe(
false,
- new ItemStack[] {CI.getNumberedCircuit(1)},
- new ItemStack[] {ItemUtils.getSimpleStack(Blocks.cobblestone)},
+ new ItemStack[] { CI.getNumberedCircuit(1) },
+ new ItemStack[] { ItemUtils.getSimpleStack(Blocks.cobblestone) },
null,
- new int[] {10000},
+ new int[] { 10000 },
null,
null,
16,
@@ -214,10 +202,10 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker
0);
sRecipe_SmoothStone = new GTPP_Recipe(
false,
- new ItemStack[] {CI.getNumberedCircuit(2)},
- new ItemStack[] {ItemUtils.getSimpleStack(Blocks.stone)},
+ new ItemStack[] { CI.getNumberedCircuit(2) },
+ new ItemStack[] { ItemUtils.getSimpleStack(Blocks.stone) },
null,
- new int[] {10000},
+ new int[] { 10000 },
null,
null,
16,
@@ -225,12 +213,11 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker
0);
sRecipe_Redstone = new GTPP_Recipe(
false,
- new ItemStack[] {
- CI.getNumberedCircuit(3), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)
- },
- new ItemStack[] {ItemUtils.getSimpleStack(Blocks.obsidian)},
+ new ItemStack[] { CI.getNumberedCircuit(3),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L) },
+ new ItemStack[] { ItemUtils.getSimpleStack(Blocks.obsidian) },
null,
- new int[] {10000},
+ new int[] { 10000 },
null,
null,
128,
@@ -256,7 +243,8 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker
if (!aItems.isEmpty()) {
for (ItemStack aItem : aItems) {
if (GT_Utility.areStacksEqual(
- aItem, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) {
+ aItem,
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) {
aHasRedstone = true;
break;
}
@@ -315,14 +303,9 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker
int aEUPercent = getEuDiscountForParallelism();
int aSpeedBonusPercent = 200;
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -340,14 +323,10 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
.setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel()))
- .calculate();
+ .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
index d5a7316b28..b9658fcd7b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
@@ -8,11 +8,20 @@ import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.AirIntake;
import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo;
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import com.google.common.collect.ImmutableMap;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -32,16 +41,10 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEn
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler_Adv;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_LargeRocketEngine
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargeRocketEngine>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_LargeRocketEngine extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargeRocketEngine> implements ISurvivalConstructable {
+
protected int fuelConsumption;
protected int fuelValue;
protected int fuelRemaining;
@@ -85,8 +88,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Large Rocket Engine")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Large Rocket Engine")
.addInfo("Supply GT++ Rocket Fuels and 1000L of " + mLubricantName + " per hour")
.addInfo("Produces as much energy as you put fuel in, with optional boosting")
.addInfo("Consumes 2000L/s of air and pollutes 1500 gibbl/s per 16384 eu/t produced")
@@ -99,18 +101,12 @@ public class GregtechMetaTileEntity_LargeRocketEngine
.addInfo("- 75% of max fuel efficiency at 53k or 159k EU/t output energy")
.addInfo("- 50% of max fuel efficiency at 69k or 207k EU/t output energy")
.addInfo("- 25% of max fuel efficiency at 98k or 294k EU/t output energy")
- .addInfo("formula: x = input of energy (30K^(1/3)/ x^(1/3)) * (80K^(1/3)/ x^(1/3))")
- .addSeparator()
- .beginStructureBlock(3, 3, 10, false)
- .addController("Front Center")
- .addCasingInfo(mCasingName, 64)
- .addCasingInfo(mGearboxName, 8)
- .addStructureHint("Air Intake Hatch", 1)
- .addInputBus("Side center line", 1)
- .addInputHatch("Side center line", 1)
+ .addInfo("formula: x = input of energy (30K^(1/3)/ x^(1/3)) * (80K^(1/3)/ x^(1/3))").addSeparator()
+ .beginStructureBlock(3, 3, 10, false).addController("Front Center").addCasingInfo(mCasingName, 64)
+ .addCasingInfo(mGearboxName, 8).addStructureHint("Air Intake Hatch", 1)
+ .addInputBus("Side center line", 1).addInputHatch("Side center line", 1)
.addMaintenanceHatch("Any Block Touching Inconel Reinforced Casing", 1)
- .addDynamoHatch("Top center line", 2)
- .addMufflerHatch("Back Center", 3)
+ .addDynamoHatch("Top center line", 2).addMufflerHatch("Back Center", 3)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -119,11 +115,14 @@ public class GregtechMetaTileEntity_LargeRocketEngine
public IStructureDefinition<GregtechMetaTileEntity_LargeRocketEngine> getStructureDefinition() {
if (this.STRUCTURE_DEFINITION == null) {
this.STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_LargeRocketEngine>builder()
- .addShape(this.mName, transpose(new String[][] {
- {"CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC"},
- {"C~C", "SIS", "SIS", "SIS", "SIS", "SIS", "SIS", "SIS", "SIS", "CMC"},
- {"CCC", "CSC", "CSC", "CSC", "CSC", "CSC", "CSC", "CSC", "CSC", "CCC"},
- }))
+ .addShape(
+ this.mName,
+ transpose(
+ new String[][] {
+ { "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC" },
+ { "C~C", "SIS", "SIS", "SIS", "SIS", "SIS", "SIS", "SIS", "SIS", "CMC" },
+ { "CCC", "CSC", "CSC", "CSC", "CSC", "CSC", "CSC", "CSC", "CSC",
+ "CCC" }, }))
.addElement('C', ofBlock(getCasingBlock(), getCasingMeta()))
.addElement('I', ofBlock(getGearboxBlock(), getGearboxMeta()))
// side
@@ -131,21 +130,20 @@ public class GregtechMetaTileEntity_LargeRocketEngine
'S',
buildHatchAdder(GregtechMetaTileEntity_LargeRocketEngine.class)
.atLeast(ImmutableMap.of(AirIntake, 8, InputBus, 1, InputHatch, 3, Maintenance, 1))
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
+ .casingIndex(getCasingTextureIndex()).dot(1).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing,
+ ofBlock(getCasingBlock(), getCasingMeta()))))
// top
.addElement(
'T',
buildHatchAdder(GregtechMetaTileEntity_LargeRocketEngine.class)
.atLeast(ImmutableMap.of(AirIntake, 8, Dynamo.or(TTDynamo), 1, Maintenance, 1))
- .casingIndex(getCasingTextureIndex())
- .dot(2)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
- .addElement('M', Muffler.newAny(getCasingTextureIndex(), 3))
- .build();
+ .casingIndex(getCasingTextureIndex()).dot(2).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing,
+ ofBlock(getCasingBlock(), getCasingMeta()))))
+ .addElement('M', Muffler.newAny(getCasingTextureIndex(), 3)).build();
}
return this.STRUCTURE_DEFINITION;
}
@@ -167,8 +165,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
this.mTecTechDynamoHatches.clear();
this.mAllDynamoHatches.clear();
this.mAirIntakes.clear();
- return checkPiece(this.mName, 1, 1, 0)
- && this.mCasing >= 64 - 48
+ return checkPiece(this.mName, 1, 1, 0) && this.mCasing >= 64 - 48
&& this.mAirIntakes.size() >= 1
&& checkHatch();
}
@@ -338,6 +335,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine
/**
* Consumes Fuel if required. Free Fuel Ticks are handled here.
+ *
* @param aFuel
* @return
*/
@@ -387,8 +385,9 @@ public class GregtechMetaTileEntity_LargeRocketEngine
public boolean consumeLOH() {
int LOHamount = (3 * this.euProduction) / 1000;
- return this.depleteInput(FluidUtils.getFluidStack(
- RocketFuels.Liquid_Hydrogen, LOHamount)); // (40 * ((long) euProduction / 10000))
+ return this.depleteInput(FluidUtils.getFluidStack(RocketFuels.Liquid_Hydrogen, LOHamount)); // (40 * ((long)
+ // euProduction /
+ // 10000))
}
@Override
@@ -421,9 +420,10 @@ public class GregtechMetaTileEntity_LargeRocketEngine
} else {
/**
* Calcualtes overclocked ness using long integers
- * @param aEUt - recipe EUt
- * @param aDuration - recipe Duration
- * @param mAmperage - should be 1 ?
+ *
+ * @param aEUt - recipe EUt
+ * @param aDuration - recipe Duration
+ * @param mAmperage - should be 1 ?
*/
// Long time calculation
if (aFirstVoltageFound != aVoltage) {
@@ -473,8 +473,8 @@ public class GregtechMetaTileEntity_LargeRocketEngine
if (this.mRuntime % 20 == 0) {
if (this.mMufflerHatches.size() == 1
&& this.mMufflerHatches.get(0) instanceof GT_MetaTileEntity_Hatch_Muffler_Adv) {
- GT_MetaTileEntity_Hatch_Muffler_Adv tMuffler =
- (GT_MetaTileEntity_Hatch_Muffler_Adv) this.mMufflerHatches.get(0);
+ GT_MetaTileEntity_Hatch_Muffler_Adv tMuffler = (GT_MetaTileEntity_Hatch_Muffler_Adv) this.mMufflerHatches
+ .get(0);
if (!tMuffler.hasValidFilter()) {
ArrayList<ItemStack> tInputs = getStoredInputs();
for (ItemStack tItem : tInputs) {
@@ -553,18 +553,14 @@ public class GregtechMetaTileEntity_LargeRocketEngine
@Override
public String[] getExtraInfoData() {
- return new String[] {
- "Rocket Engine",
- "Current Air: " + getAir(),
- "Current Pollution: " + getPollutionPerTick(null),
- "Time until next fuel consumption: " + this.freeFuelTicks,
- "Current Output: " + this.lEUt * this.mEfficiency / 10000 + " EU/t",
- "Fuel Consumption: " + (this.fuelConsumption) + "L/s",
- "Fuel Value: " + this.fuelValue + " EU/L",
- "Fuel Remaining: " + this.fuelRemaining + " Litres",
- "Current Efficiency: " + this.mEfficiency / 100 + "%",
- (this.getIdealStatus() == this.getRepairStatus()) ? "No Maintainance issues" : "Needs Maintainance"
- };
+ return new String[] { "Rocket Engine", "Current Air: " + getAir(),
+ "Current Pollution: " + getPollutionPerTick(null),
+ "Time until next fuel consumption: " + this.freeFuelTicks,
+ "Current Output: " + this.lEUt * this.mEfficiency / 10000 + " EU/t",
+ "Fuel Consumption: " + (this.fuelConsumption) + "L/s", "Fuel Value: " + this.fuelValue + " EU/L",
+ "Fuel Remaining: " + this.fuelRemaining + " Litres",
+ "Current Efficiency: " + this.mEfficiency / 100 + "%",
+ (this.getIdealStatus() == this.getRepairStatus()) ? "No Maintainance issues" : "Needs Maintainance" };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java
index cdeebe7f40..1878cc8484 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java
@@ -10,10 +10,18 @@ import static gregtech.api.enums.GT_HatchElement.Muffler;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo;
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
@@ -29,15 +37,9 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import java.util.ArrayList;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
-public class GregtechMetaTileEntity_LargeSemifluidGenerator
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargeSemifluidGenerator>
- implements ISurvivalConstructable {
+public class GregtechMetaTileEntity_LargeSemifluidGenerator extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargeSemifluidGenerator> implements ISurvivalConstructable {
private int mCasing;
private static IStructureDefinition<GregtechMetaTileEntity_LargeSemifluidGenerator> STRUCTURE_DEFINITION = null;
@@ -58,25 +60,17 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Large Semifluid Generator")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Large Semifluid Generator")
.addInfo("Engine Intake Casings must not be obstructed in front (only air blocks)")
.addInfo("Supply Semifluid Fuels and 2000L of Lubricant per hour to run.")
.addInfo("Supply 80L of Oxygen per second to boost output (optional).")
.addInfo("Default: Produces 2048EU/t at 100% efficiency")
.addInfo("Boosted: Produces 6144EU/t at 150% efficiency")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 3, 4, false)
- .addController("Front Center")
- .addCasingInfo("Stable Titanium Machine Casing", 16)
- .addCasingInfo("Steel Gear Box Machine Casing", 2)
- .addCasingInfo("Engine Intake Machine Casing", 8)
- .addInputHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
- .addDynamoHatch("Back Center", 2)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, false)
+ .addController("Front Center").addCasingInfo("Stable Titanium Machine Casing", 16)
+ .addCasingInfo("Steel Gear Box Machine Casing", 2).addCasingInfo("Engine Intake Machine Casing", 8)
+ .addInputHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
+ .addDynamoHatch("Back Center", 2).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -166,23 +160,22 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator
public IStructureDefinition<GregtechMetaTileEntity_LargeSemifluidGenerator> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_LargeSemifluidGenerator>builder()
- .addShape(mName, transpose(new String[][] {
- {"III", "CCC", "CCC", "CCC"},
- {"I~I", "CGC", "CGC", "CMC"},
- {"III", "CCC", "CCC", "CCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "III", "CCC", "CCC", "CCC" }, { "I~I", "CGC", "CGC", "CMC" },
+ { "III", "CCC", "CCC", "CCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_LargeSemifluidGenerator.class)
- .atLeast(Muffler, InputHatch, Maintenance)
- .casingIndex(getCasingTextureIndex())
- .dot(1)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing, ofBlock(getCasingBlock(), getCasingMeta()))))
+ .atLeast(Muffler, InputHatch, Maintenance).casingIndex(getCasingTextureIndex())
+ .dot(1).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing,
+ ofBlock(getCasingBlock(), getCasingMeta()))))
.addElement('G', ofBlock(getGearboxBlock(), getGearboxMeta()))
.addElement('I', ofBlock(getIntakeBlock(), getIntakeMeta()))
- .addElement('M', Dynamo.or(TTDynamo).newAny(getCasingTextureIndex(), 2))
- .build();
+ .addElement('M', Dynamo.or(TTDynamo).newAny(getCasingTextureIndex(), 2)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -297,15 +290,10 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator
@Override
public String[] getExtraInfoData() {
- return new String[] {
- "Large Semifluid Generator",
- "Current Output: " + lEUt * mEfficiency / 10000 + " EU/t",
- "Fuel Consumption: " + fuelConsumption + "L/t",
- "Fuel Value: " + fuelValue + " EU/L",
- "Fuel Remaining: " + fuelRemaining + " Litres",
- "Current Efficiency: " + (mEfficiency / 100) + "%",
- getIdealStatus() == getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance"
- };
+ return new String[] { "Large Semifluid Generator", "Current Output: " + lEUt * mEfficiency / 10000 + " EU/t",
+ "Fuel Consumption: " + fuelConsumption + "L/t", "Fuel Value: " + fuelValue + " EU/L",
+ "Fuel Remaining: " + fuelRemaining + " Litres", "Current Efficiency: " + (mEfficiency / 100) + "%",
+ getIdealStatus() == getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance" };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
index 49d867cb76..b5e8bd21e5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
@@ -6,6 +6,13 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose
import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
@@ -13,6 +20,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.Materials;
import gregtech.api.enums.TAE;
@@ -28,11 +36,6 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_MassFabricator
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_MassFabricator> implements ISurvivalConstructable {
@@ -91,26 +94,14 @@ public class GregtechMetaTileEntity_MassFabricator
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Matter Fabricator")
- .addInfo("Speed: +0% | EU Usage: 80%")
- .addInfo("Parallel: Scrap = 64 | UU = 8 * Tier")
- .addInfo("Produces UU-A, UU-M & Scrap")
- .addInfo("Change mode with screwdriver")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(5, 4, 5, true)
- .addController("Front Center")
- .addCasingInfo(mCasingName3, 9)
- .addCasingInfo(mCasingName2, 24)
- .addCasingInfo(mCasingName1, 40)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .addOutputHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
- .addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1)
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Matter Fabricator")
+ .addInfo("Speed: +0% | EU Usage: 80%").addInfo("Parallel: Scrap = 64 | UU = 8 * Tier")
+ .addInfo("Produces UU-A, UU-M & Scrap").addInfo("Change mode with screwdriver")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(5, 4, 5, true)
+ .addController("Front Center").addCasingInfo(mCasingName3, 9).addCasingInfo(mCasingName2, 24)
+ .addCasingInfo(mCasingName1, 40).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1)
+ .addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
+ .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
.toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -133,8 +124,8 @@ public class GregtechMetaTileEntity_MassFabricator
@Override
public void onConfigLoad(final GT_Config aConfig) {
super.onConfigLoad(aConfig);
- sDurationMultiplier = aConfig.get(
- ConfigCategories.machineconfig, "Massfabricator.UUM_Duration_Multiplier", sDurationMultiplier);
+ sDurationMultiplier = aConfig
+ .get(ConfigCategories.machineconfig, "Massfabricator.UUM_Duration_Multiplier", sDurationMultiplier);
sUUAperUUM = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_per_UUM", sUUAperUUM);
sUUASpeedBonus = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Speed_Bonus", sUUASpeedBonus);
sRequiresUUA = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Requirement", sRequiresUUA);
@@ -175,23 +166,21 @@ public class GregtechMetaTileEntity_MassFabricator
public IStructureDefinition<GregtechMetaTileEntity_MassFabricator> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_MassFabricator>builder()
- .addShape(mName, transpose(new String[][] {
- {"CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC"},
- {"CGGGC", "G---G", "G---G", "G---G", "CGGGC"},
- {"CGGGC", "G---G", "G---G", "G---G", "CGGGC"},
- {"CC~CC", "CHHHC", "CHHHC", "CHHHC", "CCCCC"},
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] { { "CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC" },
+ { "CGGGC", "G---G", "G---G", "G---G", "CGGGC" },
+ { "CGGGC", "G---G", "G---G", "G---G", "CGGGC" },
+ { "CC~CC", "CHHHC", "CHHHC", "CHHHC", "CCCCC" }, }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_MassFabricator.class)
.atLeast(InputBus, OutputBus, InputHatch, OutputHatch, Maintenance, Energy, Muffler)
- .casingIndex(TAE.GTPP_INDEX(9))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.GTPP_INDEX(9)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasingsMisc, 9))))
.addElement('H', ofBlock(ModBlocks.blockCasingsMisc, 8))
- .addElement('G', ofBlock(ModBlocks.blockCasings3Misc, 15))
- .build();
+ .addElement('G', ofBlock(ModBlocks.blockCasings3Misc, 15)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -243,20 +232,14 @@ public class GregtechMetaTileEntity_MassFabricator
*/
@Override
public GT_Recipe_Map getRecipeMap() {
- return this.mMode == MODE_SCRAP
- ? GT_Recipe_Map.sRecyclerRecipes
+ return this.mMode == MODE_SCRAP ? GT_Recipe_Map.sRecyclerRecipes
: GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes;
// return Recipe_GT.Gregtech_Recipe_Map.sMatterFab2Recipes;
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
if (this.mMode == MODE_SCRAP) {
return checkRecipeScrap(
aItemInputs,
@@ -276,13 +259,8 @@ public class GregtechMetaTileEntity_MassFabricator
}
}
- public boolean checkRecipeScrap(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- int aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll) {
+ public boolean checkRecipeScrap(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ int aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
if (aItemInputs == null || aItemInputs.length <= 0) {
return false;
@@ -294,24 +272,19 @@ public class GregtechMetaTileEntity_MassFabricator
ItemStack aPotentialOutput = GT_ModHandler.getRecyclerOutput(GT_Utility.copyAmount(1, aItemInputs[0]), 0);
GT_Recipe tRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {GT_Utility.copyAmount(1, aItemInputs[0])},
- aPotentialOutput == null ? null : new ItemStack[] {aPotentialOutput},
+ new ItemStack[] { GT_Utility.copyAmount(1, aItemInputs[0]) },
+ aPotentialOutput == null ? null : new ItemStack[] { aPotentialOutput },
null,
- new int[] {2000},
+ new int[] { 2000 },
null,
null,
40,
MaterialUtils.getVoltageForTier(1),
0);
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -326,13 +299,9 @@ public class GregtechMetaTileEntity_MassFabricator
return false;
}
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
- .setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(helper.getCurrentParallel())
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
+ .setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent)).setParallel(helper.getCurrentParallel())
.calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
@@ -345,13 +314,8 @@ public class GregtechMetaTileEntity_MassFabricator
return true;
}
- public boolean checkRecipeUU(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- int aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll) {
+ public boolean checkRecipeUU(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ int aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
// Based on the Processing Array. A bit overkill, but very flexible.
@@ -380,14 +344,9 @@ public class GregtechMetaTileEntity_MassFabricator
return false;
}
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -405,15 +364,10 @@ public class GregtechMetaTileEntity_MassFabricator
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(aEUPercent / 100.0f)
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(aEUPercent / 100.0f)
.setSpeedBoost(100.0f / (100.0f + aSpeedBonusPercent))
- .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel()))
- .enablePerfectOC()
- .calculate();
+ .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).enablePerfectOC().calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
@@ -510,25 +464,30 @@ public class GregtechMetaTileEntity_MassFabricator
super.drawTexts(screenElements, inventorySlot);
screenElements
- .widget(TextWidget.dynamicString(() -> "Scrap Made: " + mScrapProduced)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0
- && getBaseMetaTileEntity().isActive()))
- .widget(TextWidget.dynamicString(() -> "Scrap Used: " + mScrapUsed)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0
- && getBaseMetaTileEntity().isActive()))
- .widget(TextWidget.dynamicString(() -> "UUA Made: " + mAmplifierProduced)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0
- && getBaseMetaTileEntity().isActive()))
- .widget(TextWidget.dynamicString(() -> "UUA Used: " + mAmplifierUsed)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0
- && getBaseMetaTileEntity().isActive()))
- .widget(TextWidget.dynamicString(() -> "UUM Made: " + mMatterProduced)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0
- && getBaseMetaTileEntity().isActive()));
+ .widget(
+ TextWidget.dynamicString(() -> "Scrap Made: " + mScrapProduced)
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(
+ widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0
+ && getBaseMetaTileEntity().isActive()))
+ .widget(
+ TextWidget.dynamicString(() -> "Scrap Used: " + mScrapUsed)
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(
+ widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0
+ && getBaseMetaTileEntity().isActive()))
+ .widget(
+ TextWidget.dynamicString(() -> "UUA Made: " + mAmplifierProduced)
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(
+ widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0
+ && getBaseMetaTileEntity().isActive()))
+ .widget(
+ TextWidget.dynamicString(() -> "UUA Used: " + mAmplifierUsed)
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(
+ widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0
+ && getBaseMetaTileEntity().isActive()))
+ .widget(
+ TextWidget.dynamicString(() -> "UUM Made: " + mMatterProduced)
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(
+ widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0
+ && getBaseMetaTileEntity().isActive()));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
index 80edf59fe3..1c76c02b8c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
@@ -5,8 +5,29 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_OreDictUnificator.getAssociation;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.lwjgl.opengl.GL11;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.*;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
@@ -29,23 +50,6 @@ import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import org.apache.commons.lang3.tuple.Pair;
-import org.lwjgl.opengl.GL11;
public class GregtechMetaTileEntity_QuantumForceTransformer
extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GregtechMetaTileEntity_QuantumForceTransformer>
@@ -61,412 +65,149 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
private static final String MAIN_PIECE = "main";
private GT_MetaTileEntity_Hatch_Input mNeptuniumHatch;
private GT_MetaTileEntity_Hatch_Input mFermiumHatch;
- private static final IStructureDefinition<GregtechMetaTileEntity_QuantumForceTransformer> STRUCTURE_DEFINITION =
- StructureDefinition.<GregtechMetaTileEntity_QuantumForceTransformer>builder()
- .addShape(MAIN_PIECE, new String[][] { // A - 142, B - 234, C - 177, D - 96, E - 224, H - 36, M - 21
- {
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " BAB ",
- " BBBBABBBB ",
- " BAAAAAAAB ",
- " BABBABBAB ",
- " BA AB ",
- " A A ",
- " A A ",
- " A A "
- },
- {
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " BAB ",
- " AAABBBAAA ",
- " BAAAAAAAAAB ",
- " B B ",
- " A A ",
- " A A ",
- " ",
- " ",
- " "
- },
- {
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " BAB ",
- " AA AA ",
- " AA AA ",
- " BAA AAB ",
- " B B ",
- " A A ",
- " A A ",
- " ",
- " ",
- " "
- },
- {
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " BAAAB ",
- " AA AA ",
- " AA AA ",
- "BAA AAB",
- "B B",
- "A A",
- "A A",
- "A A",
- "A A",
- "A A"
- },
- {
- " TTT ",
- " EEE ",
- " EEE ",
- " EEE ",
- " DDD ",
- " EEE ",
- " DDD ",
- " EEE ",
- " EEE ",
- " EEE ",
- " DDD ",
- " BAEEEAB ",
- " AA EEE AA ",
- " A EEE A ",
- "BA DDD AB",
- "B EEE B",
- "B DDD B",
- " EEE ",
- " EEE ",
- " EEE ",
- " Z~X "
- },
- {
- " TTTTT ",
- " ECCCE ",
- " ECCCE ",
- " ECCCE ",
- " D D ",
- " ECCCE ",
- " D D ",
- " ECCCE ",
- " ECCCE ",
- " ECCCE ",
- " D D ",
- " BAECCCEAB ",
- " A ECCCE A ",
- " A ECCCE A ",
- "BA D D AB",
- "B ECCCE B",
- "B D D B",
- "B ECCCE B",
- " ECCCE ",
- " ECCCE ",
- " HHHHH "
- },
- {
- " TTTTTTT ",
- " ECCCCCE ",
- " EC CE ",
- " EC CE ",
- " D D ",
- " EC CE ",
- " D D ",
- " EC CE ",
- " EC CE ",
- " EC CE ",
- " D D ",
- " BAEC CEAB ",
- " B EC CE B ",
- "BB EC CE BB",
- "BA D D AB",
- "A EC CE A",
- "A D D A",
- "A EC CE A",
- " EC CE ",
- " EC CE ",
- " HHHHHHH "
- },
- {
- " TTTTTTT ",
- " ECCCCCE ",
- " EC CE ",
- " EC CE ",
- " D D ",
- " EC CE ",
- " D D ",
- " EC CE ",
- " EC CE ",
- " EC CE ",
- " D D ",
- " AAEC CEAA ",
- " A EC CE A ",
- "AB EC CE BA",
- "AA D D AA",
- "A EC CE A",
- "A D D A",
- " EC CE ",
- " EC CE ",
- " EC CE ",
- " HHHHHHH "
- },
- {
- " TTTTTTT ",
- " ECCCCCE ",
- " EC CE ",
- " EC CE ",
- " D D ",
- " EC CE ",
- " D D ",
- " EC CE ",
- " EC CE ",
- " EC CE ",
- " D D ",
- " BAEC CEAB ",
- " B EC CE B ",
- "BB EC CE BB",
- "BA D D AB",
- "A EC CE A",
- "A D D A",
- "A EC CE A",
- " EC CE ",
- " EC CE ",
- " HHHHHHH "
- },
- {
- " TTTTT ",
- " ECCCE ",
- " ECCCE ",
- " ECCCE ",
- " D D ",
- " ECCCE ",
- " D D ",
- " ECCCE ",
- " ECCCE ",
- " ECCCE ",
- " D D ",
- " BAECCCEAB ",
- " A ECCCE A ",
- " A ECCCE A ",
- "BA D D AB",
- "B ECCCE B",
- "B D D B",
- "B ECCCE B",
- " ECCCE ",
- " ECCCE ",
- " HHHHH "
- },
- {
- " TTT ",
- " EEE ",
- " EEE ",
- " EEE ",
- " DDD ",
- " EEE ",
- " DDD ",
- " EEE ",
- " EEE ",
- " EEE ",
- " DDD ",
- " BAEEEAB ",
- " AA EEE AA ",
- " A EEE A ",
- "BA DDD AB",
- "B EEE B",
- "B DDD B",
- " EEE ",
- " EEE ",
- " EEE ",
- " HHH "
- },
- {
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " BAAAB ",
- " AA AA ",
- " AA AA ",
- "BAA AB",
- "B B",
- "A A",
- "A A",
- "A A",
- "A A",
- "A A"
- },
- {
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " BAB ",
- " AA AA ",
- " AA AA ",
- " BA AB ",
- " B B ",
- " A A ",
- " A A ",
- " ",
- " ",
- " "
- },
- {
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " BAB ",
- " AAABBBAAA ",
- " BAAAAAAAAAB ",
- " B B ",
- " A A ",
- " A A ",
- " ",
- " ",
- " "
- },
- {
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " BAB ",
- " BBBBABBBB ",
- " BBBAAABBB ",
- " ABBAAABBA ",
- " A BA AB A ",
- " A A ",
- " A A ",
- " A A "
- },
- })
- .addElement(
- 'A',
- StructureUtility.ofBlocksTiered(
- craftingTierConverter(),
- getAllCraftingTiers(),
- 0,
- GregtechMetaTileEntity_QuantumForceTransformer::setCraftingTier,
- GregtechMetaTileEntity_QuantumForceTransformer::getCraftingTier))
- .addElement(
- 'B',
- StructureUtility.ofBlocksTiered(
- focusingTierConverter(),
- getAllFocusingTiers(),
- 0,
- GregtechMetaTileEntity_QuantumForceTransformer::setFocusingTier,
- GregtechMetaTileEntity_QuantumForceTransformer::getFocusingTier))
- .addElement('C', ofBlock(ModBlocks.blockCasings4Misc, 4))
- .addElement('D', ofBlock(ModBlocks.blockCasings2Misc, 12))
- .addElement('E', lazy(t -> ofBlock(t.getCasingBlock1(), t.getCasingMeta1())))
- .addElement(
- 'H',
- buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
- .atLeast(InputBus, InputHatch, Maintenance, Energy.or(ExoticEnergy))
- .casingIndex(TAE.getIndexFromPage(0, 10))
- .dot(4)
- .buildAndChain(
- onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
- .addElement(
- 'T',
- buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
- .atLeast(OutputBus, OutputHatch, Maintenance)
- .casingIndex(TAE.getIndexFromPage(0, 10))
- .dot(5)
- .buildAndChain(
- onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
- .addElement(
- 'Z',
- buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
- .hatchClass(GT_MetaTileEntity_Hatch_Input.class)
- .adder(GregtechMetaTileEntity_QuantumForceTransformer::addNeptuniumHatch)
- .casingIndex(TAE.getIndexFromPage(0, 10))
- .dot(5)
- .buildAndChain(
- onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
- .addElement(
- 'X',
- buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
- .hatchClass(GT_MetaTileEntity_Hatch_Input.class)
- .adder(GregtechMetaTileEntity_QuantumForceTransformer::addFermiumHatch)
- .casingIndex(TAE.getIndexFromPage(0, 10))
- .dot(5)
- .buildAndChain(
- onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
- .build();
-
- public GregtechMetaTileEntity_QuantumForceTransformer(
- final int aID, final String aName, final String aNameRegional) {
+ private static final IStructureDefinition<GregtechMetaTileEntity_QuantumForceTransformer> STRUCTURE_DEFINITION = StructureDefinition
+ .<GregtechMetaTileEntity_QuantumForceTransformer>builder().addShape(
+ MAIN_PIECE,
+ new String[][] { // A - 142, B - 234, C - 177, D - 96, E - 224, H - 36, M - 21
+ { " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " ", " BAB ", " BBBBABBBB ", " BAAAAAAAB ",
+ " BABBABBAB ", " BA AB ", " A A ", " A A ",
+ " A A " },
+ { " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " BAB ", " AAABBBAAA ", " BAAAAAAAAAB ", " B B ",
+ " A A ", " A A ", " ", " ",
+ " " },
+ { " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " ", " ", " ", " BAB ",
+ " AA AA ", " AA AA ", " BAA AAB ", " B B ",
+ " A A ", " A A ", " ", " ",
+ " " },
+ { " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " ", " ", " ", " BAAAB ",
+ " AA AA ", " AA AA ", "BAA AAB", "B B",
+ "A A", "A A", "A A", "A A",
+ "A A" },
+ { " TTT ", " EEE ", " EEE ", " EEE ",
+ " DDD ", " EEE ", " DDD ", " EEE ",
+ " EEE ", " EEE ", " DDD ", " BAEEEAB ",
+ " AA EEE AA ", " A EEE A ", "BA DDD AB", "B EEE B",
+ "B DDD B", " EEE ", " EEE ", " EEE ",
+ " Z~X " },
+ { " TTTTT ", " ECCCE ", " ECCCE ", " ECCCE ",
+ " D D ", " ECCCE ", " D D ", " ECCCE ",
+ " ECCCE ", " ECCCE ", " D D ", " BAECCCEAB ",
+ " A ECCCE A ", " A ECCCE A ", "BA D D AB", "B ECCCE B",
+ "B D D B", "B ECCCE B", " ECCCE ", " ECCCE ",
+ " HHHHH " },
+ { " TTTTTTT ", " ECCCCCE ", " EC CE ", " EC CE ",
+ " D D ", " EC CE ", " D D ", " EC CE ",
+ " EC CE ", " EC CE ", " D D ", " BAEC CEAB ",
+ " B EC CE B ", "BB EC CE BB", "BA D D AB", "A EC CE A",
+ "A D D A", "A EC CE A", " EC CE ", " EC CE ",
+ " HHHHHHH " },
+ { " TTTTTTT ", " ECCCCCE ", " EC CE ", " EC CE ",
+ " D D ", " EC CE ", " D D ", " EC CE ",
+ " EC CE ", " EC CE ", " D D ", " AAEC CEAA ",
+ " A EC CE A ", "AB EC CE BA", "AA D D AA", "A EC CE A",
+ "A D D A", " EC CE ", " EC CE ", " EC CE ",
+ " HHHHHHH " },
+ { " TTTTTTT ", " ECCCCCE ", " EC CE ", " EC CE ",
+ " D D ", " EC CE ", " D D ", " EC CE ",
+ " EC CE ", " EC CE ", " D D ", " BAEC CEAB ",
+ " B EC CE B ", "BB EC CE BB", "BA D D AB", "A EC CE A",
+ "A D D A", "A EC CE A", " EC CE ", " EC CE ",
+ " HHHHHHH " },
+ { " TTTTT ", " ECCCE ", " ECCCE ", " ECCCE ",
+ " D D ", " ECCCE ", " D D ", " ECCCE ",
+ " ECCCE ", " ECCCE ", " D D ", " BAECCCEAB ",
+ " A ECCCE A ", " A ECCCE A ", "BA D D AB", "B ECCCE B",
+ "B D D B", "B ECCCE B", " ECCCE ", " ECCCE ",
+ " HHHHH " },
+ { " TTT ", " EEE ", " EEE ", " EEE ",
+ " DDD ", " EEE ", " DDD ", " EEE ",
+ " EEE ", " EEE ", " DDD ", " BAEEEAB ",
+ " AA EEE AA ", " A EEE A ", "BA DDD AB", "B EEE B",
+ "B DDD B", " EEE ", " EEE ", " EEE ",
+ " HHH " },
+ { " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " ", " ", " ", " BAAAB ",
+ " AA AA ", " AA AA ", "BAA AB", "B B",
+ "A A", "A A", "A A", "A A",
+ "A A" },
+ { " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " ", " ", " ", " BAB ",
+ " AA AA ", " AA AA ", " BA AB ", " B B ",
+ " A A ", " A A ", " ", " ",
+ " " },
+ { " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " BAB ", " AAABBBAAA ", " BAAAAAAAAAB ", " B B ",
+ " A A ", " A A ", " ", " ",
+ " " },
+ { " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " ", " ", " ", " ",
+ " ", " BAB ", " BBBBABBBB ", " BBBAAABBB ",
+ " ABBAAABBA ", " A BA AB A ", " A A ", " A A ",
+ " A A " }, })
+ .addElement(
+ 'A',
+ StructureUtility.ofBlocksTiered(
+ craftingTierConverter(),
+ getAllCraftingTiers(),
+ 0,
+ GregtechMetaTileEntity_QuantumForceTransformer::setCraftingTier,
+ GregtechMetaTileEntity_QuantumForceTransformer::getCraftingTier))
+ .addElement(
+ 'B',
+ StructureUtility.ofBlocksTiered(
+ focusingTierConverter(),
+ getAllFocusingTiers(),
+ 0,
+ GregtechMetaTileEntity_QuantumForceTransformer::setFocusingTier,
+ GregtechMetaTileEntity_QuantumForceTransformer::getFocusingTier))
+ .addElement('C', ofBlock(ModBlocks.blockCasings4Misc, 4))
+ .addElement('D', ofBlock(ModBlocks.blockCasings2Misc, 12))
+ .addElement('E', lazy(t -> ofBlock(t.getCasingBlock1(), t.getCasingMeta1())))
+ .addElement(
+ 'H',
+ buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
+ .atLeast(InputBus, InputHatch, Maintenance, Energy.or(ExoticEnergy))
+ .casingIndex(TAE.getIndexFromPage(0, 10)).dot(4)
+ .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
+ .addElement(
+ 'T',
+ buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
+ .atLeast(OutputBus, OutputHatch, Maintenance).casingIndex(TAE.getIndexFromPage(0, 10))
+ .dot(5)
+ .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
+ .addElement(
+ 'Z',
+ buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
+ .hatchClass(GT_MetaTileEntity_Hatch_Input.class)
+ .adder(GregtechMetaTileEntity_QuantumForceTransformer::addNeptuniumHatch)
+ .casingIndex(TAE.getIndexFromPage(0, 10)).dot(5)
+ .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
+ .addElement(
+ 'X',
+ buildHatchAdder(GregtechMetaTileEntity_QuantumForceTransformer.class)
+ .hatchClass(GT_MetaTileEntity_Hatch_Input.class)
+ .adder(GregtechMetaTileEntity_QuantumForceTransformer::addFermiumHatch)
+ .casingIndex(TAE.getIndexFromPage(0, 10)).dot(5)
+ .buildAndChain(onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 12))))
+ .build();
+
+ public GregtechMetaTileEntity_QuantumForceTransformer(final int aID, final String aName,
+ final String aNameRegional) {
super(aID, aName, aNameRegional);
}
@@ -482,8 +223,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType("Quantum Force Transformer")
- .addInfo("Controller Block for the Quantum Force Transformer")
+ tt.addMachineType("Quantum Force Transformer").addInfo("Controller Block for the Quantum Force Transformer")
.addInfo("Allows Complex chemical lines to be performed instantly in one step")
.addInfo("Every recipe requires a catalyst, each catalyst adds 1 parallel and lasts forever")
.addInfo("Accepts TecTech Energy and Laser Hatches")
@@ -497,25 +237,19 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
.addInfo("Casing functions:")
.addInfo("Pulse Manipulators: Recipe Tier Allowed (check NEI for the tier of each recipe)")
.addInfo("Shielding Cores: Focusing Tier (equal to or higher than recipe tier to allow focus)")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(15, 21, 15, true)
- .addController("Bottom Center")
- .addCasingInfo("Bulk Production Frame", 80)
- .addCasingInfo("Quantum Force Conductor", 177)
- .addCasingInfo("Particle Containment Casing", 224)
- .addCasingInfo("Neutron Pulse Manipulators", 233)
- .addCasingInfo("Neutron Shielding Cores", 142)
- .addInputBus("Bottom Layer", 4)
- .addInputHatch("Bottom Layer", 4)
- .addOutputHatch("Top Layer", 5)
- .addOutputBus("Top Layer", 5)
- .addEnergyHatch("Bottom Layer", 4)
- .addMaintenanceHatch("Bottom Layer", 4)
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(15, 21, 15, true)
+ .addController("Bottom Center").addCasingInfo("Bulk Production Frame", 80)
+ .addCasingInfo("Quantum Force Conductor", 177).addCasingInfo("Particle Containment Casing", 224)
+ .addCasingInfo("Neutron Pulse Manipulators", 233).addCasingInfo("Neutron Shielding Cores", 142)
+ .addInputBus("Bottom Layer", 4).addInputHatch("Bottom Layer", 4).addOutputHatch("Top Layer", 5)
+ .addOutputBus("Top Layer", 5).addEnergyHatch("Bottom Layer", 4).addMaintenanceHatch("Bottom Layer", 4)
.addStructureInfo("Neptunium Plasma Hatch: Left side of Controller")
- .addStructureInfo("Fermium Plasma Hatch: Right side of Controller")
- .toolTipFinisher(GT_Values.AuthorBlueWeabo + EnumChatFormatting.RESET + EnumChatFormatting.GREEN
- + " + Steelux" + EnumChatFormatting.RESET + " - [GT++]");
+ .addStructureInfo("Fermium Plasma Hatch: Right side of Controller").toolTipFinisher(
+ GT_Values.AuthorBlueWeabo + EnumChatFormatting.RESET
+ + EnumChatFormatting.GREEN
+ + " + Steelux"
+ + EnumChatFormatting.RESET
+ + " - [GT++]");
return tt;
}
@@ -531,8 +265,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
return false;
}
- if (mMaintenanceHatches.size() != 1
- || mOutputBusses.size() < 1
+ if (mMaintenanceHatches.size() != 1 || mOutputBusses.size() < 1
|| mInputBusses.size() < 1
|| mInputHatches.size() < 1
|| mOutputHatches.size() < 1) {
@@ -575,6 +308,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
public static List<Pair<Block, Integer>> getAllCraftingTiers() {
return new ArrayList<Pair<Block, Integer>>() {
+
{
add(Pair.of(ModBlocks.blockCasings5Misc, 7));
add(Pair.of(ModBlocks.blockCasings5Misc, 8));
@@ -586,6 +320,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
public static List<Pair<Block, Integer>> getAllFocusingTiers() {
return new ArrayList<Pair<Block, Integer>>() {
+
{
add(Pair.of(ModBlocks.blockCasings5Misc, 11));
add(Pair.of(ModBlocks.blockCasings5Misc, 12));
@@ -713,11 +448,15 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
return false;
}
- private boolean processRecipe(
- ItemStack[] aItemInputs, FluidStack[] aFluidInputs, GT_Recipe.GT_Recipe_Map aRecipeMap, ItemStack aStack) {
+ private boolean processRecipe(ItemStack[] aItemInputs, FluidStack[] aFluidInputs,
+ GT_Recipe.GT_Recipe_Map aRecipeMap, ItemStack aStack) {
byte tTier = (byte) Math.max(1, GT_Utility.getTier(getAverageInputVoltage()));
GT_Recipe tRecipe = aRecipeMap.findRecipe(
- getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs);
+ getBaseMetaTileEntity(),
+ false,
+ gregtech.api.enums.GT_Values.V[tTier],
+ aFluidInputs,
+ aItemInputs);
if (tRecipe != null && tRecipe.mSpecialValue <= getCraftingTier()) {
ItemStack aRecipeCatalyst = null;
@@ -755,13 +494,9 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
doFermium = false;
}
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(getMaxInputAmps() * getAverageInputVoltage())
- .setMaxParallel(mCurrentMaxParallel)
- .enableConsumption();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(getMaxInputAmps() * getAverageInputVoltage())
+ .setMaxParallel(mCurrentMaxParallel).enableConsumption();
if (mBatchMode) {
helper.enableBatchMode(128);
@@ -773,13 +508,9 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
return false;
}
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(getAverageInputVoltage())
- .setAmperage(getMaxInputAmps())
- .setDuration(tRecipe.mDuration)
- .setParallel(Math.min(mMaxParallel, helper.getCurrentParallel()))
- .calculate();
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt)
+ .setEUt(getAverageInputVoltage()).setAmperage(getMaxInputAmps()).setDuration(tRecipe.mDuration)
+ .setParallel(Math.min(mMaxParallel, helper.getCurrentParallel())).calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
@@ -793,8 +524,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
}
int[] tChances;
- if (aStack == null
- || aStack.getItemDamage() == 0
+ if (aStack == null || aStack.getItemDamage() == 0
|| mNeptuniumHatch.getFluid() == null
|| !mNeptuniumHatch.getFluid().isFluidEqual(new FluidStack(mNeptunium, 1))
|| tRecipe.mSpecialValue > getFocusingTier()) {
@@ -828,8 +558,8 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
}
} else {
ItemStack aItem = tRecipe.getOutput(i);
- tItemOutputs.add(
- GT_Utility.copyAmountUnsafe(aItem.stackSize * mCurrentParallel, aItem));
+ tItemOutputs
+ .add(GT_Utility.copyAmountUnsafe(aItem.stackSize * mCurrentParallel, aItem));
}
} else {
FluidStack aFluid = tRecipe.getFluidOutput(i - tRecipe.mOutputs.length);
@@ -845,8 +575,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
aItem.stackSize *= mCurrentParallel;
tItemOutputs.add(aItem);
} else {
- FluidStack aFluid = tRecipe.getFluidOutput(i - tRecipe.mOutputs.length)
- .copy();
+ FluidStack aFluid = tRecipe.getFluidOutput(i - tRecipe.mOutputs.length).copy();
aFluid.amount *= mCurrentParallel;
tFluidOutputs.add(aFluid);
}
@@ -875,8 +604,9 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
if (runningTick % 20 == 0) {
if (doFermium) {
- FluidStack tFluid =
- new FluidStack(mFermium, (int) (getFocusingTier() * 4 * Math.sqrt(mCurrentParallel)));
+ FluidStack tFluid = new FluidStack(
+ mFermium,
+ (int) (getFocusingTier() * 4 * Math.sqrt(mCurrentParallel)));
FluidStack tLiquid = mFermiumHatch.drain(tFluid.amount, true);
if (tLiquid == null || tLiquid.amount < tFluid.amount) {
doFermium = false;
@@ -886,8 +616,9 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
}
if (doNeptunium) {
- FluidStack tFluid =
- new FluidStack(mNeptunium, (int) (getFocusingTier() * 4 * Math.sqrt(mCurrentParallel)));
+ FluidStack tFluid = new FluidStack(
+ mNeptunium,
+ (int) (getFocusingTier() * 4 * Math.sqrt(mCurrentParallel)));
FluidStack tLiquid = mNeptuniumHatch.drain(tFluid.amount, true);
if (tLiquid == null || tLiquid.amount < tFluid.amount) {
doNeptunium = false;
@@ -995,8 +726,8 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
}
@Override
- public boolean onWireCutterRightClick(
- byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ public boolean onWireCutterRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
+ float aZ) {
if (aPlayer.isSneaking()) {
mBatchMode = !mBatchMode;
if (mBatchMode) {
@@ -1008,7 +739,8 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
}
mSeparateInputBusses = !mSeparateInputBusses;
GT_Utility.sendChatToPlayer(
- aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + mSeparateInputBusses);
+ aPlayer,
+ StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + mSeparateInputBusses);
return true;
}
@@ -1016,7 +748,8 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
mFluidMode = !mFluidMode;
GT_Utility.sendChatToPlayer(
- aPlayer, StatCollector.translateToLocal("miscutils.machines.QFTFluidMode") + " " + mFluidMode);
+ aPlayer,
+ StatCollector.translateToLocal("miscutils.machines.QFTFluidMode") + " " + mFluidMode);
}
public boolean addNeptuniumHatch(IGregTechTileEntity aTileEntity, short aBaseCasingIndex) {
@@ -1074,31 +807,15 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
if (aSide == aFacing) {
- if (aActive)
- return new ITexture[] {
- getCasingTexture(),
- TextureFactory.builder()
- .addIcon(getActiveOverlay())
- .extFacing()
- .build()
- };
- return new ITexture[] {
- getCasingTexture(),
- TextureFactory.builder()
- .addIcon(getInactiveOverlay())
- .extFacing()
- .build()
- };
+ if (aActive) return new ITexture[] { getCasingTexture(),
+ TextureFactory.builder().addIcon(getActiveOverlay()).extFacing().build() };
+ return new ITexture[] { getCasingTexture(),
+ TextureFactory.builder().addIcon(getInactiveOverlay()).extFacing().build() };
}
- return new ITexture[] {getCasingTexture()};
+ return new ITexture[] { getCasingTexture() };
}
private ITexture getCasingTexture() {
@@ -1106,8 +823,8 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
}
@SideOnly(Side.CLIENT)
- private void renderForceField(
- double x, double y, double z, int side, double minU, double maxU, double minV, double maxV) {
+ private void renderForceField(double x, double y, double z, int side, double minU, double maxU, double minV,
+ double maxV) {
// spotless:off
Tessellator tes = Tessellator.instance;
switch (side) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
index b557272c82..6d359f43cc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
@@ -8,10 +8,13 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gregtech.api.util.GT_StructureUtility.filterByMTETier;
+import net.minecraft.item.ItemStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
@@ -25,7 +28,6 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import net.minecraft.item.ItemStack;
public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_Refinery>
implements ISurvivalConstructable {
@@ -49,22 +51,13 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Fission Fuel Processing Unit")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(3, 9, 3, false)
- .addController("Bottom Center")
- .addCasingInfo("Hastelloy-X Structural Casing", 7)
- .addCasingInfo("Incoloy-DS Fluid Containment Block", 5)
- .addCasingInfo("Zeron-100 Reactor Shielding", 4)
- .addCasingInfo("Hastelloy-N Sealant Blocks", 17)
- .addInputHatch("Base platform", 1)
- .addOutputHatch("Base platform", 1)
- .addOutputBus("Base platform", 1)
- .addMufflerHatch("Base platform", 1)
- .addMaintenanceHatch("Base platform", 1)
- .addEnergyHatch("Base platform", 1)
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Fission Fuel Processing Unit")
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 9, 3, false)
+ .addController("Bottom Center").addCasingInfo("Hastelloy-X Structural Casing", 7)
+ .addCasingInfo("Incoloy-DS Fluid Containment Block", 5).addCasingInfo("Zeron-100 Reactor Shielding", 4)
+ .addCasingInfo("Hastelloy-N Sealant Blocks", 17).addInputHatch("Base platform", 1)
+ .addOutputHatch("Base platform", 1).addOutputBus("Base platform", 1).addMufflerHatch("Base platform", 1)
+ .addMaintenanceHatch("Base platform", 1).addEnergyHatch("Base platform", 1)
.addStructureInfo("Muffler's Tier must be IV+")
.addStructureInfo("4x Input Hatches, 2x Output Hatches, 1x Output Bus")
.addStructureInfo("1x Muffler, 1x Maintenance Hatch, 1x Energy Hatch")
@@ -130,37 +123,26 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
@Override
public IStructureDefinition<GregtechMetaTileEntity_Refinery> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Refinery>builder()
- .addShape(mName, transpose(new String[][] {
- {" ", " N ", " "},
- {" N ", "NIN", " N "},
- {" N ", "NIN", " N "},
- {" N ", "NIN", " N "},
- {" Z ", "ZIZ", " Z "},
- {" N ", "NIN", " N "},
- {"XXX", "XXX", "XXX"},
- {"X~X", "XXX", "XXX"},
- }))
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Refinery>builder().addShape(
+ mName,
+ transpose(
+ new String[][] { { " ", " N ", " " }, { " N ", "NIN", " N " }, { " N ", "NIN", " N " },
+ { " N ", "NIN", " N " }, { " Z ", "ZIZ", " Z " }, { " N ", "NIN", " N " },
+ { "XXX", "XXX", "XXX" }, { "X~X", "XXX", "XXX" }, }))
.addElement(
'X',
ofChain(
buildHatchAdder(GregtechMetaTileEntity_Refinery.class)
.atLeast(Energy, Maintenance, OutputHatch, OutputBus, InputHatch)
- .casingIndex(TAE.GTPP_INDEX(18))
- .dot(1)
- .build(),
- buildHatchAdder(GregtechMetaTileEntity_Refinery.class)
- .atLeast(Muffler)
+ .casingIndex(TAE.GTPP_INDEX(18)).dot(1).build(),
+ buildHatchAdder(GregtechMetaTileEntity_Refinery.class).atLeast(Muffler)
.adder(GregtechMetaTileEntity_Refinery::addMufflerToMachineList)
.hatchItemFilterAnd(t -> filterByMTETier(6, Integer.MAX_VALUE))
- .casingIndex(TAE.GTPP_INDEX(18))
- .dot(1)
- .build(),
+ .casingIndex(TAE.GTPP_INDEX(18)).dot(1).build(),
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 2))))
.addElement('I', ofBlock(ModBlocks.blockCasings2Misc, 3))
.addElement('N', ofBlock(ModBlocks.blockCasings2Misc, 1))
- .addElement('Z', ofBlock(ModBlocks.blockCasingsMisc, 13))
- .build();
+ .addElement('Z', ofBlock(ModBlocks.blockCasingsMisc, 13)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -180,8 +162,7 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
mCasing = 0;
if (checkPiece(mName, 1, 7, 0) && mCasing >= 7) {
- if (this.mInputHatches.size() == 4
- && this.mOutputHatches.size() == 2
+ if (this.mInputHatches.size() == 4 && this.mOutputHatches.size() == 2
&& this.mOutputBusses.size() == 1
&& this.mMufflerHatches.size() == 1
&& this.mMaintenanceHatches.size() == 1
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java
index 6dedfd0e5d..d09eaf86b0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java
@@ -8,10 +8,21 @@ import static gregtech.api.enums.GT_HatchElement.Maintenance;
import static gregtech.api.enums.GT_HatchElement.OutputHatch;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
@@ -29,14 +40,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.tileentities.misc.TileEntitySolarHeater;
-import java.util.ArrayList;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_SolarTower>
implements ISurvivalConstructable {
@@ -72,8 +75,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
@Override
protected final GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Contributing Green Energy towards the future")
+ tt.addMachineType(getMachineType()).addInfo("Contributing Green Energy towards the future")
.addInfo("Surround with rings of Solar Reflectors")
.addInfo("The Reflectors increase the internal heat value of the Tower (see below for formula)")
.addInfo("Each Reflector ring increases tier, the first ring is required for the Tower to work")
@@ -89,18 +91,12 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
.addInfo("Heat gain per cycle: numberHeaters * heatEfficiency * (10 + bonus)")
.addInfo("Bonus: 1 ring = +1, 2 rings = +2, 3 rings = +4, 4 rings = +8, 5 rings = +16")
.addInfo("Total number of reflectors based on how many rings are built:")
- .addInfo("1 ring = 36, 2 rings = 88, 3 rings = 156, 4 rings = 240, 5 rings = 340")
- .addSeparator()
- .beginVariableStructureBlock(15, 31, 28, 28, 15, 31, false)
- .addController("Top Middle")
- .addCasingInfo("Structural Solar Casing", 229)
- .addCasingInfo("Thermally Insulated Casing", 60)
- .addCasingInfo("Salt Containment Casing", 66)
- .addCasingInfo("Thermal Containment Casing", 60)
- .addInputHatch("Any 2 dot hint(min 1)", 2)
- .addOutputHatch("Any 2 dot hint(min 1)", 2)
- .addMaintenanceHatch("Any 2 dot hint", 2)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addInfo("1 ring = 36, 2 rings = 88, 3 rings = 156, 4 rings = 240, 5 rings = 340").addSeparator()
+ .beginVariableStructureBlock(15, 31, 28, 28, 15, 31, false).addController("Top Middle")
+ .addCasingInfo("Structural Solar Casing", 229).addCasingInfo("Thermally Insulated Casing", 60)
+ .addCasingInfo("Salt Containment Casing", 66).addCasingInfo("Thermal Containment Casing", 60)
+ .addInputHatch("Any 2 dot hint(min 1)", 2).addOutputHatch("Any 2 dot hint(min 1)", 2)
+ .addMaintenanceHatch("Any 2 dot hint", 2).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -108,300 +104,164 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
private static final String STRUCTURE_PIECE_TOWER = "tower";
private static final String STRUCTURE_PIECE_TOP = "top";
- private static final String[] STRUCTURE_PIECE_SOLAR_HEATER_RING = {"ring1", "ring2", "ring3", "ring4", "ring5"};
+ private static final String[] STRUCTURE_PIECE_SOLAR_HEATER_RING = { "ring1", "ring2", "ring3", "ring4", "ring5" };
private static final String SOLAR_HEATER_RING_1 = STRUCTURE_PIECE_SOLAR_HEATER_RING[0];
private static final String SOLAR_HEATER_RING_2 = STRUCTURE_PIECE_SOLAR_HEATER_RING[1];
private static final String SOLAR_HEATER_RING_3 = STRUCTURE_PIECE_SOLAR_HEATER_RING[2];
private static final String SOLAR_HEATER_RING_4 = STRUCTURE_PIECE_SOLAR_HEATER_RING[3];
private static final String SOLAR_HEATER_RING_5 = STRUCTURE_PIECE_SOLAR_HEATER_RING[4];
- private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>> STRUCTURE_DEFINITION =
- new ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>>() {
- @Override
- protected IStructureDefinition<GregtechMetaTileEntity_SolarTower> computeValue(Class<?> type) {
- return StructureDefinition.<GregtechMetaTileEntity_SolarTower>builder()
-
- // s = salt
- // c = thermal containment
- // i = thermal insulated
- // t = solar structural
- // h = hatch
- // g = solar heater
-
- .addShape(STRUCTURE_PIECE_TOP, (new String[][] {
- {" ", " ", " ~ ", " ", " "},
- {" ", " s ", " sss ", " s ", " "},
- {" c ", " ccc ", "ccscc", " ccc ", " c "},
- {" c ", " ccc ", "ccscc", " ccc ", " c "},
- {" c ", " ccc ", "ccscc", " ccc ", " c "},
- {" c ", " ccc ", "ccscc", " ccc ", " c "},
- {" c ", " ccc ", "ccscc", " ccc ", " c "},
- }))
- .addShape(STRUCTURE_PIECE_TOWER, (new String[][] {
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- {" i ", "isi", " i "},
- }))
- .addShape(STRUCTURE_PIECE_BASE, (new String[][] {
- {
- " ",
- " ",
- " t ",
- " ttt ",
- " ttstt ",
- " ttssstt ",
- " ttstt ",
- " ttt ",
- " t ",
- " ",
- " "
- },
- {
- " ",
- " ",
- " t ",
- " ttt ",
- " tssst ",
- " ttssstt ",
- " tssst ",
- " ttt ",
- " t ",
- " ",
- " "
- },
- {
- " ",
- " t ",
- " ttt ",
- " ttttt ",
- " ttssstt ",
- " tttsssttt ",
- " ttssstt ",
- " ttttt ",
- " ttt ",
- " t ",
- " "
- },
- {
- " ",
- " t ",
- " ttt ",
- " ttttt ",
- " ttssstt ",
- " tttsssttt ",
- " ttssstt ",
- " ttttt ",
- " ttt ",
- " t ",
- " "
- },
- {
- " hhh ",
- " ttttt ",
- " ttttttt ",
- " ttttttttt ",
- "htttsssttth",
- "htttsssttth",
- "htttsssttth",
- " ttttttttt ",
- " ttttttt ",
- " ttttt ",
- " hhh "
- },
- {
- " hhh ",
- " ttttt ",
- " ttttttt ",
- " ttttttttt ",
- "httttttttth",
- "httttttttth",
- "httttttttth",
- " ttttttttt ",
- " ttttttt ",
- " ttttt ",
- " hhh "
- },
- }))
- .addShape(SOLAR_HEATER_RING_1, (new String[][] {
- {
- " ggggg ",
- " g g ",
- " g g ",
- " g g ",
- " g g ",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- " g g ",
- " g g ",
- " g g ",
- " g g ",
- " ggggg ",
- }
- }))
- .addShape(SOLAR_HEATER_RING_2, (new String[][] {
- {
- " ggggggggg ",
- " g g ",
- " g g ",
- " g g ",
- " g g ",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- " g g ",
- " g g ",
- " g g ",
- " g g ",
- " ggggggggg ",
- }
- }))
- .addShape(SOLAR_HEATER_RING_3, (new String[][] {
- {
- " ggggggggggggg ",
- " g g ",
- " g g ",
- " g g ",
- " g g ",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- " g g ",
- " g g ",
- " g g ",
- " g g ",
- " ggggggggggggg ",
- }
- }))
- .addShape(SOLAR_HEATER_RING_4, (new String[][] {
- {
- " ggggggggggggggggg ",
- " g g ",
- " g g ",
- " g g ",
- " g g ",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- " g g ",
- " g g ",
- " g g ",
- " g g ",
- " ggggggggggggggggg ",
- }
- }))
- .addShape(SOLAR_HEATER_RING_5, (new String[][] {
- {
- " ggggggggggggggggggggg ",
- " g g ",
- " g g ",
- " g g ",
- " g g ",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- "g g",
- " g g ",
- " g g ",
- " g g ",
- " g g ",
- " ggggggggggggggggggggg ",
- }
- }))
- .addElement('g', lazy(t -> buildHatchAdder(GregtechMetaTileEntity_SolarTower.class)
- .hatchClass(TileEntitySolarHeater.class)
- .adder(GregtechMetaTileEntity_SolarTower::addSolarHeater)
- // Use a positive casing index to make adder builder happy
- .casingIndex(1)
- .dot(1)
- .continueIfSuccess()
- .build()))
- .addElement(
- 't',
- lazy(t -> onElementPass(
- x -> ++x.mCasing1, ofBlock(t.getCasingBlock(), t.getCasingMeta()))))
- .addElement(
- 'i',
- lazy(t -> onElementPass(
- x -> ++x.mCasing2, ofBlock(t.getCasingBlock(), t.getCasingMeta2()))))
- .addElement(
- 's',
- lazy(t -> onElementPass(
- x -> ++x.mCasing3, ofBlock(t.getCasingBlock(), t.getCasingMeta3()))))
- .addElement(
- 'c',
- lazy(t -> onElementPass(
- x -> ++x.mCasing4, ofBlock(t.getCasingBlock2(), t.getCasingMeta4()))))
- .addElement('h', lazy(t -> buildHatchAdder(GregtechMetaTileEntity_SolarTower.class)
- .atLeast(InputHatch, OutputHatch, Maintenance)
- .casingIndex(t.getCasingTextureIndex())
- .dot(2)
- .buildAndChain(onElementPass(
- x -> ++x.mCasing1, ofBlock(t.getCasingBlock(), t.getCasingMeta())))))
- .build();
- }
- };
+ private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>>() {
+
+ @Override
+ protected IStructureDefinition<GregtechMetaTileEntity_SolarTower> computeValue(Class<?> type) {
+ return StructureDefinition.<GregtechMetaTileEntity_SolarTower>builder()
+
+ // s = salt
+ // c = thermal containment
+ // i = thermal insulated
+ // t = solar structural
+ // h = hatch
+ // g = solar heater
+
+ .addShape(
+ STRUCTURE_PIECE_TOP,
+ (new String[][] { { " ", " ", " ~ ", " ", " " },
+ { " ", " s ", " sss ", " s ", " " },
+ { " c ", " ccc ", "ccscc", " ccc ", " c " },
+ { " c ", " ccc ", "ccscc", " ccc ", " c " },
+ { " c ", " ccc ", "ccscc", " ccc ", " c " },
+ { " c ", " ccc ", "ccscc", " ccc ", " c " },
+ { " c ", " ccc ", "ccscc", " ccc ", " c " }, }))
+ .addShape(
+ STRUCTURE_PIECE_TOWER,
+ (new String[][] { { " i ", "isi", " i " }, { " i ", "isi", " i " }, { " i ", "isi", " i " },
+ { " i ", "isi", " i " }, { " i ", "isi", " i " }, { " i ", "isi", " i " },
+ { " i ", "isi", " i " }, { " i ", "isi", " i " }, { " i ", "isi", " i " },
+ { " i ", "isi", " i " }, { " i ", "isi", " i " }, { " i ", "isi", " i " },
+ { " i ", "isi", " i " }, { " i ", "isi", " i " }, { " i ", "isi", " i " }, }))
+ .addShape(
+ STRUCTURE_PIECE_BASE,
+ (new String[][] {
+ { " ", " ", " t ", " ttt ", " ttstt ",
+ " ttssstt ", " ttstt ", " ttt ", " t ", " ",
+ " " },
+ { " ", " ", " t ", " ttt ", " tssst ",
+ " ttssstt ", " tssst ", " ttt ", " t ", " ",
+ " " },
+ { " ", " t ", " ttt ", " ttttt ", " ttssstt ",
+ " tttsssttt ", " ttssstt ", " ttttt ", " ttt ", " t ",
+ " " },
+ { " ", " t ", " ttt ", " ttttt ", " ttssstt ",
+ " tttsssttt ", " ttssstt ", " ttttt ", " ttt ", " t ",
+ " " },
+ { " hhh ", " ttttt ", " ttttttt ", " ttttttttt ", "htttsssttth",
+ "htttsssttth", "htttsssttth", " ttttttttt ", " ttttttt ", " ttttt ",
+ " hhh " },
+ { " hhh ", " ttttt ", " ttttttt ", " ttttttttt ", "httttttttth",
+ "httttttttth", "httttttttth", " ttttttttt ", " ttttttt ", " ttttt ",
+ " hhh " }, }))
+ .addShape(
+ SOLAR_HEATER_RING_1,
+ (new String[][] { { " ggggg ", " g g ", " g g ",
+ " g g ", " g g ", "g g", "g g",
+ "g g", "g g", "g g", " g g ",
+ " g g ", " g g ", " g g ", " ggggg ", } }))
+ .addShape(
+ SOLAR_HEATER_RING_2,
+ (new String[][] { { " ggggggggg ", " g g ", " g g ",
+ " g g ", " g g ", "g g",
+ "g g", "g g", "g g",
+ "g g", "g g", "g g",
+ "g g", "g g", " g g ",
+ " g g ", " g g ", " g g ",
+ " ggggggggg ", } }))
+ .addShape(
+ SOLAR_HEATER_RING_3,
+ (new String[][] { { " ggggggggggggg ", " g g ",
+ " g g ", " g g ", " g g ",
+ "g g", "g g", "g g",
+ "g g", "g g", "g g",
+ "g g", "g g", "g g",
+ "g g", "g g", "g g",
+ "g g", " g g ", " g g ",
+ " g g ", " g g ",
+ " ggggggggggggg ", } }))
+ .addShape(
+ SOLAR_HEATER_RING_4,
+ (new String[][] { { " ggggggggggggggggg ", " g g ",
+ " g g ", " g g ",
+ " g g ", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ " g g ", " g g ",
+ " g g ", " g g ",
+ " ggggggggggggggggg ", } }))
+ .addShape(
+ SOLAR_HEATER_RING_5,
+ (new String[][] { { " ggggggggggggggggggggg ", " g g ",
+ " g g ", " g g ",
+ " g g ", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ "g g", "g g",
+ " g g ", " g g ",
+ " g g ", " g g ",
+ " ggggggggggggggggggggg ", } }))
+ .addElement(
+ 'g',
+ lazy(
+ t -> buildHatchAdder(GregtechMetaTileEntity_SolarTower.class)
+ .hatchClass(TileEntitySolarHeater.class)
+ .adder(GregtechMetaTileEntity_SolarTower::addSolarHeater)
+ // Use a positive casing index to make adder builder happy
+ .casingIndex(1).dot(1).continueIfSuccess().build()))
+ .addElement(
+ 't',
+ lazy(t -> onElementPass(x -> ++x.mCasing1, ofBlock(t.getCasingBlock(), t.getCasingMeta()))))
+ .addElement(
+ 'i',
+ lazy(
+ t -> onElementPass(
+ x -> ++x.mCasing2,
+ ofBlock(t.getCasingBlock(), t.getCasingMeta2()))))
+ .addElement(
+ 's',
+ lazy(
+ t -> onElementPass(
+ x -> ++x.mCasing3,
+ ofBlock(t.getCasingBlock(), t.getCasingMeta3()))))
+ .addElement(
+ 'c',
+ lazy(
+ t -> onElementPass(
+ x -> ++x.mCasing4,
+ ofBlock(t.getCasingBlock2(), t.getCasingMeta4()))))
+ .addElement(
+ 'h',
+ lazy(
+ t -> buildHatchAdder(GregtechMetaTileEntity_SolarTower.class)
+ .atLeast(InputHatch, OutputHatch, Maintenance)
+ .casingIndex(t.getCasingTextureIndex()).dot(2).buildAndChain(
+ onElementPass(
+ x -> ++x.mCasing1,
+ ofBlock(t.getCasingBlock(), t.getCasingMeta())))))
+ .build();
+ }
+ };
@Override
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
@@ -426,27 +286,53 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
boolean aCasingCount4 = mCasing4 == 60;
boolean aAllStructure = aStructureTop && aStructureTower && aStructureBase;
boolean aAllCasings = aCasingCount1 && aCasingCount2 && aCasingCount3 && aCasingCount4;
- if (!aAllCasings
- || !aAllStructure
+ if (!aAllCasings || !aAllStructure
|| mMaintenanceHatches.size() != 1
|| mInputHatches.size() < 1
|| mOutputHatches.size() < 1) {
- log("Bad Hatches - Solar Heaters: " + mSolarHeaters.size() + ", Maint: "
- + mMaintenanceHatches.size() + ", Input Hatches: "
- + mInputHatches.size() + ", Output Hatches: "
- + mOutputHatches.size() + ", Top: "
- + aStructureTop + ", Tower: "
- + aStructureTower + ", Base: "
- + aStructureBase + ", Casing Count: "
- + aCasingCount1 + " | Found: " + mCasing1 + ", Casing Count: "
- + aCasingCount2 + " | Found: " + mCasing2 + ", Casing Count: "
- + aCasingCount3 + " | Found: " + mCasing3 + ", Casing Count: "
- + aCasingCount4 + " | Found: " + mCasing4);
+ log(
+ "Bad Hatches - Solar Heaters: " + mSolarHeaters.size()
+ + ", Maint: "
+ + mMaintenanceHatches.size()
+ + ", Input Hatches: "
+ + mInputHatches.size()
+ + ", Output Hatches: "
+ + mOutputHatches.size()
+ + ", Top: "
+ + aStructureTop
+ + ", Tower: "
+ + aStructureTower
+ + ", Base: "
+ + aStructureBase
+ + ", Casing Count: "
+ + aCasingCount1
+ + " | Found: "
+ + mCasing1
+ + ", Casing Count: "
+ + aCasingCount2
+ + " | Found: "
+ + mCasing2
+ + ", Casing Count: "
+ + aCasingCount3
+ + " | Found: "
+ + mCasing3
+ + ", Casing Count: "
+ + aCasingCount4
+ + " | Found: "
+ + mCasing4);
return false;
}
- log("Built " + this.getLocalName() + " with " + mCasing1 + " Structural Solar casings, " + mCasing2
- + " Thermally Insulated casings, " + mCasing3 + " Salt Containment casings, " + mCasing4
- + " Thermal Containment casings.");
+ log(
+ "Built " + this.getLocalName()
+ + " with "
+ + mCasing1
+ + " Structural Solar casings, "
+ + mCasing2
+ + " Thermally Insulated casings, "
+ + mCasing3
+ + " Salt Containment casings, "
+ + mCasing4
+ + " Thermal Containment casings.");
return aAllCasings && aAllStructure;
}
@@ -515,31 +401,16 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == 0 || aSide == 1) {
- if (aActive)
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)),
- TextureFactory.builder()
- .addIcon(TexturesGtBlock.Overlay_Machine_Controller_Default_Active)
- .extFacing()
- .build()
- };
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)),
- TextureFactory.builder()
- .addIcon(TexturesGtBlock.Overlay_Machine_Controller_Default)
- .extFacing()
- .build()
- };
+ if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)),
+ TextureFactory.builder().addIcon(TexturesGtBlock.Overlay_Machine_Controller_Default_Active)
+ .extFacing().build() };
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)), TextureFactory
+ .builder().addIcon(TexturesGtBlock.Overlay_Machine_Controller_Default).extFacing().build() };
}
- return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12))};
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)) };
}
@Override
@@ -650,8 +521,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
this.mEfficiencyIncrease = 100;
this.mMaxProgresstime = 200;
- if (this.mSolarHeaters.isEmpty()
- || this.mSolarHeaters.size() < 340
+ if (this.mSolarHeaters.isEmpty() || this.mSolarHeaters.size() < 340
|| this.getTotalRuntimeInTicks() % 200 == 0) {
getConnectedSolarReflectors();
}
@@ -673,12 +543,24 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
if (aHeaters > 0 && w.isDaytime()) {
if (w.isRaining() && this.getBaseMetaTileEntity().getBiome().rainfall > 0.0F) {
this.mHeatLevel += GT_Utility.safeInt((long) ((aHeaters / 2) * aEfficiency * (10 + aTier)));
- log("Added Heat (rain): " + aHeaters / 2 + " * " + aEfficiency + " * " + (10 + aTier) + " = "
- + (aHeaters * aEfficiency * (10 + aTier)));
+ log(
+ "Added Heat (rain): " + aHeaters / 2
+ + " * "
+ + aEfficiency
+ + " * "
+ + (10 + aTier)
+ + " = "
+ + (aHeaters * aEfficiency * (10 + aTier)));
} else {
this.mHeatLevel += GT_Utility.safeInt((long) (aHeaters * aEfficiency * (10 + aTier)));
- log("Added Heat: " + aHeaters + " * " + aEfficiency + " * " + (10 + aTier) + " = "
- + (aHeaters * aEfficiency * (10 + aTier)));
+ log(
+ "Added Heat: " + aHeaters
+ + " * "
+ + aEfficiency
+ + " * "
+ + (10 + aTier)
+ + " = "
+ + (aHeaters * aEfficiency * (10 + aTier)));
}
}
@@ -827,9 +709,8 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa
@Override
public String[] getExtraInfoData() {
- return new String[] {
- "Internal Heat Level: " + this.mHeatLevel, "Connected Solar Reflectors: " + this.mSolarHeaters.size()
- };
+ return new String[] { "Internal Heat Level: " + this.mHeatLevel,
+ "Connected Solar Reflectors: " + this.mSolarHeaters.size() };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
index 1225fe318d..504f398e25 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
@@ -9,11 +9,18 @@ import static gregtech.api.enums.GT_HatchElement.InputHatch;
import static gregtech.api.enums.GT_HatchElement.OutputBus;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.TAE;
import gregtech.api.interfaces.IIconContainer;
@@ -35,11 +42,6 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm;
import ic2.core.init.BlocksItems;
import ic2.core.init.InternalName;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<GregtechMTE_AlgaePondBase>
implements ISurvivalConstructable {
@@ -76,24 +78,16 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Grows Algae!")
- .addInfo("Controller Block for the Algae Farm")
+ tt.addMachineType(getMachineType()).addInfo("Grows Algae!").addInfo("Controller Block for the Algae Farm")
.addInfo("Provide compost to boost production by one tier")
.addInfo("Does not require power or maintenance")
.addInfo("All Machine Casings must be the same tier, this dictates machine speed.")
.addInfo("All Buses/Hatches must, at least, match the tier of the Casings")
.addInfo("Fill Input Hatch with Water to fill the inside of the multiblock.")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
- .beginStructureBlock(9, 3, 9, true)
- .addController("Front Center")
- .addCasingInfo("Machine Casings", 64)
- .addCasingInfo("Sterile Farm Casings", 34)
- .addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1)
- .addInputHatch("Any Casing", 1)
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(9, 3, 9, true)
+ .addController("Front Center").addCasingInfo("Machine Casings", 64)
+ .addCasingInfo("Sterile Farm Casings", 34).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1)
+ .addInputHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -109,49 +103,22 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
public IStructureDefinition<GregtechMTE_AlgaePondBase> getStructureDefinition() {
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_AlgaePondBase>builder()
- .addShape(mName, transpose(new String[][] {
- {
- "XXXXXXXXX",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "XXXXXXXXX"
- },
- {
- "XXXXXXXXX",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "X X",
- "XXXXXXXXX"
- },
- {
- "CCCC~CCCC",
- "CCCCCCCCC",
- "CCCCCCCCC",
- "CCCCCCCCC",
- "CCCCCCCCC",
- "CCCCCCCCC",
- "CCCCCCCCC",
- "CCCCCCCCC",
- "CCCCCCCCC"
- },
- }))
+ .addShape(
+ mName,
+ transpose(
+ new String[][] {
+ { "XXXXXXXXX", "X X", "X X", "X X", "X X",
+ "X X", "X X", "X X", "XXXXXXXXX" },
+ { "XXXXXXXXX", "X X", "X X", "X X", "X X",
+ "X X", "X X", "X X", "XXXXXXXXX" },
+ { "CCCC~CCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC",
+ "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC" }, }))
.addElement(
'C',
ofChain(
buildHatchAdder(GregtechMTE_AlgaePondBase.class)
.atLeast(InputHatch, InputBus, OutputBus)
- .casingIndex(TAE.getIndexFromPage(1, 15))
- .dot(1)
- .build(),
+ .casingIndex(TAE.getIndexFromPage(1, 15)).dot(1).build(),
onElementPass(
x -> ++x.mCasing,
addTieredBlock(
@@ -159,8 +126,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
GregtechMTE_AlgaePondBase::setMeta,
GregtechMTE_AlgaePondBase::getMeta,
10))))
- .addElement('X', ofBlock(ModBlocks.blockCasings2Misc, 15))
- .build();
+ .addElement('X', ofBlock(ModBlocks.blockCasings2Misc, 15)).build();
}
return STRUCTURE_DEFINITION;
}
@@ -256,10 +222,10 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
// if (aBaseMetaTileEntity.fac)
- final int xDir =
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * mCurrentDirectionX;
- final int zDir =
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * mCurrentDirectionZ;
+ final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX
+ * mCurrentDirectionX;
+ final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ
+ * mCurrentDirectionZ;
int tAmount = 0;
for (int i = mOffsetX_Lower + 1; i <= mOffsetX_Upper - 1; ++i) {
@@ -275,13 +241,11 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
// Utils.LOG_WARNING("Going to try swap an air block for water from inut bus.");
stored.amount -= 1000;
Block fluidUsed = Blocks.water;
- aBaseMetaTileEntity
- .getWorld()
- .setBlock(
- aBaseMetaTileEntity.getXCoord() + xDir + i,
- aBaseMetaTileEntity.getYCoord() + h,
- aBaseMetaTileEntity.getZCoord() + zDir + j,
- fluidUsed);
+ aBaseMetaTileEntity.getWorld().setBlock(
+ aBaseMetaTileEntity.getXCoord() + xDir + i,
+ aBaseMetaTileEntity.getYCoord() + h,
+ aBaseMetaTileEntity.getZCoord() + zDir + j,
+ fluidUsed);
}
}
}
@@ -307,8 +271,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
}
private boolean isNotStaticWater(Block block, byte meta) {
- return block == Blocks.air
- || block == Blocks.flowing_water
+ return block == Blocks.air || block == Blocks.flowing_water
|| block == BlocksItems.getFluidBlock(InternalName.fluidDistilledWater)
|| (cofhWater != null && cofhWater.isAssignableFrom(block.getClass()) && meta != 0);
}
@@ -353,14 +316,8 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
return checkRecipeGeneric(getMaxParallelRecipes(), getEuDiscountForParallelism(), 0);
}
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll,
- GT_Recipe aRecipe) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) {
if (this.mLevel < 0) {
return false;
@@ -384,14 +341,9 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
return false;
}
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(120)
- .setMaxParallel(aMaxParallelRecipes)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(120).setMaxParallel(aMaxParallelRecipes)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java
index 875c449f2d..97bd9dbce7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java
@@ -1,41 +1,12 @@
/*
-package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.bedrock;
-
-
-public class GregtechMetaTileEntity_BedrockMiningPlatform1 extends GregtechMetaTileEntity_BedrockMiningPlatformBase {
- public GregtechMetaTileEntity_BedrockMiningPlatform1(final int aID, final String aName, final String aNameRegional) {
- super(aID, aName, aNameRegional);
- }
-
- public GregtechMetaTileEntity_BedrockMiningPlatform1(final String aName) {
- super(aName);
- }
-
- public String[] getTooltip() {
- return this.getDescriptionInternal("I");
- }
-
- public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
- return (IMetaTileEntity) new GregtechMetaTileEntity_BedrockMiningPlatform1(this.mName);
- }
-
- protected Material getFrameMaterial() {
- return ALLOY.INCONEL_690;
- }
-
- protected int getCasingTextureIndex() {
- return TAE.getIndexFromPage(0, 14);
- }
-
- protected int getRadiusInChunks() {
- return 9;
- }
-
- protected int getMinTier() {
- return 5;
- }
-
- protected int getBaseProgressTime() {
- return (int) (420*(this.mProductionModifier/100));
- }
-}*/
+ * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.bedrock; public class
+ * GregtechMetaTileEntity_BedrockMiningPlatform1 extends GregtechMetaTileEntity_BedrockMiningPlatformBase { public
+ * GregtechMetaTileEntity_BedrockMiningPlatform1(final int aID, final String aName, final String aNameRegional) {
+ * super(aID, aName, aNameRegional); } public GregtechMetaTileEntity_BedrockMiningPlatform1(final String aName) {
+ * super(aName); } public String[] getTooltip() { return this.getDescriptionInternal("I"); } public IMetaTileEntity
+ * newMetaEntity(final IGregTechTileEntity aTileEntity) { return (IMetaTileEntity) new
+ * GregtechMetaTileEntity_BedrockMiningPlatform1(this.mName); } protected Material getFrameMaterial() { return
+ * ALLOY.INCONEL_690; } protected int getCasingTextureIndex() { return TAE.getIndexFromPage(0, 14); } protected int
+ * getRadiusInChunks() { return 9; } protected int getMinTier() { return 5; } protected int getBaseProgressTime() {
+ * return (int) (420*(this.mProductionModifier/100)); } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java
index f67ecfe87f..b4be6eb80f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java
@@ -1,41 +1,12 @@
/*
-package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.bedrock;
-
-
-public class GregtechMetaTileEntity_BedrockMiningPlatform2 extends GregtechMetaTileEntity_BedrockMiningPlatformBase {
- public GregtechMetaTileEntity_BedrockMiningPlatform2(final int aID, final String aName, final String aNameRegional) {
- super(aID, aName, aNameRegional);
- }
-
- public GregtechMetaTileEntity_BedrockMiningPlatform2(final String aName) {
- super(aName);
- }
-
- public String[] getTooltip() {
- return this.getDescriptionInternal("II");
- }
-
- public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
- return (IMetaTileEntity) new GregtechMetaTileEntity_BedrockMiningPlatform2(this.mName);
- }
-
- protected Material getFrameMaterial() {
- return ELEMENT.getInstance().AMERICIUM241;
- }
-
- protected int getCasingTextureIndex() {
- return 62;
- }
-
- protected int getRadiusInChunks() {
- return 9;
- }
-
- protected int getMinTier() {
- return 5;
- }
-
- protected int getBaseProgressTime() {
- return 480;
- }
-}*/
+ * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.bedrock; public class
+ * GregtechMetaTileEntity_BedrockMiningPlatform2 extends GregtechMetaTileEntity_BedrockMiningPlatformBase { public
+ * GregtechMetaTileEntity_BedrockMiningPlatform2(final int aID, final String aName, final String aNameRegional) {
+ * super(aID, aName, aNameRegional); } public GregtechMetaTileEntity_BedrockMiningPlatform2(final String aName) {
+ * super(aName); } public String[] getTooltip() { return this.getDescriptionInternal("II"); } public IMetaTileEntity
+ * newMetaEntity(final IGregTechTileEntity aTileEntity) { return (IMetaTileEntity) new
+ * GregtechMetaTileEntity_BedrockMiningPlatform2(this.mName); } protected Material getFrameMaterial() { return
+ * ELEMENT.getInstance().AMERICIUM241; } protected int getCasingTextureIndex() { return 62; } protected int
+ * getRadiusInChunks() { return 9; } protected int getMinTier() { return 5; } protected int getBaseProgressTime() {
+ * return 480; } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
index f64f0feab7..2c40e6875a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.bedrock;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
@@ -23,10 +28,6 @@ import gtPlusPlus.core.util.minecraft.MiningUtils;
import gtPlusPlus.core.util.minecraft.OreDictUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends GregtechMeta_MultiBlockBase {
@@ -49,8 +50,8 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
private int[] xCenter = new int[5];
private int[] zCenter = new int[5];
- public GregtechMetaTileEntity_BedrockMiningPlatformBase(
- final int aID, final String aName, final String aNameRegional) {
+ public GregtechMetaTileEntity_BedrockMiningPlatformBase(final int aID, final String aName,
+ final String aNameRegional) {
super(aID, aName, aNameRegional);
this.initFields();
}
@@ -203,7 +204,8 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
}
if (pipes == null) {
this.setInventorySlotContents(
- 1, GT_Utility.copy(new Object[] {GregtechMetaTileEntity_BedrockMiningPlatformBase.miningPipe}));
+ 1,
+ GT_Utility.copy(new Object[] { GregtechMetaTileEntity_BedrockMiningPlatformBase.miningPipe }));
pipes = this.getStackInSlot(1);
}
if (pipes.stackSize == maxPipes) {
@@ -221,8 +223,7 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
private boolean isHasMiningPipes(final int minCount) {
final ItemStack pipe = this.getStackInSlot(1);
- return pipe != null
- && pipe.stackSize > minCount - 1
+ return pipe != null && pipe.stackSize > minCount - 1
&& pipe.isItemEqual(GregtechMetaTileEntity_BedrockMiningPlatformBase.miningPipe);
}
@@ -241,8 +242,8 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
for (int j = -1; j < 2; ++j) {
for (int h = -1; h < 2; ++h) {
if (h != 0 || (xDir + i != 0 || zDir + j != 0) && (i != 0 || j != 0)) {
- IGregTechTileEntity tTileEntity =
- aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
+ IGregTechTileEntity tTileEntity = aBaseMetaTileEntity
+ .getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
Block aBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j);
int aMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j);
@@ -258,10 +259,10 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
}
++tAmount;
- /*if (!isValidBlockForStructure(tTileEntity, 48, true, aBlock, aMeta, sBlockCasings4, 0)) {
- Logger.INFO("Bad centrifuge casing");
- return false;
- }*/
+ /*
+ * if (!isValidBlockForStructure(tTileEntity, 48, true, aBlock, aMeta, sBlockCasings4, 0)) {
+ * Logger.INFO("Bad centrifuge casing"); return false; }
+ */
}
}
@@ -275,8 +276,7 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
this.xDrill = this.getBaseMetaTileEntity().getXCoord();
this.yDrill = this.getBaseMetaTileEntity().getYCoord() - 1;
this.zDrill = this.getBaseMetaTileEntity().getZCoord();
- this.back =
- ForgeDirection.getOrientation((int) this.getBaseMetaTileEntity().getBackFacing());
+ this.back = ForgeDirection.getOrientation((int) this.getBaseMetaTileEntity().getBackFacing());
// Middle
this.xCenter[0] = this.xDrill + this.back.offsetX;
@@ -332,22 +332,19 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
protected String[] getDescriptionInternal(final String tierSuffix) {
final String casings = this.getCasingBlockItem().get(0L, new Object[0]).getDisplayName();
return new String[] {
- "Controller Block for the Experimental Deep Earth Drilling Platform - MK "
- + ((tierSuffix != null) ? tierSuffix : ""),
- "Size(WxHxD): 3x7x3, Controller (Front middle bottom)",
- "3x1x3 Base of " + casings,
- "1x3x1 " + casings + " pillar (Center of base)",
- "1x3x1 " + this.getFrameMaterial().getLocalizedName() + " Frame Boxes (Each pillar side and on top)",
- "2x Input Hatch (Any bottom layer casing)",
- "1x Input Bus for mining pipes (Any bottom layer casing; not necessary)",
- "1x Output Bus (Any bottom layer casing)",
- "1x Maintenance Hatch (Any bottom layer casing)",
- "1x " + GT_Values.VN[this.getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
- "Radius is " + (this.getRadiusInChunks() << 4) + " blocks",
- "Every tick, this machine altenates betweem consumption of Pyrotheum & Cryotheum",
- "Pyrotheum is used to bore through the Mantle of the world",
- "Cryotheum is used to keep the internal components cool",
- };
+ "Controller Block for the Experimental Deep Earth Drilling Platform - MK "
+ + ((tierSuffix != null) ? tierSuffix : ""),
+ "Size(WxHxD): 3x7x3, Controller (Front middle bottom)", "3x1x3 Base of " + casings,
+ "1x3x1 " + casings + " pillar (Center of base)",
+ "1x3x1 " + this.getFrameMaterial().getLocalizedName() + " Frame Boxes (Each pillar side and on top)",
+ "2x Input Hatch (Any bottom layer casing)",
+ "1x Input Bus for mining pipes (Any bottom layer casing; not necessary)",
+ "1x Output Bus (Any bottom layer casing)", "1x Maintenance Hatch (Any bottom layer casing)",
+ "1x " + GT_Values.VN[this.getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
+ "Radius is " + (this.getRadiusInChunks() << 4) + " blocks",
+ "Every tick, this machine altenates betweem consumption of Pyrotheum & Cryotheum",
+ "Pyrotheum is used to bore through the Mantle of the world",
+ "Cryotheum is used to keep the internal components cool", };
}
static {
@@ -469,9 +466,8 @@ public abstract class GregtechMetaTileEntity_BedrockMiningPlatformBase extends G
mMixedOreData.put(new Pair<String, Integer>("oreLapis", 40));
mMixedOreData.put(new Pair<String, Integer>("oreRedstone", 40));
- if (LoadedMods.Thaumcraft
- || (OreDictUtils.containsValidEntries("oreAmber")
- && OreDictUtils.containsValidEntries("oreCinnabar"))) {
+ if (LoadedMods.Thaumcraft || (OreDictUtils.containsValidEntries("oreAmber")
+ && OreDictUtils.containsValidEntries("oreCinnabar"))) {
mMixedOreData.put(new Pair<String, Integer>("oreAmber", 20));
mMixedOreData.put(new Pair<String, Integer>("oreCinnabar", 20));
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
index cb25aeb155..6c4358219f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
@@ -8,9 +8,23 @@ import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gregtech.api.util.GT_StructureUtility.filterByMTETier;
import static gregtech.api.util.GT_StructureUtility.ofCoil;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import javax.annotation.Nullable;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.StructureLibAPI;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.*;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.HeatingCoilLevel;
import gregtech.api.interfaces.IIconContainer;
@@ -35,16 +49,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_Catalysts;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import javax.annotation.Nullable;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<GregtechMTE_ChemicalPlant>
implements ISurvivalConstructable {
@@ -61,8 +65,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
private int mCasing;
private static IStructureDefinition<GregtechMTE_ChemicalPlant> STRUCTURE_DEFINITION = null;
- private final ArrayList<GT_MetaTileEntity_Hatch_Catalysts> mCatalystBuses =
- new ArrayList<GT_MetaTileEntity_Hatch_Catalysts>();
+ private final ArrayList<GT_MetaTileEntity_Hatch_Catalysts> mCatalystBuses = new ArrayList<GT_MetaTileEntity_Hatch_Catalysts>();
private static final HashMap<Integer, Triplet<Block, Integer, Integer>> mTieredBlockRegistry = new HashMap<>();
@@ -75,11 +78,14 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
}
public static boolean registerMachineCasingForTier(int aTier, Block aBlock, int aMeta, int aCasingTextureID) {
- Triplet<Block, Integer, Integer> aCasingData =
- new Triplet<Block, Integer, Integer>(aBlock, aMeta, aCasingTextureID);
+ Triplet<Block, Integer, Integer> aCasingData = new Triplet<Block, Integer, Integer>(
+ aBlock,
+ aMeta,
+ aCasingTextureID);
if (mTieredBlockRegistry.containsKey(aTier)) {
- CORE.crash("Tried to register a Machine casing for tier " + aTier
- + " to the Chemical Plant, however this tier already contains one.");
+ CORE.crash(
+ "Tried to register a Machine casing for tier " + aTier
+ + " to the Chemical Plant, however this tier already contains one.");
}
mTieredBlockRegistry.put(aTier, aCasingData);
return true;
@@ -107,24 +113,15 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Chemical Plant")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the Chemical Plant")
.addInfo("Heavy Industry, now right at your doorstep!")
- .addInfo("Please read the user manual for more information on construction and usage")
- .addSeparator()
- .addController("Bottom Center")
- .addStructureHint("Catalyst Housing", 1)
- .addInputBus("Bottom Casing", 1)
- .addOutputBus("Bottom Casing", 1)
- .addInputHatch("Bottom Casing", 1)
- .addOutputHatch("Bottom Casing", 1)
- .addEnergyHatch("Bottom Casing", 1)
- .addMaintenanceHatch("Bottom Casing", 1)
+ .addInfo("Please read the user manual for more information on construction and usage").addSeparator()
+ .addController("Bottom Center").addStructureHint("Catalyst Housing", 1).addInputBus("Bottom Casing", 1)
+ .addOutputBus("Bottom Casing", 1).addInputHatch("Bottom Casing", 1).addOutputHatch("Bottom Casing", 1)
+ .addEnergyHatch("Bottom Casing", 1).addMaintenanceHatch("Bottom Casing", 1)
.addSubChannelUsage("casing", "metal machine casing")
- .addSubChannelUsage("machine", "tier machine casing")
- .addSubChannelUsage("coil", "heating coil blocks")
- .addSubChannelUsage("pipe", "pipe casing blocks")
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addSubChannelUsage("machine", "tier machine casing").addSubChannelUsage("coil", "heating coil blocks")
+ .addSubChannelUsage("pipe", "pipe casing blocks").toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@@ -192,42 +189,37 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
if (STRUCTURE_DEFINITION == null) {
IStructureElement<GregtechMTE_ChemicalPlant> allCasingsElement = withChannel(
"casing",
- ofChain(IntStream.range(0, 8)
- .mapToObj(GregtechMTE_ChemicalPlant::ofSolidCasing)
- .collect(Collectors.toList())));
- STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_ChemicalPlant>builder()
- .addShape(mName, transpose(new String[][] {
- {"XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX"},
- {"X X", " MMMMM ", " MHHHM ", " MHHHM ", " MHHHM ", " MMMMM ", "X X"},
- {"X X", " ", " PPP ", " PPP ", " PPP ", " ", "X X"},
- {"X X", " ", " HHH ", " HHH ", " HHH ", " ", "X X"},
- {"X X", " ", " PPP ", " PPP ", " PPP ", " ", "X X"},
- {"X X", " MMMMM ", " MHHHM ", " MHHHM ", " MHHHM ", " MMMMM ", "X X"},
- {"CCC~CCC", "CMMMMMC", "CMMMMMC", "CMMMMMC", "CMMMMMC", "CMMMMMC", "CCCCCCC"},
- }))
+ ofChain(
+ IntStream.range(0, 8).mapToObj(GregtechMTE_ChemicalPlant::ofSolidCasing)
+ .collect(Collectors.toList())));
+ STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_ChemicalPlant>builder().addShape(
+ mName,
+ transpose(
+ new String[][] {
+ { "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX" },
+ { "X X", " MMMMM ", " MHHHM ", " MHHHM ", " MHHHM ", " MMMMM ", "X X" },
+ { "X X", " ", " PPP ", " PPP ", " PPP ", " ", "X X" },
+ { "X X", " ", " HHH ", " HHH ", " HHH ", " ", "X X" },
+ { "X X", " ", " PPP ", " PPP ", " PPP ", " ", "X X" },
+ { "X X", " MMMMM ", " MHHHM ", " MHHHM ", " MHHHM ", " MMMMM ", "X X" },
+ { "CCC~CCC", "CMMMMMC", "CMMMMMC", "CMMMMMC", "CMMMMMC", "CMMMMMC", "CCCCCCC" }, }))
.addElement(
'C',
ofChain(
- buildHatchAdder(GregtechMTE_ChemicalPlant.class)
- .atLeast(Maintenance)
- .casingIndex(getCasingTextureID())
- .dot(1)
- .build(),
+ buildHatchAdder(GregtechMTE_ChemicalPlant.class).atLeast(Maintenance)
+ .casingIndex(getCasingTextureID()).dot(1).build(),
buildHatchAdder(GregtechMTE_ChemicalPlant.class)
.atLeast(InputHatch, OutputHatch, InputBus, OutputBus)
.adder(GregtechMTE_ChemicalPlant::addChemicalPlantList)
- .hatchItemFilterAnd((t, s) -> filterByMTETier(
- Integer.MIN_VALUE,
- s.stackSize >= 10 ? Integer.MAX_VALUE : s.stackSize))
- .casingIndex(getCasingTextureID())
- .dot(1)
- .build(),
+ .hatchItemFilterAnd(
+ (t, s) -> filterByMTETier(
+ Integer.MIN_VALUE,
+ s.stackSize >= 10 ? Integer.MAX_VALUE : s.stackSize))
+ .casingIndex(getCasingTextureID()).dot(1).build(),
buildHatchAdder(GregtechMTE_ChemicalPlant.class)
.hatchClass(GT_MetaTileEntity_Hatch_Catalysts.class)
.adder(GregtechMTE_ChemicalPlant::addChemicalPlantList)
- .casingIndex(getCasingTextureID())
- .dot(1)
- .build(),
+ .casingIndex(getCasingTextureID()).dot(1).build(),
allCasingsElement))
.addElement('X', allCasingsElement)
.addElement(
@@ -263,6 +255,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
private static IStructureElement<GregtechMTE_ChemicalPlant> ofSolidCasing(int aIndex) {
return new IStructureElement<GregtechMTE_ChemicalPlant>() {
+
@Override
public boolean check(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z) {
if (check(aIndex, world, x, y, z)) {
@@ -298,8 +291,8 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
}
@Override
- public boolean placeBlock(
- GregtechMTE_ChemicalPlant t, World world, int x, int y, int z, ItemStack trigger) {
+ public boolean placeBlock(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z,
+ ItemStack trigger) {
return world.setBlock(
x,
y,
@@ -311,28 +304,16 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
@Nullable
@Override
- public BlocksToPlace getBlocksToPlace(
- GregtechMTE_ChemicalPlant gregtechMTE_chemicalPlant,
- World world,
- int x,
- int y,
- int z,
- ItemStack trigger,
- AutoPlaceEnvironment env) {
+ public BlocksToPlace getBlocksToPlace(GregtechMTE_ChemicalPlant gregtechMTE_chemicalPlant, World world,
+ int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) {
return BlocksToPlace.create(
mTieredBlockRegistry.get(getIndex(trigger.stackSize)).getValue_1(),
mTieredBlockRegistry.get(getIndex(trigger.stackSize)).getValue_2());
}
@Override
- public PlaceResult survivalPlaceBlock(
- GregtechMTE_ChemicalPlant t,
- World world,
- int x,
- int y,
- int z,
- ItemStack trigger,
- AutoPlaceEnvironment env) {
+ public PlaceResult survivalPlaceBlock(GregtechMTE_ChemicalPlant t, World world, int x, int y, int z,
+ ItemStack trigger, AutoPlaceEnvironment env) {
if (check(getIndex(trigger.stackSize), world, x, y, z)) return PlaceResult.SKIP;
return StructureUtility.survivalPlaceBlock(
mTieredBlockRegistry.get(getIndex(trigger.stackSize)).getValue_1(),
@@ -603,25 +584,24 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
}
@Override
- public boolean checkRecipeGeneric(
- int aMaxParallelRecipes, long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) {
+ public boolean checkRecipeGeneric(int aMaxParallelRecipes, long aEUPercent, int aSpeedBonusPercent,
+ int aOutputChanceRoll) {
ArrayList<ItemStack> tItems = getStoredInputs();
ArrayList<FluidStack> tFluids = getStoredFluids();
ItemStack[] tItemInputs = tItems.toArray(new ItemStack[tItems.size()]);
FluidStack[] tFluidInputs = tFluids.toArray(new FluidStack[tFluids.size()]);
return checkRecipeGeneric(
- tItemInputs, tFluidInputs, aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, aOutputChanceRoll);
+ tItemInputs,
+ tFluidInputs,
+ aMaxParallelRecipes,
+ aEUPercent,
+ aSpeedBonusPercent,
+ aOutputChanceRoll);
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll,
- GT_Recipe aRecipe) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) {
// Based on the Processing Array. A bit overkill, but very flexible.
@@ -636,9 +616,13 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
long tEnergy = getMaxInputEnergy();
// GT_Recipe tRecipe = findRecipe(getBaseMetaTileEntity(), mLastRecipe, false,
- // gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs);
+ // gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs);
GT_Recipe tRecipe = findRecipe(
- mLastRecipe, gregtech.api.enums.GT_Values.V[tTier], getSolidCasingTier(), aItemInputs, aFluidInputs);
+ mLastRecipe,
+ gregtech.api.enums.GT_Values.V[tTier],
+ getSolidCasingTier(),
+ aItemInputs,
+ aFluidInputs);
if (tRecipe == null) {
return false;
@@ -682,14 +666,9 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
return false;
}
- GT_ParallelHelper helper = new GT_ParallelHelper()
- .setRecipe(tRecipe)
- .setItemInputs(aItemInputs)
- .setFluidInputs(aFluidInputs)
- .setAvailableEUt(tEnergy)
- .setMaxParallel(tMaxParallelCatalyst)
- .enableConsumption()
- .enableOutputCalculation();
+ GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs)
+ .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(tMaxParallelCatalyst)
+ .enableConsumption().enableOutputCalculation();
if (!mVoidExcess) {
helper.enableVoidProtection(this);
}
@@ -707,14 +686,10 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(tRecipe.mEUt)
- .setEUt(tEnergy)
- .setDuration(tRecipe.mDuration)
- .setEUtDiscount(100.0f / aEUPercent)
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt).setEUt(tEnergy)
+ .setDuration(tRecipe.mDuration).setEUtDiscount(100.0f / aEUPercent)
.setSpeedBoost((100.0f / aSpeedBonusPercent))
- .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel()))
- .calculate();
+ .setParallel(Math.min(aMaxParallelRecipes, helper.getCurrentParallel())).calculate();
lEUt = -calculator.getConsumption();
mMaxProgresstime = (int) Math.ceil(calculator.getDuration() * helper.getDurationMultiplier());
@@ -787,12 +762,8 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
}
}
- public GT_Recipe findRecipe(
- final GT_Recipe aRecipe,
- final long aVoltage,
- final long aSpecialValue,
- ItemStack[] aInputs,
- final FluidStack[] aFluids) {
+ public GT_Recipe findRecipe(final GT_Recipe aRecipe, final long aVoltage, final long aSpecialValue,
+ ItemStack[] aInputs, final FluidStack[] aFluids) {
if (!mInitRecipeCache) {
initRecipeCaches();
}
@@ -820,8 +791,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
GT_Recipe aFoundRecipe = null;
// Iterate the tiers recipes until we find the one with all inputs matching
- master:
- for (AutoMap<GT_Recipe> aTieredMap : aMasterMap) {
+ master: for (AutoMap<GT_Recipe> aTieredMap : aMasterMap) {
for (GT_Recipe aRecipeToCheck : aTieredMap) {
if (aRecipeToCheck.isRecipeInputEqual(false, aFluids, aInputs)) {
log("Found recipe with matching inputs!");
@@ -845,8 +815,8 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
return null;
}
- private int getCatalysts(
- ItemStack[] aItemInputs, ItemStack aRecipeCatalyst, int aMaxParrallel, ArrayList<ItemStack> aOutPut) {
+ private int getCatalysts(ItemStack[] aItemInputs, ItemStack aRecipeCatalyst, int aMaxParrallel,
+ ArrayList<ItemStack> aOutPut) {
int allowedParallel = 0;
for (final ItemStack aInput : aItemInputs) {
if (aRecipeCatalyst.isItemEqual(aInput)) {
@@ -905,7 +875,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
}
/*
- * Catalyst Handling
+ * Catalyst Handling
*/
@Override
public ArrayList<ItemStack> getStoredInputs() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java
index 702dc467be..57e4724ecd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java
@@ -6,6 +6,15 @@ import static gregtech.api.enums.GT_HatchElement.Energy;
import static gregtech.api.enums.GT_HatchElement.Maintenance;
import static gregtech.api.util.GT_StructureUtility.*;
+import java.util.*;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraftforge.fluids.FluidStack;
+
import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
import com.github.bartimaeusnek.bartworks.util.Pair;
import com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel;
@@ -13,6 +22,7 @@ import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructa
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.HeatingCoilLevel;
import gregtech.api.enums.TAE;
@@ -25,13 +35,6 @@ import gregtech.api.render.TextureFactory;
import gregtech.api.util.*;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.*;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.fluids.FluidStack;
public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GregTechMetaTileEntity_MegaAlloyBlastSmelter>
@@ -44,283 +47,79 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
private int currentParallels;
private boolean hasNormalCoils;
- private static final IStructureDefinition<GregTechMetaTileEntity_MegaAlloyBlastSmelter> STRUCTURE_DEFINITION =
- StructureDefinition.<GregTechMetaTileEntity_MegaAlloyBlastSmelter>builder()
- .addShape("main", new String[][] {
- {
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " DDDDD ",
- " CCCCC ",
- " AEEEA ",
- " AE~EA ",
- " AEEEA ",
- " CCCCC ",
- " ZZZZZ "
- },
- {
- " DDDDD ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " DDDDD ",
- " D D ",
- " C C ",
- " A A ",
- " A A ",
- " A A ",
- " C C ",
- " ZZZZZZZ "
- },
- {
- " DFFFFFD ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " DBBBBBD ",
- " D BBBBB D ",
- " C BBBBB C ",
- " A BBBBB A ",
- " A BBBBB A ",
- " A BBBBB A ",
- " C BBBBB C ",
- " ZZZZZZZZZ "
- },
- {
- " DFFFFFFFD ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " DB BD ",
- "D B B D",
- "C B B C",
- "A B B A",
- "A B B A",
- "A B B A",
- "C B B C",
- "ZZZZZZZZZZZ"
- },
- {
- " DFFFFFFFD ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " DB BD ",
- "D B B D",
- "C B B C",
- "A B B A",
- "A B B A",
- "A B B A",
- "C B B C",
- "ZZZZZZZZZZZ"
- },
- {
- " DFFFFFFFD ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " DB BD ",
- "D B B D",
- "C B B C",
- "A B B A",
- "A B B A",
- "A B B A",
- "C B B C",
- "ZZZZZZZZZZZ"
- },
- {
- " DFFFFFFFD ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " DB BD ",
- "D B B D",
- "C B B C",
- "A B B A",
- "A B B A",
- "A B B A",
- "C B B C",
- "ZZZZZZZZZZZ"
- },
- {
- " DFFFFFFFD ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " AB BA ",
- " DB BD ",
- "D B B D",
- "C B B C",
- "A B B A",
- "A B B A",
- "A B B A",
- "C B B C",
- "ZZZZZZZZZZZ"
- },
- {
- " DFFFFFD ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " ABBBBBA ",
- " DBBBBBD ",
- " D BBBBB D ",
- " C BBBBB C ",
- " A BBBBB A ",
- " A BBBBB A ",
- " A BBBBB A ",
- " C BBBBB C ",
- " ZZZZZZZZZ "
- },
- {
- " DDDDD ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " DDDDD ",
- " D D ",
- " C C ",
- " A A ",
- " A A ",
- " A A ",
- " C C ",
- " ZZZZZZZ "
- },
- {
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " DDDDD ",
- " CCCCC ",
- " AAAAA ",
- " AAAAA ",
- " AAAAA ",
- " CCCCC ",
- " ZZZZZ "
- }
- })
- .addElement(
- 'B',
- ofChain(
- onElementPass(
- te -> te.hasNormalCoils = false,
- ofCoil(
- GregTechMetaTileEntity_MegaAlloyBlastSmelter::setCoilLevel,
- GregTechMetaTileEntity_MegaAlloyBlastSmelter::getCoilLevel)),
- onElementPass(
- te -> te.hasNormalCoils = true, ofBlock(ModBlocks.blockCasingsMisc, 14))))
- .addElement(
- 'Z',
- buildHatchAdder(GregTechMetaTileEntity_MegaAlloyBlastSmelter.class)
- .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Energy, ExoticEnergy)
- .casingIndex(TAE.GTPP_INDEX(15))
- .dot(1)
- .buildAndChain(ofBlock(ModBlocks.blockCasingsMisc, 15)))
- .addElement(
- 'E',
- buildHatchAdder(GregTechMetaTileEntity_MegaAlloyBlastSmelter.class)
- .atLeast(Maintenance)
- .casingIndex(TAE.GTPP_INDEX(15))
- .dot(2)
- .buildAndChain(ofBlock(ModBlocks.blockCasingsMisc, 15)))
- .addElement('D', ofBlock(ModBlocks.blockCasingsMisc, 15))
- .addElement('C', ofBlock(ModBlocks.blockCasingsMisc, 14))
- .addElement(
- 'A',
- BorosilicateGlass.ofBoroGlass((byte) -1, (te, t) -> te.glassTier = t, te -> te.glassTier))
- .addElement('F', Muffler.newAny(TAE.GTPP_INDEX(15), 3))
- .build();
+ private static final IStructureDefinition<GregTechMetaTileEntity_MegaAlloyBlastSmelter> STRUCTURE_DEFINITION = StructureDefinition
+ .<GregTechMetaTileEntity_MegaAlloyBlastSmelter>builder()
+ .addShape(
+ "main",
+ new String[][] {
+ { " ", " ", " ", " ", " ", " ",
+ " ", " ", " ", " ", " ",
+ " ", " ", " DDDDD ", " CCCCC ", " AEEEA ",
+ " AE~EA ", " AEEEA ", " CCCCC ", " ZZZZZ " },
+ { " DDDDD ", " AAAAA ", " AAAAA ", " AAAAA ", " AAAAA ", " AAAAA ",
+ " AAAAA ", " AAAAA ", " AAAAA ", " AAAAA ", " AAAAA ",
+ " AAAAA ", " DDDDD ", " D D ", " C C ", " A A ",
+ " A A ", " A A ", " C C ", " ZZZZZZZ " },
+ { " DFFFFFD ", " ABBBBBA ", " ABBBBBA ", " ABBBBBA ", " ABBBBBA ", " ABBBBBA ",
+ " ABBBBBA ", " ABBBBBA ", " ABBBBBA ", " ABBBBBA ", " ABBBBBA ",
+ " ABBBBBA ", " DBBBBBD ", " D BBBBB D ", " C BBBBB C ", " A BBBBB A ",
+ " A BBBBB A ", " A BBBBB A ", " C BBBBB C ", " ZZZZZZZZZ " },
+ { " DFFFFFFFD ", " AB BA ", " AB BA ", " AB BA ", " AB BA ", " AB BA ",
+ " AB BA ", " AB BA ", " AB BA ", " AB BA ", " AB BA ",
+ " AB BA ", " DB BD ", "D B B D", "C B B C", "A B B A",
+ "A B B A", "A B B A", "C B B C", "ZZZZZZZZZZZ" },
+ { " DFFFFFFFD ", " AB BA ", " AB BA ", " AB BA ", " AB BA ", " AB BA ",
+ " AB BA ", " AB BA ", " AB BA ", " AB BA ", " AB BA ",
+ " AB BA ", " DB BD ", "D B B D", "C B B C", "A B B A",
+ "A B B A", "A B B A", "C B B C", "ZZZZZZZZZZZ" },
+ { " DFFFFFFFD ", " AB BA ", " AB BA ", " AB BA ", " AB BA ", " AB BA ",
+ " AB BA ", " AB BA ", " AB BA ", " AB BA ", " AB BA ",
+ " AB BA ", " DB BD ", "D B B D", "C B B C", "A B B A",
+ "A B B A", "A B B A", "C B B C", "ZZZZZZZZZZZ" },
+ { " DFFFFFFFD ", " AB BA ", " AB BA ", " AB BA ", " AB BA ", " AB BA ",
+ " AB BA ", " AB BA ", " AB BA ", " AB BA ", " AB BA ",
+ " AB BA ", " DB BD ", "D B B D", "C B B C", "A B B A",
+ "A B B A", "A B B A", "C B B C", "ZZZZZZZZZZZ" },
+ { " DFFFFFFFD ", " AB BA ", " AB BA ", " AB BA ", " AB BA ", " AB BA ",
+ " AB BA ", " AB BA ", " AB BA ", " AB BA ", " AB BA ",
+ " AB BA ", " DB BD ", "D B B D", "C B B C", "A B B A",
+ "A B B A", "A B B A", "C B B C", "ZZZZZZZZZZZ" },
+ { " DFFFFFD ", " ABBBBBA ", " ABBBBBA ", " ABBBBBA ", " ABBBBBA ", " ABBBBBA ",
+ " ABBBBBA ", " ABBBBBA ", " ABBBBBA ", " ABBBBBA ", " ABBBBBA ",
+ " ABBBBBA ", " DBBBBBD ", " D BBBBB D ", " C BBBBB C ", " A BBBBB A ",
+ " A BBBBB A ", " A BBBBB A ", " C BBBBB C ", " ZZZZZZZZZ " },
+ { " DDDDD ", " AAAAA ", " AAAAA ", " AAAAA ", " AAAAA ", " AAAAA ",
+ " AAAAA ", " AAAAA ", " AAAAA ", " AAAAA ", " AAAAA ",
+ " AAAAA ", " DDDDD ", " D D ", " C C ", " A A ",
+ " A A ", " A A ", " C C ", " ZZZZZZZ " },
+ { " ", " ", " ", " ", " ", " ",
+ " ", " ", " ", " ", " ",
+ " ", " ", " DDDDD ", " CCCCC ", " AAAAA ",
+ " AAAAA ", " AAAAA ", " CCCCC ", " ZZZZZ " } })
+ .addElement(
+ 'B',
+ ofChain(
+ onElementPass(
+ te -> te.hasNormalCoils = false,
+ ofCoil(
+ GregTechMetaTileEntity_MegaAlloyBlastSmelter::setCoilLevel,
+ GregTechMetaTileEntity_MegaAlloyBlastSmelter::getCoilLevel)),
+ onElementPass(te -> te.hasNormalCoils = true, ofBlock(ModBlocks.blockCasingsMisc, 14))))
+ .addElement(
+ 'Z',
+ buildHatchAdder(GregTechMetaTileEntity_MegaAlloyBlastSmelter.class)
+ .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Energy, ExoticEnergy)
+ .casingIndex(TAE.GTPP_INDEX(15)).dot(1)
+ .buildAndChain(ofBlock(ModBlocks.blockCasingsMisc, 15)))
+ .addElement(
+ 'E',
+ buildHatchAdder(GregTechMetaTileEntity_MegaAlloyBlastSmelter.class).atLeast(Maintenance)
+ .casingIndex(TAE.GTPP_INDEX(15)).dot(2)
+ .buildAndChain(ofBlock(ModBlocks.blockCasingsMisc, 15)))
+ .addElement('D', ofBlock(ModBlocks.blockCasingsMisc, 15))
+ .addElement('C', ofBlock(ModBlocks.blockCasingsMisc, 14))
+ .addElement('A', BorosilicateGlass.ofBoroGlass((byte) -1, (te, t) -> te.glassTier = t, te -> te.glassTier))
+ .addElement('F', Muffler.newAny(TAE.GTPP_INDEX(15), 3)).build();
public GregTechMetaTileEntity_MegaAlloyBlastSmelter(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional);
@@ -372,18 +171,14 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
currentParallels = RecipeFinderForParallel.handleParallelRecipe(recipe, tFluids, tItems, (int) parallels);
if (currentParallels <= 0) return false;
- GT_OverclockCalculator calculator = new GT_OverclockCalculator()
- .setRecipeEUt(recipe.mEUt)
- .setParallel(currentParallels)
- .setDuration(recipe.mDuration)
- .setEUt(tTotalEU)
- .calculate();
+ GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(recipe.mEUt)
+ .setParallel(currentParallels).setDuration(recipe.mDuration).setEUt(tTotalEU).calculate();
lEUt = calculator.getConsumption();
mMaxProgresstime = calculator.getDuration();
- Pair<ArrayList<FluidStack>, ArrayList<ItemStack>> outputs =
- RecipeFinderForParallel.getMultiOutput(recipe, currentParallels);
+ Pair<ArrayList<FluidStack>, ArrayList<ItemStack>> outputs = RecipeFinderForParallel
+ .getMultiOutput(recipe, currentParallels);
mMaxProgresstime -= coilLevel.getTier() < 0 ? 0 : mMaxProgresstime * getCoilDiscount(coilLevel);
@@ -487,28 +282,40 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType("Fluid Alloy Cooker")
- .addInfo("Controller block for the Mega Alloy Blast Smelter")
- .addInfo("Runs the same recipes as the normal ABS, except with up to " + EnumChatFormatting.BOLD
- + EnumChatFormatting.UNDERLINE + MAX_PARALLELS + EnumChatFormatting.RESET
- + EnumChatFormatting.GRAY + " parallels.")
+ tt.addMachineType("Fluid Alloy Cooker").addInfo("Controller block for the Mega Alloy Blast Smelter")
+ .addInfo(
+ "Runs the same recipes as the normal ABS, except with up to " + EnumChatFormatting.BOLD
+ + EnumChatFormatting.UNDERLINE
+ + MAX_PARALLELS
+ + EnumChatFormatting.RESET
+ + EnumChatFormatting.GRAY
+ + " parallels.")
.addInfo("Every coil tier above cupronickel grants a speed bonus, based on this function:")
.addInfo("Bonus = TIER / 150, rounded to the nearest thousandth.")
- .addInfo(EnumChatFormatting.ITALIC
- + "Can also use normal ABS coils in their place instead, if you don't like the bonuses :)"
- + EnumChatFormatting.RESET + EnumChatFormatting.GRAY)
+ .addInfo(
+ EnumChatFormatting.ITALIC
+ + "Can also use normal ABS coils in their place instead, if you don't like the bonuses :)"
+ + EnumChatFormatting.RESET
+ + EnumChatFormatting.GRAY)
.addInfo("The glass limits the tier of the energy hatch. UEV glass unlocks all tiers.")
.addInfo("UV glass required for TecTech laser hatches.")
- .addInfo(EnumChatFormatting.ITALIC + "\"all it does is make metals hot\"" + EnumChatFormatting.RESET
- + EnumChatFormatting.GRAY)
+ .addInfo(
+ EnumChatFormatting.ITALIC + "\"all it does is make metals hot\""
+ + EnumChatFormatting.RESET
+ + EnumChatFormatting.GRAY)
.beginStructureBlock(11, 20, 11, false)
.addStructureInfo("This structure is too complex! See schematic for details.")
.addMaintenanceHatch("Around the controller", 2)
.addOtherStructurePart(
- "Input Bus, Output Bus, Input Hatch, Output Bus, Energy Hatch", "Bottom Casing", 1)
- .addMufflerHatch("At least 45", 3)
- .toolTipFinisher(EnumChatFormatting.AQUA + "MadMan310 " + EnumChatFormatting.GRAY + "via "
- + EnumChatFormatting.RED + "GT++");
+ "Input Bus, Output Bus, Input Hatch, Output Bus, Energy Hatch",
+ "Bottom Casing",
+ 1)
+ .addMufflerHatch("At least 45", 3).toolTipFinisher(
+ EnumChatFormatting.AQUA + "MadMan310 "
+ + EnumChatFormatting.GRAY
+ + "via "
+ + EnumChatFormatting.RED
+ + "GT++");
return tt;
}
@@ -526,30 +333,47 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
}
}
- return new String[] {
- "------------ Critical Information ------------",
- StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN
- + GT_Utility.formatNumbers(mProgresstime) + EnumChatFormatting.RESET + "t / "
- + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(mMaxProgresstime) + EnumChatFormatting.RESET + "t",
- StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN
- + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / "
- + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU",
- StatCollector.translateToLocal("GT5U.multiblock.usage") + ": " + EnumChatFormatting.RED
- + GT_Utility.formatNumbers(-lEUt) + EnumChatFormatting.RESET + " EU/t",
- StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(getAverageInputVoltage())
- + EnumChatFormatting.RESET + " EU/t(*" + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(getMaxInputAmps())
- + EnumChatFormatting.RESET + "A) " + StatCollector.translateToLocal("GT5U.machines.tier")
- + ": " + EnumChatFormatting.YELLOW
- + GT_Values.VN[GT_Utility.getTier(getAverageInputVoltage())]
- + EnumChatFormatting.RESET,
- "Parallels: " + EnumChatFormatting.BLUE + paras + EnumChatFormatting.RESET,
- "Coil Discount: " + EnumChatFormatting.BLUE + discountP + "%" + EnumChatFormatting.RESET,
- "-----------------------------------------"
- };
+ return new String[] { "------------ Critical Information ------------",
+ StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": "
+ + EnumChatFormatting.GREEN
+ + GT_Utility.formatNumbers(mProgresstime)
+ + EnumChatFormatting.RESET
+ + "t / "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.formatNumbers(mMaxProgresstime)
+ + EnumChatFormatting.RESET
+ + "t",
+ StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
+ + EnumChatFormatting.GREEN
+ + GT_Utility.formatNumbers(storedEnergy)
+ + EnumChatFormatting.RESET
+ + " EU / "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.formatNumbers(maxEnergy)
+ + EnumChatFormatting.RESET
+ + " EU",
+ StatCollector.translateToLocal("GT5U.multiblock.usage") + ": "
+ + EnumChatFormatting.RED
+ + GT_Utility.formatNumbers(-lEUt)
+ + EnumChatFormatting.RESET
+ + " EU/t",
+ StatCollector.translateToLocal("GT5U.multiblock.mei") + ": "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.formatNumbers(getAverageInputVoltage())
+ + EnumChatFormatting.RESET
+ + " EU/t(*"
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.formatNumbers(getMaxInputAmps())
+ + EnumChatFormatting.RESET
+ + "A) "
+ + StatCollector.translateToLocal("GT5U.machines.tier")
+ + ": "
+ + EnumChatFormatting.YELLOW
+ + GT_Values.VN[GT_Utility.getTier(getAverageInputVoltage())]
+ + EnumChatFormatting.RESET,
+ "Parallels: " + EnumChatFormatting.BLUE + paras + EnumChatFormatting.RESET,
+ "Coil Discount: " + EnumChatFormatting.BLUE + discountP + "%" + EnumChatFormatting.RESET,
+ "-----------------------------------------" };
}
@Override
@@ -558,32 +382,18 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
if (aSide == aFacing) {
if (aActive) {
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(15)),
- TextureFactory.builder()
- .addIcon(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active)
- .extFacing()
- .build()
- };
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(15)),
+ TextureFactory.builder().addIcon(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active)
+ .extFacing().build() };
}
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(15)),
- TextureFactory.builder()
- .addIcon(TexturesGtBlock.Overlay_Machine_Controller_Advanced)
- .extFacing()
- .build()
- };
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(15)), TextureFactory
+ .builder().addIcon(TexturesGtBlock.Overlay_Machine_Controller_Advanced).extFacing().build() };
}
- return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(15))};
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(15)) };
}
@Override
@@ -607,7 +417,8 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
} else {
separateBusses = !separateBusses;
GT_Utility.sendChatToPlayer(
- aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + separateBusses);
+ aPlayer,
+ StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + separateBusses);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
index 31715246fc..3f0d83114e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
@@ -2,6 +2,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.t
import static gtPlusPlus.core.lib.CORE.RANDOM;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -9,10 +15,6 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
@SuppressWarnings("deprecation")
public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbineBase {
@@ -67,9 +69,8 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin
int tEU = 0;
int actualOptimalFlow = 0;
- FluidStack firstFuelType = new FluidStack(
- aFluids.get(0),
- 0); // Identify a SINGLE type of fluid to process. Doesn't matter which one. Ignore the rest!
+ FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process.
+ // Doesn't matter which one. Ignore the rest!
int fuelValue = getFuelValue(firstFuelType);
// log("Fuel Value of "+aFluids.get(0).getLocalizedName()+" is "+fuelValue+"eu");
if (aOptFlow < fuelValue) {
@@ -85,8 +86,9 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin
actualOptimalFlow = GT_Utility.safeInt((long) (aOptFlow * (double) flowMultipliers[1] / fuelValue));
this.realOptFlow = actualOptimalFlow;
- int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow
- * 1.25f)); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for
+ int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow * 1.25f)); // Allowed to use up to 125% of
+ // optimal flow. Variable
+ // required outside of loop for
// multi-hatch scenarios.
int flow = 0;
int totalFlow = 0;
@@ -94,9 +96,8 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin
storedFluid = 0;
for (FluidStack aFluid : aFluids) {
if (aFluid.isFluidEqual(firstFuelType)) {
- flow = Math.min(
- aFluid.amount,
- remainingFlow); // try to use up to 125% of optimal flow w/o exceeding remainingFlow
+ flow = Math.min(aFluid.amount, remainingFlow); // try to use up to 125% of optimal flow w/o
+ // exceeding remainingFlow
depleteInput(new FluidStack(aFluid, flow)); // deplete that amount
this.storedFluid += aFluid.amount;
remainingFlow -= flow; // track amount we're allowed to continue depleting from hatches
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
index b55d61baab..d30f44b737 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -10,10 +16,6 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
@SuppressWarnings("deprecation")
public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTurbineBase {
@@ -63,21 +65,14 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll,
- GT_Recipe aRecipe) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) {
try {
ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies();
if (aEmptyTurbineRotorHatches.size() > 0) {
log("Found " + aEmptyTurbineRotorHatches.size() + " Assemblies without Turbine.");
- hatch:
- for (GT_MetaTileEntity_Hatch_Turbine aHatch : aEmptyTurbineRotorHatches) {
+ hatch: for (GT_MetaTileEntity_Hatch_Turbine aHatch : aEmptyTurbineRotorHatches) {
ArrayList<ItemStack> aTurbines = getAllBufferedTurbines();
for (ItemStack aTurbineItem : aTurbines) {
if (aTurbineItem == null) {
@@ -101,8 +96,7 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
ArrayList<FluidStack> tFluids = getStoredFluids();
if (tFluids.size() > 0) {
- if (baseEff == 0
- || optFlow == 0
+ if (baseEff == 0 || optFlow == 0
|| counter >= 512
|| this.getBaseMetaTileEntity().hasWorkJustBeenEnabled()
|| this.getBaseMetaTileEntity().hasInventoryBeenModified()) {
@@ -114,17 +108,18 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
ItemStack aStack = getFullTurbineAssemblies().get(0).getTurbine();
for (int i = 0; i < getSpeedMultiplier(); i++) {
if (i == 0) {
- aTotalBaseEff += GT_Utility.safeInt((long)
- ((5F + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack))
+ aTotalBaseEff += GT_Utility.safeInt(
+ (long) ((5F
+ + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack))
* 1000F));
}
- aTotalOptimalFlow += GT_Utility.safeInt((long) Math.max(
- Float.MIN_NORMAL,
- ((GT_MetaGenerated_Tool) aStack.getItem())
- .getToolStats(aStack)
+ aTotalOptimalFlow += GT_Utility.safeInt(
+ (long) Math.max(
+ Float.MIN_NORMAL,
+ ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack)
.getSpeedMultiplier()
- * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed
- * 50));
+ * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed
+ * 50));
if (aTotalOptimalFlow < 0) {
log("Int overflow, report to issue tracker");
aTotalOptimalFlow = 100;
@@ -154,8 +149,8 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
// This is how much the turbine can actually change during this tick
int maxChangeAllowed = Math.max(10, GT_Utility.safeInt((long) Math.abs(difference) / 100));
- if (Math.abs(difference)
- > maxChangeAllowed) { // If this difference is too big, use the maximum allowed change
+ if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed
+ // change
int change = maxChangeAllowed * (difference > 0 ? 1 : -1); // Make the change positive or negative.
this.lEUt += change; // Apply the change
} else {
@@ -169,7 +164,7 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
} else {
this.mMaxProgresstime = 20;
this.mEfficiencyIncrease = 10;
- // Overvoltage is handled inside the MultiBlockBase when pushing out to dynamos. no need to do it here.
+ // Overvoltage is handled inside the MultiBlockBase when pushing out to dynamos. no need to do it here.
// Play sounds (GT++ addition - GT multiblocks play no sounds)
startProcess();
return true;
@@ -188,16 +183,16 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
int actualOptimalFlow = 0;
- FluidStack firstFuelType = new FluidStack(
- aFluids.get(0),
- 0); // Identify a SINGLE type of fluid to process. Doesn't matter which one. Ignore the rest!
+ FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process.
+ // Doesn't matter which one. Ignore the rest!
int fuelValue = getFuelValue(firstFuelType);
- actualOptimalFlow = GT_Utility.safeInt(
- (long) Math.ceil((double) aOptFlow * (double) flowMultipliers[2] / (double) fuelValue));
+ actualOptimalFlow = GT_Utility
+ .safeInt((long) Math.ceil((double) aOptFlow * (double) flowMultipliers[2] / (double) fuelValue));
this.realOptFlow = actualOptimalFlow; // For scanner info
- int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow
- * 1.25f)); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for
+ int remainingFlow = GT_Utility.safeInt((long) (actualOptimalFlow * 1.25f)); // Allowed to use up to 125% of
+ // optimal flow. Variable
+ // required outside of loop for
// multi-hatch scenarios.
int flow = 0;
int totalFlow = 0;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java
index c5b4697b1c..ea6753e7d7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SCSteam.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -7,10 +13,6 @@ import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.math.MathUtils;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTurbineBase {
@@ -57,8 +59,8 @@ public class GT_MTE_LargeTurbine_SCSteam extends GregtechMetaTileEntity_LargerTu
int tEU = 0;
int totalFlow = 0; // Byproducts are based on actual flow
int flow = 0;
- int remainingFlow = MathUtils.safeInt((long) (aOptFlow
- * 1.25f)); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for
+ int remainingFlow = MathUtils.safeInt((long) (aOptFlow * 1.25f)); // Allowed to use up to 125% of optimal flow.
+ // Variable required outside of loop for
// multi-hatch scenarios.
this.realOptFlow = (double) aOptFlow * (double) flowMultipliers[0];
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
index d913abf9a8..4974508661 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
@@ -1,5 +1,12 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.GT_Mod;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -10,11 +17,6 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
@SuppressWarnings("deprecation")
public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTurbineBase {
@@ -77,8 +79,8 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
int tEU = 0;
int totalFlow = 0; // Byproducts are based on actual flow
int flow = 0;
- int remainingFlow = MathUtils.safeInt((long) (aOptFlow
- * 1.25f)); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for
+ int remainingFlow = MathUtils.safeInt((long) (aOptFlow * 1.25f)); // Allowed to use up to 125% of optimal flow.
+ // Variable required outside of loop for
// multi-hatch scenarios.
this.realOptFlow = (double) aOptFlow * (double) flowMultipliers[0];
@@ -94,20 +96,16 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
if (!achievement) {
try {
GT_Mod.achievements.issueAchievement(
- this.getBaseMetaTileEntity()
- .getWorld()
- .getPlayerEntityByName(
- this.getBaseMetaTileEntity().getOwnerName()),
+ this.getBaseMetaTileEntity().getWorld()
+ .getPlayerEntityByName(this.getBaseMetaTileEntity().getOwnerName()),
"efficientsteam");
- } catch (Exception e) {
- }
+ } catch (Exception e) {}
achievement = true;
}
- } else if (fluidName.equals("fluid.steam")
- || fluidName.equals("ic2.fluidSteam")
+ } else if (fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam")
|| fluidName.equals("fluid.mfr.steam.still.name")) {
- depleteInput(new FluidStack(aFluids.get(i), aFluids.get(i).amount));
- }
+ depleteInput(new FluidStack(aFluids.get(i), aFluids.get(i).amount));
+ }
}
if (totalFlow <= 0) return 0;
tEU = totalFlow;
@@ -133,7 +131,8 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
if (aSide == getBaseMetaTileEntity().getFrontFacing()) {
looseFit ^= true;
GT_Utility.sendChatToPlayer(
- aPlayer, looseFit ? "Fitting is Loose (Higher Flow)" : "Fitting is Tight (Higher Efficiency)");
+ aPlayer,
+ looseFit ? "Fitting is Loose (Higher Flow)" : "Fitting is Tight (Higher Efficiency)");
}
if (looseFit) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
index cb58c8acc5..88af874326 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
@@ -2,6 +2,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.t
import static gtPlusPlus.core.lib.CORE.RANDOM;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.GT_Mod;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -11,11 +18,6 @@ import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import java.util.ArrayList;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
@SuppressWarnings("deprecation")
public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurbineBase {
@@ -85,18 +87,16 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
int tEU = 0;
int totalFlow = 0; // Byproducts are based on actual flow
int flow = 0;
- int remainingFlow = MathUtils.safeInt((long) (aOptFlow
- * 1.25f)); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for
+ int remainingFlow = MathUtils.safeInt((long) (aOptFlow * 1.25f)); // Allowed to use up to 125% of optimal flow.
+ // Variable required outside of loop for
// multi-hatch scenarios.
this.realOptFlow = (double) aOptFlow * (double) flowMultipliers[0];
storedFluid = 0;
- for (int i = 0;
- i < aFluids.size() && remainingFlow > 0;
- i++) { // loop through each hatch; extract inputs and track totals.
+ for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { // loop through each hatch; extract inputs and
+ // track totals.
String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i));
- if (fluidName.equals("fluid.steam")
- || fluidName.equals("ic2.fluidSteam")
+ if (fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam")
|| fluidName.equals("fluid.mfr.steam.still.name")) {
flow = Math.min(aFluids.get(i).amount, remainingFlow); // try to use up w/o exceeding remainingFlow
depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount
@@ -105,10 +105,8 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
totalFlow += flow; // track total input used
if (!achievement) {
GT_Mod.achievements.issueAchievement(
- this.getBaseMetaTileEntity()
- .getWorld()
- .getPlayerEntityByName(
- this.getBaseMetaTileEntity().getOwnerName()),
+ this.getBaseMetaTileEntity().getWorld()
+ .getPlayerEntityByName(this.getBaseMetaTileEntity().getOwnerName()),
"muchsteam");
achievement = true;
}
@@ -141,7 +139,8 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
if (aSide == getBaseMetaTileEntity().getFrontFacing()) {
looseFit ^= true;
GT_Utility.sendChatToPlayer(
- aPlayer, looseFit ? "Fitting: Loose - More Flow" : "Fitting: Tight - More Efficiency");
+ aPlayer,
+ looseFit ? "Fitting: Loose - More Flow" : "Fitting: Tight - More Efficiency");
}
if (looseFit) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
index d6ce8e4bb2..f08fc1c9ea 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
@@ -6,10 +6,21 @@ import static gregtech.api.enums.GT_HatchElement.*;
import static gregtech.api.util.GT_StructureUtility.buildHatchAdder;
import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo;
+import java.util.ArrayList;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraftforge.fluids.FluidStack;
+
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
@@ -34,18 +45,9 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import java.util.ArrayList;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.fluids.FluidStack;
-public abstract class GregtechMetaTileEntity_LargerTurbineBase
- extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargerTurbineBase>
- implements ISurvivalConstructable {
+public abstract class GregtechMetaTileEntity_LargerTurbineBase extends
+ GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargerTurbineBase> implements ISurvivalConstructable {
protected int baseEff = 0;
protected long optFlow = 0;
@@ -54,13 +56,12 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
protected int counter = 0;
protected boolean mFastMode = false;
protected double mufflerReduction = 1;
- protected float[] flowMultipliers = new float[] {1, 1, 1};
+ protected float[] flowMultipliers = new float[] { 1, 1, 1 };
public ITexture frontFace;
public ITexture frontFaceActive;
- public ArrayList<GT_MetaTileEntity_Hatch_Turbine> mTurbineRotorHatches =
- new ArrayList<GT_MetaTileEntity_Hatch_Turbine>();
+ public ArrayList<GT_MetaTileEntity_Hatch_Turbine> mTurbineRotorHatches = new ArrayList<GT_MetaTileEntity_Hatch_Turbine>();
public GregtechMetaTileEntity_LargerTurbineBase(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional);
@@ -87,23 +88,17 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
@Override
protected final GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the XL " + getTurbineType() + " Turbine")
+ tt.addMachineType(getMachineType()).addInfo("Controller Block for the XL " + getTurbineType() + " Turbine")
.addInfo("Runs as fast as 16 Large Turbines of the same type, takes the space of 12")
.addInfo("Right-click with screwdriver to enable Fast Mode, to run it even faster")
.addInfo("Optimal flow will increase or decrease accordingly on mode switch")
.addInfo("Fast Mode increases speed to 48x instead of 16x, with some penalties")
.addInfo("Maintenance problems and turbine damage happen 12x as often in Fast Mode")
.addInfo("XL Steam Turbines can use Loose Mode with either Slow or Fast Mode")
- .addPollutionAmount(getPollutionPerSecond(null))
- .addInfo("Pollution is 3x higher in Fast Mode")
- .addSeparator()
- .beginStructureBlock(7, 9, 7, false)
- .addController("Top Middle")
- .addCasingInfo(getCasingName(), 360)
- .addCasingInfo("Rotor Shaft", 30)
- .addOtherStructurePart("Rotor Assembly", "Any 1 dot hint", 1)
- .addInputBus("Any 4 dot hint (min 1)", 4)
+ .addPollutionAmount(getPollutionPerSecond(null)).addInfo("Pollution is 3x higher in Fast Mode")
+ .addSeparator().beginStructureBlock(7, 9, 7, false).addController("Top Middle")
+ .addCasingInfo(getCasingName(), 360).addCasingInfo("Rotor Shaft", 30)
+ .addOtherStructurePart("Rotor Assembly", "Any 1 dot hint", 1).addInputBus("Any 4 dot hint (min 1)", 4)
.addInputHatch("Any 4 dot hint(min 1)", 4);
if (requiresOutputHatch()) {
tt.addOutputHatch("Any 4 dot hint(min 1)", 4);
@@ -117,48 +112,58 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
}
private static final String STRUCTURE_PIECE_MAIN = "main";
- private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>>
- STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>>() {
- @Override
- protected IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase> computeValue(Class<?> type) {
- return StructureDefinition.<GregtechMetaTileEntity_LargerTurbineBase>builder()
- // c = turbine casing
- // s = turbine shaft
- // t = turbine housing
- // h = dynamo/maint
- // m = muffler
- .addShape(STRUCTURE_PIECE_MAIN, (new String[][] {
- {"ccchccc", "ccccccc", "ccmmmcc", "ccm~mcc", "ccmmmcc", "ccccccc", "ccchccc"},
- {"ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc"},
- {"ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc"},
- {"ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc"},
- {"ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc"},
- {"ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc"},
- {"ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc"},
- {"ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc"},
- {"ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc"},
- }))
- .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta())))
- .addElement('s', lazy(t -> ofBlock(t.getShaftBlock(), t.getTurbineShaftMeta())))
- .addElement('t', lazy(t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class)
- .adder(GregtechMetaTileEntity_LargerTurbineBase::addTurbineHatch)
- .hatchClass(GT_MetaTileEntity_Hatch_Turbine.class)
- .casingIndex(t.getCasingTextureIndex())
- .dot(1)
- .build()))
- .addElement('h', lazy(t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class)
- .atLeast(InputBus, InputHatch, OutputHatch, Dynamo.or(TTDynamo), Maintenance)
- .casingIndex(t.getCasingTextureIndex())
- .dot(4)
- .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
- .addElement('m', lazy(t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class)
- .atLeast(Muffler)
- .casingIndex(t.getCasingTextureIndex())
- .dot(7)
- .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
- .build();
- }
- };
+ private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>>() {
+
+ @Override
+ protected IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase> computeValue(Class<?> type) {
+ return StructureDefinition.<GregtechMetaTileEntity_LargerTurbineBase>builder()
+ // c = turbine casing
+ // s = turbine shaft
+ // t = turbine housing
+ // h = dynamo/maint
+ // m = muffler
+ .addShape(
+ STRUCTURE_PIECE_MAIN,
+ (new String[][] {
+ { "ccchccc", "ccccccc", "ccmmmcc", "ccm~mcc", "ccmmmcc", "ccccccc", "ccchccc" },
+ { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
+ { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+ { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+ { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
+ { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+ { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+ { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
+ { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, }))
+ .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta())))
+ .addElement('s', lazy(t -> ofBlock(t.getShaftBlock(), t.getTurbineShaftMeta())))
+ .addElement(
+ 't',
+ lazy(
+ t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class)
+ .adder(GregtechMetaTileEntity_LargerTurbineBase::addTurbineHatch)
+ .hatchClass(GT_MetaTileEntity_Hatch_Turbine.class)
+ .casingIndex(t.getCasingTextureIndex()).dot(1).build()))
+ .addElement(
+ 'h',
+ lazy(
+ t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class)
+ .atLeast(
+ InputBus,
+ InputHatch,
+ OutputHatch,
+ Dynamo.or(TTDynamo),
+ Maintenance)
+ .casingIndex(t.getCasingTextureIndex()).dot(4)
+ .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
+ .addElement(
+ 'm',
+ lazy(
+ t -> buildHatchAdder(GregtechMetaTileEntity_LargerTurbineBase.class)
+ .atLeast(Muffler).casingIndex(t.getCasingTextureIndex()).dot(7)
+ .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
+ .build();
+ }
+ };
@Override
public IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase> getStructureDefinition() {
@@ -199,20 +204,26 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
// we do not check for casing count here. the bare minimal is 372 but we only require 360
boolean aStructure = checkPiece(STRUCTURE_PIECE_MAIN, 3, 3, 0);
log("Structure Check: " + aStructure);
- if (mTurbineRotorHatches.size() != 12
- || mMaintenanceHatches.size() != 1
+ if (mTurbineRotorHatches.size() != 12 || mMaintenanceHatches.size() != 1
|| (mDynamoHatches.size() < 1 && mTecTechDynamoHatches.size() < 1)
|| (requiresMufflers() && mMufflerHatches.size() != 4)
|| mInputBusses.size() < 1
|| mInputHatches.size() < 1
|| (requiresOutputHatch() && mOutputHatches.size() < 1)) {
- log("Bad Hatches - Turbine Housings: " + mTurbineRotorHatches.size() + ", Maint: "
- + mMaintenanceHatches.size() + ", Dynamo: "
- + mDynamoHatches.size() + ", Muffler: "
- + mMufflerHatches.size() + ", Input Buses: "
- + mInputBusses.size() + ", Input Hatches: "
- + mInputHatches.size() + ", Output Hatches: "
- + mOutputHatches.size());
+ log(
+ "Bad Hatches - Turbine Housings: " + mTurbineRotorHatches.size()
+ + ", Maint: "
+ + mMaintenanceHatches.size()
+ + ", Dynamo: "
+ + mDynamoHatches.size()
+ + ", Muffler: "
+ + mMufflerHatches.size()
+ + ", Input Buses: "
+ + mInputBusses.size()
+ + ", Input Hatches: "
+ + mInputHatches.size()
+ + ", Output Hatches: "
+ + mOutputHatches.size());
return false;
}
mufflerReduction = getMufflerReduction();
@@ -280,8 +291,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
public abstract int getFuelValue(FluidStack aLiquid);
public static boolean isValidTurbine(ItemStack aTurbine) {
- return (aTurbine != null
- && aTurbine.getItem() instanceof GT_MetaGenerated_Tool
+ return (aTurbine != null && aTurbine.getItem() instanceof GT_MetaGenerated_Tool
&& aTurbine.getItemDamage() >= 170
&& aTurbine.getItemDamage() <= 176);
}
@@ -363,8 +373,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
}
protected ArrayList<GT_MetaTileEntity_Hatch_Turbine> getEmptyTurbineAssemblies() {
- ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches =
- new ArrayList<GT_MetaTileEntity_Hatch_Turbine>();
+ ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = new ArrayList<GT_MetaTileEntity_Hatch_Turbine>();
// log("Checking "+mTurbineRotorHatches.size()+" Assemblies for empties.");
for (GT_MetaTileEntity_Hatch_Turbine aTurbineHatch : this.mTurbineRotorHatches) {
if (!aTurbineHatch.hasTurbine()) {
@@ -376,8 +385,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
}
protected ArrayList<GT_MetaTileEntity_Hatch_Turbine> getFullTurbineAssemblies() {
- ArrayList<GT_MetaTileEntity_Hatch_Turbine> aTurbineRotorHatches =
- new ArrayList<GT_MetaTileEntity_Hatch_Turbine>();
+ ArrayList<GT_MetaTileEntity_Hatch_Turbine> aTurbineRotorHatches = new ArrayList<GT_MetaTileEntity_Hatch_Turbine>();
// log("Checking "+mTurbineRotorHatches.size()+" Assemblies for Turbines.");
for (GT_MetaTileEntity_Hatch_Turbine aTurbineHatch : this.mTurbineRotorHatches) {
if (aTurbineHatch.hasTurbine()) {
@@ -411,25 +419,23 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
@Override
public boolean checkRecipe(final ItemStack aStack) {
return checkRecipeGeneric(
- new ItemStack[] {}, getStoredFluids().toArray(new FluidStack[] {}), 1, 100, 100, 10000);
+ new ItemStack[] {},
+ getStoredFluids().toArray(new FluidStack[] {}),
+ 1,
+ 100,
+ 100,
+ 10000);
}
@Override
- public boolean checkRecipeGeneric(
- ItemStack[] aItemInputs,
- FluidStack[] aFluidInputs,
- int aMaxParallelRecipes,
- long aEUPercent,
- int aSpeedBonusPercent,
- int aOutputChanceRoll,
- GT_Recipe aRecipe) {
+ public boolean checkRecipeGeneric(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, int aMaxParallelRecipes,
+ long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) {
try {
ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies();
if (aEmptyTurbineRotorHatches.size() > 0) {
log("Found " + aEmptyTurbineRotorHatches.size() + " Assemblies without Turbine.");
- hatch:
- for (GT_MetaTileEntity_Hatch_Turbine aHatch : aEmptyTurbineRotorHatches) {
+ hatch: for (GT_MetaTileEntity_Hatch_Turbine aHatch : aEmptyTurbineRotorHatches) {
ArrayList<ItemStack> aTurbines = getAllBufferedTurbines();
for (ItemStack aTurbineItem : aTurbines) {
if (aTurbineItem == null) {
@@ -453,8 +459,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
ArrayList<FluidStack> tFluids = getStoredFluids();
if (tFluids.size() > 0) {
- if (baseEff == 0
- || optFlow == 0
+ if (baseEff == 0 || optFlow == 0
|| counter >= 512
|| this.getBaseMetaTileEntity().hasWorkJustBeenEnabled()
|| this.getBaseMetaTileEntity().hasInventoryBeenModified()) {
@@ -467,18 +472,19 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
ItemStack aStack = getFullTurbineAssemblies().get(0).getTurbine();
for (int i = 0; i < getSpeedMultiplier(); i++) {
if (i == 0) {
- aTotalBaseEff += GT_Utility.safeInt((long)
- ((5F + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack))
+ aTotalBaseEff += GT_Utility.safeInt(
+ (long) ((5F
+ + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack))
* 1000F));
// log("Bumped base eff to "+aTotalBaseEff);
}
- aTotalOptimalFlow += GT_Utility.safeInt((long) Math.max(
- Float.MIN_NORMAL,
- ((GT_MetaGenerated_Tool) aStack.getItem())
- .getToolStats(aStack)
+ aTotalOptimalFlow += GT_Utility.safeInt(
+ (long) Math.max(
+ Float.MIN_NORMAL,
+ ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack)
.getSpeedMultiplier()
- * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed
- * 50));
+ * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed
+ * 50));
if (aTotalOptimalFlow < 0) {
log("Int overflow, report to issue tracker");
aTotalOptimalFlow = 100;
@@ -522,8 +528,8 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
int maxChangeAllowed = Math.max(10, GT_Utility.safeInt((long) Math.abs(difference) / 100));
// log("Max Change Allowed: "+maxChangeAllowed);
- if (Math.abs(difference)
- > maxChangeAllowed) { // If this difference is too big, use the maximum allowed change
+ if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed
+ // change
int change = maxChangeAllowed * (difference > 0 ? 1 : -1); // Make the change positive or negative.
this.lEUt += change; // Apply the change
// log("Applied power change.");
@@ -540,7 +546,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
} else {
this.mMaxProgresstime = 1;
this.mEfficiencyIncrease = 10;
- // Overvoltage is handled inside the MultiBlockBase when pushing out to dynamos. no need to do it here.
+ // Overvoltage is handled inside the MultiBlockBase when pushing out to dynamos. no need to do it here.
// Play sounds (GT++ addition - GT multiblocks play no sounds)
startProcess();
// log("GOOD RETURN - Making: "+this.mEUt+" EU/t");
@@ -625,34 +631,25 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
int mPollutionReduction = (int) (100 * mufflerReduction);
String tRunning = mMaxProgresstime > 0
- ? EnumChatFormatting.GREEN
- + StatCollector.translateToLocal("GT5U.turbine.running.true")
+ ? EnumChatFormatting.GREEN + StatCollector.translateToLocal("GT5U.turbine.running.true")
+ EnumChatFormatting.RESET
- : EnumChatFormatting.RED
- + StatCollector.translateToLocal("GT5U.turbine.running.false")
+ : EnumChatFormatting.RED + StatCollector.translateToLocal("GT5U.turbine.running.false")
+ EnumChatFormatting.RESET;
String tMaintainance = getIdealStatus() == getRepairStatus()
- ? EnumChatFormatting.GREEN
- + StatCollector.translateToLocal("GT5U.turbine.maintenance.false")
+ ? EnumChatFormatting.GREEN + StatCollector.translateToLocal("GT5U.turbine.maintenance.false")
+ EnumChatFormatting.RESET
- : EnumChatFormatting.RED
- + StatCollector.translateToLocal("GT5U.turbine.maintenance.true")
+ : EnumChatFormatting.RED + StatCollector.translateToLocal("GT5U.turbine.maintenance.true")
+ EnumChatFormatting.RESET;
int tDura = 0;
StringBuilder aTurbineDamage = new StringBuilder();
for (GT_MetaTileEntity_Hatch_Turbine aHatch : this.getFullTurbineAssemblies()) {
ItemStack aTurbine = aHatch.getTurbine();
- tDura = MathUtils.safeInt((long) (100.0f
- / GT_MetaGenerated_Tool.getToolMaxDamage(aTurbine)
- * (GT_MetaGenerated_Tool.getToolDamage(aTurbine))
- + 1));
- aTurbineDamage
- .append(EnumChatFormatting.RED)
- .append(tDura)
- .append(EnumChatFormatting.RESET)
- .append("% | ");
+ tDura = MathUtils.safeInt(
+ (long) (100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(aTurbine)
+ * (GT_MetaGenerated_Tool.getToolDamage(aTurbine)) + 1));
+ aTurbineDamage.append(EnumChatFormatting.RED).append(tDura).append(EnumChatFormatting.RESET).append("% | ");
}
long storedEnergy = 0;
@@ -667,31 +664,53 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
boolean aIsSteam = this.getClass().getName().toLowerCase().contains("steam");
String[] ret = new String[] {
- // 8 Lines available for information panels
- tRunning + ": " + EnumChatFormatting.RED + ((lEUt * mEfficiency) / 10000) + EnumChatFormatting.RESET
- + " EU/t",
- tMaintainance,
- StatCollector.translateToLocal("GT5U.turbine.efficiency") + ": " + EnumChatFormatting.YELLOW
- + (mEfficiency / 100F) + EnumChatFormatting.RESET + "%",
- StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN
- + storedEnergy + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW
- + maxEnergy + EnumChatFormatting.RESET + " EU",
- StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW
- + MathUtils.safeInt((long) realOptFlow) + EnumChatFormatting.RESET + " L/s"
- + EnumChatFormatting.YELLOW + " ("
- + (isLooseMode()
- ? StatCollector.translateToLocal("GT5U.turbine.loose")
- : StatCollector.translateToLocal("GT5U.turbine.tight"))
- + ")",
- StatCollector.translateToLocal("GT5U.turbine.fuel") + ": " + EnumChatFormatting.GOLD + storedFluid
- + EnumChatFormatting.RESET + "L",
- StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + aTurbineDamage,
- StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + EnumChatFormatting.GREEN
- + mPollutionReduction + EnumChatFormatting.RESET + " %"
- };
- if (!aIsSteam)
- ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW
- + MathUtils.safeInt((long) realOptFlow) + EnumChatFormatting.RESET + " L/t";
+ // 8 Lines available for information panels
+ tRunning + ": "
+ + EnumChatFormatting.RED
+ + ((lEUt * mEfficiency) / 10000)
+ + EnumChatFormatting.RESET
+ + " EU/t",
+ tMaintainance,
+ StatCollector.translateToLocal("GT5U.turbine.efficiency") + ": "
+ + EnumChatFormatting.YELLOW
+ + (mEfficiency / 100F)
+ + EnumChatFormatting.RESET
+ + "%",
+ StatCollector.translateToLocal("GT5U.multiblock.energy") + ": "
+ + EnumChatFormatting.GREEN
+ + storedEnergy
+ + EnumChatFormatting.RESET
+ + " EU / "
+ + EnumChatFormatting.YELLOW
+ + maxEnergy
+ + EnumChatFormatting.RESET
+ + " EU",
+ StatCollector.translateToLocal("GT5U.turbine.flow") + ": "
+ + EnumChatFormatting.YELLOW
+ + MathUtils.safeInt((long) realOptFlow)
+ + EnumChatFormatting.RESET
+ + " L/s"
+ + EnumChatFormatting.YELLOW
+ + " ("
+ + (isLooseMode() ? StatCollector.translateToLocal("GT5U.turbine.loose")
+ : StatCollector.translateToLocal("GT5U.turbine.tight"))
+ + ")",
+ StatCollector.translateToLocal("GT5U.turbine.fuel") + ": "
+ + EnumChatFormatting.GOLD
+ + storedFluid
+ + EnumChatFormatting.RESET
+ + "L",
+ StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + aTurbineDamage,
+ StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": "
+ + EnumChatFormatting.GREEN
+ + mPollutionReduction
+ + EnumChatFormatting.RESET
+ + " %" };
+ if (!aIsSteam) ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": "
+ + EnumChatFormatting.YELLOW
+ + MathUtils.safeInt((long) realOptFlow)
+ + EnumChatFormatting.RESET
+ + " L/t";
return ret;
}
@@ -752,19 +771,11 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
}
@Override
- public final ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1],
- aFacing == aSide
- ? getFrontFacingTurbineTexture(aActive)
- : Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex())
- };
+ public final ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing,
+ byte aColorIndex, boolean aActive, boolean aRedstone) {
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1],
+ aFacing == aSide ? getFrontFacingTurbineTexture(aActive)
+ : Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex()) };
}
protected ITexture getFrontFacingTurbineTexture(boolean isActive) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java
index d7e4a45191..be191fcc59 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java
@@ -1,584 +1,270 @@
/*
-package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage;
-
-
-public class GregtechMetaTileEntity_MultiTank
-extends GregtechMeta_MultiBlockBase {
- public GregtechMetaTileEntity_MultiTank(final int aID, final String aName, final String aNameRegional) {
- super(aID, aName, aNameRegional);
- }
-
- private short multiblockCasingCount = 0;
- private int mInternalSaveClock = 0;
- private final short storageMultiplier = 1;
- private int maximumFluidStorage = 128000;
- private FluidStack internalStorageTank = null;
- private final NBTTagCompound internalCraftingComponentsTag = new NBTTagCompound();
-
- @Override
- public String getMachineType() {
- return "Fluid Tank";
- }
-
- @Override
- public String[] getExtraInfoData() {
- final ArrayList<GT_MetaTileEntity_Hatch_Energy> mTier = this.mEnergyHatches;
- if (!mTier.isEmpty()){
- final int temp = mTier.get(0).mTier;
- if (this.internalStorageTank == null) {
- return new String[]{
- GT_Values.VOLTAGE_NAMES[temp]+" Large Fluid Tank",
- "Stored Fluid: No Fluid",
- "Internal | Current: "+Integer.toString(0) + "L",
- "Internal | Maximum: "+Integer.toString(this.maximumFluidStorage) + "L"};
- }
- return new String[]{
- GT_Values.VOLTAGE_NAMES[temp]+" Large Fluid Tank",
- "Stored Fluid: "+this.internalStorageTank.getLocalizedName(),
- "Internal | Current: "+Integer.toString(this.internalStorageTank.amount) + "L",
- "Internal | Maximum: "+Integer.toString(this.maximumFluidStorage) + "L"};
- }
- return new String[]{
- "Voltage Tier not set -" +" Large Fluid Tank",
- "Stored Fluid: No Fluid",
- "Internal | Current: "+Integer.toString(0) + "L",
- "Internal | Maximum: "+Integer.toString(this.maximumFluidStorage) + "L"};
- }
-
- @Override
- public void saveNBTData(final NBTTagCompound aNBT) {
- super.saveNBTData(aNBT);
- */
-/*final NBTTagCompound gtCraftingComponentsTag = aNBT.getCompoundTag("GT.CraftingComponents");
-if (gtCraftingComponentsTag != null){
-
- Utils.LOG_WARNING("Got Crafting Tag");
-
- if (this.internalStorageTank != null){
- Utils.LOG_WARNING("mFluid was not null, Saving TileEntity NBT data.");
-
- gtCraftingComponentsTag.setString("xFluid", this.internalStorageTank.getFluid().getName());
- gtCraftingComponentsTag.setInteger("xAmount", this.internalStorageTank.amount);
- gtCraftingComponentsTag.setLong("xAmountMax", this.maximumFluidStorage);
-
- aNBT.setTag("GT.CraftingComponents", gtCraftingComponentsTag);
- }
- else {
- Utils.LOG_WARNING("mFluid was null, Saving TileEntity NBT data.");
- gtCraftingComponentsTag.removeTag("xFluid");
- gtCraftingComponentsTag.removeTag("xAmount");
- gtCraftingComponentsTag.removeTag("xAmountMax");
- gtCraftingComponentsTag.setLong("xAmountMax", this.maximumFluidStorage);
-
-
- aNBT.setTag("GT.CraftingComponents", gtCraftingComponentsTag);
- }
-}*//*
-
- }
-
- @Override
- public void loadNBTData(final NBTTagCompound aNBT) {
- super.loadNBTData(aNBT);
- */
-/*final NBTTagCompound gtCraftingComponentsTag = aNBT.getCompoundTag("GT.CraftingComponents");
-String xFluid = null;
-int xAmount = 0;
-if (gtCraftingComponentsTag.hasNoTags()){
- if (this.internalStorageTank != null){
- Utils.LOG_WARNING("mFluid was not null, Creating TileEntity NBT data.");
- gtCraftingComponentsTag.setInteger("xAmount", this.internalStorageTank.amount);
- gtCraftingComponentsTag.setString("xFluid", this.internalStorageTank.getFluid().getName());
- aNBT.setTag("GT.CraftingComponents", gtCraftingComponentsTag);
- }
-}
-else {
-
- //internalCraftingComponentsTag = gtCraftingComponentsTag.getCompoundTag("backupTag");
-
- if (gtCraftingComponentsTag.hasKey("xFluid")){
- Utils.LOG_WARNING("xFluid was not null, Loading TileEntity NBT data.");
- xFluid = gtCraftingComponentsTag.getString("xFluid");
- }
- if (gtCraftingComponentsTag.hasKey("xAmount")){
- Utils.LOG_WARNING("xAmount was not null, Loading TileEntity NBT data.");
- xAmount = gtCraftingComponentsTag.getInteger("xAmount");
- }
- if ((xFluid != null) && (xAmount != 0)){
- Utils.LOG_WARNING("Setting Internal Tank, loading "+xAmount+"L of "+xFluid);
- this.setInternalTank(xFluid, xAmount);
- }
-}*//*
-
- }
-
- private boolean setInternalTank(final String fluidName, final int amount){
- final FluidStack temp = FluidUtils.getFluidStack(fluidName, amount);
- if (temp != null){
- if (this.internalStorageTank == null){
- this.internalStorageTank = temp;
- Logger.WARNING(temp.getFluid().getName()+" Amount: "+temp.amount+"L");
- }
- else{
- Logger.WARNING("Retained Fluid.");
- Logger.WARNING(this.internalStorageTank.getFluid().getName()+" Amxount: "+this.internalStorageTank.amount+"L");
- }
- this.markDirty();
- return true;
- }
- return false;
- }
-
- @Override
- public void onLeftclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
- this.tryForceNBTUpdate();
- super.onLeftclick(aBaseMetaTileEntity, aPlayer);
- }
-
- @Override
- public boolean onWrenchRightClick(final byte aSide, final byte aWrenchingSide, final EntityPlayer aPlayer, final float aX, final float aY, final float aZ) {
- this.tryForceNBTUpdate();
- return super.onWrenchRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ);
- }
-
- @Override
- public void onRemoval() {
- this.tryForceNBTUpdate();
- super.onRemoval();
- }
-
-
- @Override
- public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
- super.onPostTick(aBaseMetaTileEntity, aTick);
-
- if ((this.internalStorageTank != null) && this.internalStorageTank.amount >= this.maximumFluidStorage){
- if (this.internalStorageTank.amount > this.maximumFluidStorage){
- this.internalStorageTank.amount = this.maximumFluidStorage;
- }
- this.stopMachine();
- }
-
- if (this.mInternalSaveClock != 20){
- this.mInternalSaveClock++;
- }
- else {
- this.mInternalSaveClock = 0;
- this.tryForceNBTUpdate();
- }
-
- }
-
- public GregtechMetaTileEntity_MultiTank(final String aName) {
- super(aName);
- }
-
- @Override
- public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
- return new GregtechMetaTileEntity_MultiTank(this.mName);
- }
-
- @Override
- public String[] getTooltip() {
- return new String[]{
- "Controller Block for the Multitank",
- "Size: 3xHx3 (Block behind controller must be air)",
- "Structure must be at least 4 blocks tall, maximum 20.",
- "Each casing within the structure adds 128000L storage.",
- "Multitank Exterior Casings (16 at least!)",
- "Controller (front centered)",
- "1x Input hatch",
- "1x Output hatch",
- "1x Energy Hatch",
- };
- }
-
- @Override
- public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
- if (aSide == aFacing) {
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(11)), new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Screen_Logo : TexturesGtBlock.Overlay_Machine_Screen_Logo)};
- }
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(11))};
- }
-
- @Override
- public GT_Recipe.GT_Recipe_Map getRecipeMap() {
- return null;
- }
-
- @Override
- public boolean isFacingValid(final byte aFacing) {
- return aFacing > 1;
- }
-
- @Override
- public boolean checkRecipe(final ItemStack aStack) {
-
- final ArrayList<ItemStack> tInputList = this.getStoredInputs();
- for (int i = 0; i < (tInputList.size() - 1); i++) {
- for (int j = i + 1; j < tInputList.size(); j++) {
- if (GT_Utility.areStacksEqual(tInputList.get(i), tInputList.get(j))) {
- if (tInputList.get(i).stackSize >= tInputList.get(j).stackSize) {
- tInputList.remove(j--);
- } else {
- tInputList.remove(i--);
- break;
- }
- }
- }
- }
- final ItemStack[] tInputs = Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, 2);
-
- final ArrayList<FluidStack> tFluidList = this.getStoredFluids();
- for (int i = 0; i < (tFluidList.size() - 1); i++) {
- for (int j = i + 1; j < tFluidList.size(); j++) {
- if (GT_Utility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) {
- if (tFluidList.get(i).amount >= tFluidList.get(j).amount) {
- tFluidList.remove(j--);
- } else {
- tFluidList.remove(i--);
- break;
- }
- }
- }
- }
- final FluidStack[] tFluids = Arrays.copyOfRange(tFluidList.toArray(new FluidStack[1]), 0, 1);
-
- if (tFluids.length >= 2){
- Logger.WARNING("Bad");
- return false;
- }
-
- final ArrayList<Pair<GT_MetaTileEntity_Hatch_Input, Boolean>> rList = new ArrayList<>();
- int slotInputCount = 0;
- for (final GT_MetaTileEntity_Hatch_Input tHatch : this.mInputHatches) {
- boolean containsFluid = false;
- if (isValidMetaTileEntity(tHatch)) {
- slotInputCount++;
- for (int i=0; i<tHatch.getBaseMetaTileEntity().getSizeInventory(); i++) {
- if (tHatch.canTankBeEmptied()){containsFluid=true;}
- }
- rList.add(new Pair<>(tHatch, containsFluid));
- }
- }
- if ((tFluids.length <= 0) || (slotInputCount > 1)){
- Logger.WARNING("Bad");
- return false;
- }
-
- Logger.WARNING("Okay - 2");
- if (this.internalStorageTank == null){
- Logger.WARNING("Okay - 3");
- if ((rList.get(0).getKey().mFluid != null) && (rList.get(0).getKey().mFluid.amount > 0)){
- Logger.WARNING("Okay - 4");
- Logger.WARNING("Okay - 1"+" rList.get(0).getKey().mFluid.amount: "+rList.get(0).getKey().mFluid.amount */
-/*+" internalStorageTank:"+internalStorageTank.amount*//*
- );
- final FluidStack tempFluidStack = rList.get(0).getKey().mFluid;
- final Fluid tempFluid = tempFluidStack.getFluid();
- this.internalStorageTank = FluidUtils.getFluidStack(tempFluid.getName(), tempFluidStack.amount);
- rList.get(0).getKey().mFluid.amount = 0;
- Logger.WARNING("Okay - 1.1"+" rList.get(0).getKey().mFluid.amount: "+rList.get(0).getKey().mFluid.amount +" internalStorageTank:"+this.internalStorageTank.amount);
- return true;
- }
- Logger.WARNING("No Fluid in hatch.");
- return false;
- }
- else if (this.internalStorageTank.isFluidEqual(rList.get(0).getKey().mFluid)){
- Logger.WARNING("Storing "+rList.get(0).getKey().mFluid.amount+"L");
- Logger.WARNING("Contains "+this.internalStorageTank.amount+"L");
-
-
- int tempAdd = 0;
- tempAdd = rList.get(0).getKey().getFluidAmount();
- rList.get(0).getKey().mFluid = null;
- Logger.WARNING("adding "+tempAdd);
- this.internalStorageTank.amount = this.internalStorageTank.amount + tempAdd;
- Logger.WARNING("Tank now Contains "+this.internalStorageTank.amount+"L of "+this.internalStorageTank.getFluid().getName()+".");
-
-
- //Utils.LOG_WARNING("Tank");
- return true;
- }
- else {
- final FluidStack superTempFluidStack = rList.get(0).getKey().mFluid;
- Logger.WARNING("is input fluid equal to stored fluid? "+(this.internalStorageTank.isFluidEqual(superTempFluidStack)));
- if (superTempFluidStack != null) {
- Logger.WARNING("Input hatch[0] Contains "+superTempFluidStack.amount+"L of "+superTempFluidStack.getFluid().getName()+".");
- }
- Logger.WARNING("Large Multi-Tank Contains "+this.internalStorageTank.amount+"L of "+this.internalStorageTank.getFluid().getName()+".");
-
- if (this.internalStorageTank.amount <= 0){
- Logger.WARNING("Internal Tank is empty, sitting idle.");
- return false;
- }
-
- if ((this.mOutputHatches.get(0).mFluid == null) || this.mOutputHatches.isEmpty() || (this.mOutputHatches.get(0).mFluid.isFluidEqual(this.internalStorageTank) && (this.mOutputHatches.get(0).mFluid.amount < this.mOutputHatches.get(0).getCapacity()))){
- Logger.WARNING("Okay - 3");
- final int tempCurrentStored = this.internalStorageTank.amount;
- int tempResult = 0;
- final int tempHatchSize = this.mOutputHatches.get(0).getCapacity();
- final int tempHatchCurrentHolding = this.mOutputHatches.get(0).getFluidAmount();
- final int tempHatchRemainingSpace = tempHatchSize - tempHatchCurrentHolding;
- final FluidStack tempOutputFluid = this.internalStorageTank;
- if (tempHatchRemainingSpace <= 0){
- return false;
- }
- Logger.WARNING("Okay - 3.1.x"+" hatchCapacity: "+tempHatchSize +" tempCurrentStored: "+tempCurrentStored+" output hatch holds: "+tempHatchCurrentHolding+" tank has "+tempHatchRemainingSpace+"L of space left.");
-
- if (tempHatchSize >= tempHatchRemainingSpace){
- Logger.WARNING("Okay - 3.1.1"+" hatchCapacity: "+tempHatchSize +" tempCurrentStored: "+tempCurrentStored+" output hatch holds: "+tempHatchCurrentHolding+" tank has "+tempHatchRemainingSpace+"L of space left.");
-
- int adder;
- if ((tempCurrentStored > 0) && (tempCurrentStored <= tempHatchSize)){
- adder = tempCurrentStored;
- if (adder >= tempHatchRemainingSpace){
- adder = tempHatchRemainingSpace;
- }
- }
- else {
- adder = 0;
- if (tempCurrentStored >= tempHatchRemainingSpace){
- adder = tempHatchRemainingSpace;
- }
- }
-
- tempResult = adder;
- tempOutputFluid.amount = tempResult;
- Logger.WARNING("Okay - 3.1.2"+" result: "+tempResult +" tempCurrentStored: "+tempCurrentStored + " filling output hatch with: "+tempOutputFluid.amount+"L of "+tempOutputFluid.getFluid().getName());
- this.mOutputHatches.get(0).fill(tempOutputFluid, true);
- //mOutputHatches.get(0).mFluid.amount = tempResult;
- this.internalStorageTank.amount = (tempCurrentStored-adder);
- Logger.WARNING("Okay - 3.1.3"+" internalTankStorage: "+this.internalStorageTank.amount +"L | output hatch contains: "+this.mOutputHatches.get(0).mFluid.amount+"L of "+this.mOutputHatches.get(0).mFluid.getFluid().getName());
- */
-/*if (internalStorageTank.amount <= 0)
-internalStorageTank = null;*//*
-
- }
- Logger.WARNING("Tank ok.");
- return true;
- }
- }
- //this.getBaseMetaTileEntity().(tFluids[0].amount, true);
- Logger.WARNING("Tank");
- return false;
- }
-
- @Override
- public int getMaxParallelRecipes() {
- return 1;
- }
-
- @Override
- public int getEuDiscountForParallelism() {
- return 0;
- }
-
- @Override
- public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
- final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
- final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
- if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) {
- Logger.WARNING("Must be hollow.");
- return false;
- }
- int tAmount = 0;
- for (int i = -1; i < 2; i++) {
- for (int j = -1; j < 2; j++) {
- for (int h = -1; h < 19; h++) {
- if ((h != 0) || ((((xDir + i) != 0) || ((zDir + j) != 0)) && ((i != 0) || (j != 0)))) {
- final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
- if ((!this.addMaintenanceToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && (!this.addInputToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && (!this.addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(11)))) {
- if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
- if (h < 3){
- Logger.WARNING("Casing Expected.");
- return false;
- }
- else if (h >= 3){
- //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall.");
- }
- }
- if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 11) {
- if (h < 3){
- Logger.WARNING("Wrong Meta.");
- return false;
- }
- else if (h >= 3){
- //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall.");
- }
- }
- if (h < 3){
- tAmount++;
- }
- else if (h >= 3){
- if ((aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) == Blocks.air) || aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getUnlocalizedName().contains("residual")){
- Logger.WARNING("Found air");
- }
- else {
- Logger.WARNING("Layer "+(h+2)+" is complete. Adding "+(64000*9)+"L storage to the tank.");
- tAmount++;
- }
- }
- }
- }
- }
- }
- }
- this.multiblockCasingCount = (short) tAmount;
- this.maximumFluidStorage = getMaximumTankStorage(tAmount);
- Logger.INFO("Your Multitank can be 20 blocks tall.");
- Logger.INFO("Casings Count: "+this.multiblockCasingCount+" Valid Multiblock: "+(tAmount >= 16)+" Tank Storage Capacity:"+this.maximumFluidStorage+"L");
- this.tryForceNBTUpdate();
- return tAmount >= 16;
- }
-
- */
-/*public int countCasings() {
- Utils.LOG_INFO("Counting Machine Casings");
- try{
- if (this.getBaseMetaTileEntity().getWorld() == null){
- Utils.LOG_INFO("Tile Entity's world was null for casing count.");
- return 0;
- }
- if (this.getBaseMetaTileEntity() == null){
- Utils.LOG_INFO("Tile Entity was null for casing count.");
- return 0;
- }
- } catch(NullPointerException r){
- Utils.LOG_INFO("Null Pointer Exception caught.");
- return 0;
- }
- int xDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX;
- int zDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ;
- if (!this.getBaseMetaTileEntity().getAirOffset(xDir, 0, zDir)) {
- Utils.LOG_INFO("Failed due to air being misplaced.");
- Utils.LOG_WARNING("Must be hollow.");
- return 0;
- }
- int tAmount = 0;
- Utils.LOG_INFO("Casing Count set to 0.");
- for (int i = -1; i < 2; i++) {
- for (int j = -1; j < 2; j++) {
- for (int h = -1; h < 19; h++) {
- if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) {
- IGregTechTileEntity tTileEntity = this.getBaseMetaTileEntity().getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
- if ((!addMaintenanceToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && (!addInputToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && (!addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && (!addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(11)))) {
- if (this.getBaseMetaTileEntity().getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
- if (h < 3){
- Utils.LOG_WARNING("Casing Expected.");
- return 0;
- }
- else if (h >= 3){
- //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall.");
- }
- }
- if (this.getBaseMetaTileEntity().getMetaIDOffset(xDir + i, h, zDir + j) != 11) {
- if (h < 3){
- Utils.LOG_WARNING("Wrong Meta.");
- return 0;
- }
- else if (h >= 3){
- //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall.");
- }
- }
- if (h < 3){
- tAmount++;
- }
- else if (h >= 3){
- if (this.getBaseMetaTileEntity().getBlockOffset(xDir + i, h, zDir + j) == Blocks.air || this.getBaseMetaTileEntity().getBlockOffset(xDir + i, h, zDir + j).getUnlocalizedName().contains("residual")){
- Utils.LOG_WARNING("Found air");
- }
- else {
- Utils.LOG_WARNING("Layer "+(h+2)+" is complete. Adding "+(64000*9)+"L storage to the tank.");
- tAmount++;
- }
- }
- }
- }
- }
- }
- }
- Utils.LOG_INFO("Finished counting.");
- multiblockCasingCount = (short) tAmount;
- //Utils.LOG_INFO("Your Multitank can be 20 blocks tall.");
- Utils.LOG_INFO("Casings Count: "+tAmount+" Valid Multiblock: "+(tAmount >= 16)+" Tank Storage Capacity:"+getMaximumTankStorage(tAmount)+"L");
- return tAmount;
-}*//*
-
-
- @Override
- public int getMaxEfficiency(final ItemStack aStack) {
- return 10000;
- }
-
- @Override
- public int getPollutionPerTick(final ItemStack aStack) {
- return 5;
- }
-
- @Override
- public int getAmountOfOutputs() {
- return 1;
- }
-
- @Override
- public boolean explodesOnComponentBreak(final ItemStack aStack) {
- return false;
- }
-
- private static short getStorageMultiplier(final int casingCount){
- final int tsm = 1*casingCount;
- if (tsm <= 0){
- return 1;
- }
- return (short) tsm;
- }
-
- private static int getMaximumTankStorage(final int casingCount){
- final int multiplier = getStorageMultiplier(casingCount);
- final int tempTankStorageMax = 128000*multiplier;
- if (tempTankStorageMax <= 0){return 128000;}
- return tempTankStorageMax;
- }
-
- private boolean tryForceNBTUpdate(){
- */
+ * package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage; public class
+ * GregtechMetaTileEntity_MultiTank extends GregtechMeta_MultiBlockBase { public GregtechMetaTileEntity_MultiTank(final
+ * int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } private short
+ * multiblockCasingCount = 0; private int mInternalSaveClock = 0; private final short storageMultiplier = 1; private int
+ * maximumFluidStorage = 128000; private FluidStack internalStorageTank = null; private final NBTTagCompound
+ * internalCraftingComponentsTag = new NBTTagCompound();
+ * @Override public String getMachineType() { return "Fluid Tank"; }
+ * @Override public String[] getExtraInfoData() { final ArrayList<GT_MetaTileEntity_Hatch_Energy> mTier =
+ * this.mEnergyHatches; if (!mTier.isEmpty()){ final int temp = mTier.get(0).mTier; if (this.internalStorageTank ==
+ * null) { return new String[]{ GT_Values.VOLTAGE_NAMES[temp]+" Large Fluid Tank", "Stored Fluid: No Fluid",
+ * "Internal | Current: "+Integer.toString(0) + "L", "Internal | Maximum: "+Integer.toString(this.maximumFluidStorage) +
+ * "L"}; } return new String[]{ GT_Values.VOLTAGE_NAMES[temp]+" Large Fluid Tank",
+ * "Stored Fluid: "+this.internalStorageTank.getLocalizedName(),
+ * "Internal | Current: "+Integer.toString(this.internalStorageTank.amount) + "L",
+ * "Internal | Maximum: "+Integer.toString(this.maximumFluidStorage) + "L"}; } return new String[]{
+ * "Voltage Tier not set -" +" Large Fluid Tank", "Stored Fluid: No Fluid", "Internal | Current: "+Integer.toString(0) +
+ * "L", "Internal | Maximum: "+Integer.toString(this.maximumFluidStorage) + "L"}; }
+ * @Override public void saveNBTData(final NBTTagCompound aNBT) { super.saveNBTData(aNBT);
+ */
/*
-//Block is invalid.
-if ((this == null) || (this.getBaseMetaTileEntity() == null)){
- Utils.LOG_WARNING("Block was not valid for saving data.");
- return false;
-}
-
-//Don't need this to run clientside.
-if (!this.getBaseMetaTileEntity().isServerSide()) {
- return false;
-}
-
-//Internal Tag was not valid.
-try{
- if (this.internalCraftingComponentsTag == null){
- Utils.LOG_WARNING("Internal NBT data tag was null.");
- return false;
- }
-} catch (final NullPointerException x){
- Utils.LOG_WARNING("Caught null NBT.");
-}
-
-//Internal tag was valid.
-this.saveNBTData(this.internalCraftingComponentsTag);
-
-
-//Mark block for update
-int x,y,z = 0;
-x = this.getBaseMetaTileEntity().getXCoord();
-y = this.getBaseMetaTileEntity().getYCoord();
-z = this.getBaseMetaTileEntity().getZCoord();
-this.getBaseMetaTileEntity().getWorld().markBlockForUpdate(x, y, z);
-
-//Mark block dirty, let chunk know it's data has changed and it must be saved to disk. (Albeit slowly)
-this.getBaseMetaTileEntity().markDirty();*//*
-
- return true;
- }
- }*/
+ * final NBTTagCompound gtCraftingComponentsTag = aNBT.getCompoundTag("GT.CraftingComponents"); if
+ * (gtCraftingComponentsTag != null){ Utils.LOG_WARNING("Got Crafting Tag"); if (this.internalStorageTank != null){
+ * Utils.LOG_WARNING("mFluid was not null, Saving TileEntity NBT data."); gtCraftingComponentsTag.setString("xFluid",
+ * this.internalStorageTank.getFluid().getName()); gtCraftingComponentsTag.setInteger("xAmount",
+ * this.internalStorageTank.amount); gtCraftingComponentsTag.setLong("xAmountMax", this.maximumFluidStorage);
+ * aNBT.setTag("GT.CraftingComponents", gtCraftingComponentsTag); } else {
+ * Utils.LOG_WARNING("mFluid was null, Saving TileEntity NBT data."); gtCraftingComponentsTag.removeTag("xFluid");
+ * gtCraftingComponentsTag.removeTag("xAmount"); gtCraftingComponentsTag.removeTag("xAmountMax");
+ * gtCraftingComponentsTag.setLong("xAmountMax", this.maximumFluidStorage); aNBT.setTag("GT.CraftingComponents",
+ * gtCraftingComponentsTag); } }
+ *//*
+ * }
+ * @Override public void loadNBTData(final NBTTagCompound aNBT) { super.loadNBTData(aNBT);
+ */
+/*
+ * final NBTTagCompound gtCraftingComponentsTag = aNBT.getCompoundTag("GT.CraftingComponents"); String xFluid = null;
+ * int xAmount = 0; if (gtCraftingComponentsTag.hasNoTags()){ if (this.internalStorageTank != null){
+ * Utils.LOG_WARNING("mFluid was not null, Creating TileEntity NBT data.");
+ * gtCraftingComponentsTag.setInteger("xAmount", this.internalStorageTank.amount);
+ * gtCraftingComponentsTag.setString("xFluid", this.internalStorageTank.getFluid().getName());
+ * aNBT.setTag("GT.CraftingComponents", gtCraftingComponentsTag); } } else { //internalCraftingComponentsTag =
+ * gtCraftingComponentsTag.getCompoundTag("backupTag"); if (gtCraftingComponentsTag.hasKey("xFluid")){
+ * Utils.LOG_WARNING("xFluid was not null, Loading TileEntity NBT data."); xFluid =
+ * gtCraftingComponentsTag.getString("xFluid"); } if (gtCraftingComponentsTag.hasKey("xAmount")){
+ * Utils.LOG_WARNING("xAmount was not null, Loading TileEntity NBT data."); xAmount =
+ * gtCraftingComponentsTag.getInteger("xAmount"); } if ((xFluid != null) && (xAmount != 0)){
+ * Utils.LOG_WARNING("Setting Internal Tank, loading "+xAmount+"L of "+xFluid); this.setInternalTank(xFluid, xAmount); }
+ * }
+ *//*
+ * } private boolean setInternalTank(final String fluidName, final int amount){ final FluidStack temp =
+ * FluidUtils.getFluidStack(fluidName, amount); if (temp != null){ if (this.internalStorageTank == null){
+ * this.internalStorageTank = temp; Logger.WARNING(temp.getFluid().getName()+" Amount: "+temp.amount+"L"); } else{
+ * Logger.WARNING("Retained Fluid.");
+ * Logger.WARNING(this.internalStorageTank.getFluid().getName()+" Amxount: "+this.internalStorageTank.amount+"L"); }
+ * this.markDirty(); return true; } return false; }
+ * @Override public void onLeftclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
+ * this.tryForceNBTUpdate(); super.onLeftclick(aBaseMetaTileEntity, aPlayer); }
+ * @Override public boolean onWrenchRightClick(final byte aSide, final byte aWrenchingSide, final EntityPlayer
+ * aPlayer, final float aX, final float aY, final float aZ) { this.tryForceNBTUpdate(); return
+ * super.onWrenchRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ); }
+ * @Override public void onRemoval() { this.tryForceNBTUpdate(); super.onRemoval(); }
+ * @Override public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) {
+ * super.onPostTick(aBaseMetaTileEntity, aTick); if ((this.internalStorageTank != null) &&
+ * this.internalStorageTank.amount >= this.maximumFluidStorage){ if (this.internalStorageTank.amount >
+ * this.maximumFluidStorage){ this.internalStorageTank.amount = this.maximumFluidStorage; } this.stopMachine(); } if
+ * (this.mInternalSaveClock != 20){ this.mInternalSaveClock++; } else { this.mInternalSaveClock = 0;
+ * this.tryForceNBTUpdate(); } } public GregtechMetaTileEntity_MultiTank(final String aName) { super(aName); }
+ * @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { return new
+ * GregtechMetaTileEntity_MultiTank(this.mName); }
+ * @Override public String[] getTooltip() { return new String[]{ "Controller Block for the Multitank",
+ * "Size: 3xHx3 (Block behind controller must be air)", "Structure must be at least 4 blocks tall, maximum 20.",
+ * "Each casing within the structure adds 128000L storage.", "Multitank Exterior Casings (16 at least!)",
+ * "Controller (front centered)", "1x Input hatch", "1x Output hatch", "1x Energy Hatch", }; }
+ * @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte
+ * aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { if (aSide == aFacing) { return
+ * new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(11)), new GT_RenderedTexture(aActive ?
+ * TexturesGtBlock.Overlay_Machine_Screen_Logo : TexturesGtBlock.Overlay_Machine_Screen_Logo)}; } return new
+ * ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(11))}; }
+ * @Override public GT_Recipe.GT_Recipe_Map getRecipeMap() { return null; }
+ * @Override public boolean isFacingValid(final byte aFacing) { return aFacing > 1; }
+ * @Override public boolean checkRecipe(final ItemStack aStack) { final ArrayList<ItemStack> tInputList =
+ * this.getStoredInputs(); for (int i = 0; i < (tInputList.size() - 1); i++) { for (int j = i + 1; j <
+ * tInputList.size(); j++) { if (GT_Utility.areStacksEqual(tInputList.get(i), tInputList.get(j))) { if
+ * (tInputList.get(i).stackSize >= tInputList.get(j).stackSize) { tInputList.remove(j--); } else {
+ * tInputList.remove(i--); break; } } } } final ItemStack[] tInputs = Arrays.copyOfRange(tInputList.toArray(new
+ * ItemStack[tInputList.size()]), 0, 2); final ArrayList<FluidStack> tFluidList = this.getStoredFluids(); for (int i
+ * = 0; i < (tFluidList.size() - 1); i++) { for (int j = i + 1; j < tFluidList.size(); j++) { if
+ * (GT_Utility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) { if (tFluidList.get(i).amount >=
+ * tFluidList.get(j).amount) { tFluidList.remove(j--); } else { tFluidList.remove(i--); break; } } } } final
+ * FluidStack[] tFluids = Arrays.copyOfRange(tFluidList.toArray(new FluidStack[1]), 0, 1); if (tFluids.length >= 2){
+ * Logger.WARNING("Bad"); return false; } final ArrayList<Pair<GT_MetaTileEntity_Hatch_Input, Boolean>> rList = new
+ * ArrayList<>(); int slotInputCount = 0; for (final GT_MetaTileEntity_Hatch_Input tHatch : this.mInputHatches) {
+ * boolean containsFluid = false; if (isValidMetaTileEntity(tHatch)) { slotInputCount++; for (int i=0;
+ * i<tHatch.getBaseMetaTileEntity().getSizeInventory(); i++) { if (tHatch.canTankBeEmptied()){containsFluid=true;} }
+ * rList.add(new Pair<>(tHatch, containsFluid)); } } if ((tFluids.length <= 0) || (slotInputCount > 1)){
+ * Logger.WARNING("Bad"); return false; } Logger.WARNING("Okay - 2"); if (this.internalStorageTank == null){
+ * Logger.WARNING("Okay - 3"); if ((rList.get(0).getKey().mFluid != null) && (rList.get(0).getKey().mFluid.amount >
+ * 0)){ Logger.WARNING("Okay - 4");
+ * Logger.WARNING("Okay - 1"+" rList.get(0).getKey().mFluid.amount: "+rList.get(0).getKey().mFluid.amount
+ */
+/* +" internalStorageTank:"+internalStorageTank.amount *//*
+ * ); final FluidStack tempFluidStack =
+ * rList.get(0).getKey().mFluid; final Fluid tempFluid =
+ * tempFluidStack.getFluid(); this.internalStorageTank =
+ * FluidUtils.getFluidStack(tempFluid.getName(),
+ * tempFluidStack.amount); rList.get(0).getKey().mFluid.amount
+ * = 0; Logger.WARNING("Okay - 1.1"
+ * +" rList.get(0).getKey().mFluid.amount: "+rList.get(0).
+ * getKey().mFluid.amount
+ * +" internalStorageTank:"+this.internalStorageTank.amount);
+ * return true; } Logger.WARNING("No Fluid in hatch."); return
+ * false; } else if
+ * (this.internalStorageTank.isFluidEqual(rList.get(0).getKey()
+ * .mFluid)){
+ * Logger.WARNING("Storing "+rList.get(0).getKey().mFluid.
+ * amount+"L");
+ * Logger.WARNING("Contains "+this.internalStorageTank.amount+
+ * "L"); int tempAdd = 0; tempAdd =
+ * rList.get(0).getKey().getFluidAmount();
+ * rList.get(0).getKey().mFluid = null;
+ * Logger.WARNING("adding "+tempAdd);
+ * this.internalStorageTank.amount =
+ * this.internalStorageTank.amount + tempAdd;
+ * Logger.WARNING("Tank now Contains "+this.internalStorageTank
+ * .amount+"L of "+this.internalStorageTank.getFluid().getName(
+ * )+"."); //Utils.LOG_WARNING("Tank"); return true; } else {
+ * final FluidStack superTempFluidStack =
+ * rList.get(0).getKey().mFluid;
+ * Logger.WARNING("is input fluid equal to stored fluid? "+(
+ * this.internalStorageTank.isFluidEqual(superTempFluidStack)))
+ * ; if (superTempFluidStack != null) {
+ * Logger.WARNING("Input hatch[0] Contains "
+ * +superTempFluidStack.amount+"L of "+superTempFluidStack.
+ * getFluid().getName()+"."); }
+ * Logger.WARNING("Large Multi-Tank Contains "+this.
+ * internalStorageTank.amount+"L of "+this.internalStorageTank.
+ * getFluid().getName()+"."); if
+ * (this.internalStorageTank.amount <= 0){
+ * Logger.WARNING("Internal Tank is empty, sitting idle.");
+ * return false; } if ((this.mOutputHatches.get(0).mFluid ==
+ * null) || this.mOutputHatches.isEmpty() ||
+ * (this.mOutputHatches.get(0).mFluid.isFluidEqual(this.
+ * internalStorageTank) &&
+ * (this.mOutputHatches.get(0).mFluid.amount <
+ * this.mOutputHatches.get(0).getCapacity()))){
+ * Logger.WARNING("Okay - 3"); final int tempCurrentStored =
+ * this.internalStorageTank.amount; int tempResult = 0; final
+ * int tempHatchSize =
+ * this.mOutputHatches.get(0).getCapacity(); final int
+ * tempHatchCurrentHolding =
+ * this.mOutputHatches.get(0).getFluidAmount(); final int
+ * tempHatchRemainingSpace = tempHatchSize -
+ * tempHatchCurrentHolding; final FluidStack tempOutputFluid =
+ * this.internalStorageTank; if (tempHatchRemainingSpace <= 0){
+ * return false; }
+ * Logger.WARNING("Okay - 3.1.x"+" hatchCapacity: "
+ * +tempHatchSize +" tempCurrentStored: "
+ * +tempCurrentStored+" output hatch holds: "
+ * +tempHatchCurrentHolding+" tank has "
+ * +tempHatchRemainingSpace+"L of space left."); if
+ * (tempHatchSize >= tempHatchRemainingSpace){
+ * Logger.WARNING("Okay - 3.1.1"+" hatchCapacity: "
+ * +tempHatchSize +" tempCurrentStored: "
+ * +tempCurrentStored+" output hatch holds: "
+ * +tempHatchCurrentHolding+" tank has "
+ * +tempHatchRemainingSpace+"L of space left."); int adder; if
+ * ((tempCurrentStored > 0) && (tempCurrentStored <=
+ * tempHatchSize)){ adder = tempCurrentStored; if (adder >=
+ * tempHatchRemainingSpace){ adder = tempHatchRemainingSpace; }
+ * } else { adder = 0; if (tempCurrentStored >=
+ * tempHatchRemainingSpace){ adder = tempHatchRemainingSpace; }
+ * } tempResult = adder; tempOutputFluid.amount = tempResult;
+ * Logger.WARNING("Okay - 3.1.2"+" result: "+tempResult
+ * +" tempCurrentStored: "+tempCurrentStored +
+ * " filling output hatch with: "+tempOutputFluid.
+ * amount+"L of "+tempOutputFluid.getFluid().getName());
+ * this.mOutputHatches.get(0).fill(tempOutputFluid, true);
+ * //mOutputHatches.get(0).mFluid.amount = tempResult;
+ * this.internalStorageTank.amount = (tempCurrentStored-adder);
+ * Logger.WARNING("Okay - 3.1.3"+" internalTankStorage: "+this.
+ * internalStorageTank.amount
+ * +"L | output hatch contains: "+this.mOutputHatches.get(0).
+ * mFluid.amount+"L of "+this.mOutputHatches.get(0).mFluid.
+ * getFluid().getName());
+ */
+/*
+ * if (internalStorageTank.amount <= 0) internalStorageTank = null;
+ *//*
+ * } Logger.WARNING("Tank ok."); return true; } } //this.getBaseMetaTileEntity().(tFluids[0].amount, true);
+ * Logger.WARNING("Tank"); return false; }
+ * @Override public int getMaxParallelRecipes() { return 1; }
+ * @Override public int getEuDiscountForParallelism() { return 0; }
+ * @Override public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
+ * final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; final int zDir =
+ * ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; if
+ * (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) { Logger.WARNING("Must be hollow."); return false; } int
+ * tAmount = 0; for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { for (int h = -1; h < 19; h++) { if ((h
+ * != 0) || ((((xDir + i) != 0) || ((zDir + j) != 0)) && ((i != 0) || (j != 0)))) { final IGregTechTileEntity
+ * tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); if
+ * ((!this.addMaintenanceToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && (!this.addInputToMachineList(tTileEntity,
+ * TAE.GTPP_INDEX(11))) && (!this.addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) &&
+ * (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(11)))) { if
+ * (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) { if (h < 3){
+ * Logger.WARNING("Casing Expected."); return false; } else if (h >= 3){
+ * //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); } } if (aBaseMetaTileEntity.getMetaIDOffset(xDir +
+ * i, h, zDir + j) != 11) { if (h < 3){ Logger.WARNING("Wrong Meta."); return false; } else if (h >= 3){
+ * //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); } } if (h < 3){ tAmount++; } else if (h >= 3){ if
+ * ((aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) == Blocks.air) ||
+ * aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getUnlocalizedName().contains("residual")){
+ * Logger.WARNING("Found air"); } else {
+ * Logger.WARNING("Layer "+(h+2)+" is complete. Adding "+(64000*9)+"L storage to the tank."); tAmount++; } } } } } }
+ * } this.multiblockCasingCount = (short) tAmount; this.maximumFluidStorage = getMaximumTankStorage(tAmount);
+ * Logger.INFO("Your Multitank can be 20 blocks tall.");
+ * Logger.INFO("Casings Count: "+this.multiblockCasingCount+" Valid Multiblock: "+(tAmount >=
+ * 16)+" Tank Storage Capacity:"+this.maximumFluidStorage+"L"); this.tryForceNBTUpdate(); return tAmount >= 16; }
+ */
+/*
+ * public int countCasings() { Utils.LOG_INFO("Counting Machine Casings"); try{ if
+ * (this.getBaseMetaTileEntity().getWorld() == null){ Utils.LOG_INFO("Tile Entity's world was null for casing count.");
+ * return 0; } if (this.getBaseMetaTileEntity() == null){ Utils.LOG_INFO("Tile Entity was null for casing count.");
+ * return 0; } } catch(NullPointerException r){ Utils.LOG_INFO("Null Pointer Exception caught."); return 0; } int xDir =
+ * ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX; int zDir =
+ * ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ; if
+ * (!this.getBaseMetaTileEntity().getAirOffset(xDir, 0, zDir)) { Utils.LOG_INFO("Failed due to air being misplaced.");
+ * Utils.LOG_WARNING("Must be hollow."); return 0; } int tAmount = 0; Utils.LOG_INFO("Casing Count set to 0."); for (int
+ * i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { for (int h = -1; h < 19; h++) { if ((h != 0) || (((xDir + i !=
+ * 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { IGregTechTileEntity tTileEntity =
+ * this.getBaseMetaTileEntity().getIGregTechTileEntityOffset(xDir + i, h, zDir + j); if
+ * ((!addMaintenanceToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) && (!addInputToMachineList(tTileEntity,
+ * TAE.GTPP_INDEX(11))) && (!addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(11))) &&
+ * (!addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(11)))) { if
+ * (this.getBaseMetaTileEntity().getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) { if (h < 3){
+ * Utils.LOG_WARNING("Casing Expected."); return 0; } else if (h >= 3){
+ * //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); } } if
+ * (this.getBaseMetaTileEntity().getMetaIDOffset(xDir + i, h, zDir + j) != 11) { if (h < 3){
+ * Utils.LOG_WARNING("Wrong Meta."); return 0; } else if (h >= 3){
+ * //Utils.LOG_WARNING("Your Multitank can be 20 blocks tall."); } } if (h < 3){ tAmount++; } else if (h >= 3){ if
+ * (this.getBaseMetaTileEntity().getBlockOffset(xDir + i, h, zDir + j) == Blocks.air ||
+ * this.getBaseMetaTileEntity().getBlockOffset(xDir + i, h, zDir + j).getUnlocalizedName().contains("residual")){
+ * Utils.LOG_WARNING("Found air"); } else {
+ * Utils.LOG_WARNING("Layer "+(h+2)+" is complete. Adding "+(64000*9)+"L storage to the tank."); tAmount++; } } } } } }
+ * } Utils.LOG_INFO("Finished counting."); multiblockCasingCount = (short) tAmount;
+ * //Utils.LOG_INFO("Your Multitank can be 20 blocks tall.");
+ * Utils.LOG_INFO("Casings Count: "+tAmount+" Valid Multiblock: "+(tAmount >=
+ * 16)+" Tank Storage Capacity:"+getMaximumTankStorage(tAmount)+"L"); return tAmount; }
+ *//*
+ * @Override public int getMaxEfficiency(final ItemStack aStack) { return 10000; }
+ * @Override public int getPollutionPerTick(final ItemStack aStack) { return 5; }
+ * @Override public int getAmountOfOutputs() { return 1; }
+ * @Override public boolean explodesOnComponentBreak(final ItemStack aStack) { return false; } private static short
+ * getStorageMultiplier(final int casingCount){ final int tsm = 1*casingCount; if (tsm <= 0){ return 1; } return
+ * (short) tsm; } private static int getMaximumTankStorage(final int casingCount){ final int multiplier =
+ * getStorageMultiplier(casingCount); final int tempTankStorageMax = 128000*multiplier; if (tempTankStorageMax <=
+ * 0){return 128000;} return tempTankStorageMax; } private boolean tryForceNBTUpdate(){
+ */
+/*
+ * //Block is invalid. if ((this == null) || (this.getBaseMetaTileEntity() == null)){
+ * Utils.LOG_WARNING("Block was not valid for saving data."); return false; } //Don't need this to run clientside. if
+ * (!this.getBaseMetaTileEntity().isServerSide()) { return false; } //Internal Tag was not valid. try{ if
+ * (this.internalCraftingComponentsTag == null){ Utils.LOG_WARNING("Internal NBT data tag was null."); return false; } }
+ * catch (final NullPointerException x){ Utils.LOG_WARNING("Caught null NBT."); } //Internal tag was valid.
+ * this.saveNBTData(this.internalCraftingComponentsTag); //Mark block for update int x,y,z = 0; x =
+ * this.getBaseMetaTileEntity().getXCoord(); y = this.getBaseMetaTileEntity().getYCoord(); z =
+ * this.getBaseMetaTileEntity().getZCoord(); this.getBaseMetaTileEntity().getWorld().markBlockForUpdate(x, y, z); //Mark
+ * block dirty, let chunk know it's data has changed and it must be saved to disk. (Albeit slowly)
+ * this.getBaseMetaTileEntity().markDirty();
+ *//*
+ * return true; } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index 58579164a1..a4929af626 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -9,6 +9,17 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTDynamo;
import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTEnergy;
+import javax.annotation.Nullable;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.Constants.NBT;
+import net.minecraftforge.common.util.ForgeDirection;
+
import com.gtnewhorizon.structurelib.StructureLibAPI;
import com.gtnewhorizon.structurelib.alignment.constructable.ChannelDataAccessor;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
@@ -23,6 +34,7 @@ import com.gtnewhorizons.modularui.common.widget.ProgressBar;
import com.gtnewhorizons.modularui.common.widget.SlotGroup;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.TAE;
import gregtech.api.enums.Textures;
@@ -50,15 +62,6 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.preloader.asm.AsmConfig;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import javax.annotation.Nullable;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.Constants.NBT;
-import net.minecraftforge.common.util.ForgeDirection;
public class GregtechMetaTileEntity_PowerSubStationController
extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_PowerSubStationController>
@@ -86,8 +89,8 @@ public class GregtechMetaTileEntity_PowerSubStationController
private TopState topState = TopState.MayBeTop;
private static IStructureDefinition<GregtechMetaTileEntity_PowerSubStationController> STRUCTURE_DEFINITION = null;
- public GregtechMetaTileEntity_PowerSubStationController(
- final int aID, final String aName, final String aNameRegional) {
+ public GregtechMetaTileEntity_PowerSubStationController(final int aID, final String aName,
+ final String aNameRegional) {
super(aID, aName, aNameRegional);
}
@@ -106,48 +109,36 @@ public class GregtechMetaTileEntity_PowerSubStationController
tt.addMachineType(getMachineType())
.addInfo("Consumes " + this.ENERGY_TAX + "% of the average voltage of all energy type hatches")
.addInfo("Does not require maintenance")
- .addInfo("Can be built with variable height between " + (CELL_HEIGHT_MIN + 2) + "-"
- + (CELL_HEIGHT_MAX + 2) + "")
+ .addInfo(
+ "Can be built with variable height between " + (CELL_HEIGHT_MIN + 2)
+ + "-"
+ + (CELL_HEIGHT_MAX + 2)
+ + "")
.addInfo("Hatches can be placed nearly anywhere")
.addInfo("HV Energy/Dynamo Hatches are the lowest tier you can use")
- .addInfo("Supports voltages >= UHV using MAX tier components.")
- .addSeparator()
- .addController("Bottom Center")
- .addCasingInfo("Sub-Station External Casings", 10)
- .addDynamoHatch("Any Casing", 1)
- .addEnergyHatch("Any Casing", 1)
+ .addInfo("Supports voltages >= UHV using MAX tier components.").addSeparator()
+ .addController("Bottom Center").addCasingInfo("Sub-Station External Casings", 10)
+ .addDynamoHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1)
.addSubChannelUsage("capacitor", "Vanadium Capacitor Cell Tier")
- .addSubChannelUsage("height", "Height of structure")
- .toolTipFinisher(CORE.GT_Tooltip_Builder);
+ .addSubChannelUsage("height", "Height of structure").toolTipFinisher(CORE.GT_Tooltip_Builder);
return tt;
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == aFacing) {
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(24)),
- new GT_RenderedTexture(
- aActive
- ? Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE
- : Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER)
- };
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(24)),
+ new GT_RenderedTexture(
+ aActive ? Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE
+ : Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER) };
}
if (aSide == this.getBaseMetaTileEntity().getBackFacing()) {
- return new ITexture[] {
- Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(24)),
- mIsOutputtingPower
- ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[(int) this.getOutputTier()]
- : Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[(int) this.getInputTier()]
- };
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(24)),
+ mIsOutputtingPower ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[(int) this.getOutputTier()]
+ : Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[(int) this.getInputTier()] };
}
- return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(23))};
+ return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(23)) };
}
@Override
@@ -232,36 +223,36 @@ public class GregtechMetaTileEntity_PowerSubStationController
if (STRUCTURE_DEFINITION == null) {
STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_PowerSubStationController>builder()
.addShape(
- mName + "bottom", transpose(new String[][] {{"BB~BB", "BBBBB", "BBBBB", "BBBBB", "BBBBB"}}))
+ mName + "bottom",
+ transpose(new String[][] { { "BB~BB", "BBBBB", "BBBBB", "BBBBB", "BBBBB" } }))
+ .addShape(
+ mName + "layer",
+ transpose(new String[][] { { "CCCCC", "CIIIC", "CIIIC", "CIIIC", "CCCCC" } }))
+ .addShape(
+ mName + "mid",
+ transpose(new String[][] { { "CCCCC", "CHHHC", "CHHHC", "CHHHC", "CCCCC" } }))
.addShape(
- mName + "layer", transpose(new String[][] {{"CCCCC", "CIIIC", "CIIIC", "CIIIC", "CCCCC"}}))
- .addShape(mName + "mid", transpose(new String[][] {{"CCCCC", "CHHHC", "CHHHC", "CHHHC", "CCCCC"}}))
- .addShape(mName + "top", transpose(new String[][] {{"TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT"}}))
+ mName + "top",
+ transpose(new String[][] { { "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT" } }))
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_PowerSubStationController.class)
.atLeast(Energy.or(TTEnergy), Dynamo.or(TTDynamo), Maintenance)
.disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN)
- .casingIndex(TAE.GTPP_INDEX(24))
- .dot(1)
- .buildAndChain(
+ .casingIndex(TAE.GTPP_INDEX(24)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 8))))
.addElement(
'B',
buildHatchAdder(GregtechMetaTileEntity_PowerSubStationController.class)
.atLeast(Energy.or(TTEnergy), Dynamo.or(TTDynamo), Maintenance)
- .disallowOnly(ForgeDirection.UP)
- .casingIndex(TAE.GTPP_INDEX(24))
- .dot(1)
+ .disallowOnly(ForgeDirection.UP).casingIndex(TAE.GTPP_INDEX(24)).dot(1)
.buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 8))))
.addElement(
'T',
buildHatchAdder(GregtechMetaTileEntity_PowerSubStationController.class)
.atLeast(Energy.or(TTEnergy), Dynamo.or(TTDynamo), Maintenance)
- .disallowOnly(ForgeDirection.DOWN)
- .casingIndex(TAE.GTPP_INDEX(24))
- .dot(1)
+ .disallowOnly(ForgeDirection.DOWN).casingIndex(TAE.GTPP_INDEX(24)).dot(1)
.buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings2Misc, 8))))
.addElement(
@@ -274,8 +265,7 @@ public class GregtechMetaTileEntity_PowerSubStationController
onElementPass(
x -> x.topState = TopState.Top,
ofHatchAdderOptional(
- GregtechMetaTileEntity_PowerSubStationController
- ::addPowerSubStationList,
+ GregtechMetaTileEntity_PowerSubStationController::addPowerSubStationList,
TAE.GTPP_INDEX(24),
1,
ModBlocks.blockCasings2Misc,
@@ -291,15 +281,16 @@ public class GregtechMetaTileEntity_PowerSubStationController
onElementPass(x -> ++x.cellCount[3], ofCell(7)),
onElementPass(x -> ++x.cellCount[4], ofCell(8)),
onElementPass(
- x -> ++x.cellCount[5], ofCell(9))))))))
- .addElement('H', ofCell(4))
- .build();
+ x -> ++x.cellCount[5],
+ ofCell(9))))))))
+ .addElement('H', ofCell(4)).build();
}
return STRUCTURE_DEFINITION;
}
public static <T> IStructureElement<T> ofCell(int aIndex) {
return new IStructureElement<T>() {
+
@Override
public boolean check(T t, World world, int x, int y, int z) {
Block block = world.getBlock(x, y, z);
@@ -338,14 +329,14 @@ public class GregtechMetaTileEntity_PowerSubStationController
@Nullable
@Override
- public BlocksToPlace getBlocksToPlace(
- T t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) {
+ public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger,
+ AutoPlaceEnvironment env) {
return BlocksToPlace.create(getBlockFromTier(trigger.stackSize), getMetaFromTier(trigger.stackSize));
}
@Override
- public PlaceResult survivalPlaceBlock(
- T t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) {
+ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger,
+ AutoPlaceEnvironment env) {
Block block = world.getBlock(x, y, z);
int meta = world.getBlockMetadata(x, y, z);
int tier = getCellTier(block, meta);
@@ -707,41 +698,54 @@ public class GregtechMetaTileEntity_PowerSubStationController
String storedEnergyText;
if (this.getEUVar() > this.mBatteryCapacity) {
- storedEnergyText =
- EnumChatFormatting.RED + GT_Utility.formatNumbers(this.getEUVar()) + EnumChatFormatting.RESET;
+ storedEnergyText = EnumChatFormatting.RED + GT_Utility.formatNumbers(this.getEUVar())
+ + EnumChatFormatting.RESET;
} else {
- storedEnergyText =
- EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.getEUVar()) + EnumChatFormatting.RESET;
+ storedEnergyText = EnumChatFormatting.GREEN + GT_Utility.formatNumbers(this.getEUVar())
+ + EnumChatFormatting.RESET;
}
int errorCode = this.getBaseMetaTileEntity().getErrorDisplayID();
boolean mMaint = (errorCode != 0);
- return new String[] {
- "Ergon Energy - District Sub-Station",
- "Stored EU: " + storedEnergyText,
- "Capacity: " + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(this.maxEUStore())
- + EnumChatFormatting.RESET,
- "Running Costs: " + EnumChatFormatting.RED + GT_Utility.formatNumbers(this.computeEnergyTax())
- + EnumChatFormatting.RESET + " EU/t",
- "Controller Mode: " + mode,
- "Requires Maintenance: " + (!mMaint ? EnumChatFormatting.GREEN : EnumChatFormatting.RED) + mMaint
- + EnumChatFormatting.RESET + " | Code: ["
- + (!mMaint ? EnumChatFormatting.GREEN : EnumChatFormatting.RED) + errorCode
- + EnumChatFormatting.RESET + "]",
- "----------------------",
- "Stats for Nerds",
- "Average Input: " + EnumChatFormatting.BLUE + GT_Utility.formatNumbers(this.getAverageEuAdded())
- + EnumChatFormatting.RESET + " EU",
- "Average Output: " + EnumChatFormatting.GOLD + GT_Utility.formatNumbers(this.getAverageEuConsumed())
- + EnumChatFormatting.RESET + " EU",
- "Total Input: " + EnumChatFormatting.BLUE + GT_Utility.formatNumbers(this.mTotalEnergyAdded)
- + EnumChatFormatting.RESET + " EU",
- "Total Output: " + EnumChatFormatting.GOLD + GT_Utility.formatNumbers(this.mTotalEnergyConsumed)
- + EnumChatFormatting.RESET + " EU",
- "Total Costs: " + EnumChatFormatting.RED + GT_Utility.formatNumbers(this.mTotalEnergyLost)
- + EnumChatFormatting.RESET + " EU",
- };
+ return new String[] { "Ergon Energy - District Sub-Station", "Stored EU: " + storedEnergyText,
+ "Capacity: " + EnumChatFormatting.YELLOW
+ + GT_Utility.formatNumbers(this.maxEUStore())
+ + EnumChatFormatting.RESET,
+ "Running Costs: " + EnumChatFormatting.RED
+ + GT_Utility.formatNumbers(this.computeEnergyTax())
+ + EnumChatFormatting.RESET
+ + " EU/t",
+ "Controller Mode: " + mode,
+ "Requires Maintenance: " + (!mMaint ? EnumChatFormatting.GREEN : EnumChatFormatting.RED)
+ + mMaint
+ + EnumChatFormatting.RESET
+ + " | Code: ["
+ + (!mMaint ? EnumChatFormatting.GREEN : EnumChatFormatting.RED)
+ + errorCode
+ + EnumChatFormatting.RESET
+ + "]",
+ "----------------------", "Stats for Nerds",
+ "Average Input: " + EnumChatFormatting.BLUE
+ + GT_Utility.formatNumbers(this.getAverageEuAdded())
+ + EnumChatFormatting.RESET
+ + " EU",
+ "Average Output: " + EnumChatFormatting.GOLD
+ + GT_Utility.formatNumbers(this.getAverageEuConsumed())
+ + EnumChatFormatting.RESET
+ + " EU",
+ "Total Input: " + EnumChatFormatting.BLUE
+ + GT_Utility.formatNumbers(this.mTotalEnergyAdded)
+ + EnumChatFormatting.RESET
+ + " EU",
+ "Total Output: " + EnumChatFormatting.GOLD
+ + GT_Utility.formatNumbers(this.mTotalEnergyConsumed)
+ + EnumChatFormatting.RESET
+ + " EU",
+ "Total Costs: " + EnumChatFormatting.RED
+ + GT_Utility.formatNumbers(this.mTotalEnergyLost)
+ + EnumChatFormatting.RESET
+ + " EU", };
}
@Override
@@ -841,79 +845,65 @@ public class GregtechMetaTileEntity_PowerSubStationController
@Override
public void addGregTechLogo(ModularWindow.Builder builder) {
- builder.widget(new DrawableWidget()
- .setDrawable(getGUITextureSet().getGregTechLogo())
- .setSize(17, 17)
- .setPos(175, 166));
+ builder.widget(
+ new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17)
+ .setPos(175, 166));
}
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(4, 4)
- .setSize(149, 149))
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(4, 4).setSize(149, 149))
.widget(new SlotWidget(inventoryHandler, 0).setPos(154, 4))
- .widget(new SlotWidget(inventoryHandler, 1)
- .setAccess(true, false)
- .setPos(154, 22))
- .widget(SlotGroup.ofItemHandler(new PlayerMainInvWrapper(buildContext.getPlayer().inventory), 9)
- .endAtSlot(8)
- .build()
- .setPos(7, 166))
- .widget(TextWidget.dynamicString(() -> getBaseMetaTileEntity().getErrorDisplayID() == 0
- ? getBaseMetaTileEntity().isActive() ? "Running perfectly" : "Turn on with Mallet"
- : "")
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 8))
- .widget(new FakeSyncWidget.BooleanSyncer(
- () -> getBaseMetaTileEntity().isActive(),
- val -> getBaseMetaTileEntity().setActive(val)))
- .widget(new FakeSyncWidget.IntegerSyncer(
- () -> getBaseMetaTileEntity().getErrorDisplayID(),
- val -> getBaseMetaTileEntity().setErrorDisplayID(val)))
- .widget(new TextWidget("In")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(178, 10))
- .widget(new TextWidget("Out")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(176, 28))
- .widget(TextWidget.dynamicString(
- () -> "Avg In: " + GT_Utility.formatNumbers(getAverageEuAdded()) + " EU")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 20))
- .widget(TextWidget.dynamicString(
- () -> "Avg Out: " + GT_Utility.formatNumbers(getAverageEuConsumed()) + " EU")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 30))
- .widget(new DrawableWidget()
- .setDrawable(GTPP_UITextures.PICTURE_ENERGY_FRAME)
- .setPos(4, 155)
- .setSize(149, 7))
- .widget(new ProgressBar()
- .setProgress(this::getProgress)
- .setTexture(GTPP_UITextures.PROGRESSBAR_PSS_ENERGY, 147)
- .setDirection(ProgressBar.Direction.RIGHT)
- .setPos(5, 156)
- .setSize(147, 5))
- .widget(new TextWidget("Stored:")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 132))
+ .widget(new SlotWidget(inventoryHandler, 1).setAccess(true, false).setPos(154, 22))
+ .widget(
+ SlotGroup.ofItemHandler(new PlayerMainInvWrapper(buildContext.getPlayer().inventory), 9)
+ .endAtSlot(8).build().setPos(7, 166))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> getBaseMetaTileEntity().getErrorDisplayID() == 0
+ ? getBaseMetaTileEntity().isActive() ? "Running perfectly"
+ : "Turn on with Mallet"
+ : "")
+ .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 8))
+ .widget(
+ new FakeSyncWidget.BooleanSyncer(
+ () -> getBaseMetaTileEntity().isActive(),
+ val -> getBaseMetaTileEntity().setActive(val)))
+ .widget(
+ new FakeSyncWidget.IntegerSyncer(
+ () -> getBaseMetaTileEntity().getErrorDisplayID(),
+ val -> getBaseMetaTileEntity().setErrorDisplayID(val)))
+ .widget(new TextWidget("In").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(178, 10))
+ .widget(new TextWidget("Out").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(176, 28))
+ .widget(
+ TextWidget
+ .dynamicString(() -> "Avg In: " + GT_Utility.formatNumbers(getAverageEuAdded()) + " EU")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 20))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> "Avg Out: " + GT_Utility.formatNumbers(getAverageEuConsumed()) + " EU")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 30))
+ .widget(
+ new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ENERGY_FRAME).setPos(4, 155)
+ .setSize(149, 7))
+ .widget(
+ new ProgressBar().setProgress(this::getProgress)
+ .setTexture(GTPP_UITextures.PROGRESSBAR_PSS_ENERGY, 147)
+ .setDirection(ProgressBar.Direction.RIGHT).setPos(5, 156).setSize(147, 5))
+ .widget(new TextWidget("Stored:").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 132))
.widget(TextWidget.dynamicText(() -> {
- int colorScale = (int) (getProgress() * 100 * 2.55);
- return new Text(GT_Utility.formatNumbers(
- getBaseMetaTileEntity().getStoredEU()) + " EU")
- .color(Utils.rgbtoHexValue((255 - colorScale), colorScale, 0));
- })
- .setPos(10, 142))
- .widget(TextWidget.dynamicString(() -> GT_Utility.formatNumbers(getProgress() * 100) + "%")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(70, 155));
+ int colorScale = (int) (getProgress() * 100 * 2.55);
+ return new Text(GT_Utility.formatNumbers(getBaseMetaTileEntity().getStoredEU()) + " EU")
+ .color(Utils.rgbtoHexValue((255 - colorScale), colorScale, 0));
+ }).setPos(10, 142)).widget(
+ TextWidget.dynamicString(() -> GT_Utility.formatNumbers(getProgress() * 100) + "%")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(70, 155));
}
private float getProgress() {
- return (float) getBaseMetaTileEntity().getStoredEU()
- / getBaseMetaTileEntity().getEUCapacity();
+ return (float) getBaseMetaTileEntity().getStoredEU() / getBaseMetaTileEntity().getEUCapacity();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
index 6aec31dc1b..37f5d0ba25 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
@@ -3,7 +3,22 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.misc;
import static gregtech.api.enums.GT_Values.V;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
import Ic2ExpReactorPlanner.SimulationData;
+
import com.gtnewhorizons.modularui.api.ModularUITextures;
import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
@@ -15,6 +30,7 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import cpw.mods.fml.common.FMLCommonHandler;
import gregtech.api.GregTech_API;
import gregtech.api.enums.*;
@@ -38,18 +54,6 @@ import gtPlusPlus.xmod.gregtech.api.gui.widget.DataStickSlotWidget;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.computer.GT_Computercube_Description;
import gtPlusPlus.xmod.gregtech.common.computer.GT_Computercube_Simulator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank implements IAddGregtechLogo {
@@ -110,14 +114,8 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Built in Reactor Planner",
- "Built in Scanner",
- "Built in Info-Bank",
- "Displays Fusion Recipes",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Built in Reactor Planner", "Built in Scanner", "Built in Info-Bank",
+ "Displays Fusion Recipes", CORE.GT_Tooltip };
}
@Override
@@ -248,13 +246,13 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
}
for (i = 54; i < 58; i++) {
if (this.mInventory[i] != null) {
- if (!this.getWorld().isRemote)
- this.getWorld().spawnEntityInWorld((Entity) new EntityItem(
- this.getWorld(),
- this.getXCoord() + 0.5D,
- this.getYCoord() + 0.5D,
- this.getZCoord() + 0.5D,
- this.mInventory[i]));
+ if (!this.getWorld().isRemote) this.getWorld().spawnEntityInWorld(
+ (Entity) new EntityItem(
+ this.getWorld(),
+ this.getXCoord() + 0.5D,
+ this.getYCoord() + 0.5D,
+ this.getZCoord() + 0.5D,
+ this.mInventory[i]));
this.mInventory[i] = null;
}
}
@@ -308,22 +306,20 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
if (this.mMode == MODE_ELECTROLYZER) {
showElectrolyzerRecipe(0);
}
- this.getWorld()
- .addBlockEvent(
- this.getXCoord(),
- this.getYCoord(),
- this.getZCoord(),
- GregTech_API.sBlockMachines,
- 10,
- this.mMode);
- this.getWorld()
- .addBlockEvent(
- this.getXCoord(),
- this.getYCoord(),
- this.getZCoord(),
- GregTech_API.sBlockMachines,
- 11,
- this.mMaxHeat);
+ this.getWorld().addBlockEvent(
+ this.getXCoord(),
+ this.getYCoord(),
+ this.getZCoord(),
+ GregTech_API.sBlockMachines,
+ 10,
+ this.mMode);
+ this.getWorld().addBlockEvent(
+ this.getXCoord(),
+ this.getYCoord(),
+ this.getZCoord(),
+ GregTech_API.sBlockMachines,
+ 11,
+ this.mMaxHeat);
}
public void showDescription(int aIndex) {
@@ -335,105 +331,104 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[0] == null) {
this.mInventory[59] = null;
} else {
- this.mInventory[59] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[0].copy();
+ this.mInventory[59] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[0].copy();
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[1] == null) {
this.mInventory[60] = null;
} else {
- this.mInventory[60] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[1].copy();
+ this.mInventory[60] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[1].copy();
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[2] == null) {
this.mInventory[61] = null;
} else {
- this.mInventory[61] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[2].copy();
+ this.mInventory[61] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[2].copy();
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[3] == null) {
this.mInventory[62] = null;
} else {
- this.mInventory[62] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[3].copy();
+ this.mInventory[62] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[3].copy();
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[4] == null) {
this.mInventory[63] = null;
} else {
- this.mInventory[63] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[4].copy();
+ this.mInventory[63] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[4].copy();
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[5] == null) {
this.mInventory[64] = null;
} else {
- this.mInventory[64] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[5].copy();
+ this.mInventory[64] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[5].copy();
this.mExplosionStrength = 100.0F;
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[6] == null) {
this.mInventory[65] = null;
} else {
- this.mInventory[65] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[6].copy();
+ this.mInventory[65] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[6].copy();
this.mExplosionStrength = 100.0F;
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[7] == null) {
this.mInventory[66] = null;
} else {
- this.mInventory[66] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[7].copy();
+ this.mInventory[66] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[7].copy();
this.mExplosionStrength = 100.0F;
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[8] == null) {
this.mInventory[67] = null;
} else {
- this.mInventory[67] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[8].copy();
+ this.mInventory[67] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[8].copy();
this.mExplosionStrength = 100.0F;
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[9] == null) {
this.mInventory[68] = null;
} else {
- this.mInventory[68] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[9].copy();
+ this.mInventory[68] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[9].copy();
this.mExplosionStrength = 100.0F;
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[10] == null) {
this.mInventory[69] = null;
} else {
- this.mInventory[69] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[10].copy();
+ this.mInventory[69] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[10].copy();
this.mExplosionStrength = 100.0F;
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[11] == null) {
this.mInventory[70] = null;
} else {
- this.mInventory[70] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[11].copy();
+ this.mInventory[70] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[11].copy();
this.mExplosionStrength = 100.0F;
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[12] == null) {
this.mInventory[71] = null;
} else {
- this.mInventory[71] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[12].copy();
+ this.mInventory[71] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[12].copy();
this.mExplosionStrength = 100.0F;
}
if (((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex)).mStacks[13] == null) {
this.mInventory[72] = null;
} else {
- this.mInventory[72] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions.get(aIndex))
- .mStacks[13].copy();
+ this.mInventory[72] = ((GT_Computercube_Description) GT_Computercube_Description.sDescriptions
+ .get(aIndex)).mStacks[13].copy();
this.mExplosionStrength = 100.0F;
}
this.mMaxHeat = aIndex;
- this.getWorld()
- .addBlockEvent(
- this.getXCoord(),
- this.getYCoord(),
- this.getZCoord(),
- GregTech_API.sBlockMachines,
- 11,
- this.mMaxHeat);
+ this.getWorld().addBlockEvent(
+ this.getXCoord(),
+ this.getYCoord(),
+ this.getZCoord(),
+ GregTech_API.sBlockMachines,
+ 11,
+ this.mMaxHeat);
}
public void switchDescriptionPageForward() {
@@ -448,50 +443,17 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
public void showCentrifugeRecipe(int aIndex) {
/*
- if (aIndex >= GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.size() || aIndex < 0)
- aIndex = 0;
- GT_Recipe tRecipe = GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.get(aIndex);
- if (tRecipe != null) {
- if (tRecipe.mInput1 == null) {
- this.mInventory[59] = null;
- }
- else {
- this.mInventory[59] = tRecipe.mInput1.copy();
- }
- if (tRecipe.mInput2 == null) {
- this.mInventory[60] = null;
- }
- else {
- this.mInventory[60] = tRecipe.mInput2.copy();
- }
- if (tRecipe.mOutput1 == null) {
- this.mInventory[61] = null;
- }
- else {
- this.mInventory[61] = tRecipe.mOutput1.copy();
- }
- if (tRecipe.mOutput2 == null) {
- this.mInventory[62] = null;
- }
- else {
- this.mInventory[62] = tRecipe.mOutput2.copy();
- }
- if (tRecipe.mOutput3 == null) {
- this.mInventory[63] = null;
- }
- else {
- this.mInventory[63] = tRecipe.mOutput3.copy();
- }
- if (tRecipe.mOutput4 == null) {
- this.mInventory[64] = null;
- }
- else {
- this.mInventory[64] = tRecipe.mOutput4.copy();
- }
- this.mEU = tRecipe.mDuration * 5;
- this.mMaxHeat = aIndex;
- }
- this.getWorld().addBlockEvent(this.xCoord, this.yCoord, this.zCoord, (GregTech_API.sBlockList[1]).field_71990_ca, 11, this.mMaxHeat);
+ * if (aIndex >= GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.size() || aIndex < 0) aIndex = 0; GT_Recipe
+ * tRecipe = GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.get(aIndex); if (tRecipe != null) { if
+ * (tRecipe.mInput1 == null) { this.mInventory[59] = null; } else { this.mInventory[59] =
+ * tRecipe.mInput1.copy(); } if (tRecipe.mInput2 == null) { this.mInventory[60] = null; } else {
+ * this.mInventory[60] = tRecipe.mInput2.copy(); } if (tRecipe.mOutput1 == null) { this.mInventory[61] = null; }
+ * else { this.mInventory[61] = tRecipe.mOutput1.copy(); } if (tRecipe.mOutput2 == null) { this.mInventory[62] =
+ * null; } else { this.mInventory[62] = tRecipe.mOutput2.copy(); } if (tRecipe.mOutput3 == null) {
+ * this.mInventory[63] = null; } else { this.mInventory[63] = tRecipe.mOutput3.copy(); } if (tRecipe.mOutput4 ==
+ * null) { this.mInventory[64] = null; } else { this.mInventory[64] = tRecipe.mOutput4.copy(); } this.mEU =
+ * tRecipe.mDuration * 5; this.mMaxHeat = aIndex; } this.getWorld().addBlockEvent(this.xCoord, this.yCoord,
+ * this.zCoord, (GregTech_API.sBlockList[1]).field_71990_ca, 11, this.mMaxHeat);
*/ }
public void switchCentrifugePageForward() {
@@ -506,50 +468,17 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
public void showElectrolyzerRecipe(int aIndex) {
/*
- if (aIndex >= GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.size() || aIndex < 0)
- aIndex = 0;
- GT_Recipe tRecipe = GT_Recipe_Map.sElectrolyzerRecipes.get(aIndex);
- if (tRecipe != null) {
- if (tRecipe.mInput1 == null) {
- this.mInventory[59] = null;
- }
- else {
- this.mInventory[59] = tRecipe.mInput1.copy();
- }
- if (tRecipe.mInput2 == null) {
- this.mInventory[60] = null;
- }
- else {
- this.mInventory[60] = tRecipe.mInput2.copy();
- }
- if (tRecipe.mOutput1 == null) {
- this.mInventory[61] = null;
- }
- else {
- this.mInventory[61] = tRecipe.mOutput1.copy();
- }
- if (tRecipe.mOutput2 == null) {
- this.mInventory[62] = null;
- }
- else {
- this.mInventory[62] = tRecipe.mOutput2.copy();
- }
- if (tRecipe.mOutput3 == null) {
- this.mInventory[63] = null;
- }
- else {
- this.mInventory[63] = tRecipe.mOutput3.copy();
- }
- if (tRecipe.mOutput4 == null) {
- this.mInventory[64] = null;
- }
- else {
- this.mInventory[64] = tRecipe.mOutput4.copy();
- }
- this.mEU = tRecipe.mDuration * tRecipe.mEUt;
- this.mMaxHeat = aIndex;
- }
- this.getWorld().addBlockEvent(this.xCoord, this.yCoord, this.zCoord, (GregTech_API.sBlockList[1]).field_71990_ca, 11, this.mMaxHeat);
+ * if (aIndex >= GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.size() || aIndex < 0) aIndex = 0; GT_Recipe
+ * tRecipe = GT_Recipe_Map.sElectrolyzerRecipes.get(aIndex); if (tRecipe != null) { if (tRecipe.mInput1 == null)
+ * { this.mInventory[59] = null; } else { this.mInventory[59] = tRecipe.mInput1.copy(); } if (tRecipe.mInput2 ==
+ * null) { this.mInventory[60] = null; } else { this.mInventory[60] = tRecipe.mInput2.copy(); } if
+ * (tRecipe.mOutput1 == null) { this.mInventory[61] = null; } else { this.mInventory[61] =
+ * tRecipe.mOutput1.copy(); } if (tRecipe.mOutput2 == null) { this.mInventory[62] = null; } else {
+ * this.mInventory[62] = tRecipe.mOutput2.copy(); } if (tRecipe.mOutput3 == null) { this.mInventory[63] = null;
+ * } else { this.mInventory[63] = tRecipe.mOutput3.copy(); } if (tRecipe.mOutput4 == null) { this.mInventory[64]
+ * = null; } else { this.mInventory[64] = tRecipe.mOutput4.copy(); } this.mEU = tRecipe.mDuration *
+ * tRecipe.mEUt; this.mMaxHeat = aIndex; } this.getWorld().addBlockEvent(this.xCoord, this.yCoord, this.zCoord,
+ * (GregTech_API.sBlockList[1]).field_71990_ca, 11, this.mMaxHeat);
*/ }
public void switchElectrolyzerPageForward() {
@@ -599,14 +528,13 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
this.mMaxHeat = aIndex;
this.mFusionOutput = tRecipe.mFluidOutputs[0].getLocalizedName();
}
- this.getWorld()
- .addBlockEvent(
- this.getXCoord(),
- this.getYCoord(),
- this.getZCoord(),
- GregTech_API.sBlockMachines,
- 11,
- this.mMaxHeat);
+ this.getWorld().addBlockEvent(
+ this.getXCoord(),
+ this.getYCoord(),
+ this.getZCoord(),
+ GregTech_API.sBlockMachines,
+ 11,
+ this.mMaxHeat);
}
public void switchFusionPageForward() {
@@ -699,10 +627,10 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
}
if (this.getBaseMetaTileEntity().isServerSide()) {
if (this.mMode == MODE_SCANNER) {
- /*if (this.mInventory[55] == null) {
- this.mInventory[55] = this.mInventory[54];
- this.mInventory[54] = null;
- }*/
+ /*
+ * if (this.mInventory[55] == null) { this.mInventory[55] = this.mInventory[54]; this.mInventory[54] =
+ * null; }
+ */
if (this.mInventory[57] == null) {
this.mInventory[57] = this.mInventory[56];
this.mInventory[56] = null;
@@ -711,47 +639,31 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
// 54 - 55 || 56 - 57
// Do scanny bits
if (mSeedscanner && this.mMode == MODE_SCANNER) {
- /*if (doScan(this.mInventory[55]) == 4) {
- if ((this.mInventory[57] != null) && (this.mInventory[57].getUnlocalizedName().equals("gt.metaitem.01.32707"))) {
- GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "scanning");
- }
- }*/
- /*if (this.mEU > 0) {
- if (!this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(this.mEU, false)) {
- this.mProgress = 0;
- }
- }*/
+ /*
+ * if (doScan(this.mInventory[55]) == 4) { if ((this.mInventory[57] != null) &&
+ * (this.mInventory[57].getUnlocalizedName().equals("gt.metaitem.01.32707"))) {
+ * GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().
+ * getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "scanning"); } }
+ */
+ /*
+ * if (this.mEU > 0) { if (!this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(this.mEU, false))
+ * { this.mProgress = 0; } }
+ */
}
- /*if (mSeedscanner && this.mInventory[55] != null && GT_Utility.areStacksEqual(this.mInventory[55], Ic2Items.cropSeed, true) && this.mInventory[55].getTagCompound() != null) {
- if (this.mInventory[55].getTagCompound().getByte("scan") < 4) {
- if (this.mProgress >= 100) {
- this.mInventory[55].getTagCompound().setByte("scan", (byte) 4);
- this.mProgress = 0;
- }
- else if (this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(100, false)) {
- this.mProgress++;
- }
- }
- else {
- this.mProgress = 0;
- if (this.mInventory[56] == null) {
- this.mInventory[56] = this.mInventory[55];
- this.mInventory[55] = null;
- }
- }
- }
- else {
- this.mProgress = 0;
- if (this.mInventory[56] == null) {
- this.mInventory[56] = this.mInventory[55];
- this.mInventory[55] = null;
- }
- }*/
+ /*
+ * if (mSeedscanner && this.mInventory[55] != null && GT_Utility.areStacksEqual(this.mInventory[55],
+ * Ic2Items.cropSeed, true) && this.mInventory[55].getTagCompound() != null) { if
+ * (this.mInventory[55].getTagCompound().getByte("scan") < 4) { if (this.mProgress >= 100) {
+ * this.mInventory[55].getTagCompound().setByte("scan", (byte) 4); this.mProgress = 0; } else if
+ * (this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(100, false)) { this.mProgress++; } } else {
+ * this.mProgress = 0; if (this.mInventory[56] == null) { this.mInventory[56] = this.mInventory[55];
+ * this.mInventory[55] = null; } } } else { this.mProgress = 0; if (this.mInventory[56] == null) {
+ * this.mInventory[56] = this.mInventory[55]; this.mInventory[55] = null; } }
+ */
}
- if (this.mMode == MODE_REACTOR_PLANNER
- && mReactorplanner
+ if (this.mMode == MODE_REACTOR_PLANNER && mReactorplanner
&& this.mSimulator != null
&& this.mSimulator.simulator != null
&& this.mSimulator.simulatedReactor != null) {
@@ -769,22 +681,20 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
}
if (aTick % 20L == 0L) {
- this.getWorld()
- .addBlockEvent(
- this.getXCoord(),
- this.getYCoord(),
- this.getZCoord(),
- GregTech_API.sBlockMachines,
- 10,
- this.mMode);
- this.getWorld()
- .addBlockEvent(
- this.getXCoord(),
- this.getYCoord(),
- this.getZCoord(),
- GregTech_API.sBlockMachines,
- 11,
- this.mMaxHeat);
+ this.getWorld().addBlockEvent(
+ this.getXCoord(),
+ this.getYCoord(),
+ this.getZCoord(),
+ GregTech_API.sBlockMachines,
+ 10,
+ this.mMode);
+ this.getWorld().addBlockEvent(
+ this.getXCoord(),
+ this.getYCoord(),
+ this.getZCoord(),
+ GregTech_API.sBlockMachines,
+ 11,
+ this.mMaxHeat);
}
}
}
@@ -792,16 +702,15 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
@Override
public void receiveClientEvent(byte aEventID, byte aValue) {
super.receiveClientEvent(aEventID, aValue);
- if (this.getWorld().isRemote)
- switch (aEventID) {
- case 10:
- this.mNeedsUpdate = true;
- this.mMode = aValue;
- break;
- case 11:
- this.mMaxHeat = aValue;
- break;
- }
+ if (this.getWorld().isRemote) switch (aEventID) {
+ case 10:
+ this.mNeedsUpdate = true;
+ this.mMode = aValue;
+ break;
+ case 11:
+ this.mMaxHeat = aValue;
+ break;
+ }
return;
}
@@ -880,36 +789,29 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_3)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_3) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Computer_Cube)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Computer_Cube) };
}
- protected static final int DID_NOT_FIND_RECIPE = 0,
- FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS = 1,
+ protected static final int DID_NOT_FIND_RECIPE = 0, FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS = 1,
FOUND_AND_SUCCESSFULLY_USED_RECIPE = 2;
/**
* Calcualtes overclocked ness using long integers
- * @param aEUt - recipe EUt
- * @param aDuration - recipe Duration
+ *
+ * @param aEUt - recipe EUt
+ * @param aDuration - recipe Duration
*/
protected void calculateOverclockedNess(int aEUt, int aDuration) {
if (mTier == 0) {
@@ -935,9 +837,8 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
tempEUt <<= 2; // this actually controls overclocking
// xEUt *= 4;//this is effect of everclocking
mMaxProgress >>= 1; // this is effect of overclocking
- xEUt = mMaxProgress == 0
- ? xEUt >> 1
- : xEUt << 2; // U know, if the time is less than 1 tick make the machine use 2x less power
+ xEUt = mMaxProgress == 0 ? xEUt >> 1 : xEUt << 2; // U know, if the time is less than 1 tick make the
+ // machine use 2x less power
}
if (xEUt > Integer.MAX_VALUE - 1) {
mEU = Integer.MAX_VALUE - 1;
@@ -991,8 +892,7 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
return 2;
}
ItemData tData = GT_OreDictUnificator.getAssociation(aStack);
- if ((tData != null)
- && ((tData.mPrefix == OrePrefixes.dust) || (tData.mPrefix == OrePrefixes.cell))
+ if ((tData != null) && ((tData.mPrefix == OrePrefixes.dust) || (tData.mPrefix == OrePrefixes.cell))
&& (tData.mMaterial.mMaterial.mElement != null)
&& (!tData.mMaterial.mMaterial.mElement.mIsIsotope)
&& (tData.mMaterial.mMaterial != Materials.Magic)
@@ -1038,8 +938,11 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
aStack.stackSize -= 1;
this.mInventory[57] = GT_Utility.copyAmount(1L, getSpecialSlot());
- this.mInventory[57].setTagCompound(GT_Utility.getNBTContainingShort(
- new NBTTagCompound(), "map_id", (short) aStack.getItemDamage()));
+ this.mInventory[57].setTagCompound(
+ GT_Utility.getNBTContainingShort(
+ new NBTTagCompound(),
+ "map_id",
+ (short) aStack.getItemDamage()));
calculateOverclockedNess(30, 128);
// In case recipe is too OP for that machine
if (mMaxProgress == Integer.MAX_VALUE - 1 && mEU == Integer.MAX_VALUE - 1)
@@ -1134,361 +1037,306 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
break;
}
- builder.widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> {
- if (clickData.mouseButton == 0) {
- switchModeForward();
- } else if (clickData.mouseButton == 1) {
- switchModeBackward();
- }
- if (!widget.isClient()) {
- GT_UIInfos.openGTTileEntityUI(
- getBaseMetaTileEntity(), widget.getContext().getPlayer());
- }
- })
- .setBackground(GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_COMPUTER_MODE)
- .setPos(156 + (mMode == 5 ? 50 : 0), 4)
- .setSize(16, 16));
+ builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> {
+ if (clickData.mouseButton == 0) {
+ switchModeForward();
+ } else if (clickData.mouseButton == 1) {
+ switchModeBackward();
+ }
+ if (!widget.isClient()) {
+ GT_UIInfos.openGTTileEntityUI(getBaseMetaTileEntity(), widget.getContext().getPlayer());
+ }
+ }).setBackground(GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_COMPUTER_MODE)
+ .setPos(156 + (mMode == 5 ? 50 : 0), 4).setSize(16, 16));
}
private void addPage0(ModularWindow.Builder builder) {
- builder.widget(new DrawableWidget()
- .setDrawable(GTPP_UITextures.PICTURE_COMPUTER_TOP)
- .setPos(32, 4)
- .setSize(112, 76))
- .widget(new ProgressBar()
- .setProgress(() -> (float) getBaseMetaTileEntity().getStoredEU()
- / getBaseMetaTileEntity().getEUCapacity())
- .setTexture(GTPP_UITextures.PROGRESSBAR_COMPUTER_ENERGY, 96)
- .setDirection(ProgressBar.Direction.RIGHT)
- .setPos(44, 8)
- .setSize(96, 5))
- .widget(new TextWidget("Solaris 1.7.10")
- .setDefaultColor(Utils.rgbtoHexValue(100, 190, 255))
- .setPos(56, 70));
+ builder.widget(
+ new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_COMPUTER_TOP).setPos(32, 4).setSize(112, 76))
+ .widget(
+ new ProgressBar()
+ .setProgress(
+ () -> (float) getBaseMetaTileEntity().getStoredEU()
+ / getBaseMetaTileEntity().getEUCapacity())
+ .setTexture(GTPP_UITextures.PROGRESSBAR_COMPUTER_ENERGY, 96)
+ .setDirection(ProgressBar.Direction.RIGHT).setPos(44, 8).setSize(96, 5))
+ .widget(
+ new TextWidget("Solaris 1.7.10").setDefaultColor(Utils.rgbtoHexValue(100, 190, 255))
+ .setPos(56, 70));
}
private void addPage1(ModularWindow.Builder builder) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(4, 103)
- .setSize(150, 59))
- .widget(new DrawableWidget()
- .setDrawable(ModularUITextures.ITEM_SLOT)
- .setPos(4, 4)
- .setSize(146, 98))
- .widget(new DrawableWidget()
- .setDrawable(GTPP_UITextures.PICTURE_V202)
- .setPos(155, 103)
- .setSize(17, 5))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> saveNuclearReactor())
- .setBackground(GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_SAVE)
- .setPos(156, 54)
- .setSize(16, 16))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> loadNuclearReactor())
- .setBackground(GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_LOAD)
- .setPos(156, 70)
- .setSize(16, 16))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> switchNuclearReactor())
- .setBackground(
- GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_NUCLEAR_SWITCH)
- .setPos(156, 86)
- .setSize(16, 16));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(4, 103).setSize(150, 59))
+ .widget(new DrawableWidget().setDrawable(ModularUITextures.ITEM_SLOT).setPos(4, 4).setSize(146, 98))
+ .widget(new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_V202).setPos(155, 103).setSize(17, 5))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> saveNuclearReactor())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_SAVE)
+ .setPos(156, 54).setSize(16, 16))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> loadNuclearReactor())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_LOAD)
+ .setPos(156, 70).setSize(16, 16))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> switchNuclearReactor())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_NUCLEAR_SWITCH)
+ .setPos(156, 86).setSize(16, 16));
SlotWidget displaySlot = new NuclearSlotWidget(inventoryHandler, 54, null);
for (int i = 0; i < 9 * 6; i++) {
- builder.widget(new NuclearSlotWidget(inventoryHandler, i, displaySlot.getMcSlot())
- .setBackground(GT_UITextures.TRANSPARENT)
- .setPos(5 + (i % 9) * 16, 5 + (i / 9) * 16));
- }
- builder.widget(displaySlot
- .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ARROW_4)
- .setPos(152, 27));
- builder.widget(new TextWidget("Reactorstats:")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 108))
- .widget(TextWidget.dynamicString(() -> GT_Utility.formatNumbers(mEU) + "EU at " + mEUOut + "EU/t")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 120))
- .widget(TextWidget.dynamicString(() -> "HEM: " + (mHEM / 10000.0F))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 128))
- .widget(TextWidget.dynamicString(() ->
- GT_Utility.formatNumbers(mHeat) + "/" + GT_Utility.formatNumbers(mMaxHeat) + "Heat")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 136))
- .widget(TextWidget.dynamicString(() -> "Explosionpower: " + (mExplosionStrength / 100.0F))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 144))
- .widget(TextWidget.dynamicString(() -> "Runtime: " + ((mProgress > 0) ? (mProgress / 20) : 0) + "secs")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 152));
+ builder.widget(
+ new NuclearSlotWidget(inventoryHandler, i, displaySlot.getMcSlot())
+ .setBackground(GT_UITextures.TRANSPARENT).setPos(5 + (i % 9) * 16, 5 + (i / 9) * 16));
+ }
+ builder.widget(
+ displaySlot.setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ARROW_4)
+ .setPos(152, 27));
+ builder.widget(new TextWidget("Reactorstats:").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 108))
+ .widget(
+ TextWidget.dynamicString(() -> GT_Utility.formatNumbers(mEU) + "EU at " + mEUOut + "EU/t")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 120))
+ .widget(
+ TextWidget.dynamicString(() -> "HEM: " + (mHEM / 10000.0F))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 128))
+ .widget(
+ TextWidget.dynamicString(
+ () -> GT_Utility.formatNumbers(mHeat) + "/"
+ + GT_Utility.formatNumbers(mMaxHeat)
+ + "Heat")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 136))
+ .widget(
+ TextWidget.dynamicString(() -> "Explosionpower: " + (mExplosionStrength / 100.0F))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 144))
+ .widget(
+ TextWidget.dynamicString(() -> "Runtime: " + ((mProgress > 0) ? (mProgress / 20) : 0) + "secs")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 152));
}
private void addPage2(ModularWindow.Builder builder) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(48, 4)
- .setSize(81, 67));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(48, 4).setSize(81, 67));
builder.widget(new DataStickSlotWidget(inventoryHandler, 54).setPos(7, 27))
- .widget(new SlotWidget(inventoryHandler, 55)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_MICROSCOPE)
- .setPos(25, 27))
- .widget(new SlotWidget(inventoryHandler, 56)
- .setAccess(true, false)
- .setPos(133, 27))
- .widget(new SlotWidget(inventoryHandler, 57)
- .setAccess(true, false)
- .setPos(151, 27));
- builder.widget(new TextWidget("Scanner")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mProgress == 0)
+ .widget(
+ new SlotWidget(inventoryHandler, 55)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_MICROSCOPE)
+ .setPos(25, 27))
+ .widget(new SlotWidget(inventoryHandler, 56).setAccess(true, false).setPos(133, 27))
+ .widget(new SlotWidget(inventoryHandler, 57).setAccess(true, false).setPos(151, 27));
+ builder.widget(
+ new TextWidget("Scanner").setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mProgress == 0)
.setPos(51, 7))
- .widget(new TextWidget("Can be used to")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mProgress == 0)
- .setPos(51, 24))
- .widget(new TextWidget("scan things")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mProgress == 0)
- .setPos(51, 32))
- .widget(new TextWidget("Currently")
- .setDefaultColor(Utils.rgbtoHexValue(200, 20, 20))
- .setEnabled(widget -> mProgress == 0)
- .setPos(51, 48))
- .widget(new TextWidget("Disabled")
- .setDefaultColor(Utils.rgbtoHexValue(200, 20, 20))
- .setEnabled(widget -> mProgress == 0)
- .setPos(51, 56))
- .widget(new TextWidget("Progress:")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mProgress != 0)
- .setPos(51, 24))
- .widget(TextWidget.dynamicString(() -> MathUtils.findPercentage(
- mProgress, getBaseMetaTileEntity().getMaxProgress())
- + " %")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setEnabled(widget -> mProgress != 0)
- .setPos(51, 32))
+ .widget(
+ new TextWidget("Can be used to").setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setEnabled(widget -> mProgress == 0).setPos(51, 24))
+ .widget(
+ new TextWidget("scan things").setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setEnabled(widget -> mProgress == 0).setPos(51, 32))
+ .widget(
+ new TextWidget("Currently").setDefaultColor(Utils.rgbtoHexValue(200, 20, 20))
+ .setEnabled(widget -> mProgress == 0).setPos(51, 48))
+ .widget(
+ new TextWidget("Disabled").setDefaultColor(Utils.rgbtoHexValue(200, 20, 20))
+ .setEnabled(widget -> mProgress == 0).setPos(51, 56))
+ .widget(
+ new TextWidget("Progress:")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(
+ widget -> mProgress != 0)
+ .setPos(51, 24))
+ .widget(
+ TextWidget.dynamicString(
+ () -> MathUtils.findPercentage(mProgress, getBaseMetaTileEntity().getMaxProgress())
+ + " %")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mProgress != 0)
+ .setPos(51, 32))
.widget(new FakeSyncWidget.IntegerSyncer(() -> mProgress, val -> mProgress = val));
}
private void addPage3(ModularWindow.Builder builder) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(4, 4)
- .setSize(86, 41))
- .widget(new DrawableWidget()
- .setDrawable(GTPP_UITextures.PICTURE_ARROWS_SEPARATE)
- .setPos(110, 23)
- .setSize(40, 40))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> switchCentrifugePageBackward())
- .setBackground(GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_ARROW_LEFT)
- .setPos(88, 65)
- .setSize(16, 16))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> switchCentrifugePageForward())
- .setBackground(
- GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_ARROW_RIGHT)
- .setPos(104, 65)
- .setSize(16, 16))
- .widget(SlotWidget.phantom(inventoryHandler, 59)
- .disableInteraction()
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CENTRIFUGE)
- .setPos(121, 34))
- .widget(SlotWidget.phantom(inventoryHandler, 60)
- .disableInteraction()
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CANISTER)
- .setPos(91, 4))
- .widget(SlotWidget.phantom(inventoryHandler, 61)
- .disableInteraction()
- .setPos(121, 4))
- .widget(SlotWidget.phantom(inventoryHandler, 62)
- .disableInteraction()
- .setPos(151, 34))
- .widget(SlotWidget.phantom(inventoryHandler, 63)
- .disableInteraction()
- .setPos(121, 64))
- .widget(SlotWidget.phantom(inventoryHandler, 64)
- .disableInteraction()
- .setPos(91, 34))
- .widget(new TextWidget("Centrifuge")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 7))
- .widget(TextWidget.dynamicString(() ->
- "Recipe: " + (mMaxHeat + 1) + "/" + GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.size())
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 23))
- .widget(TextWidget.dynamicString(() -> "EU: " + GT_Utility.formatNumbers(mEU))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 31));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(4, 4).setSize(86, 41))
+ .widget(
+ new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ARROWS_SEPARATE).setPos(110, 23)
+ .setSize(40, 40))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> switchCentrifugePageBackward())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_ARROW_LEFT)
+ .setPos(88, 65).setSize(16, 16))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> switchCentrifugePageForward())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_ARROW_RIGHT)
+ .setPos(104, 65).setSize(16, 16))
+ .widget(
+ SlotWidget.phantom(inventoryHandler, 59).disableInteraction()
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CENTRIFUGE)
+ .setPos(121, 34))
+ .widget(
+ SlotWidget.phantom(inventoryHandler, 60).disableInteraction()
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CANISTER)
+ .setPos(91, 4))
+ .widget(SlotWidget.phantom(inventoryHandler, 61).disableInteraction().setPos(121, 4))
+ .widget(SlotWidget.phantom(inventoryHandler, 62).disableInteraction().setPos(151, 34))
+ .widget(SlotWidget.phantom(inventoryHandler, 63).disableInteraction().setPos(121, 64))
+ .widget(SlotWidget.phantom(inventoryHandler, 64).disableInteraction().setPos(91, 34))
+ .widget(new TextWidget("Centrifuge").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 7))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> "Recipe: " + (mMaxHeat + 1)
+ + "/"
+ + GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.size())
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 23))
+ .widget(
+ TextWidget.dynamicString(() -> "EU: " + GT_Utility.formatNumbers(mEU))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 31));
}
private void addPage4(ModularWindow.Builder builder) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(4, 4)
- .setSize(116, 61))
- .widget(new DrawableWidget()
- .setDrawable(GTPP_UITextures.PICTURE_ARROWS_FUSION)
- .setPos(121, 23)
- .setSize(29, 40))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> switchFusionPageBackward())
- .setBackground(GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_ARROW_LEFT)
- .setPos(88, 65)
- .setSize(16, 16))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> switchFusionPageForward())
- .setBackground(
- GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_ARROW_RIGHT)
- .setPos(104, 65)
- .setSize(16, 16))
- .widget(SlotWidget.phantom(inventoryHandler, 59)
- .disableInteraction()
- .setPos(121, 4))
- .widget(SlotWidget.phantom(inventoryHandler, 60)
- .disableInteraction()
- .setPos(121, 64))
- .widget(SlotWidget.phantom(inventoryHandler, 61)
- .disableInteraction()
- .setPos(151, 34))
- .widget(new TextWidget("Fusionreactor")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 7))
- .widget(TextWidget.dynamicString(() -> "Recipe: " + (mMaxHeat + 1) + "/"
- + GT_TileEntity_ComputerCube.sFusionReactorRecipes.size())
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 15))
- .widget(TextWidget.dynamicString(() -> "Start: " + GT_Utility.formatNumbers(mEU) + "EU")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 23))
- .widget(TextWidget.dynamicString(() -> "EU/t: " + GT_Utility.formatNumbers(mEUOut))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 31))
- .widget(TextWidget.dynamicString(() -> GT_Utility.formatNumbers(mHeat) + " Ticks")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 39))
- .widget(TextWidget.dynamicString(() -> GT_TileEntity_ComputerCube.sFusionReactorRecipes
- .get(mMaxHeat)
- .mFluidOutputs[0]
- .getLocalizedName())
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 55))
- .widget(TextWidget.dynamicString(() -> mEUOut < 0
- ? "IN: " + GT_Utility.formatNumbers(-mEUOut * mHeat) + "EU"
- : "OUT: " + GT_Utility.formatNumbers(mEUOut * mHeat) + "EU")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 47));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(4, 4).setSize(116, 61))
+ .widget(
+ new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ARROWS_FUSION).setPos(121, 23)
+ .setSize(29, 40))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> switchFusionPageBackward())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_ARROW_LEFT)
+ .setPos(88, 65).setSize(16, 16))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> switchFusionPageForward())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_ARROW_RIGHT)
+ .setPos(104, 65).setSize(16, 16))
+ .widget(SlotWidget.phantom(inventoryHandler, 59).disableInteraction().setPos(121, 4))
+ .widget(SlotWidget.phantom(inventoryHandler, 60).disableInteraction().setPos(121, 64))
+ .widget(SlotWidget.phantom(inventoryHandler, 61).disableInteraction().setPos(151, 34))
+ .widget(new TextWidget("Fusionreactor").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 7))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> "Recipe: " + (mMaxHeat + 1)
+ + "/"
+ + GT_TileEntity_ComputerCube.sFusionReactorRecipes.size())
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 15))
+ .widget(
+ TextWidget.dynamicString(() -> "Start: " + GT_Utility.formatNumbers(mEU) + "EU")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 23))
+ .widget(
+ TextWidget.dynamicString(() -> "EU/t: " + GT_Utility.formatNumbers(mEUOut))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 31))
+ .widget(
+ TextWidget.dynamicString(() -> GT_Utility.formatNumbers(mHeat) + " Ticks")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 39))
+ .widget(
+ TextWidget.dynamicString(
+ () -> GT_TileEntity_ComputerCube.sFusionReactorRecipes.get(mMaxHeat).mFluidOutputs[0]
+ .getLocalizedName())
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 55))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> mEUOut < 0 ? "IN: " + GT_Utility.formatNumbers(-mEUOut * mHeat) + "EU"
+ : "OUT: " + GT_Utility.formatNumbers(mEUOut * mHeat) + "EU")
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 47));
}
private void addPage5(ModularWindow.Builder builder) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(4, 4)
- .setSize(200, 141))
- .widget(new DrawableWidget()
- .setDrawable(() -> mExplosionStrength != 0 ? GTPP_UITextures.PICTURE_COMPUTER_GRID : null)
- .setPos(152, 6)
- .setSize(50, 50))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> switchDescriptionPageBackward())
- .setBackground(GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_ARROW_LEFT)
- .setPos(190, 146)
- .setSize(16, 16))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> switchDescriptionPageForward())
- .setBackground(
- GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_ARROW_RIGHT)
- .setPos(206, 146)
- .setSize(16, 16));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(4, 4).setSize(200, 141))
+ .widget(
+ new DrawableWidget()
+ .setDrawable(
+ () -> mExplosionStrength != 0 ? GTPP_UITextures.PICTURE_COMPUTER_GRID : null)
+ .setPos(152, 6).setSize(50, 50))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> switchDescriptionPageBackward())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_ARROW_LEFT)
+ .setPos(190, 146).setSize(16, 16))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> switchDescriptionPageForward())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_ARROW_RIGHT)
+ .setPos(206, 146).setSize(16, 16));
for (int i = 0; i < 5; i++) {
- builder.widget(SlotWidget.phantom(inventoryHandler, i + 59)
- .disableInteraction()
- .setPos(205, 37 + i * 18));
+ builder.widget(SlotWidget.phantom(inventoryHandler, i + 59).disableInteraction().setPos(205, 37 + i * 18));
}
for (int i = 0; i < 9; i++) {
- builder.widget(SlotWidget.phantom(inventoryHandler, i + 64)
- .disableInteraction()
- .setBackground(GT_UITextures.TRANSPARENT)
- .setPos(152 + (i % 3) * 16, 6 + (i / 3) * 16));
+ builder.widget(
+ SlotWidget.phantom(inventoryHandler, i + 64).disableInteraction()
+ .setBackground(GT_UITextures.TRANSPARENT).setPos(152 + (i % 3) * 16, 6 + (i / 3) * 16));
}
int descriptionMaxLines = GT_Computercube_Description.sDescriptions.stream()
- .sorted((d1, d2) -> d2.mDescription.length - d1.mDescription.length)
- .collect(Collectors.toList())
- .get(0)
- .mDescription
- .length;
+ .sorted((d1, d2) -> d2.mDescription.length - d1.mDescription.length).collect(Collectors.toList())
+ .get(0).mDescription.length;
for (int i = 0; i < descriptionMaxLines; i++) {
final int index = i;
builder.widget(TextWidget.dynamicString(() -> {
- if (mMaxHeat >= 0 && mMaxHeat < GT_Computercube_Description.sDescriptions.size()) {
- String[] descriptions =
- GT_Computercube_Description.sDescriptions.get(mMaxHeat).mDescription;
- if (index < descriptions.length) {
- return descriptions[index];
- }
- }
- return "";
- })
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 7 + index * 8));
+ if (mMaxHeat >= 0 && mMaxHeat < GT_Computercube_Description.sDescriptions.size()) {
+ String[] descriptions = GT_Computercube_Description.sDescriptions.get(mMaxHeat).mDescription;
+ if (index < descriptions.length) {
+ return descriptions[index];
+ }
+ }
+ return "";
+ }).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 7 + index * 8));
}
}
private void addPage6(ModularWindow.Builder builder) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(4, 4)
- .setSize(86, 41))
- .widget(new DrawableWidget()
- .setDrawable(GTPP_UITextures.PICTURE_ARROWS_SEPARATE)
- .setPos(110, 23)
- .setSize(40, 40))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> switchElectrolyzerPageBackward())
- .setBackground(GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_ARROW_LEFT)
- .setPos(88, 65)
- .setSize(16, 16))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> switchElectrolyzerPageForward())
- .setBackground(
- GTPP_UITextures.BUTTON_STANDARD_16x16, GTPP_UITextures.OVERLAY_BUTTON_ARROW_RIGHT)
- .setPos(104, 65)
- .setSize(16, 16))
- .widget(SlotWidget.phantom(inventoryHandler, 59)
- .disableInteraction()
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CHARGER)
- .setPos(121, 34))
- .widget(SlotWidget.phantom(inventoryHandler, 60)
- .disableInteraction()
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CANISTER)
- .setPos(91, 4))
- .widget(SlotWidget.phantom(inventoryHandler, 61)
- .disableInteraction()
- .setPos(121, 4))
- .widget(SlotWidget.phantom(inventoryHandler, 62)
- .disableInteraction()
- .setPos(151, 34))
- .widget(SlotWidget.phantom(inventoryHandler, 63)
- .disableInteraction()
- .setPos(121, 64))
- .widget(SlotWidget.phantom(inventoryHandler, 64)
- .disableInteraction()
- .setPos(91, 34))
- .widget(new TextWidget("Electrolyzer")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 7))
- .widget(TextWidget.dynamicString(() -> "Recipe: " + (mMaxHeat + 1) + "/"
- + GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.size())
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 23))
- .widget(TextWidget.dynamicString(() -> "EU: " + GT_Utility.formatNumbers(mEU))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(7, 31));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(4, 4).setSize(86, 41))
+ .widget(
+ new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ARROWS_SEPARATE).setPos(110, 23)
+ .setSize(40, 40))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> switchElectrolyzerPageBackward())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_ARROW_LEFT)
+ .setPos(88, 65).setSize(16, 16))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> switchElectrolyzerPageForward())
+ .setBackground(
+ GTPP_UITextures.BUTTON_STANDARD_16x16,
+ GTPP_UITextures.OVERLAY_BUTTON_ARROW_RIGHT)
+ .setPos(104, 65).setSize(16, 16))
+ .widget(
+ SlotWidget.phantom(inventoryHandler, 59).disableInteraction()
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CHARGER)
+ .setPos(121, 34))
+ .widget(
+ SlotWidget.phantom(inventoryHandler, 60).disableInteraction()
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CANISTER)
+ .setPos(91, 4))
+ .widget(SlotWidget.phantom(inventoryHandler, 61).disableInteraction().setPos(121, 4))
+ .widget(SlotWidget.phantom(inventoryHandler, 62).disableInteraction().setPos(151, 34))
+ .widget(SlotWidget.phantom(inventoryHandler, 63).disableInteraction().setPos(121, 64))
+ .widget(SlotWidget.phantom(inventoryHandler, 64).disableInteraction().setPos(91, 34))
+ .widget(new TextWidget("Electrolyzer").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 7))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> "Recipe: " + (mMaxHeat + 1)
+ + "/"
+ + GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.size())
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 23))
+ .widget(
+ TextWidget.dynamicString(() -> "EU: " + GT_Utility.formatNumbers(mEU))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 31));
}
private class NuclearSlotWidget extends SlotWidget {
@@ -1521,10 +1369,7 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
if (tStack == null) {
if (displaySlot.getStack() != null && aSlotIndex != 58) {
tSlot.putStack(displaySlot.getStack().copy());
- getSimulator()
- .slotClick(
- aSlotIndex,
- new GT_ItemStack(displaySlot.getStack().copy()));
+ getSimulator().slotClick(aSlotIndex, new GT_ItemStack(displaySlot.getStack().copy()));
} else {
tSlot.putStack(new ItemStack(GT_TileEntity_ComputerCube.sReactorList.get(0).mItem, 1));
getSimulator().slotClick(aSlotIndex, GT_TileEntity_ComputerCube.sReactorList.get(0));
@@ -1535,9 +1380,11 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank impl
if (GT_TileEntity_ComputerCube.sReactorList.get(i - 1).mItem == tStack.getItem()) {
tSlot.putStack(new ItemStack(GT_TileEntity_ComputerCube.sReactorList.get(i).mItem, 1, 0));
getSimulator().slotClick(aSlotIndex, GT_TileEntity_ComputerCube.sReactorList.get(i));
- /*if (tSlot.getStack() != null && tSlot.getStack().getItem() == GT_ModHandler.getIC2Item("reactorIsotopeCell", 1).getItem()) {
- tSlot.getStack().setItemDamage(tSlot.getStack().getMaxDamage() - 1);
- }*/
+ /*
+ * if (tSlot.getStack() != null && tSlot.getStack().getItem() ==
+ * GT_ModHandler.getIC2Item("reactorIsotopeCell", 1).getItem()) {
+ * tSlot.getStack().setItemDamage(tSlot.getStack().getMaxDamage() - 1); }
+ */
return;
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
index 5360ba612a..b690e56107 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.misc;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -11,9 +15,6 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_SolarTower;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock {
@@ -23,28 +24,19 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
private int mTX, mTY, mTZ;
private Byte mRequiredFacing;
- public TileEntitySolarHeater(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final int aSlotCount) {
+ public TileEntitySolarHeater(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final String aDescription, final int aSlotCount) {
super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
}
- public TileEntitySolarHeater(
- final String aName,
- final int aTier,
- final String aDescription,
- final ITexture[][][] aTextures,
- final int aSlotCount) {
+ public TileEntitySolarHeater(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures, final int aSlotCount) {
super(aName, aTier, aSlotCount, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, "Point me at a Solar Tower", CORE.GT_Tooltip};
+ return new String[] { this.mDescription, "Point me at a Solar Tower", CORE.GT_Tooltip };
}
@Override
@@ -66,79 +58,57 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
- };
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV)
- };
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
- };
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
- };
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV)
- };
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
- new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
- };
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+ new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV) };
}
@Override
@@ -158,7 +128,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
@Override
public String[] getInfoData() {
- return new String[] {this.getLocalName(), "Testificate"};
+ return new String[] { this.getLocalName(), "Testificate" };
}
@Override
@@ -247,25 +217,19 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
@Override
public void saveNBTData(NBTTagCompound aNBT) {
- /*aNBT.setBoolean("mHasTower", mHasTower);
- if (this.mHasTower) {
- aNBT.setInteger("mTX", mTX);
- aNBT.setInteger("mTY", mTY);
- aNBT.setInteger("mTZ", mTZ);
- }*/
+ /*
+ * aNBT.setBoolean("mHasTower", mHasTower); if (this.mHasTower) { aNBT.setInteger("mTX", mTX);
+ * aNBT.setInteger("mTY", mTY); aNBT.setInteger("mTZ", mTZ); }
+ */
}
@Override
public void loadNBTData(NBTTagCompound aNBT) {
- /*this.mHasTower = aNBT.getBoolean("mHasTower");
- if (this.mHasTower) {
- if (aNBT.hasKey("mTX"))
- this.mTX = aNBT.getInteger("mTX");
- if (aNBT.hasKey("mTY"))
- this.mTY = aNBT.getInteger("mTY");
- if (aNBT.hasKey("mTZ"))
- this.mTZ = aNBT.getInteger("mTZ");
- }*/
+ /*
+ * this.mHasTower = aNBT.getBoolean("mHasTower"); if (this.mHasTower) { if (aNBT.hasKey("mTX")) this.mTX =
+ * aNBT.getInteger("mTX"); if (aNBT.hasKey("mTY")) this.mTY = aNBT.getInteger("mTY"); if (aNBT.hasKey("mTZ"))
+ * this.mTZ = aNBT.getInteger("mTZ"); }
+ */
}
@Override
@@ -298,12 +262,10 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
}
public boolean canSeeSky() {
- if (this.getBaseMetaTileEntity()
- .getWorld()
- .canBlockSeeTheSky(
- this.getBaseMetaTileEntity().getXCoord(),
- this.getBaseMetaTileEntity().getYCoord() + 1,
- this.getBaseMetaTileEntity().getZCoord())) {
+ if (this.getBaseMetaTileEntity().getWorld().canBlockSeeTheSky(
+ this.getBaseMetaTileEntity().getXCoord(),
+ this.getBaseMetaTileEntity().getYCoord() + 1,
+ this.getBaseMetaTileEntity().getZCoord())) {
return true;
}
return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
index 9846813ba0..f160bc1eba 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
@@ -1,47 +1,36 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.redstone;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
import gregtech.api.objects.GT_ItemStack;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_TieredMachineBlock {
protected int mOpenerCount;
- public GT_MetaTileEntity_RedstoneBase(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- int aInvSlotCount,
- String aDescription,
- ITexture... aTextures) {
+ public GT_MetaTileEntity_RedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+ String aDescription, ITexture... aTextures) {
super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
}
- public GT_MetaTileEntity_RedstoneBase(
- int aID,
- String aName,
- String aNameRegional,
- int aTier,
- int aInvSlotCount,
- String[] aDescription,
- ITexture... aTextures) {
+ public GT_MetaTileEntity_RedstoneBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount,
+ String[] aDescription, ITexture... aTextures) {
super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
}
- public GT_MetaTileEntity_RedstoneBase(
- String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_RedstoneBase(String aName, int aTier, int aInvSlotCount, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aInvSlotCount, aDescription, aTextures);
}
- public GT_MetaTileEntity_RedstoneBase(
- String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_RedstoneBase(String aName, int aTier, int aInvSlotCount, String[] aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aInvSlotCount, aDescription, aTextures);
}
@@ -117,6 +106,6 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, CORE.GT_Tooltip};
+ return new String[] { this.mDescription, CORE.GT_Tooltip };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
index 3cf868a998..187fafb4b7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.redstone;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -8,8 +11,6 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_RedstoneBase {
@@ -33,8 +34,8 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
"Right-click with Screwdriver to change Button Design");
}
- public GT_MetaTileEntity_RedstoneButtonPanel(
- final String aName, String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_RedstoneButtonPanel(final String aName, String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, 5, 0, aDescription, aTextures);
}
@@ -67,8 +68,8 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
}
@Override
- public boolean onRightclick(
- IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
+ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX,
+ float aY, float aZ) {
if (aSide == getBaseMetaTileEntity().getFrontFacing()) {
if (getBaseMetaTileEntity().isServerSide()) {
mUpdate = 2;
@@ -98,24 +99,24 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
switch (aSide) {
case 0:
case 1:
- mRedstoneStrength =
- (byte) (mRedstoneStrength ^ (1 << (((byte) (aX * 2) + 2 * (byte) (aZ * 2)))));
+ mRedstoneStrength = (byte) (mRedstoneStrength
+ ^ (1 << (((byte) (aX * 2) + 2 * (byte) (aZ * 2)))));
break;
case 2:
- mRedstoneStrength = (byte)
- (mRedstoneStrength ^ (1 << (((byte) (2 - aX * 2) + 2 * (byte) (2 - aY * 2)))));
+ mRedstoneStrength = (byte) (mRedstoneStrength
+ ^ (1 << (((byte) (2 - aX * 2) + 2 * (byte) (2 - aY * 2)))));
break;
case 3:
- mRedstoneStrength = (byte)
- (mRedstoneStrength ^ (1 << (((byte) (aX * 2) + 2 * (byte) (2 - aY * 2)))));
+ mRedstoneStrength = (byte) (mRedstoneStrength
+ ^ (1 << (((byte) (aX * 2) + 2 * (byte) (2 - aY * 2)))));
break;
case 4:
- mRedstoneStrength = (byte)
- (mRedstoneStrength ^ (1 << (((byte) (aZ * 2) + 2 * (byte) (2 - aY * 2)))));
+ mRedstoneStrength = (byte) (mRedstoneStrength
+ ^ (1 << (((byte) (aZ * 2) + 2 * (byte) (2 - aY * 2)))));
break;
case 5:
- mRedstoneStrength = (byte)
- (mRedstoneStrength ^ (1 << (((byte) (2 - aZ * 2) + 2 * (byte) (2 - aY * 2)))));
+ mRedstoneStrength = (byte) (mRedstoneStrength
+ ^ (1 << (((byte) (2 - aZ * 2) + 2 * (byte) (2 - aY * 2)))));
break;
}
break;
@@ -156,12 +157,12 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
mRedstoneStrength = 0;
}
for (byte i = 0; i < 6; i++) {
- getBaseMetaTileEntity()
- .setStrongOutputRedstoneSignal(
- i, i == getBaseMetaTileEntity().getFrontFacing() ? (byte) 0 : mRedstoneStrength);
- getBaseMetaTileEntity()
- .setInternalOutputRedstoneSignal(
- i, i == getBaseMetaTileEntity().getFrontFacing() ? (byte) 0 : mRedstoneStrength);
+ getBaseMetaTileEntity().setStrongOutputRedstoneSignal(
+ i,
+ i == getBaseMetaTileEntity().getFrontFacing() ? (byte) 0 : mRedstoneStrength);
+ getBaseMetaTileEntity().setInternalOutputRedstoneSignal(
+ i,
+ i == getBaseMetaTileEntity().getFrontFacing() ? (byte) 0 : mRedstoneStrength);
}
}
}
@@ -190,72 +191,48 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == aFacing) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
- new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
+ new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
}
- return this.mTextures[
- (aActive || hasRedstoneSignal() ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_Off)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_Off) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_On)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_On) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_On)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_On) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_Off)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_Off) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_On)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_On) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
index 64efa84154..15e0dd65cc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
@@ -1,5 +1,14 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.redstone;
+import java.util.*;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.oredict.OreDictionary;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
@@ -8,6 +17,7 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.gui.modularui.GT_UIInfos;
@@ -23,26 +33,19 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.*;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.util.*;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.oredict.OreDictionary;
public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_RedstoneBase
implements IRedstoneCircuitBlock, IAddUIWidgets {
- public int mGate = 0, mGateData[] = new int[] {0, 0, 0, 0, 0, 0, 0, 0};
+ public int mGate = 0, mGateData[] = new int[] { 0, 0, 0, 0, 0, 0, 0, 0 };
public boolean bOutput = true;
public GT_MetaTileEntity_RedstoneCircuitBlock(int aID) {
super(aID, "redstone.circuit", "Redstone Circuit Block", 1, 5, "Computes Redstone");
}
- public GT_MetaTileEntity_RedstoneCircuitBlock(
- final String aName, String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_RedstoneCircuitBlock(final String aName, String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, 1, 5, aDescription, aTextures);
}
@@ -142,7 +145,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
public void loadNBTData(NBTTagCompound aNBT) {
mGate = aNBT.getInteger("mGate");
mGateData = aNBT.getIntArray("mGateData");
- if (mGateData.length != 8) mGateData = new int[] {0, 0, 0, 0, 0, 0, 0, 0};
+ if (mGateData.length != 8) mGateData = new int[] { 0, 0, 0, 0, 0, 0, 0, 0 };
}
public void switchGateForward(boolean aShift) {
@@ -209,23 +212,21 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
resetRedstone();
for (int i = 0; i < mGateData.length; i++) mGateData[i] = 0;
GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tBehaviour != null)
- try {
- tBehaviour.initParameters(mGateData, this);
- } catch (Throwable e) {
- GT_Log.err.print(e);
- }
+ if (tBehaviour != null) try {
+ tBehaviour.initParameters(mGateData, this);
+ } catch (Throwable e) {
+ GT_Log.err.print(e);
+ }
validateGateData();
}
private void validateGateData() {
GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tBehaviour != null)
- try {
- tBehaviour.validateParameters(mGateData, this);
- } catch (Throwable e) {
- GT_Log.err.print(e);
- }
+ if (tBehaviour != null) try {
+ tBehaviour.validateParameters(mGateData, this);
+ } catch (Throwable e) {
+ GT_Log.err.print(e);
+ }
}
@Override
@@ -335,21 +336,12 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
return false;
}
- /* @Override
- public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
- if (aSide == getOutputFacing()) {
- if (aSide == 0)
- return aRedstone ? 56 : 54;
- if (aSide == 1)
- return aRedstone ? 53 : 52;
- return aRedstone ? 94 : 93;
- }
- if (aSide == 0)
- return aRedstone ? 60 : 59;
- if (aSide == 1)
- return aRedstone ? 58 : 57;
- return aRedstone ? 62 : 61;
- }*/
+ /*
+ * @Override public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { if (aSide ==
+ * getOutputFacing()) { if (aSide == 0) return aRedstone ? 56 : 54; if (aSide == 1) return aRedstone ? 53 : 52;
+ * return aRedstone ? 94 : 93; } if (aSide == 0) return aRedstone ? 60 : 59; if (aSide == 1) return aRedstone ? 58 :
+ * 57; return aRedstone ? 62 : 61; }
+ */
@Override
public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
@@ -430,21 +422,11 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive || hasRedstoneSignal() ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
private GT_RenderedTexture getBase() {
@@ -452,43 +434,37 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off)};
+ return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On)};
+ return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- getBase(),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off),
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red)
- };
+ return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off),
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) };
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- getBase(),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On),
- new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone)
- };
+ return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On),
+ new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off)};
+ return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On)};
+ return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off)};
+ return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On)};
+ return new ITexture[] { getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) };
}
@Override
@@ -498,61 +474,44 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new DrawableWidget()
- .setDrawable(GTPP_UITextures.PICTURE_REDSTONE_CIRCUIT_SCREEN)
- .setPos(43, 5)
- .setSize(108, 72));
+ builder.widget(
+ new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_REDSTONE_CIRCUIT_SCREEN).setPos(43, 5)
+ .setSize(108, 72));
for (int i = 0; i < 4; i++) {
final int index = i;
- builder.widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> {
- ItemStack tStack = widget.getContext()
- .getPlayer()
- .inventory
- .getItemStack();
- if (tStack == null) {
- changeGateData(
- index,
- clickData.mouseButton == 0
- ? clickData.shift ? +128 : +1
- : clickData.shift ? -128 : -1);
- } else {
- tStack = GT_Utility.copy(tStack);
- if (clickData.mouseButton != 0) tStack.setItemDamage(OreDictionary.WILDCARD_VALUE);
- stackGateData(index, tStack);
- }
- })
- .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_PLUS_MINUS)
- .setPos(7, 5 + i * 18)
- .setSize(18, 18))
- .widget(SlotWidget.phantom(inventoryHandler, i + 1)
- .disableInteraction()
- .setPos(25, 5 + i * 18));
+ builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> {
+ ItemStack tStack = widget.getContext().getPlayer().inventory.getItemStack();
+ if (tStack == null) {
+ changeGateData(
+ index,
+ clickData.mouseButton == 0 ? clickData.shift ? +128 : +1 : clickData.shift ? -128 : -1);
+ } else {
+ tStack = GT_Utility.copy(tStack);
+ if (clickData.mouseButton != 0) tStack.setItemDamage(OreDictionary.WILDCARD_VALUE);
+ stackGateData(index, tStack);
+ }
+ }).setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_PLUS_MINUS)
+ .setPos(7, 5 + i * 18).setSize(18, 18))
+ .widget(SlotWidget.phantom(inventoryHandler, i + 1).disableInteraction().setPos(25, 5 + i * 18));
}
- builder.widget(new CycleButtonWidget()
- .setToggle(() -> bOutput, val -> bOutput = val)
+ builder.widget(
+ new CycleButtonWidget().setToggle(() -> bOutput, val -> bOutput = val)
.setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
- .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY)
- .addTooltip("Toggle EU Output")
- .setPos(151, 5)
- .setSize(18, 18))
- .widget(new CycleButtonWidget()
- .setToggle(() -> getBaseMetaTileEntity().isActive(), val -> getBaseMetaTileEntity()
- .setActive(val))
- .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
- .setStaticTexture(GTPP_UITextures.OVERLAY_BUTTON_ACTIVE_STATE)
- .addTooltip("Toggle Active State")
- .setPos(151, 23)
- .setSize(18, 18))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> {
- if (clickData.mouseButton == 0) switchGateForward(clickData.shift);
- else switchGateBackward(clickData.shift);
- })
- .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_CHANGE_MODE)
- .addTooltip("Change Redstone Circuit")
- .setPos(151, 41)
- .setSize(18, 18));
+ .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY).addTooltip("Toggle EU Output")
+ .setPos(151, 5).setSize(18, 18))
+ .widget(
+ new CycleButtonWidget()
+ .setToggle(
+ () -> getBaseMetaTileEntity().isActive(),
+ val -> getBaseMetaTileEntity().setActive(val))
+ .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+ .setStaticTexture(GTPP_UITextures.OVERLAY_BUTTON_ACTIVE_STATE)
+ .addTooltip("Toggle Active State").setPos(151, 23).setSize(18, 18))
+ .widget(new ButtonWidget().setOnClick((clickData, widget) -> {
+ if (clickData.mouseButton == 0) switchGateForward(clickData.shift);
+ else switchGateBackward(clickData.shift);
+ }).setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_CHANGE_MODE)
+ .addTooltip("Change Redstone Circuit").setPos(151, 41).setSize(18, 18));
builder.widget(new FakeSyncWidget.IntegerSyncer(() -> mGate, val -> mGate = val));
for (int i = 0; i < mGateData.length; i++) {
@@ -560,115 +519,82 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
builder.widget(new FakeSyncWidget.IntegerSyncer(() -> mGateData[index], val -> mGateData[index] = val));
}
- builder.widget(new DrawableWidget()
- .setDrawable(() -> {
- if (getBaseMetaTileEntity().getErrorDisplayID() > 0) {
- if ((getBaseMetaTileEntity().getTimer() / 5) % 2 == 0) {
- return GTPP_UITextures.PICTURE_ELECTRICITY_ERROR;
- } else {
- return null;
- }
- } else {
- return GTPP_UITextures.PICTURE_ELECTRICITY_FINE;
- }
- })
- .setPos(140, 9)
- .setSize(7, 7))
- .widget(new FakeSyncWidget.IntegerSyncer(
+ builder.widget(new DrawableWidget().setDrawable(() -> {
+ if (getBaseMetaTileEntity().getErrorDisplayID() > 0) {
+ if ((getBaseMetaTileEntity().getTimer() / 5) % 2 == 0) {
+ return GTPP_UITextures.PICTURE_ELECTRICITY_ERROR;
+ } else {
+ return null;
+ }
+ } else {
+ return GTPP_UITextures.PICTURE_ELECTRICITY_FINE;
+ }
+ }).setPos(140, 9).setSize(7, 7)).widget(
+ new FakeSyncWidget.IntegerSyncer(
() -> getBaseMetaTileEntity().getErrorDisplayID(),
val -> getBaseMetaTileEntity().setErrorDisplayID(val)));
builder.widget(TextWidget.dynamicString(() -> {
- GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tCircuit != null) return tCircuit.getName();
- return "";
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(46, 8))
+ GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+ if (tCircuit != null) return tCircuit.getName();
+ return "";
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 8))
.widget(TextWidget.dynamicString(() -> {
- GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tCircuit != null) return tCircuit.getDescription();
- return "";
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(46, 19))
+ GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+ if (tCircuit != null) return tCircuit.getDescription();
+ return "";
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 19))
.widget(TextWidget.dynamicString(() -> {
- GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 0);
- return "";
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(46, 33))
+ GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+ if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 0);
+ return "";
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 33))
.widget(TextWidget.dynamicString(() -> {
- GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 1);
- return "";
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(46, 44))
+ GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+ if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 1);
+ return "";
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 44))
.widget(TextWidget.dynamicString(() -> {
- GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 2);
- return "";
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(46, 55))
+ GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+ if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 2);
+ return "";
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 55))
.widget(TextWidget.dynamicString(() -> {
- GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 3);
- return "";
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(46, 66))
+ GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+ if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 3);
+ return "";
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 66))
.widget(TextWidget.dynamicString(() -> {
- GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tCircuit != null) {
- String tString = tCircuit.getDataDisplay(mGateData, 0);
- return tString == null ? GT_Utility.parseNumberToString(mGateData[0]) : tString;
- }
- return "";
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(99, 33))
+ GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+ if (tCircuit != null) {
+ String tString = tCircuit.getDataDisplay(mGateData, 0);
+ return tString == null ? GT_Utility.parseNumberToString(mGateData[0]) : tString;
+ }
+ return "";
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(99, 33))
.widget(TextWidget.dynamicString(() -> {
- GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tCircuit != null) {
- String tString = tCircuit.getDataDisplay(mGateData, 1);
- return tString == null ? GT_Utility.parseNumberToString(mGateData[1]) : tString;
- }
- return "";
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(99, 44))
+ GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+ if (tCircuit != null) {
+ String tString = tCircuit.getDataDisplay(mGateData, 1);
+ return tString == null ? GT_Utility.parseNumberToString(mGateData[1]) : tString;
+ }
+ return "";
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(99, 44))
.widget(TextWidget.dynamicString(() -> {
- GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tCircuit != null) {
- String tString = tCircuit.getDataDisplay(mGateData, 2);
- return tString == null ? GT_Utility.parseNumberToString(mGateData[2]) : tString;
- }
- return "";
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(99, 55))
+ GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+ if (tCircuit != null) {
+ String tString = tCircuit.getDataDisplay(mGateData, 2);
+ return tString == null ? GT_Utility.parseNumberToString(mGateData[2]) : tString;
+ }
+ return "";
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(99, 55))
.widget(TextWidget.dynamicString(() -> {
- GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
- if (tCircuit != null) {
- String tString = tCircuit.getDataDisplay(mGateData, 3);
- return tString == null ? GT_Utility.parseNumberToString(mGateData[3]) : tString;
- }
- return "";
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(99, 66));
+ GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+ if (tCircuit != null) {
+ String tString = tCircuit.getDataDisplay(mGateData, 3);
+ return tString == null ? GT_Utility.parseNumberToString(mGateData[3]) : tString;
+ }
+ return "";
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(99, 66));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
index dfb844654b..6413f59508 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
@@ -1,12 +1,13 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.redstone;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.objects.GT_RenderedTexture;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
-import net.minecraft.nbt.NBTTagCompound;
public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBase {
@@ -56,21 +57,16 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
return this.mTextures[(aActive ? 1 : 0)][aColorIndex + 1];
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(sIconList[0])};
+ return new ITexture[] { new GT_RenderedTexture(sIconList[0]) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(sIconList[1])};
+ return new ITexture[] { new GT_RenderedTexture(sIconList[1]) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
index 3b07f8b3ff..286b79ca3b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.redstone;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -8,8 +11,6 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity_RedstoneBase {
@@ -26,8 +27,8 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
super(aID, aUnlocal, aLocal, 5, 0, aDescription);
}
- public GT_MetaTileEntity_RedstoneStrengthDisplay(
- final String aName, String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_RedstoneStrengthDisplay(final String aName, String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, 5, 0, aDescription, aTextures);
}
@@ -67,24 +68,20 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
}
}
- /*@Override
- public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
- if (aSide == 0)
- return aRedstone ? 60 : 59;
- if (aSide == 1)
- return aRedstone ? 58 : 57;
- return aRedstone ? 62 : 61;
- }*/
+ /*
+ * @Override public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { if (aSide ==
+ * 0) return aRedstone ? 60 : 59; if (aSide == 1) return aRedstone ? 58 : 57; return aRedstone ? 62 : 61; }
+ */
@Override
public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
if (aSide == getBaseMetaTileEntity().getFrontFacing()) mType = (byte) ((mType + 1) % 6);
}
- /*@Override
- public IIcon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
- return aSide == aFacing ? sIconList[mType * 16 + mRedstoneStrength] : null;
- }*/
+ /*
+ * @Override public IIcon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { return
+ * aSide == aFacing ? sIconList[mType * 16 + mRedstoneStrength] : null; }
+ */
@Override
public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
@@ -105,72 +102,48 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == aFacing) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
- new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
+ new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
}
- return this.mTextures[
- (aActive || hasRedstoneSignal() ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1]};
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1] };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
index 8945f3f7b5..ff65ebfe91 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.redstone;
+import net.minecraft.entity.player.EntityPlayer;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -8,7 +10,6 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
-import net.minecraft.entity.player.EntityPlayer;
public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_RedstoneStrengthDisplay {
@@ -24,8 +25,8 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R
super(aID, "redstone.display.scale", "Redstone Scale", "Redstone Strength on a Scale");
}
- public GT_MetaTileEntity_RedstoneStrengthScale(
- final String aName, String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_RedstoneStrengthScale(final String aName, String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aDescription, aTextures);
}
@@ -40,26 +41,14 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == aFacing) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
- new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength])
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
+ new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength]) };
}
- return this.mTextures[
- (aActive || hasRedstoneSignal() ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ return this.mTextures[(aActive || hasRedstoneSignal() ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
index 0b12373236..95363c9bb8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
@@ -1,5 +1,16 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.storage;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.PacketBuffer;
+
import com.gtnewhorizons.modularui.api.drawable.IDrawable;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
@@ -9,6 +20,7 @@ import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
import com.gtnewhorizons.modularui.common.widget.SlotGroup;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.gui.modularui.GT_UITextures;
@@ -28,15 +40,6 @@ import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import gtPlusPlus.xmod.gregtech.api.gui.widget.ElectricSlotWidget;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.PacketBuffer;
public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_BasicTank implements IAddGregtechLogo {
@@ -44,14 +47,14 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
protected String mLocalName;
- public GT_MetaTileEntity_AdvancedCraftingTable(
- final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription) {
+ public GT_MetaTileEntity_AdvancedCraftingTable(final int aID, final String aName, final String aNameRegional,
+ final int aTier, final String aDescription) {
super(aID, aName, aNameRegional, aTier, 35, aDescription);
mLocalName = aNameRegional;
}
- public GT_MetaTileEntity_AdvancedCraftingTable(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_AdvancedCraftingTable(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 35, aDescription, aTextures);
}
@@ -172,40 +175,37 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
}
public void sortIntoTheInputSlots() {
- for (byte i = 21; i < 30; i++)
- if (mInventory[i] != null) {
- if (mInventory[i].stackSize == 0) {
- mInventory[i] = null;
+ for (byte i = 21; i < 30; i++) if (mInventory[i] != null) {
+ if (mInventory[i].stackSize == 0) {
+ mInventory[i] = null;
+ }
+ if (mInventory[i] != null) for (byte j = 0; j < 16; j++) {
+ if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j])) {
+ GT_Utility.moveStackFromSlotAToSlotB(
+ getBaseMetaTileEntity(),
+ getBaseMetaTileEntity(),
+ i,
+ j,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
}
- if (mInventory[i] != null)
- for (byte j = 0; j < 16; j++) {
- if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j])) {
- GT_Utility.moveStackFromSlotAToSlotB(
- getBaseMetaTileEntity(),
- getBaseMetaTileEntity(),
- i,
- j,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- }
- }
- if (mInventory[i] != null)
- for (byte j = 0; j < 16; j++) {
- if (mInventory[j] == null) {
- GT_Utility.moveStackFromSlotAToSlotB(
- getBaseMetaTileEntity(),
- getBaseMetaTileEntity(),
- i,
- j,
- (byte) 64,
- (byte) 1,
- (byte) 64,
- (byte) 1);
- }
- }
}
+ if (mInventory[i] != null) for (byte j = 0; j < 16; j++) {
+ if (mInventory[j] == null) {
+ GT_Utility.moveStackFromSlotAToSlotB(
+ getBaseMetaTileEntity(),
+ getBaseMetaTileEntity(),
+ i,
+ j,
+ (byte) 64,
+ (byte) 1,
+ (byte) 64,
+ (byte) 1);
+ }
+ }
+ }
}
private void fillLiquidContainers() {
@@ -215,21 +215,19 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
if (mInventory[i].stackSize == 1) {
mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount * tOutput.stackSize;
mInventory[i] = tOutput;
- } else
- for (byte j = 16; j < 21; j++) {
- if (mInventory[j] == null
- || (GT_Utility.areStacksEqual(tOutput, mInventory[j])
- && mInventory[j].stackSize + tOutput.stackSize <= tOutput.getMaxStackSize())) {
- mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount * tOutput.stackSize;
- getBaseMetaTileEntity().decrStackSize(i, 1);
- if (mInventory[j] == null) {
- mInventory[j] = tOutput;
- } else {
- mInventory[j].stackSize++;
- }
- break;
+ } else for (byte j = 16; j < 21; j++) {
+ if (mInventory[j] == null || (GT_Utility.areStacksEqual(tOutput, mInventory[j])
+ && mInventory[j].stackSize + tOutput.stackSize <= tOutput.getMaxStackSize())) {
+ mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount * tOutput.stackSize;
+ getBaseMetaTileEntity().decrStackSize(i, 1);
+ if (mInventory[j] == null) {
+ mInventory[j] = tOutput;
+ } else {
+ mInventory[j].stackSize++;
}
+ break;
}
+ }
if (mFluid != null && mFluid.amount <= 0) mFluid = null;
}
}
@@ -241,17 +239,19 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
aStack = mInventory[30];
Logger.INFO("Using Slot 30 supply.");
}
- if (mInventory[31] == null
- || aStack == null
+ if (mInventory[31] == null || aStack == null
|| aStack.getItem() == null
|| aStack.getItemDamage() != 0
|| aStack.stackSize != 1
|| !(aStack.getItem() instanceof ItemBlueprint)) {
try {
- Logger.INFO("Could not set Blueprint. Slot 31: "
- + (mInventory[31] != null ? mInventory[31].getDisplayName() : "Null")
- + ", aStack: " + (aStack != null ? aStack.getDisplayName() : "Null")
- + ", Damage: " + (aStack != null ? aStack.getItemDamage() : "Null"));
+ Logger.INFO(
+ "Could not set Blueprint. Slot 31: "
+ + (mInventory[31] != null ? mInventory[31].getDisplayName() : "Null")
+ + ", aStack: "
+ + (aStack != null ? aStack.getDisplayName() : "Null")
+ + ", Damage: "
+ + (aStack != null ? aStack.getItemDamage() : "Null"));
} catch (Throwable t) {
t.printStackTrace();
}
@@ -281,8 +281,7 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
}
public ItemStack getCraftingOutput() {
- if (mInventory[30] != null
- && mInventory[30].getItem() != null
+ if (mInventory[30] != null && mInventory[30].getItem() != null
&& mInventory[30].getItemDamage() == 0
&& mInventory[30].hasTagCompound()
&& mInventory[30].getItem() instanceof ItemBlueprint) {
@@ -298,12 +297,10 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
}
}
}
- mInventory[31] =
- GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), new ItemStack[] {
- mInventory[21], mInventory[22], mInventory[23],
- mInventory[24], mInventory[25], mInventory[26],
- mInventory[27], mInventory[28], mInventory[29]
- });
+ mInventory[31] = GT_ModHandler.getAllRecipeOutput(
+ getBaseMetaTileEntity().getWorld(),
+ new ItemStack[] { mInventory[21], mInventory[22], mInventory[23], mInventory[24], mInventory[25],
+ mInventory[26], mInventory[27], mInventory[28], mInventory[29] });
return mInventory[31];
}
@@ -351,41 +348,38 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
if (!GT_Utility.areStacksEqual(aHoldStack, mInventory[31])) return aHoldStack;
if (aHoldStack.stackSize + mInventory[31].stackSize > aHoldStack.getMaxStackSize()) return aHoldStack;
}
- for (byte i = 21; i < 30; i++)
- if (mInventory[i] != null) {
- for (byte j = 0; j <= i; j++) {
- if (j < 21 || j == i) {
- if (GT_Utility.areStacksOrToolsEqual(mInventory[i], mInventory[j])
- && mInventory[j].stackSize > 0) {
- ItemStack tStack = GT_Utility.getContainerItem(mInventory[j], true);
- if (tStack == null
- || (tStack.isItemStackDamageable()
- && tStack.getItemDamage() >= tStack.getMaxDamage())) {
- getBaseMetaTileEntity().decrStackSize(j, 1);
- } else if (mInventory[j].stackSize == 1) {
- mInventory[j] = tStack;
- } else {
- getBaseMetaTileEntity().decrStackSize(j, 1);
- for (byte k = 0; k < 21; k++) {
- if (mInventory[k] == null) {
- mInventory[k] = tStack;
- break;
- } else {
- if (GT_Utility.areStacksEqual(tStack, mInventory[k])) {
- if (tStack.stackSize + mInventory[k].stackSize
- <= mInventory[k].getMaxStackSize()) {
- mInventory[k].stackSize += tStack.stackSize;
- break;
- }
+ for (byte i = 21; i < 30; i++) if (mInventory[i] != null) {
+ for (byte j = 0; j <= i; j++) {
+ if (j < 21 || j == i) {
+ if (GT_Utility.areStacksOrToolsEqual(mInventory[i], mInventory[j]) && mInventory[j].stackSize > 0) {
+ ItemStack tStack = GT_Utility.getContainerItem(mInventory[j], true);
+ if (tStack == null || (tStack.isItemStackDamageable()
+ && tStack.getItemDamage() >= tStack.getMaxDamage())) {
+ getBaseMetaTileEntity().decrStackSize(j, 1);
+ } else if (mInventory[j].stackSize == 1) {
+ mInventory[j] = tStack;
+ } else {
+ getBaseMetaTileEntity().decrStackSize(j, 1);
+ for (byte k = 0; k < 21; k++) {
+ if (mInventory[k] == null) {
+ mInventory[k] = tStack;
+ break;
+ } else {
+ if (GT_Utility.areStacksEqual(tStack, mInventory[k])) {
+ if (tStack.stackSize + mInventory[k].stackSize
+ <= mInventory[k].getMaxStackSize()) {
+ mInventory[k].stackSize += tStack.stackSize;
+ break;
}
}
}
}
- break;
}
+ break;
}
}
}
+ }
if (aHoldStack == null) {
aHoldStack = GT_Utility.copy(mInventory[31]);
aHoldStack.onCrafting(getBaseMetaTileEntity().getWorld(), aPlayer, mInventory[31].stackSize);
@@ -465,22 +459,16 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
}
}
}
- /*if (aTick % 100 == 0) {
- for (int i = 0; i < this.mInventory.length; i++) {
- ItemStack aSlot = mInventory[i];
- Logger.INFO("Slot "+i+" "+(aSlot != null ? "contains "+aSlot.getDisplayName() : "is empty"));
- }
- }*/
+ /*
+ * if (aTick % 100 == 0) { for (int i = 0; i < this.mInventory.length; i++) { ItemStack aSlot = mInventory[i];
+ * Logger.INFO("Slot "+i+" "+(aSlot != null ? "contains "+aSlot.getDisplayName() : "is empty")); } }
+ */
}
@Override
public String[] getDescription() {
- return new String[] {
- isAdvanced() ? "For the very large Projects" : "For the smaller Projects",
- "Hold Shift in GUI to see slot usage",
- this.mDescription,
- CORE.GT_Tooltip
- };
+ return new String[] { isAdvanced() ? "For the very large Projects" : "For the smaller Projects",
+ "Hold Shift in GUI to see slot usage", this.mDescription, CORE.GT_Tooltip };
}
@Override
@@ -506,67 +494,41 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- isAdvanced()
- ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
- : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side)
- };
+ return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
+ : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side) };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- isAdvanced()
- ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
- : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side)
- };
+ return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
+ : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- isAdvanced()
- ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Bottom)
- : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Bottom)
- };
+ return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Bottom)
+ : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Bottom) };
}
public ITexture[] getTop(final byte aColor) {
if (isAdvanced()) {
- return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Top),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
- };
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Top),
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) };
} else {
- return new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Top),
- new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Crafting_Overlay)
- };
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Top),
+ new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Crafting_Overlay) };
}
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- isAdvanced()
- ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
- : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side)
- };
+ return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
+ : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side) };
}
@Override
@@ -579,139 +541,115 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 4)
- .endAtSlot(15)
- .background(getGUITextureSet().getItemSlot())
- .build()
- .setPos(7, 7));
+ builder.widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 4).endAtSlot(15).background(getGUITextureSet().getItemSlot())
+ .build().setPos(7, 7));
for (int i = 0; i < 5; i++) {
builder.widget(createElectricSlot(i + 16).setPos(81 + i * 18, 7));
}
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 3)
- .startFromSlot(21)
- .endAtSlot(29)
- .background(getGUITextureSet().getItemSlot())
- .applyForWidget(SlotWidget::disableShiftInsert)
- .build()
- .setPos(81, 27));
- builder.widget(new SlotWidget(inventoryHandler, 33)
- .disableShiftInsert()
- .addTooltipShift("Extraction Slot")
+ builder.widget(
+ SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(21).endAtSlot(29)
+ .background(getGUITextureSet().getItemSlot()).applyForWidget(SlotWidget::disableShiftInsert)
+ .build().setPos(81, 27));
+ builder.widget(
+ new SlotWidget(inventoryHandler, 33).disableShiftInsert().addTooltipShift("Extraction Slot")
.addTooltipShift("Things can always be pulled from here")
- .setBackground(getGUITextureSet().getItemSlot(), getArrowOverlay())
- .setPos(153, 27))
- .widget(new SlotWidget(inventoryHandler, 34)
- .disableShiftInsert()
- .addTooltipShift("Free Parking")
- .setBackground(getGUITextureSet().getItemSlot(), getParkOverlay())
- .setPos(153, 63));
+ .setBackground(getGUITextureSet().getItemSlot(), getArrowOverlay()).setPos(153, 27))
+ .widget(
+ new SlotWidget(inventoryHandler, 34).disableShiftInsert().addTooltipShift("Free Parking")
+ .setBackground(getGUITextureSet().getItemSlot(), getParkOverlay()).setPos(153, 63));
+
+ builder.widget(new SlotWidget(inventoryHandler, 30) {
+
+ @Override
+ public ClickResult onClick(int buttonId, boolean doubleClick) {
+ if (buttonId == 0 && Interactable.hasShiftDown()) {
+ syncToServer(99, NetworkUtils.EMPTY_PACKET);
+ return ClickResult.SUCCESS;
+ }
+ return super.onClick(buttonId, doubleClick);
+ }
- builder.widget(
- new SlotWidget(inventoryHandler, 30) {
- @Override
- public ClickResult onClick(int buttonId, boolean doubleClick) {
- if (buttonId == 0 && Interactable.hasShiftDown()) {
- syncToServer(99, NetworkUtils.EMPTY_PACKET);
- return ClickResult.SUCCESS;
+ @Override
+ public void readOnServer(int id, PacketBuffer buf) throws IOException {
+ if (id == 99) {
+ setBluePrint(null);
+ } else {
+ super.readOnServer(id, buf);
+ }
+ }
+ }.setFilter(stack -> stack.getItem() instanceof IItemBlueprint).disableShiftInsert()
+ .addTooltipShift("Blueprint Slot").addTooltipShift("Shift+Lmb Sets to crafting output")
+ .setBackground(getGUITextureSet().getItemSlot(), getBlueprintOverlay()).setPos(135, 27));
+
+ builder.widget(new SlotWidget(BaseSlot.phantom(inventoryHandler, 31)) {
+
+ @Override
+ protected void phantomClick(ClickData clickData, ItemStack cursorStack) {
+ EntityPlayer aPlayer = getContext().getPlayer();
+ ItemStack tStack = getMcSlot().getStack();
+ if (tStack == null) return;
+ if (tStack.stackSize <= 0 && !GT_Utility.areStacksEqual(tStack, aPlayer.inventory.getItemStack())) {
+ return;
+ }
+ ItemStack tStack2, tCraftedStack = getCraftingOutput();
+ if (tCraftedStack != null) {
+ if (clickData.shift) {
+ for (byte i = 0; i < aPlayer.inventory.mainInventory.length; i++) {
+ for (byte j = 0; j < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize
+ && canDoCraftingOutput(); j++) {
+ if (!GT_Utility.areStacksEqual(tStack2 = getCraftingOutput(), tCraftedStack)
+ || tStack.stackSize != tStack2.stackSize)
+ return;
+ aPlayer.inventory.mainInventory[i] = consumeMaterials(
+ aPlayer,
+ aPlayer.inventory.mainInventory[i]);
+ }
}
- return super.onClick(buttonId, doubleClick);
- }
-
- @Override
- public void readOnServer(int id, PacketBuffer buf) throws IOException {
- if (id == 99) {
- setBluePrint(null);
+ } else {
+ if (clickData.mouseButton == 0) {
+ if (canDoCraftingOutput()) aPlayer.inventory
+ .setItemStack(consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
} else {
- super.readOnServer(id, buf);
- }
- }
- }.setFilter(stack -> stack.getItem() instanceof IItemBlueprint)
- .disableShiftInsert()
- .addTooltipShift("Blueprint Slot")
- .addTooltipShift("Shift+Lmb Sets to crafting output")
- .setBackground(getGUITextureSet().getItemSlot(), getBlueprintOverlay())
- .setPos(135, 27));
-
- builder.widget(
- new SlotWidget(BaseSlot.phantom(inventoryHandler, 31)) {
- @Override
- protected void phantomClick(ClickData clickData, ItemStack cursorStack) {
- EntityPlayer aPlayer = getContext().getPlayer();
- ItemStack tStack = getMcSlot().getStack();
- if (tStack == null) return;
- if (tStack.stackSize <= 0
- && !GT_Utility.areStacksEqual(tStack, aPlayer.inventory.getItemStack())) {
- return;
- }
- ItemStack tStack2, tCraftedStack = getCraftingOutput();
- if (tCraftedStack != null) {
- if (clickData.shift) {
- for (byte i = 0; i < aPlayer.inventory.mainInventory.length; i++) {
- for (byte j = 0;
- j < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize
- && canDoCraftingOutput();
- j++) {
- if (!GT_Utility.areStacksEqual(tStack2 = getCraftingOutput(), tCraftedStack)
- || tStack.stackSize != tStack2.stackSize) return;
- aPlayer.inventory.mainInventory[i] =
- consumeMaterials(aPlayer, aPlayer.inventory.mainInventory[i]);
- }
- }
- } else {
- if (clickData.mouseButton == 0) {
- if (canDoCraftingOutput())
- aPlayer.inventory.setItemStack(
- consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
- } else {
- for (int i = 0;
- i < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize
- && canDoCraftingOutput();
- i++) {
- if (!GT_Utility.areStacksEqual(tStack2 = getCraftingOutput(), tCraftedStack)
- || tStack.stackSize != tStack2.stackSize) return;
- aPlayer.inventory.setItemStack(
- consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
- }
- }
+ for (int i = 0; i < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize
+ && canDoCraftingOutput(); i++) {
+ if (!GT_Utility.areStacksEqual(tStack2 = getCraftingOutput(), tCraftedStack)
+ || tStack.stackSize != tStack2.stackSize)
+ return;
+ aPlayer.inventory
+ .setItemStack(consumeMaterials(aPlayer, aPlayer.inventory.getItemStack()));
}
}
}
+ }
+ }
- @Override
- public boolean handleDragAndDrop(ItemStack draggedStack, int button) {
- return false;
- }
+ @Override
+ public boolean handleDragAndDrop(ItemStack draggedStack, int button) {
+ return false;
+ }
- @Override
- public List<String> getExtraTooltip() {
- return Collections.emptyList();
- }
- }.setAccess(false, false)
- .setHandlePhantomActionClient(true)
- .addTooltipShift("Output Slot")
- .setBackground(getGUITextureSet().getItemSlot(), getCraftOutputOverlay())
- .setPos(135, 63));
-
- builder.widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> sortIntoTheInputSlots())
- .addTooltipShift("Flush")
+ @Override
+ public List<String> getExtraTooltip() {
+ return Collections.emptyList();
+ }
+ }.setAccess(false, false).setHandlePhantomActionClient(true).addTooltipShift("Output Slot")
+ .setBackground(getGUITextureSet().getItemSlot(), getCraftOutputOverlay()).setPos(135, 63));
+
+ builder.widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> sortIntoTheInputSlots()).addTooltipShift("Flush")
.addTooltipShift("Empty crafting grid back to storage")
- .setBackground(getButtonIcon(), getFlushOverlay())
- .setPos(135, 45)
- .setSize(18, 18))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> mFlushMode = true)
- .addTooltipShift("Automation")
- .addTooltipShift("Allows output while")
- .addTooltipShift("crafting grid is full")
- .setBackground(getButtonIcon(), GTPP_UITextures.OVERLAY_BUTTON_AUTOMATION)
- .setPos(153, 45)
- .setSize(18, 18));
+ .setBackground(getButtonIcon(), getFlushOverlay()).setPos(135, 45).setSize(18, 18))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> mFlushMode = true)
+ .addTooltipShift("Automation").addTooltipShift("Allows output while")
+ .addTooltipShift("crafting grid is full")
+ .setBackground(getButtonIcon(), GTPP_UITextures.OVERLAY_BUTTON_AUTOMATION)
+ .setPos(153, 45).setSize(18, 18));
}
protected SlotWidget createElectricSlot(int index) {
- return (SlotWidget) new ElectricSlotWidget(inventoryHandler, index)
- .setShiftClickPriority(-1)
+ return (SlotWidget) new ElectricSlotWidget(inventoryHandler, index).setShiftClickPriority(-1)
.setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ELECTRIC_TOOL);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java
index eae9bb79ba..a28c4d90a3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.storage;
import com.gtnewhorizons.modularui.api.drawable.IDrawable;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.SteamVariant;
import gregtech.api.gui.modularui.GUITextureSet;
@@ -13,13 +14,13 @@ import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
public class GT_MetaTileEntity_BronzeCraftingTable extends GT_MetaTileEntity_AdvancedCraftingTable {
- public GT_MetaTileEntity_BronzeCraftingTable(
- final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription) {
+ public GT_MetaTileEntity_BronzeCraftingTable(final int aID, final String aName, final String aNameRegional,
+ final int aTier, final String aDescription) {
super(aID, aName, aNameRegional, aTier, aDescription);
}
- public GT_MetaTileEntity_BronzeCraftingTable(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_BronzeCraftingTable(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@@ -76,8 +77,7 @@ public class GT_MetaTileEntity_BronzeCraftingTable extends GT_MetaTileEntity_Adv
@Override
protected SlotWidget createElectricSlot(int index) {
- return (SlotWidget) new SlotWidget(inventoryHandler, index)
- .setBackground(getGUITextureSet().getItemSlot());
+ return (SlotWidget) new SlotWidget(inventoryHandler, index).setBackground(getGUITextureSet().getItemSlot());
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
index 2c29a0a00b..b51eae3131 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
@@ -1,10 +1,17 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.storage;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.Textures.BlockIcons;
import gregtech.api.gui.modularui.GT_UIInfos;
@@ -22,20 +29,13 @@ import gtPlusPlus.api.objects.minecraft.BlockPos;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.data.ArrayUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_TieredMachineBlock implements IAddUIWidgets {
- /*sides.put(getUp());
- sides.put(getDown());
- sides.put(getXPos());
- sides.put(getXNeg());
- sides.put(getZPos());
- sides.put(getZNeg());*/
+ /*
+ * sides.put(getUp()); sides.put(getDown()); sides.put(getXPos()); sides.put(getXNeg()); sides.put(getZPos());
+ * sides.put(getZNeg());
+ */
public int mItemCount = 0;
public ItemStack mItemStack = null;
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
public static final int SIDE_XNeg = 3;
public static final int SIDE_ZPos = 4;
public static final int SIDE_ZNeg = 5;
- public static final int[] SIDES = new int[] {SIDE_Up, SIDE_Down, SIDE_XPos, SIDE_XNeg, SIDE_ZPos, SIDE_ZNeg};
+ public static final int[] SIDES = new int[] { SIDE_Up, SIDE_Down, SIDE_XPos, SIDE_XNeg, SIDE_ZPos, SIDE_ZNeg };
// Neighbour Cache
private GT_MetaTileEntity_ConnectableCrate[] mNeighbourCache = new GT_MetaTileEntity_ConnectableCrate[6];
@@ -62,7 +62,7 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
// Is Master?
protected boolean mIsMaster = false;
// Is Connected?
- protected boolean mIsConnected[] = new boolean[] {false, false, false, false, false, false};
+ protected boolean mIsConnected[] = new boolean[] { false, false, false, false, false, false };
// How many are connected?
protected int mConnectedCount = 0;
// Map of connected locations
@@ -85,7 +85,7 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, CORE.GT_Tooltip};
+ return new String[] { this.mDescription, CORE.GT_Tooltip };
}
public boolean isSimpleMachine() {
@@ -187,10 +187,8 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
// Other Crate was not a Master, but we are, time to inherit it into our connection hivemind.
else {
// It would appear this controller has another master, time to query it.
- if (e.mMasterCrateLocation != null
- && !e.mMasterCrateLocation
- .getUniqueIdentifier()
- .equalsIgnoreCase(this.mMasterCrateLocation.getUniqueIdentifier())) {
+ if (e.mMasterCrateLocation != null && !e.mMasterCrateLocation.getUniqueIdentifier()
+ .equalsIgnoreCase(this.mMasterCrateLocation.getUniqueIdentifier())) {
GT_MetaTileEntity_ConnectableCrate gM = getCrateAtBlockPos(e.mMasterCrateLocation);
if (gM != null) {
// Lets compare controller strengths
@@ -207,8 +205,8 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
if (!this.mIsConnected[e4]) {
this.mIsConnected[e4] = true;
}
- this.mConnectedCache =
- ArrayUtils.mergeTwoMaps(this.mConnectedCache, gM.mConnectedCache);
+ this.mConnectedCache = ArrayUtils
+ .mergeTwoMaps(this.mConnectedCache, gM.mConnectedCache);
continue;
}
// We lost, time to submit to a new master crate
@@ -221,8 +219,8 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
if (!e.mIsConnected[getOppositeSide(e4)]) {
e.mIsConnected[getOppositeSide(e4)] = true;
}
- gM.mConnectedCache =
- ArrayUtils.mergeTwoMaps(gM.mConnectedCache, this.mConnectedCache);
+ gM.mConnectedCache = ArrayUtils
+ .mergeTwoMaps(gM.mConnectedCache, this.mConnectedCache);
// Best wipe our cache of connected blocks then, since they no longer hold
// value.
mConnectedCache.clear();
@@ -332,14 +330,10 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
}
private boolean checkSideForDataType(int aType, int aSide) {
- BlockPos mPosToCheck = aSide == SIDE_Up
- ? mCurrentPos.getUp()
- : aSide == SIDE_Down
- ? mCurrentPos.getDown()
- : aSide == SIDE_XPos
- ? mCurrentPos.getXPos()
- : aSide == SIDE_XNeg
- ? mCurrentPos.getXNeg()
+ BlockPos mPosToCheck = aSide == SIDE_Up ? mCurrentPos.getUp()
+ : aSide == SIDE_Down ? mCurrentPos.getDown()
+ : aSide == SIDE_XPos ? mCurrentPos.getXPos()
+ : aSide == SIDE_XNeg ? mCurrentPos.getXNeg()
: aSide == SIDE_ZPos ? mCurrentPos.getZPos() : mCurrentPos.getZNeg();
GT_MetaTileEntity_ConnectableCrate g = getCrateAtBlockPos(mPosToCheck);
if (g != null) {
@@ -383,8 +377,7 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
}
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
- if (this.getBaseMetaTileEntity().isServerSide()
- && this.getBaseMetaTileEntity().isAllowedToWork()) {
+ if (this.getBaseMetaTileEntity().isServerSide() && this.getBaseMetaTileEntity().isAllowedToWork()) {
if (this.getItemCount() <= 0) {
this.mItemStack = null;
this.mItemCount = 0;
@@ -394,8 +387,7 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
this.mItemStack = this.mInventory[0].copy();
}
- if (this.mInventory[0] != null
- && this.mItemCount < this.getMaxItemCount()
+ if (this.mInventory[0] != null && this.mItemCount < this.getMaxItemCount()
&& GT_Utility.areStacksEqual(this.mInventory[0], this.mItemStack)) {
this.mItemCount += this.mInventory[0].stackSize;
if (this.mItemCount > this.getMaxItemCount()) {
@@ -410,14 +402,14 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
this.mInventory[1] = this.mItemStack.copy();
this.mInventory[1].stackSize = Math.min(this.mItemStack.getMaxStackSize(), this.mItemCount);
this.mItemCount -= this.mInventory[1].stackSize;
- } else if (this.mItemCount > 0
- && GT_Utility.areStacksEqual(this.mInventory[1], this.mItemStack)
+ } else if (this.mItemCount > 0 && GT_Utility.areStacksEqual(this.mInventory[1], this.mItemStack)
&& this.mInventory[1].getMaxStackSize() > this.mInventory[1].stackSize) {
- int tmp =
- Math.min(this.mItemCount, this.mInventory[1].getMaxStackSize() - this.mInventory[1].stackSize);
- this.mInventory[1].stackSize += tmp;
- this.mItemCount -= tmp;
- }
+ int tmp = Math.min(
+ this.mItemCount,
+ this.mInventory[1].getMaxStackSize() - this.mInventory[1].stackSize);
+ this.mInventory[1].stackSize += tmp;
+ this.mItemCount -= tmp;
+ }
if (this.mItemStack != null) {
this.mInventory[2] = this.mItemStack.copy();
@@ -437,8 +429,7 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
}
public int getProgresstime() {
- return this.mItemCount
- + (this.mInventory[0] == null ? 0 : this.mInventory[0].stackSize)
+ return this.mItemCount + (this.mInventory[0] == null ? 0 : this.mInventory[0].stackSize)
+ (this.mInventory[1] == null ? 0 : this.mInventory[1].stackSize);
}
@@ -460,20 +451,10 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
public String[] getInfoData() {
return this.mItemStack == null
- ? new String[] {
- "Super Storage Chest",
- "Stored Items:",
- "No Items",
- Integer.toString(0),
- Integer.toString(this.getMaxItemCount())
- }
- : new String[] {
- "Super Storage Chest",
- "Stored Items:",
- this.mItemStack.getDisplayName(),
- Integer.toString(this.mItemCount),
- Integer.toString(this.getMaxItemCount())
- };
+ ? new String[] { "Super Storage Chest", "Stored Items:", "No Items", Integer.toString(0),
+ Integer.toString(this.getMaxItemCount()) }
+ : new String[] { "Super Storage Chest", "Stored Items:", this.mItemStack.getDisplayName(),
+ Integer.toString(this.mItemCount), Integer.toString(this.getMaxItemCount()) };
}
public boolean isGivingInformation() {
@@ -518,24 +499,15 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
}
}
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
return aBaseMetaTileEntity.getFrontFacing() == 0 && aSide == 4
- ? new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON),
- new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
- }
+ ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON),
+ new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST) }
: (aSide == aBaseMetaTileEntity.getFrontFacing()
- ? new ITexture[] {
- new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON),
- new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
- }
- : new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON)});
+ ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON),
+ new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST) }
+ : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON) });
}
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
@@ -567,26 +539,21 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(7, 16)
- .setSize(71, 45))
- .widget(new SlotWidget(inventoryHandler, 0)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
- .setPos(79, 16))
- .widget(new SlotWidget(inventoryHandler, 1)
- .setAccess(true, false)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
- .setPos(79, 52))
- .widget(SlotWidget.phantom(inventoryHandler, 2)
- .disableInteraction()
- .setBackground(GT_UITextures.TRANSPARENT)
- .setPos(59, 42))
- .widget(new TextWidget("Item Amount")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 20))
- .widget(TextWidget.dynamicString(() -> GT_Utility.parseNumberToString(mItemCount))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 30));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(7, 16).setSize(71, 45))
+ .widget(
+ new SlotWidget(inventoryHandler, 0)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
+ .setPos(79, 16))
+ .widget(
+ new SlotWidget(inventoryHandler, 1).setAccess(true, false)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+ .setPos(79, 52))
+ .widget(
+ SlotWidget.phantom(inventoryHandler, 2).disableInteraction()
+ .setBackground(GT_UITextures.TRANSPARENT).setPos(59, 42))
+ .widget(new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 20)).widget(
+ TextWidget.dynamicString(() -> GT_Utility.parseNumberToString(mItemCount))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 30));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
index eb5541ef82..103e0a159f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
@@ -1,10 +1,15 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.storage;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.enums.Textures.BlockIcons;
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.gui.modularui.GT_UITextures;
@@ -16,11 +21,9 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachi
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachineBlock implements IAddUIWidgets {
+
public int mItemCount = 0;
public ItemStack mItemStack = null;
private static final double mStorageFactor = (270000.0D / 16);
@@ -40,13 +43,14 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
super(aName, aTier, 3, aDescription, aTextures);
}
- /*public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
- super(aName, aTier, 3, aDescription, aTextures);
- }*/
+ /*
+ * public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+ * super(aName, aTier, 3, aDescription, aTextures); }
+ */
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, CORE.GT_Tooltip};
+ return new String[] { this.mDescription, CORE.GT_Tooltip };
}
public boolean isSimpleMachine() {
@@ -75,8 +79,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
}
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
- if (this.getBaseMetaTileEntity().isServerSide()
- && this.getBaseMetaTileEntity().isAllowedToWork()) {
+ if (this.getBaseMetaTileEntity().isServerSide() && this.getBaseMetaTileEntity().isAllowedToWork()) {
if (this.getItemCount() <= 0) {
this.mItemStack = null;
this.mItemCount = 0;
@@ -86,8 +89,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
this.mItemStack = this.mInventory[0].copy();
}
- if (this.mInventory[0] != null
- && this.mItemCount < this.getMaxItemCount()
+ if (this.mInventory[0] != null && this.mItemCount < this.getMaxItemCount()
&& GT_Utility.areStacksEqual(this.mInventory[0], this.mItemStack)) {
this.mItemCount += this.mInventory[0].stackSize;
if (this.mItemCount > this.getMaxItemCount()) {
@@ -102,14 +104,14 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
this.mInventory[1] = this.mItemStack.copy();
this.mInventory[1].stackSize = Math.min(this.mItemStack.getMaxStackSize(), this.mItemCount);
this.mItemCount -= this.mInventory[1].stackSize;
- } else if (this.mItemCount > 0
- && GT_Utility.areStacksEqual(this.mInventory[1], this.mItemStack)
+ } else if (this.mItemCount > 0 && GT_Utility.areStacksEqual(this.mInventory[1], this.mItemStack)
&& this.mInventory[1].getMaxStackSize() > this.mInventory[1].stackSize) {
- int tmp =
- Math.min(this.mItemCount, this.mInventory[1].getMaxStackSize() - this.mInventory[1].stackSize);
- this.mInventory[1].stackSize += tmp;
- this.mItemCount -= tmp;
- }
+ int tmp = Math.min(
+ this.mItemCount,
+ this.mInventory[1].getMaxStackSize() - this.mInventory[1].stackSize);
+ this.mInventory[1].stackSize += tmp;
+ this.mItemCount -= tmp;
+ }
if (this.mItemStack != null) {
this.mInventory[2] = this.mItemStack.copy();
@@ -129,8 +131,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
}
public int getProgresstime() {
- return this.mItemCount
- + (this.mInventory[0] == null ? 0 : this.mInventory[0].stackSize)
+ return this.mItemCount + (this.mInventory[0] == null ? 0 : this.mInventory[0].stackSize)
+ (this.mInventory[1] == null ? 0 : this.mInventory[1].stackSize);
}
@@ -152,20 +153,10 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
public String[] getInfoData() {
return this.mItemStack == null
- ? new String[] {
- "Super Storage Chest",
- "Stored Items:",
- "No Items",
- Integer.toString(0),
- Integer.toString(this.getMaxItemCount())
- }
- : new String[] {
- "Super Storage Chest",
- "Stored Items:",
- this.mItemStack.getDisplayName(),
- Integer.toString(this.mItemCount),
- Integer.toString(this.getMaxItemCount())
- };
+ ? new String[] { "Super Storage Chest", "Stored Items:", "No Items", Integer.toString(0),
+ Integer.toString(this.getMaxItemCount()) }
+ : new String[] { "Super Storage Chest", "Stored Items:", this.mItemStack.getDisplayName(),
+ Integer.toString(this.mItemCount), Integer.toString(this.getMaxItemCount()) };
}
public boolean isGivingInformation() {
@@ -189,24 +180,15 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
}
}
- public ITexture[] getTexture(
- IGregTechTileEntity aBaseMetaTileEntity,
- byte aSide,
- byte aFacing,
- byte aColorIndex,
- boolean aActive,
- boolean aRedstone) {
+ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
+ boolean aActive, boolean aRedstone) {
return aBaseMetaTileEntity.getFrontFacing() == 0 && aSide == 4
- ? new ITexture[] {
- BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
- new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
- }
+ ? new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
+ new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST) }
: (aSide == aBaseMetaTileEntity.getFrontFacing()
- ? new ITexture[] {
- BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
- new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
- }
- : new ITexture[] {BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1]});
+ ? new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
+ new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST) }
+ : new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1] });
}
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
@@ -220,26 +202,21 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(7, 16)
- .setSize(71, 45))
- .widget(new SlotWidget(inventoryHandler, 0)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
- .setPos(79, 16))
- .widget(new SlotWidget(inventoryHandler, 1)
- .setAccess(true, false)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
- .setPos(79, 52))
- .widget(SlotWidget.phantom(inventoryHandler, 2)
- .disableInteraction()
- .setBackground(GT_UITextures.TRANSPARENT)
- .setPos(59, 42))
- .widget(new TextWidget("Item Amount")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 20))
- .widget(TextWidget.dynamicString(() -> GT_Utility.parseNumberToString(mItemCount))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 30));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(7, 16).setSize(71, 45))
+ .widget(
+ new SlotWidget(inventoryHandler, 0)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
+ .setPos(79, 16))
+ .widget(
+ new SlotWidget(inventoryHandler, 1).setAccess(true, false)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+ .setPos(79, 52))
+ .widget(
+ SlotWidget.phantom(inventoryHandler, 2).disableInteraction()
+ .setBackground(GT_UITextures.TRANSPARENT).setPos(59, 42))
+ .widget(new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 20)).widget(
+ TextWidget.dynamicString(() -> GT_Utility.parseNumberToString(mItemCount))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 30));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
index 3bd7628e79..9366bc4d92 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.storage;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GT_UIInfos;
@@ -10,18 +13,16 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
import gregtech.api.objects.GT_RenderedTexture;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
- public GT_MetaTileEntity_TieredTank(
- final int aID, final String aName, final String aNameRegional, final int aTier) {
+ public GT_MetaTileEntity_TieredTank(final int aID, final String aName, final String aNameRegional,
+ final int aTier) {
super(aID, aName, aNameRegional, aTier, 3, "Stores " + ((int) (Math.pow(2, aTier) * 32000)) + "L of fluid");
}
- public GT_MetaTileEntity_TieredTank(
- final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_TieredTank(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures) {
super(aName, aTier, 3, "Stores " + ((int) (Math.pow(2, aTier) * 32000)) + "L of fluid", aTextures);
}
@@ -32,14 +33,10 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
String aTankPortableness = "portable";
if (this.mFluid == null) {
- aTip = new String[] {this.mDescription, "A " + aTankPortableness + " tank.", CORE.GT_Tooltip};
+ aTip = new String[] { this.mDescription, "A " + aTankPortableness + " tank.", CORE.GT_Tooltip };
} else {
- aTip = new String[] {
- this.mDescription,
- "A " + aTankPortableness + " tank.",
- "Fluid: " + mFluid.getLocalizedName() + " " + mFluid.amount + "L",
- CORE.GT_Tooltip
- };
+ aTip = new String[] { this.mDescription, "A " + aTankPortableness + " tank.",
+ "Fluid: " + mFluid.getLocalizedName() + " " + mFluid.amount + "L", CORE.GT_Tooltip };
}
return aTip;
}
@@ -50,22 +47,13 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
return aSide == 1
- ? new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE)
- }
- : new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
- new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER)
- };
+ ? new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE) }
+ : new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
+ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER) };
}
@Override
@@ -112,21 +100,12 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
public String[] getInfoData() {
if (this.mFluid == null) {
- return new String[] {
- GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank",
- "Stored Fluid:",
- "No Fluid",
- Integer.toString(0) + "L",
- Integer.toString(this.getCapacity()) + "L"
- };
+ return new String[] { GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", "No Fluid",
+ Integer.toString(0) + "L", Integer.toString(this.getCapacity()) + "L" };
}
- return new String[] {
- GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank",
- "Stored Fluid:",
- this.mFluid.getLocalizedName(),
- Integer.toString(this.mFluid.amount) + "L",
- Integer.toString(this.getCapacity()) + "L"
- };
+ return new String[] { GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:",
+ this.mFluid.getLocalizedName(), Integer.toString(this.mFluid.amount) + "L",
+ Integer.toString(this.getCapacity()) + "L" };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
index ff63957696..1d0b4dad7e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
@@ -2,6 +2,11 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.storage;
import static gregtech.api.enums.GT_Values.V;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -14,43 +19,25 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
protected byte aCurrentOutputAmperage = 4;
- public GregtechMetaEnergyBuffer(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final String aDescription,
- final int aSlotCount) {
+ public GregtechMetaEnergyBuffer(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final String aDescription, final int aSlotCount) {
super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
}
- public GregtechMetaEnergyBuffer(
- final String aName,
- final int aTier,
- final String aDescription,
- final ITexture[][][] aTextures,
- final int aSlotCount) {
+ public GregtechMetaEnergyBuffer(final String aName, final int aTier, final String aDescription,
+ final ITexture[][][] aTextures, final int aSlotCount) {
super(aName, aTier, aSlotCount, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {
- this.mDescription,
- "Defaults 4A In/Out",
- "Change output Amperage with a screwdriver",
- "Now Portable!",
- CORE.GT_Tooltip
- };
+ return new String[] { this.mDescription, "Defaults 4A In/Out", "Change output Amperage with a screwdriver",
+ "Now Portable!", CORE.GT_Tooltip };
}
@Override
@@ -84,139 +71,99 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
- return this.mTextures[
- (aActive ? 5 : 0)
- + (aSide == aFacing
- ? 0
- : aSide == GT_Utility.getOppositeSide(aFacing)
- ? 1
- : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+ return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0
+ : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex
+ + 1];
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
}
public ITexture[] getFrontActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] };
}
public ITexture[] getBackActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
}
public ITexture[] getBottomActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
}
public ITexture[] getTopActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo)
- };
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo) };
}
public ITexture[] getSidesActive(final byte aColor) {
- return new ITexture[] {
- Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
- new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
- };
- }
-
- /*@Override
- public ITexture[][][] getTextureSet(ITexture[] aTextures) {
- ITexture[][][] rTextures = new ITexture[2][17][];
- for (byte i = -1; i < 16; i++) {
- rTextures[0][i + 1] = new ITexture[] { new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_HEATPROOFCASING) };
- rTextures[1][i + 1] = new ITexture[] {
- new GT_RenderedTexture(
- Textures.BlockIcons.MACHINE_HEATPROOFCASING),
- mInventory.length > 4 ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]
- : Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
- }
- return rTextures;
- }*/
+ return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
+ new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) };
+ }
/*
- * @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) {
- * ITexture[][][] rTextures = new ITexture[5][17][]; for (byte i = -1; i <
- * 16; i = (byte) (i + 1)) { ITexture[] tmp0 = { new GT_RenderedTexture(
- * Textures.BlockIcons.MACHINE_STEEL_BOTTOM, Dyes.getModulation(i,
- * Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] = tmp0; ITexture[] tmp1 = {
- * new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_TOP) };
- * rTextures[1][(i + 1)] = tmp1; ITexture[] tmp2 = { new GT_RenderedTexture(
- * Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
- * Dyes._NULL.mRGBa)), new
- * GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[2][(i +
- * 1)] = tmp2; ITexture[] tmp4 = { new GT_RenderedTexture(
- * Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
- * Dyes._NULL.mRGBa)), new
- * GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; rTextures[3][(i +
- * 1)] = tmp4; ITexture[] tmp5 = { new GT_RenderedTexture(
- * Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
- * Dyes._NULL.mRGBa)), new GT_RenderedTexture(
- * Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; rTextures[4][(i + 1)] = tmp5;
- * } return rTextures; }
+ * @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new
+ * ITexture[2][17][]; for (byte i = -1; i < 16; i++) { rTextures[0][i + 1] = new ITexture[] { new
+ * GT_RenderedTexture( Textures.BlockIcons.MACHINE_HEATPROOFCASING) }; rTextures[1][i + 1] = new ITexture[] { new
+ * GT_RenderedTexture( Textures.BlockIcons.MACHINE_HEATPROOFCASING), mInventory.length > 4 ?
+ * Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] : Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; } return
+ * rTextures; }
*/
- /*@Override
- public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
- return mTextures[aSide == aFacing ? 1 : 0][aColorIndex+1];
- }*/
+ /*
+ * @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new
+ * ITexture[5][17][]; for (byte i = -1; i < 16; i = (byte) (i + 1)) { ITexture[] tmp0 = { new GT_RenderedTexture(
+ * Textures.BlockIcons.MACHINE_STEEL_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] =
+ * tmp0; ITexture[] tmp1 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_TOP) }; rTextures[1][(i + 1)]
+ * = tmp1; ITexture[] tmp2 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
+ * Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[2][(i + 1)] = tmp2;
+ * ITexture[] tmp4 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
+ * Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; rTextures[3][(i + 1)] = tmp4;
+ * ITexture[] tmp5 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
+ * Dyes._NULL.mRGBa)), new GT_RenderedTexture( Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; rTextures[4][(i + 1)] =
+ * tmp5; } return rTextures; }
+ */
+
+ /*
+ * @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte
+ * aColorIndex, boolean aActive, boolean aRedstone) { return mTextures[aSide == aFacing ? 1 : 0][aColorIndex+1]; }
+ */
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaEnergyBuffer(
- this.mName, this.mTier, this.mDescription, this.mTextures, this.mInventory.length);
+ this.mName,
+ this.mTier,
+ this.mDescription,
+ this.mTextures,
+ this.mInventory.length);
}
@Override
@@ -367,36 +314,34 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
final double roundOff = Math.round(c * 100.00) / 100.00;
PlayerUtils.messagePlayer(
playerIn,
- "Energy: " + GT_Utility.formatNumbers(tempStorage) + " EU at " + V[this.mTier] + "v (" + roundOff
- + "%)");
+ "Energy: " + GT_Utility
+ .formatNumbers(tempStorage) + " EU at " + V[this.mTier] + "v (" + roundOff + "%)");
PlayerUtils.messagePlayer(playerIn, "Amperage: " + GT_Utility.formatNumbers(maxAmperesOut()) + "A");
}
// Utils.LOG_WARNING("Begin Show Energy");
/*
- *
- //Utils.LOG_INFO("getProgresstime: "+tempStorage+" maxProgresstime: "+maxEUStore()+" C: "+c);
- Utils.LOG_INFO("getProgressTime: "+getProgresstime());
- Utils.LOG_INFO("maxProgressTime: "+maxProgresstime());
- Utils.LOG_INFO("getMinimumStoredEU: "+getMinimumStoredEU());
- Utils.LOG_INFO("maxEUStore: "+maxEUStore());*/
- /*final long d = (tempStorage * 100L) / maxEUStore();
- Utils.LOG_INFO("getProgresstime: "+tempStorage+" maxProgresstime: "+maxEUStore()+" D: "+d);
- final double roundOff2 = Math.round(d * 100.00) / 100.00;
- Utils.messagePlayer(playerIn, "Energy: " + tempStorage + " EU at "+V[mTier]+"v ("+roundOff2+"%)");
- Utils.LOG_WARNING("Making new instance of Guihandler");
- GuiHandler block = new GuiHandler();
- Utils.LOG_WARNING("Guihandler.toString(): "+block.toString());
- block.getClientGuiElement(1, playerIn, worldIn, (int) playerIn.posX, (int) playerIn.posY, (int) playerIn.posZ);*/
-
- @Override
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ * //Utils.LOG_INFO("getProgresstime: "+tempStorage+" maxProgresstime: "+maxEUStore()+" C: "+c);
+ * Utils.LOG_INFO("getProgressTime: "+getProgresstime()); Utils.LOG_INFO("maxProgressTime: "+maxProgresstime());
+ * Utils.LOG_INFO("getMinimumStoredEU: "+getMinimumStoredEU()); Utils.LOG_INFO("maxEUStore: "+maxEUStore());
+ */
+ /*
+ * final long d = (tempStorage * 100L) / maxEUStore();
+ * Utils.LOG_INFO("getProgresstime: "+tempStorage+" maxProgresstime: "+maxEUStore()+" D: "+d); final double
+ * roundOff2 = Math.round(d * 100.00) / 100.00; Utils.messagePlayer(playerIn, "Energy: " + tempStorage +
+ * " EU at "+V[mTier]+"v ("+roundOff2+"%)"); Utils.LOG_WARNING("Making new instance of Guihandler"); GuiHandler
+ * block = new GuiHandler(); Utils.LOG_WARNING("Guihandler.toString(): "+block.toString());
+ * block.getClientGuiElement(1, playerIn, worldIn, (int) playerIn.posX, (int) playerIn.posY, (int) playerIn.posZ);
+ */
+
+ @Override
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@Override
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return false;
}
@@ -409,7 +354,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
String fmt = String.format("%%%ds", max.length());
cur = String.format(fmt, cur);
- return new String[] {cur + " EU stored", max + " EU capacity"};
+ return new String[] { cur + " EU stored", max + " EU capacity" };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
index 5115b87da7..12a64f7fa8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
@@ -6,6 +6,7 @@ import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
import com.gtnewhorizons.modularui.common.widget.SlotGroup;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GT_UITextures;
import gregtech.api.interfaces.ITexture;
@@ -23,34 +24,29 @@ public class GregtechMetaSafeBlock extends GregtechMetaSafeBlockBase implements
super(aID, aName, aNameRegional, aTier, 28, "Protecting your items from sticky fingers.");
}
- public GregtechMetaSafeBlock(
- final int aID,
- final String aName,
- final String aNameRegional,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription) {
+ public GregtechMetaSafeBlock(final int aID, final String aName, final String aNameRegional, final int aTier,
+ final int aInvSlotCount, final String aDescription) {
super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
}
- public GregtechMetaSafeBlock(
- final String aName,
- final int aTier,
- final int aInvSlotCount,
- final String aDescription,
- final ITexture[][][] aTextures) {
+ public GregtechMetaSafeBlock(final String aName, final int aTier, final int aInvSlotCount,
+ final String aDescription, final ITexture[][][] aTextures) {
super(aName, aTier, aInvSlotCount, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, CORE.GT_Tooltip};
+ return new String[] { this.mDescription, CORE.GT_Tooltip };
}
@Override
public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
return new GregtechMetaSafeBlock(
- this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
+ this.mName,
+ this.mTier,
+ this.mInventory.length,
+ this.mDescription,
+ this.mTextures);
}
@Override
@@ -70,19 +66,15 @@ public class GregtechMetaSafeBlock extends GregtechMetaSafeBlockBase implements
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 9)
- .endAtSlot(26)
- .build()
- .setPos(7, 4))
- .widget(new ButtonWidget()
- .setOnClick((clickData, widget) -> bUnbreakable = !bUnbreakable)
- .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_LOCK)
- .setPos(43, 62)
- .setSize(18, 18))
+ builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 9).endAtSlot(26).build().setPos(7, 4))
+ .widget(
+ new ButtonWidget().setOnClick((clickData, widget) -> bUnbreakable = !bUnbreakable)
+ .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_LOCK)
+ .setPos(43, 62).setSize(18, 18))
.widget(new TextWidget("Safe Status").setPos(76, 61))
- .widget(TextWidget.dynamicString(() -> bUnbreakable ? "Locked" : "Unlocked")
- .setSynced(false)
- .setPos(82, 73))
+ .widget(
+ TextWidget.dynamicString(() -> bUnbreakable ? "Locked" : "Unlocked").setSynced(false)
+ .setPos(82, 73))
.widget(new FakeSyncWidget.BooleanSyncer(() -> bUnbreakable, val -> bUnbreakable = val));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java
index bff2cad086..daf79e022f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.storage.creative;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
@@ -7,8 +10,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.sys.KeyboardUtils;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_TieredChest {
@@ -16,14 +17,14 @@ public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_Tier
super(aID, aName, aNameRegional, aTier);
}
- public GT_MetaTileEntity_InfiniteItemHolder(
- String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+ public GT_MetaTileEntity_InfiniteItemHolder(String aName, int aTier, String aDescription,
+ ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@Override
public String[] getDescription() {
- return new String[] {this.mDescription, CORE.GT_Tooltip};
+ return new String[] { this.mDescription, CORE.GT_Tooltip };
}
@Override
@@ -39,7 +40,8 @@ public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_Tier
this.mItemCount = Short.MAX_VALUE;
aPlayer.setCurrentItemOrArmor(0, null);
PlayerUtils.messagePlayer(
- aPlayer, "Now holding " + this.mItemStack.getDisplayName() + " x" + Short.MAX_VALUE + ".");
+ aPlayer,
+ "Now holding " + this.mItemStack.getDisplayName() + " x" + Short.MAX_VALUE + ".");
return true;
}
} else {
@@ -55,7 +57,8 @@ public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_Tier
PlayerUtils.messagePlayer(
aPlayer,
- "Currently holding: " + (this.mItemStack != null ? this.mItemStack.getDisplayName() : "Nothing") + " x"
+ "Currently holding: " + (this.mItemStack != null ? this.mItemStack.getDisplayName() : "Nothing")
+ + " x"
+ this.mItemCount);
return true;
// return super.onRightclick(aBaseMetaTileEntity, aPlayer);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
index 18e95861b3..4d959789eb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.*;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -15,22 +20,19 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.sys.KeyboardUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
+
public byte mType = 0;
public String mOldDesc = "";
public boolean mLocked = false;
protected byte mIndex = (byte) MathUtils.randInt(1, 3);
- public static GT_RenderedTexture texBottom =
- new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_bottom"));
+ public static GT_RenderedTexture texBottom = new GT_RenderedTexture(
+ new CustomIcon("TileEntities/gt4/machine_bottom"));
public static GT_RenderedTexture texTop = new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_top"));
public static GT_RenderedTexture texSide = new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_side"));
- public static GT_RenderedTexture texSideCabinet =
- new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_side_cabinet"));
+ public static GT_RenderedTexture texSideCabinet = new GT_RenderedTexture(
+ new CustomIcon("TileEntities/gt4/machine_side_cabinet"));
public GT4Entity_Shelf(final int aID, final String aName, final String aNameRegional, final String aDescription) {
super(aID, aName, aNameRegional, 0, aDescription);
@@ -103,7 +105,9 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
if (this.mInventory[0] != null) {
PlayerUtils.messagePlayer(
aPlayer,
- "Contains " + this.mInventory[0].getDisplayName() + " x" + this.mInventory[0].stackSize
+ "Contains " + this.mInventory[0].getDisplayName()
+ + " x"
+ + this.mInventory[0].stackSize
+ ".");
}
return false;
@@ -112,7 +116,9 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
if (!this.mLocked) {
PlayerUtils.messagePlayer(
aPlayer,
- "Removed " + this.mInventory[0].getDisplayName() + " x" + this.mInventory[0].stackSize
+ "Removed " + this.mInventory[0].getDisplayName()
+ + " x"
+ + this.mInventory[0].stackSize
+ ".");
aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, this.mInventory[0]);
getBaseMetaTileEntity().setInventorySlotContents(0, null);
@@ -120,7 +126,8 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
return true;
} else {
PlayerUtils.messagePlayer(
- aPlayer, "This container is locked. It belongs to " + aTile.getOwnerName() + ".");
+ aPlayer,
+ "This container is locked. It belongs to " + aTile.getOwnerName() + ".");
return false;
}
}
@@ -147,7 +154,7 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
@Override
public void onLeftclick(IGregTechTileEntity aTile, EntityPlayer aPlayer) {
if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0)) {
- ItemStack tOutput = GT_Utility.copy(new Object[] {this.mInventory[0]});
+ ItemStack tOutput = GT_Utility.copy(new Object[] { this.mInventory[0] });
if (!aPlayer.isSneaking()) {
tOutput.stackSize = 1;
}
@@ -206,13 +213,8 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
@Override
public String[] getDescription() {
- return new String[] {
- mOldDesc,
- "Decorative Item Storage",
- "Right click to store/remove something",
- "Ctrl + Rmb to check contents",
- "Ctrl + Rmb with a screwdriver to lock",
- };
+ return new String[] { mOldDesc, "Decorative Item Storage", "Right click to store/remove something",
+ "Ctrl + Rmb to check contents", "Ctrl + Rmb with a screwdriver to lock", };
}
@Override
@@ -240,44 +242,35 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
ITexture[][][] rTextures = new ITexture[7][17][];
for (byte i = -1; i < 16; i = (byte) (i + 1)) {
- ITexture[] tmp0 = {this.getBottom((byte) 0)[0]};
+ ITexture[] tmp0 = { this.getBottom((byte) 0)[0] };
rTextures[0][(i + 1)] = tmp0;
- ITexture[] tmp1 = {this.getTop((byte) 0)[0]};
+ ITexture[] tmp1 = { this.getTop((byte) 0)[0] };
rTextures[1][(i + 1)] = tmp1;
- ITexture[] tmp2 = {this.getSides((byte) 0)[0]};
+ ITexture[] tmp2 = { this.getSides((byte) 0)[0] };
rTextures[2][(i + 1)] = tmp2;
- ITexture[] tmp4 = {this.getSides((byte) 0)[0]};
+ ITexture[] tmp4 = { this.getSides((byte) 0)[0] };
rTextures[3][(i + 1)] = tmp4;
- ITexture[] tmp5 = {this.getSides((byte) 0)[0], getFront((byte) 0)[0]};
+ ITexture[] tmp5 = { this.getSides((byte) 0)[0], getFront((byte) 0)[0] };
rTextures[4][(i + 1)] = tmp5;
- ITexture[] tmp6 = {this.getSides((byte) 0)[0], getFront((byte) 1)[0]};
+ ITexture[] tmp6 = { this.getSides((byte) 0)[0], getFront((byte) 1)[0] };
rTextures[5][(i + 1)] = tmp6;
- ITexture[] tmp7 = {this.getSides((byte) 0)[0], getFront((byte) 2)[0]};
+ ITexture[] tmp7 = { this.getSides((byte) 0)[0], getFront((byte) 2)[0] };
rTextures[6][(i + 1)] = tmp7;
}
return rTextures;
}
@Override
- public ITexture[] getTexture(
- final IGregTechTileEntity aBaseMetaTileEntity,
- final byte aSide,
- final byte aFacing,
- final byte aColorIndex,
- final boolean aActive,
- final boolean aRedstone) {
-
- ITexture[] tmp = this.mTextures[
- (aSide >= 2)
- ? ((aSide != aFacing)
- ? 2
- : ((byte) this.mType == 0
- ? 4
- : this.mType == 1 || this.mType == 2 ? 5 : this.mType == 3 ? 6 : 0))
- : aSide][
- aColorIndex + 1];
+ public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
+ final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+
+ ITexture[] tmp = this.mTextures[(aSide >= 2)
+ ? ((aSide != aFacing) ? 2
+ : ((byte) this.mType == 0 ? 4
+ : this.mType == 1 || this.mType == 2 ? 5 : this.mType == 3 ? 6 : 0))
+ : aSide][aColorIndex + 1];
if (aSide != aFacing && tmp.length == 2) {
- tmp = new ITexture[] {tmp[0]};
+ tmp = new ITexture[] { tmp[0] };
}
return tmp;
}
@@ -287,31 +280,31 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
private static GT_RenderedTexture x3 = new GT_RenderedTexture(TexturesGtBlock.OVERLAY_WOODEN_SHELF_CANS_FRONT);
public ITexture[] getFrontNormal() {
- return new ITexture[] {x1};
+ return new ITexture[] { x1 };
}
public ITexture[] getFrontActive() {
- return new ITexture[] {x2};
+ return new ITexture[] { x2 };
}
public ITexture[] getFrontAlternative() {
- return new ITexture[] {x3};
+ return new ITexture[] { x3 };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks) };
}
public ITexture[] getFrontActive(final byte aColor) {
@@ -351,8 +344,7 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
@Override
public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
if (KeyboardUtils.isCtrlKeyDown()) {
- if (!aPlayer.getDisplayName()
- .equalsIgnoreCase(this.getBaseMetaTileEntity().getOwnerName())) {
+ if (!aPlayer.getDisplayName().equalsIgnoreCase(this.getBaseMetaTileEntity().getOwnerName())) {
PlayerUtils.messagePlayer(aPlayer, "Container is not yours to lock.");
} else {
this.mLocked = Utils.invertBoolean(this.mLocked);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java
index 93361a523f..b75b383377 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java
@@ -1,16 +1,17 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
+import net.minecraft.entity.player.EntityPlayer;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
public class GT4Entity_Shelf_Compartment extends GT4Entity_Shelf {
- public GT4Entity_Shelf_Compartment(
- final int aID, final String aName, final String aNameRegional, final String aDescription) {
+ public GT4Entity_Shelf_Compartment(final int aID, final String aName, final String aNameRegional,
+ final String aDescription) {
super(aID, aName, aNameRegional, aDescription);
}
@@ -33,6 +34,6 @@ public class GT4Entity_Shelf_Compartment extends GT4Entity_Shelf {
@Override
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {TexturesGtBlock.OVERLAYS_COMPARTMENT_FRONT[this.mType < 16 ? this.mType : 0]};
+ return new ITexture[] { TexturesGtBlock.OVERLAYS_COMPARTMENT_FRONT[this.mType < 16 ? this.mType : 0] };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
index c9472e157c..0327424efb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
@@ -8,8 +8,8 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf {
- public GT4Entity_Shelf_Desk(
- final int aID, final String aName, final String aNameRegional, final String aDescription) {
+ public GT4Entity_Shelf_Desk(final int aID, final String aName, final String aNameRegional,
+ final String aDescription) {
super(aID, aName, aNameRegional, aDescription);
}
@@ -24,22 +24,22 @@ public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf {
@Override
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {TexturesGtBlock.OVERLAYS_CABINET_FRONT[this.mType < 16 ? this.mType : 0]};
+ return new ITexture[] { TexturesGtBlock.OVERLAYS_CABINET_FRONT[this.mType < 16 ? this.mType : 0] };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks) };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks) };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks) };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
+ return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks) };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java
index 9c4ae3aefa..b7ebac4f90 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java
@@ -1,16 +1,17 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
+import net.minecraft.entity.player.EntityPlayer;
+
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
-import net.minecraft.entity.player.EntityPlayer;
public class GT4Entity_Shelf_FileCabinet extends GT4Entity_Shelf {
- public GT4Entity_Shelf_FileCabinet(
- final int aID, final String aName, final String aNameRegional, final String aDescription) {
+ public GT4Entity_Shelf_FileCabinet(final int aID, final String aName, final String aNameRegional,
+ final String aDescription) {
super(aID, aName, aNameRegional, aDescription);
}
@@ -33,22 +34,22 @@ public class GT4Entity_Shelf_FileCabinet extends GT4Entity_Shelf {
@Override
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {TexturesGtBlock.OVERLAYS_CABINET_FRONT[this.mType < 16 ? this.mType : 0]};
+ return new ITexture[] { TexturesGtBlock.OVERLAYS_CABINET_FRONT[this.mType < 16 ? this.mType : 0] };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {texSide};
+ return new ITexture[] { texSide };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {texBottom};
+ return new ITexture[] { texBottom };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {texTop};
+ return new ITexture[] { texTop };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {texSide};
+ return new ITexture[] { texSide };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java
index 17110e691b..a401fd96e3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java
@@ -6,8 +6,8 @@ import gregtech.api.metatileentity.MetaTileEntity;
public class GT4Entity_Shelf_Iron extends GT4Entity_Shelf {
- public GT4Entity_Shelf_Iron(
- final int aID, final String aName, final String aNameRegional, final String aDescription) {
+ public GT4Entity_Shelf_Iron(final int aID, final String aName, final String aNameRegional,
+ final String aDescription) {
super(aID, aName, aNameRegional, aDescription);
}
@@ -21,22 +21,22 @@ public class GT4Entity_Shelf_Iron extends GT4Entity_Shelf {
}
public ITexture[] getFront(final byte aColor) {
- return new ITexture[] {texSideCabinet};
+ return new ITexture[] { texSideCabinet };
}
public ITexture[] getBack(final byte aColor) {
- return new ITexture[] {texSide};
+ return new ITexture[] { texSide };
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] {texBottom};
+ return new ITexture[] { texBottom };
}
public ITexture[] getTop(final byte aColor) {
- return new ITexture[] {texTop};
+ return new ITexture[] { texTop };
}
public ITexture[] getSides(final byte aColor) {
- return new ITexture[] {texSide};
+ return new ITexture[] { texSide };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java
index 15fa23bf95..4b8943f6d1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java
@@ -1,10 +1,16 @@
package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.gui.modularui.GT_UIInfos;
import gregtech.api.gui.modularui.GT_UITextures;
import gregtech.api.interfaces.ITexture;
@@ -14,10 +20,6 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.core.util.sys.KeyboardUtils;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
@@ -25,8 +27,8 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
public int mItemCount;
public ItemStack mItemStack;
- public GT4Entity_Shelf_Large(
- final int aID, final String aName, final String aNameRegional, final String aDescription, final int aSize) {
+ public GT4Entity_Shelf_Large(final int aID, final String aName, final String aNameRegional,
+ final String aDescription, final int aSize) {
super(aID, aName, aNameRegional, aDescription);
this.mSize = aSize;
this.mItemCount = 0;
@@ -45,10 +47,9 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
return new GT4Entity_Shelf_Large(this.mName, this.mDescription, mSize, this.mTextures);
}
- /*@Override
- public int getInvSize() {
- return (mSize > 0 && mSize < 255 ? mSize : 255);
- }*/
+ /*
+ * @Override public int getInvSize() { return (mSize > 0 && mSize < 255 ? mSize : 255); }
+ */
@Override
public boolean isGivingInformation() {
@@ -108,8 +109,7 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
}
public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTimer) {
- if (this.getBaseMetaTileEntity().isServerSide()
- && this.getBaseMetaTileEntity().isAllowedToWork()) {
+ if (this.getBaseMetaTileEntity().isServerSide() && this.getBaseMetaTileEntity().isAllowedToWork()) {
try {
if (this.mInventory[0] != null) {
this.mType = (byte) this.mIndex;
@@ -124,8 +124,7 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
if (this.mItemStack == null && this.mInventory[0] != null) {
this.mItemStack = this.mInventory[0].copy();
}
- if (this.mInventory[0] != null
- && this.mItemCount < this.getMaxItemCount()
+ if (this.mInventory[0] != null && this.mItemCount < this.getMaxItemCount()
&& GT_Utility.areStacksEqual(this.mInventory[0], this.mItemStack)) {
this.mItemCount += this.mInventory[0].stackSize;
if (this.mItemCount > this.getMaxItemCount()) {
@@ -139,15 +138,15 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
this.mInventory[1] = this.mItemStack.copy();
this.mInventory[1].stackSize = Math.min(this.mItemStack.getMaxStackSize(), this.mItemCount);
this.mItemCount -= this.mInventory[1].stackSize;
- } else if (this.mItemCount > 0
- && GT_Utility.areStacksEqual(this.mInventory[1], this.mItemStack)
+ } else if (this.mItemCount > 0 && GT_Utility.areStacksEqual(this.mInventory[1], this.mItemStack)
&& this.mInventory[1].getMaxStackSize() > this.mInventory[1].stackSize) {
- final int tmp = Math.min(
- this.mItemCount, this.mInventory[1].getMaxStackSize() - this.mInventory[1].stackSize);
- final ItemStack itemStack = this.mInventory[1];
- itemStack.stackSize += tmp;
- this.mItemCount -= tmp;
- }
+ final int tmp = Math.min(
+ this.mItemCount,
+ this.mInventory[1].getMaxStackSize() - this.mInventory[1].stackSize);
+ final ItemStack itemStack = this.mInventory[1];
+ itemStack.stackSize += tmp;
+ this.mItemCount -= tmp;
+ }
if (this.mItemStack != null) {
this.mInventory[2] = this.mItemStack.copy();
this.mInventory[2].stackSize = Math.min(this.mItemStack.getMaxStackSize(), this.mItemCount);
@@ -170,8 +169,7 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
public int getProgresstime() {
try {
- return this.mItemCount
- + ((this.mInventory[0] == null) ? 0 : this.mInventory[0].stackSize)
+ return this.mItemCount + ((this.mInventory[0] == null) ? 0 : this.mInventory[0].stackSize)
+ ((this.mInventory[1] == null) ? 0 : this.mInventory[1].stackSize);
} catch (Throwable t) {
return 0;
@@ -186,31 +184,28 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
return this.mSize;
}
- public boolean allowPullStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
+ public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
return aIndex == 1;
}
- public boolean allowPutStack(
- final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) {
- return aIndex == 0
- && ((this.mInventory[0] == null && this.mItemStack == null)
- || GT_Utility.areStacksEqual(this.mInventory[0], aStack)
- || (this.mItemStack != null && GT_Utility.areStacksEqual(this.mItemStack, aStack)));
+ public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide,
+ final ItemStack aStack) {
+ return aIndex == 0 && ((this.mInventory[0] == null && this.mItemStack == null)
+ || GT_Utility.areStacksEqual(this.mInventory[0], aStack)
+ || (this.mItemStack != null && GT_Utility.areStacksEqual(this.mItemStack, aStack)));
}
public String[] getInfoData() {
if (this.mItemStack == null) {
- return new String[] {
- this.getLocalName(), "No Items Stored", "Free Space: " + Integer.toString(this.getMaxItemCount())
- };
+ return new String[] { this.getLocalName(), "No Items Stored",
+ "Free Space: " + Integer.toString(this.getMaxItemCount()) };
}
- return new String[] {
- this.getLocalName(),
- "Storing: " + this.mItemStack.getDisplayName() + " x" + Integer.toString(this.mItemCount),
- "Space Remaining: " + Integer.toString(this.getMaxItemCount() - this.getItemCount()) + "/"
- + Integer.toString(this.getMaxItemCount())
- };
+ return new String[] { this.getLocalName(),
+ "Storing: " + this.mItemStack.getDisplayName() + " x" + Integer.toString(this.mItemCount),
+ "Space Remaining: " + Integer.toString(this.getMaxItemCount() - this.getItemCount())
+ + "/"
+ + Integer.toString(this.getMaxItemCount()) };
}
@Override
@@ -263,18 +258,14 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf {
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
- builder.widget(new DrawableWidget()
- .setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(7, 16)
- .setSize(71, 45))
- .widget(new SlotWidget(inventoryHandler, 0)
- .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
- .setPos(79, 16))
- .widget(new TextWidget("Item Amount")
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 20))
- .widget(TextWidget.dynamicString(() -> GT_Utility.parseNumberToString(mItemCount))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 30));
+ builder.widget(
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(7, 16).setSize(71, 45))
+ .widget(
+ new SlotWidget(inventoryHandler, 0)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
+ .setPos(79, 16))
+ .widget(new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 20)).widget(
+ TextWidget.dynamicString(() -> GT_Utility.parseNumberToString(mItemCount))
+ .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 30));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java
index e8b72c7ea9..8065eee736 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java
@@ -1,16 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tools;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.Textures.ItemIcons;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_None;
-import gregtech.common.tools.GT_Tool;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
import java.util.Arrays;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -23,14 +15,24 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.event.world.BlockEvent;
+import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures.ItemIcons;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.items.behaviors.Behaviour_None;
+import gregtech.common.tools.GT_Tool;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
+
public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
- public static final List<String> mEffectiveList =
- Arrays.asList(new String[] {EntityIronGolem.class.getName(), "EntityTowerGuardian"});
+ public static final List<String> mEffectiveList = Arrays
+ .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" });
@Override
- public float getNormalDamageAgainstEntity(
- final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, final EntityPlayer aPlayer) {
+ public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack,
+ final EntityPlayer aPlayer) {
String tName = aEntity.getClass().getName();
tName = tName.substring(tName.lastIndexOf(".") + 1);
return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;
@@ -122,38 +124,21 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
}
@Override
- public int convertBlockDrops(
- final List<ItemStack> aDrops,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final Block aBlock,
- final int aX,
- final int aY,
- final int aZ,
- final byte aMetaData,
- final int aFortune,
- final boolean aSilkTouch,
- final BlockEvent.HarvestDropsEvent aEvent) {
+ public int convertBlockDrops(final List<ItemStack> aDrops, final ItemStack aStack, final EntityPlayer aPlayer,
+ final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData, final int aFortune,
+ final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) {
int rConversions = 0;
- /*GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack[]{new ItemStack(aBlock, 1, aMetaData)});
- if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
- for (final ItemStack tDrop : aDrops) {
- tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack[]{GT_Utility.copyAmount(1L, new Object[]{tDrop})});
- if (tRecipe != null) {
- final ItemStack tHammeringOutput = tRecipe.getOutput(0);
- if (tHammeringOutput != null) {
- rConversions += tDrop.stackSize;
- tDrop.stackSize *= tHammeringOutput.stackSize;
- tHammeringOutput.stackSize = tDrop.stackSize;
- GT_Utility.setStack(tDrop, tHammeringOutput);
- }
- }
- }
- } else {
- aDrops.clear();
- aDrops.add(tRecipe.getOutput(0));
- rConversions++;
- }*/
+ /*
+ * GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new
+ * ItemStack[]{new ItemStack(aBlock, 1, aMetaData)}); if ((tRecipe == null) ||
+ * (aBlock.hasTileEntity(aMetaData))) { for (final ItemStack tDrop : aDrops) { tRecipe =
+ * GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new
+ * ItemStack[]{GT_Utility.copyAmount(1L, new Object[]{tDrop})}); if (tRecipe != null) { final ItemStack
+ * tHammeringOutput = tRecipe.getOutput(0); if (tHammeringOutput != null) { rConversions += tDrop.stackSize;
+ * tDrop.stackSize *= tHammeringOutput.stackSize; tHammeringOutput.stackSize = tDrop.stackSize;
+ * GT_Utility.setStack(tDrop, tHammeringOutput); } } } } else { aDrops.clear();
+ * aDrops.add(tRecipe.getOutput(0)); rConversions++; }
+ */
return rConversions;
}
@@ -177,15 +162,18 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool {
try {
GT_Mod.achievements.issueAchievement(aPlayer, "tools");
GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
- } catch (final Exception e) {
- }
+ } catch (final Exception e) {}
}
@Override
public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) {
- return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE
- + " has been Ground out of existence by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ return new ChatComponentText(
+ EnumChatFormatting.RED + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " has been Ground out of existence by "
+ + EnumChatFormatting.GREEN
+ + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
index db93f8fdd1..5939203637 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
@@ -1,10 +1,7 @@
package gtPlusPlus.xmod.gregtech.common.tools;
-import gregtech.api.GregTech_API;
-import gregtech.api.damagesources.GT_DamageSources;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.entity.Entity;
@@ -17,9 +14,15 @@ import net.minecraft.util.EntityDamageSource;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.event.world.BlockEvent;
+import gregtech.api.GregTech_API;
+import gregtech.api.damagesources.GT_DamageSources;
+import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
+
public abstract class TOOL_Gregtech_Base implements Interface_ToolStats {
- public static final Enchantment[] FORTUNE_ENCHANTMENT = {Enchantment.fortune};
- public static final Enchantment[] LOOTING_ENCHANTMENT = {Enchantment.looting};
+
+ public static final Enchantment[] FORTUNE_ENCHANTMENT = { Enchantment.fortune };
+ public static final Enchantment[] LOOTING_ENCHANTMENT = { Enchantment.looting };
public static final Enchantment[] ZERO_ENCHANTMENTS = new Enchantment[0];
public static final int[] ZERO_ENCHANTMENT_LEVELS = new int[0];
@@ -127,8 +130,7 @@ public abstract class TOOL_Gregtech_Base implements Interface_ToolStats {
return GT_DamageSources.getCombatDamage(
(aPlayer instanceof EntityPlayer) ? "player" : "mob",
aPlayer,
- (aEntity instanceof EntityLivingBase)
- ? this.getDeathMessage(aPlayer, (EntityLivingBase) aEntity)
+ (aEntity instanceof EntityLivingBase) ? this.getDeathMessage(aPlayer, (EntityLivingBase) aEntity)
: null);
}
@@ -138,18 +140,9 @@ public abstract class TOOL_Gregtech_Base implements Interface_ToolStats {
}
@Override
- public int convertBlockDrops(
- final List<ItemStack> aDrops,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final Block aBlock,
- final int aX,
- final int aY,
- final int aZ,
- final byte aMetaData,
- final int aFortune,
- final boolean aSilkTouch,
- final BlockEvent.HarvestDropsEvent aEvent) {
+ public int convertBlockDrops(final List<ItemStack> aDrops, final ItemStack aStack, final EntityPlayer aPlayer,
+ final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData, final int aFortune,
+ final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) {
return 0;
}
@@ -179,14 +172,14 @@ public abstract class TOOL_Gregtech_Base implements Interface_ToolStats {
public void onStatsAddedToTool(final Gregtech_MetaTool aItem, final int aID) {}
@Override
- public float getNormalDamageAgainstEntity(
- final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, final EntityPlayer aPlayer) {
+ public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack,
+ final EntityPlayer aPlayer) {
return aOriginalDamage;
}
@Override
- public float getMagicDamageAgainstEntity(
- final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, final EntityPlayer aPlayer) {
+ public float getMagicDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack,
+ final EntityPlayer aPlayer) {
return aOriginalDamage;
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
index efdf8b18e9..bdd501ee99 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
@@ -1,16 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tools;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.tools.GT_Tool;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
-import gtPlusPlus.xmod.gregtech.common.items.behaviours.Behaviour_Choocher;
import java.util.Arrays;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
@@ -25,14 +17,24 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.event.world.BlockEvent;
+import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.tools.GT_Tool;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
+import gtPlusPlus.xmod.gregtech.common.items.behaviours.Behaviour_Choocher;
+
public class TOOL_Gregtech_Choocher extends GT_Tool {
- public static final List<String> mEffectiveList =
- Arrays.asList(new String[] {EntityIronGolem.class.getName(), "EntityTowerGuardian"});
+ public static final List<String> mEffectiveList = Arrays
+ .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" });
@Override
- public float getNormalDamageAgainstEntity(
- final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, final EntityPlayer aPlayer) {
+ public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack,
+ final EntityPlayer aPlayer) {
String tName = aEntity.getClass().getName();
tName = tName.substring(tName.lastIndexOf(".") + 1);
return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;
@@ -120,12 +122,9 @@ public class TOOL_Gregtech_Choocher extends GT_Tool {
@Override
public boolean isMinableBlock(final Block aBlock, final byte aMetaData) {
final String tTool = aBlock.getHarvestTool(aMetaData);
- return ((tTool != null)
- && ((tTool.equals("sword"))
- || (tTool.equals("wrench"))
- || (tTool.equals("hammer"))
- || (tTool.equals("pickaxe"))))
- || (aBlock.getMaterial() == Material.rock)
+ return ((tTool != null) && ((tTool.equals("sword")) || (tTool.equals("wrench"))
+ || (tTool.equals("hammer"))
+ || (tTool.equals("pickaxe")))) || (aBlock.getMaterial() == Material.rock)
|| (aBlock.getMaterial() == Material.glass)
|| (aBlock.getMaterial() == Material.piston)
|| (aBlock == Blocks.hopper)
@@ -155,26 +154,20 @@ public class TOOL_Gregtech_Choocher extends GT_Tool {
}
@Override
- public int convertBlockDrops(
- final List<ItemStack> aDrops,
- final ItemStack aStack,
- final EntityPlayer aPlayer,
- final Block aBlock,
- final int aX,
- final int aY,
- final int aZ,
- final byte aMetaData,
- final int aFortune,
- final boolean aSilkTouch,
- final BlockEvent.HarvestDropsEvent aEvent) {
+ public int convertBlockDrops(final List<ItemStack> aDrops, final ItemStack aStack, final EntityPlayer aPlayer,
+ final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData, final int aFortune,
+ final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) {
int rConversions = 0;
- GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(
- null, true, 2147483647L, null, new ItemStack[] {new ItemStack(aBlock, 1, aMetaData)});
+ GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes
+ .findRecipe(null, true, 2147483647L, null, new ItemStack[] { new ItemStack(aBlock, 1, aMetaData) });
if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
for (final ItemStack tDrop : aDrops) {
tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(
- null, true, 2147483647L, null, new ItemStack[] {GT_Utility.copyAmount(1L, new Object[] {tDrop})
- });
+ null,
+ true,
+ 2147483647L,
+ null,
+ new ItemStack[] { GT_Utility.copyAmount(1L, new Object[] { tDrop }) });
if (tRecipe != null) {
final ItemStack tHammeringOutput = tRecipe.getOutput(0);
if (tHammeringOutput != null) {
@@ -216,15 +209,18 @@ public class TOOL_Gregtech_Choocher extends GT_Tool {
try {
GT_Mod.achievements.issueAchievement(aPlayer, "tools");
GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
- } catch (final Exception e) {
- }
+ } catch (final Exception e) {}
}
@Override
public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) {
- return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE
- + " has been Choochered by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ return new ChatComponentText(
+ EnumChatFormatting.RED + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " has been Choochered by "
+ + EnumChatFormatting.GREEN
+ + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java
index 06e429514e..1580119238 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java
@@ -1,16 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tools;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.Textures.ItemIcons;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_None;
-import gregtech.common.tools.GT_Tool;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
import java.util.Arrays;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.entity.Entity;
@@ -23,14 +15,24 @@ import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
+import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures.ItemIcons;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.items.behaviors.Behaviour_None;
+import gregtech.common.tools.GT_Tool;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
+
public class TOOL_Gregtech_ElectricButcherKnife extends GT_Tool {
- public static final List<String> mEffectiveList =
- Arrays.asList(new String[] {EntityIronGolem.class.getName(), "EntityTowerGuardian"});
+ public static final List<String> mEffectiveList = Arrays
+ .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" });
@Override
- public float getNormalDamageAgainstEntity(
- final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, final EntityPlayer aPlayer) {
+ public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack,
+ final EntityPlayer aPlayer) {
String tName = aEntity.getClass().getName();
tName = tName.substring(tName.lastIndexOf(".") + 1);
return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;
@@ -136,15 +138,18 @@ public class TOOL_Gregtech_ElectricButcherKnife extends GT_Tool {
try {
GT_Mod.achievements.issueAchievement(aPlayer, "tools");
GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
- } catch (final Exception e) {
- }
+ } catch (final Exception e) {}
}
@Override
public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) {
- return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE
- + " has been Sliced out of existence by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ return new ChatComponentText(
+ EnumChatFormatting.RED + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " has been Sliced out of existence by "
+ + EnumChatFormatting.GREEN
+ + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
@Override
@@ -179,6 +184,6 @@ public class TOOL_Gregtech_ElectricButcherKnife extends GT_Tool {
@Override
public int[] getEnchantmentLevels(ItemStack aStack) {
- return new int[] {(4 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2};
+ return new int[] { (4 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2 };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java
index b1f4385a11..f14af8b988 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java
@@ -1,16 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.tools;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.Textures.ItemIcons;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.tools.GT_Tool;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
-import gtPlusPlus.xmod.gregtech.common.items.behaviours.Behaviour_Electric_Lighter;
import java.util.Arrays;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -22,14 +14,24 @@ import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
+import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures.ItemIcons;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.tools.GT_Tool;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
+import gtPlusPlus.xmod.gregtech.common.items.behaviours.Behaviour_Electric_Lighter;
+
public class TOOL_Gregtech_ElectricLighter extends GT_Tool {
- public static final List<String> mEffectiveList =
- Arrays.asList(new String[] {EntityIronGolem.class.getName(), "EntityTowerGuardian"});
+ public static final List<String> mEffectiveList = Arrays
+ .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" });
@Override
- public float getNormalDamageAgainstEntity(
- final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, final EntityPlayer aPlayer) {
+ public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack,
+ final EntityPlayer aPlayer) {
String tName = aEntity.getClass().getName();
tName = tName.substring(tName.lastIndexOf(".") + 1);
return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;
@@ -139,15 +141,18 @@ public class TOOL_Gregtech_ElectricLighter extends GT_Tool {
try {
GT_Mod.achievements.issueAchievement(aPlayer, "tools");
GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
- } catch (final Exception e) {
- }
+ } catch (final Exception e) {}
}
@Override
public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) {
- return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE
- + " has been burnt out of existence by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ return new ChatComponentText(
+ EnumChatFormatting.RED + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " has been burnt out of existence by "
+ + EnumChatFormatting.GREEN
+ + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java
index ae477cd7bb..9586896fc9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java
@@ -1,12 +1,5 @@
package gtPlusPlus.xmod.gregtech.common.tools;
-import gregtech.GT_Mod;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.Textures.ItemIcons;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.tools.GT_Tool_WireCutter;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -15,6 +8,14 @@ import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
+import gregtech.GT_Mod;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures.ItemIcons;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.tools.GT_Tool_WireCutter;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
+
public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter {
@Override
@@ -77,14 +78,17 @@ public class TOOL_Gregtech_ElectricSnips extends GT_Tool_WireCutter {
try {
GT_Mod.achievements.issueAchievement(aPlayer, "tools");
GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
- } catch (final Exception e) {
- }
+ } catch (final Exception e) {}
}
@Override
public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) {
- return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE
- + " has been Snipped out of existence by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ return new ChatComponentText(
+ EnumChatFormatting.RED + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " has been Snipped out of existence by "
+ + EnumChatFormatting.GREEN
+ + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
index 894d45ee39..980efc1bdb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.lang.reflect.*;
+import java.util.HashMap;
+import java.util.Map;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gtPlusPlus.api.objects.Logger;
@@ -8,9 +12,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.*;
-import java.util.HashMap;
-import java.util.Map;
public class GT_Material_Loader {
@@ -43,14 +44,16 @@ public class GT_Material_Loader {
// Make this class Dynamically implement IMaterialHandler
if (mProxyObject == null) {
mProxyObject = Proxy.newProxyInstance(
- mInterface.getClassLoader(), new Class[] {mInterface}, new MaterialHandler(getInstance()));
+ mInterface.getClassLoader(),
+ new Class[] { mInterface },
+ new MaterialHandler(getInstance()));
}
if (ReflectionUtils.invoke(
Materials.class,
"add",
- new Class[] {ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler")},
- new Object[] {mProxyObject})) {
+ new Class[] { ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler") },
+ new Object[] { mProxyObject })) {
Logger.REFLECTION("Successfully invoked add, on the proxied object implementing IMaterialHandler.");
Logger.REFLECTION("Examining Proxy to ensure it implements the correct Interface.");
@@ -134,17 +137,22 @@ public class GT_Material_Loader {
enableComponent.invoke(prefix, mMaterial);
Logger.DEBUG_MATERIALS("Enabled " + prefix.name() + " for " + mMaterial.mDefaultLocalName + ".");
return true;
- } catch (IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException
- | NoSuchMethodException
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
| SecurityException error) {
- Logger.DEBUG_MATERIALS("Failed to enabled " + prefix.name() + " for " + mMaterial.mDefaultLocalName
- + ". Caught " + error.getCause().toString() + ".");
+ Logger.DEBUG_MATERIALS(
+ "Failed to enabled " + prefix.name()
+ + " for "
+ + mMaterial.mDefaultLocalName
+ + ". Caught "
+ + error.getCause().toString()
+ + ".");
error.printStackTrace();
}
- Logger.DEBUG_MATERIALS("Did not enable " + prefix.name() + " for " + mMaterial.mDefaultLocalName
- + ". Report this error to Alkalus on Github.");
+ Logger.DEBUG_MATERIALS(
+ "Did not enable " + prefix.name()
+ + " for "
+ + mMaterial.mDefaultLocalName
+ + ". Report this error to Alkalus on Github.");
return false;
}
@@ -169,8 +177,9 @@ public class GT_Material_Loader {
}
return mValid > 0;
} catch (SecurityException | IllegalArgumentException e) {
- Logger.DEBUG_MATERIALS("Total Failure - Unable to re-enable " + MaterialUtils.getMaterialName(material)
- + ". Most likely an IllegalArgumentException, but small chance it's a SecurityException.");
+ Logger.DEBUG_MATERIALS(
+ "Total Failure - Unable to re-enable " + MaterialUtils.getMaterialName(material)
+ + ". Most likely an IllegalArgumentException, but small chance it's a SecurityException.");
return false;
}
}
@@ -203,77 +212,29 @@ public class GT_Material_Loader {
}
/*
- public static class ProxyListener implements java.lang.reflect.InvocationHandler {
-
- public static Object IMaterialHandlerProxy;
-
- ProxyListener(){
-
- Logger.REFLECTION("Failed setting IMaterialHandler Proxy instance.");
- }
-
- //Loading the class at runtime
- public static void main(String[] args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException {
- Class<?> someInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler");
- Object instance = Proxy.newProxyInstance(someInterface.getClassLoader(), new Class<?>[]{someInterface}, new InvocationHandler() {
-
- @Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- //Handle the invocations
- if(method.getName().equals("onMaterialsInit")){
- Logger.REFLECTION("Invoked onMaterialsInit() via IMaterialHandler proxy");
- return 1;
- }
- else if(method.getName().equals("onComponentInit")){
- Logger.REFLECTION("Invoked onComponentInit() via IMaterialHandler proxy");
- return 2;
- }
- else if(method.getName().equals("onComponentIteration")){
- Logger.REFLECTION("Invoked onComponentIteration() via IMaterialHandler proxy");
- return 3;
- }
- else {
- return -1;
- }
- }
- });
- System.out.println(instance.getClass().getDeclaredMethod("someMethod", (Class<?>[])null).invoke(instance, new Object[]{}));
- }
-
- private static class MaterialHandler implements InvocationHandler {
- private final Object original;
-
- public MaterialHandler(Object original) {
- this.original = original;
- }
-
- @Override
- public Object invoke(Object proxy, Method method, Object[] args)
- throws IllegalAccessException, IllegalArgumentException,
- InvocationTargetException {
- System.out.println("BEFORE");
- method.invoke(original, args);
- System.out.println("AFTER");
- return null;
- }
- }
-
- public static void init(){
-
- Class<?> someInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler");
- GT_Material_Loader original = GT_Material_Loader.instance;
- MaterialHandler handler = new MaterialHandler(original);
-
- Object f = Proxy.newProxyInstance(someInterface.getClassLoader(),
- new Class[] { someInterface },
- handler);
-
- f.originalMethod("Hallo");
- }
-
-
-
- }
-
+ * public static class ProxyListener implements java.lang.reflect.InvocationHandler { public static Object
+ * IMaterialHandlerProxy; ProxyListener(){ Logger.REFLECTION("Failed setting IMaterialHandler Proxy instance."); }
+ * //Loading the class at runtime public static void main(String[] args) throws IllegalAccessException,
+ * IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException,
+ * ClassNotFoundException { Class<?> someInterface =
+ * ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler"); Object instance =
+ * Proxy.newProxyInstance(someInterface.getClassLoader(), new Class<?>[]{someInterface}, new InvocationHandler() {
+ * @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { //Handle the
+ * invocations if(method.getName().equals("onMaterialsInit")){
+ * Logger.REFLECTION("Invoked onMaterialsInit() via IMaterialHandler proxy"); return 1; } else
+ * if(method.getName().equals("onComponentInit")){
+ * Logger.REFLECTION("Invoked onComponentInit() via IMaterialHandler proxy"); return 2; } else
+ * if(method.getName().equals("onComponentIteration")){
+ * Logger.REFLECTION("Invoked onComponentIteration() via IMaterialHandler proxy"); return 3; } else { return -1; } }
+ * }); System.out.println(instance.getClass().getDeclaredMethod("someMethod", (Class<?>[])null).invoke(instance, new
+ * Object[]{})); } private static class MaterialHandler implements InvocationHandler { private final Object
+ * original; public MaterialHandler(Object original) { this.original = original; }
+ * @Override public Object invoke(Object proxy, Method method, Object[] args) throws IllegalAccessException,
+ * IllegalArgumentException, InvocationTargetException { System.out.println("BEFORE"); method.invoke(original,
+ * args); System.out.println("AFTER"); return null; } } public static void init(){ Class<?> someInterface =
+ * ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler"); GT_Material_Loader original =
+ * GT_Material_Loader.instance; MaterialHandler handler = new MaterialHandler(original); Object f =
+ * Proxy.newProxyInstance(someInterface.getClassLoader(), new Class[] { someInterface }, handler);
+ * f.originalMethod("Hallo"); } }
*/
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
index f43a255534..247cdb890b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -16,36 +18,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import net.minecraft.item.ItemStack;
public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, Runnable {
+
public ProcessingAngleGrinder() {
GregtechOrePrefixes.toolAngleGrinder.add(this);
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
if (aMaterial != Materials.Rubber) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))) {}
}
}
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final GT_Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
// TODO Auto-generated method stub
}
@@ -58,12 +51,10 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
Materials aMaterial = null;
for (int r = 0; r < size; r++) {
aMaterial = i[r];
- if ((aMaterial != Materials.Stone)
- && (aMaterial != Materials.Flint)
+ if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
&& (aMaterial != Materials.Rubber)
&& (aMaterial != Materials._NULL)) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))
&& (!aMaterial.contains(SubTag.TRANSPARENT))
&& (!aMaterial.contains(SubTag.FLAMMABLE))
@@ -83,8 +74,11 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
} else {
Logger.MATERIALS(
"Unable to generate Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial)
- + ", Plate or Long Rod may be invalid. Invalid | Plate? " + (plate == null)
- + " | Rod? " + (longrod == null) + " |");
+ + ", Plate or Long Rod may be invalid. Invalid | Plate? "
+ + (plate == null)
+ + " | Rod? "
+ + (longrod == null)
+ + " |");
}
// GT_ModHandler.addCraftingRecipe(,
// GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
@@ -113,38 +107,27 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R
public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) {
ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
- MetaGeneratedGregtechTools.ANGLE_GRINDER, 1, aMaterial, Materials.Titanium, new long[] {
- aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L
- });
+ MetaGeneratedGregtechTools.ANGLE_GRINDER,
+ 1,
+ aMaterial,
+ Materials.Titanium,
+ new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L });
long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
if (aDura <= 32000) {
- Logger.MATERIALS("Unable to generate Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial)
- + ", Durability: " + aDura);
+ Logger.MATERIALS(
+ "Unable to generate Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial)
+ + ", Durability: "
+ + aDura);
return false;
}
return GT_ModHandler.addCraftingRecipe(
aOutputStack,
RecipeBits.DISMANTLEABLE | RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | RecipeBits.BUFFERED,
- new Object[] {
- "SXL",
- "GMG",
- "PBP",
- 'X',
- ItemList.Component_Grinder_Tungsten.get(1),
- 'M',
- CI.getElectricMotor(aVoltageTier, 1),
- 'S',
- OrePrefixes.screw.get(Materials.Titanium),
- 'L',
- OrePrefixes.stickLong.get(aMaterial),
- 'P',
- OrePrefixes.plate.get(aMaterial),
- 'G',
- ELEMENT.STANDALONE.BLACK_METAL.getGear(1),
- 'B',
- aBattery
- });
+ new Object[] { "SXL", "GMG", "PBP", 'X', ItemList.Component_Grinder_Tungsten.get(1), 'M',
+ CI.getElectricMotor(aVoltageTier, 1), 'S', OrePrefixes.screw.get(Materials.Titanium), 'L',
+ OrePrefixes.stickLong.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'G',
+ ELEMENT.STANDALONE.BLACK_METAL.getGear(1), 'B', aBattery });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java
index 43c9d31727..f1493f2e63 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -15,36 +17,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import net.minecraft.item.ItemStack;
public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegistrator, Runnable {
+
public ProcessingElectricButcherKnife() {
GregtechOrePrefixes.toolElectricButcherKnife.add(this);
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
if (aMaterial != Materials.Rubber) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))) {}
}
}
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final GT_Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
// TODO Auto-generated method stub
}
@@ -57,12 +50,10 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist
Materials aMaterial = null;
for (int r = 0; r < size; r++) {
aMaterial = i[r];
- if ((aMaterial != Materials.Stone)
- && (aMaterial != Materials.Flint)
+ if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
&& (aMaterial != Materials.Rubber)
&& (aMaterial != Materials._NULL)) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))
&& (!aMaterial.contains(SubTag.TRANSPARENT))
&& (!aMaterial.contains(SubTag.FLAMMABLE))
@@ -81,10 +72,13 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist
addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1));
used++;
} else {
- Logger.MATERIALS("Unable to generate Electric Butcher Knife from "
- + MaterialUtils.getMaterialName(aMaterial)
- + ", Plate or Long Rod may be invalid. Invalid | Plate? " + (plate == null) + " | Rod? "
- + " |");
+ Logger.MATERIALS(
+ "Unable to generate Electric Butcher Knife from "
+ + MaterialUtils.getMaterialName(aMaterial)
+ + ", Plate or Long Rod may be invalid. Invalid | Plate? "
+ + (plate == null)
+ + " | Rod? "
+ + " |");
}
// GT_ModHandler.addCraftingRecipe(,
// GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
@@ -93,8 +87,9 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist
// Character.valueOf('P'), OrePrefixes.plate.get(aMaterial),
// Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)});
} else {
- Logger.MATERIALS("Unable to generate Electric Butcher Knife from "
- + MaterialUtils.getMaterialName(aMaterial));
+ Logger.MATERIALS(
+ "Unable to generate Electric Butcher Knife from "
+ + MaterialUtils.getMaterialName(aMaterial));
}
} else {
Logger.MATERIALS(
@@ -114,17 +109,21 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist
public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) {
ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
- MetaGeneratedGregtechTools.ELECTRIC_BUTCHER_KNIFE, 1, aMaterial, Materials.Titanium, new long[] {
- aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L
- });
+ MetaGeneratedGregtechTools.ELECTRIC_BUTCHER_KNIFE,
+ 1,
+ aMaterial,
+ Materials.Titanium,
+ new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L });
- ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null);
+ ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null);
long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
if (aDura <= 32000) {
- Logger.MATERIALS("Unable to generate Electric Butcher Knife from "
- + MaterialUtils.getMaterialName(aMaterial) + ", Durability: " + aDura);
+ Logger.MATERIALS(
+ "Unable to generate Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial)
+ + ", Durability: "
+ + aDura);
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java
index 5d6e87b204..ee1cbc2744 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -16,36 +18,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import net.minecraft.item.ItemStack;
public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator, Runnable {
+
public ProcessingElectricLighter() {
GregtechOrePrefixes.toolElectricLighter.add(this);
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
if (aMaterial != Materials.Rubber) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))) {}
}
}
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final GT_Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
// TODO Auto-generated method stub
}
@@ -58,12 +51,10 @@ public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator
Materials aMaterial = null;
for (int r = 0; r < size; r++) {
aMaterial = i[r];
- if ((aMaterial != Materials.Stone)
- && (aMaterial != Materials.Flint)
+ if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
&& (aMaterial != Materials.Rubber)
&& (aMaterial != Materials._NULL)) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))
&& (!aMaterial.contains(SubTag.TRANSPARENT))
&& (!aMaterial.contains(SubTag.FLAMMABLE))
@@ -82,8 +73,10 @@ public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator
} else {
Logger.MATERIALS(
"Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)
- + ", Plate or Long Rod may be invalid. Invalid | Plate? " + (plate == null)
- + " | Rod? " + " |");
+ + ", Plate or Long Rod may be invalid. Invalid | Plate? "
+ + (plate == null)
+ + " | Rod? "
+ + " |");
}
// GT_ModHandler.addCraftingRecipe(,
// GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
@@ -113,17 +106,21 @@ public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator
public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) {
ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
- MetaGeneratedGregtechTools.ELECTRIC_LIGHTER, 1, aMaterial, Materials.Titanium, new long[] {
- aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L
- });
+ MetaGeneratedGregtechTools.ELECTRIC_LIGHTER,
+ 1,
+ aMaterial,
+ Materials.Titanium,
+ new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L });
- ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, aMaterial, aMaterial, null);
+ ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, aMaterial, aMaterial, null);
long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
if (aDura <= 32000) {
- Logger.MATERIALS("Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)
- + ", Durability: " + aDura);
+ Logger.MATERIALS(
+ "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)
+ + ", Durability: "
+ + aDura);
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
index 9ea8eaf867..a431d4a500 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -16,36 +18,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import net.minecraft.item.ItemStack;
public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, Runnable {
+
public ProcessingElectricSnips() {
GregtechOrePrefixes.toolElectricSnips.add(this);
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
if (aMaterial != Materials.Rubber) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))) {}
}
}
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final GT_Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
// TODO Auto-generated method stub
}
@@ -58,12 +51,10 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
Materials aMaterial = null;
for (int r = 0; r < size; r++) {
aMaterial = i[r];
- if ((aMaterial != Materials.Stone)
- && (aMaterial != Materials.Flint)
+ if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
&& (aMaterial != Materials.Rubber)
&& (aMaterial != Materials._NULL)) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))
&& (!aMaterial.contains(SubTag.TRANSPARENT))
&& (!aMaterial.contains(SubTag.FLAMMABLE))
@@ -82,8 +73,10 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
} else {
Logger.MATERIALS(
"Unable to generate Electric Snips from " + MaterialUtils.getMaterialName(aMaterial)
- + ", Plate or Long Rod may be invalid. Invalid | Plate? " + (plate == null)
- + " | Rod? " + " |");
+ + ", Plate or Long Rod may be invalid. Invalid | Plate? "
+ + (plate == null)
+ + " | Rod? "
+ + " |");
}
// GT_ModHandler.addCraftingRecipe(,
// GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
@@ -112,17 +105,21 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) {
ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
- MetaGeneratedGregtechTools.ELECTRIC_SNIPS, 1, aMaterial, Materials.Titanium, new long[] {
- aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L
- });
+ MetaGeneratedGregtechTools.ELECTRIC_SNIPS,
+ 1,
+ aMaterial,
+ Materials.Titanium,
+ new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L });
- ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
- GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null);
+ ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE
+ .getToolWithStats(GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null);
long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
if (aDura <= 32000) {
- Logger.MATERIALS("Unable to generate Electric Snips from " + MaterialUtils.getMaterialName(aMaterial)
- + ", Durability: " + aDura);
+ Logger.MATERIALS(
+ "Unable to generate Electric Snips from " + MaterialUtils.getMaterialName(aMaterial)
+ + ", Durability: "
+ + aDura);
return false;
}
return RecipeUtils.addShapedRecipe(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
index a9011ca3bc..7e02cfba09 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
@@ -9,42 +11,33 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import net.minecraft.item.ItemStack;
public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrator, Runnable {
+
public ProcessingToolHeadChoocher() {
GregtechOrePrefixes.toolSkookumChoocher.add(this);
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
if (aMaterial != Materials.Rubber) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))) {
GT_ModHandler.addCraftingRecipe(
MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(16, 1, aMaterial, aMaterial, null),
GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"IhI", "III", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial)
- });
+ new Object[] { "IhI", "III", " I ", Character.valueOf('I'),
+ OrePrefixes.ingot.get(aMaterial) });
}
}
}
}
@Override
- public void registerOre(
- final GregtechOrePrefixes aPrefix,
- final GT_Materials aMaterial,
- final String aOreDictName,
- final String aModName,
- final ItemStack aStack) {
+ public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName,
+ final String aModName, final ItemStack aStack) {
// TODO Auto-generated method stub
}
@@ -57,12 +50,10 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato
Materials aMaterial = null;
for (int r = 0; r < size; r++) {
aMaterial = i[r];
- if ((aMaterial != Materials.Stone)
- && (aMaterial != Materials.Flint)
+ if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)
&& (aMaterial != Materials.Rubber)
&& (aMaterial != Materials._NULL)) {
- if ((!aMaterial.contains(SubTag.WOOD))
- && (!aMaterial.contains(SubTag.BOUNCY))
+ if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY))
&& (!aMaterial.contains(SubTag.NO_SMASHING))
&& (!aMaterial.contains(SubTag.TRANSPARENT))
&& (!aMaterial.contains(SubTag.FLAMMABLE))
@@ -76,8 +67,7 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato
final ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L);
final ItemStack hammerhead = GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L);
- if ((null != plate)
- && (null != ingot)
+ if ((null != plate) && (null != ingot)
&& (null != hammerhead)
&& (null != longrod)
&& (null != screw)) {
@@ -92,12 +82,22 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato
screw,
null,
MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(
- MetaGeneratedGregtechTools.SKOOKUM_CHOOCHER, 1, aMaterial, null, null));
+ MetaGeneratedGregtechTools.SKOOKUM_CHOOCHER,
+ 1,
+ aMaterial,
+ null,
+ null));
used++;
} else {
- Logger.WARNING("" + aMaterial.name() + " could not be used for all input compoenents. [3x"
- + aMaterial.name() + " plates, 2x" + aMaterial.name() + " ingots, 1x" + aMaterial.name()
- + " Hard Hammer Head.");
+ Logger.WARNING(
+ "" + aMaterial.name()
+ + " could not be used for all input compoenents. [3x"
+ + aMaterial.name()
+ + " plates, 2x"
+ + aMaterial.name()
+ + " ingots, 1x"
+ + aMaterial.name()
+ + " Hard Hammer Head.");
}
// GT_ModHandler.addCraftingRecipe(, GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
// GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", Character.valueOf('I'),
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java
index c2f0d1e623..28d0609e93 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java
@@ -1,13 +1,14 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashSet;
-import java.util.Set;
public class RecipeGen_AlloySmelter extends RecipeGen_Base {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java
index 90195a15e8..79a5947d66 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java
@@ -1,14 +1,16 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashSet;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
public class RecipeGen_Assembler extends RecipeGen_Base {
@@ -31,7 +33,7 @@ public class RecipeGen_Assembler extends RecipeGen_Base {
private void generateRecipes(final Material material) {
// Frame Box
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {material.getRod(1), material.getFrameBox(1)}))
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { material.getRod(1), material.getFrameBox(1) }))
GT_Values.RA.addAssemblerRecipe(
material.getRod(4),
ItemUtils.getGregtechCircuit(4),
@@ -41,22 +43,37 @@ public class RecipeGen_Assembler extends RecipeGen_Base {
// Rotor
if (ItemUtils.checkForInvalidItems(
- new ItemStack[] {material.getPlate(1), material.getRing(1), material.getRotor(1)}))
+ new ItemStack[] { material.getPlate(1), material.getRing(1), material.getRotor(1) }))
addAssemblerRecipe(
- material.getPlate(4), material.getRing(1), material.getRotor(1), 240, material.vVoltageMultiplier);
+ material.getPlate(4),
+ material.getRing(1),
+ material.getRotor(1),
+ 240,
+ material.vVoltageMultiplier);
}
- private static void addAssemblerRecipe(
- final ItemStack input1,
- final ItemStack input2,
- final ItemStack output1,
- final int seconds,
- final int euCost) {
+ private static void addAssemblerRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1,
+ final int seconds, final int euCost) {
GT_Values.RA.addAssemblerRecipe(
- input1, input2, FluidUtils.getFluidStack("molten.solderingalloy", 16), output1, seconds, euCost);
+ input1,
+ input2,
+ FluidUtils.getFluidStack("molten.solderingalloy", 16),
+ output1,
+ seconds,
+ euCost);
GT_Values.RA.addAssemblerRecipe(
- input1, input2, FluidUtils.getFluidStack("molten.tin", 32), output1, seconds, euCost);
+ input1,
+ input2,
+ FluidUtils.getFluidStack("molten.tin", 32),
+ output1,
+ seconds,
+ euCost);
GT_Values.RA.addAssemblerRecipe(
- input1, input2, FluidUtils.getFluidStack("molten.lead", 48), output1, seconds, euCost);
+ input1,
+ input2,
+ FluidUtils.getFluidStack("molten.lead", 48),
+ output1,
+ seconds,
+ euCost);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index b6b8a3f7ac..58f8d3e349 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -1,5 +1,12 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
@@ -15,11 +22,6 @@ import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeGen_BlastSmelter extends RecipeGen_Base {
@@ -45,14 +47,8 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
ItemStack tStack;
if (null != (tStack = M.getDust(1))) {
- final Material[] badMaterials = {
- FLUORIDES.THORIUM_HEXAFLUORIDE,
- FLUORIDES.THORIUM_TETRAFLUORIDE,
- ALLOY.BLOODSTEEL,
- NUCLIDE.LiFBeF2ThF4UF4,
- NUCLIDE.LiFBeF2ZrF4UF4,
- NUCLIDE.LiFBeF2ZrF4U235
- };
+ final Material[] badMaterials = { FLUORIDES.THORIUM_HEXAFLUORIDE, FLUORIDES.THORIUM_TETRAFLUORIDE,
+ ALLOY.BLOODSTEEL, NUCLIDE.LiFBeF2ThF4UF4, NUCLIDE.LiFBeF2ZrF4UF4, NUCLIDE.LiFBeF2ZrF4U235 };
for (final Material R : badMaterials) {
if (M == R) {
return;
@@ -71,13 +67,10 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
ItemStack circuitGT = ItemUtils.getGregtechCircuit(0);
// Set a duration - OLD
- /*int duration = 0;
- if (M.getMeltingPointK() > 150){
- duration = (int) Math.max(M.getMass() / 50L, 1L) * M.getMeltingPointK();
- }
- else {
- duration = (int) Math.max(M.getMass() / 50L, 1L) * 150;
- }*/
+ /*
+ * int duration = 0; if (M.getMeltingPointK() > 150){ duration = (int) Math.max(M.getMass() / 50L, 1L) *
+ * M.getMeltingPointK(); } else { duration = (int) Math.max(M.getMass() / 50L, 1L) * 150; }
+ */
long aVoltage = MaterialUtils.getVoltageForTier(M.vTier);
@@ -112,15 +105,24 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
// Make a simple one Material Materialstack[] and log it for validity.
circuitGT = ItemUtils.getGregtechCircuit(1);
- final ItemStack[] tItemStackTest = new ItemStack[] {circuitGT, tStack};
+ final ItemStack[] tItemStackTest = new ItemStack[] { circuitGT, tStack };
inputStackCount = 1;
fluidAmount = 144 * inputStackCount;
- Logger.WARNING("[BAS] Adding an Alloy Blast Smelter Recipe for " + M.getLocalizedName() + ". Gives "
- + fluidAmount + "L of molten metal.");
+ Logger.WARNING(
+ "[BAS] Adding an Alloy Blast Smelter Recipe for " + M.getLocalizedName()
+ + ". Gives "
+ + fluidAmount
+ + "L of molten metal.");
for (int das = 0; das < tItemStackTest.length; das++) {
if (tItemStackTest[das] != null) {
- Logger.WARNING("[BAS] tMaterial[" + das + "]: " + tItemStackTest[das].getDisplayName() + " Meta: "
- + tItemStackTest[das].getItemDamage() + ", Amount: " + tItemStackTest[das].stackSize);
+ Logger.WARNING(
+ "[BAS] tMaterial[" + das
+ + "]: "
+ + tItemStackTest[das].getDisplayName()
+ + " Meta: "
+ + tItemStackTest[das].getItemDamage()
+ + ", Amount: "
+ + tItemStackTest[das].stackSize);
}
}
@@ -137,18 +139,18 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
(int) aVoltage)) {
Logger.WARNING("[BAS] Success.");
Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe.");
- /*if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100, duration, 120)){
- Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
- }
- if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100, duration/9, 120)){
- Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
- }*/
- /*if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){
- Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
- }
- if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/9, 120)){
- Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
- }*/
+ /*
+ * if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100,
+ * duration, 120)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } if
+ * (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100,
+ * duration/9, 120)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); }
+ */
+ /*
+ * if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100,
+ * duration/4, 120)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); }
+ * if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100,
+ * duration/9, 120)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); }
+ */
}
} else {
Logger.WARNING("[BAS] Failed.");
@@ -162,20 +164,24 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
(int) aVoltage)) {
Logger.WARNING("[BAS] Success.");
if (GT_Values.RA.addFluidSolidifierRecipe(
- ItemList.Shape_Mold_Ingot.get(0), M.getFluidStack(144), M.getIngot(1), duration / 2, 60)) {
+ ItemList.Shape_Mold_Ingot.get(0),
+ M.getFluidStack(144),
+ M.getIngot(1),
+ duration / 2,
+ 60)) {
Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe.");
- /*if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100, duration/2, 60)){
- Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
- }
- if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100, duration/2/9, 60)){
- Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
- }*/
- /*if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/2/4, 60)){
- Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
- }
- if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/2/9, 60)){
- Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
- }*/
+ /*
+ * if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100,
+ * duration/2, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } if
+ * (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100,
+ * duration/2/9, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); }
+ */
+ /*
+ * if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100,
+ * duration/2/4, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); }
+ * if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100,
+ * duration/2/9, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); }
+ */
}
} else {
Logger.WARNING("[BAS] Failed.");
@@ -188,8 +194,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
// If this Material has some kind of compound list, proceed
if (mMaterialListSize > 1) {
- final gtPlusPlus.core.material.MaterialStack[] tempStack =
- new gtPlusPlus.core.material.MaterialStack[mMaterialListSize];
+ final gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize];
circuitGT = ItemUtils.getGregtechCircuit(mMaterialListSize);
// Just double checking
if (tempStack.length > 1) {
@@ -199,10 +204,8 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
for (final gtPlusPlus.core.material.MaterialStack xMaterial : M.getComposites()) {
if (xMaterial != null) {
if (xMaterial.getStackMaterial() != null) {
- Logger.WARNING("[BAS] FOUND: "
- + xMaterial.getStackMaterial().getLocalizedName());
- Logger.WARNING("[BAS] ADDING: "
- + xMaterial.getStackMaterial().getLocalizedName());
+ Logger.WARNING("[BAS] FOUND: " + xMaterial.getStackMaterial().getLocalizedName());
+ Logger.WARNING("[BAS] ADDING: " + xMaterial.getStackMaterial().getLocalizedName());
}
tempStack[ooo] = xMaterial;
}
@@ -218,21 +221,14 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
if (M.getComposites().get(irc) != null) {
final int r = (int) M.vSmallestRatio[irc];
inputStackCount = inputStackCount + r;
- if ((M.getComposites()
- .get(irc)
- .getStackMaterial()
- .getState()
- != MaterialState.SOLID)
- || !ItemUtils.checkForInvalidItems(
- M.getComposites().get(irc).getDustStack(r))) {
+ if ((M.getComposites().get(irc).getStackMaterial().getState() != MaterialState.SOLID)
+ || !ItemUtils
+ .checkForInvalidItems(M.getComposites().get(irc).getDustStack(r))) {
final int xr = r;
if ((xr > 0) && (xr <= 100)) {
final int mathmatics = (r * 1000);
componentsFluid = FluidUtils.getFluidStack(
- M.getComposites()
- .get(irc)
- .getStackMaterial()
- .getFluidStack(mathmatics),
+ M.getComposites().get(irc).getStackMaterial().getFluidStack(mathmatics),
mathmatics);
}
} else {
@@ -253,8 +249,10 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
components[fr] = components_NoCircuit[fr - 1];
}
}
- Logger.WARNING("[BAS] Should have added a circuit. mMaterialListSize: " + mMaterialListSize
- + " | circuit: " + components[0].getDisplayName());
+ Logger.WARNING(
+ "[BAS] Should have added a circuit. mMaterialListSize: " + mMaterialListSize
+ + " | circuit: "
+ + components[0].getDisplayName());
} else {
Logger.WARNING("[BAS] Did not add a circuit. mMaterialListSize: " + mMaterialListSize);
}
@@ -262,23 +260,36 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
// Set Fluid output
fluidAmount = 144 * inputStackCount;
- Logger.WARNING("[BAS] Adding an Alloy Blast Smelter Recipe for " + M.getLocalizedName()
- + " using it's compound dusts. This material has " + inputStackCount + " parts. Gives "
- + fluidAmount + "L of molten metal.");
+ Logger.WARNING(
+ "[BAS] Adding an Alloy Blast Smelter Recipe for " + M.getLocalizedName()
+ + " using it's compound dusts. This material has "
+ + inputStackCount
+ + " parts. Gives "
+ + fluidAmount
+ + "L of molten metal.");
Logger.WARNING("[BAS] tMaterial.length: " + components.length + ".");
for (int das = 0; das < components.length; das++) {
if (components[das] != null) {
- Logger.WARNING("[BAS] tMaterial[" + das + "]: " + components[das].getDisplayName()
- + " Meta: " + components[das].getItemDamage() + ", Amount: "
- + components[das].stackSize);
+ Logger.WARNING(
+ "[BAS] tMaterial[" + das
+ + "]: "
+ + components[das].getDisplayName()
+ + " Meta: "
+ + components[das].getItemDamage()
+ + ", Amount: "
+ + components[das].stackSize);
}
}
// Adds Recipe
if (M.requiresBlastFurnace()) {
if (CORE.RA.addBlastSmelterRecipe(
- components, componentsFluid, M.getFluidStack(fluidAmount), 100, duration, (int)
- aVoltage)) {
+ components,
+ componentsFluid,
+ M.getFluidStack(fluidAmount),
+ 100,
+ duration,
+ (int) aVoltage)) {
Logger.WARNING("[BAS] Success.");
} else {
Logger.WARNING("[BAS] Failed.");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
index 2e47eaf807..97807f3053 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.SubTag;
@@ -9,31 +12,20 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
- private final OrePrefixes[] mSmeltingPrefixes = {
- OrePrefixes.crushed,
- OrePrefixes.ingot,
- OrePrefixes.crushedPurified,
- OrePrefixes.crushedCentrifuged,
- OrePrefixes.dust,
- OrePrefixes.dustPure,
- OrePrefixes.dustImpure,
- OrePrefixes.dustRefined,
- OrePrefixes.dustSmall,
- OrePrefixes.dustTiny
- };
+ private final OrePrefixes[] mSmeltingPrefixes = { OrePrefixes.crushed, OrePrefixes.ingot,
+ OrePrefixes.crushedPurified, OrePrefixes.crushedCentrifuged, OrePrefixes.dust, OrePrefixes.dustPure,
+ OrePrefixes.dustImpure, OrePrefixes.dustRefined, OrePrefixes.dustSmall, OrePrefixes.dustTiny };
public RecipeGen_BlastSmelterGT_Ex() {
for (OrePrefixes tPrefix : this.mSmeltingPrefixes) tPrefix.add(this);
}
@Override
- public void registerOre(
- OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
+ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
+ ItemStack aStack) {
boolean keepHighTempRecipes = !CORE.GTNH;
@@ -45,14 +37,14 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
&& (!aMaterial.contains(SubTag.NO_SMELTING))) {
if (aMaterial.mBlastFurnaceRequired) {
addBlastRecipe(
- GT_Utility.copyAmount(1L, new Object[] {aStack}),
+ GT_Utility.copyAmount(1L, new Object[] { aStack }),
null,
null,
null,
aMaterial.mBlastFurnaceTemp > 1750
- ? GT_OreDictUnificator.get(
- OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L)
- : GT_Utility.copyAmount(1L, new Object[] {tDustStack}),
+ ? GT_OreDictUnificator
+ .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L)
+ : GT_Utility.copyAmount(1L, new Object[] { tDustStack }),
null,
(int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp,
120,
@@ -71,14 +63,14 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
&& (!aMaterial.contains(SubTag.NO_SMELTING))) {
if (aMaterial.mBlastFurnaceRequired) {
addBlastRecipe(
- GT_Utility.copyAmount(1L, new Object[] {aStack}),
+ GT_Utility.copyAmount(1L, new Object[] { aStack }),
null,
null,
null,
aMaterial.mBlastFurnaceTemp > 1750
- ? GT_OreDictUnificator.get(
- OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L)
- : GT_Utility.copyAmount(1L, new Object[] {tDustStack}),
+ ? GT_OreDictUnificator
+ .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L)
+ : GT_Utility.copyAmount(1L, new Object[] { tDustStack }),
null,
(int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp,
120,
@@ -91,7 +83,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
if (aMaterial.mBlastFurnaceRequired) {
addBlastRecipe(
- GT_Utility.copyAmount(4L, new Object[] {aStack}),
+ GT_Utility.copyAmount(4L, new Object[] { aStack }),
null,
null,
null,
@@ -114,7 +106,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) {
if (aMaterial.mBlastFurnaceRequired) {
addBlastRecipe(
- GT_Utility.copyAmount(9L, new Object[] {aStack}),
+ GT_Utility.copyAmount(9L, new Object[] { aStack }),
null,
null,
null,
@@ -122,8 +114,8 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
? GT_OreDictUnificator.get(
OrePrefixes.ingotHot,
aMaterial.mSmeltInto,
- GT_OreDictUnificator.get(
- OrePrefixes.ingot, aMaterial.mSmeltInto, 1L),
+ GT_OreDictUnificator
+ .get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L),
1L)
: GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L),
null,
@@ -139,17 +131,15 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
if (!aMaterial.contains(SubTag.NO_SMELTING)) {
if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) {
addBlastRecipe(
- GT_Utility.copyAmount(1L, new Object[] {aStack}),
+ GT_Utility.copyAmount(1L, new Object[] { aStack }),
null,
null,
null,
- aMaterial.mBlastFurnaceTemp > 1750
- ? GT_OreDictUnificator.get(
- OrePrefixes.ingotHot,
- aMaterial,
- GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
- 1L)
- : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
+ aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get(
+ OrePrefixes.ingotHot,
+ aMaterial,
+ GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
+ 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L),
null,
(int) Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp,
120,
@@ -165,16 +155,8 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
}
}
- public boolean addBlastRecipe(
- ItemStack input1,
- ItemStack input2,
- FluidStack fluid1,
- FluidStack fluid2,
- ItemStack output1,
- ItemStack output2,
- int time,
- int euCost,
- Materials smeltInto) {
+ public boolean addBlastRecipe(ItemStack input1, ItemStack input2, FluidStack fluid1, FluidStack fluid2,
+ ItemStack output1, ItemStack output2, int time, int euCost, Materials smeltInto) {
// Set up variables.
ItemStack[] components;
@@ -194,7 +176,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
}
// Set up input components.
ItemStack configCircuit = ItemUtils.getGregtechCircuit(count);
- components = new ItemStack[] {configCircuit, input1, input2};
+ components = new ItemStack[] { configCircuit, input1, input2 };
if (fluid1 != null || fluid2 != null) {
// If it uses an input fluid, we cannot handle this. So let's not try. (Annealed copper for example)
// return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
index f9e083a44a..bfd5fdc2cb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import gregtech.api.util.*;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.minecraft.ItemStackData;
@@ -8,12 +16,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
public class RecipeGen_BlastSmelterGT_GTNH {
@@ -46,13 +48,9 @@ public class RecipeGen_BlastSmelterGT_GTNH {
return null;
}
- private static boolean isValid(
- final ItemStack[] inputs,
- final ItemStack outputs[],
- final FluidStack[] fluidIn,
+ private static boolean isValid(final ItemStack[] inputs, final ItemStack outputs[], final FluidStack[] fluidIn,
final FluidStack fluidOut) {
- if (inputs != null
- && outputs != null
+ if (inputs != null && outputs != null
&& fluidIn != null
&& fluidOut != null
&& inputs.length > 0
@@ -83,8 +81,7 @@ public class RecipeGen_BlastSmelterGT_GTNH {
if (CORE.GTNH) {
mType = "ingot";
}
- if (oreName.startsWith(mType)
- && !oreName.contains("double")
+ if (oreName.startsWith(mType) && !oreName.contains("double")
&& !oreName.contains("triple")
&& !oreName.contains("quad")
&& !oreName.contains("quintuple")) {
@@ -98,8 +95,12 @@ public class RecipeGen_BlastSmelterGT_GTNH {
if (validInput != null && validOutput != null) {
ItemStackData R = new ItemStackData(validInput);
setIngotToFluid(R, validOutput);
- Logger.MACHINE_INFO("[ABS][I2F] Cached " + validInput.getDisplayName() + " to "
- + validOutput.getLocalizedName() + ". Stored Under ID of " + R.getUniqueDataIdentifier());
+ Logger.MACHINE_INFO(
+ "[ABS][I2F] Cached " + validInput.getDisplayName()
+ + " to "
+ + validOutput.getLocalizedName()
+ + ". Stored Under ID of "
+ + R.getUniqueDataIdentifier());
}
}
}
@@ -122,9 +123,14 @@ public class RecipeGen_BlastSmelterGT_GTNH {
ItemStackData R1 = new ItemStackData(validInput);
ItemStackData R2 = new ItemStackData(validOutput);
setHotToCold(R1, R2);
- Logger.MACHINE_INFO("[ABS][H2C] Cached " + validInput.getDisplayName() + " to "
- + validOutput.getDisplayName() + ". Stored Under ID of " + R1.getUniqueDataIdentifier()
- + ", links to ID " + R2.getUniqueDataIdentifier());
+ Logger.MACHINE_INFO(
+ "[ABS][H2C] Cached " + validInput.getDisplayName()
+ + " to "
+ + validOutput.getDisplayName()
+ + ". Stored Under ID of "
+ + R1.getUniqueDataIdentifier()
+ + ", links to ID "
+ + R2.getUniqueDataIdentifier());
}
}
}
@@ -159,9 +165,12 @@ public class RecipeGen_BlastSmelterGT_GTNH {
if (x.mOutputs != null && x.mOutputs[0] != null) {
mMoltenCount = x.mOutputs[0].stackSize;
ItemStackData R = new ItemStackData(x.mOutputs[0]);
- Logger.MACHINE_INFO("[ABS] Found " + x.mOutputs[0].getDisplayName()
- + " as valid EBF output, finding it's fluid from the cache. We will require "
- + (144 * mMoltenCount) + "L. Looking for ID " + R.getUniqueDataIdentifier());
+ Logger.MACHINE_INFO(
+ "[ABS] Found " + x.mOutputs[0].getDisplayName()
+ + " as valid EBF output, finding it's fluid from the cache. We will require "
+ + (144 * mMoltenCount)
+ + "L. Looking for ID "
+ + R.getUniqueDataIdentifier());
FluidStack tempFluid = getFluidFromIngot(R);
if (tempFluid != null) {
// Logger.MACHINE_INFO("[ABS] Got Fluid from Cache.");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index d3143b9706..ed8c18ba4b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.util.GT_ModHandler;
@@ -16,10 +22,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import java.util.HashSet;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeGen_DustGeneration extends RecipeGen_Base {
@@ -57,8 +59,8 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
Logger.INFO("9 Tiny dust to 1 Dust Recipe: " + M.getLocalizedName() + " - Failed");
}
- if (RecipeUtils.addShapedRecipe(
- normalDust, null, null, null, null, null, null, null, null, M.getTinyDust(9))) {
+ if (RecipeUtils
+ .addShapedRecipe(normalDust, null, null, null, null, null, null, null, null, M.getTinyDust(9))) {
Logger.INFO("9 Tiny dust from 1 Recipe: " + M.getLocalizedName() + " - Success");
} else {
Logger.INFO("9 Tiny dust from 1 Recipe: " + M.getLocalizedName() + " - Failed");
@@ -67,13 +69,22 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
if (smallDust != null && normalDust != null) {
if (RecipeUtils.addShapedRecipe(
- smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, normalDust)) {
+ smallDust,
+ smallDust,
+ null,
+ smallDust,
+ smallDust,
+ null,
+ null,
+ null,
+ null,
+ normalDust)) {
Logger.INFO("4 Small dust to 1 Dust Recipe: " + M.getLocalizedName() + " - Success");
} else {
Logger.INFO("4 Small dust to 1 Dust Recipe: " + M.getLocalizedName() + " - Failed");
}
- if (RecipeUtils.addShapedRecipe(
- null, normalDust, null, null, null, null, null, null, null, M.getSmallDust(4))) {
+ if (RecipeUtils
+ .addShapedRecipe(null, normalDust, null, null, null, null, null, null, null, M.getSmallDust(4))) {
Logger.INFO("4 Small dust from 1 Dust Recipe: " + M.getLocalizedName() + " - Success");
} else {
Logger.INFO("4 Small dust from 1 Dust Recipe: " + M.getLocalizedName() + " - Failed");
@@ -162,15 +173,10 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
input[0] = CI.getNumberedCircuit(inputStacks.length + 10);
}
- /*for (int g = 0; g<4; g++) {
- if(inputStacks.length > g) {
- input[g] = inputStacks[g] != null ? inputStacks[g] : null;
- }
- else {
- input[g] = CI.getNumberedCircuit(g+10);
- break;
- }
- }*/
+ /*
+ * for (int g = 0; g<4; g++) { if(inputStacks.length > g) { input[g] = inputStacks[g] != null ?
+ * inputStacks[g] : null; } else { input[g] = CI.getNumberedCircuit(g+10); break; } }
+ */
// Add mixer Recipe
FluidStack oxygen = GT_Values.NF;
@@ -213,14 +219,12 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
}
// Add Shapeless recipe for low tier alloys.
- /*if (tVoltageMultiplier <= 30){
- if (RecipeUtils.addShapedGregtechRecipe(inputStacks, outputStacks)){
- Logger.WARNING("Dust Shapeless Recipe: "+material.getLocalizedName()+" - Success");
- }
- else {
- Logger.WARNING("Dust Shapeless Recipe: "+material.getLocalizedName()+" - Failed");
- }
- }*/
+ /*
+ * if (tVoltageMultiplier <= 30){ if (RecipeUtils.addShapedGregtechRecipe(inputStacks,
+ * outputStacks)){
+ * Logger.WARNING("Dust Shapeless Recipe: "+material.getLocalizedName()+" - Success"); } else {
+ * Logger.WARNING("Dust Shapeless Recipe: "+material.getLocalizedName()+" - Failed"); } }
+ */
}
}
}
@@ -252,14 +256,11 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
// Get us four ItemStacks to input into the mixer
ItemStack input1, input2, input3, input4;
input1 = inputStacks[0];
- input2 = (inputStacks.length >= 2)
- ? (input2 = (inputStacks[1] == null) ? null : inputStacks[1])
+ input2 = (inputStacks.length >= 2) ? (input2 = (inputStacks[1] == null) ? null : inputStacks[1])
: null;
- input3 = (inputStacks.length >= 3)
- ? (input3 = (inputStacks[2] == null) ? null : inputStacks[2])
+ input3 = (inputStacks.length >= 3) ? (input3 = (inputStacks[2] == null) ? null : inputStacks[2])
: null;
- input4 = (inputStacks.length >= 4)
- ? (input4 = (inputStacks[3] == null) ? null : inputStacks[3])
+ input4 = (inputStacks.length >= 4) ? (input4 = (inputStacks[3] == null) ? null : inputStacks[3])
: null;
if (inputStacks.length == 1) {
@@ -286,14 +287,12 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
if (x != null) {
if (x.getStackMaterial() != null) {
if (x.getStackMaterial().getDust(1) == null) {
- MaterialState f =
- x.getStackMaterial().getState();
- if (f == MaterialState.GAS
- || f == MaterialState.LIQUID
+ MaterialState f = x.getStackMaterial().getState();
+ if (f == MaterialState.GAS || f == MaterialState.LIQUID
|| f == MaterialState.PURE_LIQUID
|| f == MaterialState.PURE_GAS) {
- oxygen = x.getStackMaterial().getFluidStack((int)
- (material.vSmallestRatio[compSlot] * 1000));
+ oxygen = x.getStackMaterial().getFluidStack(
+ (int) (material.vSmallestRatio[compSlot] * 1000));
}
}
}
@@ -341,19 +340,21 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
public static boolean generatePackagerRecipes(Material aMatInfo) {
AutoMap<Boolean> aResults = new AutoMap<Boolean>();
// Small Dust
- aResults.put(GT_Values.RA.addBoxingRecipe(
- GT_Utility.copyAmount(4L, new Object[] {aMatInfo.getSmallDust(4)}),
- ItemList.Schematic_Dust.get(0L, new Object[0]),
- aMatInfo.getDust(1),
- 100,
- 4));
+ aResults.put(
+ GT_Values.RA.addBoxingRecipe(
+ GT_Utility.copyAmount(4L, new Object[] { aMatInfo.getSmallDust(4) }),
+ ItemList.Schematic_Dust.get(0L, new Object[0]),
+ aMatInfo.getDust(1),
+ 100,
+ 4));
// Tiny Dust
- aResults.put(GT_Values.RA.addBoxingRecipe(
- GT_Utility.copyAmount(9L, new Object[] {aMatInfo.getTinyDust(9)}),
- ItemList.Schematic_Dust.get(0L, new Object[0]),
- aMatInfo.getDust(1),
- 100,
- 4));
+ aResults.put(
+ GT_Values.RA.addBoxingRecipe(
+ GT_Utility.copyAmount(9L, new Object[] { aMatInfo.getTinyDust(9) }),
+ ItemList.Schematic_Dust.get(0L, new Object[0]),
+ aMatInfo.getDust(1),
+ 100,
+ 4));
for (boolean b : aResults) {
if (!b) {
@@ -405,13 +406,8 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
}
}
- private boolean addBlastFurnaceRecipe(
- Material aMatInfo,
- final ItemStack input1,
- final ItemStack input2,
- final ItemStack output1,
- final ItemStack output2,
- final int tempRequired) {
+ private boolean addBlastFurnaceRecipe(Material aMatInfo, final ItemStack input1, final ItemStack input2,
+ final ItemStack output1, final ItemStack output2, final int tempRequired) {
try {
int timeTaken = 125 * aMatInfo.vTier * 10;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
index e675f2758f..3d2ed68a3f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
@@ -7,9 +12,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashSet;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
public class RecipeGen_Extruder extends RecipeGen_Base {
@@ -121,10 +123,10 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
material.getRod(2),
(int) Math.max(material.getMass() * 2L * 1, 1),
material.vVoltageMultiplier)) {
- Logger.WARNING("Extruder Rod Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Extruder Rod Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Extruder Rod Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Extruder Rod Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Bolt Recipe
if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1)))
@@ -143,8 +145,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
// Rotor Recipe
// Shape_Extruder_Rotor
- if (mRotorShapeEnabled
- && ItemUtils.checkForInvalidItems(material.getIngot(1))
+ if (mRotorShapeEnabled && ItemUtils.checkForInvalidItems(material.getIngot(1))
&& ItemUtils.checkForInvalidItems(material.getRotor(1)))
if (GT_Values.RA.addExtruderRecipe(
material.getIngot(5),
@@ -152,9 +153,9 @@ public class RecipeGen_Extruder extends RecipeGen_Base {
material.getRotor(1),
200,
60)) {
- Logger.WARNING("Extruder Rotor Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Extruder Rotor Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Extruder Rotor Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Extruder Rotor Recipe: " + material.getLocalizedName() + " - Failed");
+ }
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
index 4b1f407809..561c0884cd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
@@ -9,9 +14,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.util.HashSet;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeGen_FluidCanning implements Runnable {
@@ -60,30 +62,19 @@ public class RecipeGen_FluidCanning implements Runnable {
this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, null, null);
}
- public RecipeGen_FluidCanning(
- boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, FluidStack aFluidOut) {
+ public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn,
+ FluidStack aFluidOut) {
this(aExtracting, aEmpty, aFull, aFluidIn, aFluidOut, null, null);
}
- public RecipeGen_FluidCanning(
- boolean aExtracting,
- ItemStack aEmpty,
- ItemStack aFull,
- FluidStack aFluid,
- Integer aDuration,
- Integer aEUt) {
+ public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid,
+ Integer aDuration, Integer aEUt) {
this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, aDuration, aEUt);
}
// Alternative Constructor
- public RecipeGen_FluidCanning(
- boolean aExtracting,
- ItemStack aEmpty,
- ItemStack aFull,
- FluidStack aFluidIn,
- FluidStack aFluidOut,
- Integer aDuration,
- Integer aEUt) {
+ public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn,
+ FluidStack aFluidOut, Integer aDuration, Integer aEUt) {
ItemStack aInput;
ItemStack aOutput;
FluidStack aFluidInput;
@@ -91,8 +82,8 @@ public class RecipeGen_FluidCanning implements Runnable {
// Safety check on the duration
if (aDuration == null || aDuration <= 0) {
- aDuration =
- (aFluidIn != null) ? (aFluidIn.amount / 62) : ((aFluidOut != null) ? (aFluidOut.amount / 62) : 10);
+ aDuration = (aFluidIn != null) ? (aFluidIn.amount / 62)
+ : ((aFluidOut != null) ? (aFluidOut.amount / 62) : 10);
}
// Safety check on the EU
@@ -121,12 +112,12 @@ public class RecipeGen_FluidCanning implements Runnable {
GTPP_Recipe aRecipe = new GTPP_Recipe(
true,
- new ItemStack[] {aInput},
- new ItemStack[] {aOutput},
+ new ItemStack[] { aInput },
+ new ItemStack[] { aOutput },
null,
- new int[] {10000},
- new FluidStack[] {aFluidInput},
- new FluidStack[] {aFluidOutput},
+ new int[] { 10000 },
+ new FluidStack[] { aFluidInput },
+ new FluidStack[] { aFluidOutput },
aDuration,
aEUt,
0);
@@ -187,9 +178,15 @@ public class RecipeGen_FluidCanning implements Runnable {
boolean result = false;
CORE.crash();
Logger.INFO(
- "[FE-Debug] " + aRecipe.mFluidOutputs[0].amount + "L of " + aRecipe.mFluidOutputs[0].getLocalizedName()
- + " fluid extractor from 1 " + aRecipe.mInputs[0].getDisplayName() + " - Success. Time: "
- + aRecipe.mDuration + ", Voltage: " + aRecipe.mEUt);
+ "[FE-Debug] " + aRecipe.mFluidOutputs[0].amount
+ + "L of "
+ + aRecipe.mFluidOutputs[0].getLocalizedName()
+ + " fluid extractor from 1 "
+ + aRecipe.mInputs[0].getDisplayName()
+ + " - Success. Time: "
+ + aRecipe.mDuration
+ + ", Voltage: "
+ + aRecipe.mEUt);
int aCount1 = GT_Recipe_Map.sFluidExtractionRecipes.mRecipeList.size();
int aCount2 = aCount1;
GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(aRecipe);
@@ -201,10 +198,14 @@ public class RecipeGen_FluidCanning implements Runnable {
// "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+",
// "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs));
} else {
- Logger.INFO("[ERROR] Failed adding Extraction recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs)
- + ", " + ItemUtils.getArrayStackNames(aRecipe.mOutputs) + ", "
- + ItemUtils.getArrayStackNames(aRecipe.mFluidInputs) + ", "
- + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs));
+ Logger.INFO(
+ "[ERROR] Failed adding Extraction recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs)
+ + ", "
+ + ItemUtils.getArrayStackNames(aRecipe.mOutputs)
+ + ", "
+ + ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)
+ + ", "
+ + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs));
dumpStack();
}
return result;
@@ -223,10 +224,14 @@ public class RecipeGen_FluidCanning implements Runnable {
// "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+",
// "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs));
} else {
- Logger.INFO("[ERROR] Failed adding Canning recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs)
- + ", " + ItemUtils.getArrayStackNames(aRecipe.mOutputs) + ", "
- + ItemUtils.getArrayStackNames(aRecipe.mFluidInputs) + ", "
- + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs));
+ Logger.INFO(
+ "[ERROR] Failed adding Canning recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs)
+ + ", "
+ + ItemUtils.getArrayStackNames(aRecipe.mOutputs)
+ + ", "
+ + ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)
+ + ", "
+ + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs));
dumpStack();
}
return result;
@@ -235,16 +240,21 @@ public class RecipeGen_FluidCanning implements Runnable {
private void dumpStack() {
int parents = 2;
for (int i = 0; i < 6; i++) {
- Logger.INFO((disableOptional ? "EXTRACTING" : "CANNING") + " DEBUG | "
- + (i == 0 ? "Called from: " : "Parent: ") + ReflectionUtils.getMethodName(i + parents));
+ Logger.INFO(
+ (disableOptional ? "EXTRACTING" : "CANNING") + " DEBUG | "
+ + (i == 0 ? "Called from: " : "Parent: ")
+ + ReflectionUtils.getMethodName(i + parents));
}
}
private String buildLogString() {
int solidSize = getMapSize(GT_Recipe_Map.sCannerRecipes);
int fluidSize = getMapSize(GT_Recipe_Map.sFluidCannerRecipes);
- return (disableOptional ? "EXTRACTING" : "CANNING") + " DEBUG | Solids: " + solidSize + " | Liquids: "
- + fluidSize + " | ";
+ return (disableOptional ? "EXTRACTING" : "CANNING") + " DEBUG | Solids: "
+ + solidSize
+ + " | Liquids: "
+ + fluidSize
+ + " | ";
}
private final int getMapSize(GT_Recipe_Map aMap) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index 50827ae39a..9f12a591ff 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
@@ -8,8 +11,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashSet;
-import java.util.Set;
public class RecipeGen_Fluids extends RecipeGen_Base {
@@ -49,83 +50,73 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Making Shapes from fluid
// Ingot
- if (ItemUtils.checkForInvalidItems(material.getIngot(1)))
- if (GT_Values.RA.addFluidSolidifierRecipe(
- ItemList.Shape_Mold_Ingot.get(0), // Item Shape
- material.getFluidStack(144), // Fluid Input
- material.getIngot(1), // output
- 32, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING(
- "144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING(
- "144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ if (ItemUtils.checkForInvalidItems(material.getIngot(1))) if (GT_Values.RA.addFluidSolidifierRecipe(
+ ItemList.Shape_Mold_Ingot.get(0), // Item Shape
+ material.getFluidStack(144), // Fluid Input
+ material.getIngot(1), // output
+ 32, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING("144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Plate
- if (ItemUtils.checkForInvalidItems(material.getPlate(1)))
- if (GT_Values.RA.addFluidSolidifierRecipe(
- ItemList.Shape_Mold_Plate.get(0), // Item Shape
- material.getFluidStack(144), // Fluid Input
- material.getPlate(1), // output
- 32, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING(
- "144l fluid molder for 1 plate Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING(
- "144l fluid molder for 1 plate Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ if (ItemUtils.checkForInvalidItems(material.getPlate(1))) if (GT_Values.RA.addFluidSolidifierRecipe(
+ ItemList.Shape_Mold_Plate.get(0), // Item Shape
+ material.getFluidStack(144), // Fluid Input
+ material.getPlate(1), // output
+ 32, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING("144l fluid molder for 1 plate Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("144l fluid molder for 1 plate Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Nugget
- if (ItemUtils.checkForInvalidItems(material.getNugget(1)))
- if (GT_Values.RA.addFluidSolidifierRecipe(
- ItemList.Shape_Mold_Nugget.get(0), // Item Shape
- material.getFluidStack(16), // Fluid Input
- material.getNugget(1), // output
- 16, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING(
- "16l fluid molder for 1 nugget Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING(
- "16l fluid molder for 1 nugget Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ if (ItemUtils.checkForInvalidItems(material.getNugget(1))) if (GT_Values.RA.addFluidSolidifierRecipe(
+ ItemList.Shape_Mold_Nugget.get(0), // Item Shape
+ material.getFluidStack(16), // Fluid Input
+ material.getNugget(1), // output
+ 16, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING("16l fluid molder for 1 nugget Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("16l fluid molder for 1 nugget Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Gears
- if (ItemUtils.checkForInvalidItems(material.getGear(1)))
- if (GT_Values.RA.addFluidSolidifierRecipe(
- ItemList.Shape_Mold_Gear.get(0), // Item Shape
- material.getFluidStack(576), // Fluid Input
- material.getGear(1), // output
- 128, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING(
- "576l fluid molder for 1 gear Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("576l fluid molder for 1 gear Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ if (ItemUtils.checkForInvalidItems(material.getGear(1))) if (GT_Values.RA.addFluidSolidifierRecipe(
+ ItemList.Shape_Mold_Gear.get(0), // Item Shape
+ material.getFluidStack(576), // Fluid Input
+ material.getGear(1), // output
+ 128, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING("576l fluid molder for 1 gear Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("576l fluid molder for 1 gear Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Blocks
- if (ItemUtils.checkForInvalidItems(material.getBlock(1)))
- if (GT_Values.RA.addFluidSolidifierRecipe(
- ItemList.Shape_Mold_Block.get(0), // Item Shape
- material.getFluidStack(144 * 9), // Fluid Input
- material.getBlock(1), // output
- 288, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 block Recipe: " + material.getLocalizedName()
- + " - Success");
- } else {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 block Recipe: " + material.getLocalizedName()
- + " - Failed");
- }
+ if (ItemUtils.checkForInvalidItems(material.getBlock(1))) if (GT_Values.RA.addFluidSolidifierRecipe(
+ ItemList.Shape_Mold_Block.get(0), // Item Shape
+ material.getFluidStack(144 * 9), // Fluid Input
+ material.getBlock(1), // output
+ 288, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 block Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
+ } else {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 block Recipe: " + material.getLocalizedName() + " - Failed");
+ }
if (CORE.GTNH) {
@@ -146,105 +137,123 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Rod
if (ItemUtils.checkForInvalidItems(material.getRod(1)))
- if (mold_Rod != null
- && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Rod.get(0), // Item Shape
- material.getFluidStack(72), // Fluid Input
- material.getRod(1), // output
- 150, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 rod Recipe: " + material.getLocalizedName()
- + " - Success");
+ if (mold_Rod != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Rod.get(0), // Item Shape
+ material.getFluidStack(72), // Fluid Input
+ material.getRod(1), // output
+ 150, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rod Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
} else {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 rod Recipe: " + material.getLocalizedName()
- + " - Failed");
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rod Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
}
// Rod Long
if (ItemUtils.checkForInvalidItems(material.getLongRod(1)))
- if (mold_Rod_Long != null
- && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Rod_Long.get(0), // Item
- // Shape
- material.getFluidStack(144), // Fluid Input
- material.getLongRod(1), // output
- 300, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 rod long Recipe: "
- + material.getLocalizedName() + " - Success");
+ if (mold_Rod_Long != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Rod_Long.get(0), // Item
+ // Shape
+ material.getFluidStack(144), // Fluid Input
+ material.getLongRod(1), // output
+ 300, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rod long Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
} else {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 rod long Recipe: "
- + material.getLocalizedName() + " - Failed");
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rod long Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
}
// Bolt
if (ItemUtils.checkForInvalidItems(material.getBolt(1)))
- if (mold_Bolt != null
- && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Bolt.get(0), // Item Shape
- material.getFluidStack(18), // Fluid Input
- material.getBolt(1), // output
- 50, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 bolt Recipe: " + material.getLocalizedName()
- + " - Success");
+ if (mold_Bolt != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Bolt.get(0), // Item Shape
+ material.getFluidStack(18), // Fluid Input
+ material.getBolt(1), // output
+ 50, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 bolt Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
} else {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 bolt Recipe: " + material.getLocalizedName()
- + " - Failed");
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 bolt Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
}
// Screw
if (ItemUtils.checkForInvalidItems(material.getScrew(1)))
- if (mold_Screw != null
- && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Screw.get(0), // Item Shape
- material.getFluidStack(18), // Fluid Input
- material.getScrew(1), // output
- 50, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 screw Recipe: " + material.getLocalizedName()
- + " - Success");
+ if (mold_Screw != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Screw.get(0), // Item Shape
+ material.getFluidStack(18), // Fluid Input
+ material.getScrew(1), // output
+ 50, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 screw Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
} else {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 screw Recipe: " + material.getLocalizedName()
- + " - Failed");
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 screw Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
}
// Ring
if (ItemUtils.checkForInvalidItems(material.getRing(1)))
- if (mold_Ring != null
- && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Ring.get(0), // Item Shape
- material.getFluidStack(36), // Fluid Input
- material.getRing(1), // output
- 100, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 ring Recipe: " + material.getLocalizedName()
- + " - Success");
+ if (mold_Ring != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Ring.get(0), // Item Shape
+ material.getFluidStack(36), // Fluid Input
+ material.getRing(1), // output
+ 100, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 ring Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
} else {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 ring Recipe: " + material.getLocalizedName()
- + " - Failed");
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 ring Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
}
// Rotor
if (ItemUtils.checkForInvalidItems(material.getRotor(1)))
- if (mold_Rotor != null
- && GT_Values.RA.addFluidSolidifierRecipe(
- mold_Rotor.get(0), // Item Shape
- material.getFluidStack(612), // Fluid Input
- material.getRotor(1), // output
- 100, // Duration
- material.vVoltageMultiplier // Eu Tick
- )) {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 rotor Recipe: " + material.getLocalizedName()
- + " - Success");
+ if (mold_Rotor != null && GT_Values.RA.addFluidSolidifierRecipe(
+ mold_Rotor.get(0), // Item Shape
+ material.getFluidStack(612), // Fluid Input
+ material.getRotor(1), // output
+ 100, // Duration
+ material.vVoltageMultiplier // Eu Tick
+ )) {
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rotor Recipe: "
+ + material.getLocalizedName()
+ + " - Success");
} else {
- Logger.WARNING((144 * 9) + "l fluid molder from 1 rotor Recipe: " + material.getLocalizedName()
- + " - Failed");
+ Logger.WARNING(
+ (144 * 9) + "l fluid molder from 1 rotor Recipe: "
+ + material.getLocalizedName()
+ + " - Failed");
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
index 67819c8699..d1bcab904c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
@@ -13,10 +19,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import java.util.HashSet;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeGen_Fluorite extends RecipeGen_Base {
@@ -74,28 +76,55 @@ public class RecipeGen_Fluorite extends RecipeGen_Base {
final ItemStack tinyDust = material.getTinyDust(1);
if (RecipeUtils.addShapedRecipe(
- tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, normalDust)) {
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ normalDust)) {
Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed");
}
- if (RecipeUtils.addShapedRecipe(
- normalDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) {
+ if (RecipeUtils
+ .addShapedRecipe(normalDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) {
Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Failed");
}
if (RecipeUtils.addShapedRecipe(
- smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, normalDust)) {
+ smallDust,
+ smallDust,
+ null,
+ smallDust,
+ smallDust,
+ null,
+ null,
+ null,
+ null,
+ normalDust)) {
Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed");
}
if (RecipeUtils.addShapedRecipe(
- null, normalDust, null, null, null, null, null, null, null, material.getSmallDust(4))) {
+ null,
+ normalDust,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ material.getSmallDust(4))) {
Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Failed");
@@ -133,8 +162,8 @@ public class RecipeGen_Fluorite extends RecipeGen_Base {
// Macerate ore to Crushed
if (GT_Values.RA.addPulveriserRecipe(
material.getOre(1),
- new ItemStack[] {material.getCrushed(2)},
- new int[] {10000},
+ new ItemStack[] { material.getCrushed(2) },
+ new int[] { 10000 },
20 * 20,
tVoltageMultiplier / 2)) {
Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate ore to Crushed ore'");
@@ -142,8 +171,8 @@ public class RecipeGen_Fluorite extends RecipeGen_Base {
// Macerate Centrifuged to Pure Dust
if (GT_Values.RA.addPulveriserRecipe(
material.getCrushedCentrifuged(1),
- new ItemStack[] {matDust, matDustA},
- new int[] {10000, 1000},
+ new ItemStack[] { matDust, matDustA },
+ new int[] { 10000, 1000 },
20 * 20,
tVoltageMultiplier / 2)) {
Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Centrifuged ore to Pure Dust'");
@@ -154,10 +183,16 @@ public class RecipeGen_Fluorite extends RecipeGen_Base {
material.getCrushedCentrifuged(1),
tinyDustA,
dustStone)) {
- Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore' | Input: "
- + material.getCrushedPurified(1).getDisplayName() + " | Outputs: "
- + material.getCrushedCentrifuged(1).getDisplayName() + ", " + tinyDustA.getDisplayName() + ", "
- + dustStone.getDisplayName() + ".");
+ Logger.MATERIALS(
+ "[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore' | Input: "
+ + material.getCrushedPurified(1).getDisplayName()
+ + " | Outputs: "
+ + material.getCrushedCentrifuged(1).getDisplayName()
+ + ", "
+ + tinyDustA.getDisplayName()
+ + ", "
+ + dustStone.getDisplayName()
+ + ".");
}
GT_Values.RA.addChemicalBathRecipe(
@@ -166,7 +201,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base {
FLUORIDES.FLUORITE.getCrushedPurified(8),
FLUORIDES.FLUORITE.getDustImpure(4),
FLUORIDES.FLUORITE.getDustPurified(2),
- new int[] {10000, 5000, 1000},
+ new int[] { 10000, 5000, 1000 },
30 * 20,
240);
@@ -192,7 +227,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base {
null,
null,
null,
- new int[] {10000, 10000}, // Chances
+ new int[] { 10000, 10000 }, // Chances
(int) Math.max(1L, material.getMass() * 8L), // Time
tVoltageMultiplier / 2)) { // Eu
Logger.MATERIALS("[Centrifuge] Added Recipe: Purified Dust to Clean Dust");
@@ -210,7 +245,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base {
null,
null,
null,
- new int[] {10000, 10000}, // Chances
+ new int[] { 10000, 10000 }, // Chances
(int) Math.max(1L, material.getMass() * 8L), // Time
tVoltageMultiplier / 2)) { // Eu
Logger.MATERIALS("[Centrifuge] Added Recipe: Inpure Dust to Clean Dust");
@@ -223,19 +258,15 @@ public class RecipeGen_Fluorite extends RecipeGen_Base {
}
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(5), FLUORIDES.FLUORITE.getDust(37),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(5), FLUORIDES.FLUORITE.getDust(37), },
FluidUtils.getFluidStack("sulfuricacid", 8000),
aGregtechHydro, // Fluid output (slot 2)
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 15),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2)
- },
- new int[] {10000, 1000, 1000, 3000, 2000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 15),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) },
+ new int[] { 10000, 1000, 1000, 3000, 2000 },
10 * 60 * 20,
240); // EU
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
index 958c97c652..397f590c12 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.api.objects.Logger;
@@ -12,10 +18,6 @@ import gtPlusPlus.core.material.MaterialStack;
import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashSet;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
@@ -79,16 +81,25 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
int mCounter = 0;
for (Pair<Integer, Material> f : componentMap) {
if (f.getValue().getState() != MaterialState.SOLID) {
- Logger.MATERIALS("[Centrifuge] Found Fluid Component, adding " + f.getKey() + " cells of "
- + f.getValue().getLocalizedName() + ".");
+ Logger.MATERIALS(
+ "[Centrifuge] Found Fluid Component, adding " + f.getKey()
+ + " cells of "
+ + f.getValue().getLocalizedName()
+ + ".");
mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey());
mCellCount += f.getKey();
mTotalCount += f.getKey();
- Logger.MATERIALS("[Centrifuge] In total, adding " + mCellCount + " cells for "
- + material.getLocalizedName() + " processing.");
+ Logger.MATERIALS(
+ "[Centrifuge] In total, adding " + mCellCount
+ + " cells for "
+ + material.getLocalizedName()
+ + " processing.");
} else {
- Logger.MATERIALS("[Centrifuge] Found Solid Component, adding " + f.getKey() + " dusts of "
- + f.getValue().getLocalizedName() + ".");
+ Logger.MATERIALS(
+ "[Centrifuge] Found Solid Component, adding " + f.getKey()
+ + " dusts of "
+ + f.getValue().getLocalizedName()
+ + ".");
mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey());
mTotalCount += f.getKey();
}
@@ -96,8 +107,10 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
// Build Output Array
for (int g = 0; g < mInternalOutputs.length; g++) {
- Logger.MATERIALS("[Centrifuge] Is output[" + g + "] valid with a chance? "
- + (mInternalOutputs[g] != null ? 10000 : 0));
+ Logger.MATERIALS(
+ "[Centrifuge] Is output[" + g
+ + "] valid with a chance? "
+ + (mInternalOutputs[g] != null ? 10000 : 0));
mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0);
}
@@ -109,14 +122,20 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing);
if (mainDust != null) {
- Logger.MATERIALS("[Centrifuge] Recipe now requires " + material.smallestStackSizeWhenProcessing
- + "x " + mainDust.getDisplayName() + " as input.");
+ Logger.MATERIALS(
+ "[Centrifuge] Recipe now requires " + material.smallestStackSizeWhenProcessing
+ + "x "
+ + mainDust.getDisplayName()
+ + " as input.");
} else {
mainDust = material.getDust(mTotalCount);
Logger.MATERIALS("[Centrifuge] Could not find valid input dust, trying alternative.");
if (mainDust != null) {
- Logger.MATERIALS("[Centrifuge] Recipe now requires " + mTotalCount + "x "
- + mainDust.getDisplayName() + " as input.");
+ Logger.MATERIALS(
+ "[Centrifuge] Recipe now requires " + mTotalCount
+ + "x "
+ + mainDust.getDisplayName()
+ + " as input.");
} else {
Logger.MATERIALS("[Centrifuge] Could not find valid input dust, exiting.");
}
@@ -147,11 +166,12 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
mChances,
20 * 1 * (tVoltageMultiplier / 10),
tVoltageMultiplier)) {
- Logger.MATERIALS("[Centrifuge] Generated Centrifuge recipe for "
- + material.getDust(1).getDisplayName());
+ Logger.MATERIALS(
+ "[Centrifuge] Generated Centrifuge recipe for " + material.getDust(1).getDisplayName());
} else {
- Logger.MATERIALS("[Centrifuge] Failed to generate Centrifuge recipe for "
- + material.getDust(1).getDisplayName());
+ Logger.MATERIALS(
+ "[Centrifuge] Failed to generate Centrifuge recipe for "
+ + material.getDust(1).getDisplayName());
}
} catch (Throwable t) {
t.printStackTrace();
@@ -170,16 +190,25 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
int mCounter = 0;
for (Pair<Integer, Material> f : componentMap) {
if (f.getValue().getState() != MaterialState.SOLID) {
- Logger.MATERIALS("[Dehydrator] Found Fluid Component, adding " + f.getKey() + " cells of "
- + f.getValue().getLocalizedName() + ".");
+ Logger.MATERIALS(
+ "[Dehydrator] Found Fluid Component, adding " + f.getKey()
+ + " cells of "
+ + f.getValue().getLocalizedName()
+ + ".");
mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey());
mCellCount += f.getKey();
mTotalCount += f.getKey();
- Logger.MATERIALS("[Dehydrator] In total, adding " + mCellCount + " cells for "
- + material.getLocalizedName() + " processing.");
+ Logger.MATERIALS(
+ "[Dehydrator] In total, adding " + mCellCount
+ + " cells for "
+ + material.getLocalizedName()
+ + " processing.");
} else {
- Logger.MATERIALS("[Dehydrator] Found Solid Component, adding " + f.getKey() + " dusts of "
- + f.getValue().getLocalizedName() + ".");
+ Logger.MATERIALS(
+ "[Dehydrator] Found Solid Component, adding " + f.getKey()
+ + " dusts of "
+ + f.getValue().getLocalizedName()
+ + ".");
mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey());
mTotalCount += f.getKey();
}
@@ -187,8 +216,10 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
// Build Output Array
for (int g = 0; g < mInternalOutputs.length; g++) {
- Logger.MATERIALS("[Dehydrator] Is output[" + g + "] valid with a chance? "
- + (mInternalOutputs[g] != null ? 10000 : 0));
+ Logger.MATERIALS(
+ "[Dehydrator] Is output[" + g
+ + "] valid with a chance? "
+ + (mInternalOutputs[g] != null ? 10000 : 0));
mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0);
}
@@ -200,14 +231,20 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing);
if (mainDust != null) {
- Logger.MATERIALS("[Dehydrator] Recipe now requires " + material.smallestStackSizeWhenProcessing
- + "x " + mainDust.getDisplayName() + " as input.");
+ Logger.MATERIALS(
+ "[Dehydrator] Recipe now requires " + material.smallestStackSizeWhenProcessing
+ + "x "
+ + mainDust.getDisplayName()
+ + " as input.");
} else {
mainDust = material.getDust(mTotalCount);
Logger.MATERIALS("[Dehydrator] Could not find valid input dust, trying alternative.");
if (mainDust != null) {
- Logger.MATERIALS("[Dehydrator] Recipe now requires " + mTotalCount + "x "
- + mainDust.getDisplayName() + " as input.");
+ Logger.MATERIALS(
+ "[Dehydrator] Recipe now requires " + mTotalCount
+ + "x "
+ + mainDust.getDisplayName()
+ + " as input.");
} else {
Logger.MATERIALS("[Dehydrator] Could not find valid input dust, exiting.");
}
@@ -226,18 +263,19 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
try {
if (CORE.RA.addDehydratorRecipe(
- new ItemStack[] {mainDust, emptyCell},
+ new ItemStack[] { mainDust, emptyCell },
null,
null,
mInternalOutputs,
mChances,
20 * 1 * (tVoltageMultiplier / 10),
tVoltageMultiplier)) {
- Logger.MATERIALS("[Dehydrator] Generated Dehydrator recipe for "
- + material.getDust(1).getDisplayName());
+ Logger.MATERIALS(
+ "[Dehydrator] Generated Dehydrator recipe for " + material.getDust(1).getDisplayName());
} else {
- Logger.MATERIALS("[Dehydrator] Failed to generate Dehydrator recipe for "
- + material.getDust(1).getDisplayName());
+ Logger.MATERIALS(
+ "[Dehydrator] Failed to generate Dehydrator recipe for "
+ + material.getDust(1).getDisplayName());
}
} catch (Throwable t) {
t.printStackTrace();
@@ -246,20 +284,9 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base {
}
}
- public static boolean addCentrifgeRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- FluidStack aFluidInput,
- FluidStack aFluidOutput,
- ItemStack aOutput1,
- ItemStack aOutput2,
- ItemStack aOutput3,
- ItemStack aOutput4,
- ItemStack aOutput5,
- ItemStack aOutput6,
- int[] aChances,
- int aDuration,
- int aEUt) {
+ public static boolean addCentrifgeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
+ FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4,
+ ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) {
return GT_Values.RA.addCentrifugeRecipe(
aInput1,
aInput2,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java
index eb6fa4ee75..0464ae80d7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
@@ -8,8 +11,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashSet;
-import java.util.Set;
public class RecipeGen_MetalRecipe extends RecipeGen_Base {
@@ -47,10 +48,10 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base {
material.getSmallDust(2),
(int) Math.max(material.getMass() / 8L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Lathe Rod Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Lathe Rod Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Lathe Rod Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Lathe Rod Recipe: " + material.getLocalizedName() + " - Failed");
+ }
if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1)))
if (GT_Values.RA.addCutterRecipe(
@@ -59,10 +60,10 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base {
null,
(int) Math.max(material.getMass() * 2L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Failed");
+ }
if (ItemUtils.checkForInvalidItems(material.getIngot(1))
&& ItemUtils.checkForInvalidItems(material.getHotIngot(1)))
@@ -71,30 +72,41 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base {
material.getIngot(1),
(int) Math.max(material.getMass() * 3L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Failed");
+ }
if (ItemUtils.checkForInvalidItems(material.getRod(1))
&& ItemUtils.checkForInvalidItems(material.getLongRod(1))) {
if (GT_Values.RA.addForgeHammerRecipe(
- material.getRod(2), material.getLongRod(1), (int) Math.max(material.getMass(), 1L), 16)) {
+ material.getRod(2),
+ material.getLongRod(1),
+ (int) Math.max(material.getMass(), 1L),
+ 16)) {
Logger.WARNING("Hammer Long Rod Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Hammer Long Rod Recipe: " + material.getLocalizedName() + " - Failed");
}
GT_Values.RA.addCutterRecipe(
- material.getLongRod(1), material.getRod(2), null, (int) Math.max(material.getMass(), 1L), 4);
+ material.getLongRod(1),
+ material.getRod(2),
+ null,
+ (int) Math.max(material.getMass(), 1L),
+ 4);
}
if (ItemUtils.checkForInvalidItems(material.getBolt(1)) && ItemUtils.checkForInvalidItems(material.getScrew(1)))
if (GT_Values.RA.addLatheRecipe(
- material.getBolt(1), material.getScrew(1), null, (int) Math.max(material.getMass() / 8L, 1L), 4)) {
- Logger.WARNING("Lathe Screw Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Lathe Screw Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ material.getBolt(1),
+ material.getScrew(1),
+ null,
+ (int) Math.max(material.getMass() / 8L, 1L),
+ 4)) {
+ Logger.WARNING("Lathe Screw Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Lathe Screw Recipe: " + material.getLocalizedName() + " - Failed");
+ }
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java
index 39d9456115..25300ed515 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -8,9 +13,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeGen_MultisUsingFluidInsteadOfCells {
@@ -71,8 +73,7 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells {
int aInvalidRecipesToConvert = 0;
int aOriginalCount = aInputs.mRecipeList.size();
- recipe:
- for (GT_Recipe x : aInputs.mRecipeList) {
+ recipe: for (GT_Recipe x : aInputs.mRecipeList) {
if (x != null) {
ItemStack[] aInputItems = x.mInputs.clone();
@@ -86,8 +87,7 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells {
AutoMap<FluidStack> aOutputFluidsMap = new AutoMap<FluidStack>();
// Iterate Inputs, Convert valid items into fluids
- inputs:
- for (ItemStack aInputStack : aInputItems) {
+ inputs: for (ItemStack aInputStack : aInputItems) {
FluidStack aFoundFluid = getFluidFromItemStack(aInputStack);
if (aFoundFluid == null) {
for (ItemStack aBadStack : mItemsToIgnore) {
@@ -104,8 +104,7 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells {
}
}
// Iterate Outputs, Convert valid items into fluids
- outputs:
- for (ItemStack aOutputStack : aOutputItems) {
+ outputs: for (ItemStack aOutputStack : aOutputItems) {
FluidStack aFoundFluid = getFluidFromItemStack(aOutputStack);
if (aFoundFluid == null) {
for (ItemStack aBadStack : mItemsToIgnore) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
index 4e163119a0..f276ea218f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
@@ -1,5 +1,12 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
@@ -17,11 +24,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeGen_Ore extends RecipeGen_Base {
@@ -96,18 +98,15 @@ public class RecipeGen_Ore extends RecipeGen_Base {
if (material.getComposites().size() >= 2 && material.getComposites().get(1) != null) {
bonusB = material.getComposites().get(1).getStackMaterial();
// If Secondary Output has no solid output, try the third (If it exists)
- if (!bonusB.hasSolidForm()
- && material.getComposites().size() >= 3
+ if (!bonusB.hasSolidForm() && material.getComposites().size() >= 3
&& material.getComposites().get(2) != null) {
bonusB = material.getComposites().get(2).getStackMaterial();
// If Third Output has no solid output, try the Fourth (If it exists)
- if (!bonusB.hasSolidForm()
- && material.getComposites().size() >= 4
+ if (!bonusB.hasSolidForm() && material.getComposites().size() >= 4
&& material.getComposites().get(3) != null) {
bonusB = material.getComposites().get(3).getStackMaterial();
// If Fourth Output has no solid output, try the Fifth (If it exists)
- if (!bonusB.hasSolidForm()
- && material.getComposites().size() >= 5
+ if (!bonusB.hasSolidForm() && material.getComposites().size() >= 5
&& material.getComposites().get(4) != null) {
bonusB = material.getComposites().get(4).getStackMaterial();
// If Fifth Output has no solid output, default out to Stone dust.
@@ -177,8 +176,8 @@ public class RecipeGen_Ore extends RecipeGen_Base {
// Macerate ore to Crushed
if (GT_Values.RA.addPulveriserRecipe(
material.getOre(1),
- new ItemStack[] {material.getCrushed(2)},
- new int[] {10000},
+ new ItemStack[] { material.getCrushed(2) },
+ new int[] { 10000 },
20 * 20,
tVoltageMultiplier / 2)) {
Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate ore to Crushed ore'");
@@ -186,8 +185,8 @@ public class RecipeGen_Ore extends RecipeGen_Base {
// Macerate Crushed to Impure Dust
if (GT_Values.RA.addPulveriserRecipe(
material.getCrushed(1),
- new ItemStack[] {material.getDustImpure(1), matDustA},
- new int[] {10000, 1000},
+ new ItemStack[] { material.getDustImpure(1), matDustA },
+ new int[] { 10000, 1000 },
20 * 20,
tVoltageMultiplier / 2)) {
Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Crushed ore to Impure Dust'");
@@ -195,8 +194,8 @@ public class RecipeGen_Ore extends RecipeGen_Base {
// Macerate Washed to Purified Dust
if (GT_Values.RA.addPulveriserRecipe(
material.getCrushedPurified(1),
- new ItemStack[] {material.getDustPurified(1), matDustA},
- new int[] {10000, 1000},
+ new ItemStack[] { material.getDustPurified(1), matDustA },
+ new int[] { 10000, 1000 },
20 * 20,
tVoltageMultiplier / 2)) {
Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Washed ore to Purified Dust'");
@@ -204,8 +203,8 @@ public class RecipeGen_Ore extends RecipeGen_Base {
// Macerate Centrifuged to Pure Dust
if (GT_Values.RA.addPulveriserRecipe(
material.getCrushedCentrifuged(1),
- new ItemStack[] {matDust, matDustA},
- new int[] {10000, 1000},
+ new ItemStack[] { matDust, matDustA },
+ new int[] { 10000, 1000 },
20 * 20,
tVoltageMultiplier / 2)) {
Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Centrifuged ore to Pure Dust'");
@@ -215,13 +214,15 @@ public class RecipeGen_Ore extends RecipeGen_Base {
* Wash
*/
// Wash into Purified Crushed
- /*if (GT_Values.RA.addOreWasherRecipe(material.getCrushed(1), material.getCrushedPurified(1), bonusA.getTinyDust(1), dustStone, FluidUtils.getWater(1000), 25*20, 16)){
- Logger.MATERIALS("[OreWasher] Added Recipe: 'Wash Crushed ore into Purified Crushed ore'");
- }*/
+ /*
+ * if (GT_Values.RA.addOreWasherRecipe(material.getCrushed(1), material.getCrushedPurified(1),
+ * bonusA.getTinyDust(1), dustStone, FluidUtils.getWater(1000), 25*20, 16)){
+ * Logger.MATERIALS("[OreWasher] Added Recipe: 'Wash Crushed ore into Purified Crushed ore'"); }
+ */
// .08 compat method
if (GT_ModHandler.addOreWasherRecipe(
material.getCrushed(1),
- new int[] {10000, 1111, 10000},
+ new int[] { 10000, 1111, 10000 },
1000,
material.getCrushedPurified(1),
matDustA,
@@ -232,14 +233,14 @@ public class RecipeGen_Ore extends RecipeGen_Base {
/**
* Thermal Centrifuge
*/
- /*//Crushed ore to Centrifuged Ore
- if (GT_Values.RA.addThermalCentrifugeRecipe(material.getCrushed(1), material.getCrushedCentrifuged(1), tinyDustB, dustStone, 25*20, 24)){
- Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Crushed ore to Centrifuged Ore'");
- }
- //Washed ore to Centrifuged Ore
- if (GT_Values.RA.addThermalCentrifugeRecipe(material.getCrushedPurified(1), material.getCrushedCentrifuged(1), bonusA.getTinyDust(1), dustStone, 25*20, 24)){
- Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore'");
- }*/
+ /*
+ * //Crushed ore to Centrifuged Ore if (GT_Values.RA.addThermalCentrifugeRecipe(material.getCrushed(1),
+ * material.getCrushedCentrifuged(1), tinyDustB, dustStone, 25*20, 24)){
+ * Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Crushed ore to Centrifuged Ore'"); } //Washed ore to
+ * Centrifuged Ore if (GT_Values.RA.addThermalCentrifugeRecipe(material.getCrushedPurified(1),
+ * material.getCrushedCentrifuged(1), bonusA.getTinyDust(1), dustStone, 25*20, 24)){
+ * Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore'"); }
+ */
Logger.MATERIALS("material.getCrushed(1): " + (material.getCrushed(1) != null));
Logger.MATERIALS("material.getCrushedPurified(1): " + (material.getCrushedPurified(1) != null));
@@ -251,33 +252,43 @@ public class RecipeGen_Ore extends RecipeGen_Base {
// .08 compat
if (GT_ModHandler.addThermalCentrifugeRecipe(
material.getCrushed(1),
- new int[] {10000, 1111, 10000},
+ new int[] { 10000, 1111, 10000 },
(int) Math.min(5000L, Math.abs(material.getMass() * 20L)),
material.getCrushedCentrifuged(1),
matDustB,
dustStone)) {
- Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Crushed ore to Centrifuged Ore' | Input: "
- + material.getCrushed(1).getDisplayName() + " | Outputs: "
- + material.getCrushedCentrifuged(1).getDisplayName() + ", " + matDustB.getDisplayName() + ", "
- + dustStone.getDisplayName() + ".");
+ Logger.MATERIALS(
+ "[ThermalCentrifuge] Added Recipe: 'Crushed ore to Centrifuged Ore' | Input: "
+ + material.getCrushed(1).getDisplayName()
+ + " | Outputs: "
+ + material.getCrushedCentrifuged(1).getDisplayName()
+ + ", "
+ + matDustB.getDisplayName()
+ + ", "
+ + dustStone.getDisplayName()
+ + ".");
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
try {
if (GT_ModHandler.addThermalCentrifugeRecipe(
material.getCrushedPurified(1),
- new int[] {10000, 1111, 10000},
+ new int[] { 10000, 1111, 10000 },
(int) Math.min(5000L, Math.abs(material.getMass() * 20L)),
material.getCrushedCentrifuged(1),
matDustA,
dustStone)) {
- Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore' | Input: "
- + material.getCrushedPurified(1).getDisplayName() + " | Outputs: "
- + material.getCrushedCentrifuged(1).getDisplayName() + ", " + matDustA.getDisplayName() + ", "
- + dustStone.getDisplayName() + ".");
+ Logger.MATERIALS(
+ "[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore' | Input: "
+ + material.getCrushedPurified(1).getDisplayName()
+ + " | Outputs: "
+ + material.getCrushedCentrifuged(1).getDisplayName()
+ + ", "
+ + matDustA.getDisplayName()
+ + ", "
+ + dustStone.getDisplayName()
+ + ".");
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
/**
* Forge Hammer
@@ -286,7 +297,10 @@ public class RecipeGen_Ore extends RecipeGen_Base {
Logger.MATERIALS("[ForgeHammer] Added Recipe: 'Crushed Centrifuged to Pure Dust'");
}
if (GT_Values.RA.addForgeHammerRecipe(
- material.getCrushedPurified(1), material.getDustPurified(1), 10, tVoltageMultiplier / 4)) {
+ material.getCrushedPurified(1),
+ material.getDustPurified(1),
+ 10,
+ tVoltageMultiplier / 4)) {
Logger.MATERIALS("[ForgeHammer] Added Recipe: 'Crushed Purified to Purified Dust'");
}
if (GT_Values.RA.addForgeHammerRecipe(material.getOre(1), material.getCrushed(1), 10, tVoltageMultiplier / 4)) {
@@ -308,7 +322,7 @@ public class RecipeGen_Ore extends RecipeGen_Base {
null,
null,
null,
- new int[] {10000, 1111}, // Chances
+ new int[] { 10000, 1111 }, // Chances
(int) Math.max(1L, material.getMass() * 8L), // Time
tVoltageMultiplier / 2)) { // Eu
Logger.MATERIALS("[Centrifuge] Added Recipe: Purified Dust to Clean Dust");
@@ -326,7 +340,7 @@ public class RecipeGen_Ore extends RecipeGen_Base {
null,
null,
null,
- new int[] {10000, 1111}, // Chances
+ new int[] { 10000, 1111 }, // Chances
(int) Math.max(1L, material.getMass() * 8L), // Time
tVoltageMultiplier / 2)) { // Eu
Logger.MATERIALS("[Centrifuge] Added Recipe: Inpure Dust to Clean Dust");
@@ -348,16 +362,25 @@ public class RecipeGen_Ore extends RecipeGen_Base {
int mCounter = 0;
for (Pair<Integer, Material> f : componentMap) {
if (f.getValue().getState() != MaterialState.SOLID) {
- Logger.MATERIALS("[Electrolyzer] Found Fluid Component, adding " + f.getKey() + " cells of "
- + f.getValue().getLocalizedName() + ".");
+ Logger.MATERIALS(
+ "[Electrolyzer] Found Fluid Component, adding " + f.getKey()
+ + " cells of "
+ + f.getValue().getLocalizedName()
+ + ".");
mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey());
mCellCount += f.getKey();
mTotalCount += f.getKey();
- Logger.MATERIALS("[Electrolyzer] In total, adding " + mCellCount + " cells for "
- + material.getLocalizedName() + " processing.");
+ Logger.MATERIALS(
+ "[Electrolyzer] In total, adding " + mCellCount
+ + " cells for "
+ + material.getLocalizedName()
+ + " processing.");
} else {
- Logger.MATERIALS("[Electrolyzer] Found Solid Component, adding " + f.getKey() + " dusts of "
- + f.getValue().getLocalizedName() + ".");
+ Logger.MATERIALS(
+ "[Electrolyzer] Found Solid Component, adding " + f.getKey()
+ + " dusts of "
+ + f.getValue().getLocalizedName()
+ + ".");
mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey());
mTotalCount += f.getKey();
}
@@ -365,8 +388,10 @@ public class RecipeGen_Ore extends RecipeGen_Base {
// Build Output Array
for (int g = 0; g < mInternalOutputs.length; g++) {
- Logger.MATERIALS("[Electrolyzer] Is output[" + g + "] valid with a chance? "
- + (mInternalOutputs[g] != null ? 10000 : 0));
+ Logger.MATERIALS(
+ "[Electrolyzer] Is output[" + g
+ + "] valid with a chance? "
+ + (mInternalOutputs[g] != null ? 10000 : 0));
mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0);
}
@@ -378,14 +403,20 @@ public class RecipeGen_Ore extends RecipeGen_Base {
ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing);
if (mainDust != null) {
- Logger.MATERIALS("[Electrolyzer] Recipe now requires " + material.smallestStackSizeWhenProcessing
- + "x " + mainDust.getDisplayName() + " as input.");
+ Logger.MATERIALS(
+ "[Electrolyzer] Recipe now requires " + material.smallestStackSizeWhenProcessing
+ + "x "
+ + mainDust.getDisplayName()
+ + " as input.");
} else {
mainDust = material.getDust(mTotalCount);
Logger.MATERIALS("[Electrolyzer] Could not find valid input dust, trying alternative.");
if (mainDust != null) {
- Logger.MATERIALS("[Electrolyzer] Recipe now requires " + mTotalCount + "x "
- + mainDust.getDisplayName() + " as input.");
+ Logger.MATERIALS(
+ "[Electrolyzer] Recipe now requires " + mTotalCount
+ + "x "
+ + mainDust.getDisplayName()
+ + " as input.");
} else {
Logger.MATERIALS("[Electrolyzer] Could not find valid input dust, exiting.");
}
@@ -419,8 +450,9 @@ public class RecipeGen_Ore extends RecipeGen_Base {
Logger.MATERIALS(
"[Electrolyzer] Generated Electrolyzer recipe for " + matDust.getDisplayName());
} else {
- Logger.MATERIALS("[Electrolyzer] Failed to generate Electrolyzer recipe for "
- + matDust.getDisplayName());
+ Logger.MATERIALS(
+ "[Electrolyzer] Failed to generate Electrolyzer recipe for "
+ + matDust.getDisplayName());
}
} catch (Throwable t) {
t.printStackTrace();
@@ -440,16 +472,25 @@ public class RecipeGen_Ore extends RecipeGen_Base {
for (Pair<Integer, Material> f : componentMap) {
if (f.getValue().getState() != MaterialState.SOLID
&& f.getValue().getState() != MaterialState.ORE) {
- Logger.MATERIALS("[Dehydrator] Found Fluid Component, adding " + f.getKey() + " cells of "
- + f.getValue().getLocalizedName() + ".");
+ Logger.MATERIALS(
+ "[Dehydrator] Found Fluid Component, adding " + f.getKey()
+ + " cells of "
+ + f.getValue().getLocalizedName()
+ + ".");
mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey());
mCellCount += f.getKey();
mTotalCount += f.getKey();
- Logger.MATERIALS("[Dehydrator] In total, adding " + mCellCount + " cells for "
- + material.getLocalizedName() + " processing.");
+ Logger.MATERIALS(
+ "[Dehydrator] In total, adding " + mCellCount
+ + " cells for "
+ + material.getLocalizedName()
+ + " processing.");
} else {
- Logger.MATERIALS("[Dehydrator] Found Solid Component, adding " + f.getKey() + " dusts of "
- + f.getValue().getLocalizedName() + ".");
+ Logger.MATERIALS(
+ "[Dehydrator] Found Solid Component, adding " + f.getKey()
+ + " dusts of "
+ + f.getValue().getLocalizedName()
+ + ".");
mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey());
mTotalCount += f.getKey();
}
@@ -457,8 +498,10 @@ public class RecipeGen_Ore extends RecipeGen_Base {
// Build Output Array
for (int g = 0; g < mInternalOutputs.length; g++) {
- Logger.MATERIALS("[Dehydrator] Is output[" + g + "] valid with a chance? "
- + (mInternalOutputs[g] != null ? 10000 : 0));
+ Logger.MATERIALS(
+ "[Dehydrator] Is output[" + g
+ + "] valid with a chance? "
+ + (mInternalOutputs[g] != null ? 10000 : 0));
mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0);
}
@@ -470,14 +513,20 @@ public class RecipeGen_Ore extends RecipeGen_Base {
ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing);
if (mainDust != null) {
- Logger.MATERIALS("[Dehydrator] Recipe now requires " + material.smallestStackSizeWhenProcessing
- + "x " + mainDust.getDisplayName() + " as input.");
+ Logger.MATERIALS(
+ "[Dehydrator] Recipe now requires " + material.smallestStackSizeWhenProcessing
+ + "x "
+ + mainDust.getDisplayName()
+ + " as input.");
} else {
mainDust = material.getDust(mTotalCount);
Logger.MATERIALS("[Dehydrator] Could not find valid input dust, trying alternative.");
if (mainDust != null) {
- Logger.MATERIALS("[Dehydrator] Recipe now requires " + mTotalCount + "x "
- + mainDust.getDisplayName() + " as input.");
+ Logger.MATERIALS(
+ "[Dehydrator] Recipe now requires " + mTotalCount
+ + "x "
+ + mainDust.getDisplayName()
+ + " as input.");
} else {
Logger.MATERIALS("[Dehydrator] Could not find valid input dust, exiting.");
}
@@ -495,7 +544,7 @@ public class RecipeGen_Ore extends RecipeGen_Base {
try {
if (CORE.RA.addDehydratorRecipe(
- new ItemStack[] {mainDust, emptyCell},
+ new ItemStack[] { mainDust, emptyCell },
null,
null,
mInternalOutputs,
@@ -503,10 +552,13 @@ public class RecipeGen_Ore extends RecipeGen_Base {
(int) Math.max(material.getMass() * 4L * 1, 1),
tVoltageMultiplier)) {
Logger.MATERIALS("[Dehydrator] Generated Dehydrator recipe for " + matDust.getDisplayName());
- Logger.MATERIALS("Inputs: " + mainDust.getDisplayName() + " x" + mainDust.stackSize + ", "
- + (emptyCell == null
- ? "No Cells"
- : "" + emptyCell.getDisplayName() + " x" + emptyCell.stackSize));
+ Logger.MATERIALS(
+ "Inputs: " + mainDust.getDisplayName()
+ + " x"
+ + mainDust.stackSize
+ + ", "
+ + (emptyCell == null ? "No Cells"
+ : "" + emptyCell.getDisplayName() + " x" + emptyCell.stackSize));
Logger.MATERIALS("Outputs " + ItemUtils.getArrayStackNames(mInternalOutputs));
Logger.MATERIALS("Time: " + ((int) Math.max(material.getMass() * 4L * 1, 1)));
Logger.MATERIALS("EU: " + tVoltageMultiplier);
@@ -564,28 +616,55 @@ public class RecipeGen_Ore extends RecipeGen_Base {
final ItemStack tinyDust = material.getTinyDust(1);
if (RecipeUtils.addShapedRecipe(
- tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, normalDust)) {
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ tinyDust,
+ normalDust)) {
Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed");
}
- if (RecipeUtils.addShapedRecipe(
- normalDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) {
+ if (RecipeUtils
+ .addShapedRecipe(normalDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) {
Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Failed");
}
if (RecipeUtils.addShapedRecipe(
- smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, normalDust)) {
+ smallDust,
+ smallDust,
+ null,
+ smallDust,
+ smallDust,
+ null,
+ null,
+ null,
+ null,
+ normalDust)) {
Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed");
}
if (RecipeUtils.addShapedRecipe(
- null, normalDust, null, null, null, null, null, null, null, material.getSmallDust(4))) {
+ null,
+ normalDust,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ material.getSmallDust(4))) {
Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Failed");
@@ -594,20 +673,9 @@ public class RecipeGen_Ore extends RecipeGen_Base {
// }
}
- public static boolean addElectrolyzerRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- FluidStack aFluidInput,
- FluidStack aFluidOutput,
- ItemStack aOutput1,
- ItemStack aOutput2,
- ItemStack aOutput3,
- ItemStack aOutput4,
- ItemStack aOutput5,
- ItemStack aOutput6,
- int[] aChances,
- int aDuration,
- int aEUt) {
+ public static boolean addElectrolyzerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
+ FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4,
+ ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) {
if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) {
Logger.MATERIALS("[Electrolyzer] Either both inputs or outputs are null.");
return false;
@@ -617,10 +685,8 @@ public class RecipeGen_Ore extends RecipeGen_Base {
Logger.MATERIALS("[Electrolyzer] Fail 1.");
return false;
}
- if ((aFluidInput != null)
- && ((aDuration = GregTech_API.sRecipeFile.get(
- "electrolyzer", aFluidInput.getFluid().getName(), aDuration))
- <= 0)) {
+ if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile
+ .get("electrolyzer", aFluidInput.getFluid().getName(), aDuration)) <= 0)) {
Logger.MATERIALS("[Electrolyzer] Fail 2.");
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java
index bf9ef18720..ea77ce1761 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
@@ -7,9 +12,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashSet;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
public class RecipeGen_Plasma extends RecipeGen_Base {
@@ -37,14 +39,14 @@ public class RecipeGen_Plasma extends RecipeGen_Base {
ItemStack aContainerItem = GT_Utility.getFluidForFilledItem(aPlasmaCell, true) == null
? GT_Utility.getContainerItem(aPlasmaCell, true)
: CI.emptyCells(1);
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aPlasmaCell, aContainerItem})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aPlasmaCell, aContainerItem })) {
GT_Values.RA.addFuel(
GT_Utility.copyAmount(1L, aPlasmaCell),
aContainerItem,
(int) Math.max(1024L, 1024L * material.getMass()),
4);
}
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aCell, aPlasmaCell})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aCell, aPlasmaCell })) {
GT_Values.RA.addVacuumFreezerRecipe(aPlasmaCell, aCell, (int) Math.max(material.getMass() * 2L, 1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
index 15e77ac0f5..3de61a949f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
@@ -11,9 +16,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashSet;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
public class RecipeGen_Plates extends RecipeGen_Base {
@@ -58,10 +60,10 @@ public class RecipeGen_Plates extends RecipeGen_Base {
plate_SingleTwo,
(int) Math.max(material.getMass(), 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Forge Hammer Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Forge Hammer Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Forge Hammer Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Forge Hammer Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Bender
if (ItemUtils.checkForInvalidItems(ingotStackOne) && ItemUtils.checkForInvalidItems(plate_Single))
if (addBenderRecipe(
@@ -69,10 +71,10 @@ public class RecipeGen_Plates extends RecipeGen_Base {
plate_Single,
(int) Math.max(material.getMass() * 1L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
+ }
if (ItemUtils.checkForInvalidItems(ingotStackOne) && ItemUtils.checkForInvalidItems(foil_SingleFour))
if (addBenderRecipe(
ingotStackOne,
@@ -80,10 +82,10 @@ public class RecipeGen_Plates extends RecipeGen_Base {
foil_SingleFour,
(int) Math.max(material.getMass() * 2L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Alloy Smelter
if (ItemUtils.checkForInvalidItems(ingotStackTwo) && ItemUtils.checkForInvalidItems(plate_Single))
if (GT_Values.RA.addAlloySmelterRecipe(
@@ -92,10 +94,10 @@ public class RecipeGen_Plates extends RecipeGen_Base {
plate_Single,
(int) Math.max(material.getMass() * 2L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Alloy Smelter Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Alloy Smelter Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Alloy Smelter Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Alloy Smelter Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Cutting Machine
if (ItemUtils.checkForInvalidItems(block) && ItemUtils.checkForInvalidItems(plate_Single))
if (GT_Values.RA.addCutterRecipe(
@@ -104,10 +106,10 @@ public class RecipeGen_Plates extends RecipeGen_Base {
plate_SingleNine,
(int) Math.max(material.getMass() * 10L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Cutting Machine Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Cutting Machine Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Cutting Machine Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Cutting Machine Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Making Double Plates
if (ItemUtils.checkForInvalidItems(ingotStackTwo) && ItemUtils.checkForInvalidItems(plate_Double))
@@ -116,10 +118,10 @@ public class RecipeGen_Plates extends RecipeGen_Base {
plate_Double,
(int) Math.max(material.getMass() * 2L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
+ }
if (ItemUtils.checkForInvalidItems(plate_SingleTwo) && ItemUtils.checkForInvalidItems(plate_Double))
if (addBenderRecipe(
@@ -127,10 +129,10 @@ public class RecipeGen_Plates extends RecipeGen_Base {
plate_Double,
(int) Math.max(material.getMass() * 2L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Bender
if (ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getFoil(1)))
@@ -139,14 +141,17 @@ public class RecipeGen_Plates extends RecipeGen_Base {
material.getFoil(4),
(int) Math.max(material.getMass(), 1L),
material.vVoltageMultiplier)) {
- GregTech_API.registerCover(
- material.getFoil(1),
- new GT_RenderedTexture(material.getTextureSet().mTextures[70], material.getRGBA(), false),
- null);
- Logger.WARNING("Bender Foil Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Bender Foil Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ GregTech_API.registerCover(
+ material.getFoil(1),
+ new GT_RenderedTexture(
+ material.getTextureSet().mTextures[70],
+ material.getRGBA(),
+ false),
+ null);
+ Logger.WARNING("Bender Foil Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Bender Foil Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Making Dense Plates
if (ItemUtils.checkForInvalidItems(ingotStackNine) && ItemUtils.checkForInvalidItems(plate_Dense))
@@ -155,10 +160,10 @@ public class RecipeGen_Plates extends RecipeGen_Base {
plate_Dense,
(int) Math.max(material.getMass() * 2L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
+ }
if (ItemUtils.checkForInvalidItems(plate_SingleNine) && ItemUtils.checkForInvalidItems(plate_Dense))
if (addBenderRecipe(
@@ -166,28 +171,24 @@ public class RecipeGen_Plates extends RecipeGen_Base {
plate_Double,
(int) Math.max(material.getMass() * 2L, 1L),
material.vVoltageMultiplier)) {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed");
+ }
}
- public static boolean addBenderRecipe(
- final ItemStack aInput1, final ItemStack aOutput1, int aDuration, final int aEUt) {
+ public static boolean addBenderRecipe(final ItemStack aInput1, final ItemStack aOutput1, int aDuration,
+ final int aEUt) {
return GT_Values.RA.addBenderRecipe(aInput1, aOutput1, aDuration, aEUt);
}
- public static boolean addBenderRecipe(
- final ItemStack aInput1,
- final ItemStack aCircuit,
- final ItemStack aOutput1,
- int aDuration,
- final int aEUt) {
+ public static boolean addBenderRecipe(final ItemStack aInput1, final ItemStack aCircuit, final ItemStack aOutput1,
+ int aDuration, final int aEUt) {
return GT_Values.RA.addBenderRecipe(aInput1, aCircuit, aOutput1, aDuration, aEUt);
}
- public static boolean addExtruderRecipe(
- final ItemStack aInput, final ItemStack aShape, final ItemStack aOutput, int aDuration, final int aEUt) {
+ public static boolean addExtruderRecipe(final ItemStack aInput, final ItemStack aShape, final ItemStack aOutput,
+ int aDuration, final int aEUt) {
if ((aInput == null) || (aShape == null) || (aOutput == null)) {
return false;
}
@@ -196,8 +197,8 @@ public class RecipeGen_Plates extends RecipeGen_Base {
}
GT_Recipe.GT_Recipe_Map.sExtruderRecipes.addRecipe(
true,
- new ItemStack[] {aInput, aShape},
- new ItemStack[] {aOutput},
+ new ItemStack[] { aInput, aShape },
+ new ItemStack[] { aOutput },
null,
null,
null,
@@ -207,8 +208,8 @@ public class RecipeGen_Plates extends RecipeGen_Base {
return true;
}
- public static boolean addForgeHammerRecipe(
- final ItemStack aInput1, final ItemStack aOutput1, final int aDuration, final int aEUt) {
+ public static boolean addForgeHammerRecipe(final ItemStack aInput1, final ItemStack aOutput1, final int aDuration,
+ final int aEUt) {
if ((aInput1 == null) || (aOutput1 == null)) {
return false;
}
@@ -216,7 +217,15 @@ public class RecipeGen_Plates extends RecipeGen_Base {
return false;
}
GT_Recipe.GT_Recipe_Map.sHammerRecipes.addRecipe(
- true, new ItemStack[] {aInput1}, new ItemStack[] {aOutput1}, null, null, null, aDuration, aEUt, 0);
+ true,
+ new ItemStack[] { aInput1 },
+ new ItemStack[] { aOutput1 },
+ null,
+ null,
+ null,
+ aDuration,
+ aEUt,
+ 0);
return true;
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
index 18391d170f..1c938e0da4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -3,6 +3,15 @@ package gtPlusPlus.xmod.gregtech.loaders;
import static gregtech.api.enums.GT_Values.L;
import static gregtech.api.enums.GT_Values.M;
+import java.util.ArrayList;
+import java.util.Map;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
@@ -17,12 +26,6 @@ import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.util.ArrayList;
-import java.util.Map;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-import org.apache.commons.lang3.reflect.FieldUtils;
public class RecipeGen_Recycling implements Runnable {
@@ -58,53 +61,24 @@ public class RecipeGen_Recycling implements Runnable {
if (material != null) Logger.WARNING("Generating Recycling recipes for " + material.getLocalizedName());
- final OrePrefixes[] mValidPrefixesAsString = {
- OrePrefixes.ingot,
- OrePrefixes.ingotHot,
- OrePrefixes.nugget,
- OrePrefixes.plate,
- OrePrefixes.plateDense,
- OrePrefixes.plateDouble,
- OrePrefixes.plateTriple,
- OrePrefixes.plateQuadruple,
- OrePrefixes.plateQuintuple,
- OrePrefixes.stick,
- OrePrefixes.stickLong,
- OrePrefixes.bolt,
- OrePrefixes.screw,
- OrePrefixes.ring,
- OrePrefixes.rotor,
- OrePrefixes.gearGt,
- OrePrefixes.gearGtSmall,
- OrePrefixes.gear,
- OrePrefixes.block,
- OrePrefixes.cableGt01,
- OrePrefixes.cableGt02,
- OrePrefixes.cableGt04,
- OrePrefixes.cableGt08,
- OrePrefixes.cableGt12,
- OrePrefixes.wireFine,
- OrePrefixes.wireGt01,
- OrePrefixes.wireGt02,
- OrePrefixes.wireGt04,
- OrePrefixes.wireGt08,
- OrePrefixes.wireGt12,
- OrePrefixes.wireGt16,
- OrePrefixes.foil,
- OrePrefixes.frameGt,
- OrePrefixes.pipeHuge,
- OrePrefixes.pipeLarge,
- OrePrefixes.pipeMedium,
- OrePrefixes.pipeSmall,
- OrePrefixes.pipeTiny,
- };
+ final OrePrefixes[] mValidPrefixesAsString = { OrePrefixes.ingot, OrePrefixes.ingotHot, OrePrefixes.nugget,
+ OrePrefixes.plate, OrePrefixes.plateDense, OrePrefixes.plateDouble, OrePrefixes.plateTriple,
+ OrePrefixes.plateQuadruple, OrePrefixes.plateQuintuple, OrePrefixes.stick, OrePrefixes.stickLong,
+ OrePrefixes.bolt, OrePrefixes.screw, OrePrefixes.ring, OrePrefixes.rotor, OrePrefixes.gearGt,
+ OrePrefixes.gearGtSmall, OrePrefixes.gear, OrePrefixes.block, OrePrefixes.cableGt01,
+ OrePrefixes.cableGt02, OrePrefixes.cableGt04, OrePrefixes.cableGt08, OrePrefixes.cableGt12,
+ OrePrefixes.wireFine, OrePrefixes.wireGt01, OrePrefixes.wireGt02, OrePrefixes.wireGt04,
+ OrePrefixes.wireGt08, OrePrefixes.wireGt12, OrePrefixes.wireGt16, OrePrefixes.foil, OrePrefixes.frameGt,
+ OrePrefixes.pipeHuge, OrePrefixes.pipeLarge, OrePrefixes.pipeMedium, OrePrefixes.pipeSmall,
+ OrePrefixes.pipeTiny, };
int mSlotIndex = 0;
Pair<OrePrefixes, ItemStack>[] mValidPairs = new Pair[mValidPrefixesAsString.length];
for (int r = 0; r < mValidPairs.length; r++) {
ItemStack temp = getItemStackOfAmountFromOreDictNoBroken(
- mValidPrefixesAsString[r].name() + Utils.sanitizeString(material.getLocalizedName()), 1);
+ mValidPrefixesAsString[r].name() + Utils.sanitizeString(material.getLocalizedName()),
+ 1);
if (temp != null) {
mValidPairs[mSlotIndex++] = new Pair<OrePrefixes, ItemStack>(mValidPrefixesAsString[r], temp.copy());
}
@@ -135,8 +109,7 @@ public class RecipeGen_Recycling implements Runnable {
for (final Pair<OrePrefixes, ItemStack> validPrefix : mValidPairs) {
try {
- if (material == null
- || validPrefix == null
+ if (material == null || validPrefix == null
|| (material.getState() != MaterialState.SOLID
&& material.getState() != MaterialState.LIQUID)
|| validPrefix.getKey() == OrePrefixes.ingotHot) {
@@ -146,15 +119,19 @@ public class RecipeGen_Recycling implements Runnable {
final ItemStack tempStack = validPrefix.getValue();
final ItemStack mDust = getDust(material, validPrefix.getKey());
final Pair<OrePrefixes, ItemStack> mData = getDustData(material, validPrefix.getKey());
- int mFluidAmount =
- (int) GT_Utility.translateMaterialToFluidAmount(validPrefix.getKey().mMaterialAmount, true);
+ int mFluidAmount = (int) GT_Utility
+ .translateMaterialToFluidAmount(validPrefix.getKey().mMaterialAmount, true);
// Maceration
if (ItemUtils.checkForInvalidItems(tempStack)) {
// mValidItems[mSlotIndex++] = tempStack;
if ((mDust != null) && GT_ModHandler.addPulverisationRecipe(tempStack, mDust)) {
- Logger.WARNING("Recycle Recipe: " + material.getLocalizedName() + " - Success - Recycle "
- + tempStack.getDisplayName() + " and obtain " + mDust.getDisplayName());
+ Logger.WARNING(
+ "Recycle Recipe: " + material.getLocalizedName()
+ + " - Success - Recycle "
+ + tempStack.getDisplayName()
+ + " and obtain "
+ + mDust.getDisplayName());
} else {
Logger.WARNING("Recycle Recipe: " + material.getLocalizedName() + " - Failed");
if (mDust == null) {
@@ -170,20 +147,31 @@ public class RecipeGen_Recycling implements Runnable {
if (ItemUtils.checkForInvalidItems(tempStack)) {
// mValidItems[mSlotIndex++] = tempStack;
- int aFluidAmount =
- (int) ((L * validPrefix.getKey().mMaterialAmount) / (M * tempStack.stackSize));
+ int aFluidAmount = (int) ((L * validPrefix.getKey().mMaterialAmount)
+ / (M * tempStack.stackSize));
int aDuration = (int) Math.max(1, (24 * validPrefix.getKey().mMaterialAmount) / M);
boolean aGenFluidExtraction = CORE.RA.addFluidExtractionRecipe(
tempStack,
material.getFluidStack(aFluidAmount),
aDuration,
material.vVoltageMultiplier);
- if (aGenFluidExtraction /*(mDust != null) && CORE.RA.addFluidExtractionRecipe(tempStack, material.getFluidStack(mFluidAmount), 30, material.vVoltageMultiplier)*/) {
+ if (aGenFluidExtraction /*
+ * (mDust != null) && CORE.RA.addFluidExtractionRecipe(tempStack,
+ * material.getFluidStack(mFluidAmount), 30,
+ * material.vVoltageMultiplier)
+ */) {
Logger.WARNING(
- "Fluid Recycle Recipe: " + material.getLocalizedName() + " - Success - Recycle "
- + tempStack.getDisplayName() + " and obtain " + aFluidAmount + "mb of "
- + material.getFluidStack(1).getLocalizedName() + ". Time: " + aDuration
- + ", Voltage: " + material.vVoltageMultiplier);
+ "Fluid Recycle Recipe: " + material.getLocalizedName()
+ + " - Success - Recycle "
+ + tempStack.getDisplayName()
+ + " and obtain "
+ + aFluidAmount
+ + "mb of "
+ + material.getFluidStack(1).getLocalizedName()
+ + ". Time: "
+ + aDuration
+ + ", Voltage: "
+ + material.vVoltageMultiplier);
} else {
Logger.WARNING("Fluid Recycle Recipe: " + material.getLocalizedName() + " - Failed");
if (mDust == null) {
@@ -275,8 +263,8 @@ public class RecipeGen_Recycling implements Runnable {
return get(aPrefix, aMaterial, null, aAmount);
}
- public static ItemStack get(
- final OrePrefixes aPrefix, final Material aMaterial, final ItemStack aReplacement, final long aAmount) {
+ public static ItemStack get(final OrePrefixes aPrefix, final Material aMaterial, final ItemStack aReplacement,
+ final long aAmount) {
return get(
aPrefix.name() + Utils.sanitizeString(aMaterial.getLocalizedName()),
aReplacement,
@@ -285,12 +273,8 @@ public class RecipeGen_Recycling implements Runnable {
true);
}
- public static ItemStack get(
- final Object aName,
- final ItemStack aReplacement,
- final long aAmount,
- final boolean aMentionPossibleTypos,
- final boolean aNoInvalidAmounts) {
+ public static ItemStack get(final Object aName, final ItemStack aReplacement, final long aAmount,
+ final boolean aMentionPossibleTypos, final boolean aNoInvalidAmounts) {
if (aNoInvalidAmounts && (aAmount < 1L)) {
Logger.WARNING("Returning Null. Method: " + ReflectionUtils.getMethodName(0));
Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(1));
@@ -303,7 +287,8 @@ public class RecipeGen_Recycling implements Runnable {
Logger.WARNING("Unknown Key for Unification, Typo? " + aName);
}
return GT_Utility.copyAmount(
- aAmount, new Object[] {mNameMap.get(aName.toString()), getFirstOre(aName, aAmount), aReplacement});
+ aAmount,
+ new Object[] { mNameMap.get(aName.toString()), getFirstOre(aName, aAmount), aReplacement });
}
public static ItemStack getFirstOre(final Object aName, final long aAmount) {
@@ -318,7 +303,7 @@ public class RecipeGen_Recycling implements Runnable {
final ItemStack tStack = mNameMap.get(aName.toString());
if (GT_Utility.isStackValid(tStack)) {
Logger.WARNING("Found valid stack.");
- return GT_Utility.copyAmount(aAmount, new Object[] {tStack});
+ return GT_Utility.copyAmount(aAmount, new Object[] { tStack });
}
return GT_Utility.copyAmount(aAmount, getOres(aName).toArray());
}
@@ -342,8 +327,8 @@ public class RecipeGen_Recycling implements Runnable {
public Map<String, ItemStack> getNameMap() {
Map<String, ItemStack> tempMap;
try {
- tempMap = (Map<String, ItemStack>)
- FieldUtils.readStaticField(GT_OreDictUnificator.class, "sName2StackMap", true);
+ tempMap = (Map<String, ItemStack>) FieldUtils
+ .readStaticField(GT_OreDictUnificator.class, "sName2StackMap", true);
if (tempMap != null) {
Logger.WARNING("Found 'sName2StackMap' in GT_OreDictUnificator.class.");
return tempMap;
@@ -360,7 +345,7 @@ public class RecipeGen_Recycling implements Runnable {
try {
if (oredictName.contains("-") || oredictName.contains("_")) {
- oredictName = Utils.sanitizeString(oredictName, new char[] {'-', '_'});
+ oredictName = Utils.sanitizeString(oredictName, new char[] { '-', '_' });
} else {
oredictName = Utils.sanitizeString(oredictName);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index 178e84935d..8bc90b6ba0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import java.util.HashSet;
+import java.util.Set;
+
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.api.objects.Logger;
@@ -8,8 +11,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import java.util.HashSet;
-import java.util.Set;
public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
@@ -36,17 +37,11 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
// Nuggets
if (ItemUtils.checkForInvalidItems(material.getNugget(1))
&& ItemUtils.checkForInvalidItems(material.getIngot(1)))
- GT_ModHandler.addShapelessCraftingRecipe(material.getIngot(1), new Object[] {
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1),
- material.getNugget(1)
- });
+ GT_ModHandler.addShapelessCraftingRecipe(
+ material.getIngot(1),
+ new Object[] { material.getNugget(1), material.getNugget(1), material.getNugget(1),
+ material.getNugget(1), material.getNugget(1), material.getNugget(1),
+ material.getNugget(1), material.getNugget(1), material.getNugget(1) });
}
// Plates
@@ -54,26 +49,19 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
// Single Plate Shaped/Shapeless
if (ItemUtils.checkForInvalidItems(material.getPlate(1))
&& ItemUtils.checkForInvalidItems(material.getIngot(1)))
- if (material.getPlate(1) != null && material.getIngot(1) != null)
- GT_ModHandler.addCraftingRecipe(
- material.getPlate(1),
- gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
- | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "h",
- "B",
- "I",
- Character.valueOf('I'),
- material.getIngot(1),
- Character.valueOf('B'),
- material.getIngot(1)
- });
+ if (material.getPlate(1) != null && material.getIngot(1) != null) GT_ModHandler.addCraftingRecipe(
+ material.getPlate(1),
+ gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
+ | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
+ new Object[] { "h", "B", "I", Character.valueOf('I'), material.getIngot(1), Character.valueOf('B'),
+ material.getIngot(1) });
if (ItemUtils.checkForInvalidItems(material.getPlate(1))
&& ItemUtils.checkForInvalidItems(material.getIngot(1)))
- GT_ModHandler.addShapelessCraftingRecipe(material.getPlate(1), new Object[] {
- gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getIngot(1), material.getIngot(1)
- });
+ GT_ModHandler.addShapelessCraftingRecipe(
+ material.getPlate(1),
+ new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getIngot(1),
+ material.getIngot(1) });
// Double Plate Shaped/Shapeless
if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1))
@@ -82,32 +70,25 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getPlateDouble(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "I",
- "B",
- "h",
- Character.valueOf('I'),
- material.getPlate(1),
- Character.valueOf('B'),
- material.getPlate(1)
- });
+ new Object[] { "I", "B", "h", Character.valueOf('I'), material.getPlate(1), Character.valueOf('B'),
+ material.getPlate(1) });
if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1))
&& ItemUtils.checkForInvalidItems(material.getPlate(1)))
- GT_ModHandler.addShapelessCraftingRecipe(material.getPlateDouble(1), new Object[] {
- gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getPlate(1), material.getPlate(1)
- });
+ GT_ModHandler.addShapelessCraftingRecipe(
+ material.getPlateDouble(1),
+ new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getPlate(1),
+ material.getPlate(1) });
// Ring Recipe
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getRing(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getRing(1))
&& ItemUtils.checkForInvalidItems(material.getRod(1))) {
if (CORE.GTNH) {
if (GT_ModHandler.addCraftingRecipe(
material.getRing(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"h ", "fR", 'R', material.getRod(1)})) {
+ new Object[] { "h ", "fR", 'R', material.getRod(1) })) {
Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Failed");
@@ -132,14 +113,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
}
// Framebox Recipe
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getFrameBox(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getFrameBox(1))
&& ItemUtils.checkForInvalidItems(material.getRod(1))) {
if (GT_ModHandler.addCraftingRecipe(
material.getFrameBox(2),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"RRR", "RwR", "RRR", 'R', material.getRod(1)})) {
+ new Object[] { "RRR", "RwR", "RRR", 'R', material.getRod(1) })) {
Logger.WARNING("Framebox Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Framebox Recipe: " + material.getLocalizedName() + " - Failed");
@@ -147,14 +127,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
}
// Shaped Recipe - Bolts
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getBolt(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getBolt(1))
&& ItemUtils.checkForInvalidItems(material.getRod(1))) {
if (GT_ModHandler.addCraftingRecipe(
material.getBolt(2),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"s ", " R", 'R', material.getRod(1)})) {
+ new Object[] { "s ", " R", 'R', material.getRod(1) })) {
Logger.WARNING("Bolt Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Bolt Recipe: " + material.getLocalizedName() + " - Failed");
@@ -162,14 +141,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
}
// Shaped Recipe - Fine Wire
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getFoil(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getFoil(1))
&& ItemUtils.checkForInvalidItems(material.getFineWire(1))) {
if (GT_ModHandler.addCraftingRecipe(
material.getFineWire(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"Fx", 'F', material.getFoil(1)})) {
+ new Object[] { "Fx", 'F', material.getFoil(1) })) {
Logger.WARNING("Fine Wire Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Fine Wire Recipe: " + material.getLocalizedName() + " - Failed");
@@ -183,7 +161,7 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getFoil(2),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"hP", 'P', material.getPlate(1)})) {
+ new Object[] { "hP", 'P', material.getPlate(1) })) {
Logger.WARNING("Foil Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Foil Recipe: " + material.getLocalizedName() + " - Failed");
@@ -196,11 +174,11 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getRod(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"f ", " I", 'I', material.getIngot(1)})) {
- Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ new Object[] { "f ", " I", 'I', material.getIngot(1) })) {
+ Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Shaped Recipe - Long Rod to two smalls
if (ItemUtils.checkForInvalidItems(material.getRod(1))
@@ -209,11 +187,11 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getRod(2),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"s", "L", 'L', material.getLongRod(1)})) {
- Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ new Object[] { "s", "L", 'L', material.getLongRod(1) })) {
+ Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Two small to long rod
if (ItemUtils.checkForInvalidItems(material.getLongRod(1))
@@ -222,15 +200,14 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getLongRod(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {"RhR", 'R', material.getRod(1)})) {
- Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Success");
- } else {
- Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Failed");
- }
+ new Object[] { "RhR", 'R', material.getRod(1) })) {
+ Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Success");
+ } else {
+ Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Failed");
+ }
// Rotor Recipe
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getRotor(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getRotor(1))
&& ItemUtils.checkForInvalidItems(material.getRing(1))
&& !material.isRadioactive
&& ItemUtils.checkForInvalidItems(material.getPlate(1))
@@ -239,17 +216,8 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
material.getRotor(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "PhP",
- "SRf",
- "PdP",
- 'P',
- material.getPlate(1),
- 'S',
- material.getScrew(1),
- 'R',
- material.getRing(1),
- })) {
+ new Object[] { "PhP", "SRf", "PdP", 'P', material.getPlate(1), 'S', material.getScrew(1), 'R',
+ material.getRing(1), })) {
Logger.WARNING("Rotor Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Rotor Recipe: " + material.getLocalizedName() + " - Failed");
@@ -257,17 +225,14 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
}
// Gear Recipe
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getGear(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getGear(1))
&& ItemUtils.checkForInvalidItems(material.getPlate(1))
&& ItemUtils.checkForInvalidItems(material.getRod(1))) {
if (GT_ModHandler.addCraftingRecipe(
material.getGear(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "RPR", "PwP", "RPR", 'P', material.getPlate(1), 'R', material.getRod(1),
- })) {
+ new Object[] { "RPR", "PwP", "RPR", 'P', material.getPlate(1), 'R', material.getRod(1), })) {
Logger.WARNING("Gear Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Gear Recipe: " + material.getLocalizedName() + " - Failed");
@@ -275,16 +240,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
}
// Screws
- if (!material.isRadioactive
- && ItemUtils.checkForInvalidItems(material.getScrew(1))
+ if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getScrew(1))
&& ItemUtils.checkForInvalidItems(material.getBolt(1))) {
if (GT_ModHandler.addCraftingRecipe(
material.getScrew(1),
gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
| gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "fB", "B ", 'B', material.getBolt(1),
- })) {
+ new Object[] { "fB", "B ", 'B', material.getBolt(1), })) {
Logger.WARNING("Screw Recipe: " + material.getLocalizedName() + " - Success");
} else {
Logger.WARNING("Screw Recipe: " + material.getLocalizedName() + " - Failed");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java
index 5a8306abee..c89648e25f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java
@@ -4,10 +4,11 @@ import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_ProcessingArray_Manager;
public class AddCustomMachineToPA {
+
public static void register() {
// Simple Washers
- GT_ProcessingArray_Manager.addRecipeMapToPA(
- "simplewasher.01", GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes);
+ GT_ProcessingArray_Manager
+ .addRecipeMapToPA("simplewasher.01", GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java
index 01683e8067..be7023433e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java
@@ -1,5 +1,15 @@
package gtPlusPlus.xmod.gregtech.loaders.misc;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.Achievement;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.stats.StatBase;
+import net.minecraftforge.common.AchievementPage;
+import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import gregtech.GT_Mod;
import gregtech.api.util.GT_Log;
@@ -9,14 +19,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
-import java.util.concurrent.ConcurrentHashMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.stats.Achievement;
-import net.minecraft.stats.AchievementList;
-import net.minecraft.stats.StatBase;
-import net.minecraftforge.common.AchievementPage;
-import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
public class AssLineAchievements {
@@ -41,8 +43,8 @@ public class AssLineAchievements {
if (!ready) {
active = GT_Mod.gregtechproxy.mAchievements;
try {
- recipeTotal =
- ((GT_Recipe.GT_Recipe_Map) StaticFields59.mAssLineVisualMapNEI.get(null)).mRecipeList.size();
+ recipeTotal = ((GT_Recipe.GT_Recipe_Map) StaticFields59.mAssLineVisualMapNEI.get(null)).mRecipeList
+ .size();
} catch (IllegalArgumentException | IllegalAccessException e) {
recipeTotal = 0;
}
@@ -54,8 +56,10 @@ public class AssLineAchievements {
public static void registerAchievements() {
if (active && mAchievementMap.size() > 0) {
- AchievementPage.registerAchievementPage(new AchievementPage("GT Assembly Line", (Achievement[])
- mAchievementMap.values().toArray(new Achievement[mAchievementMap.size()])));
+ AchievementPage.registerAchievementPage(
+ new AchievementPage(
+ "GT Assembly Line",
+ (Achievement[]) mAchievementMap.values().toArray(new Achievement[mAchievementMap.size()])));
} else if (active) {
Logger.INFO("Unable to register custom achievement page for Assembly Line recipes.");
}
@@ -104,8 +108,8 @@ public class AssLineAchievements {
return aYouDidSomethingInGT;
}
- public static Achievement registerAchievement(
- String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) {
+ public static Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement,
+ boolean special) {
if (!GT_Mod.gregtechproxy.mAchievements) {
return null;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
index 3fec531a12..379d8acda0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.gregtech.loaders.recipe;
+import java.util.HashMap;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
@@ -9,15 +14,11 @@ import gtPlusPlus.api.objects.data.WeightedCollection;
import gtPlusPlus.core.item.chemistry.AgriculturalChem;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashMap;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeLoader_AlgaeFarm {
private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<Integer, AutoMap<GT_Recipe>>();
- private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache =
- new HashMap<Integer, AutoMap<GT_Recipe>>();
+ private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<Integer, AutoMap<GT_Recipe>>();
public static void generateRecipes() {
for (int i = 0; i < 10; i++) {
@@ -70,7 +71,8 @@ public class RecipeLoader_AlgaeFarm {
aOutputTimeMulti.put(i, aValue);
}
- final int[] aDurations = new int[] {2000, 1800, 1600, 1400, 1200, 1000, 512, 256, 128, 64, 32, 16, 8, 4, 2, 1};
+ final int[] aDurations = new int[] { 2000, 1800, 1600, 1400, 1200, 1000, 512, 256, 128, 64, 32, 16, 8, 4, 2,
+ 1 };
ItemStack[] aInputs = new ItemStack[] {};
@@ -78,8 +80,9 @@ public class RecipeLoader_AlgaeFarm {
// Make it use 4 compost per tier if we have some available
// Compost consumption maxes out at 1 stack per cycle
ItemStack aCompost = ItemUtils.getSimpleStack(
- AgriculturalChem.mCompost, aTier > 1 ? (int) Math.min(64, Math.pow(2, aTier - 1)) : 1);
- aInputs = new ItemStack[] {aCompost};
+ AgriculturalChem.mCompost,
+ aTier > 1 ? (int) Math.min(64, Math.pow(2, aTier - 1)) : 1);
+ aInputs = new ItemStack[] { aCompost };
// Boost Tier by one if using compost so it gets a speed boost
aTier++;
}
@@ -93,8 +96,8 @@ public class RecipeLoader_AlgaeFarm {
aOutputs,
(Object) null,
new int[] {},
- new FluidStack[] {GT_Values.NF},
- new FluidStack[] {GT_Values.NF},
+ new FluidStack[] { GT_Values.NF },
+ new FluidStack[] { GT_Values.NF },
(int) (aDurations[aTier] * aOutputTimeMulti.get() / 2), // Time
0,
0);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java
index c00b9b08e2..d92b117b65 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java
@@ -1,9 +1,13 @@
package gtPlusPlus.xmod.gregtech.loaders.recipe;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import com.dreammaster.gthandler.GT_CoreModSupport;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import com.github.technus.tectech.recipe.TT_recipeAdder;
import com.github.technus.tectech.thing.block.QuantumGlassBlock;
+
import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
@@ -19,8 +23,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeLoader_ChemicalSkips {
@@ -48,247 +50,175 @@ public class RecipeLoader_ChemicalSkips {
ItemStack biocells = GT_Utility.copyAmountUnsafe(64 * 32, ItemList.Circuit_Chip_Biocell.get(1));
// Platline
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- WerkstoffLoader.PTMetallicPowder.get(OrePrefixes.dust, 32),
- ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)
- },
+ new ItemStack[] { WerkstoffLoader.PTMetallicPowder.get(OrePrefixes.dust, 32),
+ ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0) },
new FluidStack[] {},
new FluidStack[] {},
- new ItemStack[] {
- Materials.Platinum.getDust(64),
- Materials.Palladium.getDust(64),
- Materials.Iridium.getDust(64),
- Materials.Osmium.getDust(64),
- WerkstoffLoader.Rhodium.get(OrePrefixes.dust, 64),
- WerkstoffLoader.Ruthenium.get(OrePrefixes.dust, 64)
- },
- new int[] {1667, 1667, 1667, 1667, 1667, 1667},
+ new ItemStack[] { Materials.Platinum.getDust(64), Materials.Palladium.getDust(64),
+ Materials.Iridium.getDust(64), Materials.Osmium.getDust(64),
+ WerkstoffLoader.Rhodium.get(OrePrefixes.dust, 64),
+ WerkstoffLoader.Ruthenium.get(OrePrefixes.dust, 64) },
+ new int[] { 1667, 1667, 1667, 1667, 1667, 1667 },
20 * 20,
(int) GT_Values.VP[8],
1);
// Early Plastics
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 0)
- },
- new FluidStack[] {
- Materials.Oxygen.getGas(1000 * 16),
- Materials.Hydrogen.getGas(1000 * 16),
- Materials.Chlorine.getGas(1000 * 16),
- Materials.Fluorine.getGas(1000 * 16)
- },
- new FluidStack[] {
- Materials.Plastic.getMolten(144 * 256),
- Materials.PolyvinylChloride.getMolten(144 * 128),
- Materials.Polystyrene.getMolten(144 * 64),
- Materials.Polytetrafluoroethylene.getMolten(144 * 128),
- Materials.Epoxid.getMolten(144 * 64),
- Materials.Polybenzimidazole.getMolten(144 * 64)
- },
+ new ItemStack[] { Materials.Carbon.getDust(64),
+ ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 0) },
+ new FluidStack[] { Materials.Oxygen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16),
+ Materials.Chlorine.getGas(1000 * 16), Materials.Fluorine.getGas(1000 * 16) },
+ new FluidStack[] { Materials.Plastic.getMolten(144 * 256),
+ Materials.PolyvinylChloride.getMolten(144 * 128), Materials.Polystyrene.getMolten(144 * 64),
+ Materials.Polytetrafluoroethylene.getMolten(144 * 128), Materials.Epoxid.getMolten(144 * 64),
+ Materials.Polybenzimidazole.getMolten(144 * 64) },
null,
- new int[] {2000, 2000, 2000, 2000, 2000, 2000},
+ new int[] { 2000, 2000, 2000, 2000, 2000, 2000 },
20 * 20,
(int) GT_Values.VP[7],
1);
// Early Rubbers/Cable Materials
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 0)
- },
- new FluidStack[] {
- Materials.Oxygen.getGas(1000 * 16),
- Materials.Hydrogen.getGas(1000 * 16),
- Materials.Chlorine.getGas(1000 * 16)
- },
- new FluidStack[] {
- Materials.Silicone.getMolten(144 * 64),
- Materials.StyreneButadieneRubber.getMolten(144 * 64),
- Materials.PolyphenyleneSulfide.getMolten(144 * 128),
- Materials.Rubber.getMolten(144 * 256)
- },
+ new ItemStack[] { Materials.Carbon.getDust(64),
+ ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 0) },
+ new FluidStack[] { Materials.Oxygen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16),
+ Materials.Chlorine.getGas(1000 * 16) },
+ new FluidStack[] { Materials.Silicone.getMolten(144 * 64),
+ Materials.StyreneButadieneRubber.getMolten(144 * 64),
+ Materials.PolyphenyleneSulfide.getMolten(144 * 128), Materials.Rubber.getMolten(144 * 256) },
null,
- new int[] {2500, 2500, 2500, 2500},
+ new int[] { 2500, 2500, 2500, 2500 },
20 * 20,
(int) GT_Values.VP[7],
1);
// Glues and Solders
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- Materials.Carbon.getDust(32),
- Materials.Bismuth.getDust(32),
- ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 0)
- },
- new FluidStack[] {Materials.Oxygen.getFluid(10000), Materials.Hydrogen.getFluid(10000)},
- new FluidStack[] {
- MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1000 * 32),
- Materials.AdvancedGlue.getFluid(1000 * 16),
- ALLOY.INDALLOY_140.getFluidStack(144 * 64),
- Materials.SolderingAlloy.getMolten(144 * 128)
- },
- new ItemStack[] {ItemList.StableAdhesive.get(1)},
- new int[] {2000, 2000, 2000, 2000, 2000},
+ new ItemStack[] { Materials.Carbon.getDust(32), Materials.Bismuth.getDust(32),
+ ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 0) },
+ new FluidStack[] { Materials.Oxygen.getFluid(10000), Materials.Hydrogen.getFluid(10000) },
+ new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1000 * 32),
+ Materials.AdvancedGlue.getFluid(1000 * 16), ALLOY.INDALLOY_140.getFluidStack(144 * 64),
+ Materials.SolderingAlloy.getMolten(144 * 128) },
+ new ItemStack[] { ItemList.StableAdhesive.get(1) },
+ new int[] { 2000, 2000, 2000, 2000, 2000 },
20 * 20,
(int) GT_Values.VP[8],
1);
// Titanium, Tungsten, Indium
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- Materials.Lead.getDust(16),
- Materials.Bauxite.getDust(32),
- Materials.Tungstate.getDust(16),
- ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 0)
- },
+ new ItemStack[] { Materials.Lead.getDust(16), Materials.Bauxite.getDust(32),
+ Materials.Tungstate.getDust(16),
+ ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 0) },
new FluidStack[] {},
new FluidStack[] {},
- new ItemStack[] {
- Materials.Titanium.getDust(64),
- Materials.TungstenSteel.getDust(64),
- Materials.TungstenCarbide.getDust(64),
- Materials.Indium.getDust(64)
- },
- new int[] {2500, 2500, 2500, 2500},
+ new ItemStack[] { Materials.Titanium.getDust(64), Materials.TungstenSteel.getDust(64),
+ Materials.TungstenCarbide.getDust(64), Materials.Indium.getDust(64) },
+ new int[] { 2500, 2500, 2500, 2500 },
20 * 20,
(int) GT_Values.VP[8],
1);
// Thorium, Uranium, Plutonium
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- Materials.Thorium.getDust(32),
- Materials.Uranium.getDust(32),
- ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 0)
- },
+ new ItemStack[] { Materials.Thorium.getDust(32), Materials.Uranium.getDust(32),
+ ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 0) },
new FluidStack[] {},
new FluidStack[] {},
- new ItemStack[] {
- ELEMENT.getInstance().THORIUM232.getDust(64),
- ELEMENT.getInstance().URANIUM233.getDust(64),
- Materials.Uranium235.getDust(64),
- ELEMENT.getInstance().PLUTONIUM238.getDust(64),
- Materials.Plutonium.getDust(64),
- Materials.Plutonium241.getDust(64)
- },
- new int[] {1667, 1667, 1667, 1667, 1667, 1667},
+ new ItemStack[] { ELEMENT.getInstance().THORIUM232.getDust(64),
+ ELEMENT.getInstance().URANIUM233.getDust(64), Materials.Uranium235.getDust(64),
+ ELEMENT.getInstance().PLUTONIUM238.getDust(64), Materials.Plutonium.getDust(64),
+ Materials.Plutonium241.getDust(64) },
+ new int[] { 1667, 1667, 1667, 1667, 1667, 1667 },
20 * 20,
(int) GT_Values.VP[8],
1);
// Monaline
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- Materials.Monazite.getDust(32), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0)
- },
+ new ItemStack[] { Materials.Monazite.getDust(32),
+ ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0) },
new FluidStack[] {},
new FluidStack[] {},
- new ItemStack[] {
- Materials.Cerium.getDust(64),
- Materials.Gadolinium.getDust(64),
- Materials.Samarium.getDust(64),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11002), // Hafnia
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11007), // Zirconium
- ItemList.SuperconductorComposite.get(1)
- },
- new int[] {1667, 1667, 1667, 1667, 1667, 1667},
+ new ItemStack[] { Materials.Cerium.getDust(64), Materials.Gadolinium.getDust(64),
+ Materials.Samarium.getDust(64),
+ GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11002), // Hafnia
+ GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11007), // Zirconium
+ ItemList.SuperconductorComposite.get(1) },
+ new int[] { 1667, 1667, 1667, 1667, 1667, 1667 },
20 * 20,
(int) GT_Values.VP[9],
2);
// Bastline
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- Materials.Bastnasite.getDust(32), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0)
- },
+ new ItemStack[] { Materials.Bastnasite.getDust(32),
+ ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0) },
null,
null,
- new ItemStack[] {
- Materials.Holmium.getDust(64),
- Materials.Cerium.getDust(64),
- Materials.Samarium.getDust(64),
- Materials.Gadolinium.getDust(64),
- Materials.Lanthanum.getDust(64)
- },
- new int[] {2000, 2000, 2000, 2000, 2000},
+ new ItemStack[] { Materials.Holmium.getDust(64), Materials.Cerium.getDust(64),
+ Materials.Samarium.getDust(64), Materials.Gadolinium.getDust(64),
+ Materials.Lanthanum.getDust(64) },
+ new int[] { 2000, 2000, 2000, 2000, 2000 },
20 * 20,
(int) GT_Values.VP[9],
2);
// Stem Cells
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- Materials.Calcium.getDust(32),
- Materials.MeatRaw.getDust(32),
- GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 32, 2),
- ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 0)
- },
+ new ItemStack[] { Materials.Calcium.getDust(32), Materials.MeatRaw.getDust(32),
+ GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 32, 2),
+ ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 0) },
new FluidStack[] {},
- new FluidStack[] {
- Materials.GrowthMediumRaw.getFluid(1000 * 1024),
- Materials.GrowthMediumSterilized.getFluid(1000 * 512)
- },
- new ItemStack[] {stemcells},
- new int[] {3333, 3333, 3333},
+ new FluidStack[] { Materials.GrowthMediumRaw.getFluid(1000 * 1024),
+ Materials.GrowthMediumSterilized.getFluid(1000 * 512) },
+ new ItemStack[] { stemcells },
+ new int[] { 3333, 3333, 3333 },
20 * 20,
(int) GT_Values.VP[10],
3);
// Lategame Plastics (Missing Radox Polymer and Heavy Radox)
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- Materials.Carbon.getDust(64),
- Materials.Osmium.getDust(24),
- ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0)
- },
- new FluidStack[] {Materials.Hydrogen.getGas(1000 * 16), Materials.Nitrogen.getGas(1000 * 16)},
- new FluidStack[] {
- GT_CoreModSupport.Xenoxene.getFluid(1000 * 16),
- GT_CoreModSupport.RadoxPolymer.getMolten(144 * 64),
- GT_CoreModSupport.RadoxHeavy.getFluid(1000 * 16),
- MaterialsKevlar.Kevlar.getMolten(144 * 64)
- },
+ new ItemStack[] { Materials.Carbon.getDust(64), Materials.Osmium.getDust(24),
+ ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0) },
+ new FluidStack[] { Materials.Hydrogen.getGas(1000 * 16), Materials.Nitrogen.getGas(1000 * 16) },
+ new FluidStack[] { GT_CoreModSupport.Xenoxene.getFluid(1000 * 16),
+ GT_CoreModSupport.RadoxPolymer.getMolten(144 * 64),
+ GT_CoreModSupport.RadoxHeavy.getFluid(1000 * 16), MaterialsKevlar.Kevlar.getMolten(144 * 64) },
new ItemStack[] {},
- new int[] {2500, 2500, 2500, 2500},
+ new int[] { 2500, 2500, 2500, 2500 },
20 * 20,
(int) GT_Values.VP[11],
4);
// Lategame Kevlar using Kevlar bee comb
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- GT_Bees.combs.getStackForType(CombType.KEVLAR, 24),
- Materials.Carbon.getDust(64),
- ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0)
- },
- new FluidStack[] {Materials.Nitrogen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16)},
- new FluidStack[] {
- MaterialsKevlar.PolyurethaneResin.getFluid(1000 * 32),
- MaterialsKevlar.LiquidCrystalKevlar.getFluid(144 * 32),
- MaterialsKevlar.Kevlar.getMolten(144 * 64)
- },
+ new ItemStack[] { GT_Bees.combs.getStackForType(CombType.KEVLAR, 24), Materials.Carbon.getDust(64),
+ ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0) },
+ new FluidStack[] { Materials.Nitrogen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16) },
+ new FluidStack[] { MaterialsKevlar.PolyurethaneResin.getFluid(1000 * 32),
+ MaterialsKevlar.LiquidCrystalKevlar.getFluid(144 * 32),
+ MaterialsKevlar.Kevlar.getMolten(144 * 64) },
new ItemStack[] {},
- new int[] {2500, 2500, 2500, 2500},
+ new int[] { 2500, 2500, 2500, 2500 },
20 * 20,
(int) GT_Values.VP[11],
4);
// Bio Cells and Mutated Solder
CORE.RA.addQuantumTransformerRecipe(
- new ItemStack[] {
- ItemList.Circuit_Chip_Stemcell.get(16),
- Materials.InfinityCatalyst.getDust(4),
- ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 0)
- },
+ new ItemStack[] { ItemList.Circuit_Chip_Stemcell.get(16), Materials.InfinityCatalyst.getDust(4),
+ ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 0) },
new FluidStack[] {},
- new FluidStack[] {
- MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 128),
- Materials.BioMediumSterilized.getFluid(1000 * 256),
- Materials.BioMediumRaw.getFluid(1000 * 512)
- },
- new ItemStack[] {biocells},
- new int[] {2500, 2500, 2500, 2500},
+ new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 128),
+ Materials.BioMediumSterilized.getFluid(1000 * 256),
+ Materials.BioMediumRaw.getFluid(1000 * 512) },
+ new ItemStack[] { biocells },
+ new int[] { 2500, 2500, 2500, 2500 },
20 * 20,
(int) GT_Values.VP[11],
4);
@@ -296,15 +226,15 @@ public class RecipeLoader_ChemicalSkips {
private static void fusionReactorRecipes() {
GT_Values.RA.addFusionReactorRecipe(
- new FluidStack[] {Materials.Radon.getPlasma(100), Materials.Nitrogen.getPlasma(100)},
- new FluidStack[] {new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 100)},
+ new FluidStack[] { Materials.Radon.getPlasma(100), Materials.Nitrogen.getPlasma(100) },
+ new FluidStack[] { new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 100) },
30 * 20,
(int) GT_Values.VP[8],
1000000000);
GT_Values.RA.addFusionReactorRecipe(
- new FluidStack[] {Materials.Americium.getPlasma(100), Materials.Boron.getPlasma(100)},
- new FluidStack[] {new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 100)},
+ new FluidStack[] { Materials.Americium.getPlasma(100), Materials.Boron.getPlasma(100) },
+ new FluidStack[] { new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 100) },
30 * 20,
(int) GT_Values.VP[8],
1000000000);
@@ -312,153 +242,100 @@ public class RecipeLoader_ChemicalSkips {
private static void catalystRecipes() {
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 88),
- Materials.Osmiridium.getDust(64),
- Materials.Carbon.getNanite(64)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
+ GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 88),
+ Materials.Osmiridium.getDust(64), Materials.Carbon.getNanite(64) },
ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360),
ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 1),
60 * 20,
(int) GT_Values.VP[9]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- Materials.Polybenzimidazole.getDust(64),
- Materials.Polytetrafluoroethylene.getDust(64),
- Materials.Carbon.getNanite(64)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
+ Materials.Polybenzimidazole.getDust(64), Materials.Polytetrafluoroethylene.getDust(64),
+ Materials.Carbon.getNanite(64) },
ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360),
ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 1),
60 * 20,
(int) GT_Values.VP[9]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- Materials.Silicone.getDust(64),
- Materials.StyreneButadieneRubber.getDust(64),
- Materials.Carbon.getNanite(64)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Silicone.getDust(64),
+ Materials.StyreneButadieneRubber.getDust(64), Materials.Carbon.getNanite(64) },
ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360),
ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 1),
60 * 20,
(int) GT_Values.VP[9]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- ALLOY.INDALLOY_140.getDust(64),
- MISC_MATERIALS.ETHYL_CYANOACRYLATE.getCell(64),
- Materials.Carbon.getNanite(64)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), ALLOY.INDALLOY_140.getDust(64),
+ MISC_MATERIALS.ETHYL_CYANOACRYLATE.getCell(64), Materials.Carbon.getNanite(64) },
ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360),
ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 1),
60 * 20,
(int) GT_Values.VP[9]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- Materials.TungstenSteel.getDust(64),
- Materials.Indium.getDust(64),
- Materials.Carbon.getNanite(64)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
+ Materials.TungstenSteel.getDust(64), Materials.Indium.getDust(64),
+ Materials.Carbon.getNanite(64) },
ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360),
ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 1),
60 * 20,
(int) GT_Values.VP[9]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- ELEMENT.getInstance().URANIUM235.getDust(64),
- ELEMENT.getInstance().PLUTONIUM241.getDust(64),
- Materials.Carbon.getNanite(64)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
+ ELEMENT.getInstance().URANIUM235.getDust(64), ELEMENT.getInstance().PLUTONIUM241.getDust(64),
+ Materials.Carbon.getNanite(64) },
ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360),
ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 1),
60 * 20,
(int) GT_Values.VP[9]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- Materials.Samarium.getDust(64),
- Materials.Gadolinium.getDust(64),
- Materials.Silver.getNanite(1)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Samarium.getDust(64),
+ Materials.Gadolinium.getDust(64), Materials.Silver.getNanite(1) },
ELEMENT.STANDALONE.HYPOGEN.getFluidStack(9216),
ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 1),
60 * 20,
(int) GT_Values.VP[10]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- Materials.Naquadah.getDust(64),
- Materials.Adamantium.getDust(64),
- Materials.Silver.getNanite(1)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Naquadah.getDust(64),
+ Materials.Adamantium.getDust(64), Materials.Silver.getNanite(1) },
ELEMENT.STANDALONE.HYPOGEN.getFluidStack(9216),
ItemUtils.getSimpleStack(GenericChem.mSimpleNaquadahCatalyst, 1),
60 * 20,
(int) GT_Values.VP[10]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- Materials.Naquadria.getDust(64),
- Materials.Trinium.getDust(64),
- Materials.Gold.getNanite(1)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Naquadria.getDust(64),
+ Materials.Trinium.getDust(64), Materials.Gold.getNanite(1) },
Materials.SpaceTime.getMolten(9216L),
ItemUtils.getSimpleStack(GenericChem.mAdvancedNaquadahCatalyst, 1),
60 * 20,
(int) GT_Values.VP[11]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- ItemList.Circuit_Chip_Stemcell.get(64),
- Materials.Gold.getNanite(1)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
+ ItemList.Circuit_Chip_Stemcell.get(64), Materials.Gold.getNanite(1) },
Materials.SpaceTime.getMolten(9216L),
ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 1),
60 * 20,
(int) GT_Values.VP[11]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- MaterialsKevlar.Kevlar.getDust(64),
- Materials.TranscendentMetal.getNanite(1)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), MaterialsKevlar.Kevlar.getDust(64),
+ Materials.TranscendentMetal.getNanite(1) },
FluidUtils.getFluidStack("molten.shirabon", 92160),
ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 1),
60 * 20,
(int) GT_Values.VP[12]);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(10),
- CI.getEmptyCatalyst(1),
- ItemList.Circuit_Chip_Biocell.get(64),
- Materials.TranscendentMetal.getNanite(1)
- },
+ new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1),
+ ItemList.Circuit_Chip_Biocell.get(64), Materials.TranscendentMetal.getNanite(1) },
FluidUtils.getFluidStack("molten.shirabon", 92160),
ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 1),
60 * 20,
@@ -472,20 +349,14 @@ public class RecipeLoader_ChemicalSkips {
1024,
(int) GT_Values.VP[7],
32,
- new ItemStack[] {
- GregtechItemList.ForceFieldGlass.get(1),
- Materials.Carbon.getNanite(4),
- ItemList.Emitter_UV.get(4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8),
- GregtechItemList.Laser_Lens_Special.get(1),
- GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 2)
- },
- new FluidStack[] {
- Materials.Thulium.getMolten(144 * 10),
- Materials.ExcitedDTCC.getFluid(5000),
- new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500),
- new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500)
- },
+ new ItemStack[] { GregtechItemList.ForceFieldGlass.get(1), Materials.Carbon.getNanite(4),
+ ItemList.Emitter_UV.get(4),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8),
+ GregtechItemList.Laser_Lens_Special.get(1),
+ GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 2) },
+ new FluidStack[] { Materials.Thulium.getMolten(144 * 10), Materials.ExcitedDTCC.getFluid(5000),
+ new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500),
+ new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500) },
GregtechItemList.NeutronPulseManipulator.get(1),
60 * 20,
(int) GT_Values.VP[10]);
@@ -496,21 +367,15 @@ public class RecipeLoader_ChemicalSkips {
2048,
(int) GT_Values.VP[8],
32,
- new ItemStack[] {
- GregtechItemList.ForceFieldGlass.get(2),
- Materials.Carbon.getNanite(8),
- ItemList.Emitter_UEV.get(4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8),
- GregtechItemList.Laser_Lens_Special.get(1),
- GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 4),
- ItemList.StableAdhesive.get(4)
- },
- new FluidStack[] {
- Materials.Thulium.getMolten(144 * 12),
- Materials.ExcitedDTPC.getFluid(5000),
- new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500),
- new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2500)
- },
+ new ItemStack[] { GregtechItemList.ForceFieldGlass.get(2), Materials.Carbon.getNanite(8),
+ ItemList.Emitter_UEV.get(4),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8),
+ GregtechItemList.Laser_Lens_Special.get(1),
+ GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 4),
+ ItemList.StableAdhesive.get(4) },
+ new FluidStack[] { Materials.Thulium.getMolten(144 * 12), Materials.ExcitedDTPC.getFluid(5000),
+ new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500),
+ new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2500) },
GregtechItemList.CosmicFabricManipulator.get(1),
75 * 20,
(int) GT_Values.VP[11]);
@@ -521,21 +386,15 @@ public class RecipeLoader_ChemicalSkips {
4096,
(int) GT_Values.VP[7],
32,
- new ItemStack[] {
- GregtechItemList.ForceFieldGlass.get(4),
- Materials.Carbon.getNanite(16),
- ItemList.Emitter_UIV.get(4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8),
- GregtechItemList.Laser_Lens_Special.get(1),
- GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 8),
- ItemList.SuperconductorComposite.get(4)
- },
- new FluidStack[] {
- Materials.Thulium.getMolten(144 * 15),
- Materials.ExcitedDTRC.getFluid(5000),
- new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10),
- new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 1000 * 10)
- },
+ new ItemStack[] { GregtechItemList.ForceFieldGlass.get(4), Materials.Carbon.getNanite(16),
+ ItemList.Emitter_UIV.get(4),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8),
+ GregtechItemList.Laser_Lens_Special.get(1),
+ GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 8),
+ ItemList.SuperconductorComposite.get(4) },
+ new FluidStack[] { Materials.Thulium.getMolten(144 * 15), Materials.ExcitedDTRC.getFluid(5000),
+ new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10),
+ new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 1000 * 10) },
GregtechItemList.InfinityInfusedManipulator.get(1),
90 * 20,
(int) GT_Values.VP[12]);
@@ -545,21 +404,15 @@ public class RecipeLoader_ChemicalSkips {
1024,
(int) GT_Values.VP[7],
32,
- new ItemStack[] {
- GregtechItemList.ForceFieldGlass.get(8),
- Materials.Carbon.getNanite(32),
- ItemList.Emitter_UMV.get(4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8),
- GregtechItemList.Laser_Lens_Special.get(1),
- GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 16),
- ItemList.NaquadriaSupersolid.get(4)
- },
- new FluidStack[] {
- Materials.Thulium.getMolten(144 * 20),
- Materials.ExcitedDTEC.getFluid(5000),
- new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10),
- new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2000 * 10)
- },
+ new ItemStack[] { GregtechItemList.ForceFieldGlass.get(8), Materials.Carbon.getNanite(32),
+ ItemList.Emitter_UMV.get(4),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8),
+ GregtechItemList.Laser_Lens_Special.get(1),
+ GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 16),
+ ItemList.NaquadriaSupersolid.get(4) },
+ new FluidStack[] { Materials.Thulium.getMolten(144 * 20), Materials.ExcitedDTEC.getFluid(5000),
+ new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10),
+ new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2000 * 10) },
GregtechItemList.SpaceTimeContinuumRipper.get(1),
60 * 20,
(int) GT_Values.VP[13]);
@@ -570,16 +423,11 @@ public class RecipeLoader_ChemicalSkips {
1024,
(int) GT_Values.VP[7],
32,
- new ItemStack[] {
- ALLOY.QUANTUM.getFrameBox(1),
- GT_OreDictUnificator.get("plateDensePreciousMetalsAlloy", 4),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 16),
- ItemList.Field_Generator_UV.get(1),
- ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getScrew(16)
- },
- new FluidStack[] {
- MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10),
- },
+ new ItemStack[] { ALLOY.QUANTUM.getFrameBox(1),
+ GT_OreDictUnificator.get("plateDensePreciousMetalsAlloy", 4),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 16),
+ ItemList.Field_Generator_UV.get(1), ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getScrew(16) },
+ new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), },
GregtechItemList.NeutronShieldingCore.get(1),
60 * 20,
(int) GT_Values.VP[10]);
@@ -590,17 +438,13 @@ public class RecipeLoader_ChemicalSkips {
2048,
(int) GT_Values.VP[8],
32,
- new ItemStack[] {
- ALLOY.QUANTUM.getFrameBox(2),
- GT_OreDictUnificator.get("plateDenseEnrichedNaquadahAlloy", 4),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16),
- ItemList.Field_Generator_UEV.get(1),
- GT_OreDictUnificator.get(OrePrefixes.screw, GT_CoreModSupport.RadoxPolymer, 16),
- ItemList.StableAdhesive.get(4)
- },
- new FluidStack[] {
- MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 20),
- },
+ new ItemStack[] { ALLOY.QUANTUM.getFrameBox(2),
+ GT_OreDictUnificator.get("plateDenseEnrichedNaquadahAlloy", 4),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16),
+ ItemList.Field_Generator_UEV.get(1),
+ GT_OreDictUnificator.get(OrePrefixes.screw, GT_CoreModSupport.RadoxPolymer, 16),
+ ItemList.StableAdhesive.get(4) },
+ new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 20), },
GregtechItemList.CosmicFabricShieldingCore.get(1),
75 * 20,
(int) GT_Values.VP[11]);
@@ -611,17 +455,11 @@ public class RecipeLoader_ChemicalSkips {
4096,
(int) GT_Values.VP[9],
32,
- new ItemStack[] {
- ALLOY.QUANTUM.getFrameBox(4),
- ELEMENT.STANDALONE.HYPOGEN.getPlateDense(4),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 16),
- ItemList.Field_Generator_UIV.get(1),
- GT_OreDictUnificator.get("screwMetastableOganesson", 16),
- ItemList.SuperconductorComposite.get(4)
- },
- new FluidStack[] {
- MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 40),
- },
+ new ItemStack[] { ALLOY.QUANTUM.getFrameBox(4), ELEMENT.STANDALONE.HYPOGEN.getPlateDense(4),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 16),
+ ItemList.Field_Generator_UIV.get(1), GT_OreDictUnificator.get("screwMetastableOganesson", 16),
+ ItemList.SuperconductorComposite.get(4) },
+ new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 40), },
GregtechItemList.InfinityInfusedShieldingCore.get(1),
90 * 20,
(int) GT_Values.VP[12]);
@@ -632,28 +470,20 @@ public class RecipeLoader_ChemicalSkips {
8192,
(int) GT_Values.VP[10],
32,
- new ItemStack[] {
- ALLOY.QUANTUM.getFrameBox(8),
- GT_OreDictUnificator.get("plateDenseShirabon", 4),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 16),
- ItemList.Field_Generator_UMV.get(1),
- GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Dilithium, 16),
- ItemList.NaquadriaSupersolid.get(4)
- },
- new FluidStack[] {
- MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 80),
- },
+ new ItemStack[] { ALLOY.QUANTUM.getFrameBox(8), GT_OreDictUnificator.get("plateDenseShirabon", 4),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 16),
+ ItemList.Field_Generator_UMV.get(1),
+ GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Dilithium, 16),
+ ItemList.NaquadriaSupersolid.get(4) },
+ new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 80), },
GregtechItemList.SpaceTimeBendingCore.get(1),
120 * 20,
(int) GT_Values.VP[13]);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- new ItemStack(QuantumGlassBlock.INSTANCE, 1),
- ItemList.Field_Generator_ZPM.get(1),
- ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getLongRod(6),
- ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlate(6)
- },
+ new ItemStack[] { new ItemStack(QuantumGlassBlock.INSTANCE, 1), ItemList.Field_Generator_ZPM.get(1),
+ ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getLongRod(6),
+ ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlate(6) },
ALLOY.QUANTUM.getFluidStack(144 * 6),
GregtechItemList.ForceFieldGlass.get(1),
10 * 20,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java
index fa13b1d093..6caa976ac7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java
@@ -1,14 +1,15 @@
package gtPlusPlus.xmod.gregtech.loaders.recipe;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gtPlusPlus.core.material.ELEMENT;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gtPlusPlus.core.material.ELEMENT;
+
public class RecipeLoader_GTNH {
public static void generate() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
index 0ce18ad1d0..0edc2a2d00 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.gregtech.loaders.recipe;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -18,9 +22,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.plugin.agrichem.BioRecipes;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeLoader_GlueLine {
@@ -43,100 +44,82 @@ public class RecipeLoader_GlueLine {
private static void chemicalPlantRecipes() {
// CO + C3H6O2 = C4H6O3
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(GenericChem.mBlueCatalyst, 0)},
- new FluidStack[] {
- FluidUtils.getFluidStack("carbonmonoxide", 1000), FluidUtils.getFluidStack("methylacetate", 1000),
- },
+ new ItemStack[] { CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(GenericChem.mBlueCatalyst, 0) },
+ new FluidStack[] { FluidUtils.getFluidStack("carbonmonoxide", 1000),
+ FluidUtils.getFluidStack("methylacetate", 1000), },
new ItemStack[] {},
- new FluidStack[] {MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000)},
+ new FluidStack[] { MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000) },
10 * 20,
500,
3);
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedCircuit(18)},
- new FluidStack[] {
- FluidUtils.getFluidStack("aceticacid", 1000),
- FluidUtils.getFluidStack("chlorine", 1000),
- MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000)
- },
+ new ItemStack[] { CI.getNumberedCircuit(18) },
+ new FluidStack[] { FluidUtils.getFluidStack("aceticacid", 1000),
+ FluidUtils.getFluidStack("chlorine", 1000),
+ MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000) },
new ItemStack[] {},
- new FluidStack[] {
- MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000),
- MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(950)
- },
+ new FluidStack[] { MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000),
+ MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(950) },
150 * 20,
1000,
4);
// Na2CO3 + NaCN + C2H3O2Cl + 2HCl = C3H3NO2 + 3NaCl + CO2 + H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(19),
- ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6),
- MISC_MATERIALS.SODIUM_CYANIDE.getDust(3)
- },
- new FluidStack[] {
- MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(1000),
- FluidUtils.getFluidStack("hydrochloricacid_gt5u", 2000)
- },
- new ItemStack[] {MISC_MATERIALS.CYANOACETIC_ACID.getDust(9), Materials.Salt.getDust(6)},
- new FluidStack[] {Materials.CarbonDioxide.getGas(1000), GT_ModHandler.getWater(1000)},
+ new ItemStack[] { CI.getNumberedCircuit(19),
+ ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6),
+ MISC_MATERIALS.SODIUM_CYANIDE.getDust(3) },
+ new FluidStack[] { MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(1000),
+ FluidUtils.getFluidStack("hydrochloricacid_gt5u", 2000) },
+ new ItemStack[] { MISC_MATERIALS.CYANOACETIC_ACID.getDust(9), Materials.Salt.getDust(6) },
+ new FluidStack[] { Materials.CarbonDioxide.getGas(1000), GT_ModHandler.getWater(1000) },
20 * 20,
1000,
4);
// CuSO4 + 5C3H3NO2 + 5C2H6O = CuSO4·5(H2O) + 5C5H7NO2
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(20),
- ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0),
- MISC_MATERIALS.COPPER_SULFATE.getDust(6),
- MISC_MATERIALS.CYANOACETIC_ACID.getDust(45)
- },
- new FluidStack[] {Materials.Ethanol.getFluid(5000)},
- new ItemStack[] {MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11)},
- new FluidStack[] {MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(5000)},
+ new ItemStack[] { CI.getNumberedCircuit(20),
+ ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0),
+ MISC_MATERIALS.COPPER_SULFATE.getDust(6), MISC_MATERIALS.CYANOACETIC_ACID.getDust(45) },
+ new FluidStack[] { Materials.Ethanol.getFluid(5000) },
+ new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11) },
+ new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(5000) },
500 * 20,
6000,
5);
// C3H3NO2 + C2H6O = C5H7NO2 + H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedCircuit(21), MISC_MATERIALS.CYANOACETIC_ACID.getDust(9)},
- new FluidStack[] {Materials.Ethanol.getFluid(1000)},
+ new ItemStack[] { CI.getNumberedCircuit(21), MISC_MATERIALS.CYANOACETIC_ACID.getDust(9) },
+ new FluidStack[] { Materials.Ethanol.getFluid(1000) },
new ItemStack[] {},
- new FluidStack[] {MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(1000)},
+ new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(1000) },
1000 * 20,
6000,
5);
- BioRecipes.mFormaldehyde =
- FluidUtils.getFluidStack("fluid.formaldehyde", 1).getFluid();
+ BioRecipes.mFormaldehyde = FluidUtils.getFluidStack("fluid.formaldehyde", 1).getFluid();
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedCircuit(22), ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0)
- },
- new FluidStack[] {
- MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(100),
- FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 100)
- },
+ new ItemStack[] { CI.getNumberedCircuit(22),
+ ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0) },
+ new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(100),
+ FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 100) },
new ItemStack[] {},
- new FluidStack[] {MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000)},
+ new FluidStack[] { MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000) },
10 * 20,
8000,
5);
// CH4 + NH3 + 3O = HCN + 3H2O
CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] {CI.getNumberedCircuit(23), ItemUtils.getSimpleStack(GenericChem.mPinkCatalyst, 0)},
- new FluidStack[] {
- FluidUtils.getFluidStack("methane", 2000),
- FluidUtils.getFluidStack("ammonia", 2000),
- FluidUtils.getFluidStack("oxygen", 6000)
- },
+ new ItemStack[] { CI.getNumberedCircuit(23), ItemUtils.getSimpleStack(GenericChem.mPinkCatalyst, 0) },
+ new FluidStack[] { FluidUtils.getFluidStack("methane", 2000), FluidUtils.getFluidStack("ammonia", 2000),
+ FluidUtils.getFluidStack("oxygen", 6000) },
new ItemStack[] {},
- new FluidStack[] {MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000)},
+ new FluidStack[] { MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000) },
10 * 20,
500,
3);
@@ -153,12 +136,11 @@ public class RecipeLoader_GlueLine {
10 * 20);
// #addChemicalRecipe won't generate LCR recipe if config >= 10
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {
- CI.getNumberedCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3)
- },
- new FluidStack[] {MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000)},
- new FluidStack[] {FluidUtils.getWater(1000)},
- new ItemStack[] {MISC_MATERIALS.SODIUM_CYANIDE.getDust(3)},
+ new ItemStack[] { CI.getNumberedCircuit(17),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3) },
+ new FluidStack[] { MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000) },
+ new FluidStack[] { FluidUtils.getWater(1000) },
+ new ItemStack[] { MISC_MATERIALS.SODIUM_CYANIDE.getDust(3) },
10 * 20,
30);
@@ -192,23 +174,22 @@ public class RecipeLoader_GlueLine {
5 * 20);
// #addChemicalRecipe won't generate LCR recipe if config >= 10
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {CI.getNumberedCircuit(19), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1)},
- new FluidStack[] {FluidUtils.getFluidStack("sulfuricacid", 2000)},
- new FluidStack[] {FluidUtils.getFluidStack("dilutedsulfuricacid", 1000)},
- new ItemStack[] {MISC_MATERIALS.COPPER_SULFATE.getDust(6)},
+ new ItemStack[] { CI.getNumberedCircuit(19),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1) },
+ new FluidStack[] { FluidUtils.getFluidStack("sulfuricacid", 2000) },
+ new FluidStack[] { FluidUtils.getFluidStack("dilutedsulfuricacid", 1000) },
+ new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE.getDust(6) },
5 * 20,
30);
}
private static void dehydratorRecipes() {
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11),
- },
+ new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11), },
null,
GT_ModHandler.getWater(5000),
- new ItemStack[] {MISC_MATERIALS.COPPER_SULFATE.getDust(6)},
- new int[] {10000, 10000, 10000},
+ new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE.getDust(6) },
+ new int[] { 10000, 10000, 10000 },
300 * 20,
10);
}
@@ -216,11 +197,9 @@ public class RecipeLoader_GlueLine {
private static void distillationTowerRecipes() {
GT_Values.RA.addDistillationTowerRecipe(
MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000),
- new FluidStack[] {
- MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(100),
- MISC_MATERIALS.DICHLOROACETIC_ACID.getFluidStack(450),
- MISC_MATERIALS.TRICHLOROACETIC_ACID.getFluidStack(450)
- },
+ new FluidStack[] { MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(100),
+ MISC_MATERIALS.DICHLOROACETIC_ACID.getFluidStack(450),
+ MISC_MATERIALS.TRICHLOROACETIC_ACID.getFluidStack(450) },
null,
4 * 20,
MaterialUtils.getVoltageForTier(5));
@@ -239,7 +218,7 @@ public class RecipeLoader_GlueLine {
null,
null,
null,
- new int[] {10000, 10000, 10000},
+ new int[] { 10000, 10000, 10000 },
20 * 30,
120);
}
@@ -282,11 +261,8 @@ public class RecipeLoader_GlueLine {
private static void glueUsageRecipes() {
// Braintech Tape recipe, PBI and superglue make 16 tape at once
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 1L),
- GT_ModHandler.getIC2Item("carbonMesh", 1L),
- CI.getNumberedCircuit(10)
- },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 1L),
+ GT_ModHandler.getIC2Item("carbonMesh", 1L), CI.getNumberedCircuit(10) },
MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100),
ItemList.Duct_Tape.get(16L),
120,
@@ -294,7 +270,7 @@ public class RecipeLoader_GlueLine {
// Maintenance Hatch recipe, using Braintech Tape
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(1), CI.getNumberedCircuit(1)},
+ new ItemStack[] { ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(1), CI.getNumberedCircuit(1) },
MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100),
ItemList.Hatch_Maintenance.get(1),
120,
@@ -302,22 +278,16 @@ public class RecipeLoader_GlueLine {
// Graphene recipes from later wafer tiers, using superglue instead of the bronze age glue
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64),
- ItemList.Circuit_Silicon_Wafer4.get(2L),
- CI.getNumberedCircuit(2)
- },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64),
+ ItemList.Circuit_Silicon_Wafer4.get(2L), CI.getNumberedCircuit(2) },
MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(500),
ItemUtils.getItemStackOfAmountFromOreDict("dustGraphene", 64),
400,
30720);
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64),
- ItemList.Circuit_Silicon_Wafer5.get(1L),
- CI.getNumberedCircuit(2)
- },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64),
+ ItemList.Circuit_Silicon_Wafer5.get(1L), CI.getNumberedCircuit(2) },
MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(250),
ItemUtils.getItemStackOfAmountFromOreDict("dustGraphene", 64),
80,
@@ -424,12 +394,10 @@ public class RecipeLoader_GlueLine {
}
if (LoadedMods.DreamCraft && LoadedMods.GalacticraftCore) {
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ItemUtils.getItemStackFromFQRN("GalacticraftMars:item.itemBasicAsteroids:7", 1),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Titanium, 8),
- ItemUtils.getItemStackFromFQRN("dreamcraft:item.TungstenString", 8),
- CI.getNumberedCircuit(1)
- },
+ new ItemStack[] { ItemUtils.getItemStackFromFQRN("GalacticraftMars:item.itemBasicAsteroids:7", 1),
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Titanium, 8),
+ ItemUtils.getItemStackFromFQRN("dreamcraft:item.TungstenString", 8),
+ CI.getNumberedCircuit(1) },
MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(576),
ItemUtils.getItemStackFromFQRN("GalaxySpace:item.ThermalClothT2", 1),
600,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
index a693cfb6d9..9c92f40608 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.gregtech.loaders.recipe;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GasSpargingRecipeMap;
@@ -7,9 +11,6 @@ import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.material.nuclear.NUCLIDE;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeLoader_LFTR {
@@ -60,18 +61,15 @@ public class RecipeLoader_LFTR {
new ItemStack[] {},
new ItemStack[] {},
null,
- new int[] {10000, 10000, 5000, 2500},
- new FluidStack[] {NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100), Li2BeF4},
- new FluidStack[] {
- NUCLIDE.LiFBeF2UF4FP.getFluidStack(100),
- NUCLIDE.LiFBeF2ThF4.getFluidStack(200),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(20),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10)
- },
+ new int[] { 10000, 10000, 5000, 2500 },
+ new FluidStack[] { NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100), Li2BeF4 },
+ new FluidStack[] { NUCLIDE.LiFBeF2UF4FP.getFluidStack(100), NUCLIDE.LiFBeF2ThF4.getFluidStack(200),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(20),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10) },
100 * 20, // time
0, // cost
32768 * 4 // fuel value
- );
+ );
// LiFBeF2ZrF4UF4 - T2
GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.addRecipe(
@@ -79,18 +77,15 @@ public class RecipeLoader_LFTR {
new ItemStack[] {},
new ItemStack[] {},
null,
- new int[] {10000, 10000, 2500, 1250},
- new FluidStack[] {NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100), Li2BeF4},
- new FluidStack[] {
- NUCLIDE.LiFBeF2UF4FP.getFluidStack(50),
- NUCLIDE.LiFBeF2ThF4.getFluidStack(100),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(5)
- },
+ new int[] { 10000, 10000, 2500, 1250 },
+ new FluidStack[] { NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100), Li2BeF4 },
+ new FluidStack[] { NUCLIDE.LiFBeF2UF4FP.getFluidStack(50), NUCLIDE.LiFBeF2ThF4.getFluidStack(100),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(5) },
100 * 20, // time
0, // cost
8192 * 4 // fuel value
- );
+ );
// LiFBeF2ZrF4U235 - T1
GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.addRecipe(
@@ -98,57 +93,42 @@ public class RecipeLoader_LFTR {
new ItemStack[] {},
new ItemStack[] {},
null,
- new int[] {10000, 10000, 1000, 500},
- new FluidStack[] {NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100), Li2BeF4},
- new FluidStack[] {
- NUCLIDE.LiFBeF2UF4FP.getFluidStack(25),
- NUCLIDE.LiFThF4.getFluidStack(50),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(4),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2)
- },
+ new int[] { 10000, 10000, 1000, 500 },
+ new FluidStack[] { NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100), Li2BeF4 },
+ new FluidStack[] { NUCLIDE.LiFBeF2UF4FP.getFluidStack(25), NUCLIDE.LiFThF4.getFluidStack(50),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(4),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2) },
100 * 20, // time
0, // cost
8192 // fuel value
- );
+ );
// Sparging NEI Recipes
GasSpargingRecipeMap.addRecipe(
new FluidStack(mSpargeGases.get(0), 1000),
NUCLIDE.LiFBeF2UF4FP.getFluidStack(50),
NUCLIDE.Sparged_LiFBeF2UF4FP.getFluidStack(50),
- new FluidStack[] {
- new FluidStack(mNobleGases.get(1), 10),
- new FluidStack(mNobleGases.get(2), 10),
- new FluidStack(mNobleGases.get(3), 10),
- new FluidStack(mNobleGases.get(4), 10),
- new FluidStack(mNobleGases.get(5), 10)
- },
- new int[] {20000, 20000, 20000, 20000, 20000});
+ new FluidStack[] { new FluidStack(mNobleGases.get(1), 10), new FluidStack(mNobleGases.get(2), 10),
+ new FluidStack(mNobleGases.get(3), 10), new FluidStack(mNobleGases.get(4), 10),
+ new FluidStack(mNobleGases.get(5), 10) },
+ new int[] { 20000, 20000, 20000, 20000, 20000 });
GasSpargingRecipeMap.addRecipe(
new FluidStack(mSpargeGases.get(1), 100),
NUCLIDE.LiFThF4.getFluidStack(50),
NUCLIDE.Sparged_LiFThF4.getFluidStack(50),
- new FluidStack[] {
- new FluidStack(mFluorideGases.get(1), 5),
- new FluidStack(mFluorideGases.get(2), 5),
- new FluidStack(mFluorideGases.get(3), 5),
- new FluidStack(mFluorideGases.get(4), 5),
- new FluidStack(mFluorideGases.get(5), 5)
- },
- new int[] {1000, 1000, 1000, 1000, 1000});
+ new FluidStack[] { new FluidStack(mFluorideGases.get(1), 5), new FluidStack(mFluorideGases.get(2), 5),
+ new FluidStack(mFluorideGases.get(3), 5), new FluidStack(mFluorideGases.get(4), 5),
+ new FluidStack(mFluorideGases.get(5), 5) },
+ new int[] { 1000, 1000, 1000, 1000, 1000 });
GasSpargingRecipeMap.addRecipe(
new FluidStack(mSpargeGases.get(1), 100),
NUCLIDE.LiFBeF2ThF4.getFluidStack(50),
NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(50),
- new FluidStack[] {
- new FluidStack(mFluorideGases.get(1), 10),
- new FluidStack(mFluorideGases.get(2), 10),
- new FluidStack(mFluorideGases.get(3), 10),
- new FluidStack(mFluorideGases.get(4), 10),
- new FluidStack(mFluorideGases.get(5), 10)
- },
- new int[] {2000, 2000, 2000, 2000, 2000});
+ new FluidStack[] { new FluidStack(mFluorideGases.get(1), 10), new FluidStack(mFluorideGases.get(2), 10),
+ new FluidStack(mFluorideGases.get(3), 10), new FluidStack(mFluorideGases.get(4), 10),
+ new FluidStack(mFluorideGases.get(5), 10) },
+ new int[] { 2000, 2000, 2000, 2000, 2000 });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java
index 28e72cc0b9..44115ea7d0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java
@@ -21,8 +21,9 @@ public class RecipeLoader_MolecularTransformer {
int aEU = MaterialUtils.getVoltageForTier(5);
Logger.INFO("=======================");
Logger.INFO("Generating GT recipe for Molecular Transformer.");
- Logger.INFO("Input: " + aRecipe.inputStack.getDisplayName() + ", Output: "
- + aRecipe.outputStack.getDisplayName() + ", EU/t: " + aEU);
+ Logger.INFO(
+ "Input: " + aRecipe.inputStack
+ .getDisplayName() + ", Output: " + aRecipe.outputStack.getDisplayName() + ", EU/t: " + aEU);
float aTicks = (float) aRecipe.energyPerOperation / (float) aEU;
Logger.INFO("Ticks: " + aTicks);
int aTicksRoundedUp = MathUtils.roundToClosestInt(Math.ceil(aTicks));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index 4c0b93ce68..2a6715c1ac 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -2,6 +2,9 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe;
import static gtPlusPlus.core.lib.CORE.GTNH;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -20,8 +23,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeLoader_Nuclear {
@@ -98,7 +99,7 @@ public class RecipeLoader_Nuclear {
ELEMENT.getInstance().URANIUM233.getSmallDust(1),
ELEMENT.getInstance().URANIUM235.getSmallDust(1),
ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1),
- new int[] {0, 0, 1000, 1000, 1000, 500},
+ new int[] { 0, 0, 1000, 1000, 1000, 500 },
500 * 20,
4000);
// Mox
@@ -113,7 +114,7 @@ public class RecipeLoader_Nuclear {
ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1),
ELEMENT.getInstance().PLUTONIUM238.getTinyDust(1),
ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1),
- new int[] {0, 0, 500, 500, 500, 500},
+ new int[] { 0, 0, 500, 500, 500, 500 },
750 * 20,
4000);
@@ -129,14 +130,14 @@ public class RecipeLoader_Nuclear {
ELEMENT.getInstance().LUTETIUM.getSmallDust(1),
ELEMENT.getInstance().POLONIUM.getSmallDust(1),
ELEMENT.getInstance().THALLIUM.getTinyDust(1),
- new int[] {0, 0, 5000, 5000, 5000, 2500},
+ new int[] { 0, 0, 5000, 5000, 5000, 2500 },
250 * 20,
4000);
}
private static void chemicalBathRecipes() {
- int[] chances = {9000, 6000, 3000};
+ int[] chances = { 9000, 6000, 3000 };
GT_Values.RA.addChemicalBathRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12),
FluidUtils.getFluidStack("chlorine", 2400),
@@ -147,7 +148,7 @@ public class RecipeLoader_Nuclear {
30 * 20,
480);
- chances = new int[] {9000, 3000, 1000};
+ chances = new int[] { 9000, 3000, 1000 };
GT_Values.RA.addChemicalBathRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("dustRutile", 5),
FluidUtils.getFluidStack("chlorine", 4000),
@@ -171,8 +172,8 @@ public class RecipeLoader_Nuclear {
private static void chemicalReactorRecipes() {
- ItemStack aGtHydrofluoricAcid =
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellHydrofluoricAcid_GT5U", 2);
+ ItemStack aGtHydrofluoricAcid = ItemUtils
+ .getItemStackOfAmountFromOreDictNoBroken("cellHydrofluoricAcid_GT5U", 2);
GT_Values.RA.addChemicalRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), // Input
@@ -354,38 +355,36 @@ public class RecipeLoader_Nuclear {
// Makes 7-Lithium
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(14),
- ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(14),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1) },
FluidUtils.getFluidStack("sulfuriclithium", 440),
null,
- new ItemStack[] {
- CI.emptyCells(1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 4)
- },
- new int[] {10000, 10000, 10000, 10000, 10000},
+ new ItemStack[] { CI.emptyCells(1), ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 4) },
+ new int[] { 10000, 10000, 10000, 10000, 10000 },
30 * 20,
30);
// Makes Lithium Carbonate
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.emptyCells(12), ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20)
- }, // Item input (Array, up to 2)
+ new ItemStack[] { CI.emptyCells(12), ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20) }, // Item
+ // input
+ // (Array,
+ // up
+ // to
+ // 2)
FluidUtils.getFluidStack("sulfuricacid", 10000),
FluidUtils.getFluidStack("sulfuriclithium", 10000),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4),
- ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10),
- ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), // LithiumCarbonate
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), // LithiumCarbonate
}, // Output Array of Items - Upto 9,
- new int[] {10000, 10000, 10000, 10000, 10000},
+ new int[] { 10000, 10000, 10000, 10000, 10000 },
75 * 20, // Time in ticks
1000); // EU
@@ -394,13 +393,12 @@ public class RecipeLoader_Nuclear {
|| LoadedMods.IHL) {
// CaO + H2O = Ca(OH)2
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedBioCircuit(20), ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 2)
- },
+ new ItemStack[] { CI.getNumberedBioCircuit(20),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 2) },
FluidUtils.getFluidStack("water", 1000),
null, // Fluid output (slot 2)
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5)}, // Output
- new int[] {10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5) }, // Output
+ new int[] { 10000 },
12 * 20, // Time in ticks
120); // EU
} else {
@@ -414,39 +412,35 @@ public class RecipeLoader_Nuclear {
// 2 LiOH + CaCO3
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(20), ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5)
- }, // Item
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(20),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) }, // Item
null, // Fluid input (slot 1)
null, // Fluid output (slot 2)
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3)
- }, // Output
- new int[] {10000, 10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) }, // Output
+ new int[] { 10000, 10000 },
120 * 20, // Time in ticks
1000); // EU
// LiOH Liquid to Dust
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedAdvancedCircuit(22)},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(22) },
FluidUtils.getFluidStack("lithiumhydroxide", 144),
null,
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1)},
- new int[] {10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) },
+ new int[] { 10000 },
1 * 20, // Time in ticks
64); // EU
// Zirconium Chloride -> TetraFluoride
FluidStack aHydrogenChloride = new FluidStack(GenericChem.HydrochloricAcid, 9000);
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(11), ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
- }, // Item
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(11),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), }, // Item
FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144),
aHydrogenChloride,
- new ItemStack[] {FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9)},
- new int[] {10000},
+ new ItemStack[] { FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) },
+ new int[] { 10000 },
120 * 20, // Time in ticks
500); // EU
@@ -454,39 +448,35 @@ public class RecipeLoader_Nuclear {
FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1);
if (aGregtechHydro != null || Utils.getGregtechVersionAsInt() >= 50929) {
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(10),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9)
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(10),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9) },
FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144),
aHydrogenChloride,
- new ItemStack[] {FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9)},
- new int[] {10000},
+ new ItemStack[] { FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) },
+ new int[] { 10000 },
240 * 20, // Time in ticks
500); // EU
}
// Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedAdvancedCircuit(6), FLUORIDES.AMMONIUM_BIFLUORIDE.getCell(4)},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(6), FLUORIDES.AMMONIUM_BIFLUORIDE.getCell(4) },
FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000), // Fluid input (slot 1)
FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(6000),
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4)},
- new int[] {10000},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4) },
+ new int[] { 10000 },
32 * 20, // Time in ticks
64); // EU
// (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedAdvancedCircuit(17), CI.emptyCells(5)},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.emptyCells(5) },
FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(5000),
null,
- new ItemStack[] {
- MISC_MATERIALS.AMMONIA.getCell(2),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
- FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1)
- },
- new int[] {10000, 10000, 10000},
+ new ItemStack[] { MISC_MATERIALS.AMMONIA.getCell(2),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
+ FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1) },
+ new int[] { 10000, 10000, 10000 },
5 * 60 * 20,
120);
}
@@ -499,7 +489,7 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1),
ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1),
- new int[] {10000, 2500, 4000},
+ new int[] { 10000, 2500, 4000 },
20 * 20,
24);
@@ -509,7 +499,7 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1),
- new int[] {10000, 1250, 2500},
+ new int[] { 10000, 1250, 2500 },
20 * 20,
24);
GT_Values.RA.addElectromagneticSeparatorRecipe(
@@ -517,7 +507,7 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1),
- new int[] {10000, 1250, 2500},
+ new int[] { 10000, 1250, 2500 },
20 * 20,
24);
}
@@ -534,11 +524,20 @@ public class RecipeLoader_Nuclear {
500);
// LFTR Fuel 1
CORE.RA.addFluidExtractionRecipe(
- NUCLIDE.LiFBeF2ZrF4U235.getDust(1), NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(144), 250, 1000);
+ NUCLIDE.LiFBeF2ZrF4U235.getDust(1),
+ NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(144),
+ 250,
+ 1000);
CORE.RA.addFluidExtractionRecipe(
- NUCLIDE.LiFBeF2ZrF4UF4.getDust(1), NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(144), 150, 1500);
+ NUCLIDE.LiFBeF2ZrF4UF4.getDust(1),
+ NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(144),
+ 150,
+ 1500);
CORE.RA.addFluidExtractionRecipe(
- NUCLIDE.LiFBeF2ThF4UF4.getDust(1), NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(144), 150, 2000);
+ NUCLIDE.LiFBeF2ThF4UF4.getDust(1),
+ NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(144),
+ 150,
+ 2000);
// ZIRCONIUM_TETRAFLUORIDE
CORE.RA.addFluidExtractionRecipe(
@@ -574,82 +573,70 @@ public class RecipeLoader_Nuclear {
// Zirconium
GT_Values.RA.addSifterRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIlmenite", 1),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustWroughtIron", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1)
- },
- new int[] {5000, 278, 1000, 1000, 300, 300},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustWroughtIron", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1) },
+ new int[] { 5000, 278, 1000, 1000, 300, 300 },
20 * 30,
500);
GT_Values.RA.addSifterRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)
- },
- new int[] {10000, 556, 1500, 1000, 500, 500},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) },
+ new int[] { 10000, 556, 1500, 1000, 500, 500 },
20 * 30,
500);
GT_Values.RA.addSifterRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)
- },
- new int[] {10000, 556, 1500, 1000, 500, 500},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) },
+ new int[] { 10000, 556, 1500, 1000, 500, 500 },
20 * 30,
500);
// Radium
GT_Values.RA.addSifterRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUranium", 1),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustLead", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)
- },
- new int[] {10000, 556, 1000, 500, 500, 500},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLead", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) },
+ new int[] { 10000, 556, 1000, 500, 500, 500 },
20 * 30,
500);
GT_Values.RA.addSifterRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUraninite", 1),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustUraninite", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)
- },
- new int[] {10000, 556, 500, 250, 250, 250},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUraninite", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) },
+ new int[] { 10000, 556, 500, 250, 250, 250 },
20 * 30,
500);
GT_Values.RA.addSifterRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPitchblende", 1),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustPitchblende", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustLead", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)
- },
- new int[] {10000, 556, 500, 250, 250, 250},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPitchblende", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLead", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) },
+ new int[] { 10000, 556, 500, 250, 250, 250 },
20 * 30,
500);
}
@@ -657,6 +644,10 @@ public class RecipeLoader_Nuclear {
private static void fluidHeater() {
CORE.RA.addFluidHeaterRecipe(
- FLUORIDES.SODIUM_FLUORIDE.getDust(1), null, FLUORIDES.SODIUM_FLUORIDE.getFluidStack(144), 20 * 30, 500);
+ FLUORIDES.SODIUM_FLUORIDE.getDust(1),
+ null,
+ FLUORIDES.SODIUM_FLUORIDE.getFluidStack(144),
+ 20 * 30,
+ 500);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
index 4e84e465c4..d2a6741221 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.loaders.recipe;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.chemistry.NuclearChem;
@@ -11,8 +14,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipeLoader_NuclearFuelProcessing {
@@ -85,17 +86,14 @@ public class RecipeLoader_NuclearFuelProcessing {
CI.getNumberedAdvancedCircuit(17),
ELEMENT.getInstance().FLUORINE.getCell(6),
NUCLIDE.LiFThF4.getFluidStack(10000),
- new ItemStack[] {
- CI.emptyCells(5),
- FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
- },
- new int[] {10000, 10000, 500, 500, 500, 250, 250, 250},
+ new ItemStack[] { CI.emptyCells(5), FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233) },
+ new int[] { 10000, 10000, 500, 500, 500, 250, 250, 250 },
NUCLIDE.UF6F2.getFluidStack(1500),
20 * 60 * 10,
MaterialUtils.getVoltageForTier(5));
@@ -103,18 +101,14 @@ public class RecipeLoader_NuclearFuelProcessing {
CI.getNumberedAdvancedCircuit(18),
ELEMENT.getInstance().FLUORINE.getCell(6),
NUCLIDE.LiFBeF2ThF4.getFluidStack(10000),
- new ItemStack[] {
- CI.emptyCells(4),
- FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
- FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
- },
- new int[] {10000, 10000, 10000, 1000, 1000, 1000, 500, 500, 500},
+ new ItemStack[] { CI.emptyCells(4), FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
+ FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1), ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233) },
+ new int[] { 10000, 10000, 10000, 1000, 1000, 1000, 500, 500, 500 },
NUCLIDE.UF6F2.getFluidStack(3000),
20 * 60 * 10,
MaterialUtils.getVoltageForTier(5));
@@ -124,17 +118,14 @@ public class RecipeLoader_NuclearFuelProcessing {
CI.getNumberedAdvancedCircuit(7),
ELEMENT.getInstance().FLUORINE.getCell(6),
NUCLIDE.Sparged_LiFThF4.getFluidStack(10000),
- new ItemStack[] {
- CI.emptyCells(4),
- FLUORIDES.LITHIUM_FLUORIDE.getCell(2),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
- },
- new int[] {10000, 10000, 1000, 1000, 1000, 1000, 1000, 1000},
+ new ItemStack[] { CI.emptyCells(4), FLUORIDES.LITHIUM_FLUORIDE.getCell(2),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233) },
+ new int[] { 10000, 10000, 1000, 1000, 1000, 1000, 1000, 1000 },
NUCLIDE.UF6F2.getFluidStack(3000),
20 * 60 * 5,
MaterialUtils.getVoltageForTier(5));
@@ -142,18 +133,14 @@ public class RecipeLoader_NuclearFuelProcessing {
CI.getNumberedAdvancedCircuit(8),
ELEMENT.getInstance().FLUORINE.getCell(6),
NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(10000),
- new ItemStack[] {
- CI.emptyCells(2),
- FLUORIDES.LITHIUM_FLUORIDE.getCell(2),
- FLUORIDES.BERYLLIUM_FLUORIDE.getCell(2),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
- ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
- },
- new int[] {10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000},
+ new ItemStack[] { CI.emptyCells(2), FLUORIDES.LITHIUM_FLUORIDE.getCell(2),
+ FLUORIDES.BERYLLIUM_FLUORIDE.getCell(2), ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
+ ItemUtils.getSimpleStack(ModItems.dustProtactinium233) },
+ new int[] { 10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000 },
NUCLIDE.UF6F2.getFluidStack(6000),
20 * 60 * 5,
MaterialUtils.getVoltageForTier(5));
@@ -163,32 +150,22 @@ public class RecipeLoader_NuclearFuelProcessing {
8,
FLUORIDES.SODIUM_FLUORIDE.getCell(4),
NUCLIDE.UF6F2.getFluidStack(3000),
- new ItemStack[] {
- ELEMENT.getInstance().FLUORINE.getCell(2),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2),
- ELEMENT.getInstance().URANIUM233.getDust(1),
- ELEMENT.getInstance().URANIUM233.getDust(1),
- ELEMENT.getInstance().URANIUM233.getDust(1)
- },
- new int[] {10000, 10000, 3000, 2000, 1000},
+ new ItemStack[] { ELEMENT.getInstance().FLUORINE.getCell(2), FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2),
+ ELEMENT.getInstance().URANIUM233.getDust(1), ELEMENT.getInstance().URANIUM233.getDust(1),
+ ELEMENT.getInstance().URANIUM233.getDust(1) },
+ new int[] { 10000, 10000, 3000, 2000, 1000 },
FLUORIDES.SODIUM_FLUORIDE.getFluidStack(2000),
20 * 60 * 10,
MaterialUtils.getVoltageForTier(3));
// Reactor Core step 0 - Process Burnt Salt
// Tier 1 Fuel - Gives back FLIBE and breeds U233
- /* CORE.RA.addReactorProcessingUnitRecipe(
- CI.getNumberedAdvancedCircuit(1),
- CI.emptyCells(2),
- new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 4000),
- new ItemStack[] {
- FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
- ELEMENT.getInstance().URANIUM233.getCell(1)
- },
- new int[] {10000, 10000},
- NUCLIDE.LiFBeF2.getFluidStack(2000),
- 20 * 60 * 60,
- MaterialUtils.getVoltageForTier(3));*/
+ /*
+ * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(1), CI.emptyCells(2), new
+ * FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 4000), new ItemStack[] { FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
+ * ELEMENT.getInstance().URANIUM233.getCell(1) }, new int[] {10000, 10000}, NUCLIDE.LiFBeF2.getFluidStack(2000),
+ * 20 * 60 * 60, MaterialUtils.getVoltageForTier(3));
+ */
// LiBeF2UF4FP + F2 = LiFBeF2 & UF6F2FP
// Reactor Core step 1 - Process Burnt Salt
@@ -196,8 +173,8 @@ public class RecipeLoader_NuclearFuelProcessing {
CI.getNumberedAdvancedCircuit(1),
ELEMENT.getInstance().FLUORINE.getCell(1),
NUCLIDE.LiFBeF2UF4FP.getFluidStack(1000),
- new ItemStack[] {NUCLIDE.UF6F2FP.getCell(1)},
- new int[] {10000},
+ new ItemStack[] { NUCLIDE.UF6F2FP.getCell(1) },
+ new int[] { 10000 },
FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000),
20 * 60 * 120,
MaterialUtils.getVoltageForTier(3));
@@ -208,8 +185,8 @@ public class RecipeLoader_NuclearFuelProcessing {
CI.getNumberedAdvancedCircuit(1),
ELEMENT.getInstance().FLUORINE.getCell(3),
NUCLIDE.Sparged_LiFBeF2UF4FP.getFluidStack(1000),
- new ItemStack[] {CI.emptyCells(1), NUCLIDE.UF6F2FP.getCell(2)},
- new int[] {10000},
+ new ItemStack[] { CI.emptyCells(1), NUCLIDE.UF6F2FP.getCell(2) },
+ new int[] { 10000 },
FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 2000),
20 * 60 * 60,
MaterialUtils.getVoltageForTier(3));
@@ -219,18 +196,12 @@ public class RecipeLoader_NuclearFuelProcessing {
8,
FLUORIDES.SODIUM_FLUORIDE.getCell(3),
NUCLIDE.UF6F2FP.getFluidStack(2000),
- new ItemStack[] {
- ELEMENT.getInstance().FLUORINE.getCell(1),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2),
- ELEMENT.getInstance().PHOSPHORUS.getDust(1),
- ELEMENT.getInstance().PHOSPHORUS.getDust(1),
- ELEMENT.getInstance().PHOSPHORUS.getDust(1),
- ELEMENT.getInstance().PHOSPHORUS.getDust(1),
- ELEMENT.getInstance().PHOSPHORUS.getDust(1),
- ELEMENT.getInstance().PHOSPHORUS.getDust(1),
- ELEMENT.getInstance().PHOSPHORUS.getDust(1)
- },
- new int[] {10000, 10000, 5000, 5000, 5000, 5000, 5000, 5000, 5000},
+ new ItemStack[] { ELEMENT.getInstance().FLUORINE.getCell(1), FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2),
+ ELEMENT.getInstance().PHOSPHORUS.getDust(1), ELEMENT.getInstance().PHOSPHORUS.getDust(1),
+ ELEMENT.getInstance().PHOSPHORUS.getDust(1), ELEMENT.getInstance().PHOSPHORUS.getDust(1),
+ ELEMENT.getInstance().PHOSPHORUS.getDust(1), ELEMENT.getInstance().PHOSPHORUS.getDust(1),
+ ELEMENT.getInstance().PHOSPHORUS.getDust(1) },
+ new int[] { 10000, 10000, 5000, 5000, 5000, 5000, 5000, 5000, 5000 },
FLUORIDES.SODIUM_FLUORIDE.getFluidStack(2000),
20 * 60 * 10,
MaterialUtils.getVoltageForTier(4));
@@ -238,7 +209,7 @@ public class RecipeLoader_NuclearFuelProcessing {
// Reactor Core step 2B - Distillation
GT_Values.RA.addDistillationTowerRecipe(
FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000),
- new FluidStack[] {NUCLIDE.LiFBeF2.getFluidStack(250)},
+ new FluidStack[] { NUCLIDE.LiFBeF2.getFluidStack(250) },
null,
450 * 20,
MaterialUtils.getVoltageForTier(5));
@@ -246,51 +217,31 @@ public class RecipeLoader_NuclearFuelProcessing {
// UF6 -> UF4 reduction
// UF6 + LiFBeF2 + H2 -> LiFBeF2UF4 + HF
CORE.RA.addBlastRecipe(
- new ItemStack[] {FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2.getCell(1)},
- new FluidStack[] {ELEMENT.getInstance().HYDROGEN.getFluidStack(2000)},
- new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2)},
- new FluidStack[] {NUCLIDE.LiFBeF2UF4.getFluidStack(3000)},
+ new ItemStack[] { FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2.getCell(1) },
+ new FluidStack[] { ELEMENT.getInstance().HYDROGEN.getFluidStack(2000) },
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2) },
+ new FluidStack[] { NUCLIDE.LiFBeF2UF4.getFluidStack(3000) },
300 * 10,
MaterialUtils.getVoltageForTier(5),
5400);
// LiFBeF2ZrF4U235 - We can't add both ZrF4 and U235 here, so best we leave this disabled.
- /*CORE.RA.addReactorProcessingUnitRecipe(
- CI.getNumberedAdvancedCircuit(8),
- NUCLIDE.LiFBeF2UF4.getCell(9),
- ELEMENT.getInstance().URANIUM235.getFluidStack(1000),
- new ItemStack[] {
- CI.emptyCells(9)
- },
- new int[] {10000},
- NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(10000),
- 20 * 60 * 5,
- MaterialUtils.getVoltageForTier(4));*/
+ /*
+ * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(8), NUCLIDE.LiFBeF2UF4.getCell(9),
+ * ELEMENT.getInstance().URANIUM235.getFluidStack(1000), new ItemStack[] { CI.emptyCells(9) }, new int[]
+ * {10000}, NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(10000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(4));
+ */
// LiFBeF2ZrF4UF4
- /*CORE.RA.addReactorProcessingUnitRecipe(
- CI.getNumberedAdvancedCircuit(9),
- NUCLIDE.LiFBeF2UF4.getCell(9),
- FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000),
- new ItemStack[] {
- CI.emptyCells(9)
- },
- new int[] {10000},
- NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000),
- 20 * 60 * 5,
- MaterialUtils.getVoltageForTier(5));
-
- CORE.RA.addReactorProcessingUnitRecipe(
- CI.getNumberedAdvancedCircuit(9),
- FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getCell(1),
- NUCLIDE.LiFBeF2UF4.getFluidStack(9000),
- new ItemStack[] {
- CI.emptyCells(1)
- },
- new int[] {10000},
- NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000),
- 20 * 60 * 5,
- MaterialUtils.getVoltageForTier(5));*/
+ /*
+ * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(9), NUCLIDE.LiFBeF2UF4.getCell(9),
+ * FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000), new ItemStack[] { CI.emptyCells(9) }, new int[]
+ * {10000}, NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(5));
+ * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(9),
+ * FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2UF4.getFluidStack(9000), new ItemStack[] {
+ * CI.emptyCells(1) }, new int[] {10000}, NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), 20 * 60 * 5,
+ * MaterialUtils.getVoltageForTier(5));
+ */
CORE.RA.addFissionFuel(
FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000),
@@ -308,29 +259,15 @@ public class RecipeLoader_NuclearFuelProcessing {
MaterialUtils.getVoltageForTier(5));
// LiFBeF2ThF4UF4
- /*CORE.RA.addReactorProcessingUnitRecipe(
- CI.getNumberedAdvancedCircuit(10),
- NUCLIDE.LiFBeF2UF4.getCell(9),
- FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000),
- new ItemStack[] {
- CI.emptyCells(9)
- },
- new int[] {10000},
- NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000),
- 20 * 60 * 5,
- MaterialUtils.getVoltageForTier(5));
-
- CORE.RA.addReactorProcessingUnitRecipe(
- CI.getNumberedAdvancedCircuit(10),
- FLUORIDES.THORIUM_TETRAFLUORIDE.getCell(1),
- NUCLIDE.LiFBeF2UF4.getFluidStack(9000),
- new ItemStack[] {
- CI.emptyCells(1)
- },
- new int[] {10000},
- NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000),
- 20 * 60 * 5,
- MaterialUtils.getVoltageForTier(5));*/
+ /*
+ * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(10), NUCLIDE.LiFBeF2UF4.getCell(9),
+ * FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000), new ItemStack[] { CI.emptyCells(9) }, new int[] {10000},
+ * NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(5));
+ * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(10),
+ * FLUORIDES.THORIUM_TETRAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2UF4.getFluidStack(9000), new ItemStack[] {
+ * CI.emptyCells(1) }, new int[] {10000}, NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), 20 * 60 * 5,
+ * MaterialUtils.getVoltageForTier(5));
+ */
CORE.RA.addFissionFuel(
FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000),
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 4c95ea4f22..e836112814 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -4,6 +4,16 @@ import static gregtech.GT_Mod.GT_FML_LOGGER;
import static gregtech.api.enums.GT_Values.RA;
import static gtPlusPlus.core.lib.CORE.GTNH;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.GT_Values;
@@ -32,26 +42,12 @@ import gtPlusPlus.xmod.gregtech.common.StaticFields59;
import gtPlusPlus.xmod.gregtech.common.helpers.FlotationRecipeHandler;
import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntity_RTG;
import gtPlusPlus.xmod.gregtech.recipes.machines.RECIPEHANDLER_MatterFabricator;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
@Override
- public boolean addCokeOvenRecipe(
- final ItemStack aInput1,
- final ItemStack aInput2,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final ItemStack aOutput,
- int aDuration,
- final int aEUt) {
+ public boolean addCokeOvenRecipe(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final ItemStack aOutput, int aDuration, final int aEUt) {
try {
try {
// RECIPEHANDLER_CokeOven.debug1();
@@ -91,10 +87,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
try {
// RECIPEHANDLER_CokeOven.debug3(aInput1, aInput2, aFluidInput,
// aFluidOutput, aOutput, aDuration, aEUt);
- if ((aFluidOutput == null)
- || ((aDuration = GregTech_API.sRecipeFile.get(
- "cokeoven", aFluidOutput.getFluid().getName(), aDuration))
- <= 0)) {
+ if ((aFluidOutput == null) || ((aDuration = GregTech_API.sRecipeFile
+ .get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
// Utils.LOG_WARNING("aInput1:"+aInput1.toString()+"
// aInput2:"+aInput2.toString()+"
// aFluidInput:"+aFluidInput.toString()+"
@@ -112,12 +106,12 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
GTPP_Recipe aSpecialRecipe = new GTPP_Recipe(
true,
- new ItemStack[] {aInput1, aInput2},
- new ItemStack[] {aOutput},
+ new ItemStack[] { aInput1, aInput2 },
+ new ItemStack[] { aOutput },
null,
new int[] {},
- new FluidStack[] {aFluidInput},
- new FluidStack[] {aFluidOutput},
+ new FluidStack[] { aFluidInput },
+ new FluidStack[] { aFluidOutput },
Math.max(1, aDuration),
Math.max(1, aEUt),
0);
@@ -129,21 +123,17 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
// RECIPEHANDLER_CokeOven.debug4(aInput1, aInput2, aFluidInput,
// aFluidOutput, aOutput, aDuration, aEUt);
- /*if (aFluidInput == null && aInput2 != null) {
- GTPP_Recipe.GTPP_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 },
- new ItemStack[] { aOutput }, null, null, null, new FluidStack[] { aFluidOutput }, aDuration,
- aEUt, 0);
- }
- else if (aFluidInput == null && aInput2 == null) {
- GTPP_Recipe.GTPP_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[] { aInput1 },
- new ItemStack[] { aOutput }, null, null, null, new FluidStack[] { aFluidOutput }, aDuration,
- aEUt, 0);
- }
- else {
- GTPP_Recipe.GTPP_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 },
- new ItemStack[] { aOutput }, null, null, new FluidStack[] { aFluidInput },
- new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0);
- }*/
+ /*
+ * if (aFluidInput == null && aInput2 != null) {
+ * GTPP_Recipe.GTPP_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 },
+ * new ItemStack[] { aOutput }, null, null, null, new FluidStack[] { aFluidOutput }, aDuration, aEUt,
+ * 0); } else if (aFluidInput == null && aInput2 == null) {
+ * GTPP_Recipe.GTPP_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[] { aInput1 }, new
+ * ItemStack[] { aOutput }, null, null, null, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); }
+ * else { GTPP_Recipe.GTPP_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[] { aInput1,
+ * aInput2 }, new ItemStack[] { aOutput }, null, null, new FluidStack[] { aFluidInput }, new
+ * FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); }
+ */
// RECIPEHANDLER_CokeOven.debug5(aInput1, aInput2, aFluidInput,
// aFluidOutput, aOutput, aDuration, aEUt);
@@ -167,30 +157,24 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addCokeOvenRecipe(
- int aCircuit,
- ItemStack aInput2,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int aDuration,
- int aEUt) {
+ public boolean addCokeOvenRecipe(int aCircuit, ItemStack aInput2, FluidStack[] aFluidInputs,
+ FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt) {
return addCokeOvenRecipe(
- aInput2, CI.getNumberedCircuit(aCircuit), aFluidInputs, aFluidOutputs, aOutputs, aDuration, aEUt);
+ aInput2,
+ CI.getNumberedCircuit(aCircuit),
+ aFluidInputs,
+ aFluidOutputs,
+ aOutputs,
+ aDuration,
+ aEUt);
}
@Override
- public boolean addCokeOvenRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int aDuration,
- int aEUt) {
+ public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack[] aFluidInputs,
+ FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt) {
GTPP_Recipe aSpecialRecipe = new GTPP_Recipe(
true,
- new ItemStack[] {aInput1, aInput2},
+ new ItemStack[] { aInput1, aInput2 },
aOutputs,
null,
new int[] {},
@@ -205,8 +189,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addMatterFabricatorRecipe(
- final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) {
+ public boolean addMatterFabricatorRecipe(final FluidStack aFluidInput, final FluidStack aFluidOutput,
+ final int aDuration, final int aEUt) {
try {
try {
// RECIPEHANDLER_MatterFabricator.debug1();
@@ -237,7 +221,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
null,
new int[] {},
new FluidStack[] {},
- new FluidStack[] {aFluidOutput},
+ new FluidStack[] { aFluidOutput },
aDuration,
aEUt,
0);
@@ -252,8 +236,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
new ItemStack[] {},
null,
new int[] {},
- new FluidStack[] {aFluidInput},
- new FluidStack[] {aFluidOutput},
+ new FluidStack[] { aFluidInput },
+ new FluidStack[] { aFluidOutput },
aDuration,
aEUt,
0);
@@ -277,29 +261,24 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addMatterFabricatorRecipe(
- final ItemStack aInputStack,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final int aDuration,
- final int aEUt) {
+ public boolean addMatterFabricatorRecipe(final ItemStack aInputStack, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final int aDuration, final int aEUt) {
try {
try {
if ((aFluidOutput == null) || (aInputStack == null)) {
return false;
}
- } catch (final NullPointerException e) {
- }
+ } catch (final NullPointerException e) {}
try {
if (aFluidInput == null) {
GTPP_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {aInputStack},
+ new ItemStack[] { aInputStack },
new ItemStack[] {},
null,
new int[] {},
new FluidStack[] {},
- new FluidStack[] {aFluidOutput},
+ new FluidStack[] { aFluidOutput },
aDuration,
aEUt,
0);
@@ -307,12 +286,12 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
} else {
GTPP_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {aInputStack},
+ new ItemStack[] { aInputStack },
new ItemStack[] {},
null,
new int[] {},
- new FluidStack[] {aFluidInput},
- new FluidStack[] {aFluidOutput},
+ new FluidStack[] { aFluidInput },
+ new FluidStack[] { aFluidOutput },
aDuration,
aEUt,
0);
@@ -340,83 +319,43 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
/*
- * @Override public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack
- * aItemB, FluidStack aFluid, ItemStack[] aOutputItems, FluidStack
- * aOutputFluid, int aDuration, int aEUt) { if ((aItemA == null) || (aItemB
- * == null) || (aOutputItems == null)) { return false; } for (ItemStack
- * tStack : aOutputItems) { if (tStack != null) { if ((aDuration =
- * GregTech_API.sRecipeFile.get("dehydrator", aItemA, aDuration)) <= 0) {
- * return false; }
- * Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true,
- * new ItemStack[]{aItemA, aItemB}, aOutputItems, null, null, null,
- * aDuration, aEUt, 0); RECIPEHANDLER_Dehydrator.debug5(aItemA, aItemB,
- * aFluid, aOutputFluid, aOutputItems, aDuration, aEUt); return true; } }
- * return false; }
- * @Override public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack
- * aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt) { if ((aItemA
- * == null) || (aItemB == null) || (aOutputItems == null)) { return false; }
- * if ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aItemA,
- * aDuration)) <= 0) { return false; }
- * Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true,
- * new ItemStack[]{aItemA, aItemB}, aOutputItems, null, null, null,
- * aDuration, aEUt, 0); RECIPEHANDLER_Dehydrator.debug5(aItemA, aItemB,
- * null, null, aOutputItems, aDuration, aEUt); return true; }
- * @Override public boolean addDehydratorRecipe(FluidStack aFluid,
- * FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int
- * aEUt){ if ((aFluid == null) || (aOutputFluid == null || aOutputItems ==
- * null)) { return false; } if ((aDuration =
- * GregTech_API.sRecipeFile.get("dehydrator", aFluid.getUnlocalizedName(),
- * aDuration)) <= 0) { return false; }
- * Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true,
- * null, aOutputItems, null, new FluidStack[]{aFluid}, new
- * FluidStack[]{aOutputFluid}, aDuration, aEUt, 0);
- * RECIPEHANDLER_Dehydrator.debug5(null, null, aFluid, aOutputFluid,
+ * @Override public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[]
+ * aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt) { if ((aItemA == null) || (aItemB == null) ||
+ * (aOutputItems == null)) { return false; } for (ItemStack tStack : aOutputItems) { if (tStack != null) { if
+ * ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aItemA, aDuration)) <= 0) { return false; }
+ * Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, new ItemStack[]{aItemA, aItemB},
+ * aOutputItems, null, null, null, aDuration, aEUt, 0); RECIPEHANDLER_Dehydrator.debug5(aItemA, aItemB, aFluid,
+ * aOutputFluid, aOutputItems, aDuration, aEUt); return true; } } return false; }
+ * @Override public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int
+ * aDuration, int aEUt) { if ((aItemA == null) || (aItemB == null) || (aOutputItems == null)) { return false; } if
+ * ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aItemA, aDuration)) <= 0) { return false; }
+ * Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, new ItemStack[]{aItemA, aItemB},
+ * aOutputItems, null, null, null, aDuration, aEUt, 0); RECIPEHANDLER_Dehydrator.debug5(aItemA, aItemB, null, null,
* aOutputItems, aDuration, aEUt); return true; }
+ * @Override public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[]
+ * aOutputItems, int aDuration, int aEUt){ if ((aFluid == null) || (aOutputFluid == null || aOutputItems == null)) {
+ * return false; } if ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aFluid.getUnlocalizedName(),
+ * aDuration)) <= 0) { return false; } Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true,
+ * null, aOutputItems, null, new FluidStack[]{aFluid}, new FluidStack[]{aOutputFluid}, aDuration, aEUt, 0);
+ * RECIPEHANDLER_Dehydrator.debug5(null, null, aFluid, aOutputFluid, aOutputItems, aDuration, aEUt); return true; }
+ */
+
+ /*
+ * @Override public boolean addDehydratorRecipe(final ItemStack aInput, final FluidStack aFluid, final ItemStack[]
+ * aOutput, int aDuration, final int aEUt) { Logger.WARNING("Trying to add a Dehydrator recipe."); try { if ((aInput
+ * == null) || (aFluid == null) || (aOutput == null)) { return false; } if ((aDuration =
+ * GregTech_API.sRecipeFile.get("dehydrator", aInput, aDuration)) <= 0) { return false; } GTPP_Recipe aRecipe = new
+ * GTPP_Recipe( false, new ItemStack[] { aInput }, aOutput, null, new int[] {}, new FluidStack[] { aFluid }, new
+ * FluidStack[] {}, aDuration, aEUt, 0); GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(aRecipe);
+ * // RECIPEHANDLER_Dehydrator.debug5(aInput, null, aFluid, null, // aOutput, aDuration, aEUt); return true; } catch
+ * (final NullPointerException e) { Logger.WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); return false;
+ * } }
*/
- /*@Override
- public boolean addDehydratorRecipe(final ItemStack aInput, final FluidStack aFluid, final ItemStack[] aOutput,
- int aDuration, final int aEUt) {
- Logger.WARNING("Trying to add a Dehydrator recipe.");
- try {
- if ((aInput == null) || (aFluid == null) || (aOutput == null)) {
- return false;
- }
- if ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aInput, aDuration)) <= 0) {
- return false;
- }
- GTPP_Recipe aRecipe = new GTPP_Recipe(
- false,
- new ItemStack[] { aInput },
- aOutput,
- null,
- new int[] {},
- new FluidStack[] { aFluid },
- new FluidStack[] {},
- aDuration,
- aEUt,
- 0);
- GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(aRecipe);
- // RECIPEHANDLER_Dehydrator.debug5(aInput, null, aFluid, null,
- // aOutput, aDuration, aEUt);
- return true;
- }
- catch (final NullPointerException e) {
- Logger.WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- return false;
- }
- }*/
-
- @Override
- public boolean addDehydratorRecipe(
- final ItemStack[] aInput,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final ItemStack[] aOutputItems,
- final int[] aChances,
- int aDuration,
- final int aEUt)
- throws IndexOutOfBoundsException {
+ @Override
+ public boolean addDehydratorRecipe(final ItemStack[] aInput, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final ItemStack[] aOutputItems, final int[] aChances, int aDuration,
+ final int aEUt) throws IndexOutOfBoundsException {
Logger.WARNING("Trying to add a Dehydrator recipe.");
try {
if (aInput != null && aInput.length > 0) {
@@ -431,8 +370,11 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
}
if (aFluidInput != null) {
- Logger.WARNING("Recipe requires input: "
- + aFluidInput.getFluid().getName() + " " + aFluidInput.amount + "mbs");
+ Logger.WARNING(
+ "Recipe requires input: " + aFluidInput.getFluid().getName()
+ + " "
+ + aFluidInput.amount
+ + "mbs");
}
if (((aInput == null || aInput.length == 0) && (aFluidInput == null))
|| ((aOutputItems == null || aOutputItems.length == 0) && (aFluidOutput == null))) {
@@ -451,8 +393,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
aOutputItems,
null,
aChances,
- new FluidStack[] {aFluidInput},
- new FluidStack[] {aFluidOutput},
+ new FluidStack[] { aFluidInput },
+ new FluidStack[] { aFluidOutput },
Math.max(1, aDuration),
Math.max(1, aEUt),
0);
@@ -462,19 +404,14 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.add(aSpecialRecipe);
aSize = GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.mRecipeList.size();
- /*if (aInput.length == 1) {
- Logger.WARNING("Dehydrator recipe only has a single input item.");
- GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null,
- aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt,
- 0);
-
- }
- else {
- Logger.WARNING("Dehydrator recipe has two input items.");
- GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null,
- aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt,
- 0);
- }*/
+ /*
+ * if (aInput.length == 1) { Logger.WARNING("Dehydrator recipe only has a single input item.");
+ * GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null,
+ * aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); }
+ * else { Logger.WARNING("Dehydrator recipe has two input items.");
+ * GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null,
+ * aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); }
+ */
return aSize > aSize2;
} catch (final NullPointerException e) {
@@ -484,128 +421,124 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addBlastSmelterRecipe(
- final ItemStack[] aInput, FluidStack aOutput, final int aChance, int aDuration, final int aEUt) {
+ public boolean addBlastSmelterRecipe(final ItemStack[] aInput, FluidStack aOutput, final int aChance, int aDuration,
+ final int aEUt) {
return addBlastSmelterRecipe(
- aInput, (FluidStack) null, aOutput, new ItemStack[] {}, new int[] {aChance}, aDuration, aEUt, 3700);
+ aInput,
+ (FluidStack) null,
+ aOutput,
+ new ItemStack[] {},
+ new int[] { aChance },
+ aDuration,
+ aEUt,
+ 3700);
}
@Override
- public boolean addBlastSmelterRecipe(
- final ItemStack[] aInput,
- FluidStack aInputFluid,
- FluidStack aOutput,
- final int aChance,
- int aDuration,
- final int aEUt) {
+ public boolean addBlastSmelterRecipe(final ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
+ final int aChance, int aDuration, final int aEUt) {
return addBlastSmelterRecipe(
- aInput, aInputFluid, aOutput, new ItemStack[] {}, new int[] {aChance}, aDuration, aEUt, 3700);
+ aInput,
+ aInputFluid,
+ aOutput,
+ new ItemStack[] {},
+ new int[] { aChance },
+ aDuration,
+ aEUt,
+ 3700);
}
@Override
- public boolean addBlastSmelterRecipe(
- final ItemStack[] aInput,
- FluidStack[] aInputFluid,
- FluidStack aOutput,
- final int aChance,
- int aDuration,
- final int aEUt) {
+ public boolean addBlastSmelterRecipe(final ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
+ final int aChance, int aDuration, final int aEUt) {
return addBlastSmelterRecipe(
- aInput, aInputFluid, aOutput, new ItemStack[] {}, new int[] {aChance}, aDuration, aEUt, 3700);
+ aInput,
+ aInputFluid,
+ aOutput,
+ new ItemStack[] {},
+ new int[] { aChance },
+ aDuration,
+ aEUt,
+ 3700);
}
@Override
- public boolean addBlastSmelterRecipe(
- final ItemStack[] aInput,
- FluidStack aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- final int aChance[],
- int aDuration,
- final int aEUt) {
+ public boolean addBlastSmelterRecipe(final ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, final int aChance[], int aDuration, final int aEUt) {
return addBlastSmelterRecipe(aInput, aInputFluid, aOutput, aOutputStack, aChance, aDuration, aEUt, 3700);
}
@Override
- public boolean addBlastSmelterRecipe(
- final ItemStack[] aInput,
- FluidStack[] aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- final int aChance[],
- int aDuration,
- final int aEUt) {
+ public boolean addBlastSmelterRecipe(final ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, final int aChance[], int aDuration, final int aEUt) {
return addBlastSmelterRecipe(aInput, aInputFluid, aOutput, aOutputStack, aChance, aDuration, aEUt, 3700);
}
@Override
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack aInputFluid,
- FluidStack aOutput,
- int aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue) {
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
+ int aDuration, int aEUt, int aSpecialValue) {
return addBlastSmelterRecipe(
- aInput, aInputFluid, aOutput, new ItemStack[] {}, new int[] {aChance}, aDuration, aEUt, aSpecialValue);
+ aInput,
+ aInputFluid,
+ aOutput,
+ new ItemStack[] {},
+ new int[] { aChance },
+ aDuration,
+ aEUt,
+ aSpecialValue);
}
@Override
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack[] aInputFluid,
- FluidStack aOutput,
- int aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue) {
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
+ int aDuration, int aEUt, int aSpecialValue) {
return addBlastSmelterRecipe(
- aInput, aInputFluid, aOutput, new ItemStack[] {}, new int[] {aChance}, aDuration, aEUt, aSpecialValue);
+ aInput,
+ aInputFluid,
+ aOutput,
+ new ItemStack[] {},
+ new int[] { aChance },
+ aDuration,
+ aEUt,
+ aSpecialValue);
}
@Override
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- int[] aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue) {
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue) {
return addBlastSmelterRecipe(
- aInput, aInputFluid, aOutput, aOutputStack, aChance, aDuration, aEUt, aSpecialValue, true);
+ aInput,
+ aInputFluid,
+ aOutput,
+ aOutputStack,
+ aChance,
+ aDuration,
+ aEUt,
+ aSpecialValue,
+ true);
}
@Override
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack[] aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- int[] aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue) {
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue) {
return addBlastSmelterRecipe(
- aInput, aInputFluid, aOutput, aOutputStack, aChance, aDuration, aEUt, aSpecialValue, true);
+ aInput,
+ aInputFluid,
+ aOutput,
+ aOutputStack,
+ aChance,
+ aDuration,
+ aEUt,
+ aSpecialValue,
+ true);
}
@Override
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- int[] aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue,
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue,
boolean aOptimizeRecipe) {
return addBlastSmelterRecipe(
aInput,
- new FluidStack[] {aInputFluid},
+ new FluidStack[] { aInputFluid },
aOutput,
aOutputStack,
aChance,
@@ -615,15 +548,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
aOptimizeRecipe);
}
- public boolean addBlastSmelterRecipe(
- ItemStack[] aInput,
- FluidStack[] aInputFluid,
- FluidStack aOutput,
- ItemStack[] aOutputStack,
- int[] aChance,
- int aDuration,
- int aEUt,
- int aSpecialValue,
+ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
+ ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue,
boolean aOptimizeRecipe) {
if ((aInput == null) || (aOutput == null)) {
Logger.WARNING("Fail - Input or Output was null.");
@@ -636,17 +562,19 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
if (aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))) {
aOutput = Materials.PulsatingIron.getMolten(aOutput.amount);
}
- if ((aDuration = GregTech_API.sRecipeFile.get(
- "blastsmelter", aOutput.getFluid().getName(), aDuration))
- <= 0) {
+ if ((aDuration = GregTech_API.sRecipeFile.get("blastsmelter", aOutput.getFluid().getName(), aDuration)) <= 0) {
Logger.WARNING("Recipe did not register.");
return false;
}
for (int das = 0; das < aInput.length; das++) {
if (aInput[das] != null) {
- Logger.WARNING("tMaterial[" + das + "]: " + aInput[das].getDisplayName() + ", Amount: "
- + aInput[das].stackSize);
+ Logger.WARNING(
+ "tMaterial[" + das
+ + "]: "
+ + aInput[das].getDisplayName()
+ + ", Amount: "
+ + aInput[das].stackSize);
}
}
@@ -664,7 +592,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
null,
aChance,
aInputFluid,
- new FluidStack[] {aOutput},
+ new FluidStack[] { aOutput },
Math.max(1, aDuration),
Math.max(1, aEUt),
aSpecialValue);
@@ -674,15 +602,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addQuantumTransformerRecipe(
- ItemStack[] aInput,
- FluidStack[] aFluidInput,
- FluidStack[] aFluidOutput,
- ItemStack[] aOutputStack,
- int[] aChances,
- int aDuration,
- int aEUt,
- int aSpecialValue) {
+ public boolean addQuantumTransformerRecipe(ItemStack[] aInput, FluidStack[] aFluidInput, FluidStack[] aFluidOutput,
+ ItemStack[] aOutputStack, int[] aChances, int aDuration, int aEUt, int aSpecialValue) {
if (aInput == null) {
aInput = new ItemStack[0];
}
@@ -692,7 +613,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
// if (aInput.length + aFluidInput.length < 1) {
- // return false;
+ // return false;
// }
if (aOutputStack == null) {
@@ -704,107 +625,91 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
// if (aOutputStack.length + aFluidOutput.length < 4) {
- // return false;
+ // return false;
// }
// if (aChances == null || aChances.length != aOutputStack.length + aFluidOutput.length) {
- // return false;
+ // return false;
// }
- GTPP_Recipe.GTPP_Recipe_Map.sQuantumForceTransformerRecipes.add(new GT_Recipe(
- false,
- aInput,
- aOutputStack,
- null,
- aChances,
- aFluidInput,
- aFluidOutput,
- aDuration,
- aEUt,
- aSpecialValue));
+ GTPP_Recipe.GTPP_Recipe_Map.sQuantumForceTransformerRecipes.add(
+ new GT_Recipe(
+ false,
+ aInput,
+ aOutputStack,
+ null,
+ aChances,
+ aFluidInput,
+ aFluidOutput,
+ aDuration,
+ aEUt,
+ aSpecialValue));
return true;
}
@Override
- public boolean addLFTRRecipe(
- final ItemStack aInput1,
- final FluidStack aInput2,
- final ItemStack aOutput1,
- final FluidStack aOutput2,
- final int aDuration,
- final int aEUt) {
+ public boolean addLFTRRecipe(final ItemStack aInput1, final FluidStack aInput2, final ItemStack aOutput1,
+ final FluidStack aOutput2, final int aDuration, final int aEUt) {
// TODO Auto-generated method stub
return false;
}
@Override
- public boolean addLFTRRecipe(
- final ItemStack aInput1,
- final ItemStack aInput2,
- final ItemStack aOutput1,
- final int aDuration,
- final int aEUt) {
+ public boolean addLFTRRecipe(final ItemStack aInput1, final ItemStack aInput2, final ItemStack aOutput1,
+ final int aDuration, final int aEUt) {
return false;
}
@Override
- public boolean addLFTRRecipe(
- final FluidStack aInput1,
- final FluidStack aInput2,
- final FluidStack aOutput1,
- final int aDuration,
- final int aEUt) {
+ public boolean addLFTRRecipe(final FluidStack aInput1, final FluidStack aInput2, final FluidStack aOutput1,
+ final int aDuration, final int aEUt) {
if ((aInput1 == null) || (aInput2 == null) || (aOutput1 == null) || (aDuration < 1) || (aEUt < 1)) {
return false;
}
GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.addRecipe(
- null, new FluidStack[] {aInput1, aInput2}, new FluidStack[] {aOutput1}, aDuration, aEUt, 16000);
+ null,
+ new FluidStack[] { aInput1, aInput2 },
+ new FluidStack[] { aOutput1 },
+ aDuration,
+ aEUt,
+ 16000);
return true;
}
@Override
- public boolean addFissionFuel(
- final FluidStack aInput1,
- final FluidStack aInput2,
- final FluidStack aInput3,
- final FluidStack aInput4,
- final FluidStack aInput5,
- final FluidStack aInput6,
- final FluidStack aInput7,
- final FluidStack aInput8,
- final FluidStack aInput9,
- final FluidStack aOutput1,
- final FluidStack aOutput2,
- final int aDuration,
- final int aEUt) {
+ public boolean addFissionFuel(final FluidStack aInput1, final FluidStack aInput2, final FluidStack aInput3,
+ final FluidStack aInput4, final FluidStack aInput5, final FluidStack aInput6, final FluidStack aInput7,
+ final FluidStack aInput8, final FluidStack aInput9, final FluidStack aOutput1, final FluidStack aOutput2,
+ final int aDuration, final int aEUt) {
return addFissionFuel(
- false, aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9, aOutput1,
- aOutput2, aDuration, aEUt);
- }
-
- @Override
- public boolean addFissionFuel(
- final boolean aOptimise,
- final FluidStack aInput1,
- final FluidStack aInput2,
- final FluidStack aInput3,
- final FluidStack aInput4,
- final FluidStack aInput5,
- final FluidStack aInput6,
- final FluidStack aInput7,
- final FluidStack aInput8,
- final FluidStack aInput9,
- final FluidStack aOutput1,
- final FluidStack aOutput2,
- final int aDuration,
- final int aEUt) {
+ false,
+ aInput1,
+ aInput2,
+ aInput3,
+ aInput4,
+ aInput5,
+ aInput6,
+ aInput7,
+ aInput8,
+ aInput9,
+ aOutput1,
+ aOutput2,
+ aDuration,
+ aEUt);
+ }
+
+ @Override
+ public boolean addFissionFuel(final boolean aOptimise, final FluidStack aInput1, final FluidStack aInput2,
+ final FluidStack aInput3, final FluidStack aInput4, final FluidStack aInput5, final FluidStack aInput6,
+ final FluidStack aInput7, final FluidStack aInput8, final FluidStack aInput9, final FluidStack aOutput1,
+ final FluidStack aOutput2, final int aDuration, final int aEUt) {
if ((aInput1 == null) || (aOutput1 == null) || (aDuration < 1) || (aEUt < 1)) {
return false;
}
- final FluidStack inputs[] = {aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9};
- final FluidStack outputs[] = {aOutput1, aOutput2};
+ final FluidStack inputs[] = { aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9 };
+ final FluidStack outputs[] = { aOutput1, aOutput2 };
int aSize = GTPP_Recipe.GTPP_Recipe_Map.sFissionFuelProcessing.mRecipeList.size();
int aSize2 = aSize;
@@ -829,17 +734,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addCyclotronRecipe(
- ItemStack aInputs,
- FluidStack aFluidInput,
- ItemStack[] aOutputs,
- FluidStack aFluidOutput,
- int[] aChances,
- int aDuration,
- int aEUt,
- int aSpecialValue) {
+ public boolean addCyclotronRecipe(ItemStack aInputs, FluidStack aFluidInput, ItemStack[] aOutputs,
+ FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue) {
return addCyclotronRecipe(
- new ItemStack[] {aInputs},
+ new ItemStack[] { aInputs },
aFluidInput,
aOutputs,
aFluidOutput,
@@ -850,15 +748,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addCyclotronRecipe(
- ItemStack[] aInputs,
- FluidStack aFluidInput,
- ItemStack[] aOutput,
- FluidStack aFluidOutput,
- int[] aChances,
- int aDuration,
- int aEUt,
- int aSpecialValue) {
+ public boolean addCyclotronRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack[] aOutput,
+ FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue) {
if (aOutput == null || aOutput.length < 1 || !ItemUtils.checkForInvalidItems(aOutput)) {
Logger.INFO("Bad output for Cyclotron Recipe.");
return false;
@@ -870,8 +761,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
aOutput,
null,
aChances,
- new FluidStack[] {aFluidInput},
- new FluidStack[] {aFluidOutput},
+ new FluidStack[] { aFluidInput },
+ new FluidStack[] { aFluidOutput },
Math.max(1, aDuration),
Math.max(1, aEUt),
aSpecialValue);
@@ -891,30 +782,20 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addMixerRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- ItemStack aInput3,
- ItemStack aInput4,
- FluidStack aFluidInput,
- FluidStack aFluidOutput,
- ItemStack aOutput1,
- ItemStack aOutput2,
- ItemStack aOutput3,
- ItemStack aOutput4,
- int aDuration,
- int aEUt) {
+ public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4,
+ FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3,
+ ItemStack aOutput4, int aDuration, int aEUt) {
if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) {
return false;
}
GTPP_Recipe aSpecialRecipe = new GTPP_Recipe(
true,
- new ItemStack[] {aInput1, aInput2, aInput3, aInput4},
- new ItemStack[] {aOutput1, aOutput2, aOutput3, aOutput4},
+ new ItemStack[] { aInput1, aInput2, aInput3, aInput4 },
+ new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4 },
null,
new int[] {},
- new FluidStack[] {aFluidInput},
- new FluidStack[] {aFluidOutput},
+ new FluidStack[] { aFluidInput },
+ new FluidStack[] { aFluidOutput },
Math.max(1, aDuration),
Math.max(1, aEUt),
0);
@@ -926,9 +807,9 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
// Machine Component Assembler
@Override
- public boolean addComponentMakerRecipe(
- ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt) {
- if (areItemsAndFluidsBothNull(aInputs, new FluidStack[] {aFluidInput})) {
+ public boolean addComponentMakerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1,
+ int aDuration, int aEUt) {
+ if (areItemsAndFluidsBothNull(aInputs, new FluidStack[] { aFluidInput })) {
return false;
}
if (aOutput1 == null) {
@@ -943,10 +824,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
GTPP_Recipe aRecipe = new GTPP_Recipe(
false,
aInputs,
- new ItemStack[] {aOutput1},
+ new ItemStack[] { aOutput1 },
null,
new int[] {},
- new FluidStack[] {aFluidInput},
+ new FluidStack[] { aFluidInput },
new FluidStack[] {},
aDuration,
aEUt,
@@ -955,17 +836,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
return true;
}
- public boolean addMultiblockCentrifugeRecipe(
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int[] aChances,
- int aDuration,
- int aEUtick,
+ public boolean addMultiblockCentrifugeRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs,
+ FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick,
int aSpecial) {
- if (areItemsAndFluidsBothNull(aInputs, aFluidInputs)
- || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)
+ if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)
|| aEUtick <= 0) {
return false;
}
@@ -980,7 +854,16 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
GTPP_Recipe aRecipe = new GTPP_Recipe(
- false, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial);
+ false,
+ aInputs,
+ aOutputs,
+ null,
+ aChances,
+ aFluidInputs,
+ aFluidOutputs,
+ aDuration,
+ aEUtick,
+ aSpecial);
GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.addRecipe(aRecipe);
// GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes.addRecipe(true, aInputs, aOutputs, null, aChances,
@@ -988,17 +871,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
return true;
}
- public boolean addMultiblockElectrolyzerRecipe(
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int[] aChances,
- int aDuration,
- int aEUtick,
+ public boolean addMultiblockElectrolyzerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs,
+ FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick,
int aSpecial) {
- if (areItemsAndFluidsBothNull(aInputs, aFluidInputs)
- || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)
+ if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)
|| aEUtick <= 0) {
return false;
}
@@ -1012,24 +888,25 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
GTPP_Recipe aRecipe = new GTPP_Recipe(
- false, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial);
+ false,
+ aInputs,
+ aOutputs,
+ null,
+ aChances,
+ aFluidInputs,
+ aFluidOutputs,
+ aDuration,
+ aEUtick,
+ aSpecial);
GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.addRecipe(aRecipe);
// GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes.addRecipe(true, aInputs, aOutputs, null, aChances,
// aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial);
return true;
}
- public boolean addAdvancedFreezerRecipe(
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int[] aChances,
- int aDuration,
- int aEUtick,
- int aSpecial) {
- if (areItemsAndFluidsBothNull(aInputs, aFluidInputs)
- || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)
+ public boolean addAdvancedFreezerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
+ ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial) {
+ if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)
|| aEUtick <= 0) {
return false;
}
@@ -1044,25 +921,27 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
GTPP_Recipe aRecipe = new GTPP_Recipe(
- false, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial);
+ false,
+ aInputs,
+ aOutputs,
+ null,
+ aChances,
+ aFluidInputs,
+ aFluidOutputs,
+ aDuration,
+ aEUtick,
+ aSpecial);
GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT.addRecipe(aRecipe);
- /*if (GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes.addRecipe(true, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial) != null) {
- return true;
- }*/
+ /*
+ * if (GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes.addRecipe(true, aInputs, aOutputs, null, aChances,
+ * aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial) != null) { return true; }
+ */
return false;
}
- public boolean addMultiblockMixerRecipe(
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int[] aChances,
- int aDuration,
- int aEUtick,
- int aSpecial) {
- if (areItemsAndFluidsBothNull(aInputs, aFluidInputs)
- || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)
+ public boolean addMultiblockMixerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
+ ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial) {
+ if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)
|| aEUtick <= 0) {
return false;
}
@@ -1076,22 +955,24 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
GTPP_Recipe aRecipe = new GTPP_Recipe(
- false, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial);
+ false,
+ aInputs,
+ aOutputs,
+ null,
+ aChances,
+ aFluidInputs,
+ aFluidOutputs,
+ aDuration,
+ aEUtick,
+ aSpecial);
GTPP_Recipe.GTPP_Recipe_Map.sMultiblockMixerRecipes_GT.addRecipe(aRecipe);
return true;
}
- public boolean addMultiblockChemicalDehydratorRecipe(
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- FluidStack[] aFluidOutputs,
- ItemStack[] aOutputs,
- int[] aChances,
- int aDuration,
- int aEUtick,
+ public boolean addMultiblockChemicalDehydratorRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs,
+ FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick,
int aSpecial) {
- if (areItemsAndFluidsBothNull(aInputs, aFluidInputs)
- || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)
+ if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs)
|| aEUtick <= 0) {
return false;
}
@@ -1105,13 +986,22 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
GTPP_Recipe aRecipe = new GTPP_Recipe(
- false, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial);
+ false,
+ aInputs,
+ aOutputs,
+ null,
+ aChances,
+ aFluidInputs,
+ aFluidOutputs,
+ aDuration,
+ aEUtick,
+ aSpecial);
GTPP_Recipe.GTPP_Recipe_Map.sMultiblockChemicalDehydratorRecipes.addRecipe(aRecipe);
return true;
}
- public boolean addAssemblerRecipeWithOreDict(
- Object aInput1, int aAmount1, Object aInput2, int aAmount2, ItemStack aOutput, int a1, int a2) {
+ public boolean addAssemblerRecipeWithOreDict(Object aInput1, int aAmount1, Object aInput2, int aAmount2,
+ ItemStack aOutput, int a1, int a2) {
if (aInput1 instanceof String || aInput2 instanceof String) {
int mCompleted = 0;
if (aInput1 instanceof String && aInput2 instanceof String) {
@@ -1156,15 +1046,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
}
- public boolean addAssemblerRecipeWithOreDict(
- Object aInput1,
- int aAmount1,
- Object aInput2,
- int aAmount2,
- FluidStack aInputFluid,
- ItemStack aOutput,
- int a1,
- int a2) {
+ public boolean addAssemblerRecipeWithOreDict(Object aInput1, int aAmount1, Object aInput2, int aAmount2,
+ FluidStack aInputFluid, ItemStack aOutput, int a1, int a2) {
if (aInput1 instanceof String || aInput2 instanceof String) {
int mCompleted = 0;
if (aInput1 instanceof String && aInput2 instanceof String) {
@@ -1205,8 +1088,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
return mCompleted > 0;
} else {
- return GT_Values.RA.addAssemblerRecipe(
- (ItemStack) aInput1, (ItemStack) aInput2, aInputFluid, aOutput, a1, a2);
+ return GT_Values.RA
+ .addAssemblerRecipe((ItemStack) aInput1, (ItemStack) aInput2, aInputFluid, aOutput, a1, a2);
}
}
@@ -1281,8 +1164,13 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
Method[] aDump = TTRecipeAdder.getDeclaredMethods();
for (Method m : aDump) {
if (m != null) {
- Logger.INFO("Found " + m.getName() + " | " + m.getModifiers() + " | "
- + ArrayUtils.toString(m.getParameters(), "EMPTY") + "");
+ Logger.INFO(
+ "Found " + m.getName()
+ + " | "
+ + m.getModifiers()
+ + " | "
+ + ArrayUtils.toString(m.getParameters(), "EMPTY")
+ + "");
if (m.getName().toLowerCase().equals("addresearchableassemblylinerecipe")) {
Logger.INFO("Types: " + ArrayUtils.toString(m.getParameterTypes()));
}
@@ -1346,13 +1234,13 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
}
- public boolean addSixSlotAssemblingRecipe(
- ItemStack[] aInputs, FluidStack aInputFluid, ItemStack aOutput1, int aDuration, int aEUt) {
+ public boolean addSixSlotAssemblingRecipe(ItemStack[] aInputs, FluidStack aInputFluid, ItemStack aOutput1,
+ int aDuration, int aEUt) {
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) {
if (mSixSlotAssembly != null) {
try {
- return (boolean)
- mSixSlotAssembly.invoke(GT_Values.RA, aInputs, aInputFluid, aOutput1, aDuration, aEUt);
+ return (boolean) mSixSlotAssembly
+ .invoke(GT_Values.RA, aInputs, aInputFluid, aOutput1, aDuration, aEUt);
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
if (CORE.GTNH) {
return false;
@@ -1364,19 +1252,11 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addAssemblylineRecipe(
- ItemStack aResearchItem,
- int aResearchTime,
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- ItemStack aOutput,
- int aDuration,
- int aEUt) {
- if (GTNH)
- return RA.addAssemblylineRecipe(
- aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt);
- if ((aResearchItem == null)
- || (aResearchTime <= 0)
+ public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
+ FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
+ if (GTNH) return RA
+ .addAssemblylineRecipe(aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt);
+ if ((aResearchItem == null) || (aResearchTime <= 0)
|| (aInputs == null)
|| (aOutput == null)
|| aInputs.length > 15
@@ -1388,15 +1268,18 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
for (ItemStack tItem : aInputs) {
if (tItem == null) {
- GT_FML_LOGGER.info("addAssemblingLineRecipe " + aResearchItem.getDisplayName() + " --> "
- + aOutput.getUnlocalizedName() + " there is some null item in that recipe");
+ GT_FML_LOGGER.info(
+ "addAssemblingLineRecipe " + aResearchItem.getDisplayName()
+ + " --> "
+ + aOutput.getUnlocalizedName()
+ + " there is some null item in that recipe");
}
}
GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(
false,
- new ItemStack[] {aResearchItem},
- new ItemStack[] {aOutput},
- new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0])},
+ new ItemStack[] { aResearchItem },
+ new ItemStack[] { aOutput },
+ new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0]) },
null,
null,
aResearchTime,
@@ -1405,33 +1288,32 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(
false,
aInputs,
- new ItemStack[] {aOutput},
- new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0])},
+ new ItemStack[] { aOutput },
+ new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0]) },
aFluidInputs,
null,
aDuration,
aEUt,
0,
false);
- GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine(
- aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt));
+ GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(
+ new GT_Recipe_AssemblyLine(
+ aResearchItem,
+ aResearchTime,
+ aInputs,
+ aFluidInputs,
+ aOutput,
+ aDuration,
+ aEUt));
return true;
}
@Override
- public boolean addAssemblylineRecipe(
- ItemStack aResearchItem,
- int aResearchTime,
- Object[] aInputs,
- FluidStack[] aFluidInputs,
- ItemStack aOutput,
- int aDuration,
- int aEUt) {
- if (GTNH)
- return RA.addAssemblylineRecipe(
- aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt);
- if ((aResearchItem == null)
- || (aResearchTime <= 0)
+ public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, Object[] aInputs,
+ FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
+ if (GTNH) return RA
+ .addAssemblylineRecipe(aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt);
+ if ((aResearchItem == null) || (aResearchTime <= 0)
|| (aInputs == null)
|| (aOutput == null)
|| aInputs.length > 15
@@ -1472,18 +1354,20 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
tAlts[i] = uList.toArray(new ItemStack[uList.size()]);
continue;
- } catch (Exception t) {
- }
+ } catch (Exception t) {}
}
}
- GT_FML_LOGGER.info("addAssemblingLineRecipe " + aResearchItem.getDisplayName() + " --> "
- + aOutput.getUnlocalizedName() + " there is some null item in that recipe");
+ GT_FML_LOGGER.info(
+ "addAssemblingLineRecipe " + aResearchItem.getDisplayName()
+ + " --> "
+ + aOutput.getUnlocalizedName()
+ + " there is some null item in that recipe");
}
GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(
false,
- new ItemStack[] {aResearchItem},
- new ItemStack[] {aOutput},
- new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0])},
+ new ItemStack[] { aResearchItem },
+ new ItemStack[] { aOutput },
+ new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0]) },
null,
null,
aResearchTime,
@@ -1492,8 +1376,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(
false,
tInputs,
- new ItemStack[] {aOutput},
- new ItemStack[] {ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0])},
+ new ItemStack[] { aOutput },
+ new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0]) },
aFluidInputs,
null,
aDuration,
@@ -1501,18 +1385,21 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
0,
tAlts,
false);
- GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine(
- aResearchItem, aResearchTime, tInputs, aFluidInputs, aOutput, aDuration, aEUt, tAlts));
+ GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(
+ new GT_Recipe_AssemblyLine(
+ aResearchItem,
+ aResearchTime,
+ tInputs,
+ aFluidInputs,
+ aOutput,
+ aDuration,
+ aEUt,
+ tAlts));
return true;
}
- private boolean tryAddTecTechScannerRecipe(
- ItemStack aResearchItem,
- Object[] aInputs,
- FluidStack[] aFluidInputs,
- ItemStack aOutput,
- int assDuration,
- int assEUt) {
+ private boolean tryAddTecTechScannerRecipe(ItemStack aResearchItem, Object[] aInputs, FluidStack[] aFluidInputs,
+ ItemStack aOutput, int assDuration, int assEUt) {
if (!LoadedMods.TecTech) {
return true;
} else {
@@ -1534,13 +1421,16 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
aOutput,
assDuration,
assEUt);
- Logger.INFO("Added TecTech Scanner Recipe for " + ItemUtils.getItemName(aResearchItem) + "? "
- + aResult);
+ Logger.INFO(
+ "Added TecTech Scanner Recipe for " + ItemUtils.getItemName(aResearchItem)
+ + "? "
+ + aResult);
return aResult;
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- Logger.INFO("Failed to generate TecTech recipe for " + ItemUtils.getItemName(aResearchItem)
- + ", please report this to Alkalus. [Severe]");
+ Logger.INFO(
+ "Failed to generate TecTech recipe for " + ItemUtils.getItemName(aResearchItem)
+ + ", please report this to Alkalus. [Severe]");
e.printStackTrace();
}
}
@@ -1548,34 +1438,21 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
return false;
}
- public boolean addChemicalRecipe(
- ItemStack input1,
- ItemStack input2,
- FluidStack inputFluid,
- FluidStack outputFluid,
- ItemStack output,
- int time,
- int eu) {
+ public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
+ ItemStack output, int time, int eu) {
return addChemicalRecipe(input1, input2, inputFluid, outputFluid, output, null, time, eu);
}
@Override
- public boolean addChemicalRecipe(
- ItemStack input1,
- ItemStack input2,
- FluidStack inputFluid,
- FluidStack outputFluid,
- ItemStack output,
- Object object,
- int time,
- int eu) {
+ public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
+ ItemStack output, Object object, int time, int eu) {
try {
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return (boolean)
- mChemicalRecipe[0].invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, time);
+ return (boolean) mChemicalRecipe[0]
+ .invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, time);
} else {
- return (boolean) mChemicalRecipe[1].invoke(
- GT_Values.RA, input1, input2, inputFluid, outputFluid, output, time, eu);
+ return (boolean) mChemicalRecipe[1]
+ .invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, time, eu);
}
} catch (Throwable t) {
return false;
@@ -1583,21 +1460,15 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addChemicalRecipe(
- ItemStack input1,
- ItemStack input2,
- FluidStack inputFluid,
- FluidStack outputFluid,
- ItemStack output,
- ItemStack output2,
- int time) {
+ public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
+ ItemStack output, ItemStack output2, int time) {
try {
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return (boolean)
- mChemicalRecipe[0].invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, time);
+ return (boolean) mChemicalRecipe[0]
+ .invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, time);
} else {
- return (boolean) mChemicalRecipe[2].invoke(
- GT_Values.RA, input1, input2, inputFluid, outputFluid, output, output2, time);
+ return (boolean) mChemicalRecipe[2]
+ .invoke(GT_Values.RA, input1, input2, inputFluid, outputFluid, output, output2, time);
}
} catch (Throwable t) {
return false;
@@ -1605,27 +1476,19 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addChemicalRecipe(
- ItemStack input1,
- ItemStack input2,
- int aCircuit,
- FluidStack inputFluid,
- FluidStack outputFluid,
- ItemStack output,
- ItemStack output2,
- int time,
- int eu) {
+ public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, int aCircuit, FluidStack inputFluid,
+ FluidStack outputFluid, ItemStack output, ItemStack output2, int time, int eu) {
if (aCircuit < 0 || aCircuit > 24) {
aCircuit = 22;
}
GT_Recipe aSpecialRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {input1, input2},
- new ItemStack[] {output, output2},
+ new ItemStack[] { input1, input2 },
+ new ItemStack[] { output, output2 },
CI.getNumberedCircuit(aCircuit),
new int[] {},
- new FluidStack[] {inputFluid},
- new FluidStack[] {outputFluid},
+ new FluidStack[] { inputFluid },
+ new FluidStack[] { outputFluid },
time,
eu,
0);
@@ -1633,19 +1496,14 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addMultiblockChemicalRecipe(
- ItemStack[] itemStacks,
- FluidStack[] fluidStacks,
- FluidStack[] fluidStacks2,
- ItemStack[] outputs,
- int time,
- int eu) {
+ public boolean addMultiblockChemicalRecipe(ItemStack[] itemStacks, FluidStack[] fluidStacks,
+ FluidStack[] fluidStacks2, ItemStack[] outputs, int time, int eu) {
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || mLargeChemReactor == null) {
return false;
}
try {
- return (boolean)
- mLargeChemReactor.invoke(GT_Values.RA, itemStacks, fluidStacks, fluidStacks2, outputs, time, eu);
+ return (boolean) mLargeChemReactor
+ .invoke(GT_Values.RA, itemStacks, fluidStacks, fluidStacks2, outputs, time, eu);
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
return false;
}
@@ -1682,19 +1540,27 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
return false;
}
GT_Recipe.GT_Recipe_Map.sCompressorRecipes.addRecipe(
- true, new ItemStack[] {aInput1}, new ItemStack[] {aOutput1}, null, null, null, aDuration, aEUt, 0);
+ true,
+ new ItemStack[] { aInput1 },
+ new ItemStack[] { aOutput1 },
+ null,
+ null,
+ null,
+ aDuration,
+ aEUt,
+ 0);
return true;
}
@Override
- public boolean addBrewingRecipe(
- int aCircuit, FluidStack aInput, FluidStack aOutput, int aTime, int aEu, boolean aHidden) {
+ public boolean addBrewingRecipe(int aCircuit, FluidStack aInput, FluidStack aOutput, int aTime, int aEu,
+ boolean aHidden) {
return addBrewingRecipe(CI.getNumberedCircuit(aCircuit), aInput, aOutput, aTime, aEu, aHidden);
}
@Override
- public boolean addBrewingRecipe(
- ItemStack aIngredient, FluidStack aInput, FluidStack aOutput, int aTime, int aEu, boolean aHidden) {
+ public boolean addBrewingRecipe(ItemStack aIngredient, FluidStack aInput, FluidStack aOutput, int aTime, int aEu,
+ boolean aHidden) {
if ((aIngredient == null) || (aInput == null) || (aOutput == null)) {
return false;
}
@@ -1703,11 +1569,11 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sBrewingRecipes.addRecipe(
false,
- new ItemStack[] {aIngredient},
+ new ItemStack[] { aIngredient },
null,
null,
- new FluidStack[] {aInput},
- new FluidStack[] {aOutput},
+ new FluidStack[] { aInput },
+ new FluidStack[] { aOutput },
aTime,
aEu,
0);
@@ -1718,7 +1584,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
/**
- * Lets me add recipes for GT 5.08 & 5.09, since someone broke the method headers.
+ * Lets me add recipes for GT 5.08 & 5.09, since someone broke the method headers.
*/
@Override
public boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aDust, ItemStack aOutput) {
@@ -1741,14 +1607,19 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
@Override
public boolean addFluidExtractionRecipe(ItemStack input, FluidStack output, int aTime, int aEu) {
- boolean aRecipe =
- RA.addFluidSmelterRecipe(GT_Utility.copyAmount(1, input), null, output, 10000, aTime, aEu, false);
+ boolean aRecipe = RA
+ .addFluidSmelterRecipe(GT_Utility.copyAmount(1, input), null, output, 10000, aTime, aEu, false);
if (aRecipe) {
- Logger.INFO("Added Fluid Extractor Recipe: "
- + input.getDisplayName() + " and obtain "
- + output.amount + "mb of " + output.getLocalizedName()
- + ". Time: " + aTime + ", Voltage: "
- + aEu);
+ Logger.INFO(
+ "Added Fluid Extractor Recipe: " + input.getDisplayName()
+ + " and obtain "
+ + output.amount
+ + "mb of "
+ + output.getLocalizedName()
+ + ". Time: "
+ + aTime
+ + ", Voltage: "
+ + aEu);
}
return aRecipe;
@@ -1756,10 +1627,16 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addFluidExtractionRecipe(
- ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, int aDuration, int aEU) {
+ public boolean addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, int aDuration,
+ int aEU) {
boolean aRecipe = RA.addFluidSmelterRecipe(
- GT_Utility.copyAmount(1, aEmpty), aRemains, aFluid, 10000, aDuration, aEU, false);
+ GT_Utility.copyAmount(1, aEmpty),
+ aRemains,
+ aFluid,
+ 10000,
+ aDuration,
+ aEU,
+ false);
return aRecipe;
// return MaterialGenerator.addFluidExtractionRecipe(aEmpty, aRemains, aFluid, aDuration, aEU);
}
@@ -1770,44 +1647,32 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addFluidCannerRecipe(
- ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn, FluidStack rFluidOut) {
+ public boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn,
+ FluidStack rFluidOut) {
return MaterialGenerator.addFluidCannerRecipe(aContainer, aFullContainer, rFluidIn, rFluidOut);
}
@Override
- public boolean addFluidCannerRecipe(
- ItemStack aFullContainer,
- ItemStack container,
- FluidStack rFluidIn,
- FluidStack rFluidOut,
- int aTime,
- int aEu) {
+ public boolean addFluidCannerRecipe(ItemStack aFullContainer, ItemStack container, FluidStack rFluidIn,
+ FluidStack rFluidOut, int aTime, int aEu) {
return MaterialGenerator.addFluidCannerRecipe(container, aFullContainer, rFluidIn, rFluidOut, aTime, aEu);
}
/**
* Adds a Fusion reactor Recipe
*
- * @param aInputStackA = first Input (not null, and respects StackSize)
- * @param aInputStackB = second Input (not null, and respects StackSize)
- * @param plasma = Output of the Fusion (can be null, and respects StackSize)
- * @param aOutputChance = chance to output plasma (can be 0)
- * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
- * @param aEu = The EU generated per Tick (can even be negative!)
- * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
+ * @param aInputStackA = first Input (not null, and respects StackSize)
+ * @param aInputStackB = second Input (not null, and respects StackSize)
+ * @param plasma = Output of the Fusion (can be null, and respects StackSize)
+ * @param aOutputChance = chance to output plasma (can be 0)
+ * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
+ * @param aEu = The EU generated per Tick (can even be negative!)
+ * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
*/
@Override
- public boolean addFusionReactorRecipe(
- FluidStack aInputStackA,
- FluidStack aInputStackB,
- FluidStack plasma,
- int aOutputChance,
- int aFusionDurationInTicks,
- int aEu,
- int aSpecial) {
- if (aInputStackA == null
- || aInputStackB == null
+ public boolean addFusionReactorRecipe(FluidStack aInputStackA, FluidStack aInputStackB, FluidStack plasma,
+ int aOutputChance, int aFusionDurationInTicks, int aEu, int aSpecial) {
+ if (aInputStackA == null || aInputStackB == null
|| plasma == null
|| aFusionDurationInTicks < 1
|| aEu < 1
@@ -1819,9 +1684,9 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
null,
null,
null,
- new int[] {aOutputChance},
- new FluidStack[] {aInputStackA, aInputStackB},
- new FluidStack[] {plasma},
+ new int[] { aOutputChance },
+ new FluidStack[] { aInputStackA, aInputStackB },
+ new FluidStack[] { plasma },
aFusionDurationInTicks,
aEu,
aSpecial);
@@ -1832,46 +1697,34 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
/**
* Adds a Fusion reactor Recipe
*
- * @param aInputStackA = first Input (not null, and respects StackSize)
- * @param aInputStackB = second Input (not null, and respects StackSize)
- * @param plasma = Output of the Fusion (can be null, and respects StackSize)
- * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
- * @param aEu = The EU generated per Tick (can even be negative!)
- * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
+ * @param aInputStackA = first Input (not null, and respects StackSize)
+ * @param aInputStackB = second Input (not null, and respects StackSize)
+ * @param plasma = Output of the Fusion (can be null, and respects StackSize)
+ * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
+ * @param aEu = The EU generated per Tick (can even be negative!)
+ * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
*/
@Override
- public boolean addFusionReactorRecipe(
- ItemStack aInputStackA,
- ItemStack aInputStackB,
- FluidStack plasma,
- int aFusionDurationInTicks,
- int aEu,
- int aSpecial) {
+ public boolean addFusionReactorRecipe(ItemStack aInputStackA, ItemStack aInputStackB, FluidStack plasma,
+ int aFusionDurationInTicks, int aEu, int aSpecial) {
return addFusionReactorRecipe(aInputStackA, aInputStackB, plasma, 10000, aFusionDurationInTicks, aEu, aSpecial);
}
/**
* Adds a Fusion reactor Recipe
*
- * @param aInputStackA = first Input (not null, and respects StackSize)
- * @param aInputStackB = second Input (not null, and respects StackSize)
- * @param plasma = Output of the Fusion (can be null, and respects StackSize)
- * @param aOutputChance = chance to output plasma (can be 0)
- * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
- * @param aEu = The EU generated per Tick (can even be negative!)
- * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
+ * @param aInputStackA = first Input (not null, and respects StackSize)
+ * @param aInputStackB = second Input (not null, and respects StackSize)
+ * @param plasma = Output of the Fusion (can be null, and respects StackSize)
+ * @param aOutputChance = chance to output plasma (can be 0)
+ * @param aFusionDurationInTicks = How many ticks the Fusion lasts (must be > 0)
+ * @param aEu = The EU generated per Tick (can even be negative!)
+ * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
*/
@Override
- public boolean addFusionReactorRecipe(
- ItemStack aInputStackA,
- ItemStack aInputStackB,
- FluidStack plasma,
- int aOutputChance,
- int aFusionDurationInTicks,
- int aEu,
- int aSpecial) {
- if (aInputStackA == null
- || aInputStackB == null
+ public boolean addFusionReactorRecipe(ItemStack aInputStackA, ItemStack aInputStackB, FluidStack plasma,
+ int aOutputChance, int aFusionDurationInTicks, int aEu, int aSpecial) {
+ if (aInputStackA == null || aInputStackB == null
|| plasma == null
|| aFusionDurationInTicks < 1
|| aEu < 1
@@ -1880,12 +1733,12 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
GTPP_Recipe aFusionCustom = new GTPP_Recipe(
true,
- new ItemStack[] {aInputStackA, aInputStackB},
+ new ItemStack[] { aInputStackA, aInputStackB },
null,
null,
- new int[] {aOutputChance},
+ new int[] { aOutputChance },
null,
- new FluidStack[] {plasma},
+ new FluidStack[] { plasma },
aFusionDurationInTicks,
aEu,
aSpecial);
@@ -1904,22 +1757,14 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addVacuumFurnaceRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- FluidStack aFluidInput,
- FluidStack aFluidOutput,
- ItemStack aOutput1,
- ItemStack aOutput2,
- int aDuration,
- int aEUt,
- int aLevel) {
+ public boolean addVacuumFurnaceRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
+ FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, int aLevel) {
if (aInput1 != null && aOutput1 != null) {
return addVacuumFurnaceRecipe(
- new ItemStack[] {aInput1, aInput2},
- new FluidStack[] {aFluidInput},
- new ItemStack[] {aOutput1, aOutput2},
- new FluidStack[] {aFluidOutput},
+ new ItemStack[] { aInput1, aInput2 },
+ new FluidStack[] { aFluidInput },
+ new ItemStack[] { aOutput1, aOutput2 },
+ new FluidStack[] { aFluidOutput },
aDuration,
aEUt,
aLevel);
@@ -1929,19 +1774,22 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addVacuumFurnaceRecipe(
- ItemStack[] aInputs,
- FluidStack[] aFluidInputs,
- ItemStack[] aOutputs,
- FluidStack[] aFluidOutputs,
- int aDuration,
- int aEUt,
- int aLevel) {
+ public boolean addVacuumFurnaceRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack[] aOutputs,
+ FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aLevel) {
if (aInputs != null && aOutputs != null) {
int aSize = GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes.mRecipeList.size();
int aSize2 = aSize;
GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes.addRecipe(
- false, aInputs, aOutputs, null, new int[] {}, aFluidInputs, aFluidOutputs, aDuration, aEUt, aLevel);
+ false,
+ aInputs,
+ aOutputs,
+ null,
+ new int[] {},
+ aFluidInputs,
+ aFluidOutputs,
+ aDuration,
+ aEUt,
+ aLevel);
aSize = GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes.mRecipeList.size();
return aSize > aSize2;
} else {
@@ -1954,12 +1802,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
// Generate Special Laser Recipe
GT_Recipe u = new GTPP_Recipe(
false,
- new ItemStack[] {
- aInput1, GregtechItemList.Laser_Lens_WoodsGlass.get(0),
- },
- new ItemStack[] {aOutput},
+ new ItemStack[] { aInput1, GregtechItemList.Laser_Lens_WoodsGlass.get(0), },
+ new ItemStack[] { aOutput },
null,
- new int[] {10000},
+ new int[] { 10000 },
new FluidStack[] {},
new FluidStack[] {},
time,
@@ -1974,27 +1820,14 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addChemicalPlantRecipe(
- ItemStack[] aInputs,
- FluidStack[] aInputFluids,
- ItemStack[] aOutputs,
- FluidStack[] aFluidOutputs,
- int time,
- long eu,
- int aTier) {
+ public boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
+ FluidStack[] aFluidOutputs, int time, long eu, int aTier) {
return addChemicalPlantRecipe(aInputs, aInputFluids, aOutputs, aFluidOutputs, new int[] {}, time, eu, aTier);
}
@Override
- public boolean addChemicalPlantRecipe(
- ItemStack[] aInputs,
- FluidStack[] aInputFluids,
- ItemStack[] aOutputs,
- FluidStack[] aFluidOutputs,
- int[] aChances,
- int time,
- long eu,
- int aTier) {
+ public boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
+ FluidStack[] aFluidOutputs, int[] aChances, int time, long eu, int aTier) {
if (aInputs.length > 4 || aInputFluids.length > 4 || aOutputs.length > 4 || aFluidOutputs.length > 2) {
Logger.INFO("Inputs: " + ItemUtils.getArrayStackNames(aInputs));
@@ -2007,22 +1840,34 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
int aSize = GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList.size();
int aSize2 = aSize;
GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.addRecipe(
- false, aInputs, aOutputs, null, aChances, aInputFluids, aFluidOutputs, time, (int) eu, aTier);
+ false,
+ aInputs,
+ aOutputs,
+ null,
+ aChances,
+ aInputFluids,
+ aFluidOutputs,
+ time,
+ (int) eu,
+ aTier);
aSize = GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList.size();
return aSize > aSize2;
}
@Override
- public boolean addBlastRecipe(
- ItemStack[] aInputs,
- FluidStack[] aInputFluids,
- ItemStack[] aOutputs,
- FluidStack[] aFluidOutputs,
- int time,
- long eu,
- int aHeat) {
+ public boolean addBlastRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
+ FluidStack[] aFluidOutputs, int time, long eu, int aHeat) {
GTPP_Recipe aSpecialRecipe = new GTPP_Recipe(
- false, aInputs, aOutputs, null, new int[] {}, aInputFluids, aFluidOutputs, time, (int) eu, aHeat);
+ false,
+ aInputs,
+ aOutputs,
+ null,
+ new int[] {},
+ aInputFluids,
+ aFluidOutputs,
+ time,
+ (int) eu,
+ aHeat);
int aSize = GT_Recipe.GT_Recipe_Map.sBlastRecipes.mRecipeList.size();
int aSize2 = aSize;
@@ -2032,47 +1877,34 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addPyrolyseRecipe(
- ItemStack aInput,
- FluidStack aFluidInput,
- int intCircuit,
- ItemStack aOutput,
- FluidStack aFluidOutput,
- int aDuration,
- int aEUt) {
+ public boolean addPyrolyseRecipe(ItemStack aInput, FluidStack aFluidInput, int intCircuit, ItemStack aOutput,
+ FluidStack aFluidOutput, int aDuration, int aEUt) {
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || mPyroOven == null) {
return false;
}
try {
- return (boolean) mPyroOven.invoke(
- GT_Values.RA, aInput, aFluidInput, intCircuit, aOutput, aFluidOutput, aDuration, aEUt);
+ return (boolean) mPyroOven
+ .invoke(GT_Values.RA, aInput, aFluidInput, intCircuit, aOutput, aFluidOutput, aDuration, aEUt);
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
return false;
}
}
@Override
- public boolean addDistilleryRecipe(
- ItemStack aCircuit,
- FluidStack aInput,
- FluidStack aOutput,
- ItemStack aSolidOutput,
- int aDuration,
- int aEUt,
- boolean aHidden) {
+ public boolean addDistilleryRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput,
+ ItemStack aSolidOutput, int aDuration, int aEUt, boolean aHidden) {
if (aInput != null && aOutput != null) {
- if ((aDuration = GregTech_API.sRecipeFile.get(
- "distillery", aOutput.getFluid().getUnlocalizedName(), aDuration))
- <= 0) {
+ if ((aDuration = GregTech_API.sRecipeFile
+ .get("distillery", aOutput.getFluid().getUnlocalizedName(), aDuration)) <= 0) {
return false;
} else {
GT_Recipe tRecipe = GT_Recipe_Map.sDistilleryRecipes.addRecipe(
true,
- new ItemStack[] {aCircuit},
- new ItemStack[] {aSolidOutput},
+ new ItemStack[] { aCircuit },
+ new ItemStack[] { aSolidOutput },
(Object) null,
- new FluidStack[] {aInput},
- new FluidStack[] {aOutput},
+ new FluidStack[] { aInput },
+ new FluidStack[] { aOutput },
aDuration,
aEUt,
0);
@@ -2096,10 +1928,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
if (aInput != null && aOutput != null) {
GT_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {aInput.copy()},
- new ItemStack[] {aOutput.copy()},
+ new ItemStack[] { aInput.copy() },
+ new ItemStack[] { aOutput.copy() },
null,
- new int[] {aChance},
+ new int[] { aChance },
null,
null,
aDuration,
@@ -2114,8 +1946,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addPulverisationRecipe(
- ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3) {
+ public boolean addPulverisationRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2,
+ ItemStack aOutput3) {
// return GT_Values.RA.addPulveriserRecipe(arg0, arg1, arg2, arg3, arg4)
aOutput1 = GT_OreDictUnificator.get(true, aOutput1);
@@ -2128,10 +1960,17 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
if (GregTech_API.sRecipeFile.get(ConfigCategories.Machines.maceration, aInput, true)) {
GT_Utility.addSimpleIC2MachineRecipe(
- aInput, GT_ModHandler.getMaceratorRecipeList(), null, new Object[] {aOutput1});
+ aInput,
+ GT_ModHandler.getMaceratorRecipeList(),
+ null,
+ new Object[] { aOutput1 });
}
GT_Values.RA.addPulveriserRecipe(
- aInput, new ItemStack[] {aOutput1, aOutput2, aOutput3}, new int[] {10000, 10000, 10000}, 400, 2);
+ aInput,
+ new ItemStack[] { aOutput1, aOutput2, aOutput3 },
+ new int[] { 10000, 10000, 10000 },
+ 400,
+ 2);
}
return true;
}
@@ -2156,34 +1995,45 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
ItemStack aMillingBall_Soapstone = GregtechItemList.Milling_Ball_Soapstone.get(0);
// Inputs
- ItemStack[] aInputsOre1 = new ItemStack[] {CI.getNumberedCircuit(10), aOreStack, aMillingBall_Alumina};
+ ItemStack[] aInputsOre1 = new ItemStack[] { CI.getNumberedCircuit(10), aOreStack, aMillingBall_Alumina };
- ItemStack[] aInputsOre2 = new ItemStack[] {CI.getNumberedCircuit(11), aOreStack, aMillingBall_Soapstone};
+ ItemStack[] aInputsOre2 = new ItemStack[] { CI.getNumberedCircuit(11), aOreStack, aMillingBall_Soapstone };
- ItemStack[] aInputsCrushed1 = new ItemStack[] {CI.getNumberedCircuit(10), aCrushedStack, aMillingBall_Alumina};
+ ItemStack[] aInputsCrushed1 = new ItemStack[] { CI.getNumberedCircuit(10), aCrushedStack,
+ aMillingBall_Alumina };
- ItemStack[] aInputsCrushed2 =
- new ItemStack[] {CI.getNumberedCircuit(11), aCrushedStack, aMillingBall_Soapstone};
+ ItemStack[] aInputsCrushed2 = new ItemStack[] { CI.getNumberedCircuit(11), aCrushedStack,
+ aMillingBall_Soapstone };
// Outputs
- ItemStack[] aOutputsOre1 = new ItemStack[] {aMilledStackOres1};
+ ItemStack[] aOutputsOre1 = new ItemStack[] { aMilledStackOres1 };
- ItemStack[] aOutputsOre2 = new ItemStack[] {aMilledStackOres2};
+ ItemStack[] aOutputsOre2 = new ItemStack[] { aMilledStackOres2 };
- ItemStack[] aOutputsCrushed1 = new ItemStack[] {aMilledStackCrushed1};
+ ItemStack[] aOutputsCrushed1 = new ItemStack[] { aMilledStackCrushed1 };
- ItemStack[] aOutputsCrushed2 = new ItemStack[] {aMilledStackCrushed2};
+ ItemStack[] aOutputsCrushed2 = new ItemStack[] { aMilledStackCrushed2 };
- ItemStack[][] aInputArray = new ItemStack[][] {aInputsOre1, aInputsOre2, aInputsCrushed1, aInputsCrushed2};
- ItemStack[][] aOutputArray = new ItemStack[][] {aOutputsOre1, aOutputsOre2, aOutputsCrushed1, aOutputsCrushed2};
- int[] aTime = new int[] {2400, 3000, 1200, 1500};
+ ItemStack[][] aInputArray = new ItemStack[][] { aInputsOre1, aInputsOre2, aInputsCrushed1, aInputsCrushed2 };
+ ItemStack[][] aOutputArray = new ItemStack[][] { aOutputsOre1, aOutputsOre2, aOutputsCrushed1,
+ aOutputsCrushed2 };
+ int[] aTime = new int[] { 2400, 3000, 1200, 1500 };
int aSize = GTPP_Recipe.GTPP_Recipe_Map.sOreMillRecipes.mRecipeList.size();
int aSize2 = aSize;
for (int i = 0; i < 4; i++) {
GTPP_Recipe aOreRecipe = new GTPP_Recipe(
- false, aInputArray[i], aOutputArray[i], null, new int[] {}, null, null, aTime[i], aEU, 0);
+ false,
+ aInputArray[i],
+ aOutputArray[i],
+ null,
+ new int[] {},
+ null,
+ null,
+ aTime[i],
+ aEU,
+ 0);
GTPP_Recipe.GTPP_Recipe_Map.sOreMillRecipes.add(aOreRecipe);
}
@@ -2192,25 +2042,20 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addFlotationRecipe(
- Materials aMat,
- ItemStack aXanthate,
- FluidStack[] aInputFluids,
- FluidStack[] aOutputFluids,
- int aTime,
- int aEU) {
+ public boolean addFlotationRecipe(Materials aMat, ItemStack aXanthate, FluidStack[] aInputFluids,
+ FluidStack[] aOutputFluids, int aTime, int aEU) {
return addFlotationRecipe(
- MaterialUtils.generateMaterialFromGtENUM(aMat), aXanthate, aInputFluids, aOutputFluids, aTime, aEU);
+ MaterialUtils.generateMaterialFromGtENUM(aMat),
+ aXanthate,
+ aInputFluids,
+ aOutputFluids,
+ aTime,
+ aEU);
}
@Override
- public boolean addFlotationRecipe(
- Material aMat,
- ItemStack aXanthate,
- FluidStack[] aInputFluids,
- FluidStack[] aOutputFluids,
- int aTime,
- int aEU) {
+ public boolean addFlotationRecipe(Material aMat, ItemStack aXanthate, FluidStack[] aInputFluids,
+ FluidStack[] aOutputFluids, int aTime, int aEU) {
FlotationRecipeHandler.registerOreType(aMat);
@@ -2219,13 +2064,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
GT_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {
- ItemUtils.getSimpleStack(aXanthate, 32),
- aMat.getMilled(64),
- aMat.getMilled(64),
- aMat.getMilled(64),
- aMat.getMilled(64),
- },
+ new ItemStack[] { ItemUtils.getSimpleStack(aXanthate, 32), aMat.getMilled(64), aMat.getMilled(64),
+ aMat.getMilled(64), aMat.getMilled(64), },
new ItemStack[] {},
null,
new int[] {},
@@ -2242,15 +2082,25 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addpackagerRecipe(
- ItemStack aRecipeType, ItemStack aSmallDust, ItemStack aTinyDust, ItemStack aOutputStack1) {
+ public boolean addpackagerRecipe(ItemStack aRecipeType, ItemStack aSmallDust, ItemStack aTinyDust,
+ ItemStack aOutputStack1) {
AutoMap<Boolean> aResults = new AutoMap<Boolean>();
// Dust 1
- aResults.put(GT_Values.RA.addBoxingRecipe(
- GT_Utility.copyAmount(4L, new Object[] {aSmallDust}), aRecipeType, aOutputStack1, 100, 4));
+ aResults.put(
+ GT_Values.RA.addBoxingRecipe(
+ GT_Utility.copyAmount(4L, new Object[] { aSmallDust }),
+ aRecipeType,
+ aOutputStack1,
+ 100,
+ 4));
// Dust 2
- aResults.put(GT_Values.RA.addBoxingRecipe(
- GT_Utility.copyAmount(9L, new Object[] {aTinyDust}), aRecipeType, aOutputStack1, 100, 4));
+ aResults.put(
+ GT_Values.RA.addBoxingRecipe(
+ GT_Utility.copyAmount(9L, new Object[] { aTinyDust }),
+ aRecipeType,
+ aOutputStack1,
+ 100,
+ 4));
for (boolean b : aResults) {
if (!b) {
return false;
@@ -2263,12 +2113,20 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
public boolean addFuelForRTG(ItemStack aFuelPellet, int aFuelDays, int aVoltage) {
int aSize1 = GTPP_Recipe.GTPP_Recipe_Map.sRTGFuels.mRecipeList.size();
GTPP_Recipe.GTPP_Recipe_Map.sRTGFuels.addRecipe(
- true, new ItemStack[] {aFuelPellet}, new ItemStack[] {}, null, null, null, 0, aVoltage, aFuelDays);
+ true,
+ new ItemStack[] { aFuelPellet },
+ new ItemStack[] {},
+ null,
+ null,
+ null,
+ 0,
+ aVoltage,
+ aFuelDays);
int aSize2 = GTPP_Recipe.GTPP_Recipe_Map.sRTGFuels.mRecipeList.size();
if (aSize2 > aSize1) {
- long eu = GregtechMetaTileEntity_RTG.getTotalEUGenerated(
- GregtechMetaTileEntity_RTG.convertDaysToTicks(aFuelDays), aVoltage);
+ long eu = GregtechMetaTileEntity_RTG
+ .getTotalEUGenerated(GregtechMetaTileEntity_RTG.convertDaysToTicks(aFuelDays), aVoltage);
GT_MetaTileEntity_Hatch_Energy_RTG.registerPelletForHatch(aFuelPellet, eu);
return true;
} else {
@@ -2277,23 +2135,16 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addColdTrapRecipe(
- int aCircuit,
- ItemStack aInput,
- FluidStack aFluidInput,
- ItemStack[] aOutputs,
- int[] aChances,
- FluidStack aFluidOutput,
- int aTime,
- int aEU) {
+ public boolean addColdTrapRecipe(int aCircuit, ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs,
+ int[] aChances, FluidStack aFluidOutput, int aTime, int aEU) {
GTPP_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {CI.getNumberedAdvancedCircuit(aCircuit), aInput},
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(aCircuit), aInput },
aOutputs,
null,
aChances,
- new FluidStack[] {aFluidInput},
- new FluidStack[] {aFluidOutput},
+ new FluidStack[] { aFluidInput },
+ new FluidStack[] { aFluidOutput },
aTime,
aEU,
0);
@@ -2304,23 +2155,16 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addReactorProcessingUnitRecipe(
- ItemStack aInput1,
- ItemStack aInput2,
- FluidStack aFluidInput,
- ItemStack[] aOutputs,
- int[] aChances,
- FluidStack aFluidOutput,
- int aTime,
- int aEU) {
+ public boolean addReactorProcessingUnitRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
+ ItemStack[] aOutputs, int[] aChances, FluidStack aFluidOutput, int aTime, int aEU) {
GTPP_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {aInput1, aInput2},
+ new ItemStack[] { aInput1, aInput2 },
aOutputs,
null,
aChances,
- new FluidStack[] {aFluidInput},
- new FluidStack[] {aFluidOutput},
+ new FluidStack[] { aFluidInput },
+ new FluidStack[] { aFluidOutput },
aTime,
aEU,
0);
@@ -2331,18 +2175,18 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addFluidHeaterRecipe(
- ItemStack aInput, FluidStack aFluidInput, FluidStack aOutput, int aDuration, int aEUt) {
+ public boolean addFluidHeaterRecipe(ItemStack aInput, FluidStack aFluidInput, FluidStack aOutput, int aDuration,
+ int aEUt) {
if ((aInput == null && aFluidInput == null) || (aOutput == null)) {
return false;
}
GT_Recipe.GT_Recipe_Map.sFluidHeaterRecipes.addRecipe(
true,
- new ItemStack[] {aInput},
+ new ItemStack[] { aInput },
null,
null,
- new FluidStack[] {aFluidInput},
- new FluidStack[] {aOutput},
+ new FluidStack[] { aFluidInput },
+ new FluidStack[] { aOutput },
aDuration,
aEUt,
0);
@@ -2356,10 +2200,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
GTPP_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {aInput},
- new ItemStack[] {aOutput},
+ new ItemStack[] { aInput },
+ new ItemStack[] { aOutput },
null,
- new int[] {10000},
+ new int[] { 10000 },
new FluidStack[] {},
new FluidStack[] {},
aDuration,
@@ -2378,10 +2222,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
GTPP_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {aInput},
- new ItemStack[] {aOutput},
+ new ItemStack[] { aInput },
+ new ItemStack[] { aOutput },
null,
- new int[] {10000},
+ new int[] { 10000 },
new FluidStack[] {},
new FluidStack[] {},
aDuration,
@@ -2394,8 +2238,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
}
@Override
- public boolean addMolecularTransformerRecipe(
- ItemStack aInput, ItemStack aOutput, int aDuration, int aEUt, int aAmps) {
+ public boolean addMolecularTransformerRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEUt,
+ int aAmps) {
return addMolecularTransformerRecipe(aInput, aOutput, aDuration, aEUt);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
index 271e29d654..aaa3ff2876 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
@@ -1,13 +1,14 @@
package gtPlusPlus.xmod.gregtech.recipes;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.ORES;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class RecipesToRemove {
@@ -20,9 +21,11 @@ public class RecipesToRemove {
// caesium
// Replaced by advanced sifting recipe.
GT_Recipe aRareEarthCentrifuging = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.findRecipe(
- null, false, 20, new FluidStack[] {}, new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1)
- });
+ null,
+ false,
+ 20,
+ new FluidStack[] {},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1) });
if (aRareEarthCentrifuging != null && aRareEarthCentrifuging.mEnabled) {
aRareEarthCentrifuging.mEnabled = false;
aRareEarthCentrifuging.mHidden = true;
@@ -32,19 +35,15 @@ public class RecipesToRemove {
Logger.INFO("Removed vanilla GT Rare Earth processing.");
// Set the Chemical Symbol for Rare Earth now that we are giving it custom outputs
// Best not to set this unless the original recipe is removed.
- /*Materials.RareEarth.mChemicalFormula = "("
- +ELEMENT.getInstance().YTTRIUM.vChemicalSymbol
- +ELEMENT.getInstance().NEODYMIUM.vChemicalSymbol
- +ELEMENT.getInstance().LANTHANUM.vChemicalSymbol
- +ELEMENT.getInstance().CERIUM.vChemicalSymbol
- +ELEMENT.getInstance().CADMIUM.vChemicalSymbol
- +ELEMENT.getInstance().CAESIUM.vChemicalSymbol
- +ELEMENT.getInstance().YTTERBIUM.vChemicalSymbol
- +ELEMENT.getInstance().SAMARIUM.vChemicalSymbol
- +ELEMENT.getInstance().GADOLINIUM.vChemicalSymbol+
- ")";*/
+ /*
+ * Materials.RareEarth.mChemicalFormula = "(" +ELEMENT.getInstance().YTTRIUM.vChemicalSymbol
+ * +ELEMENT.getInstance().NEODYMIUM.vChemicalSymbol +ELEMENT.getInstance().LANTHANUM.vChemicalSymbol
+ * +ELEMENT.getInstance().CERIUM.vChemicalSymbol +ELEMENT.getInstance().CADMIUM.vChemicalSymbol
+ * +ELEMENT.getInstance().CAESIUM.vChemicalSymbol +ELEMENT.getInstance().YTTERBIUM.vChemicalSymbol
+ * +ELEMENT.getInstance().SAMARIUM.vChemicalSymbol +ELEMENT.getInstance().GADOLINIUM.vChemicalSymbol+ ")";
+ */
- Material[] aLowTierOutputMaterials = new Material[] {ORES.GREENOCKITE};
+ Material[] aLowTierOutputMaterials = new Material[] { ORES.GREENOCKITE };
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java
index 43c48232d8..cb0ec59f22 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java
@@ -5,14 +5,9 @@ import net.minecraftforge.fluids.FluidStack;
public class RECIPEHANDLER_AssemblyLine {
- public static boolean addAssemblylineRecipe(
- ItemStack paramItemStack1,
- int paramInt1,
- ItemStack[] paramArrayOfItemStack,
- FluidStack[] paramArrayOfFluidStack,
- ItemStack paramItemStack2,
- int paramInt2,
- int paramInt3) {
+ public static boolean addAssemblylineRecipe(ItemStack paramItemStack1, int paramInt1,
+ ItemStack[] paramArrayOfItemStack, FluidStack[] paramArrayOfFluidStack, ItemStack paramItemStack2,
+ int paramInt2, int paramInt3) {
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
index 627241cd53..599b98ed86 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java
@@ -1,9 +1,10 @@
package gtPlusPlus.xmod.gregtech.recipes.machines;
-import gtPlusPlus.api.objects.Logger;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.api.objects.Logger;
+
public class RECIPEHANDLER_CokeOven {
public static void debug1() {
@@ -14,75 +15,105 @@ public class RECIPEHANDLER_CokeOven {
Logger.WARNING("My name is Ralph and I will be your humble host.");
}
- public static void debug2(
- final ItemStack aInput1,
- final ItemStack aInput2,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final ItemStack aOutput,
- final int aDuration,
- final int aEUt) {
+ public static void debug2(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
Logger.WARNING("==================================================================================");
Logger.WARNING("Taking a step forward.");
Logger.WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null");
- Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
- + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aInput1:" + aInput1.toString()
+ + " aInput2:"
+ + aInput2.toString()
+ + " aFluidInput:"
+ + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aOutput:"
+ + aOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
Logger.WARNING("Passed.");
}
- public static void debug3(
- final ItemStack aInput1,
- final ItemStack aInput2,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final ItemStack aOutput,
- final int aDuration,
- final int aEUt) {
+ public static void debug3(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
Logger.WARNING("==================================================================================");
Logger.WARNING("Taking a step forward.");
Logger.WARNING(
"(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)");
- Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
- + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aInput1:" + aInput1.toString()
+ + " aInput2:"
+ + aInput2.toString()
+ + " aFluidInput:"
+ + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aOutput:"
+ + aOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
Logger.WARNING("Passed.");
}
- public static void debug4(
- final ItemStack aInput1,
- final ItemStack aInput2,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final ItemStack aOutput,
- final int aDuration,
- final int aEUt) {
+ public static void debug4(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
Logger.WARNING("==================================================================================");
Logger.WARNING("Taking a step forward.");
Logger.WARNING(
"(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)");
- Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
- + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aInput1:" + aInput1.toString()
+ + " aInput2:"
+ + aInput2.toString()
+ + " aFluidInput:"
+ + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aOutput:"
+ + aOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
Logger.WARNING("Passed.");
- Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
- + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aInput1:" + aInput1.toString()
+ + " aInput2:"
+ + aInput2.toString()
+ + " aFluidInput:"
+ + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aOutput:"
+ + aOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
}
- public static void debug5(
- final ItemStack aInput1,
- final ItemStack aInput2,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final ItemStack aOutput,
- final int aDuration,
- final int aEUt) {
- Logger.INFO("Successfully added a Coke Oven recipe for: " + aOutput.getDisplayName() + " & "
- + aFluidOutput.getFluid().getName() + ", Using " + aInput1.getDisplayName() + " & "
- + aInput2.getDisplayName() + " & liquid "
- + aFluidInput.getFluid().getName() + ". This takes " + (aDuration / 20) + " seconds for " + aEUt
- + "eu/t.");
+ public static void debug5(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
+ Logger.INFO(
+ "Successfully added a Coke Oven recipe for: " + aOutput.getDisplayName()
+ + " & "
+ + aFluidOutput.getFluid().getName()
+ + ", Using "
+ + aInput1.getDisplayName()
+ + " & "
+ + aInput2.getDisplayName()
+ + " & liquid "
+ + aFluidInput.getFluid().getName()
+ + ". This takes "
+ + (aDuration / 20)
+ + " seconds for "
+ + aEUt
+ + "eu/t.");
Logger.WARNING("==================================================================================");
Logger.WARNING("==================================================================================");
Logger.WARNING("==================================================================================");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
index b9f4c11887..fc9ed99ffe 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java
@@ -1,10 +1,11 @@
package gtPlusPlus.xmod.gregtech.recipes.machines;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
public class RECIPEHANDLER_Dehydrator {
public static void debug1() {
@@ -15,70 +16,90 @@ public class RECIPEHANDLER_Dehydrator {
Logger.WARNING("My name is Willus and I will be your humble host.");
}
- public static void debug2(
- final ItemStack aInput1,
- final ItemStack aInput2,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final ItemStack aOutput,
- final int aDuration,
- final int aEUt) {
+ public static void debug2(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
Logger.WARNING("==================================================================================");
Logger.WARNING("Taking a step forward.");
Logger.WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null");
- Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
- + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aInput1:" + aInput1.toString()
+ + " aInput2:"
+ + aInput2.toString()
+ + " aFluidInput:"
+ + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aOutput:"
+ + aOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
Logger.WARNING("Passed.");
}
- public static void debug3(
- final ItemStack aInput1,
- final ItemStack aInput2,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final ItemStack aOutput,
- final int aDuration,
- final int aEUt) {
+ public static void debug3(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
Logger.WARNING("==================================================================================");
Logger.WARNING("Taking a step forward.");
Logger.WARNING(
"(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)");
- Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
- + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aInput1:" + aInput1.toString()
+ + " aInput2:"
+ + aInput2.toString()
+ + " aFluidInput:"
+ + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aOutput:"
+ + aOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
Logger.WARNING("Passed.");
}
- public static void debug4(
- final ItemStack aInput1,
- final ItemStack aInput2,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final ItemStack aOutput,
- final int aDuration,
- final int aEUt) {
+ public static void debug4(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final ItemStack aOutput, final int aDuration, final int aEUt) {
Logger.WARNING("==================================================================================");
Logger.WARNING("Taking a step forward.");
Logger.WARNING(
"(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)");
- Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
- + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aInput1:" + aInput1.toString()
+ + " aInput2:"
+ + aInput2.toString()
+ + " aFluidInput:"
+ + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aOutput:"
+ + aOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
Logger.WARNING("Passed.");
- Logger.WARNING("aInput1:" + aInput1.toString() + " aInput2:" + aInput2.toString() + " aFluidInput:"
- + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString() + " aOutput:" + aOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aInput1:" + aInput1.toString()
+ + " aInput2:"
+ + aInput2.toString()
+ + " aFluidInput:"
+ + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aOutput:"
+ + aOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
}
- public static void debug5(
- final ItemStack aInput1,
- final ItemStack aInput2,
- final FluidStack aFluidInput,
- final FluidStack aFluidOutput,
- final ItemStack[] aOutput,
- final int aDuration,
- final int aEUt) {
+ public static void debug5(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
+ final FluidStack aFluidOutput, final ItemStack[] aOutput, final int aDuration, final int aEUt) {
String inputAname;
String inputBname;
@@ -109,9 +130,21 @@ public class RECIPEHANDLER_Dehydrator {
outputFluidName = "null";
}
- Logger.INFO("Successfully added a Chemical Dehydrator recipe for: " + ItemUtils.getArrayStackNames(aOutput)
- + " & " + outputFluidName + ", Using " + inputAname + " & " + inputBname + " & liquid " + inputFluidname
- + ". This takes " + (aDuration / 20) + " seconds for " + aEUt + "eu/t.");
+ Logger.INFO(
+ "Successfully added a Chemical Dehydrator recipe for: " + ItemUtils.getArrayStackNames(aOutput)
+ + " & "
+ + outputFluidName
+ + ", Using "
+ + inputAname
+ + " & "
+ + inputBname
+ + " & liquid "
+ + inputFluidname
+ + ". This takes "
+ + (aDuration / 20)
+ + " seconds for "
+ + aEUt
+ + "eu/t.");
Logger.WARNING("==================================================================================");
Logger.WARNING("==================================================================================");
Logger.WARNING("==================================================================================");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
index 6523e0a6f6..ea2f4a95fe 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java
@@ -1,8 +1,9 @@
package gtPlusPlus.xmod.gregtech.recipes.machines;
-import gtPlusPlus.api.objects.Logger;
import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.api.objects.Logger;
+
public class RECIPEHANDLER_MatterFabricator {
public static void debug1() {
@@ -13,42 +14,66 @@ public class RECIPEHANDLER_MatterFabricator {
Logger.WARNING("My name is Ralph and I will be your humble host.");
}
- public static void debug2(
- final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) {
+ public static void debug2(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration,
+ final int aEUt) {
Logger.WARNING("==================================================================================");
Logger.WARNING("Taking a step forward.");
Logger.WARNING("aInput1 == null && aFluidInput == null || aOutput == null && aFluidOutput == null");
- Logger.WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aFluidInput:" + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
Logger.WARNING("Passed.");
}
- public static void debug3(
- final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) {
+ public static void debug3(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration,
+ final int aEUt) {
Logger.WARNING("==================================================================================");
Logger.WARNING("Taking a step forward.");
Logger.WARNING(
"(aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aOutput, aDuration)) <= 0)");
- Logger.WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aFluidInput:" + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
Logger.WARNING("Passed.");
}
- public static void debug4(
- final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) {
+ public static void debug4(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration,
+ final int aEUt) {
Logger.WARNING("==================================================================================");
Logger.WARNING("Taking a step forward.");
Logger.WARNING(
"(aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get(cokeoven, aFluidOutput.getFluid().getName(), aDuration)) <= 0)");
- Logger.WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aFluidInput:" + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
Logger.WARNING("Passed.");
- Logger.WARNING("aFluidInput:" + aFluidInput.toString() + " aFluidOutput:" + aFluidOutput.toString()
- + " aDuration:" + aDuration + " aEU/t:" + aEUt);
+ Logger.WARNING(
+ "aFluidInput:" + aFluidInput.toString()
+ + " aFluidOutput:"
+ + aFluidOutput.toString()
+ + " aDuration:"
+ + aDuration
+ + " aEU/t:"
+ + aEUt);
}
- public static void debug5(
- final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) {
+ public static void debug5(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration,
+ final int aEUt) {
String a = "nothing";
String b = "";
@@ -59,8 +84,16 @@ public class RECIPEHANDLER_MatterFabricator {
b = aFluidOutput.getFluid().getName();
}
- Logger.INFO("Successfully added a Matter Fabrication recipe for: " + b + ", Using " + " liquid " + a
- + ". This takes " + (aDuration / 20) + " seconds for " + aEUt + "eu/t.");
+ Logger.INFO(
+ "Successfully added a Matter Fabrication recipe for: " + b
+ + ", Using "
+ + " liquid "
+ + a
+ + ". This takes "
+ + (aDuration / 20)
+ + " seconds for "
+ + aEUt
+ + "eu/t.");
Logger.WARNING("==================================================================================");
Logger.WARNING("==================================================================================");
Logger.WARNING("==================================================================================");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index 898fe17a52..36035364c0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -36,30 +36,41 @@ public class Gregtech4Content {
private static void computer() {
Logger.INFO("Gregtech 4 Content | Registering Computer Cube.");
- GregtechItemList.Gregtech_Computer_Cube_Machine.set(
- new GT_TileEntity_ComputerCube(31130, "C-O-M-P-U-T-E-R").getStackForm(1L));
+ GregtechItemList.Gregtech_Computer_Cube_Machine
+ .set(new GT_TileEntity_ComputerCube(31130, "C-O-M-P-U-T-E-R").getStackForm(1L));
}
private static void workbenches() {
// Gregtech 4 Workbenches
Logger.INFO("Gregtech 4 Content | Registering Workbenches.");
- GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable(
- 31081, "workbench.basic", "Bronze Workbench", 0, "Stores 16000L of fluid")
- .getStackForm(1L));
- GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(
- 31082, "workbench.advanced", "Advanced Workbench", 3, "Stores 64000L of fluid")
- .getStackForm(1L));
+ GregtechItemList.GT4_Workbench_Bronze.set(
+ new GT_MetaTileEntity_BronzeCraftingTable(
+ 31081,
+ "workbench.basic",
+ "Bronze Workbench",
+ 0,
+ "Stores 16000L of fluid").getStackForm(1L));
+ GregtechItemList.GT4_Workbench_Advanced.set(
+ new GT_MetaTileEntity_AdvancedCraftingTable(
+ 31082,
+ "workbench.advanced",
+ "Advanced Workbench",
+ 3,
+ "Stores 64000L of fluid").getStackForm(1L));
}
private static void redstone() {
Logger.INFO("Gregtech 4 Content | Registering Redstone Blocks.");
GregtechItemList.GT4_Redstone_Lamp.set(new GT_MetaTileEntity_RedstoneLamp(31120).getStackForm(1L));
- GregtechItemList.GT4_Redstone_Button_Panel.set(
- new GT_MetaTileEntity_RedstoneButtonPanel(31121).getStackForm(1L));
+ GregtechItemList.GT4_Redstone_Button_Panel
+ .set(new GT_MetaTileEntity_RedstoneButtonPanel(31121).getStackForm(1L));
GregtechItemList.GT4_Redstone_Scale.set(new GT_MetaTileEntity_RedstoneStrengthScale(31122).getStackForm(1L));
- GregtechItemList.GT4_Redstone_Display.set(new GT_MetaTileEntity_RedstoneStrengthDisplay(
- 31123, "redstone.display.strength", "Redstone Display", "Displays Redstone Strength")
- .getStackForm(1L));
+ GregtechItemList.GT4_Redstone_Display.set(
+ new GT_MetaTileEntity_RedstoneStrengthDisplay(
+ 31123,
+ "redstone.display.strength",
+ "Redstone Display",
+ "Displays Redstone Strength").getStackForm(1L));
GregtechItemList.GT4_Redstone_Circuit.set(new GT_MetaTileEntity_RedstoneCircuitBlock(31124).getStackForm(1L));
}
@@ -157,15 +168,21 @@ public class Gregtech4Content {
GregtechItemList.GT4_Shelf_Iron.set(
new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal Shelf", "A heavy duty shelf")
.getStackForm(1L));
- GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet(
- 872, "gtplusplus.shelf.filecabinet", "File Cabinet", "Could look nice in your office")
- .getStackForm(1L));
+ GregtechItemList.GT4_Shelf_FileCabinet.set(
+ new GT4Entity_Shelf_FileCabinet(
+ 872,
+ "gtplusplus.shelf.filecabinet",
+ "File Cabinet",
+ "Could look nice in your office").getStackForm(1L));
GregtechItemList.GT4_Shelf_Desk.set(
new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "A place to study")
.getStackForm(1L));
- GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment(
- 874, "gtplusplus.shelf.compartment", "Compartment", "Stores Books & Things")
- .getStackForm(1L));
+ GregtechItemList.GT4_Shelf_Compartment.set(
+ new GT4Entity_Shelf_Compartment(
+ 874,
+ "gtplusplus.shelf.compartment",
+ "Compartment",
+ "Stores Books & Things").getStackForm(1L));
// Custom Storage
GregtechItemList.GT4_Shelf_Large.set(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
index de8dd983e9..23d9cb88fa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -13,7 +15,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_HV;
import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_LV;
import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_MV;
-import net.minecraft.item.ItemStack;
public class GregtechAdvancedBoilers {
@@ -26,88 +27,55 @@ public class GregtechAdvancedBoilers {
private static void run1() {
// Boilers
- GregtechItemList.Boiler_Advanced_LV.set(
- new GT_MetaTileEntity_Boiler_LV(753, "Advanced Boiler [LV]", 1).getStackForm(1L));
- GregtechItemList.Boiler_Advanced_MV.set(
- new GT_MetaTileEntity_Boiler_MV(754, "Advanced Boiler [MV]", 2).getStackForm(1L));
- GregtechItemList.Boiler_Advanced_HV.set(
- new GT_MetaTileEntity_Boiler_HV(755, "Advanced Boiler [HV]", 3).getStackForm(1L));
+ GregtechItemList.Boiler_Advanced_LV
+ .set(new GT_MetaTileEntity_Boiler_LV(753, "Advanced Boiler [LV]", 1).getStackForm(1L));
+ GregtechItemList.Boiler_Advanced_MV
+ .set(new GT_MetaTileEntity_Boiler_MV(754, "Advanced Boiler [MV]", 2).getStackForm(1L));
+ GregtechItemList.Boiler_Advanced_HV
+ .set(new GT_MetaTileEntity_Boiler_HV(755, "Advanced Boiler [HV]", 3).getStackForm(1L));
- ItemStack chassisT1 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1);
- ItemStack chassisT2 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 1, 1);
- ItemStack chassisT3 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 2, 1);
+ ItemStack chassisT1 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1);
+ ItemStack chassisT2 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 1, 1);
+ ItemStack chassisT3 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 2, 1);
// Make the Coil in each following recipe a hammer and a Screwdriver.
// Chassis Recipes
GT_ModHandler.addCraftingRecipe(
chassisT1,
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WCW",
- "GMG",
- "WPW",
- Character.valueOf('M'),
- ItemList.Hull_ULV,
- Character.valueOf('P'),
- OrePrefixes.pipeLarge.get(Materials.Bronze),
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Primitive),
- Character.valueOf('W'),
- OrePrefixes.plate.get(Materials.Lead),
- Character.valueOf('G'),
- OrePrefixes.pipeSmall.get(Materials.Copper)
- });
+ new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('P'),
+ OrePrefixes.pipeLarge.get(Materials.Bronze), Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Primitive), Character.valueOf('W'),
+ OrePrefixes.plate.get(Materials.Lead), Character.valueOf('G'),
+ OrePrefixes.pipeSmall.get(Materials.Copper) });
GT_ModHandler.addCraftingRecipe(
chassisT2,
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WCW",
- "GMG",
- "WPW",
- Character.valueOf('M'),
- ItemList.Hull_LV,
- Character.valueOf('P'),
- OrePrefixes.pipeLarge.get(Materials.Steel),
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Basic),
- Character.valueOf('W'),
- OrePrefixes.plate.get(Materials.Steel),
- Character.valueOf('G'),
- OrePrefixes.pipeSmall.get(Materials.Bronze)
- });
+ new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
+ OrePrefixes.pipeLarge.get(Materials.Steel), Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
+ OrePrefixes.plate.get(Materials.Steel), Character.valueOf('G'),
+ OrePrefixes.pipeSmall.get(Materials.Bronze) });
GT_ModHandler.addCraftingRecipe(
chassisT3,
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WCW",
- "GMG",
- "WPW",
- Character.valueOf('M'),
- ItemList.Hull_MV,
- Character.valueOf('P'),
- OrePrefixes.pipeLarge.get(Materials.StainlessSteel),
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Good),
- Character.valueOf('W'),
- OrePrefixes.plate.get(Materials.Aluminium),
- Character.valueOf('G'),
- OrePrefixes.pipeSmall.get(Materials.Steel)
- });
+ new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
+ OrePrefixes.pipeLarge.get(Materials.StainlessSteel), Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
+ OrePrefixes.plate.get(Materials.Aluminium), Character.valueOf('G'),
+ OrePrefixes.pipeSmall.get(Materials.Steel) });
ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier7, 1);
ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier8, 1);
@@ -116,68 +84,30 @@ public class GregtechAdvancedBoilers {
// Boiler Recipes
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Boiler_Advanced_LV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "dCw",
- "WMW",
- "GPG",
- Character.valueOf('M'),
- ItemList.Hull_LV,
- Character.valueOf('P'),
- pipeTier1,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Basic),
- Character.valueOf('W'),
- chassisT1,
- Character.valueOf('G'),
- OrePrefixes.gear.get(Materials.Steel)
- });
+ new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
+ pipeTier1, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic),
+ Character.valueOf('W'), chassisT1, Character.valueOf('G'),
+ OrePrefixes.gear.get(Materials.Steel) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Boiler_Advanced_MV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "dCw",
- "WMW",
- "GPG",
- Character.valueOf('M'),
- ItemList.Hull_MV,
- Character.valueOf('P'),
- pipeTier2,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Good),
- Character.valueOf('W'),
- chassisT2,
- Character.valueOf('G'),
- ALLOY.SILICON_CARBIDE.getGear(1)
- });
+ new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
+ pipeTier2, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good),
+ Character.valueOf('W'), chassisT2, Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Boiler_Advanced_HV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "dCw",
- "WMW",
- "GPG",
- Character.valueOf('M'),
- ItemList.Hull_HV,
- Character.valueOf('P'),
- pipeTier3,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Advanced),
- Character.valueOf('W'),
- chassisT3,
- Character.valueOf('G'),
- ALLOY.SILICON_CARBIDE.getGear(1)
- });
+ new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'),
+ pipeTier3, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced),
+ Character.valueOf('W'), chassisT3, Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1) });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java
index 62bbb93ffd..592db618f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java
@@ -1,15 +1,6 @@
/*
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-
-public class GregtechBedrockPlatforms {
-
- //941-945
-
- public static void run() {
- Logger.INFO("Gregtech5u Content | Registering Bedrock Mining Platform.");
- GregtechItemList.BedrockMiner_MKI.set(new GregtechMetaTileEntity_BedrockMiningPlatform1(941, "multimachine.tier.01.bedrockminer", "Experimental Deep Earth Drilling Platform - MK I").getStackForm(1));
- }
-
-}
-*/
+ * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechBedrockPlatforms { //941-945 public
+ * static void run() { Logger.INFO("Gregtech5u Content | Registering Bedrock Mining Platform.");
+ * GregtechItemList.BedrockMiner_MKI.set(new GregtechMetaTileEntity_BedrockMiningPlatform1(941,
+ * "multimachine.tier.01.bedrockminer", "Experimental Deep Earth Drilling Platform - MK I").getStackForm(1)); } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
index 075784d85d..eb13397bf3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
@@ -19,135 +19,115 @@ public class GregtechBufferDynamos {
}
private static final void run2() {
- GregtechItemList.Hatch_Buffer_Dynamo_ULV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer(
- mID++, "hatch.dynamo.buffer.tier.00", "ULV Dynamo Hatch [Buffered]", 0)
- .getStackForm(1L));
- GregtechItemList.Hatch_Buffer_Dynamo_LV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer(
- mID++, "hatch.dynamo.buffer.tier.01", "LV Dynamo Hatch [Buffered]", 1)
- .getStackForm(1L));
- GregtechItemList.Hatch_Buffer_Dynamo_MV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer(
- mID++, "hatch.dynamo.buffer.tier.02", "MV Dynamo Hatch [Buffered]", 2)
- .getStackForm(1L));
- GregtechItemList.Hatch_Buffer_Dynamo_HV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer(
- mID++, "hatch.dynamo.buffer.tier.03", "HV Dynamo Hatch [Buffered]", 3)
- .getStackForm(1L));
- GregtechItemList.Hatch_Buffer_Dynamo_EV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer(
- mID++, "hatch.dynamo.buffer.tier.04", "EV Dynamo Hatch [Buffered]", 4)
- .getStackForm(1L));
- GregtechItemList.Hatch_Buffer_Dynamo_IV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer(
- mID++, "hatch.dynamo.buffer.tier.05", "IV Dynamo Hatch [Buffered]", 5)
- .getStackForm(1L));
- GregtechItemList.Hatch_Buffer_Dynamo_LuV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer(
- mID++, "hatch.dynamo.buffer.tier.06", "LuV Dynamo Hatch [Buffered]", 6)
- .getStackForm(1L));
- GregtechItemList.Hatch_Buffer_Dynamo_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoBuffer(
- mID++, "hatch.dynamo.buffer.tier.07", "ZPM Dynamo Hatch [Buffered]", 7)
- .getStackForm(1L));
- GregtechItemList.Hatch_Buffer_Dynamo_UV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer(
- mID++, "hatch.dynamo.buffer.tier.08", "UV Dynamo Hatch [Buffered]", 8)
- .getStackForm(1L));
- GregtechItemList.Hatch_Buffer_Dynamo_MAX.set(new GT_MetaTileEntity_Hatch_DynamoBuffer(
- mID++, "hatch.dynamo.buffer.tier.09", "UHV Dynamo Hatch [Buffered]", 9)
- .getStackForm(1L));
+ GregtechItemList.Hatch_Buffer_Dynamo_ULV.set(
+ new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ mID++,
+ "hatch.dynamo.buffer.tier.00",
+ "ULV Dynamo Hatch [Buffered]",
+ 0).getStackForm(1L));
+ GregtechItemList.Hatch_Buffer_Dynamo_LV.set(
+ new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ mID++,
+ "hatch.dynamo.buffer.tier.01",
+ "LV Dynamo Hatch [Buffered]",
+ 1).getStackForm(1L));
+ GregtechItemList.Hatch_Buffer_Dynamo_MV.set(
+ new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ mID++,
+ "hatch.dynamo.buffer.tier.02",
+ "MV Dynamo Hatch [Buffered]",
+ 2).getStackForm(1L));
+ GregtechItemList.Hatch_Buffer_Dynamo_HV.set(
+ new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ mID++,
+ "hatch.dynamo.buffer.tier.03",
+ "HV Dynamo Hatch [Buffered]",
+ 3).getStackForm(1L));
+ GregtechItemList.Hatch_Buffer_Dynamo_EV.set(
+ new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ mID++,
+ "hatch.dynamo.buffer.tier.04",
+ "EV Dynamo Hatch [Buffered]",
+ 4).getStackForm(1L));
+ GregtechItemList.Hatch_Buffer_Dynamo_IV.set(
+ new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ mID++,
+ "hatch.dynamo.buffer.tier.05",
+ "IV Dynamo Hatch [Buffered]",
+ 5).getStackForm(1L));
+ GregtechItemList.Hatch_Buffer_Dynamo_LuV.set(
+ new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ mID++,
+ "hatch.dynamo.buffer.tier.06",
+ "LuV Dynamo Hatch [Buffered]",
+ 6).getStackForm(1L));
+ GregtechItemList.Hatch_Buffer_Dynamo_ZPM.set(
+ new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ mID++,
+ "hatch.dynamo.buffer.tier.07",
+ "ZPM Dynamo Hatch [Buffered]",
+ 7).getStackForm(1L));
+ GregtechItemList.Hatch_Buffer_Dynamo_UV.set(
+ new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ mID++,
+ "hatch.dynamo.buffer.tier.08",
+ "UV Dynamo Hatch [Buffered]",
+ 8).getStackForm(1L));
+ GregtechItemList.Hatch_Buffer_Dynamo_MAX.set(
+ new GT_MetaTileEntity_Hatch_DynamoBuffer(
+ mID++,
+ "hatch.dynamo.buffer.tier.09",
+ "UHV Dynamo Hatch [Buffered]",
+ 9).getStackForm(1L));
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Buffer_Dynamo_ULV.get(1L, new Object[0]), bitsd, new Object[] {
- "TMC",
- 'M',
- ItemList.Hatch_Dynamo_ULV,
- 'T',
- CI.getTieredCircuit(0),
- 'C',
- OrePrefixes.cableGt04.get((Object) Materials.Lead)
- });
+ GregtechItemList.Hatch_Buffer_Dynamo_ULV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ULV, 'T', CI.getTieredCircuit(0), 'C',
+ OrePrefixes.cableGt04.get((Object) Materials.Lead) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Buffer_Dynamo_LV.get(1L, new Object[0]), bitsd, new Object[] {
- "TMC",
- 'M',
- ItemList.Hatch_Dynamo_LV,
- 'T',
- CI.getTieredCircuit(1),
- 'C',
- OrePrefixes.cableGt04.get((Object) Materials.Tin)
- });
+ GregtechItemList.Hatch_Buffer_Dynamo_LV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LV, 'T', CI.getTieredCircuit(1), 'C',
+ OrePrefixes.cableGt04.get((Object) Materials.Tin) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Buffer_Dynamo_MV.get(1L, new Object[0]), bitsd, new Object[] {
- "TMC",
- 'M',
- ItemList.Hatch_Dynamo_MV,
- 'T',
- CI.getTieredCircuit(2),
- 'C',
- OrePrefixes.cableGt04.get((Object) Materials.AnyCopper)
- });
+ GregtechItemList.Hatch_Buffer_Dynamo_MV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_MV, 'T', CI.getTieredCircuit(2), 'C',
+ OrePrefixes.cableGt04.get((Object) Materials.AnyCopper) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Buffer_Dynamo_HV.get(1L, new Object[0]), bitsd, new Object[] {
- "TMC",
- 'M',
- ItemList.Hatch_Dynamo_HV,
- 'T',
- CI.getTieredCircuit(3),
- 'C',
- OrePrefixes.cableGt04.get((Object) Materials.Gold)
- });
+ GregtechItemList.Hatch_Buffer_Dynamo_HV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_HV, 'T', CI.getTieredCircuit(3), 'C',
+ OrePrefixes.cableGt04.get((Object) Materials.Gold) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Buffer_Dynamo_EV.get(1L, new Object[0]), bitsd, new Object[] {
- "TMC",
- 'M',
- ItemList.Hatch_Dynamo_EV,
- 'T',
- CI.getTieredCircuit(4),
- 'C',
- OrePrefixes.cableGt04.get((Object) Materials.Aluminium)
- });
+ GregtechItemList.Hatch_Buffer_Dynamo_EV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_EV, 'T', CI.getTieredCircuit(4), 'C',
+ OrePrefixes.cableGt04.get((Object) Materials.Aluminium) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Buffer_Dynamo_IV.get(1L, new Object[0]), bitsd, new Object[] {
- "TMC",
- 'M',
- ItemList.Hatch_Dynamo_IV,
- 'T',
- CI.getTieredCircuit(5),
- 'C',
- OrePrefixes.cableGt04.get((Object) Materials.Tungsten)
- });
+ GregtechItemList.Hatch_Buffer_Dynamo_IV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_IV, 'T', CI.getTieredCircuit(5), 'C',
+ OrePrefixes.cableGt04.get((Object) Materials.Tungsten) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Buffer_Dynamo_LuV.get(1L, new Object[0]), bitsd, new Object[] {
- "TMC",
- 'M',
- ItemList.Hatch_Dynamo_LuV,
- 'T',
- CI.getTieredCircuit(6),
- 'C',
- OrePrefixes.cableGt04.get((Object) Materials.VanadiumGallium)
- });
+ GregtechItemList.Hatch_Buffer_Dynamo_LuV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LuV, 'T', CI.getTieredCircuit(6), 'C',
+ OrePrefixes.cableGt04.get((Object) Materials.VanadiumGallium) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Buffer_Dynamo_ZPM.get(1L, new Object[0]), bitsd, new Object[] {
- "TMC",
- 'M',
- ItemList.Hatch_Dynamo_ZPM,
- 'T',
- CI.getTieredCircuit(7),
- 'C',
- OrePrefixes.cableGt04.get((Object) Materials.Naquadah)
- });
+ GregtechItemList.Hatch_Buffer_Dynamo_ZPM.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ZPM, 'T', CI.getTieredCircuit(7), 'C',
+ OrePrefixes.cableGt04.get((Object) Materials.Naquadah) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Buffer_Dynamo_UV.get(1L, new Object[0]), bitsd, new Object[] {
- "TMC",
- 'M',
- ItemList.Hatch_Dynamo_UV,
- 'T',
- CI.getTieredCircuit(8),
- 'C',
- OrePrefixes.wireGt12.get((Object) Materials.NaquadahAlloy)
- });
+ GregtechItemList.Hatch_Buffer_Dynamo_UV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_UV, 'T', CI.getTieredCircuit(8), 'C',
+ OrePrefixes.wireGt12.get((Object) Materials.NaquadahAlloy) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Hatch_Buffer_Dynamo_MAX.get(1L, new Object[0]), bitsd, new Object[] {
- "TMC",
- 'M',
- ItemList.Hatch_Dynamo_MAX,
- 'T',
- CI.getTieredCircuit(9),
- 'C',
- OrePrefixes.wireGt04.get((Object) Materials.Superconductor)
- });
+ GregtechItemList.Hatch_Buffer_Dynamo_MAX.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_MAX, 'T', CI.getTieredCircuit(9), 'C',
+ OrePrefixes.wireGt04.get((Object) Materials.Superconductor) });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
index 55a86a80d4..d2d42504db 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java
@@ -2,6 +2,12 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_ComponentAssemblers;
+import java.util.ArrayList;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import gregtech.api.enums.*;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
import gregtech.api.util.GTPP_Recipe;
@@ -10,10 +16,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import java.util.ArrayList;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
public class GregtechComponentAssembler {
@@ -29,7 +31,8 @@ public class GregtechComponentAssembler {
return;
}
- GregtechItemList.Machine_LV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ GregtechItemList.Machine_LV_Component_Maker.set(
+ new GT_MetaTileEntity_BasicMachine_GT_Recipe(
985,
"basicmachine.componentmaker.tier.01",
"Basic Component Maker",
@@ -47,23 +50,13 @@ public class GregtechComponentAssembler {
false,
0,
"ASSEMBLER",
- new Object[] {
- "ACA",
- "VMV",
- "WCW",
- 'M',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
- 'V',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM,
- 'A',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
- 'C',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT,
- 'W',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4
- })
- .getStackForm(1L));
- GregtechItemList.Machine_MV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L));
+ GregtechItemList.Machine_MV_Component_Maker.set(
+ new GT_MetaTileEntity_BasicMachine_GT_Recipe(
986,
"basicmachine.componentmaker.tier.02",
"Advanced Component Maker",
@@ -81,23 +74,13 @@ public class GregtechComponentAssembler {
false,
0,
"ASSEMBLER",
- new Object[] {
- "ACA",
- "VMV",
- "WCW",
- 'M',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
- 'V',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM,
- 'A',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
- 'C',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT,
- 'W',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4
- })
- .getStackForm(1L));
- GregtechItemList.Machine_HV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L));
+ GregtechItemList.Machine_HV_Component_Maker.set(
+ new GT_MetaTileEntity_BasicMachine_GT_Recipe(
987,
"basicmachine.componentmaker.tier.03",
"Advanced Component Maker II",
@@ -115,23 +98,13 @@ public class GregtechComponentAssembler {
false,
0,
"ASSEMBLER",
- new Object[] {
- "ACA",
- "VMV",
- "WCW",
- 'M',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
- 'V',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM,
- 'A',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
- 'C',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT,
- 'W',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4
- })
- .getStackForm(1L));
- GregtechItemList.Machine_EV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L));
+ GregtechItemList.Machine_EV_Component_Maker.set(
+ new GT_MetaTileEntity_BasicMachine_GT_Recipe(
988,
"basicmachine.componentmaker.tier.04",
"Advanced Component Maker III",
@@ -149,23 +122,13 @@ public class GregtechComponentAssembler {
false,
0,
"ASSEMBLER",
- new Object[] {
- "ACA",
- "VMV",
- "WCW",
- 'M',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
- 'V',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM,
- 'A',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
- 'C',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT,
- 'W',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4
- })
- .getStackForm(1L));
- GregtechItemList.Machine_IV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L));
+ GregtechItemList.Machine_IV_Component_Maker.set(
+ new GT_MetaTileEntity_BasicMachine_GT_Recipe(
989,
"basicmachine.componentmaker.tier.05",
"Advanced Component Maker IV",
@@ -183,23 +146,13 @@ public class GregtechComponentAssembler {
false,
0,
"ASSEMBLER",
- new Object[] {
- "ACA",
- "VMV",
- "WCW",
- 'M',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
- 'V',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM,
- 'A',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
- 'C',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT,
- 'W',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4
- })
- .getStackForm(1L));
- GregtechItemList.Machine_LuV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L));
+ GregtechItemList.Machine_LuV_Component_Maker.set(
+ new GT_MetaTileEntity_BasicMachine_GT_Recipe(
31012,
"basicmachine.componentmaker.tier.06",
"Advanced Component Maker V",
@@ -217,23 +170,13 @@ public class GregtechComponentAssembler {
false,
0,
"ASSEMBLER",
- new Object[] {
- "ACA",
- "VMV",
- "WCW",
- 'M',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
- 'V',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM,
- 'A',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
- 'C',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT,
- 'W',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4
- })
- .getStackForm(1L));
- GregtechItemList.Machine_ZPM_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L));
+ GregtechItemList.Machine_ZPM_Component_Maker.set(
+ new GT_MetaTileEntity_BasicMachine_GT_Recipe(
31013,
"basicmachine.componentmaker.tier.07",
"Advanced Component Maker VI",
@@ -251,23 +194,13 @@ public class GregtechComponentAssembler {
false,
0,
"ASSEMBLER",
- new Object[] {
- "ACA",
- "VMV",
- "WCW",
- 'M',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
- 'V',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM,
- 'A',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
- 'C',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT,
- 'W',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4
- })
- .getStackForm(1L));
- GregtechItemList.Machine_UV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(
+ new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L));
+ GregtechItemList.Machine_UV_Component_Maker.set(
+ new GT_MetaTileEntity_BasicMachine_GT_Recipe(
31014,
"basicmachine.componentmaker.tier.08",
"Advanced Component Maker VII",
@@ -285,22 +218,11 @@ public class GregtechComponentAssembler {
false,
0,
"ASSEMBLER",
- new Object[] {
- "ACA",
- "VMV",
- "WCW",
- 'M',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
- 'V',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM,
- 'A',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON,
- 'C',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT,
- 'W',
- GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4
- })
- .getStackForm(1L));
+ new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W',
+ GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L));
// Motors
// addRecipeMotor(0, Materials.Lead, 1, Materials.RedAlloy, 1,
@@ -310,7 +232,13 @@ public class GregtechComponentAssembler {
addRecipeMotor(3, Materials.Copper, 4, Materials.Gold, 1, Materials.StainlessSteel, Materials.SteelMagnetic);
addRecipeMotor(4, Materials.Copper, 8, Materials.Aluminium, 1, Materials.Titanium, Materials.NeodymiumMagnetic);
addRecipeMotor(
- 5, Materials.Copper, 16, Materials.Tungsten, 1, Materials.TungstenSteel, Materials.NeodymiumMagnetic);
+ 5,
+ Materials.Copper,
+ 16,
+ Materials.Tungsten,
+ 1,
+ Materials.TungstenSteel,
+ Materials.NeodymiumMagnetic);
// Pistons
// addRecipePiston(0, Materials.Lead, Materials.Lead);
@@ -370,14 +298,8 @@ public class GregtechComponentAssembler {
addRecipeSensor(5, Materials.TungstenSteel, Materials.Osmium, Materials.EnderEye);
}
- private static boolean addRecipeMotor(
- int tier,
- Materials wire,
- int wirethickness,
- Materials cable,
- int cablethickness,
- Materials stick,
- Materials magstick) {
+ private static boolean addRecipeMotor(int tier, Materials wire, int wirethickness, Materials cable,
+ int cablethickness, Materials stick, Materials magstick) {
try {
String mWT = "" + wirethickness;
String mCT = "" + cablethickness;
@@ -397,7 +319,7 @@ public class GregtechComponentAssembler {
ItemStack rodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, stick, 2);
ItemStack magrodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, magstick, 1);
- ItemStack Input[] = {wireStack, cableStack, rodStack, magrodStack};
+ ItemStack Input[] = { wireStack, cableStack, rodStack, magrodStack };
return CORE.RA.addComponentMakerRecipe(
Input,
@@ -420,7 +342,7 @@ public class GregtechComponentAssembler {
ItemStack gearStack = ItemUtils.getGregtechOreStack(OrePrefixes.gearGtSmall, mat, 1);
ItemStack motorStack = CI.getElectricMotor(tier, 1);
- ItemStack Input[] = {plateStack, cableStack, rodStack, gearStack, motorStack};
+ ItemStack Input[] = { plateStack, cableStack, rodStack, gearStack, motorStack };
return CORE.RA.addComponentMakerRecipe(
Input,
@@ -446,7 +368,7 @@ public class GregtechComponentAssembler {
for (ItemStack mRubberType : oreDictList) {
final ItemStack returnValue = mRubberType.copy();
returnValue.stackSize = 6;
- ItemStack Input[] = {cableStack, motorStack, returnValue};
+ ItemStack Input[] = { cableStack, motorStack, returnValue };
mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(
Input,
GT_Values.NF,
@@ -466,11 +388,14 @@ public class GregtechComponentAssembler {
return false;
}
} else {
- ItemStack Input[] = {
- cableStack, motorStack, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateRubber", 6)
- };
+ ItemStack Input[] = { cableStack, motorStack,
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateRubber", 6) };
return CORE.RA.addComponentMakerRecipe(
- Input, GT_Values.NF, CI.getConveyor(tier, 1), (tier * 40), ((int) GT_Values.V[tier] / 16) * 15);
+ Input,
+ GT_Values.NF,
+ CI.getConveyor(tier, 1),
+ (tier * 40),
+ ((int) GT_Values.V[tier] / 16) * 15);
}
} catch (Throwable t) {
@@ -493,7 +418,7 @@ public class GregtechComponentAssembler {
for (ItemStack mRubberType : oreDictList) {
final ItemStack returnValue = mRubberType.copy();
returnValue.stackSize = 2;
- ItemStack Input[] = {cableStack, screwStack, rotorStack, pipeStack, motorStack, returnValue};
+ ItemStack Input[] = { cableStack, screwStack, rotorStack, pipeStack, motorStack, returnValue };
mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(
Input,
GT_Values.NF,
@@ -513,14 +438,8 @@ public class GregtechComponentAssembler {
return false;
}
} else {
- ItemStack Input[] = {
- cableStack,
- screwStack,
- rotorStack,
- pipeStack,
- motorStack,
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ringRubber", 2)
- };
+ ItemStack Input[] = { cableStack, screwStack, rotorStack, pipeStack, motorStack,
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ringRubber", 2) };
return CORE.RA.addComponentMakerRecipe(
Input,
GT_Values.NF,
@@ -549,7 +468,7 @@ public class GregtechComponentAssembler {
for (ItemStack mCircuitType : oreDictList) {
final ItemStack returnValue = mCircuitType.copy();
returnValue.stackSize = 1;
- ItemStack Input[] = {returnValue, cableStack, rodStack, pistonStack, motorStack};
+ ItemStack Input[] = { returnValue, cableStack, rodStack, pistonStack, motorStack };
mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(
Input,
GT_Values.NF,
@@ -569,14 +488,14 @@ public class GregtechComponentAssembler {
}
} else {
ItemStack Input[] = {
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1),
- cableStack,
- rodStack,
- pistonStack,
- motorStack
- };
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1), cableStack,
+ rodStack, pistonStack, motorStack };
return CORE.RA.addComponentMakerRecipe(
- Input, GT_Values.NF, CI.getRobotArm(tier, 1), (tier * 40), ((int) GT_Values.V[tier] / 16) * 15);
+ Input,
+ GT_Values.NF,
+ CI.getRobotArm(tier, 1),
+ (tier * 40),
+ ((int) GT_Values.V[tier] / 16) * 15);
}
} catch (Throwable t) {
@@ -595,10 +514,10 @@ public class GregtechComponentAssembler {
else if (tier == 5) mWT = "16";
else mWT = "01";
- ItemStack eyeQuantum =
- ItemUtils.getValueOfItemList("QuantumEye", 1, ItemUtils.getSimpleStack(Items.ender_eye, 4));
- ItemStack starQuantum =
- ItemUtils.getValueOfItemList("QuantumStar", 1, ItemUtils.getSimpleStack(Items.nether_star, 4));
+ ItemStack eyeQuantum = ItemUtils
+ .getValueOfItemList("QuantumEye", 1, ItemUtils.getSimpleStack(Items.ender_eye, 4));
+ ItemStack starQuantum = ItemUtils
+ .getValueOfItemList("QuantumStar", 1, ItemUtils.getSimpleStack(Items.nether_star, 4));
if (tier == 1) gem = ItemUtils.getSimpleStack(Items.ender_pearl);
else if (tier == 2) gem = ItemUtils.getSimpleStack(Items.ender_eye);
@@ -618,7 +537,7 @@ public class GregtechComponentAssembler {
for (ItemStack mCircuitType : oreDictList) {
final ItemStack returnValue = mCircuitType.copy();
returnValue.stackSize = 4;
- ItemStack Input[] = {returnValue, wireStack, gem};
+ ItemStack Input[] = { returnValue, wireStack, gem };
mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(
Input,
GT_Values.NF,
@@ -638,8 +557,8 @@ public class GregtechComponentAssembler {
}
} else {
ItemStack Input[] = {
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 4), wireStack, gem
- };
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 4), wireStack,
+ gem };
return CORE.RA.addComponentMakerRecipe(
Input,
GT_Values.NF,
@@ -667,7 +586,7 @@ public class GregtechComponentAssembler {
for (ItemStack mCircuitType : oreDictList) {
final ItemStack returnValue = mCircuitType.copy();
returnValue.stackSize = 2;
- ItemStack Input[] = {returnValue, cableStack, gemstack, magrodStack};
+ ItemStack Input[] = { returnValue, cableStack, gemstack, magrodStack };
mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(
Input,
GT_Values.NF,
@@ -687,13 +606,14 @@ public class GregtechComponentAssembler {
}
} else {
ItemStack Input[] = {
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 2),
- cableStack,
- gemstack,
- magrodStack
- };
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 2), cableStack,
+ gemstack, magrodStack };
return CORE.RA.addComponentMakerRecipe(
- Input, GT_Values.NF, CI.getEmitter(tier, 1), (tier * 40), ((int) GT_Values.V[tier] / 16) * 15);
+ Input,
+ GT_Values.NF,
+ CI.getEmitter(tier, 1),
+ (tier * 40),
+ ((int) GT_Values.V[tier] / 16) * 15);
}
} catch (Throwable t) {
@@ -715,7 +635,7 @@ public class GregtechComponentAssembler {
for (ItemStack mCircuitType : oreDictList) {
final ItemStack returnValue = mCircuitType.copy();
returnValue.stackSize = 1;
- ItemStack Input[] = {gemStack, cableStack, returnValue, magrodStack};
+ ItemStack Input[] = { gemStack, cableStack, returnValue, magrodStack };
mAdd[mcount++] = CORE.RA.addComponentMakerRecipe(
Input,
GT_Values.NF,
@@ -734,14 +654,14 @@ public class GregtechComponentAssembler {
return false;
}
} else {
- ItemStack Input[] = {
- gemStack,
- cableStack,
- magrodStack,
- ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1)
- };
+ ItemStack Input[] = { gemStack, cableStack, magrodStack,
+ ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1) };
return CORE.RA.addComponentMakerRecipe(
- Input, GT_Values.NF, CI.getSensor(tier, 1), (tier * 40), ((int) GT_Values.V[tier] / 16) * 15);
+ Input,
+ GT_Values.NF,
+ CI.getSensor(tier, 1),
+ (tier * 40),
+ ((int) GT_Values.V[tier] / 16) * 15);
}
} catch (Throwable t) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index c48885df21..aadf6f4a12 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -3,6 +3,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
import static gtPlusPlus.core.lib.CORE.GTNH;
import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -25,17 +32,15 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntityFluid;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
public class GregtechConduits {
+
/**
*
- * The Voltage Tiers. Use this Array instead of the old named Voltage Variables
- * public static final long[] V = new long[] {0=8, 1=32, 2=128, 3=512, 4=2048, 5=8192, 6=32768, 7=131072, 8=524288, 9=Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE};
+ * The Voltage Tiers. Use this Array instead of the old named Voltage Variables public static final long[] V = new
+ * long[] {0=8, 1=32, 2=128, 3=512, 4=2048, 5=8192, 6=32768, 7=131072, 8=524288, 9=Integer.MAX_VALUE,
+ * Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE,
+ * Integer.MAX_VALUE};
*
*/
public static OrePrefixes cableGt16;
@@ -43,8 +48,7 @@ public class GregtechConduits {
static {
if (GTNH) {
try {
- cableGt16 = (OrePrefixes)
- GT_Utility.getField(OrePrefixes.class, "cableGt16").get(null);
+ cableGt16 = (OrePrefixes) GT_Utility.getField(OrePrefixes.class, "cableGt16").get(null);
} catch (IllegalAccessException | NullPointerException e) {
e.printStackTrace();
}
@@ -174,24 +178,17 @@ public class GregtechConduits {
}
// Generate Heat Pipes
- // GregtechItemList.HeatPipe_Tier_1.set(new GT_MetaPipeEntity_Heat(31021, "gtpp.pipe.heat.basic.01", "Lead Heat
+ // GregtechItemList.HeatPipe_Tier_1.set(new GT_MetaPipeEntity_Heat(31021, "gtpp.pipe.heat.basic.01", "Lead Heat
// Pipe (500C)", Materials.Lead, 500).getStackForm(1L));
- // GregtechItemList.HeatPipe_Tier_2.set(new GT_MetaPipeEntity_Heat(31022, "gtpp.pipe.heat.basic.02", "Iron Heat
+ // GregtechItemList.HeatPipe_Tier_2.set(new GT_MetaPipeEntity_Heat(31022, "gtpp.pipe.heat.basic.02", "Iron Heat
// Pipe (500C)", Materials.Iron, 500).getStackForm(1L));
- // GregtechItemList.HeatPipe_Tier_3.set(new GT_MetaPipeEntity_Heat(31023, "gtpp.pipe.heat.basic.03", "Silver
+ // GregtechItemList.HeatPipe_Tier_3.set(new GT_MetaPipeEntity_Heat(31023, "gtpp.pipe.heat.basic.03", "Silver
// Heat Pipe (1500C)", Materials.Silver, 1500).getStackForm(1L));
}
- private static void generateFluidMultiPipes(
- Constructor<GT_MetaPipeEntity_Fluid> aClazz,
- Materials aMaterial,
- String name,
- String displayName,
- int startID,
- int transferRatePerSec,
- int heatCapacity,
- boolean gasProof) {
+ private static void generateFluidMultiPipes(Constructor<GT_MetaPipeEntity_Fluid> aClazz, Materials aMaterial,
+ String name, String displayName, int startID, int transferRatePerSec, int heatCapacity, boolean gasProof) {
GT_MetaPipeEntity_Fluid aPipe;
final int transferRatePerTick = transferRatePerSec / 20;
try {
@@ -211,9 +208,7 @@ public class GregtechConduits {
Logger.INFO("Generated " + aMaterial + " Hexadecuple pipes.");
GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L));
}
- } catch (InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
Logger.INFO("Failed to Generate " + aMaterial + " Hexadecuple pipes. [Ecx]");
e.printStackTrace();
@@ -223,13 +218,13 @@ public class GregtechConduits {
private static void run1() {
if (LoadedMods.Big_Reactors) {
- wireFactory("Blutonium", 8196, BaseWireID, 8, 32, 2, new short[] {28, 28, 218, 0});
- wireFactory("Cyanite", 512, BaseWireID + 15, 2, 16, 4, new short[] {27, 130, 178, 0});
- wireFactory("Yellorium", 2048, BaseWireID + 30, 4, 16, 2, new short[] {150, 195, 54, 0});
+ wireFactory("Blutonium", 8196, BaseWireID, 8, 32, 2, new short[] { 28, 28, 218, 0 });
+ wireFactory("Cyanite", 512, BaseWireID + 15, 2, 16, 4, new short[] { 27, 130, 178, 0 });
+ wireFactory("Yellorium", 2048, BaseWireID + 30, 4, 16, 2, new short[] { 150, 195, 54, 0 });
}
if (LoadedMods.EnderIO) {
- wireFactory("RedstoneAlloy", 32, BaseWireID + 45, 0, 2, 1, new short[] {178, 34, 34, 0});
+ wireFactory("RedstoneAlloy", 32, BaseWireID + 45, 0, 2, 1, new short[] { 178, 34, 34, 0 });
}
if (!GTNH) {
@@ -271,17 +266,16 @@ public class GregtechConduits {
generateGTFluidPipes(Materials.Lead, BasePipeID + 70, 350, 1200, true);
generateNonGTFluidPipes(
- GT_Materials.TriniumNaquadahCarbonite, ALLOY.TRINIUM_NAQUADAH_CARBON, 30500, 20, 250000, true);
+ GT_Materials.TriniumNaquadahCarbonite,
+ ALLOY.TRINIUM_NAQUADAH_CARBON,
+ 30500,
+ 20,
+ 250000,
+ true);
}
- private static void wireFactory(
- final String Material,
- final int Voltage,
- final int ID,
- final long insulatedLoss,
- final long uninsulatedLoss,
- final long Amps,
- final short[] rgb) {
+ private static void wireFactory(final String Material, final int Voltage, final int ID, final long insulatedLoss,
+ final long uninsulatedLoss, final long Amps, final short[] rgb) {
@SuppressWarnings("deprecation")
final Materials T = Materials.valueOf(Material);
int V = GT_Utility.getTier(Voltage);
@@ -294,222 +288,198 @@ public class GregtechConduits {
}
@SuppressWarnings("deprecation")
- private static void makeWires(
- final Materials aMaterial,
- final int aStartID,
- final long aLossInsulated,
- final long aLoss,
- final long aAmperage,
- final long aVoltage,
- final boolean aInsulatable,
- final boolean aAutoInsulated,
- final short[] aRGB) {
+ private static void makeWires(final Materials aMaterial, final int aStartID, final long aLossInsulated,
+ final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable,
+ final boolean aAutoInsulated, final short[] aRGB) {
Logger.WARNING("Gregtech5u Content | Registered " + aMaterial.name() + " as a new material for Wire & Cable.");
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt01,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 0,
- "wire." + aMaterial.name().toLowerCase() + ".01",
- "1x " + aMaterial.mDefaultLocalName + " Wire",
- 0.125F,
- aMaterial,
- aLoss,
- 1L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aRGB)
- .getStackForm(1L));
+ aStartID + 0,
+ "wire." + aMaterial.name().toLowerCase() + ".01",
+ "1x " + aMaterial.mDefaultLocalName + " Wire",
+ 0.125F,
+ aMaterial,
+ aLoss,
+ 1L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aRGB).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt02,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 1,
- "wire." + aMaterial.name().toLowerCase() + ".02",
- "2x " + aMaterial.mDefaultLocalName + " Wire",
- 0.25F,
- aMaterial,
- aLoss,
- 2L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aRGB)
- .getStackForm(1L));
+ aStartID + 1,
+ "wire." + aMaterial.name().toLowerCase() + ".02",
+ "2x " + aMaterial.mDefaultLocalName + " Wire",
+ 0.25F,
+ aMaterial,
+ aLoss,
+ 2L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aRGB).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt04,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 2,
- "wire." + aMaterial.name().toLowerCase() + ".04",
- "4x " + aMaterial.mDefaultLocalName + " Wire",
- 0.375F,
- aMaterial,
- aLoss,
- 4L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aRGB)
- .getStackForm(1L));
+ aStartID + 2,
+ "wire." + aMaterial.name().toLowerCase() + ".04",
+ "4x " + aMaterial.mDefaultLocalName + " Wire",
+ 0.375F,
+ aMaterial,
+ aLoss,
+ 4L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aRGB).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt08,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 3,
- "wire." + aMaterial.name().toLowerCase() + ".08",
- "8x " + aMaterial.mDefaultLocalName + " Wire",
- 0.50F,
- aMaterial,
- aLoss,
- 8L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aRGB)
- .getStackForm(1L));
+ aStartID + 3,
+ "wire." + aMaterial.name().toLowerCase() + ".08",
+ "8x " + aMaterial.mDefaultLocalName + " Wire",
+ 0.50F,
+ aMaterial,
+ aLoss,
+ 8L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aRGB).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt12,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 4,
- "wire." + aMaterial.name().toLowerCase() + ".12",
- "12x " + aMaterial.mDefaultLocalName + " Wire",
- GTNH ? 0.625F : 0.75F,
- aMaterial,
- aLoss,
- 12L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aRGB)
- .getStackForm(1L));
+ aStartID + 4,
+ "wire." + aMaterial.name().toLowerCase() + ".12",
+ "12x " + aMaterial.mDefaultLocalName + " Wire",
+ GTNH ? 0.625F : 0.75F,
+ aMaterial,
+ aLoss,
+ 12L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aRGB).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.wireGt16,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 5,
- "wire." + aMaterial.name().toLowerCase() + ".16",
- "16x " + aMaterial.mDefaultLocalName + " Wire",
- GTNH ? 0.75F : 1.0F,
- aMaterial,
- aLoss,
- 16L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aRGB)
- .getStackForm(1L));
+ aStartID + 5,
+ "wire." + aMaterial.name().toLowerCase() + ".16",
+ "16x " + aMaterial.mDefaultLocalName + " Wire",
+ GTNH ? 0.75F : 1.0F,
+ aMaterial,
+ aLoss,
+ 16L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aRGB).getStackForm(1L));
if (aInsulatable) {
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt01,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 6,
- "cable." + aMaterial.name().toLowerCase() + ".01",
- "1x " + aMaterial.mDefaultLocalName + " Cable",
- 0.25F,
- aMaterial,
- aLossInsulated,
- 1L * aAmperage,
- aVoltage,
- true,
- false,
- aRGB)
- .getStackForm(1L));
+ aStartID + 6,
+ "cable." + aMaterial.name().toLowerCase() + ".01",
+ "1x " + aMaterial.mDefaultLocalName + " Cable",
+ 0.25F,
+ aMaterial,
+ aLossInsulated,
+ 1L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aRGB).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt02,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 7,
- "cable." + aMaterial.name().toLowerCase() + ".02",
- "2x " + aMaterial.mDefaultLocalName + " Cable",
- 0.375F,
- aMaterial,
- aLossInsulated,
- 2L * aAmperage,
- aVoltage,
- true,
- false,
- aRGB)
- .getStackForm(1L));
+ aStartID + 7,
+ "cable." + aMaterial.name().toLowerCase() + ".02",
+ "2x " + aMaterial.mDefaultLocalName + " Cable",
+ 0.375F,
+ aMaterial,
+ aLossInsulated,
+ 2L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aRGB).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt04,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 8,
- "cable." + aMaterial.name().toLowerCase() + ".04",
- "4x " + aMaterial.mDefaultLocalName + " Cable",
- 0.5F,
- aMaterial,
- aLossInsulated,
- 4L * aAmperage,
- aVoltage,
- true,
- false,
- aRGB)
- .getStackForm(1L));
+ aStartID + 8,
+ "cable." + aMaterial.name().toLowerCase() + ".04",
+ "4x " + aMaterial.mDefaultLocalName + " Cable",
+ 0.5F,
+ aMaterial,
+ aLossInsulated,
+ 4L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aRGB).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt08,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 9,
- "cable." + aMaterial.name().toLowerCase() + ".08",
- "8x " + aMaterial.mDefaultLocalName + " Cable",
- 0.625F,
- aMaterial,
- aLossInsulated,
- 8L * aAmperage,
- aVoltage,
- true,
- false,
- aRGB)
- .getStackForm(1L));
+ aStartID + 9,
+ "cable." + aMaterial.name().toLowerCase() + ".08",
+ "8x " + aMaterial.mDefaultLocalName + " Cable",
+ 0.625F,
+ aMaterial,
+ aLossInsulated,
+ 8L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aRGB).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.cableGt12,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 10,
- "cable." + aMaterial.name().toLowerCase() + ".12",
- "12x " + aMaterial.mDefaultLocalName + " Cable",
- GTNH ? 0.75F : 0.875F,
- aMaterial,
- aLossInsulated,
- 12L * aAmperage,
- aVoltage,
- true,
- false,
- aRGB)
- .getStackForm(1L));
+ aStartID + 10,
+ "cable." + aMaterial.name().toLowerCase() + ".12",
+ "12x " + aMaterial.mDefaultLocalName + " Cable",
+ GTNH ? 0.75F : 0.875F,
+ aMaterial,
+ aLossInsulated,
+ 12L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aRGB).getStackForm(1L));
if (GTNH) {
GT_OreDictUnificator.registerOre(
cableGt16,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 11,
- "cable." + aMaterial.name().toLowerCase() + ".16",
- "16x " + aMaterial.mDefaultLocalName + " Cable",
- 0.875f,
- aMaterial,
- aLossInsulated,
- 16L * aAmperage,
- aVoltage,
- true,
- false,
- aRGB)
- .getStackForm(1L));
+ aStartID + 11,
+ "cable." + aMaterial.name().toLowerCase() + ".16",
+ "16x " + aMaterial.mDefaultLocalName + " Cable",
+ 0.875f,
+ aMaterial,
+ aLossInsulated,
+ 16L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aRGB).getStackForm(1L));
}
}
}
- private static void customWireFactory(
- final Material Material,
- final int Voltage,
- final int ID,
- final long insulatedLoss,
- final long uninsulatedLoss,
- final long Amps) {
+ private static void customWireFactory(final Material Material, final int Voltage, final int ID,
+ final long insulatedLoss, final long uninsulatedLoss, final long Amps) {
int V = GT_Utility.getTier(Voltage);
if (V == -1) {
Logger.ERROR("Failed to set voltage on " + Material + ". Invalid voltage of " + Voltage + "V set.");
@@ -519,210 +489,188 @@ public class GregtechConduits {
makeCustomWires(Material, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false);
}
- private static void makeCustomWires(
- final Material aMaterial,
- final int aStartID,
- final long aLossInsulated,
- final long aLoss,
- final long aAmperage,
- final long aVoltage,
- final boolean aInsulatable,
+ private static void makeCustomWires(final Material aMaterial, final int aStartID, final long aLossInsulated,
+ final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable,
final boolean aAutoInsulated) {
- Logger.WARNING("Gregtech5u Content | Registered " + aMaterial.getLocalizedName()
- + " as a new material for Wire & Cable.");
+ Logger.WARNING(
+ "Gregtech5u Content | Registered " + aMaterial.getLocalizedName()
+ + " as a new material for Wire & Cable.");
registerOre(
OrePrefixes.wireGt01,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 0,
- "wire." + aMaterial.getLocalizedName().toLowerCase() + ".01",
- "1x " + aMaterial.getLocalizedName() + " Wire",
- 0.125F,
- aLoss,
- 1L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 0,
+ "wire." + aMaterial.getLocalizedName().toLowerCase() + ".01",
+ "1x " + aMaterial.getLocalizedName() + " Wire",
+ 0.125F,
+ aLoss,
+ 1L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aMaterial.getRGBA()).getStackForm(1L));
registerOre(
OrePrefixes.wireGt02,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 1,
- "wire." + aMaterial.getLocalizedName().toLowerCase() + ".02",
- "2x " + aMaterial.getLocalizedName() + " Wire",
- 0.25F,
- aLoss,
- 2L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 1,
+ "wire." + aMaterial.getLocalizedName().toLowerCase() + ".02",
+ "2x " + aMaterial.getLocalizedName() + " Wire",
+ 0.25F,
+ aLoss,
+ 2L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aMaterial.getRGBA()).getStackForm(1L));
registerOre(
OrePrefixes.wireGt04,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 2,
- "wire." + aMaterial.getLocalizedName().toLowerCase() + ".04",
- "4x " + aMaterial.getLocalizedName() + " Wire",
- 0.375F,
- aLoss,
- 4L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 2,
+ "wire." + aMaterial.getLocalizedName().toLowerCase() + ".04",
+ "4x " + aMaterial.getLocalizedName() + " Wire",
+ 0.375F,
+ aLoss,
+ 4L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aMaterial.getRGBA()).getStackForm(1L));
registerOre(
OrePrefixes.wireGt08,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 3,
- "wire." + aMaterial.getLocalizedName().toLowerCase() + ".08",
- "8x " + aMaterial.getLocalizedName() + " Wire",
- 0.50F,
- aLoss,
- 8L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 3,
+ "wire." + aMaterial.getLocalizedName().toLowerCase() + ".08",
+ "8x " + aMaterial.getLocalizedName() + " Wire",
+ 0.50F,
+ aLoss,
+ 8L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aMaterial.getRGBA()).getStackForm(1L));
registerOre(
OrePrefixes.wireGt12,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 4,
- "wire." + aMaterial.getLocalizedName().toLowerCase() + ".12",
- "12x " + aMaterial.getLocalizedName() + " Wire",
- GTNH ? 0.625F : 0.75F,
- aLoss,
- 12L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 4,
+ "wire." + aMaterial.getLocalizedName().toLowerCase() + ".12",
+ "12x " + aMaterial.getLocalizedName() + " Wire",
+ GTNH ? 0.625F : 0.75F,
+ aLoss,
+ 12L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aMaterial.getRGBA()).getStackForm(1L));
registerOre(
OrePrefixes.wireGt16,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 5,
- "wire." + aMaterial.getLocalizedName().toLowerCase() + ".16",
- "16x " + aMaterial.getLocalizedName() + " Wire",
- GTNH ? 0.75F : 1.0F,
- aLoss,
- 16L * aAmperage,
- aVoltage,
- false,
- !aAutoInsulated,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 5,
+ "wire." + aMaterial.getLocalizedName().toLowerCase() + ".16",
+ "16x " + aMaterial.getLocalizedName() + " Wire",
+ GTNH ? 0.75F : 1.0F,
+ aLoss,
+ 16L * aAmperage,
+ aVoltage,
+ false,
+ !aAutoInsulated,
+ aMaterial.getRGBA()).getStackForm(1L));
if (aInsulatable) {
registerOre(
OrePrefixes.cableGt01,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 6,
- "cable." + aMaterial.getLocalizedName().toLowerCase() + ".01",
- "1x " + aMaterial.getLocalizedName() + " Cable",
- 0.25F,
- aLossInsulated,
- 1L * aAmperage,
- aVoltage,
- true,
- false,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 6,
+ "cable." + aMaterial.getLocalizedName().toLowerCase() + ".01",
+ "1x " + aMaterial.getLocalizedName() + " Cable",
+ 0.25F,
+ aLossInsulated,
+ 1L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aMaterial.getRGBA()).getStackForm(1L));
registerOre(
OrePrefixes.cableGt02,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 7,
- "cable." + aMaterial.getLocalizedName().toLowerCase() + ".02",
- "2x " + aMaterial.getLocalizedName() + " Cable",
- 0.375F,
- aLossInsulated,
- 2L * aAmperage,
- aVoltage,
- true,
- false,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 7,
+ "cable." + aMaterial.getLocalizedName().toLowerCase() + ".02",
+ "2x " + aMaterial.getLocalizedName() + " Cable",
+ 0.375F,
+ aLossInsulated,
+ 2L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aMaterial.getRGBA()).getStackForm(1L));
registerOre(
OrePrefixes.cableGt04,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 8,
- "cable." + aMaterial.getLocalizedName().toLowerCase() + ".04",
- "4x " + aMaterial.getLocalizedName() + " Cable",
- 0.5F,
- aLossInsulated,
- 4L * aAmperage,
- aVoltage,
- true,
- false,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 8,
+ "cable." + aMaterial.getLocalizedName().toLowerCase() + ".04",
+ "4x " + aMaterial.getLocalizedName() + " Cable",
+ 0.5F,
+ aLossInsulated,
+ 4L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aMaterial.getRGBA()).getStackForm(1L));
registerOre(
OrePrefixes.cableGt08,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 9,
- "cable." + aMaterial.getLocalizedName().toLowerCase() + ".08",
- "8x " + aMaterial.getLocalizedName() + " Cable",
- 0.625F,
- aLossInsulated,
- 8L * aAmperage,
- aVoltage,
- true,
- false,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 9,
+ "cable." + aMaterial.getLocalizedName().toLowerCase() + ".08",
+ "8x " + aMaterial.getLocalizedName() + " Cable",
+ 0.625F,
+ aLossInsulated,
+ 8L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aMaterial.getRGBA()).getStackForm(1L));
registerOre(
OrePrefixes.cableGt12,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 10,
- "cable." + aMaterial.getLocalizedName().toLowerCase() + ".12",
- "12x " + aMaterial.getLocalizedName() + " Cable",
- GTNH ? 0.75F : 0.875F,
- aLossInsulated,
- 12L * aAmperage,
- aVoltage,
- true,
- false,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 10,
+ "cable." + aMaterial.getLocalizedName().toLowerCase() + ".12",
+ "12x " + aMaterial.getLocalizedName() + " Cable",
+ GTNH ? 0.75F : 0.875F,
+ aLossInsulated,
+ 12L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aMaterial.getRGBA()).getStackForm(1L));
if (GTNH) {
registerOre(
cableGt16,
aMaterial,
new GregtechMetaPipeEntity_Cable(
- aStartID + 11,
- "cable." + aMaterial.getLocalizedName().toLowerCase() + ".16",
- "16x " + aMaterial.getLocalizedName() + " Cable",
- 0.875f,
- aLossInsulated,
- 16L * aAmperage,
- aVoltage,
- true,
- false,
- aMaterial.getRGBA())
- .getStackForm(1L));
+ aStartID + 11,
+ "cable." + aMaterial.getLocalizedName().toLowerCase() + ".16",
+ "16x " + aMaterial.getLocalizedName() + " Cable",
+ 0.875f,
+ aLossInsulated,
+ 16L * aAmperage,
+ aVoltage,
+ true,
+ false,
+ aMaterial.getRGBA()).getStackForm(1L));
}
}
}
- private static void superConductorFactory(
- final GT_Materials Material,
- final int Voltage,
- final int ID,
- final long insulatedLoss,
- final long uninsulatedLoss,
- final long Amps) {
+ private static void superConductorFactory(final GT_Materials Material, final int Voltage, final int ID,
+ final long insulatedLoss, final long uninsulatedLoss, final long Amps) {
final GT_Materials T = Material;
int V = 0;
if (Voltage == 8) {
@@ -755,85 +703,71 @@ public class GregtechConduits {
// makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false);
}
- private static void generateGTFluidPipes(
- final Materials material,
- final int startID,
- final int transferRatePerSec,
- final int heatResistance,
- final boolean isGasProof) {
+ private static void generateGTFluidPipes(final Materials material, final int startID, final int transferRatePerSec,
+ final int heatResistance, final boolean isGasProof) {
final int transferRatePerTick = transferRatePerSec / 20;
final long mass = material.getMass();
final long voltage = material.mMeltingPoint >= 2800 ? 64 : 16;
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeTiny.get(material),
new GT_MetaPipeEntity_Fluid(
- startID,
- "GT_Pipe_" + material.mDefaultLocalName + "_Tiny",
- "Tiny " + material.mDefaultLocalName + " Fluid Pipe",
- 0.25F,
- material,
- transferRatePerTick * 2,
- heatResistance,
- isGasProof)
- .getStackForm(1L));
+ startID,
+ "GT_Pipe_" + material.mDefaultLocalName + "_Tiny",
+ "Tiny " + material.mDefaultLocalName + " Fluid Pipe",
+ 0.25F,
+ material,
+ transferRatePerTick * 2,
+ heatResistance,
+ isGasProof).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeSmall.get(material),
new GT_MetaPipeEntity_Fluid(
- startID + 1,
- "GT_Pipe_" + material.mDefaultLocalName + "_Small",
- "Small " + material.mDefaultLocalName + " Fluid Pipe",
- 0.375F,
- material,
- transferRatePerTick * 4,
- heatResistance,
- isGasProof)
- .getStackForm(1L));
+ startID + 1,
+ "GT_Pipe_" + material.mDefaultLocalName + "_Small",
+ "Small " + material.mDefaultLocalName + " Fluid Pipe",
+ 0.375F,
+ material,
+ transferRatePerTick * 4,
+ heatResistance,
+ isGasProof).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeMedium.get(material),
new GT_MetaPipeEntity_Fluid(
- startID + 2,
- "GT_Pipe_" + material.mDefaultLocalName + "",
- "" + material.mDefaultLocalName + " Fluid Pipe",
- 0.5F,
- material,
- transferRatePerTick * 12,
- heatResistance,
- isGasProof)
- .getStackForm(1L));
+ startID + 2,
+ "GT_Pipe_" + material.mDefaultLocalName + "",
+ "" + material.mDefaultLocalName + " Fluid Pipe",
+ 0.5F,
+ material,
+ transferRatePerTick * 12,
+ heatResistance,
+ isGasProof).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeLarge.get(material),
new GT_MetaPipeEntity_Fluid(
- startID + 3,
- "GT_Pipe_" + material.mDefaultLocalName + "_Large",
- "Large " + material.mDefaultLocalName + " Fluid Pipe",
- 0.75F,
- material,
- transferRatePerTick * 24,
- heatResistance,
- isGasProof)
- .getStackForm(1L));
+ startID + 3,
+ "GT_Pipe_" + material.mDefaultLocalName + "_Large",
+ "Large " + material.mDefaultLocalName + " Fluid Pipe",
+ 0.75F,
+ material,
+ transferRatePerTick * 24,
+ heatResistance,
+ isGasProof).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeHuge.get(material),
new GT_MetaPipeEntity_Fluid(
- startID + 4,
- "GT_Pipe_" + material.mDefaultLocalName + "_Huge",
- "Huge " + material.mDefaultLocalName + " Fluid Pipe",
- GTNH ? 0.875F : 1.0F,
- material,
- transferRatePerTick * 48,
- heatResistance,
- isGasProof)
- .getStackForm(1L));
+ startID + 4,
+ "GT_Pipe_" + material.mDefaultLocalName + "_Huge",
+ "Huge " + material.mDefaultLocalName + " Fluid Pipe",
+ GTNH ? 0.875F : 1.0F,
+ material,
+ transferRatePerTick * 48,
+ heatResistance,
+ isGasProof).getStackForm(1L));
// generatePipeRecipes(material.mDefaultLocalName, mass, voltage);
}
- private static void generateNonGTFluidPipes(
- final GT_Materials material,
- final Material myMaterial,
- final int startID,
- final int transferRatePerSec,
- final int heatResistance,
- final boolean isGasProof) {
+ private static void generateNonGTFluidPipes(final GT_Materials material, final Material myMaterial,
+ final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof) {
final int transferRatePerTick = transferRatePerSec / 20;
long mass;
if (myMaterial != null) {
@@ -847,63 +781,58 @@ public class GregtechConduits {
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeTiny.get(material),
new GregtechMetaPipeEntityFluid(
- startID,
- "GT_Pipe_" + material.mDefaultLocalName + "_Tiny",
- "Tiny " + material.mDefaultLocalName + " Fluid Pipe",
- 0.25F,
- material,
- transferRatePerTick * 2,
- heatResistance,
- isGasProof)
- .getStackForm(1L));
+ startID,
+ "GT_Pipe_" + material.mDefaultLocalName + "_Tiny",
+ "Tiny " + material.mDefaultLocalName + " Fluid Pipe",
+ 0.25F,
+ material,
+ transferRatePerTick * 2,
+ heatResistance,
+ isGasProof).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeSmall.get(material),
new GregtechMetaPipeEntityFluid(
- startID + 1,
- "GT_Pipe_" + material.mDefaultLocalName + "_Small",
- "Small " + material.mDefaultLocalName + " Fluid Pipe",
- 0.375F,
- material,
- transferRatePerTick * 4,
- heatResistance,
- isGasProof)
- .getStackForm(1L));
+ startID + 1,
+ "GT_Pipe_" + material.mDefaultLocalName + "_Small",
+ "Small " + material.mDefaultLocalName + " Fluid Pipe",
+ 0.375F,
+ material,
+ transferRatePerTick * 4,
+ heatResistance,
+ isGasProof).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeMedium.get(material),
new GregtechMetaPipeEntityFluid(
- startID + 2,
- "GT_Pipe_" + material.mDefaultLocalName + "",
- "" + material.mDefaultLocalName + " Fluid Pipe",
- 0.5F,
- material,
- transferRatePerTick * 12,
- heatResistance,
- isGasProof)
- .getStackForm(1L));
+ startID + 2,
+ "GT_Pipe_" + material.mDefaultLocalName + "",
+ "" + material.mDefaultLocalName + " Fluid Pipe",
+ 0.5F,
+ material,
+ transferRatePerTick * 12,
+ heatResistance,
+ isGasProof).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeLarge.get(material),
new GregtechMetaPipeEntityFluid(
- startID + 3,
- "GT_Pipe_" + material.mDefaultLocalName + "_Large",
- "Large " + material.mDefaultLocalName + " Fluid Pipe",
- 0.75F,
- material,
- transferRatePerTick * 24,
- heatResistance,
- isGasProof)
- .getStackForm(1L));
+ startID + 3,
+ "GT_Pipe_" + material.mDefaultLocalName + "_Large",
+ "Large " + material.mDefaultLocalName + " Fluid Pipe",
+ 0.75F,
+ material,
+ transferRatePerTick * 24,
+ heatResistance,
+ isGasProof).getStackForm(1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.pipeHuge.get(material),
new GregtechMetaPipeEntityFluid(
- startID + 4,
- "GT_Pipe_" + material.mDefaultLocalName + "_Huge",
- "Huge " + material.mDefaultLocalName + " Fluid Pipe",
- GTNH ? 0.875F : 1.0F,
- material,
- transferRatePerTick * 48,
- heatResistance,
- isGasProof)
- .getStackForm(1L));
+ startID + 4,
+ "GT_Pipe_" + material.mDefaultLocalName + "_Huge",
+ "Huge " + material.mDefaultLocalName + " Fluid Pipe",
+ GTNH ? 0.875F : 1.0F,
+ material,
+ transferRatePerTick * 48,
+ heatResistance,
+ isGasProof).getStackForm(1L));
// generatePipeRecipes(material.mDefaultLocalName, mass, tVoltageMultiplier);
}
@@ -929,16 +858,31 @@ public class GregtechConduits {
}
// Check all pipes are not null
- Logger.WARNING("Generated pipeTiny from " + materialName + "? "
- + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Tiny" + output, 1) != null) ? true : false));
- Logger.WARNING("Generated pipeSmall from " + materialName + "? "
- + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 1) != null) ? true : false));
- Logger.WARNING("Generated pipeNormal from " + materialName + "? "
- + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 1) != null) ? true : false));
- Logger.WARNING("Generated pipeLarge from " + materialName + "? "
- + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1) != null) ? true : false));
- Logger.WARNING("Generated pipeHuge from " + materialName + "? "
- + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null) ? true : false));
+ Logger.WARNING(
+ "Generated pipeTiny from " + materialName
+ + "? "
+ + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Tiny" + output, 1) != null) ? true
+ : false));
+ Logger.WARNING(
+ "Generated pipeSmall from " + materialName
+ + "? "
+ + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 1) != null) ? true
+ : false));
+ Logger.WARNING(
+ "Generated pipeNormal from " + materialName
+ + "? "
+ + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 1) != null) ? true
+ : false));
+ Logger.WARNING(
+ "Generated pipeLarge from " + materialName
+ + "? "
+ + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1) != null) ? true
+ : false));
+ Logger.WARNING(
+ "Generated pipeHuge from " + materialName
+ + "? "
+ + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null) ? true
+ : false));
int eut = 120;
eut = (int) (8 * vMulti);
@@ -1036,8 +980,9 @@ public class GregtechConduits {
pipePlateDouble,
ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1));
} else {
- Logger.INFO("Failed to add a recipe for " + materialName
- + " Huge pipes. Double plates probably do not exist.");
+ Logger.INFO(
+ "Failed to add a recipe for " + materialName
+ + " Huge pipes. Double plates probably do not exist.");
}
} catch (Throwable t) {
t.printStackTrace();
@@ -1056,7 +1001,7 @@ public class GregtechConduits {
ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres(tName);
for (int i = 0; i < tList.size(); ++i)
if (GT_Utility.areStacksEqual((ItemStack) tList.get(i), aStack, true)) return false;
- OreDictionary.registerOre(tName, GT_Utility.copyAmount(1L, new Object[] {aStack}));
+ OreDictionary.registerOre(tName, GT_Utility.copyAmount(1L, new Object[] { aStack }));
return true;
}
@@ -1080,139 +1025,209 @@ public class GregtechConduits {
ItemStack aFineWire = aMaterial.getFineWire(1);
// Adds manual crafting recipe
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aPlate, aWire01})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aPlate, aWire01 })) {
RecipeUtils.addShapedRecipe(
- aPlate, CI.craftingToolWireCutter, null, null, null, null, null, null, null, aWire01);
+ aPlate,
+ CI.craftingToolWireCutter,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ aWire01);
}
// Wire mill
if (ItemUtils.checkForInvalidItems(
- new ItemStack[] {aIngot, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16})) {
+ new ItemStack[] { aIngot, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16 })) {
GT_Values.RA.addWiremillRecipe(
- aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(1), aMaterial.getWire01(2), 100, 4);
+ aMaterial.getIngot(1),
+ GT_Utility.getIntegratedCircuit(1),
+ aMaterial.getWire01(2),
+ 100,
+ 4);
GT_Values.RA.addWiremillRecipe(
- aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(2), aMaterial.getWire02(1), 150, 4);
+ aMaterial.getIngot(1),
+ GT_Utility.getIntegratedCircuit(2),
+ aMaterial.getWire02(1),
+ 150,
+ 4);
GT_Values.RA.addWiremillRecipe(
- aMaterial.getIngot(2), GT_Utility.getIntegratedCircuit(4), aMaterial.getWire04(1), 200, 4);
+ aMaterial.getIngot(2),
+ GT_Utility.getIntegratedCircuit(4),
+ aMaterial.getWire04(1),
+ 200,
+ 4);
GT_Values.RA.addWiremillRecipe(
- aMaterial.getIngot(4), GT_Utility.getIntegratedCircuit(8), aMaterial.getWire08(1), 250, 4);
+ aMaterial.getIngot(4),
+ GT_Utility.getIntegratedCircuit(8),
+ aMaterial.getWire08(1),
+ 250,
+ 4);
GT_Values.RA.addWiremillRecipe(
- aMaterial.getIngot(6), GT_Utility.getIntegratedCircuit(12), aMaterial.getWire12(1), 300, 4);
+ aMaterial.getIngot(6),
+ GT_Utility.getIntegratedCircuit(12),
+ aMaterial.getWire12(1),
+ 300,
+ 4);
GT_Values.RA.addWiremillRecipe(
- aMaterial.getIngot(8), GT_Utility.getIntegratedCircuit(16), aMaterial.getWire16(1), 350, 4);
+ aMaterial.getIngot(8),
+ GT_Utility.getIntegratedCircuit(16),
+ aMaterial.getWire16(1),
+ 350,
+ 4);
}
- if (ItemUtils.checkForInvalidItems(
- new ItemStack[] {aRod, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16})) {
+ if (ItemUtils
+ .checkForInvalidItems(new ItemStack[] { aRod, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16 })) {
GT_Values.RA.addWiremillRecipe(
- aMaterial.getRod(1), GT_Utility.getIntegratedCircuit(1), aMaterial.getWire01(1), 50, 4);
+ aMaterial.getRod(1),
+ GT_Utility.getIntegratedCircuit(1),
+ aMaterial.getWire01(1),
+ 50,
+ 4);
GT_Values.RA.addWiremillRecipe(
- aMaterial.getRod(2), GT_Utility.getIntegratedCircuit(2), aMaterial.getWire02(1), 100, 4);
+ aMaterial.getRod(2),
+ GT_Utility.getIntegratedCircuit(2),
+ aMaterial.getWire02(1),
+ 100,
+ 4);
GT_Values.RA.addWiremillRecipe(
- aMaterial.getRod(4), GT_Utility.getIntegratedCircuit(4), aMaterial.getWire04(1), 150, 4);
+ aMaterial.getRod(4),
+ GT_Utility.getIntegratedCircuit(4),
+ aMaterial.getWire04(1),
+ 150,
+ 4);
GT_Values.RA.addWiremillRecipe(
- aMaterial.getRod(8), GT_Utility.getIntegratedCircuit(8), aMaterial.getWire08(1), 200, 4);
+ aMaterial.getRod(8),
+ GT_Utility.getIntegratedCircuit(8),
+ aMaterial.getWire08(1),
+ 200,
+ 4);
GT_Values.RA.addWiremillRecipe(
- aMaterial.getRod(12), GT_Utility.getIntegratedCircuit(12), aMaterial.getWire12(1), 250, 4);
+ aMaterial.getRod(12),
+ GT_Utility.getIntegratedCircuit(12),
+ aMaterial.getWire12(1),
+ 250,
+ 4);
GT_Values.RA.addWiremillRecipe(
- aMaterial.getRod(16), GT_Utility.getIntegratedCircuit(16), aMaterial.getWire16(1), 300, 4);
+ aMaterial.getRod(16),
+ GT_Utility.getIntegratedCircuit(16),
+ aMaterial.getWire16(1),
+ 300,
+ 4);
}
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aIngot, aFineWire})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aIngot, aFineWire })) {
GT_Values.RA.addWiremillRecipe(
- aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(3), aMaterial.getFineWire(8), 100, 4);
+ aMaterial.getIngot(1),
+ GT_Utility.getIntegratedCircuit(3),
+ aMaterial.getFineWire(8),
+ 100,
+ 4);
}
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aRod, aFineWire})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aRod, aFineWire })) {
GT_Values.RA.addWiremillRecipe(
- aMaterial.getRod(1), GT_Utility.getIntegratedCircuit(3), aMaterial.getFineWire(4), 50, 4);
+ aMaterial.getRod(1),
+ GT_Utility.getIntegratedCircuit(3),
+ aMaterial.getFineWire(4),
+ 50,
+ 4);
}
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aFineWire})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aFineWire })) {
GT_Values.RA.addWiremillRecipe(
- aMaterial.getWire01(1), GT_Utility.getIntegratedCircuit(1), aMaterial.getFineWire(4), 200, 8);
+ aMaterial.getWire01(1),
+ GT_Utility.getIntegratedCircuit(1),
+ aMaterial.getFineWire(4),
+ 200,
+ 8);
}
// Extruder
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aIngot, aWire01})) {
- GT_Values.RA.addExtruderRecipe(
- aIngot, ItemList.Shape_Extruder_Wire.get(0), aMaterial.getWire01(2), 196, 96);
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aIngot, aWire01 })) {
+ GT_Values.RA
+ .addExtruderRecipe(aIngot, ItemList.Shape_Extruder_Wire.get(0), aMaterial.getWire01(2), 196, 96);
}
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aCable01, aWire01})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aCable01, aWire01 })) {
GT_Values.RA.addUnboxingRecipe(aCable01, aWire01, null, 100, 8);
}
// Shapeless Down-Crafting
// 2x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire02}, aMaterial.getWire01(2));
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire02 }, aMaterial.getWire01(2));
}
// 4x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire04})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire04}, aMaterial.getWire01(4));
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire04 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire04 }, aMaterial.getWire01(4));
}
// 8x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire08})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire08}, aMaterial.getWire01(8));
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire08 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire08 }, aMaterial.getWire01(8));
}
// 12x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire12})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire12}, aMaterial.getWire01(12));
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire12 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire12 }, aMaterial.getWire01(12));
}
// 16x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire16})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire16}, aMaterial.getWire01(16));
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire16 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire16 }, aMaterial.getWire01(16));
}
// 1x -> 2x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire01, aWire01}, aWire02);
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire01, aWire01 }, aWire02);
}
// 2x -> 4x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire02, aWire04})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire02, aWire02}, aWire04);
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire02, aWire04 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire02, aWire02 }, aWire04);
}
// 4x -> 8x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire04, aWire08})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire04, aWire04}, aWire08);
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire04, aWire08 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire04, aWire04 }, aWire08);
}
// 8x -> 12x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire04, aWire08, aWire12})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire04, aWire08}, aWire12);
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire04, aWire08, aWire12 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire04, aWire08 }, aWire12);
}
// 12x -> 16x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire04, aWire12, aWire16})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire04, aWire12}, aWire16);
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire04, aWire12, aWire16 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire04, aWire12 }, aWire16);
}
// 8x -> 16x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire08, aWire16})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire08, aWire08}, aWire16);
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire08, aWire16 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire08, aWire08 }, aWire16);
}
// 1x -> 4x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire04})) {
- RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire01, aWire01, aWire01, aWire01}, aWire04);
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire04 })) {
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire01, aWire01, aWire01, aWire01 }, aWire04);
}
// 1x -> 8x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire08})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire08 })) {
RecipeUtils.addShapelessGregtechRecipe(
- new ItemStack[] {aWire01, aWire01, aWire01, aWire01, aWire01, aWire01, aWire01, aWire01}, aWire08);
+ new ItemStack[] { aWire01, aWire01, aWire01, aWire01, aWire01, aWire01, aWire01, aWire01 },
+ aWire08);
}
// Wire to Cable
// 1x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aCable01})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aCable01 })) {
GT_Values.RA.addAssemblerRecipe(
aWire01,
CI.getNumberedCircuit(24),
@@ -1223,7 +1238,7 @@ public class GregtechConduits {
}
// 2x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire02, aCable02})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire02, aCable02 })) {
GT_Values.RA.addAssemblerRecipe(
aWire02,
CI.getNumberedCircuit(24),
@@ -1234,7 +1249,7 @@ public class GregtechConduits {
}
// 4x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire04, aCable04})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire04, aCable04 })) {
GT_Values.RA.addAssemblerRecipe(
aWire04,
CI.getNumberedCircuit(24),
@@ -1245,7 +1260,7 @@ public class GregtechConduits {
}
// 8x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire08, aCable08})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire08, aCable08 })) {
GT_Values.RA.addAssemblerRecipe(
aWire08,
CI.getNumberedCircuit(24),
@@ -1256,7 +1271,7 @@ public class GregtechConduits {
}
// 12x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire12, aCable12})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire12, aCable12 })) {
GT_Values.RA.addAssemblerRecipe(
aWire12,
CI.getNumberedCircuit(24),
@@ -1267,7 +1282,7 @@ public class GregtechConduits {
}
// 16x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire16, aCable16})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire16, aCable16 })) {
GT_Values.RA.addAssemblerRecipe(
aWire16,
CI.getNumberedCircuit(24),
@@ -1280,27 +1295,27 @@ public class GregtechConduits {
// Assemble small wires into bigger wires
// 2x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) {
GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(2), CI.getNumberedCircuit(2), null, aWire02, 100, 8);
}
// 4x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) {
GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(4), CI.getNumberedCircuit(4), null, aWire04, 100, 8);
}
// 8x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) {
GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(8), CI.getNumberedCircuit(8), null, aWire08, 100, 8);
}
// 12x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) {
GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(12), CI.getNumberedCircuit(12), null, aWire12, 100, 8);
}
// 16x
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) {
GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(16), CI.getNumberedCircuit(16), null, aWire16, 100, 8);
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
index e261b2f01a..2cd484bc9f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
@@ -24,7 +24,8 @@ public class GregtechCustomHatches {
private static void run1() {
- GregtechItemList.Hatch_Input_Cryotheum.set(new GT_MetaTileEntity_Hatch_CustomFluidBase(
+ GregtechItemList.Hatch_Input_Cryotheum.set(
+ new GT_MetaTileEntity_Hatch_CustomFluidBase(
FluidUtils.getFluidStack("cryotheum", 1).getFluid(), // Fluid
// to
// resitrct
@@ -34,10 +35,10 @@ public class GregtechCustomHatches {
967, // ID
"hatch.cryotheum.input.tier.00", // unlocal name
"Cryotheum Cooling Hatch" // Local name
- )
- .getStackForm(1L));
+ ).getStackForm(1L));
- GregtechItemList.Hatch_Input_Pyrotheum.set(new GT_MetaTileEntity_Hatch_CustomFluidBase(
+ GregtechItemList.Hatch_Input_Pyrotheum.set(
+ new GT_MetaTileEntity_Hatch_CustomFluidBase(
FluidUtils.getFluidStack("pyrotheum", 1).getFluid(), // Fluid
// to
// resitrct
@@ -47,22 +48,21 @@ public class GregtechCustomHatches {
968, // ID
"hatch.pyrotheum.input.tier.00", // unlocal name
"Pyrotheum Heating Vent" // Local name
- )
- .getStackForm(1L));
+ ).getStackForm(1L));
- GregtechItemList.Hatch_Input_Naquadah.set(new GT_MetaTileEntity_Hatch_Naquadah(
+ GregtechItemList.Hatch_Input_Naquadah.set(
+ new GT_MetaTileEntity_Hatch_Naquadah(
969, // ID
"hatch.naquadah.input.tier.00", // unlocal name
"Naquadah Reactor Input hatch" // Local name
- )
- .getStackForm(1L));
+ ).getStackForm(1L));
- GregtechItemList.Hatch_Input_TurbineHousing.set(new GT_MetaTileEntity_Hatch_TurbineProvider(
+ GregtechItemList.Hatch_Input_TurbineHousing.set(
+ new GT_MetaTileEntity_Hatch_TurbineProvider(
31025, // ID
"hatch.turbine.input.tier.00", // unlocal name
"Turbine Housing", // Local name
- 8)
- .getStackForm(1L));
+ 8).getStackForm(1L));
// Multiblock Control Core Bus
GregtechItemList.Hatch_Control_Core.set(
@@ -73,9 +73,12 @@ public class GregtechCustomHatches {
GregtechItemList.Hatch_Air_Intake.set(
new GT_MetaTileEntity_Hatch_AirIntake(861, "hatch.air.intake.tier.00", "Air Intake Hatch", 5)
.getStackForm(1L));
- GregtechItemList.Hatch_Air_Intake_Extreme.set(new GT_MetaTileEntity_Hatch_AirIntake_Extreme(
- 31070, "hatch.air.intake.tier.01", "Extreme Air Intake Hatch", 6)
- .getStackForm(1L));
+ GregtechItemList.Hatch_Air_Intake_Extreme.set(
+ new GT_MetaTileEntity_Hatch_AirIntake_Extreme(
+ 31070,
+ "hatch.air.intake.tier.01",
+ "Extreme Air Intake Hatch",
+ 6).getStackForm(1L));
// Multiblock Reservoir Hatch
GregtechItemList.Hatch_Reservoir.set(
@@ -83,7 +86,8 @@ public class GregtechCustomHatches {
.getStackForm(1L));
// Steam Hatch
- GregtechItemList.Hatch_Input_Steam.set(new GT_MetaTileEntity_Hatch_CustomFluidBase(
+ GregtechItemList.Hatch_Input_Steam.set(
+ new GT_MetaTileEntity_Hatch_CustomFluidBase(
FluidUtils.getSteam(1).getFluid(), // Fluid
// to
// resitrct
@@ -93,38 +97,64 @@ public class GregtechCustomHatches {
31040, // ID
"hatch.steam.input.tier.00", // unlocal name
"Steam Hatch" // Local name
- )
- .getStackForm(1L));
+ ).getStackForm(1L));
}
private static void run2() {
- GregtechItemList.Hatch_Muffler_Adv_LV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(
- 30001, "hatch.muffler.adv.tier.01", "Advanced Muffler Hatch (LV)", 1))
- .getStackForm(1L));
- GregtechItemList.Hatch_Muffler_Adv_MV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(
- 30002, "hatch.muffler.adv.tier.02", "Advanced Muffler Hatch (MV)", 2))
- .getStackForm(1L));
- GregtechItemList.Hatch_Muffler_Adv_HV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(
- 30003, "hatch.muffler.adv.tier.03", "Advanced Muffler Hatch (HV)", 3))
- .getStackForm(1L));
- GregtechItemList.Hatch_Muffler_Adv_EV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(
- 30004, "hatch.muffler.adv.tier.04", "Advanced Muffler Hatch (EV)", 4))
- .getStackForm(1L));
- GregtechItemList.Hatch_Muffler_Adv_IV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(
- 30005, "hatch.muffler.adv.tier.05", "Advanced Muffler Hatch (IV)", 5))
- .getStackForm(1L));
- GregtechItemList.Hatch_Muffler_Adv_LuV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(
- 30006, "hatch.muffler.adv.tier.06", "Advanced Muffler Hatch (LuV)", 6))
- .getStackForm(1L));
- GregtechItemList.Hatch_Muffler_Adv_ZPM.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(
- 30007, "hatch.muffler.adv.tier.07", "Advanced Muffler Hatch (ZPM)", 7))
- .getStackForm(1L));
- GregtechItemList.Hatch_Muffler_Adv_UV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(
- 30008, "hatch.muffler.adv.tier.08", "Advanced Muffler Hatch (UV)", 8))
- .getStackForm(1L));
- GregtechItemList.Hatch_Muffler_Adv_MAX.set((new GT_MetaTileEntity_Hatch_Muffler_Adv(
- 30009, "hatch.muffler.adv.tier.09", "Advanced Muffler Hatch (MAX)", 9))
- .getStackForm(1L));
+ GregtechItemList.Hatch_Muffler_Adv_LV.set(
+ (new GT_MetaTileEntity_Hatch_Muffler_Adv(
+ 30001,
+ "hatch.muffler.adv.tier.01",
+ "Advanced Muffler Hatch (LV)",
+ 1)).getStackForm(1L));
+ GregtechItemList.Hatch_Muffler_Adv_MV.set(
+ (new GT_MetaTileEntity_Hatch_Muffler_Adv(
+ 30002,
+ "hatch.muffler.adv.tier.02",
+ "Advanced Muffler Hatch (MV)",
+ 2)).getStackForm(1L));
+ GregtechItemList.Hatch_Muffler_Adv_HV.set(
+ (new GT_MetaTileEntity_Hatch_Muffler_Adv(
+ 30003,
+ "hatch.muffler.adv.tier.03",
+ "Advanced Muffler Hatch (HV)",
+ 3)).getStackForm(1L));
+ GregtechItemList.Hatch_Muffler_Adv_EV.set(
+ (new GT_MetaTileEntity_Hatch_Muffler_Adv(
+ 30004,
+ "hatch.muffler.adv.tier.04",
+ "Advanced Muffler Hatch (EV)",
+ 4)).getStackForm(1L));
+ GregtechItemList.Hatch_Muffler_Adv_IV.set(
+ (new GT_MetaTileEntity_Hatch_Muffler_Adv(
+ 30005,
+ "hatch.muffler.adv.tier.05",
+ "Advanced Muffler Hatch (IV)",
+ 5)).getStackForm(1L));
+ GregtechItemList.Hatch_Muffler_Adv_LuV.set(
+ (new GT_MetaTileEntity_Hatch_Muffler_Adv(
+ 30006,
+ "hatch.muffler.adv.tier.06",
+ "Advanced Muffler Hatch (LuV)",
+ 6)).getStackForm(1L));
+ GregtechItemList.Hatch_Muffler_Adv_ZPM.set(
+ (new GT_MetaTileEntity_Hatch_Muffler_Adv(
+ 30007,
+ "hatch.muffler.adv.tier.07",
+ "Advanced Muffler Hatch (ZPM)",
+ 7)).getStackForm(1L));
+ GregtechItemList.Hatch_Muffler_Adv_UV.set(
+ (new GT_MetaTileEntity_Hatch_Muffler_Adv(
+ 30008,
+ "hatch.muffler.adv.tier.08",
+ "Advanced Muffler Hatch (UV)",
+ 8)).getStackForm(1L));
+ GregtechItemList.Hatch_Muffler_Adv_MAX.set(
+ (new GT_MetaTileEntity_Hatch_Muffler_Adv(
+ 30009,
+ "hatch.muffler.adv.tier.09",
+ "Advanced Muffler Hatch (MAX)",
+ 9)).getStackForm(1L));
}
private static void run3() {
@@ -201,25 +231,37 @@ public class GregtechCustomHatches {
.getStackForm(1L));
}
- private static GT_MetaTileEntity_SuperBus_Input makeInputBus(
- int id, String unlocalizedName, String localizedName, int tier) {
+ private static GT_MetaTileEntity_SuperBus_Input makeInputBus(int id, String unlocalizedName, String localizedName,
+ int tier) {
return new GT_MetaTileEntity_SuperBus_Input(id, unlocalizedName, localizedName, tier);
}
- private static GT_MetaTileEntity_SuperBus_Output makeOutputBus(
- int id, String unlocalizedName, String localizedName, int tier) {
+ private static GT_MetaTileEntity_SuperBus_Output makeOutputBus(int id, String unlocalizedName, String localizedName,
+ int tier) {
return new GT_MetaTileEntity_SuperBus_Output(id, unlocalizedName, localizedName, tier);
}
private static void run4() {
int aID = 31060;
// 41, "hatch.energy.tier.01", "LV Energy Hatch", 1
- GT_MetaTileEntity_Hatch_Energy_RTG aHatch1 =
- new GT_MetaTileEntity_Hatch_Energy_RTG(aID++, "hatch.energy.rtg.tier.01", "RTG Power Unit [LV]", 1, 9);
- GT_MetaTileEntity_Hatch_Energy_RTG aHatch2 =
- new GT_MetaTileEntity_Hatch_Energy_RTG(aID++, "hatch.energy.rtg.tier.02", "RTG Power Unit [MV]", 2, 9);
- GT_MetaTileEntity_Hatch_Energy_RTG aHatch3 =
- new GT_MetaTileEntity_Hatch_Energy_RTG(aID++, "hatch.energy.rtg.tier.03", "RTG Power Unit [HV]", 3, 9);
+ GT_MetaTileEntity_Hatch_Energy_RTG aHatch1 = new GT_MetaTileEntity_Hatch_Energy_RTG(
+ aID++,
+ "hatch.energy.rtg.tier.01",
+ "RTG Power Unit [LV]",
+ 1,
+ 9);
+ GT_MetaTileEntity_Hatch_Energy_RTG aHatch2 = new GT_MetaTileEntity_Hatch_Energy_RTG(
+ aID++,
+ "hatch.energy.rtg.tier.02",
+ "RTG Power Unit [MV]",
+ 2,
+ 9);
+ GT_MetaTileEntity_Hatch_Energy_RTG aHatch3 = new GT_MetaTileEntity_Hatch_Energy_RTG(
+ aID++,
+ "hatch.energy.rtg.tier.03",
+ "RTG Power Unit [HV]",
+ 3,
+ 9);
GregtechItemList.Hatch_RTG_LV.set(aHatch1.getStackForm(1L));
GregtechItemList.Hatch_RTG_MV.set(aHatch2.getStackForm(1L));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index 6dba10bb98..7a42bf1c9c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -14,9 +16,9 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Dehydrator;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialDehydrator;
-import net.minecraft.item.ItemStack;
public class GregtechDehydrator {
+
public static void run() {
if (LoadedMods.Gregtech) {
Logger.INFO("Gregtech5u Content | Registering Chemical Dehydrators.");
@@ -29,87 +31,82 @@ public class GregtechDehydrator {
private static void run1() {
/*
- *
- * public GT_MetaTileEntity_BasicMachine_GT_Recipe( int aID, String
- * aName, String aNameRegional, int aTier, String aDescription,
- * GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int
- * aTankCapacity, int aGUIParameterA, int aGUIParameterB, String
- * aGUIName, String aSound, boolean aSharedTank, boolean
- * aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays,
- * Object[] aRecipe) {
- *
+ * public GT_MetaTileEntity_BasicMachine_GT_Recipe( int aID, String aName, String aNameRegional, int aTier,
+ * String aDescription, GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int
+ * aGUIParameterA, int aGUIParameterB, String aGUIName, String aSound, boolean aSharedTank, boolean
+ * aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays, Object[] aRecipe) {
*/
// Basic
- GregtechItemList.GT_Dehydrator_MV.set(new GT_MetaTileEntity_Dehydrator(
+ GregtechItemList.GT_Dehydrator_MV.set(
+ new GT_MetaTileEntity_Dehydrator(
911,
"machine.dehydrator.tier.00",
"Basic Dehydrator I",
2,
"This dehydrates your Grapes into Raisins.",
- 16000)
- .getStackForm(1L));
+ 16000).getStackForm(1L));
- GregtechItemList.GT_Dehydrator_HV.set(new GT_MetaTileEntity_Dehydrator(
+ GregtechItemList.GT_Dehydrator_HV.set(
+ new GT_MetaTileEntity_Dehydrator(
912,
"machine.dehydrator.tier.01",
"Basic Dehydrator II",
3,
"This dehydrates your Grapes into Raisins.",
- 32000)
- .getStackForm(1L));
+ 32000).getStackForm(1L));
// Chemical
- GregtechItemList.GT_Dehydrator_EV.set(new GT_MetaTileEntity_Dehydrator(
+ GregtechItemList.GT_Dehydrator_EV.set(
+ new GT_MetaTileEntity_Dehydrator(
813,
"advancedmachine.dehydrator.tier.01",
"Chemical Dehydrator I",
4,
"A hangover is the way your body reacts to dehydration.",
- 48000)
- .getStackForm(1L));
+ 48000).getStackForm(1L));
- GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_Dehydrator(
+ GregtechItemList.GT_Dehydrator_IV.set(
+ new GT_MetaTileEntity_Dehydrator(
814,
"advancedmachine.dehydrator.tier.02",
"Chemical Dehydrator II",
5,
"A hangover is the way your body reacts to dehydration.",
- 48000)
- .getStackForm(1L));
+ 48000).getStackForm(1L));
- GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_Dehydrator(
+ GregtechItemList.GT_Dehydrator_LuV.set(
+ new GT_MetaTileEntity_Dehydrator(
815,
"advancedmachine.dehydrator.tier.03",
"Chemical Dehydrator III",
6,
"You could probably make space icecream with this..",
- 64000)
- .getStackForm(1L));
+ 64000).getStackForm(1L));
- GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_Dehydrator(
+ GregtechItemList.GT_Dehydrator_ZPM.set(
+ new GT_MetaTileEntity_Dehydrator(
816,
"advancedmachine.dehydrator.tier.04",
"Chemical Dehydrator IV",
7,
"You can definitely make space icecream with this..",
- 64000)
- .getStackForm(1L));
+ 64000).getStackForm(1L));
// Advanced
GregtechItemList.Controller_Vacuum_Furnace.set(
new GregtechMetaTileEntity_IndustrialDehydrator(995, "multimachine.adv.vacuumfurnace", "Utupu-Tanuri")
.getStackForm(1L));
- ItemStack coilWire1 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 4);
- ItemStack coilWire2 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 4);
- ItemStack coilWire3 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 4);
- ItemStack coilWire4 =
- ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 4);
+ ItemStack coilWire1 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 4);
+ ItemStack coilWire2 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 4);
+ ItemStack coilWire3 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 4);
+ ItemStack coilWire4 = ItemUtils
+ .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 4);
ItemStack coilT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil", "coil1", 0, 1);
ItemStack coilT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:1", "coil2", 1, 1);
ItemStack coilT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:2", "coil3", 2, 1);
@@ -130,146 +127,67 @@ public class GregtechDehydrator {
// Basic
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Dehydrator_MV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "ECE",
- "WMW",
- "GPG",
- Character.valueOf('M'),
- ItemList.Hull_MV,
- Character.valueOf('P'),
- ItemList.Robot_Arm_MV,
- Character.valueOf('E'),
- OrePrefixes.wireFine.get(Materials.RedAlloy),
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Good),
- Character.valueOf('W'),
- OrePrefixes.cableGt04.get(Materials.Copper),
- Character.valueOf('G'),
- OrePrefixes.gearGt.get(Materials.Steel)
- });
+ new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
+ ItemList.Robot_Arm_MV, Character.valueOf('E'), OrePrefixes.wireFine.get(Materials.RedAlloy),
+ Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
+ OrePrefixes.cableGt04.get(Materials.Copper), Character.valueOf('G'),
+ OrePrefixes.gearGt.get(Materials.Steel) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Dehydrator_HV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "ECE",
- "WMW",
- "GPG",
- Character.valueOf('M'),
- ItemList.Hull_HV,
- Character.valueOf('P'),
- ItemList.Robot_Arm_HV,
- Character.valueOf('E'),
- OrePrefixes.wireFine.get(Materials.Electrum),
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Advanced),
- Character.valueOf('W'),
- OrePrefixes.cableGt04.get(Materials.Silver),
- Character.valueOf('G'),
- ALLOY.POTIN.getGear(1)
- });
+ new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'),
+ ItemList.Robot_Arm_HV, Character.valueOf('E'), OrePrefixes.wireFine.get(Materials.Electrum),
+ Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
+ OrePrefixes.cableGt04.get(Materials.Silver), Character.valueOf('G'), ALLOY.POTIN.getGear(1) });
// Chemical
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Dehydrator_EV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "ECE",
- "WMW",
- "GPG",
- Character.valueOf('M'),
- ItemList.Hull_EV,
- Character.valueOf('P'),
- ItemList.Robot_Arm_EV,
- Character.valueOf('E'),
- coilT1,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Data),
- Character.valueOf('W'),
- OrePrefixes.cableGt04.get(Materials.Aluminium),
- Character.valueOf('G'),
- ALLOY.TUMBAGA.getGear(1)
- });
+ new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'),
+ ItemList.Robot_Arm_EV, Character.valueOf('E'), coilT1, Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Data), Character.valueOf('W'),
+ OrePrefixes.cableGt04.get(Materials.Aluminium), Character.valueOf('G'),
+ ALLOY.TUMBAGA.getGear(1) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Dehydrator_IV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "ECE",
- "WMW",
- "GPG",
- Character.valueOf('M'),
- ItemList.Hull_IV,
- Character.valueOf('P'),
- ItemList.Robot_Arm_IV,
- Character.valueOf('E'),
- coilT2,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Elite),
- Character.valueOf('W'),
- OrePrefixes.cableGt04.get(Materials.Tungsten),
- Character.valueOf('G'),
- ALLOY.INCONEL_690.getGear(1)
- });
+ new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'),
+ ItemList.Robot_Arm_IV, Character.valueOf('E'), coilT2, Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
+ OrePrefixes.cableGt04.get(Materials.Tungsten), Character.valueOf('G'),
+ ALLOY.INCONEL_690.getGear(1) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Dehydrator_LuV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "ECE",
- "WMW",
- "GPG",
- Character.valueOf('M'),
- ItemList.Hull_LuV,
- Character.valueOf('P'),
- CI.robotArm_LuV,
- Character.valueOf('E'),
- coilT3,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Master),
- Character.valueOf('W'),
- OrePrefixes.cableGt04.get(Materials.Naquadah),
- Character.valueOf('G'),
- ALLOY.HASTELLOY_N.getGear(1)
- });
+ new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'),
+ CI.robotArm_LuV, Character.valueOf('E'), coilT3, Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'),
+ OrePrefixes.cableGt04.get(Materials.Naquadah), Character.valueOf('G'),
+ ALLOY.HASTELLOY_N.getGear(1) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Dehydrator_ZPM.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "ECE",
- "WMW",
- "GPG",
- Character.valueOf('M'),
- ItemList.Hull_ZPM,
- Character.valueOf('P'),
- CI.robotArm_ZPM,
- Character.valueOf('E'),
- coilT4,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Ultimate),
- Character.valueOf('W'),
- OrePrefixes.cableGt04.get(Materials.Osmium),
- Character.valueOf('G'),
- ALLOY.ZERON_100.getGear(1)
- });
+ new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('P'),
+ CI.robotArm_ZPM, Character.valueOf('E'), coilT4, Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
+ OrePrefixes.cableGt04.get(Materials.Osmium), Character.valueOf('G'),
+ ALLOY.ZERON_100.getGear(1) });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index 1eed50db26..4d074619dc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -28,7 +28,8 @@ public class GregtechEnergyBuffer {
private static void run1() {
// itemBufferCore = new
- // Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore");
+ // Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID
+ // + ":itemBufferCore");
// Registry
// GameRegistry.registerItem(itemBufferCore, "itemBufferCore");
@@ -67,9 +68,14 @@ public class GregtechEnergyBuffer {
new GregtechMetaEnergyBuffer(779, "energybuffer.tier.09", "MAX Voltage Energy Buffer", 9, "", 1)
.getStackForm(1L));
// Creative Buffer Has Special ID
- GregtechItemList.Energy_Buffer_CREATIVE.set(new GregtechMetaCreativeEnergyBuffer(
- 750, "energybuffer.tier.xx", "512V Creative Energy Buffer", 3, "", 0)
- .getStackForm(1L));
+ GregtechItemList.Energy_Buffer_CREATIVE.set(
+ new GregtechMetaCreativeEnergyBuffer(
+ 750,
+ "energybuffer.tier.xx",
+ "512V Creative Energy Buffer",
+ 3,
+ "",
+ 0).getStackForm(1L));
if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor) {
// RF Convertor Buffer Has Special ID
@@ -80,174 +86,92 @@ public class GregtechEnergyBuffer {
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WTW",
- "WMW",
- Character.valueOf('M'),
- ItemList.Hull_ULV,
- Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.Lead),
- Character.valueOf('T'),
- GregtechOreDictNames.buffer_core
- });
+ new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('W'),
+ OrePrefixes.wireGt08.get(Materials.Lead), Character.valueOf('T'),
+ GregtechOreDictNames.buffer_core });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WTW",
- "WMW",
- Character.valueOf('M'),
- ItemList.Hull_LV,
- Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.Tin),
- Character.valueOf('T'),
- GregtechOreDictNames.buffer_core
- });
+ new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('W'),
+ OrePrefixes.wireGt08.get(Materials.Tin), Character.valueOf('T'),
+ GregtechOreDictNames.buffer_core });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WTW",
- "WMW",
- Character.valueOf('M'),
- ItemList.Hull_MV,
- Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.AnyCopper),
- Character.valueOf('T'),
- GregtechOreDictNames.buffer_core
- });
+ new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('W'),
+ OrePrefixes.wireGt08.get(Materials.AnyCopper), Character.valueOf('T'),
+ GregtechOreDictNames.buffer_core });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WTW",
- "WMW",
- Character.valueOf('M'),
- ItemList.Hull_HV,
- Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.Gold),
- Character.valueOf('T'),
- GregtechOreDictNames.buffer_core
- });
+ new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'),
+ OrePrefixes.wireGt08.get(Materials.Gold), Character.valueOf('T'),
+ GregtechOreDictNames.buffer_core });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WTW",
- "WMW",
- Character.valueOf('M'),
- ItemList.Hull_EV,
- Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.Aluminium),
- Character.valueOf('T'),
- GregtechOreDictNames.buffer_core
- });
+ new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('W'),
+ OrePrefixes.wireGt08.get(Materials.Aluminium), Character.valueOf('T'),
+ GregtechOreDictNames.buffer_core });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WTW",
- "WMW",
- Character.valueOf('M'),
- ItemList.Hull_IV,
- Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.Tungsten),
- Character.valueOf('T'),
- GregtechOreDictNames.buffer_core
- });
+ new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('W'),
+ OrePrefixes.wireGt08.get(Materials.Tungsten), Character.valueOf('T'),
+ GregtechOreDictNames.buffer_core });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WTW",
- "WMW",
- Character.valueOf('M'),
- ItemList.Hull_LuV,
- Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.Osmium),
- Character.valueOf('T'),
- GregtechOreDictNames.buffer_core
- });
+ new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('W'),
+ OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'),
+ GregtechOreDictNames.buffer_core });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WTW",
- "WMW",
- Character.valueOf('M'),
- ItemList.Hull_ZPM,
- Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.Osmium),
- Character.valueOf('T'),
- GregtechOreDictNames.buffer_core
- });
+ new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('W'),
+ OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'),
+ GregtechOreDictNames.buffer_core });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WTW",
- "WMW",
- Character.valueOf('M'),
- ItemList.Hull_UV,
- Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.Osmium),
- Character.valueOf('T'),
- GregtechOreDictNames.buffer_core
- });
+ new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('W'),
+ OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'),
+ GregtechOreDictNames.buffer_core });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "WTW",
- "WMW",
- Character.valueOf('M'),
- ItemList.Hull_MAX,
- Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.Superconductor),
- Character.valueOf('T'),
- GregtechOreDictNames.buffer_core
- });
- /*GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
- | GT_ModHandler.RecipeBits.REVERSIBLE
- | GT_ModHandler.RecipeBits.BUFFERED, new Object[] {
- "WTW", "WMW", Character.valueOf('M'),
- ItemList.Hull_MAX, Character.valueOf('W'),
- OrePrefixes.wireGt08.get(Materials.Superconductor),
- Character.valueOf('T'), GregtechOreDictNames.buffer_core });*/
+ new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'),
+ OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'),
+ GregtechOreDictNames.buffer_core });
+ /*
+ * GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]),
+ * GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE |
+ * GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW",
+ * Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'),
+ * OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), GregtechOreDictNames.buffer_core
+ * });
+ */
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java
index f07091e481..f3d5a5b479 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java
@@ -23,21 +23,27 @@ public class GregtechFactoryGradeReplacementMultis {
GregtechItemList.Machine_Adv_ImplosionCompressor.set(
new GregtechMetaTileEntity_Adv_Implosion(964, "multimachine.adv.implosioncompressor", "Density^2")
.getStackForm(1L));
- GregtechItemList.Industrial_Cryogenic_Freezer.set(new GregtechMetaTileEntity_IndustrialVacuumFreezer(
- 910, "multimachine.adv.industrialfreezer", "Cryogenic Freezer")
- .getStackForm(1L));
+ GregtechItemList.Industrial_Cryogenic_Freezer.set(
+ new GregtechMetaTileEntity_IndustrialVacuumFreezer(
+ 910,
+ "multimachine.adv.industrialfreezer",
+ "Cryogenic Freezer").getStackForm(1L));
GregtechItemList.FusionComputer_UV2.set(
new GregtechMetaTileEntity_Adv_Fusion_MK4(965, "fusioncomputer.tier.09", "FusionTech MK IV")
.getStackForm(1L));
// 31021
- GregtechItemList.Machine_Adv_DistillationTower.set(new GregtechMetaTileEntity_Adv_DistillationTower(
- 31021, "multimachine.adv.distillationtower", "Dangote Distillus")
- .getStackForm(1L));
+ GregtechItemList.Machine_Adv_DistillationTower.set(
+ new GregtechMetaTileEntity_Adv_DistillationTower(
+ 31021,
+ "multimachine.adv.distillationtower",
+ "Dangote Distillus").getStackForm(1L));
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- GregtechItemList.Machine_Adv_AssemblyLine.set(new GregtechMetaTileEntity_Adv_AssemblyLine(
- 31024, "multimachine.adv.assemblyline", "Compound Fabricator")
- .getStackForm(1L));
+ GregtechItemList.Machine_Adv_AssemblyLine.set(
+ new GregtechMetaTileEntity_Adv_AssemblyLine(
+ 31024,
+ "multimachine.adv.assemblyline",
+ "Compound Fabricator").getStackForm(1L));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java
index 81420275da..ebc6be40c9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java
@@ -5,17 +5,13 @@ public class GregtechFluidReactor {
public static void run() {
/*
- * GregtechItemList.FluidReactor_LV .set(new
- * GregtechMetaTileEntity_ChemicalReactor(31021, "chemicalplant.01.tier.01",
- * "Chemical Plant I", 1) .getStackForm(1L)); GregtechItemList.FluidReactor_HV
- * .set(new GregtechMetaTileEntity_ChemicalReactor(31022,
- * "chemicalplant.01.tier.02", "Chemical Plant II", 3) .getStackForm(1L));
- * GregtechItemList.FluidReactor_IV .set(new
- * GregtechMetaTileEntity_ChemicalReactor(31023, "chemicalplant.01.tier.03",
- * "Chemical Plant III", 5) .getStackForm(1L));
- * GregtechItemList.FluidReactor_ZPM .set(new
- * GregtechMetaTileEntity_ChemicalReactor(31024, "chemicalplant.01.tier.04",
- * "Chemical Plant IV", 7) .getStackForm(1L));
+ * GregtechItemList.FluidReactor_LV .set(new GregtechMetaTileEntity_ChemicalReactor(31021,
+ * "chemicalplant.01.tier.01", "Chemical Plant I", 1) .getStackForm(1L)); GregtechItemList.FluidReactor_HV
+ * .set(new GregtechMetaTileEntity_ChemicalReactor(31022, "chemicalplant.01.tier.02", "Chemical Plant II", 3)
+ * .getStackForm(1L)); GregtechItemList.FluidReactor_IV .set(new GregtechMetaTileEntity_ChemicalReactor(31023,
+ * "chemicalplant.01.tier.03", "Chemical Plant III", 5) .getStackForm(1L)); GregtechItemList.FluidReactor_ZPM
+ * .set(new GregtechMetaTileEntity_ChemicalReactor(31024, "chemicalplant.01.tier.04", "Chemical Plant IV", 7)
+ * .getStackForm(1L));
*/
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java
index f93f6e165a..5593f7a239 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java
@@ -12,11 +12,15 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEn
import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_SteamTurbine;
public class GregtechGeneratorsULV {
+
public static void run() {
- GregtechItemList.Generator_Diesel_ULV.set(new GT_MetaTileEntity_ULV_CombustionGenerator(
- 960, "basicgenerator.diesel.tier.00", "Simple Combustion Generator", 0)
- .getStackForm(1L));
+ GregtechItemList.Generator_Diesel_ULV.set(
+ new GT_MetaTileEntity_ULV_CombustionGenerator(
+ 960,
+ "basicgenerator.diesel.tier.00",
+ "Simple Combustion Generator",
+ 0).getStackForm(1L));
GregtechItemList.Generator_Gas_Turbine_ULV.set(
new GT_MetaTileEntity_ULV_GasTurbine(961, "basicgenerator.gas.tier.00", "Simple Gas Turbine", 0)
.getStackForm(1L));
@@ -25,56 +29,24 @@ public class GregtechGeneratorsULV {
.getStackForm(1L));
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Generator_Diesel_ULV.get(1L, new Object[0]), bitsd, new Object[] {
- "PCP",
- "EME",
- "GWG",
- 'M',
- ItemList.Hull_ULV,
- 'P',
- GregtechItemList.Electric_Piston_ULV,
- 'E',
- GregtechItemList.Electric_Motor_ULV,
- 'C',
- OrePrefixes.circuit.get(Materials.Primitive),
- 'W',
- OrePrefixes.cableGt01.get(Materials.RedAlloy),
- 'G',
- OrePrefixes.gearGt.get(Materials.Bronze)
- });
+ GregtechItemList.Generator_Diesel_ULV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_ULV, 'P', GregtechItemList.Electric_Piston_ULV,
+ 'E', GregtechItemList.Electric_Motor_ULV, 'C', OrePrefixes.circuit.get(Materials.Primitive),
+ 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'G',
+ OrePrefixes.gearGt.get(Materials.Bronze) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Generator_Gas_Turbine_ULV.get(1L, new Object[0]), bitsd, new Object[] {
- "CRC",
- "RMR",
- "EWE",
- 'M',
- ItemList.Hull_ULV,
- 'E',
- GregtechItemList.Electric_Motor_ULV,
- 'R',
- OrePrefixes.rotor.get(Materials.Tin),
- 'C',
- OrePrefixes.circuit.get(Materials.Primitive),
- 'W',
- OrePrefixes.cableGt01.get(Materials.RedAlloy)
- });
+ GregtechItemList.Generator_Gas_Turbine_ULV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "CRC", "RMR", "EWE", 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV,
+ 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive),
+ 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Generator_Steam_Turbine_ULV.get(1L, new Object[0]), bitsd, new Object[] {
- "PCP",
- "RMR",
- "EWE",
- 'M',
- ItemList.Hull_ULV,
- 'E',
- GregtechItemList.Electric_Motor_ULV,
- 'R',
- OrePrefixes.rotor.get(Materials.Tin),
- 'C',
- OrePrefixes.circuit.get(Materials.Primitive),
- 'W',
- OrePrefixes.cableGt01.get(Materials.RedAlloy),
- 'P',
- OrePrefixes.pipeMedium.get(Materials.Copper)
- });
+ GregtechItemList.Generator_Steam_Turbine_ULV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "PCP", "RMR", "EWE", 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV,
+ 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive),
+ 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P',
+ OrePrefixes.pipeMedium.get(Materials.Copper) });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
index cb8dfaf0c1..5a1638509c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -11,7 +13,6 @@ import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator;
-import net.minecraft.item.ItemStack;
public class GregtechGeothermalThermalGenerator {
@@ -25,88 +26,58 @@ public class GregtechGeothermalThermalGenerator {
}
private static void run1() {
- GregtechItemList.Geothermal_Engine_EV.set(new GregtechMetaTileEntityGeothermalGenerator(
- 830, "advancedgenerator.geothermalFuel.tier.01", "Basic Geothermal Engine", 4)
- .getStackForm(1L));
- GregtechItemList.Geothermal_Engine_IV.set(new GregtechMetaTileEntityGeothermalGenerator(
- 831, "advancedgenerator.geothermalFuel.tier.02", "Turbo Geothermal Engine", 5)
- .getStackForm(1L));
- GregtechItemList.Geothermal_Engine_LuV.set(new GregtechMetaTileEntityGeothermalGenerator(
- 832, "advancedgenerator.geothermalFuel.tier.03", "Vulcan Geothermal Engine", 6)
- .getStackForm(1L));
+ GregtechItemList.Geothermal_Engine_EV.set(
+ new GregtechMetaTileEntityGeothermalGenerator(
+ 830,
+ "advancedgenerator.geothermalFuel.tier.01",
+ "Basic Geothermal Engine",
+ 4).getStackForm(1L));
+ GregtechItemList.Geothermal_Engine_IV.set(
+ new GregtechMetaTileEntityGeothermalGenerator(
+ 831,
+ "advancedgenerator.geothermalFuel.tier.02",
+ "Turbo Geothermal Engine",
+ 5).getStackForm(1L));
+ GregtechItemList.Geothermal_Engine_LuV.set(
+ new GregtechMetaTileEntityGeothermalGenerator(
+ 832,
+ "advancedgenerator.geothermalFuel.tier.03",
+ "Vulcan Geothermal Engine",
+ 6).getStackForm(1L));
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Geothermal_Engine_EV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CEC",
- "GMG",
- "PWP",
- Character.valueOf('M'),
- ItemList.Hull_EV,
- Character.valueOf('P'),
- ItemList.Electric_Piston_EV,
- Character.valueOf('E'),
- ItemList.Electric_Motor_EV,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Ultimate),
- Character.valueOf('W'),
- OrePrefixes.cableGt04.get(Materials.Aluminium),
- Character.valueOf('G'),
- ALLOY.TANTALLOY_61.getGear(1)
- });
+ new Object[] { "CEC", "GMG", "PWP", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'),
+ ItemList.Electric_Piston_EV, Character.valueOf('E'), ItemList.Electric_Motor_EV,
+ Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
+ OrePrefixes.cableGt04.get(Materials.Aluminium), Character.valueOf('G'),
+ ALLOY.TANTALLOY_61.getGear(1) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Geothermal_Engine_IV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CEC",
- "GMG",
- "PWP",
- Character.valueOf('M'),
- ItemList.Hull_IV,
- Character.valueOf('P'),
- ItemList.Electric_Piston_IV,
- Character.valueOf('E'),
- ItemList.Electric_Motor_IV,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Superconductor),
- Character.valueOf('W'),
- OrePrefixes.cableGt04.get(Materials.Platinum),
- Character.valueOf('G'),
- ALLOY.STELLITE.getGear(1)
- });
+ new Object[] { "CEC", "GMG", "PWP", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'),
+ ItemList.Electric_Piston_IV, Character.valueOf('E'), ItemList.Electric_Motor_IV,
+ Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor),
+ Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum), Character.valueOf('G'),
+ ALLOY.STELLITE.getGear(1) });
final ItemStack INGREDIENT_1 = CI.electricPiston_LuV;
final ItemStack INGREDIENT_2 = CI.electricMotor_LuV;
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Geothermal_Engine_LuV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CEC",
- "GMG",
- "PWP",
- Character.valueOf('M'),
- ItemList.Hull_LuV,
- Character.valueOf('P'),
- INGREDIENT_1,
- Character.valueOf('E'),
- INGREDIENT_2,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Infinite),
- Character.valueOf('W'),
- OrePrefixes.cableGt04.get(Materials.Tungsten),
- Character.valueOf('G'),
- ALLOY.ZERON_100.getGear(1)
- });
+ new Object[] { "CEC", "GMG", "PWP", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'),
+ INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2, Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Infinite), Character.valueOf('W'),
+ OrePrefixes.cableGt04.get(Materials.Tungsten), Character.valueOf('G'),
+ ALLOY.ZERON_100.getGear(1) });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java
index 0e4e6a280b..02a28e5b1f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java
@@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
import static gtPlusPlus.core.lib.CORE.GTNH;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -11,14 +13,12 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp;
import gtPlusPlus.xmod.gregtech.common.StaticFields59;
-import net.minecraft.item.ItemStack;
public class GregtechHiAmpTransformer {
public static void run() {
- long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED;
int mID = 877;
@@ -29,90 +29,90 @@ public class GregtechHiAmpTransformer {
mHammerName = "Mallet";
}
- GregtechItemList.Transformer_HA_LV_ULV.set(new GregtechMetaTransformerHiAmp(
+ GregtechItemList.Transformer_HA_LV_ULV.set(
+ new GregtechMetaTransformerHiAmp(
mID++,
"transformer.ha.tier.00",
"ULV Hi-Amp Transformer",
0,
- "LV -> ULV (Use Soft " + mHammerName + " to invert)")
- .getStackForm(1L));
- GregtechItemList.Transformer_HA_MV_LV.set(new GregtechMetaTransformerHiAmp(
+ "LV -> ULV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
+ GregtechItemList.Transformer_HA_MV_LV.set(
+ new GregtechMetaTransformerHiAmp(
mID++,
"transformer.ha.tier.01",
"LV Hi-Amp Transformer",
1,
- "MV -> LV (Use Soft " + mHammerName + " to invert)")
- .getStackForm(1L));
- GregtechItemList.Transformer_HA_HV_MV.set(new GregtechMetaTransformerHiAmp(
+ "MV -> LV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
+ GregtechItemList.Transformer_HA_HV_MV.set(
+ new GregtechMetaTransformerHiAmp(
mID++,
"transformer.ha.tier.02",
"MV Hi-Amp Transformer",
2,
- "HV -> MV (Use Soft " + mHammerName + " to invert)")
- .getStackForm(1L));
- GregtechItemList.Transformer_HA_EV_HV.set(new GregtechMetaTransformerHiAmp(
+ "HV -> MV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
+ GregtechItemList.Transformer_HA_EV_HV.set(
+ new GregtechMetaTransformerHiAmp(
mID++,
"transformer.ha.tier.03",
"HV Hi-Amp Transformer",
3,
- "EV -> HV (Use Soft " + mHammerName + " to invert)")
- .getStackForm(1L));
- GregtechItemList.Transformer_HA_IV_EV.set(new GregtechMetaTransformerHiAmp(
+ "EV -> HV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
+ GregtechItemList.Transformer_HA_IV_EV.set(
+ new GregtechMetaTransformerHiAmp(
mID++,
"transformer.ha.tier.04",
"EV Hi-Amp Transformer",
4,
- "IV -> EV (Use Soft " + mHammerName + " to invert)")
- .getStackForm(1L));
- GregtechItemList.Transformer_HA_LuV_IV.set(new GregtechMetaTransformerHiAmp(
+ "IV -> EV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
+ GregtechItemList.Transformer_HA_LuV_IV.set(
+ new GregtechMetaTransformerHiAmp(
mID++,
"transformer.ha.tier.05",
"IV Hi-Amp Transformer",
5,
- "LuV -> IV (Use Soft " + mHammerName + " to invert)")
- .getStackForm(1L));
- GregtechItemList.Transformer_HA_ZPM_LuV.set(new GregtechMetaTransformerHiAmp(
+ "LuV -> IV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
+ GregtechItemList.Transformer_HA_ZPM_LuV.set(
+ new GregtechMetaTransformerHiAmp(
mID++,
"transformer.ha.tier.06",
"LuV Hi-Amp Transformer",
6,
- "ZPM -> LuV (Use Soft " + mHammerName + " to invert)")
- .getStackForm(1L));
- GregtechItemList.Transformer_HA_UV_ZPM.set(new GregtechMetaTransformerHiAmp(
+ "ZPM -> LuV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
+ GregtechItemList.Transformer_HA_UV_ZPM.set(
+ new GregtechMetaTransformerHiAmp(
mID++,
"transformer.ha.tier.07",
"ZPM Hi-Amp Transformer",
7,
- "UV -> ZPM (Use Soft " + mHammerName + " to invert)")
- .getStackForm(1L));
+ "UV -> ZPM (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
if (!GTNH) {
- GregtechItemList.Transformer_HA_MAX_UV.set(new GregtechMetaTransformerHiAmp(
+ GregtechItemList.Transformer_HA_MAX_UV.set(
+ new GregtechMetaTransformerHiAmp(
mID++,
"transformer.ha.tier.08",
"UV Hi-Amp Transformer",
8,
- "Any Voltage -> UV (Use Soft " + mHammerName + " to invert)")
- .getStackForm(1L));
+ "Any Voltage -> UV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
} else {
- GregtechItemList.Transformer_HA_MAX_UV.set(new GregtechMetaTransformerHiAmp(
+ GregtechItemList.Transformer_HA_MAX_UV.set(
+ new GregtechMetaTransformerHiAmp(
mID++,
"transformer.ha.tier.08",
"UV Hi-Amp Transformer",
8,
- "UHV -> UV (Use Soft " + mHammerName + " to invert)")
- .getStackForm(1L));
+ "UHV -> UV (Use Soft " + mHammerName + " to invert)").getStackForm(1L));
}
ItemStack mItem_1;
ItemStack mItem_2;
ItemStack mItem_3;
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- mItem_1 = ItemUtils.simpleMetaStack(
- ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 3, 1);
- mItem_2 = ItemUtils.simpleMetaStack(
- ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 4, 1);
- mItem_3 = ItemUtils.simpleMetaStack(
- ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 9, 1);
+ mItem_1 = ItemUtils
+ .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 3, 1);
+ mItem_2 = ItemUtils
+ .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 4, 1);
+ mItem_3 = ItemUtils
+ .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 9, 1);
} else {
mItem_1 = ItemList.Circuit_Elite.get(1);
mItem_2 = ItemList.Circuit_Master.get(1);
@@ -121,246 +121,126 @@ public class GregtechHiAmpTransformer {
if (!GTNH) {
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]), bitsd, new Object[] {
- " BB",
- "CM ",
- " BB",
- Character.valueOf('M'),
- ItemList.Hull_ULV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Tin),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Lead)
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]), bitsd, new Object[] {
- " BB",
- "CM ",
- " BB",
- Character.valueOf('M'),
- ItemList.Hull_LV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Copper),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Tin)
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]), bitsd, new Object[] {
- " BB",
- "CM ",
- " BB",
- Character.valueOf('M'),
- ItemList.Hull_MV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Gold),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.AnnealedCopper)
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Hull_HV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Aluminium),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Gold),
- Character.valueOf('K'),
- ItemList.Casing_Coil_Cupronickel
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Hull_EV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Tungsten),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Aluminium),
- Character.valueOf('K'),
- ItemList.Casing_Coil_Kanthal
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Hull_IV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Tungsten),
- Character.valueOf('K'),
- ItemList.Casing_Coil_Nichrome
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Hull_LuV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Naquadah),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
- Character.valueOf('K'),
- mItem_1
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Hull_ZPM,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Naquadah),
- Character.valueOf('K'),
- mItem_2
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Hull_UV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Bedrockium),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
- Character.valueOf('K'),
- mItem_3
- });
+ GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Hull_ULV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tin), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.Lead) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Hull_LV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Copper), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.Tin) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Hull_MV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.AnnealedCopper) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_HV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Aluminium),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('K'),
+ ItemList.Casing_Coil_Cupronickel });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_EV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tungsten),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Aluminium),
+ Character.valueOf('K'), ItemList.Casing_Coil_Kanthal });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_IV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Tungsten),
+ Character.valueOf('K'), ItemList.Casing_Coil_Nichrome });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_LuV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Naquadah),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
+ Character.valueOf('K'), mItem_1 });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_ZPM,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Naquadah),
+ Character.valueOf('K'), mItem_2 });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_UV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Bedrockium),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
+ Character.valueOf('K'), mItem_3 });
} else {
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]), bitsd, new Object[] {
- " BB",
- "CM ",
- " BB",
- Character.valueOf('M'),
- ItemList.Transformer_LV_ULV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Tin),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Lead)
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]), bitsd, new Object[] {
- " BB",
- "CM ",
- " BB",
- Character.valueOf('M'),
- ItemList.Transformer_MV_LV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.AnyCopper),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Tin)
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]), bitsd, new Object[] {
- " BB",
- "CM ",
- " BB",
- Character.valueOf('M'),
- ItemList.Transformer_HV_MV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Gold),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.AnyCopper)
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Transformer_EV_HV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Aluminium),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Gold),
- Character.valueOf('K'),
- ItemList.Casing_Coil_Cupronickel
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Transformer_IV_EV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Tungsten),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Aluminium),
- Character.valueOf('K'),
- ItemList.Casing_Coil_Kanthal
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Transformer_LuV_IV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Tungsten),
- Character.valueOf('K'),
- ItemList.Casing_Coil_Nichrome
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Transformer_ZPM_LuV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Naquadah),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
- Character.valueOf('K'),
- mItem_1
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Transformer_UV_ZPM,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.Naquadah),
- Character.valueOf('K'),
- mItem_2
- });
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]), bitsd, new Object[] {
- "KBB",
- "CM ",
- "KBB",
- Character.valueOf('M'),
- ItemList.Transformer_MAX_UV,
- Character.valueOf('C'),
- OrePrefixes.wireGt04.get(Materials.Bedrockium),
- Character.valueOf('B'),
- OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
- Character.valueOf('K'),
- mItem_3
- });
+ GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_LV_ULV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tin), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.Lead) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_MV_LV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.AnyCopper),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Tin) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_HV_MV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('B'),
+ OrePrefixes.wireGt04.get(Materials.AnyCopper) });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_EV_HV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Aluminium),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('K'),
+ ItemList.Casing_Coil_Cupronickel });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_IV_EV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tungsten),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Aluminium),
+ Character.valueOf('K'), ItemList.Casing_Coil_Kanthal });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_LuV_IV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Tungsten),
+ Character.valueOf('K'), ItemList.Casing_Coil_Nichrome });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_ZPM_LuV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Naquadah),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium),
+ Character.valueOf('K'), mItem_1 });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_UV_ZPM,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Naquadah),
+ Character.valueOf('K'), mItem_2 });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_MAX_UV,
+ Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Bedrockium),
+ Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy),
+ Character.valueOf('K'), mItem_3 });
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java
index a115160b51..0ee6ce78d4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java
@@ -14,8 +14,10 @@ public class GregtechIndustrialAlloySmelter {
}
private static void run1() {
- GregtechItemList.Industrial_AlloySmelter.set(new GregtechMetaTileEntity_IndustrialAlloySmelter(
- 31023, "industrialalloysmelter.controller.tier.single", "Zyngen")
- .getStackForm(1L));
+ GregtechItemList.Industrial_AlloySmelter.set(
+ new GregtechMetaTileEntity_IndustrialAlloySmelter(
+ 31023,
+ "industrialalloysmelter.controller.tier.single",
+ "Zyngen").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java
index e6afc8f352..95d80847af 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java
@@ -15,8 +15,10 @@ public class GregtechIndustrialArcFurnace {
private static void run1() {
// Industrial Arc Furnace Multiblock
- GregtechItemList.Industrial_Arc_Furnace.set(new GregtechMetaTileEntity_IndustrialArcFurnace(
- 862, "industrialarcfurnace.controller.tier.single", "High Current Industrial Arc Furnace")
- .getStackForm(1L));
+ GregtechItemList.Industrial_Arc_Furnace.set(
+ new GregtechMetaTileEntity_IndustrialArcFurnace(
+ 862,
+ "industrialarcfurnace.controller.tier.single",
+ "High Current Industrial Arc Furnace").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
index 2214aba514..f0a0bbd6aa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java
@@ -19,11 +19,15 @@ public class GregtechIndustrialBlastSmelter {
private static void run1() {
// Industrial Alloy Blast Smelter Multiblock
- GregtechItemList.Industrial_AlloyBlastSmelter.set(new GregtechMetaTileEntity_AlloyBlastSmelter(
- 810, "industrialsalloyamelter.controller.tier.single", "Alloy Blast Smelter")
- .getStackForm(1L));
- GregtechItemList.Mega_AlloyBlastSmelter.set(new GregTechMetaTileEntity_MegaAlloyBlastSmelter(
- 31150, "industrialsalloyamelter.controller.tier.mega", "Mega Alloy Blast Smelter")
- .getStackForm(1L));
+ GregtechItemList.Industrial_AlloyBlastSmelter.set(
+ new GregtechMetaTileEntity_AlloyBlastSmelter(
+ 810,
+ "industrialsalloyamelter.controller.tier.single",
+ "Alloy Blast Smelter").getStackForm(1L));
+ GregtechItemList.Mega_AlloyBlastSmelter.set(
+ new GregTechMetaTileEntity_MegaAlloyBlastSmelter(
+ 31150,
+ "industrialsalloyamelter.controller.tier.mega",
+ "Mega Alloy Blast Smelter").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
index 2a346a26c9..edeec33ec2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
@@ -18,8 +18,10 @@ public class GregtechIndustrialCentrifuge {
private static void run1() {
// Industrial Centrifuge Multiblock
- GregtechItemList.Industrial_Centrifuge.set(new GregtechMetaTileEntity_IndustrialCentrifuge(
- 790, "industrialcentrifuge.controller.tier.single", "Industrial Centrifuge")
- .getStackForm(1L));
+ GregtechItemList.Industrial_Centrifuge.set(
+ new GregtechMetaTileEntity_IndustrialCentrifuge(
+ 790,
+ "industrialcentrifuge.controller.tier.single",
+ "Industrial Centrifuge").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java
index 5d5c4e43e1..feefd45619 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java
@@ -17,8 +17,10 @@ public class GregtechIndustrialChisel {
new GregtechMetaTileEntity_AutoChisel(31068, "chisel.tier.03", "Precision Auto-Chisel", 3)
.getStackForm(1L));
- GregtechItemList.Controller_IndustrialAutoChisel.set(new GregtechMetaTileEntity_IndustrialChisel(
- 31069, "multimachine.adv.chisel", "Industrial 3D Copying Machine")
- .getStackForm(1L));
+ GregtechItemList.Controller_IndustrialAutoChisel.set(
+ new GregtechMetaTileEntity_IndustrialChisel(
+ 31069,
+ "multimachine.adv.chisel",
+ "Industrial 3D Copying Machine").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
index 578e4cd3fe..0f989692cc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
@@ -18,8 +18,10 @@ public class GregtechIndustrialCokeOven {
private static void run1() {
// Industrial Centrifuge Multiblock
- GregtechItemList.Industrial_CokeOven.set(new GregtechMetaTileEntity_IndustrialCokeOven(
- 791, "industrialcokeoven.controller.tier.single", "Industrial Coke Oven")
- .getStackForm(1L));
+ GregtechItemList.Industrial_CokeOven.set(
+ new GregtechMetaTileEntity_IndustrialCokeOven(
+ 791,
+ "industrialcokeoven.controller.tier.single",
+ "Industrial Coke Oven").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java
index 118fa05099..ed7076b8a8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java
@@ -18,8 +18,10 @@ public class GregtechIndustrialCuttingFactory {
private static void run1() {
// Industrial Wire Factory Multiblock
- GregtechItemList.Industrial_CuttingFactoryController.set(new GregtechMetaTileEntity_IndustrialCuttingMachine(
- 992, "industrialcuttingmachine.controller.tier.01", "Cutting Factory Controller")
- .getStackForm(1L));
+ GregtechItemList.Industrial_CuttingFactoryController.set(
+ new GregtechMetaTileEntity_IndustrialCuttingMachine(
+ 992,
+ "industrialcuttingmachine.controller.tier.01",
+ "Cutting Factory Controller").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
index 89f6f62ef9..99d13981e0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
@@ -18,8 +18,10 @@ public class GregtechIndustrialElectrolyzer {
private static void run1() {
// Industrial Electrolyzer Multiblock
- GregtechItemList.Industrial_Electrolyzer.set(new GregtechMetaTileEntity_IndustrialElectrolyzer(
- 796, "industrialelectrolyzer.controller.tier.single", "Industrial Electrolyzer")
- .getStackForm(1L));
+ GregtechItemList.Industrial_Electrolyzer.set(
+ new GregtechMetaTileEntity_IndustrialElectrolyzer(
+ 796,
+ "industrialelectrolyzer.controller.tier.single",
+ "Industrial Electrolyzer").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java
index 705d5f02e9..8e1607087d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java
@@ -14,8 +14,11 @@ public class GregtechIndustrialElementDuplicator {
GregtechItemList.Controller_ElementalDuplicator.set(
new GregtechMTE_ElementalDuplicator(31050, "gtpp.multimachine.replicator", "Elemental Duplicator")
.getStackForm(1L));
- GregtechItemList.Hatch_Input_Elemental_Duplicator.set(new GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(
- 31051, "hatch.input_bus.elementalorbholder", "Data Orb Repository", 7)
- .getStackForm(1L));
+ GregtechItemList.Hatch_Input_Elemental_Duplicator.set(
+ new GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(
+ 31051,
+ "hatch.input_bus.elementalorbholder",
+ "Data Orb Repository",
+ 7).getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java
index 40396ded0b..0a591a640b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java
@@ -18,8 +18,10 @@ public class GregtechIndustrialExtruder {
private static void run1() {
// Industrial Presser Multiblock
- GregtechItemList.Industrial_Extruder.set(new GregtechMetaTileEntity_IndustrialExtruder(
- 859, "industrialextruder.controller.tier.single", "Industrial Extrusion Machine")
- .getStackForm(1L));
+ GregtechItemList.Industrial_Extruder.set(
+ new GregtechMetaTileEntity_IndustrialExtruder(
+ 859,
+ "industrialextruder.controller.tier.single",
+ "Industrial Extrusion Machine").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java
index b37216b343..bc03c6e277 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java
@@ -16,8 +16,10 @@ public class GregtechIndustrialFishPond {
}
private static void run1() {
- GregtechItemList.Industrial_FishingPond.set(new GregtechMetaTileEntity_IndustrialFishingPond(
- 829, "industrial.fishpond.controller.tier.single", "Zhuhai - Fishing Port")
- .getStackForm(1L));
+ GregtechItemList.Industrial_FishingPond.set(
+ new GregtechMetaTileEntity_IndustrialFishingPond(
+ 829,
+ "industrial.fishpond.controller.tier.single",
+ "Zhuhai - Fishing Port").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java
index a1eb79b5b1..878abd4409 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java
@@ -14,8 +14,10 @@ public class GregtechIndustrialFluidHeater {
}
private static void run1() {
- GregtechItemList.Controller_IndustrialFluidHeater.set(new GregtechMetaTileEntity_IndustrialFluidHeater(
- 31077, "industrialfluidheater.controller.tier.single", "Thermic Heating Device")
- .getStackForm(1L));
+ GregtechItemList.Controller_IndustrialFluidHeater.set(
+ new GregtechMetaTileEntity_IndustrialFluidHeater(
+ 31077,
+ "industrialfluidheater.controller.tier.single",
+ "Thermic Heating Device").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java
index 2064d15c2b..67f95cbcda 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java
@@ -14,8 +14,10 @@ public class GregtechIndustrialForgeHammer {
}
private static void run1() {
- GregtechItemList.Controller_IndustrialForgeHammer.set(new GregtechMetaTileEntity_IndustrialForgeHammer(
- 31075, "industrialhammer.controller.tier.single", "Industrial Sledgehammer")
- .getStackForm(1L));
+ GregtechItemList.Controller_IndustrialForgeHammer.set(
+ new GregtechMetaTileEntity_IndustrialForgeHammer(
+ 31075,
+ "industrialhammer.controller.tier.single",
+ "Industrial Sledgehammer").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
index 29568c32cc..a73ad190ca 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
@@ -18,8 +18,10 @@ public class GregtechIndustrialFuelRefinery {
private static void run1() {
// Industrial Maceration Stack Multiblock
- GregtechItemList.Industrial_FuelRefinery.set(new GregtechMetaTileEntity_Refinery(
- 835, "industrialrefinery.controller.tier.single", "Reactor Fuel Processing Plant")
- .getStackForm(1L));
+ GregtechItemList.Industrial_FuelRefinery.set(
+ new GregtechMetaTileEntity_Refinery(
+ 835,
+ "industrialrefinery.controller.tier.single",
+ "Reactor Fuel Processing Plant").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java
index e9ad7309d3..e356de6398 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java
@@ -17,8 +17,10 @@ public class GregtechIndustrialGeneratorArray {
private static void run1() {
// Industrial Maceration Stack Multiblock
- GregtechItemList.Generator_Array_Controller.set(new GregtechMetaTileEntityGeneratorArray(
- 990, "generatorarray.controller.tier.01", "Large Generator Array")
- .getStackForm(1L));
+ GregtechItemList.Generator_Array_Controller.set(
+ new GregtechMetaTileEntityGeneratorArray(
+ 990,
+ "generatorarray.controller.tier.01",
+ "Large Generator Array").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
index 6ceb0cc089..9bcf0a44bb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
@@ -18,8 +18,10 @@ public class GregtechIndustrialMacerator {
private static void run1() {
// Industrial Maceration Stack Multiblock
- GregtechItemList.Industrial_MacerationStack.set(new GregtechMetaTileEntity_IndustrialMacerator(
- 797, "industrialmacerator.controller.tier.single", "Maceration Stack Controller")
- .getStackForm(1L));
+ GregtechItemList.Industrial_MacerationStack.set(
+ new GregtechMetaTileEntity_IndustrialMacerator(
+ 797,
+ "industrialmacerator.controller.tier.single",
+ "Maceration Stack Controller").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
index 6133919b30..997a5f7a7c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.util.GTPP_Recipe;
@@ -10,8 +13,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_MassFabricator;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechIndustrialMassFabricator {
@@ -27,9 +28,11 @@ public class GregtechIndustrialMassFabricator {
private static void run1() {
// Industrial Matter Fabricator Multiblock
- GregtechItemList.Industrial_MassFab.set(new GregtechMetaTileEntity_MassFabricator(
- 799, "industrialmassfab.controller.tier.single", "Matter Fabrication CPU")
- .getStackForm(1L));
+ GregtechItemList.Industrial_MassFab.set(
+ new GregtechMetaTileEntity_MassFabricator(
+ 799,
+ "industrialmassfab.controller.tier.single",
+ "Matter Fabrication CPU").getStackForm(1L));
}
private static void generateRecipes() {
@@ -39,24 +42,24 @@ public class GregtechIndustrialMassFabricator {
// Basic UUA1
GT_Recipe UUA_From_Scrap = new GTPP_Recipe(
false,
- new ItemStack[] {CI.getNumberedCircuit(9), ItemUtils.getSimpleStack(getScrapPile(), 9)},
- new ItemStack[] {GT_Values.NI},
+ new ItemStack[] { CI.getNumberedCircuit(9), ItemUtils.getSimpleStack(getScrapPile(), 9) },
+ new ItemStack[] { GT_Values.NI },
null,
null,
- new FluidStack[] {GT_Values.NF},
- new FluidStack[] {Materials.UUAmplifier.getFluid(1)},
+ new FluidStack[] { GT_Values.NF },
+ new FluidStack[] { Materials.UUAmplifier.getFluid(1) },
9 * 20,
32,
0);
// Basic UUA2
GT_Recipe UUA_From_ScrapBoxes = new GTPP_Recipe(
false,
- new ItemStack[] {CI.getNumberedCircuit(19), ItemUtils.getSimpleStack(getScrapBox(), 1)},
- new ItemStack[] {GT_Values.NI},
+ new ItemStack[] { CI.getNumberedCircuit(19), ItemUtils.getSimpleStack(getScrapBox(), 1) },
+ new ItemStack[] { GT_Values.NI },
null,
null,
- new FluidStack[] {GT_Values.NF},
- new FluidStack[] {Materials.UUAmplifier.getFluid(1)},
+ new FluidStack[] { GT_Values.NF },
+ new FluidStack[] { Materials.UUAmplifier.getFluid(1) },
9 * 20,
32,
0);
@@ -68,12 +71,12 @@ public class GregtechIndustrialMassFabricator {
// Basic UUM
GT_Recipe generateUUM = new GTPP_Recipe(
false,
- new ItemStack[] {CI.getNumberedCircuit(1)},
- new ItemStack[] {GT_Values.NI},
+ new ItemStack[] { CI.getNumberedCircuit(1) },
+ new ItemStack[] { GT_Values.NI },
null,
null,
- new FluidStack[] {GT_Values.NF},
- new FluidStack[] {Materials.UUMatter.getFluid(1)},
+ new FluidStack[] { GT_Values.NF },
+ new FluidStack[] { Materials.UUMatter.getFluid(1) },
160 * 20,
32,
0);
@@ -81,12 +84,12 @@ public class GregtechIndustrialMassFabricator {
// Basic UUM
GT_Recipe generateUUMFromUUA = new GTPP_Recipe(
false,
- new ItemStack[] {CI.getNumberedCircuit(2)},
- new ItemStack[] {GT_Values.NI},
+ new ItemStack[] { CI.getNumberedCircuit(2) },
+ new ItemStack[] { GT_Values.NI },
null,
null,
- new FluidStack[] {Materials.UUAmplifier.getFluid(1)},
- new FluidStack[] {Materials.UUMatter.getFluid(1)},
+ new FluidStack[] { Materials.UUAmplifier.getFluid(1) },
+ new FluidStack[] { Materials.UUMatter.getFluid(1) },
40 * 20,
32,
0);
@@ -97,12 +100,12 @@ public class GregtechIndustrialMassFabricator {
// Basic UUM
GT_Recipe generateUUM_LV = new GTPP_Recipe(
false,
- new ItemStack[] {CI.getNumberedCircuit(1)},
- new ItemStack[] {GT_Values.NI},
+ new ItemStack[] { CI.getNumberedCircuit(1) },
+ new ItemStack[] { GT_Values.NI },
null,
null,
- new FluidStack[] {GT_Values.NF},
- new FluidStack[] {Materials.UUMatter.getFluid(1)},
+ new FluidStack[] { GT_Values.NF },
+ new FluidStack[] { Materials.UUMatter.getFluid(1) },
160 * 20,
256,
0);
@@ -110,12 +113,12 @@ public class GregtechIndustrialMassFabricator {
// Basic UUM
GT_Recipe generateUUMFromUUA_LV = new GTPP_Recipe(
false,
- new ItemStack[] {CI.getNumberedCircuit(2)},
- new ItemStack[] {GT_Values.NI},
+ new ItemStack[] { CI.getNumberedCircuit(2) },
+ new ItemStack[] { GT_Values.NI },
null,
null,
- new FluidStack[] {Materials.UUAmplifier.getFluid(1)},
- new FluidStack[] {Materials.UUMatter.getFluid(1)},
+ new FluidStack[] { Materials.UUAmplifier.getFluid(1) },
+ new FluidStack[] { Materials.UUMatter.getFluid(1) },
40 * 20,
256,
0);
@@ -124,8 +127,9 @@ public class GregtechIndustrialMassFabricator {
GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_LV);
}
- Logger.INFO("Generated " + GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.mRecipeList.size()
- + " Matter Fabricator recipes.");
+ Logger.INFO(
+ "Generated " + GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.mRecipeList.size()
+ + " Matter Fabricator recipes.");
}
public static ItemStack getScrapPile() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java
index aaa39c906d..fe348b0982 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java
@@ -18,8 +18,10 @@ public class GregtechIndustrialMixer {
private static void run1() {
// Industrial Mixer Multiblock
- GregtechItemList.Industrial_Mixer.set(new GregtechMetaTileEntity_IndustrialMixer(
- 811, "industrialmixer.controller.tier.single", "Industrial Mixing Machine")
- .getStackForm(1L));
+ GregtechItemList.Industrial_Mixer.set(
+ new GregtechMetaTileEntity_IndustrialMixer(
+ 811,
+ "industrialmixer.controller.tier.single",
+ "Industrial Mixing Machine").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java
index 06b18b3d7b..aa824c9cce 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java
@@ -17,8 +17,10 @@ public class GregtechIndustrialMultiMachine {
}
private static void run1() {
- GregtechItemList.Industrial_MultiMachine.set(new GregtechMetaTileEntity_IndustrialMultiMachine(
- 860, "industrialmultimachine.controller.tier.single", "Large Processing Factory")
- .getStackForm(1L));
+ GregtechItemList.Industrial_MultiMachine.set(
+ new GregtechMetaTileEntity_IndustrialMultiMachine(
+ 860,
+ "industrialmultimachine.controller.tier.single",
+ "Large Processing Factory").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java
index f9662cfa0c..e17b8f22a2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java
@@ -1,28 +1,10 @@
/*
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-
-public class GregtechIndustrialMultiTank {
-
- public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks.");
- if (CORE.ConfigSwitches.enableMultiblock_MultiTank) {
- run1();
- }
- }
-
- }
-
- private static void run1() {
- GregtechItemList.Industrial_MultiTank
- .set(new GregtechMetaTileEntity_MultiTank(827, "multitank.controller.tier.single", "Gregtech Multitank")
- .getStackForm(1L));
- // GregtechItemList.Industrial_MultiTankDense.set(new
- // GregtechMetaTileEntityMultiTankDense(828,
- // "multitankdense.controller.tier.single", "Gregtech Dense
- // Multitank").getStackForm(1L));
-
- }
-}
-*/
+ * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechIndustrialMultiTank { public static void
+ * run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
+ * Logger.INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks."); if
+ * (CORE.ConfigSwitches.enableMultiblock_MultiTank) { run1(); } } } private static void run1() {
+ * GregtechItemList.Industrial_MultiTank .set(new GregtechMetaTileEntity_MultiTank(827,
+ * "multitank.controller.tier.single", "Gregtech Multitank") .getStackForm(1L)); //
+ * GregtechItemList.Industrial_MultiTankDense.set(new // GregtechMetaTileEntityMultiTankDense(828, //
+ * "multitankdense.controller.tier.single", "Gregtech Dense // Multitank").getStackForm(1L)); } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
index 2f73addbbd..5aeb63fcd0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
@@ -18,8 +18,10 @@ public class GregtechIndustrialPlatePress {
private static void run1() {
// Industrial Presser Multiblock
- GregtechItemList.Industrial_PlatePress.set(new GregtechMetaTileEntity_IndustrialPlatePress(
- 792, "industrialbender.controller.tier.single", "Industrial Material Press")
- .getStackForm(1L));
+ GregtechItemList.Industrial_PlatePress.set(
+ new GregtechMetaTileEntity_IndustrialPlatePress(
+ 792,
+ "industrialbender.controller.tier.single",
+ "Industrial Material Press").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java
index c490ef2b81..b300a5e77c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java
@@ -6,8 +6,10 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechIndustrialRockBreaker {
public static void run() {
- GregtechItemList.Controller_IndustrialRockBreaker.set(new GregtechMetaTileEntity_IndustrialRockBreaker(
- 31065, "industrialrockcrusher.controller.tier.single", "Boldarnator")
- .getStackForm(1L));
+ GregtechItemList.Controller_IndustrialRockBreaker.set(
+ new GregtechMetaTileEntity_IndustrialRockBreaker(
+ 31065,
+ "industrialrockcrusher.controller.tier.single",
+ "Boldarnator").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
index c474b5f6c0..da538eb776 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
@@ -17,8 +17,10 @@ public class GregtechIndustrialSifter {
}
private static void run1() {
- GregtechItemList.Industrial_Sifter.set(new GregtechMetaTileEntity_IndustrialSifter(
- 840, "industrialsifter.controller.tier.single", "Large Sifter Control Block")
- .getStackForm(1L));
+ GregtechItemList.Industrial_Sifter.set(
+ new GregtechMetaTileEntity_IndustrialSifter(
+ 840,
+ "industrialsifter.controller.tier.single",
+ "Large Sifter Control Block").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java
index 00552d9f3a..ec647ba787 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java
@@ -17,8 +17,10 @@ public class GregtechIndustrialThermalCentrifuge {
}
private static void run1() {
- GregtechItemList.Industrial_ThermalCentrifuge.set(new GregtechMetaTileEntity_IndustrialThermalCentrifuge(
- 849, "industrialthermalcentrifuge.controller.tier.single", "Large Thermal Refinery")
- .getStackForm(1L));
+ GregtechItemList.Industrial_ThermalCentrifuge.set(
+ new GregtechMetaTileEntity_IndustrialThermalCentrifuge(
+ 849,
+ "industrialthermalcentrifuge.controller.tier.single",
+ "Large Thermal Refinery").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java
index e1d48b3395..8093f1fcc1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java
@@ -17,8 +17,10 @@ public class GregtechIndustrialWashPlant {
}
private static void run1() {
- GregtechItemList.Industrial_WashPlant.set(new GregtechMetaTileEntity_IndustrialWashPlant(
- 850, "industrialwashplant.controller.tier.single", "Ore Washing Plant")
- .getStackForm(1L));
+ GregtechItemList.Industrial_WashPlant.set(
+ new GregtechMetaTileEntity_IndustrialWashPlant(
+ 850,
+ "industrialwashplant.controller.tier.single",
+ "Ore Washing Plant").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
index 456b55bf7b..e16a6fe09e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
@@ -18,8 +18,10 @@ public class GregtechIndustrialWiremill {
private static void run1() {
// Industrial Wire Factory Multiblock
- GregtechItemList.Industrial_WireFactory.set(new GregtechMetaTileEntity_IndustrialWireMill(
- 798, "industrialwiremill.controller.tier.single", "Wire Factory Controller")
- .getStackForm(1L));
+ GregtechItemList.Industrial_WireFactory.set(
+ new GregtechMetaTileEntity_IndustrialWireMill(
+ 798,
+ "industrialwiremill.controller.tier.single",
+ "Wire Factory Controller").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
index 5a7b082dd5..c38e386c0f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
@@ -17,8 +17,10 @@ public class GregtechIronBlastFurnace {
}
private static void run1() {
- GregtechItemList.Machine_Iron_BlastFurnace.set(new GregtechMetaTileEntity_IronBlastFurnace(
- 768, "ironmachine.blastfurnace", "Iron Plated Blast Furnace")
- .getStackForm(1L));
+ GregtechItemList.Machine_Iron_BlastFurnace.set(
+ new GregtechMetaTileEntity_IronBlastFurnace(
+ 768,
+ "ironmachine.blastfurnace",
+ "Iron Plated Blast Furnace").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java
index 05993e06a6..aebe678984 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java
@@ -34,10 +34,12 @@ public class GregtechLargeTurbinesAndHeatExchanger {
new GT_MTE_LargeTurbine_SCSteam(31076, "multimachine.largerscturbine", "XL Turbo SC Steam Turbine")
.getStackForm(1L));
}
- GregtechItemList.Hatch_Turbine_Rotor.set(
- new GT_MetaTileEntity_Hatch_Turbine(30010, "hatch.turbine", "Rotor Assembly", 8).getStackForm(1L));
- GregtechItemList.XL_HeatExchanger.set(new GregtechMetaTileEntity_Adv_HeatExchanger(
- 31079, "multimachine.reallybigheatexchanger", "Whakawhiti Wera XL")
- .getStackForm(1L));
+ GregtechItemList.Hatch_Turbine_Rotor
+ .set(new GT_MetaTileEntity_Hatch_Turbine(30010, "hatch.turbine", "Rotor Assembly", 8).getStackForm(1L));
+ GregtechItemList.XL_HeatExchanger.set(
+ new GregtechMetaTileEntity_Adv_HeatExchanger(
+ 31079,
+ "multimachine.reallybigheatexchanger",
+ "Whakawhiti Wera XL").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java
index dead66b933..ca2b1237c3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java
@@ -1,39 +1,13 @@
/*
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-
-public class GregtechMiniRaFusion {
-
- public static void run() {
- // Register the Simple Fusion Entity.
- GregtechItemList.Miniature_Fusion.set(new GregtechMTE_MiniFusionPlant(31015, "gtplusplus.fusion.single", "Helium Prime").getStackForm(1L));
- GregtechItemList.Plasma_Tank.set(new GT_MetaTileEntity_Hatch_Plasma(31016, "gtplusplus.tank.plasma", "Plasma Tank").getStackForm(1L));
-
- }
-
- public static boolean generateSlowFusionrecipes() {
- for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList){
- if (x.mEnabled) {
- GT_Recipe y = x.copy();
- y.mDuration *= 16;
- long z = y.mEUt * 4;
- if (z > Integer.MAX_VALUE) {
- y.mEnabled = false;
- continue;
- }
- y.mEUt = (int) Math.min(Math.max(0, z), Integer.MAX_VALUE);
- y.mCanBeBuffered = true;
- GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes.add(y);
- }
- }
- int mRecipeCount = GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes.mRecipeList.size();
- if (mRecipeCount > 0) {
- Logger.INFO("[Pocket Fusion] Generated "+mRecipeCount+" recipes for the Pocket Fusion Reactor.");
- return true;
- }
- return false;
- }
-
-
-}
-*/
+ * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechMiniRaFusion { public static void run()
+ * { // Register the Simple Fusion Entity. GregtechItemList.Miniature_Fusion.set(new GregtechMTE_MiniFusionPlant(31015,
+ * "gtplusplus.fusion.single", "Helium Prime").getStackForm(1L)); GregtechItemList.Plasma_Tank.set(new
+ * GT_MetaTileEntity_Hatch_Plasma(31016, "gtplusplus.tank.plasma", "Plasma Tank").getStackForm(1L)); } public static
+ * boolean generateSlowFusionrecipes() { for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList){ if
+ * (x.mEnabled) { GT_Recipe y = x.copy(); y.mDuration *= 16; long z = y.mEUt * 4; if (z > Integer.MAX_VALUE) {
+ * y.mEnabled = false; continue; } y.mEUt = (int) Math.min(Math.max(0, z), Integer.MAX_VALUE); y.mCanBeBuffered = true;
+ * GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes.add(y); } } int mRecipeCount =
+ * GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes.mRecipeList.size(); if (mRecipeCount > 0) {
+ * Logger.INFO("[Pocket Fusion] Generated "+mRecipeCount+" recipes for the Pocket Fusion Reactor."); return true; }
+ * return false; } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java
index 1e024389fe..7d1d77f1b4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java
@@ -14,8 +14,10 @@ public class GregtechMolecularTransformer {
}
private static void run1() {
- GregtechItemList.Controller_MolecularTransformer.set(new GregtechMetaTileEntity_IndustrialMolecularTransformer(
- 31072, "moleculartransformer.controller.tier.single", "Molecular Transformer")
- .getStackForm(1L));
+ GregtechItemList.Controller_MolecularTransformer.set(
+ new GregtechMetaTileEntity_IndustrialMolecularTransformer(
+ 31072,
+ "moleculartransformer.controller.tier.single",
+ "Molecular Transformer").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java
index db124f510a..c98b023b08 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java
@@ -1,21 +1,7 @@
/*
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-
-public class GregtechNaqReactor {
-
- public static void run() {
- if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
- Logger.INFO("Gregtech5u Content | Registering Futuristic Naquadah Reactor {LNR].");
- run1();
- }
-
- }
-
- private static void run1() {
- // LFTR
- GregtechItemList.Controller_Naq_Reactor.set(new GregtechMTE_LargeNaqReactor(970, "lnr.controller.single", "Naquadah Reactor Mark XII").getStackForm(1L));
-
- }
-}
-*/
+ * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechNaqReactor { public static void run() {
+ * if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
+ * Logger.INFO("Gregtech5u Content | Registering Futuristic Naquadah Reactor {LNR]."); run1(); } } private static void
+ * run1() { // LFTR GregtechItemList.Controller_Naq_Reactor.set(new GregtechMTE_LargeNaqReactor(970,
+ * "lnr.controller.single", "Naquadah Reactor Mark XII").getStackForm(1L)); } }
+ */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java
index 63eb34e97f..3a632049a9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java
@@ -1,5 +1,16 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+
import gregtech.GT_Mod;
import gregtech.api.enums.*;
import gregtech.api.objects.MaterialStack;
@@ -12,14 +23,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import org.apache.commons.lang3.reflect.FieldUtils;
public class GregtechNitroDieselFix {
@@ -79,9 +82,9 @@ public class GregtechNitroDieselFix {
* Reflectively get all the values to maintain 5.08.xx compat
*/
GT_Recipe_Map recipeMapMultiblockChemReactor;
- recipeMapMultiblockChemReactor = (GT_Recipe_Map)
- FieldUtils.getDeclaredField(GT_Recipe_Map.class, "sMultiblockChemicalRecipes", true)
- .get(null);
+ recipeMapMultiblockChemReactor = (GT_Recipe_Map) FieldUtils
+ .getDeclaredField(GT_Recipe_Map.class, "sMultiblockChemicalRecipes", true)
+ .get(null);
/**
* Do Recipe Stuff
@@ -104,8 +107,9 @@ public class GregtechNitroDieselFix {
}
}
}
- Logger.INFO("[Nitro] Found " + mIndexSingle
- + " single block Chemical Reactor recipes to remove.");
+ Logger.INFO(
+ "[Nitro] Found " + mIndexSingle
+ + " single block Chemical Reactor recipes to remove.");
// Iterate Multi Block recipes for Nitro production.
for (GT_Recipe rnd : xMulti) {
@@ -115,8 +119,9 @@ public class GregtechNitroDieselFix {
}
}
}
- Logger.INFO("[Nitro] Found " + mIndexMulti
- + " multi block Chemical Reactor recipes to remove.");
+ Logger.INFO(
+ "[Nitro] Found " + mIndexMulti
+ + " multi block Chemical Reactor recipes to remove.");
// Remove Single Block recipes found.
int mRemovedSingle = 0;
@@ -141,12 +146,13 @@ public class GregtechNitroDieselFix {
Materials mLightFuel = Materials.valueOf("LightFuel");
// Build a New Recipe set
- Materials mFuels[] = {mLightFuel, Materials.Fuel};
+ Materials mFuels[] = { mLightFuel, Materials.Fuel };
for (Materials fuel : mFuels) {
boolean didAdd[] = new boolean[3];
Logger.INFO(
"[Nitro] Getting ready to add back in the old nitro-diesel recipe to the mixer, using "
- + fuel.mDefaultLocalName + " as the fuel input.");
+ + fuel.mDefaultLocalName
+ + " as the fuel input.");
didAdd[0] = GT_Values.RA.addMixerRecipe(
getCells(fuel, 4),
getCells(mGlycerol, 1),
@@ -177,15 +183,20 @@ public class GregtechNitroDieselFix {
ItemList.Cell_Empty.get(1L),
20,
30);
- Logger.INFO("[Nitro] Did the recipes add? 1: " + didAdd[0] + " | 2: " + didAdd[1]
- + " | 3: " + didAdd[2]);
+ Logger.INFO(
+ "[Nitro] Did the recipes add? 1: " + didAdd[0]
+ + " | 2: "
+ + didAdd[1]
+ + " | 3: "
+ + didAdd[2]);
}
for (Materials fuel : mFuels) {
boolean didAdd[] = new boolean[3];
Logger.INFO(
"[Nitro] Getting ready to add back in the old nitro-diesel recipe to the chemical reactors, using "
- + fuel.mDefaultLocalName + " as the fuel input.");
+ + fuel.mDefaultLocalName
+ + " as the fuel input.");
didAdd[0] = GT_Values.RA.addChemicalRecipe(
getCells(fuel, 4),
getCells(mGlycerol, 1),
@@ -207,8 +218,12 @@ public class GregtechNitroDieselFix {
mNitroFix.getFluid(5000L),
ItemList.Cell_Empty.get(1L),
20);
- Logger.INFO("[Nitro] Did the recipes add? 1: " + didAdd[0] + " | 2: " + didAdd[1]
- + " | 3: " + didAdd[2]);
+ Logger.INFO(
+ "[Nitro] Did the recipes add? 1: " + didAdd[0]
+ + " | 2: "
+ + didAdd[1]
+ + " | 3: "
+ + didAdd[2]);
}
Logger.INFO("[Nitro] Getting ready to add back in the old glycerol recipe!");
@@ -223,12 +238,8 @@ public class GregtechNitroDieselFix {
}
}
}
- } catch (IllegalArgumentException
- | IllegalAccessException
- | InstantiationException
- | InvocationTargetException
- | NoSuchMethodException
- | SecurityException e) {
+ } catch (IllegalArgumentException | IllegalAccessException | InstantiationException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
Logger.INFO("[Nitro] ================ Error ================");
e.printStackTrace();
Logger.INFO("[Nitro] ================ Error ================");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
index 9b5968657f..348f50d3c1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java
@@ -22,48 +22,80 @@ public class GregtechPollutionDevices {
private static void run1() {
if (CORE.ConfigSwitches.enableMachine_Pollution) {
// 759
- GregtechItemList.Pollution_Detector.set(new GregtechMetaPollutionDetector(
+ GregtechItemList.Pollution_Detector.set(
+ new GregtechMetaPollutionDetector(
756,
"pollutiondetector.01.tier.single",
"Pollution Detection Device",
0,
"Tells you if you're living in Gwalior yet.",
- 0)
- .getStackForm(1L));
- GregtechItemList.Pollution_Creator.set(new GregtechMetaPollutionCreator(
- 951, "pollutioncreator.01.tier.single", "Smog Device", 4, "Polluting the skies.", 0)
- .getStackForm(1L));
+ 0).getStackForm(1L));
+ GregtechItemList.Pollution_Creator.set(
+ new GregtechMetaPollutionCreator(
+ 951,
+ "pollutioncreator.01.tier.single",
+ "Smog Device",
+ 4,
+ "Polluting the skies.",
+ 0).getStackForm(1L));
- GregtechItemList.Pollution_Cleaner_ULV.set(new GregtechMetaAtmosphericReconditioner(
- 757, "pollutioncleaner.01.tier.single", "Pollution Scrubber", 0)
- .getStackForm(1L));
- GregtechItemList.Pollution_Cleaner_LV.set(new GregtechMetaAtmosphericReconditioner(
- 758, "pollutioncleaner.02.tier.single", "Upgraded Pollution Scrubber", 1)
- .getStackForm(1L));
- GregtechItemList.Pollution_Cleaner_MV.set(new GregtechMetaAtmosphericReconditioner(
- 759, "pollutioncleaner.03.tier.single", "Advanced Pollution Scrubber", 2)
- .getStackForm(1L));
- GregtechItemList.Pollution_Cleaner_HV.set(new GregtechMetaAtmosphericReconditioner(
- 760, "pollutioncleaner.04.tier.single", "Precision Pollution Scrubber", 3)
- .getStackForm(1L));
+ GregtechItemList.Pollution_Cleaner_ULV.set(
+ new GregtechMetaAtmosphericReconditioner(
+ 757,
+ "pollutioncleaner.01.tier.single",
+ "Pollution Scrubber",
+ 0).getStackForm(1L));
+ GregtechItemList.Pollution_Cleaner_LV.set(
+ new GregtechMetaAtmosphericReconditioner(
+ 758,
+ "pollutioncleaner.02.tier.single",
+ "Upgraded Pollution Scrubber",
+ 1).getStackForm(1L));
+ GregtechItemList.Pollution_Cleaner_MV.set(
+ new GregtechMetaAtmosphericReconditioner(
+ 759,
+ "pollutioncleaner.03.tier.single",
+ "Advanced Pollution Scrubber",
+ 2).getStackForm(1L));
+ GregtechItemList.Pollution_Cleaner_HV.set(
+ new GregtechMetaAtmosphericReconditioner(
+ 760,
+ "pollutioncleaner.04.tier.single",
+ "Precision Pollution Scrubber",
+ 3).getStackForm(1L));
GregtechItemList.Pollution_Cleaner_EV.set(
new GregtechMetaAtmosphericReconditioner(761, "pollutioncleaner.05.tier.single", "Air Recycler", 4)
.getStackForm(1L));
- GregtechItemList.Pollution_Cleaner_IV.set(new GregtechMetaAtmosphericReconditioner(
- 762, "pollutioncleaner.06.tier.single", "Upgraded Air Recycler", 5)
- .getStackForm(1L));
- GregtechItemList.Pollution_Cleaner_LuV.set(new GregtechMetaAtmosphericReconditioner(
- 763, "pollutioncleaner.07.tier.single", "Advanced Air Recycler", 6)
- .getStackForm(1L));
- GregtechItemList.Pollution_Cleaner_ZPM.set(new GregtechMetaAtmosphericReconditioner(
- 764, "pollutioncleaner.08.tier.single", "Precision Air Recycler", 7)
- .getStackForm(1L));
- GregtechItemList.Pollution_Cleaner_UV.set(new GregtechMetaAtmosphericReconditioner(
- 765, "pollutioncleaner.09.tier.single", "Atmospheric Cleaner", 8)
- .getStackForm(1L));
- GregtechItemList.Pollution_Cleaner_MAX.set(new GregtechMetaAtmosphericReconditioner(
- 766, "pollutioncleaner.10.tier.single", "Biosphere Cleanser", 9)
- .getStackForm(1L));
+ GregtechItemList.Pollution_Cleaner_IV.set(
+ new GregtechMetaAtmosphericReconditioner(
+ 762,
+ "pollutioncleaner.06.tier.single",
+ "Upgraded Air Recycler",
+ 5).getStackForm(1L));
+ GregtechItemList.Pollution_Cleaner_LuV.set(
+ new GregtechMetaAtmosphericReconditioner(
+ 763,
+ "pollutioncleaner.07.tier.single",
+ "Advanced Air Recycler",
+ 6).getStackForm(1L));
+ GregtechItemList.Pollution_Cleaner_ZPM.set(
+ new GregtechMetaAtmosphericReconditioner(
+ 764,
+ "pollutioncleaner.08.tier.single",
+ "Precision Air Recycler",
+ 7).getStackForm(1L));
+ GregtechItemList.Pollution_Cleaner_UV.set(
+ new GregtechMetaAtmosphericReconditioner(
+ 765,
+ "pollutioncleaner.09.tier.single",
+ "Atmospheric Cleaner",
+ 8).getStackForm(1L));
+ GregtechItemList.Pollution_Cleaner_MAX.set(
+ new GregtechMetaAtmosphericReconditioner(
+ 766,
+ "pollutioncleaner.10.tier.single",
+ "Biosphere Cleanser",
+ 9).getStackForm(1L));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java
index d1d6dd5f04..25fd245ba4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java
@@ -17,35 +17,85 @@ public class GregtechPowerBreakers {
private static void run1() {
// 30200
int aStartID = 30400;
- GregtechItemList.BreakerBox_ULV.set((new GT_MetaTileEntity_BasicBreaker(
- aStartID++, "breaker.tier.00", "Ultra Low Voltage Breaker Box", 0, "", 16))
- .getStackForm(1L));
- GregtechItemList.BreakerBox_LV.set((new GT_MetaTileEntity_BasicBreaker(
- aStartID++, "breaker.tier.01", "Low Voltage Breaker Box", 1, "", 16))
- .getStackForm(1L));
- GregtechItemList.BreakerBox_MV.set((new GT_MetaTileEntity_BasicBreaker(
- aStartID++, "breaker.tier.02", "Medium Voltage Breaker Box", 2, "", 16))
- .getStackForm(1L));
- GregtechItemList.BreakerBox_HV.set((new GT_MetaTileEntity_BasicBreaker(
- aStartID++, "breaker.tier.03", "High Voltage Breaker Box", 3, "", 16))
- .getStackForm(1L));
- GregtechItemList.BreakerBox_EV.set((new GT_MetaTileEntity_BasicBreaker(
- aStartID++, "breaker.tier.04", "Extreme Voltage Breaker Box", 4, "", 16))
- .getStackForm(1L));
- GregtechItemList.BreakerBox_IV.set((new GT_MetaTileEntity_BasicBreaker(
- aStartID++, "breaker.tier.05", "Insane Voltage Breaker Box", 5, "", 16))
- .getStackForm(1L));
- GregtechItemList.BreakerBox_LuV.set((new GT_MetaTileEntity_BasicBreaker(
- aStartID++, "breaker.tier.06", "Ludicrous Voltage Breaker Box", 6, "", 16))
- .getStackForm(1L));
- GregtechItemList.BreakerBox_ZPM.set((new GT_MetaTileEntity_BasicBreaker(
- aStartID++, "breaker.tier.07", "ZPM Voltage Breaker Box", 7, "", 16))
- .getStackForm(1L));
- GregtechItemList.BreakerBox_UV.set((new GT_MetaTileEntity_BasicBreaker(
- aStartID++, "breaker.tier.08", "Ultimate Voltage Breaker Box", 8, "", 16))
- .getStackForm(1L));
- GregtechItemList.BreakerBox_MAX.set((new GT_MetaTileEntity_BasicBreaker(
- aStartID++, "breaker.tier.09", GT_Values.VN[9] + " Breaker Box", 9, "", 16))
- .getStackForm(1L));
+ GregtechItemList.BreakerBox_ULV.set(
+ (new GT_MetaTileEntity_BasicBreaker(
+ aStartID++,
+ "breaker.tier.00",
+ "Ultra Low Voltage Breaker Box",
+ 0,
+ "",
+ 16)).getStackForm(1L));
+ GregtechItemList.BreakerBox_LV.set(
+ (new GT_MetaTileEntity_BasicBreaker(
+ aStartID++,
+ "breaker.tier.01",
+ "Low Voltage Breaker Box",
+ 1,
+ "",
+ 16)).getStackForm(1L));
+ GregtechItemList.BreakerBox_MV.set(
+ (new GT_MetaTileEntity_BasicBreaker(
+ aStartID++,
+ "breaker.tier.02",
+ "Medium Voltage Breaker Box",
+ 2,
+ "",
+ 16)).getStackForm(1L));
+ GregtechItemList.BreakerBox_HV.set(
+ (new GT_MetaTileEntity_BasicBreaker(
+ aStartID++,
+ "breaker.tier.03",
+ "High Voltage Breaker Box",
+ 3,
+ "",
+ 16)).getStackForm(1L));
+ GregtechItemList.BreakerBox_EV.set(
+ (new GT_MetaTileEntity_BasicBreaker(
+ aStartID++,
+ "breaker.tier.04",
+ "Extreme Voltage Breaker Box",
+ 4,
+ "",
+ 16)).getStackForm(1L));
+ GregtechItemList.BreakerBox_IV.set(
+ (new GT_MetaTileEntity_BasicBreaker(
+ aStartID++,
+ "breaker.tier.05",
+ "Insane Voltage Breaker Box",
+ 5,
+ "",
+ 16)).getStackForm(1L));
+ GregtechItemList.BreakerBox_LuV.set(
+ (new GT_MetaTileEntity_BasicBreaker(
+ aStartID++,
+ "breaker.tier.06",
+ "Ludicrous Voltage Breaker Box",
+ 6,
+ "",
+ 16)).getStackForm(1L));
+ GregtechItemList.BreakerBox_ZPM.set(
+ (new GT_MetaTileEntity_BasicBreaker(
+ aStartID++,
+ "breaker.tier.07",
+ "ZPM Voltage Breaker Box",
+ 7,
+ "",
+ 16)).getStackForm(1L));
+ GregtechItemList.BreakerBox_UV.set(
+ (new GT_MetaTileEntity_BasicBreaker(
+ aStartID++,
+ "breaker.tier.08",
+ "Ultimate Voltage Breaker Box",
+ 8,
+ "",
+ 16)).getStackForm(1L));
+ GregtechItemList.BreakerBox_MAX.set(
+ (new GT_MetaTileEntity_BasicBreaker(
+ aStartID++,
+ "breaker.tier.09",
+ GT_Values.VN[9] + " Breaker Box",
+ 9,
+ "",
+ 16)).getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
index 17d89686a6..b9672c5382 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
@@ -23,9 +23,11 @@ public class GregtechPowerSubStation {
private static void run1() {
// Steam Condensors
- GregtechItemList.PowerSubStation.set(new GregtechMetaTileEntity_PowerSubStationController(
- 812, "substation.01.input.single", "Power Station Control Node")
- .getStackForm(1L));
+ GregtechItemList.PowerSubStation.set(
+ new GregtechMetaTileEntity_PowerSubStationController(
+ 812,
+ "substation.01.input.single",
+ "Power Station Control Node").getStackForm(1L));
int tID = 886;
GregtechItemList.Hatch_Input_Battery_MV.set(
new GT_MetaTileEntity_Hatch_InputBattery(tID++, "hatch.input_battery.tier.00", "Charging Bus (MV)", 2)
@@ -34,28 +36,34 @@ public class GregtechPowerSubStation {
new GT_MetaTileEntity_Hatch_InputBattery(tID++, "hatch.input_battery.tier.01", "Charging Bus (EV)", 4)
.getStackForm(1L));
- GregtechItemList.Hatch_Output_Battery_MV.set(new GT_MetaTileEntity_Hatch_OutputBattery(
- tID++, "hatch.output_battery.tier.00", "Discharging Bus (MV)", 2)
- .getStackForm(1L));
- GregtechItemList.Hatch_Output_Battery_EV.set(new GT_MetaTileEntity_Hatch_OutputBattery(
- tID++, "hatch.output_battery.tier.01", "Discharging Bus (EV)", 4)
- .getStackForm(1L));
+ GregtechItemList.Hatch_Output_Battery_MV.set(
+ new GT_MetaTileEntity_Hatch_OutputBattery(
+ tID++,
+ "hatch.output_battery.tier.00",
+ "Discharging Bus (MV)",
+ 2).getStackForm(1L));
+ GregtechItemList.Hatch_Output_Battery_EV.set(
+ new GT_MetaTileEntity_Hatch_OutputBattery(
+ tID++,
+ "hatch.output_battery.tier.01",
+ "Discharging Bus (EV)",
+ 4).getStackForm(1L));
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Hatch_Input_Battery_MV.get(1L, new Object[0]),
CI.bitsd,
- new Object[] {"C", "M", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV});
+ new Object[] { "C", "M", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Hatch_Input_Battery_EV.get(1L, new Object[0]),
CI.bitsd,
- new Object[] {"C", "M", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV});
+ new Object[] { "C", "M", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Hatch_Output_Battery_MV.get(1L, new Object[0]),
CI.bitsd,
- new Object[] {"M", "C", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV});
+ new Object[] { "M", "C", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Hatch_Output_Battery_EV.get(1L, new Object[0]),
CI.bitsd,
- new Object[] {"M", "C", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV});
+ new Object[] { "M", "C", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java
index f7032838ab..392c6eced8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java
@@ -11,9 +11,11 @@ public class GregtechQuantumForceTransformer {
if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
Logger.INFO("Gregtech5u Content | Registering Quantum Force Transformer Multiblock.");
if (CORE.ConfigSwitches.enableMultiblock_QuantumForceTransformer) {
- GregtechItemList.QuantumForceTransformer.set(new GregtechMetaTileEntity_QuantumForceTransformer(
- 31151, "quantumforcetransformer.controller.tier.single", "Quantum Force Transformer")
- .getStackForm(1L));
+ GregtechItemList.QuantumForceTransformer.set(
+ new GregtechMetaTileEntity_QuantumForceTransformer(
+ 31151,
+ "quantumforcetransformer.controller.tier.single",
+ "Quantum Force Transformer").getStackForm(1L));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
index 91902396d9..40a0c5820f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java
@@ -14,8 +14,11 @@ public class GregtechRTG {
}
private static void run1() {
- GregtechItemList.RTG.set(new GregtechMetaTileEntity_RTG(
- 869, "basicgenerator.rtg.tier.01", "Radioisotope Thermoelectric Generator", 3)
- .getStackForm(1L));
+ GregtechItemList.RTG.set(
+ new GregtechMetaTileEntity_RTG(
+ 869,
+ "basicgenerator.rtg.tier.01",
+ "Radioisotope Thermoelectric Generator",
+ 3).getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
index 689cd53d54..6d48652202 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -13,7 +15,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_LargeRocketEngine;
-import net.minecraft.item.ItemStack;
public class GregtechRocketFuelGenerator {
@@ -27,203 +28,122 @@ public class GregtechRocketFuelGenerator {
}
private static void run1() {
- GregtechItemList.Controller_RocketEngine.set(new GregtechMetaTileEntity_LargeRocketEngine(
- 996, "gtpp.multimachine.rocketengine", "Rocketdyne F-1A Engine")
- .getStackForm(1L));
+ GregtechItemList.Controller_RocketEngine.set(
+ new GregtechMetaTileEntity_LargeRocketEngine(
+ 996,
+ "gtpp.multimachine.rocketengine",
+ "Rocketdyne F-1A Engine").getStackForm(1L));
- ItemList aDieselEngine = ItemUtils.getValueOfItemList(
- "Machine_Multi_DieselEngine", ItemList.Machine_Multi_LargeBoiler_TungstenSteel);
+ ItemList aDieselEngine = ItemUtils
+ .getValueOfItemList("Machine_Multi_DieselEngine", ItemList.Machine_Multi_LargeBoiler_TungstenSteel);
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Controller_RocketEngine.get(1L), CI.bitsd, new Object[] {
- "PCP",
- "EME",
- "GWG",
- 'M',
- aDieselEngine,
- 'P',
- ItemList.Electric_Piston_IV,
- 'E',
- ItemList.Field_Generator_EV,
- 'C',
- OrePrefixes.circuit.get(Materials.Master),
- 'W',
- OrePrefixes.cableGt08.get(Materials.Platinum),
- 'G',
- ALLOY.MARAGING350.getGear(1)
- });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Controller_RocketEngine.get(1L),
+ CI.bitsd,
+ new Object[] { "PCP", "EME", "GWG", 'M', aDieselEngine, 'P', ItemList.Electric_Piston_IV, 'E',
+ ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W',
+ OrePrefixes.cableGt08.get(Materials.Platinum), 'G', ALLOY.MARAGING350.getGear(1) });
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Casing_RocketEngine.get(1L), CI.bitsd, new Object[] {
- "PhP",
- "RFR",
- "PWP",
- 'R',
- OrePrefixes.pipeMedium.get(Materials.TungstenSteel),
- 'F',
- ItemList.Casing_RobustTungstenSteel,
- 'P',
- ALLOY.NITINOL_60.getGear(1),
- 'W',
- OrePrefixes.stickLong.get(Materials.TungstenSteel)
- });
+ GT_ModHandler.addCraftingRecipe(
+ GregtechItemList.Casing_RocketEngine.get(1L),
+ CI.bitsd,
+ new Object[] { "PhP", "RFR", "PWP", 'R', OrePrefixes.pipeMedium.get(Materials.TungstenSteel), 'F',
+ ItemList.Casing_RobustTungstenSteel, 'P', ALLOY.NITINOL_60.getGear(1), 'W',
+ OrePrefixes.stickLong.get(Materials.TungstenSteel) });
- GregtechItemList.Rocket_Engine_EV.set(new GregtechMetaTileEntityRocketFuelGenerator(
- 793, "advancedgenerator.rocketFuel.tier.01", "Basic Rocket Engine", 4)
- .getStackForm(1L));
- GregtechItemList.Rocket_Engine_IV.set(new GregtechMetaTileEntityRocketFuelGenerator(
- 794, "advancedgenerator.rocketFuel.tier.02", "Advanced Rocket Engine", 5)
- .getStackForm(1L));
- GregtechItemList.Rocket_Engine_LuV.set(new GregtechMetaTileEntityRocketFuelGenerator(
- 795, "advancedgenerator.rocketFuel.tier.03", "Turbo Rocket Engine", 6)
- .getStackForm(1L));
+ GregtechItemList.Rocket_Engine_EV.set(
+ new GregtechMetaTileEntityRocketFuelGenerator(
+ 793,
+ "advancedgenerator.rocketFuel.tier.01",
+ "Basic Rocket Engine",
+ 4).getStackForm(1L));
+ GregtechItemList.Rocket_Engine_IV.set(
+ new GregtechMetaTileEntityRocketFuelGenerator(
+ 794,
+ "advancedgenerator.rocketFuel.tier.02",
+ "Advanced Rocket Engine",
+ 5).getStackForm(1L));
+ GregtechItemList.Rocket_Engine_LuV.set(
+ new GregtechMetaTileEntityRocketFuelGenerator(
+ 795,
+ "advancedgenerator.rocketFuel.tier.03",
+ "Turbo Rocket Engine",
+ 6).getStackForm(1L));
if (!CORE.GTNH) {
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "PCP",
- "EME",
- "GWG",
- Character.valueOf('M'),
- ItemList.Hull_EV,
- Character.valueOf('P'),
- ItemList.Electric_Piston_EV,
- Character.valueOf('E'),
- ItemList.Electric_Motor_EV,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Ultimate),
- Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Aluminium),
- Character.valueOf('G'),
- ALLOY.TANTALLOY_61.getGear(1)
- });
+ new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV,
+ Character.valueOf('P'), ItemList.Electric_Piston_EV, Character.valueOf('E'),
+ ItemList.Electric_Motor_EV, Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
+ OrePrefixes.cableGt02.get(Materials.Aluminium), Character.valueOf('G'),
+ ALLOY.TANTALLOY_61.getGear(1) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "PCP",
- "EME",
- "GWG",
- Character.valueOf('M'),
- ItemList.Hull_IV,
- Character.valueOf('P'),
- ItemList.Electric_Piston_IV,
- Character.valueOf('E'),
- ItemList.Electric_Motor_IV,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Superconductor),
- Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Platinum),
- Character.valueOf('G'),
- ALLOY.STELLITE.getGear(1)
- });
+ new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV,
+ Character.valueOf('P'), ItemList.Electric_Piston_IV, Character.valueOf('E'),
+ ItemList.Electric_Motor_IV, Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('W'),
+ OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'),
+ ALLOY.STELLITE.getGear(1) });
}
if (CORE.GTNH) {
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "PCP",
- "EME",
- "GWG",
- Character.valueOf('M'),
- ItemList.Hull_EV,
- Character.valueOf('P'),
- ItemList.Electric_Piston_EV,
- Character.valueOf('E'),
- ItemList.Electric_Motor_EV,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Elite),
- Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Aluminium),
- Character.valueOf('G'),
- ALLOY.TANTALLOY_61.getGear(1)
- });
+ new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV,
+ Character.valueOf('P'), ItemList.Electric_Piston_EV, Character.valueOf('E'),
+ ItemList.Electric_Motor_EV, Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'),
+ OrePrefixes.cableGt02.get(Materials.Aluminium), Character.valueOf('G'),
+ ALLOY.TANTALLOY_61.getGear(1) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "PCP",
- "EME",
- "GWG",
- Character.valueOf('M'),
- ItemList.Hull_IV,
- Character.valueOf('P'),
- ItemList.Electric_Piston_IV,
- Character.valueOf('E'),
- ItemList.Electric_Motor_IV,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Master),
- Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Platinum),
- Character.valueOf('G'),
- ALLOY.STELLITE.getGear(1)
- });
+ new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV,
+ Character.valueOf('P'), ItemList.Electric_Piston_IV, Character.valueOf('E'),
+ ItemList.Electric_Motor_IV, Character.valueOf('C'),
+ OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'),
+ OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'),
+ ALLOY.STELLITE.getGear(1) });
}
final ItemStack INGREDIENT_1 = CI.electricPiston_LuV;
final ItemStack INGREDIENT_2 = CI.electricMotor_LuV;
if (!CORE.GTNH) {
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "PCP",
- "EME",
- "GWG",
- Character.valueOf('M'),
- ItemList.Hull_LuV,
- Character.valueOf('P'),
- INGREDIENT_1,
- Character.valueOf('E'),
- INGREDIENT_2,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Infinite),
- Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Tungsten),
- Character.valueOf('G'),
- ALLOY.ZERON_100.getGear(1)
- });
+ new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV,
+ Character.valueOf('P'), INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2,
+ Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Infinite), Character.valueOf('W'),
+ OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'),
+ ALLOY.ZERON_100.getGear(1) });
}
if (CORE.GTNH) {
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "PCP",
- "EME",
- "GWG",
- Character.valueOf('M'),
- ItemList.Hull_LuV,
- Character.valueOf('P'),
- INGREDIENT_1,
- Character.valueOf('E'),
- INGREDIENT_2,
- Character.valueOf('C'),
- OrePrefixes.circuit.get(Materials.Ultimate),
- Character.valueOf('W'),
- OrePrefixes.cableGt02.get(Materials.Tungsten),
- Character.valueOf('G'),
- ALLOY.ZERON_100.getGear(1)
- });
+ new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV,
+ Character.valueOf('P'), INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2,
+ Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'),
+ OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'),
+ ALLOY.ZERON_100.getGear(1) });
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
index 60b7d5a8cc..13a3e11340 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
@@ -8,6 +8,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock;
public class GregtechSafeBlock {
+
public static void run() {
if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
Logger.INFO("Gregtech5u Content | Registering Lockable Safe Blocks.");
@@ -53,183 +54,83 @@ public class GregtechSafeBlock {
// To-Do Change Recipes
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Safe_ULV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CMV",
- " X ",
- Character.valueOf('M'),
- ItemList.Hull_ULV,
- Character.valueOf('V'),
- OrePrefixes.circuit.get(Materials.Basic),
- Character.valueOf('C'),
- OreDictNames.craftingChest,
- Character.valueOf('X'),
- OrePrefixes.circuit.get(Materials.Basic)
- });
+ new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('V'),
+ OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'), OreDictNames.craftingChest,
+ Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Basic) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Safe_LV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CMV",
- " X ",
- Character.valueOf('M'),
- ItemList.Hull_LV,
- Character.valueOf('V'),
- OrePrefixes.circuit.get(Materials.Basic),
- Character.valueOf('C'),
- OreDictNames.craftingChest,
- Character.valueOf('X'),
- OrePrefixes.circuit.get(Materials.Good)
- });
+ new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('V'),
+ OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'), OreDictNames.craftingChest,
+ Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Good) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Safe_MV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CMV",
- " X ",
- Character.valueOf('M'),
- ItemList.Hull_MV,
- Character.valueOf('V'),
- OrePrefixes.circuit.get(Materials.Good),
- Character.valueOf('C'),
- OreDictNames.craftingChest,
- Character.valueOf('X'),
- OrePrefixes.circuit.get(Materials.Good)
- });
+ new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('V'),
+ OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'), OreDictNames.craftingChest,
+ Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Good) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Safe_HV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CMV",
- " X ",
- Character.valueOf('M'),
- ItemList.Hull_HV,
- Character.valueOf('V'),
- OrePrefixes.circuit.get(Materials.Good),
- Character.valueOf('C'),
- OreDictNames.craftingChest,
- Character.valueOf('X'),
- OrePrefixes.circuit.get(Materials.Advanced)
- });
+ new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('V'),
+ OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'), OreDictNames.craftingChest,
+ Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Advanced) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Safe_EV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CMV",
- " X ",
- Character.valueOf('M'),
- ItemList.Hull_EV,
- Character.valueOf('V'),
- OrePrefixes.circuit.get(Materials.Advanced),
- Character.valueOf('C'),
- OreDictNames.craftingChest,
- Character.valueOf('X'),
- OrePrefixes.circuit.get(Materials.Elite)
- });
+ new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('V'),
+ OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest,
+ Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Elite) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Safe_IV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CMV",
- " X ",
- Character.valueOf('M'),
- ItemList.Hull_IV,
- Character.valueOf('V'),
- OrePrefixes.circuit.get(Materials.Advanced),
- Character.valueOf('C'),
- OreDictNames.craftingChest,
- Character.valueOf('X'),
- OrePrefixes.circuit.get(Materials.Master)
- });
+ new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('V'),
+ OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest,
+ Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Safe_LuV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CMV",
- " X ",
- Character.valueOf('M'),
- ItemList.Hull_LuV,
- Character.valueOf('V'),
- OrePrefixes.circuit.get(Materials.Elite),
- Character.valueOf('C'),
- OreDictNames.craftingChest,
- Character.valueOf('X'),
- OrePrefixes.circuit.get(Materials.Master)
- });
+ new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('V'),
+ OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest,
+ Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Safe_ZPM.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CMV",
- " X ",
- Character.valueOf('M'),
- ItemList.Hull_ZPM,
- Character.valueOf('V'),
- OrePrefixes.circuit.get(Materials.Elite),
- Character.valueOf('C'),
- OreDictNames.craftingChest,
- Character.valueOf('X'),
- OrePrefixes.circuit.get(Materials.Master)
- });
+ new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('V'),
+ OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest,
+ Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Safe_UV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CMV",
- " X ",
- Character.valueOf('M'),
- ItemList.Hull_UV,
- Character.valueOf('V'),
- OrePrefixes.circuit.get(Materials.Master),
- Character.valueOf('C'),
- OreDictNames.craftingChest,
- Character.valueOf('X'),
- OrePrefixes.circuit.get(Materials.Superconductor)
- });
+ new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('V'),
+ OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest,
+ Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Superconductor) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.GT_Safe_MAX.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "CMV",
- " X ",
- Character.valueOf('M'),
- ItemList.Hull_MAX,
- Character.valueOf('V'),
- OrePrefixes.circuit.get(Materials.Master),
- Character.valueOf('C'),
- OreDictNames.craftingChest,
- Character.valueOf('X'),
- OrePrefixes.circuit.get(Materials.Infinite)
- });
+ new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('V'),
+ OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest,
+ Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Infinite) });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java
index c8881c7490..32e164bc84 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java
@@ -7,23 +7,40 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr
public class GregtechSemiFluidgenerators {
public static void run() {
- GregtechItemList.Generator_SemiFluid_LV.set(new GT_MetaTileEntity_SemiFluidGenerator(
- 837, "basicgenerator.semifluid.tier.01", "Basic Semi-Fluid Generator", 1)
- .getStackForm(1L));
- GregtechItemList.Generator_SemiFluid_MV.set(new GT_MetaTileEntity_SemiFluidGenerator(
- 838, "basicgenerator.semifluid.tier.02", "Advanced Semi-Fluid Generator", 2)
- .getStackForm(1L));
- GregtechItemList.Generator_SemiFluid_HV.set(new GT_MetaTileEntity_SemiFluidGenerator(
- 839, "basicgenerator.semifluid.tier.03", "Turbo Semi-Fluid Generator", 3)
- .getStackForm(1L));
- GregtechItemList.Generator_SemiFluid_EV.set(new GT_MetaTileEntity_SemiFluidGenerator(
- 993, "basicgenerator.semifluid.tier.04", "Turbo Semi-Fluid Generator II", 4)
- .getStackForm(1L));
- GregtechItemList.Generator_SemiFluid_IV.set(new GT_MetaTileEntity_SemiFluidGenerator(
- 994, "basicgenerator.semifluid.tier.05", "Turbo Semi-Fluid Generator III", 5)
- .getStackForm(1L));
- GregtechItemList.Controller_LargeSemifluidGenerator.set(new GregtechMetaTileEntity_LargeSemifluidGenerator(
- 31026, "gtpp.multimachine.semifluidgenerator", "Large Semifluid Burner")
- .getStackForm(1L));
+ GregtechItemList.Generator_SemiFluid_LV.set(
+ new GT_MetaTileEntity_SemiFluidGenerator(
+ 837,
+ "basicgenerator.semifluid.tier.01",
+ "Basic Semi-Fluid Generator",
+ 1).getStackForm(1L));
+ GregtechItemList.Generator_SemiFluid_MV.set(
+ new GT_MetaTileEntity_SemiFluidGenerator(
+ 838,
+ "basicgenerator.semifluid.tier.02",
+ "Advanced Semi-Fluid Generator",
+ 2).getStackForm(1L));
+ GregtechItemList.Generator_SemiFluid_HV.set(
+ new GT_MetaTileEntity_SemiFluidGenerator(
+ 839,
+ "basicgenerator.semifluid.tier.03",
+ "Turbo Semi-Fluid Generator",
+ 3).getStackForm(1L));
+ GregtechItemList.Generator_SemiFluid_EV.set(
+ new GT_MetaTileEntity_SemiFluidGenerator(
+ 993,
+ "basicgenerator.semifluid.tier.04",
+ "Turbo Semi-Fluid Generator II",
+ 4).getStackForm(1L));
+ GregtechItemList.Generator_SemiFluid_IV.set(
+ new GT_MetaTileEntity_SemiFluidGenerator(
+ 994,
+ "basicgenerator.semifluid.tier.05",
+ "Turbo Semi-Fluid Generator III",
+ 5).getStackForm(1L));
+ GregtechItemList.Controller_LargeSemifluidGenerator.set(
+ new GregtechMetaTileEntity_LargeSemifluidGenerator(
+ 31026,
+ "gtpp.multimachine.semifluidgenerator",
+ "Large Semifluid Burner").getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
index 124c7731ee..01fdb612d4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java
@@ -1,5 +1,8 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GTPP_Recipe;
@@ -8,8 +11,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_BasicWasher;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechSimpleWasher {
@@ -46,8 +47,7 @@ public class GregtechSimpleWasher {
ItemStack dustDirty;
for (Materials v : Materials.values()) {
if (disablePlat) {
- if (v == Materials.Platinum
- || v == Materials.Osmium
+ if (v == Materials.Platinum || v == Materials.Osmium
|| v == Materials.Iridium
|| v == Materials.Palladium) {
continue;
@@ -59,11 +59,11 @@ public class GregtechSimpleWasher {
if (dustClean != null && dustDirty != null) {
GTPP_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {dustDirty},
- new ItemStack[] {dustClean},
+ new ItemStack[] { dustDirty },
+ new ItemStack[] { dustClean },
null,
new int[] {},
- new FluidStack[] {FluidUtils.getFluidStack("water", 100)},
+ new FluidStack[] { FluidUtils.getFluidStack("water", 100) },
new FluidStack[] {},
5,
8,
@@ -89,11 +89,11 @@ public class GregtechSimpleWasher {
if (crushedClean != null && crushedDirty != null) {
GTPP_Recipe aRecipe = new GTPP_Recipe(
false,
- new ItemStack[] {crushedDirty},
- new ItemStack[] {crushedClean},
+ new ItemStack[] { crushedDirty },
+ new ItemStack[] { crushedClean },
null,
new int[] {},
- new FluidStack[] {FluidUtils.getFluidStack("water", 100)},
+ new FluidStack[] { FluidUtils.getFluidStack("water", 100) },
new FluidStack[] {},
5,
8,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
index 5004984f0e..d686270bad 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
@@ -8,6 +8,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
public class GregtechSolarGenerators {
+
public static void run() {
if (LoadedMods.Gregtech && ConfigSwitches.enableMachine_SolarGenerators) {
Logger.INFO("Gregtech5u Content | Registering Solar Generator Blocks.");
@@ -19,33 +20,51 @@ public class GregtechSolarGenerators {
private static void run1() {
- GregtechItemList.GT_Solar_ULV.set(new GregtechMetaTileEntitySolarGenerator(
- 800, "sunabsorber.tier.00", "Ultra Low Voltage Solar Generator", 0)
- .getStackForm(1L));
+ GregtechItemList.GT_Solar_ULV.set(
+ new GregtechMetaTileEntitySolarGenerator(
+ 800,
+ "sunabsorber.tier.00",
+ "Ultra Low Voltage Solar Generator",
+ 0).getStackForm(1L));
GregtechItemList.GT_Solar_LV.set(
new GregtechMetaTileEntitySolarGenerator(801, "sunabsorber.tier.01", "Low Voltage Solar Generator", 1)
.getStackForm(1L));
- GregtechItemList.GT_Solar_MV.set(new GregtechMetaTileEntitySolarGenerator(
- 802, "sunabsorber.tier.02", "Medium Voltage Solar Generator", 2)
- .getStackForm(1L));
+ GregtechItemList.GT_Solar_MV.set(
+ new GregtechMetaTileEntitySolarGenerator(
+ 802,
+ "sunabsorber.tier.02",
+ "Medium Voltage Solar Generator",
+ 2).getStackForm(1L));
GregtechItemList.GT_Solar_HV.set(
new GregtechMetaTileEntitySolarGenerator(803, "sunabsorber.tier.03", "High Voltage Solar Generator", 3)
.getStackForm(1L));
- GregtechItemList.GT_Solar_EV.set(new GregtechMetaTileEntitySolarGenerator(
- 804, "sunabsorber.tier.04", "Extreme Voltage Solar Generator", 4)
- .getStackForm(1L));
- GregtechItemList.GT_Solar_IV.set(new GregtechMetaTileEntitySolarGenerator(
- 805, "sunabsorber.tier.05", "Insane Voltage Solar Generator", 5)
- .getStackForm(1L));
- GregtechItemList.GT_Solar_LuV.set(new GregtechMetaTileEntitySolarGenerator(
- 806, "sunabsorber.tier.06", "Ludicrous Voltage Solar Generator", 6)
- .getStackForm(1L));
+ GregtechItemList.GT_Solar_EV.set(
+ new GregtechMetaTileEntitySolarGenerator(
+ 804,
+ "sunabsorber.tier.04",
+ "Extreme Voltage Solar Generator",
+ 4).getStackForm(1L));
+ GregtechItemList.GT_Solar_IV.set(
+ new GregtechMetaTileEntitySolarGenerator(
+ 805,
+ "sunabsorber.tier.05",
+ "Insane Voltage Solar Generator",
+ 5).getStackForm(1L));
+ GregtechItemList.GT_Solar_LuV.set(
+ new GregtechMetaTileEntitySolarGenerator(
+ 806,
+ "sunabsorber.tier.06",
+ "Ludicrous Voltage Solar Generator",
+ 6).getStackForm(1L));
GregtechItemList.GT_Solar_ZPM.set(
new GregtechMetaTileEntitySolarGenerator(807, "sunabsorber.tier.07", "ZPM Voltage Solar Generator", 7)
.getStackForm(1L));
- GregtechItemList.GT_Solar_UV.set(new GregtechMetaTileEntitySolarGenerator(
- 808, "sunabsorber.tier.08", "Ultimate Voltage Solar Generator", 8)
- .getStackForm(1L));
+ GregtechItemList.GT_Solar_UV.set(
+ new GregtechMetaTileEntitySolarGenerator(
+ 808,
+ "sunabsorber.tier.08",
+ "Ultimate Voltage Solar Generator",
+ 8).getStackForm(1L));
GregtechItemList.GT_Solar_MAX.set(
new GregtechMetaTileEntitySolarGenerator(809, "sunabsorber.tier.09", "MAX Voltage Solar Generator", 9)
.getStackForm(1L));
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java
index fdb2ea8830..3b86daf811 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java
@@ -1,12 +1,13 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.util.GTPP_Recipe;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.material.MISC_MATERIALS;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_SolarTower;
import gtPlusPlus.xmod.gregtech.common.tileentities.misc.TileEntitySolarHeater;
-import net.minecraftforge.fluids.FluidStack;
public class GregtechSolarTower {
@@ -22,14 +23,14 @@ public class GregtechSolarTower {
GregtechItemList.Industrial_Solar_Tower.set(
new GregtechMetaTileEntity_SolarTower(863, "solartower.controller.tier.single", "Solar Tower")
.getStackForm(1L));
- GregtechItemList.Solar_Tower_Reflector.set(new TileEntitySolarHeater(
+ GregtechItemList.Solar_Tower_Reflector.set(
+ new TileEntitySolarHeater(
864,
"solarreflector.simple.single",
"Solar Reflector",
8,
"Part of the Clean Green energy movement",
- 0)
- .getStackForm(1L));
+ 0).getStackForm(1L));
// NEI recipe
GTPP_Recipe.GTPP_Recipe_Map.sSolarTowerRecipes.addRecipe(
@@ -38,8 +39,8 @@ public class GregtechSolarTower {
null,
null,
null,
- new FluidStack[] {MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(1000)},
- new FluidStack[] {MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(1000)},
+ new FluidStack[] { MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(1000) },
+ new FluidStack[] { MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(1000) },
0,
0,
0);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java
index c6008c6b5c..53436350cc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java
@@ -16,15 +16,20 @@ public class GregtechSteamMultis {
GregtechItemList.Controller_SteamMaceratorMulti.set(
new GregtechMetaTileEntity_SteamMacerator(31041, "gtpp.multimachine.steam.macerator", "Steam Grinder")
.getStackForm(1L));
- GregtechItemList.Controller_SteamCompressorMulti.set(new GregtechMetaTileEntity_SteamCompressor(
- 31078, "gtpp.multimachine.steam.compressor", "Steam Squasher")
- .getStackForm(1L));
+ GregtechItemList.Controller_SteamCompressorMulti.set(
+ new GregtechMetaTileEntity_SteamCompressor(
+ 31078,
+ "gtpp.multimachine.steam.compressor",
+ "Steam Squasher").getStackForm(1L));
GregtechItemList.Hatch_Input_Bus_Steam.set(
new GT_MetaTileEntity_Hatch_Steam_BusInput(31046, "hatch.input_bus.tier.steam", "Input Bus (Steam)", 0)
.getStackForm(1L));
- GregtechItemList.Hatch_Output_Bus_Steam.set(new GT_MetaTileEntity_Hatch_Steam_BusOutput(
- 31047, "hatch.output_bus.tier.steam", "Output Bus (Steam)", 0)
- .getStackForm(1L));
+ GregtechItemList.Hatch_Output_Bus_Steam.set(
+ new GT_MetaTileEntity_Hatch_Steam_BusOutput(
+ 31047,
+ "hatch.output_bus.tier.steam",
+ "Output Bus (Steam)",
+ 0).getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
index 5c99d2b4b7..fa2edaa030 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
@@ -47,87 +47,52 @@ public class GregtechSuperChests {
ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_IV.get(1L));
} else {
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Super_Chest_LV.get(1L, new Object[0]), bitsd, new Object[] {
- "DPD",
- "PMP",
- "DGD",
- Character.valueOf('M'),
- ItemList.Hull_LV,
- Character.valueOf('G'),
- ItemList.Automation_ChestBuffer_LV,
- Character.valueOf('D'),
- OrePrefixes.circuit.get(Materials.Basic),
- Character.valueOf('P'),
- OrePrefixes.plate.get(Materials.Invar)
- });
+ GregtechItemList.Super_Chest_LV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_LV,
+ Character.valueOf('G'), ItemList.Automation_ChestBuffer_LV, Character.valueOf('D'),
+ OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('P'),
+ OrePrefixes.plate.get(Materials.Invar) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Super_Chest_MV.get(1L, new Object[0]), bitsd, new Object[] {
- "DPD",
- "PMP",
- "DGD",
- Character.valueOf('M'),
- ItemList.Hull_MV,
- Character.valueOf('G'),
- ItemList.Automation_ChestBuffer_MV,
- Character.valueOf('D'),
- OrePrefixes.circuit.get(Materials.Good),
- Character.valueOf('P'),
- OrePrefixes.plate.get(Materials.Aluminium)
- });
+ GregtechItemList.Super_Chest_MV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_MV,
+ Character.valueOf('G'), ItemList.Automation_ChestBuffer_MV, Character.valueOf('D'),
+ OrePrefixes.circuit.get(Materials.Good), Character.valueOf('P'),
+ OrePrefixes.plate.get(Materials.Aluminium) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Super_Chest_HV.get(1L, new Object[0]), bitsd, new Object[] {
- "DPD",
- "PMP",
- "DGD",
- Character.valueOf('M'),
- ItemList.Hull_HV,
- Character.valueOf('G'),
- ItemList.Automation_ChestBuffer_HV,
- Character.valueOf('D'),
- OrePrefixes.circuit.get(Materials.Advanced),
- Character.valueOf('P'),
- OrePrefixes.plate.get(Materials.StainlessSteel)
- });
+ GregtechItemList.Super_Chest_HV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_HV,
+ Character.valueOf('G'), ItemList.Automation_ChestBuffer_HV, Character.valueOf('D'),
+ OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('P'),
+ OrePrefixes.plate.get(Materials.StainlessSteel) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Super_Chest_EV.get(1L, new Object[0]), bitsd, new Object[] {
- "DPD",
- "PMP",
- "DGD",
- Character.valueOf('M'),
- ItemList.Hull_EV,
- Character.valueOf('G'),
- ItemList.Automation_ChestBuffer_EV,
- Character.valueOf('D'),
- OrePrefixes.circuit.get(Materials.Data),
- Character.valueOf('P'),
- OrePrefixes.plate.get(Materials.Titanium)
- });
+ GregtechItemList.Super_Chest_EV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_EV,
+ Character.valueOf('G'), ItemList.Automation_ChestBuffer_EV, Character.valueOf('D'),
+ OrePrefixes.circuit.get(Materials.Data), Character.valueOf('P'),
+ OrePrefixes.plate.get(Materials.Titanium) });
GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Super_Chest_IV.get(1L, new Object[0]), bitsd, new Object[] {
- "DPD",
- "PMP",
- "DGD",
- Character.valueOf('M'),
- ItemList.Hull_IV,
- Character.valueOf('G'),
- ItemList.Automation_ChestBuffer_IV,
- Character.valueOf('D'),
- OrePrefixes.circuit.get(Materials.Elite),
- Character.valueOf('P'),
- OrePrefixes.plate.get(Materials.Tungsten)
- });
+ GregtechItemList.Super_Chest_IV.get(1L, new Object[0]),
+ bitsd,
+ new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_IV,
+ Character.valueOf('G'), ItemList.Automation_ChestBuffer_IV, Character.valueOf('D'),
+ OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('P'),
+ OrePrefixes.plate.get(Materials.Tungsten) });
}
// Test Thing
- GregtechItemList.CrateStorage.set((new GT_MetaTileEntity_ConnectableCrate(
+ GregtechItemList.CrateStorage.set(
+ (new GT_MetaTileEntity_ConnectableCrate(
GT_MetaTileEntity_ConnectableCrate.mCrateID,
"crate.tier.01",
"Interconnecting Storage Crate",
- 0))
- .getStackForm(1L));
+ 0)).getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
index cdeb6859c7..b36a81e101 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
@@ -12,7 +12,7 @@ public class GregtechSuperConductionPoint {
private static void run1() {
// Steam Condensors
// GregtechItemList.SuperConductorInputNode.set(new GregtechMetaTileEntitySuperCondensor(811,
- // "superconductor.01.input.single", "Power Phase Shifting Station", 8).getStackForm(1L));
+ // "superconductor.01.input.single", "Power Phase Shifting Station", 8).getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java
index 728d23ed24..4470ebe67e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java
@@ -16,8 +16,13 @@ public class GregtechThaumcraftDevices {
private static void run1() {
// 956-960
- GregtechItemList.Thaumcraft_Researcher.set(new GregtechMetaPollutionCreator(
- 956, "thaumcraft.gtpp.machine.01", "Arcane Researcher", 5, "Thinking for you.", 0)
- .getStackForm(1L));
+ GregtechItemList.Thaumcraft_Researcher.set(
+ new GregtechMetaPollutionCreator(
+ 956,
+ "thaumcraft.gtpp.machine.01",
+ "Arcane Researcher",
+ 5,
+ "Thinking for you.",
+ 0).getStackForm(1L));
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java
index 41ea0c3d26..737f585a56 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java
@@ -1,11 +1,12 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.util.GT_Recipe;
import gregtech.common.tileentities.automation.GT_MetaTileEntity_SuperBuffer;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.creative.GT_MetaTileEntity_InfiniteItemHolder;
-import net.minecraft.item.ItemStack;
public class GregtechThreadedBuffers {
@@ -21,86 +22,82 @@ public class GregtechThreadedBuffers {
/*
* This file used to contain registration and recipes for GT++ threaded super buffers. Those have now been
- * deprecated and replaced by the original GT super buffers.
- *
- * To avoid breaking existing bases, we've assigned the threaded super buffer metadata IDs to a copy of the GT
- * super buffers, with a deprecation notice attached. We've also provided disassembler recipes that are the
- * reverse of the original crafting recipes, allowing players to reclaim their original materials as well as
- * convert the deprecated threaded super buffer metadata ID item back to the original GT super buffer metadata
- * ID item.
+ * deprecated and replaced by the original GT super buffers. To avoid breaking existing bases, we've assigned
+ * the threaded super buffer metadata IDs to a copy of the GT super buffers, with a deprecation notice attached.
+ * We've also provided disassembler recipes that are the reverse of the original crafting recipes, allowing
+ * players to reclaim their original materials as well as convert the deprecated threaded super buffer metadata
+ * ID item back to the original GT super buffer metadata ID item.
*/
final String deprecationNotice = "**DEPRECATED - Drop in disassembler!** ";
- GregtechItemList.Automation_Threaded_SuperBuffer_ULV.set((new GT_MetaTileEntity_SuperBuffer(
+ GregtechItemList.Automation_Threaded_SuperBuffer_ULV.set(
+ (new GT_MetaTileEntity_SuperBuffer(
31000,
"automation.superbuffer.tier.00.deprecated",
deprecationNotice + "Ultra Low Voltage Super Buffer",
- 0))
- .getStackForm(1L));
- GregtechItemList.Automation_Threaded_SuperBuffer_LV.set((new GT_MetaTileEntity_SuperBuffer(
+ 0)).getStackForm(1L));
+ GregtechItemList.Automation_Threaded_SuperBuffer_LV.set(
+ (new GT_MetaTileEntity_SuperBuffer(
31001,
"automation.superbuffer.tier.01.deprecated",
deprecationNotice + "Low Voltage Super Buffer",
- 1))
- .getStackForm(1L));
- GregtechItemList.Automation_Threaded_SuperBuffer_MV.set((new GT_MetaTileEntity_SuperBuffer(
+ 1)).getStackForm(1L));
+ GregtechItemList.Automation_Threaded_SuperBuffer_MV.set(
+ (new GT_MetaTileEntity_SuperBuffer(
31002,
"automation.superbuffer.tier.02.deprecated",
deprecationNotice + "Medium Voltage Super Buffer",
- 2))
- .getStackForm(1L));
- GregtechItemList.Automation_Threaded_SuperBuffer_HV.set((new GT_MetaTileEntity_SuperBuffer(
+ 2)).getStackForm(1L));
+ GregtechItemList.Automation_Threaded_SuperBuffer_HV.set(
+ (new GT_MetaTileEntity_SuperBuffer(
31003,
"automation.superbuffer.tier.03.deprecated",
deprecationNotice + "High Voltage Super Buffer",
- 3))
- .getStackForm(1L));
- GregtechItemList.Automation_Threaded_SuperBuffer_EV.set((new GT_MetaTileEntity_SuperBuffer(
+ 3)).getStackForm(1L));
+ GregtechItemList.Automation_Threaded_SuperBuffer_EV.set(
+ (new GT_MetaTileEntity_SuperBuffer(
31004,
"automation.superbuffer.tier.04.deprecated",
deprecationNotice + "Extreme Voltage Super Buffer",
- 4))
- .getStackForm(1L));
- GregtechItemList.Automation_Threaded_SuperBuffer_IV.set((new GT_MetaTileEntity_SuperBuffer(
+ 4)).getStackForm(1L));
+ GregtechItemList.Automation_Threaded_SuperBuffer_IV.set(
+ (new GT_MetaTileEntity_SuperBuffer(
31005,
"automation.superbuffer.tier.05.deprecated",
deprecationNotice + "Insane Voltage Super Buffer",
- 5))
- .getStackForm(1L));
- GregtechItemList.Automation_Threaded_SuperBuffer_LuV.set((new GT_MetaTileEntity_SuperBuffer(
+ 5)).getStackForm(1L));
+ GregtechItemList.Automation_Threaded_SuperBuffer_LuV.set(
+ (new GT_MetaTileEntity_SuperBuffer(
31006,
"automation.superbuffer.tier.06.deprecated",
deprecationNotice + "Ludicrous Voltage Super Buffer",
- 6))
- .getStackForm(1L));
- GregtechItemList.Automation_Threaded_SuperBuffer_ZPM.set((new GT_MetaTileEntity_SuperBuffer(
+ 6)).getStackForm(1L));
+ GregtechItemList.Automation_Threaded_SuperBuffer_ZPM.set(
+ (new GT_MetaTileEntity_SuperBuffer(
31007,
"automation.superbuffer.tier.07.deprecated",
deprecationNotice + "ZPM Voltage Super Buffer",
- 7))
- .getStackForm(1L));
- GregtechItemList.Automation_Threaded_SuperBuffer_UV.set((new GT_MetaTileEntity_SuperBuffer(
+ 7)).getStackForm(1L));
+ GregtechItemList.Automation_Threaded_SuperBuffer_UV.set(
+ (new GT_MetaTileEntity_SuperBuffer(
31008,
"automation.superbuffer.tier.08.deprecated",
deprecationNotice + "Ultimate Voltage Super Buffer",
- 8))
- .getStackForm(1L));
- GregtechItemList.Automation_Threaded_SuperBuffer_MAX.set((new GT_MetaTileEntity_SuperBuffer(
+ 8)).getStackForm(1L));
+ GregtechItemList.Automation_Threaded_SuperBuffer_MAX.set(
+ (new GT_MetaTileEntity_SuperBuffer(
31009,
"automation.superbuffer.tier.09.deprecated",
deprecationNotice + "Highly Ultimate Voltage Super Buffer",
- 9))
- .getStackForm(1L));
+ 9)).getStackForm(1L));
// These recipes are all 1 sec @ 32 EU/t
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
true,
- new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_ULV.get(1L, new Object[0])},
- new ItemStack[] {
- ItemList.Automation_SuperBuffer_ULV.get(1L, new Object[0]),
- ItemList.Tool_DataOrb.get(1L, new Object[0]),
- ItemList.Conveyor_Module_LV.get(1L, new Object[0]),
- },
+ new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_ULV.get(1L, new Object[0]) },
+ new ItemStack[] { ItemList.Automation_SuperBuffer_ULV.get(1L, new Object[0]),
+ ItemList.Tool_DataOrb.get(1L, new Object[0]),
+ ItemList.Conveyor_Module_LV.get(1L, new Object[0]), },
null,
null,
null,
@@ -109,12 +106,10 @@ public class GregtechThreadedBuffers {
-100);
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
true,
- new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_LV.get(1L, new Object[0])},
- new ItemStack[] {
- ItemList.Automation_SuperBuffer_LV.get(1L, new Object[0]),
- ItemList.Tool_DataOrb.get(1L, new Object[0]),
- ItemList.Conveyor_Module_LV.get(1L, new Object[0]),
- },
+ new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_LV.get(1L, new Object[0]) },
+ new ItemStack[] { ItemList.Automation_SuperBuffer_LV.get(1L, new Object[0]),
+ ItemList.Tool_DataOrb.get(1L, new Object[0]),
+ ItemList.Conveyor_Module_LV.get(1L, new Object[0]), },
null,
null,
null,
@@ -123,12 +118,10 @@ public class GregtechThreadedBuffers {
-100);
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
true,
- new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_MV.get(1L, new Object[0])},
- new ItemStack[] {
- ItemList.Automation_SuperBuffer_MV.get(1L, new Object[0]),
- ItemList.Tool_DataOrb.get(1L, new Object[0]),
- ItemList.Conveyor_Module_MV.get(1L, new Object[0]),
- },
+ new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_MV.get(1L, new Object[0]) },
+ new ItemStack[] { ItemList.Automation_SuperBuffer_MV.get(1L, new Object[0]),
+ ItemList.Tool_DataOrb.get(1L, new Object[0]),
+ ItemList.Conveyor_Module_MV.get(1L, new Object[0]), },
null,
null,
null,
@@ -137,12 +130,10 @@ public class GregtechThreadedBuffers {
-100);
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
true,
- new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_HV.get(1L, new Object[0])},
- new ItemStack[] {
- ItemList.Automation_SuperBuffer_HV.get(1L, new Object[0]),
- ItemList.Tool_DataOrb.get(1L, new Object[0]),
- ItemList.Conveyor_Module_HV.get(1L, new Object[0]),
- },
+ new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_HV.get(1L, new Object[0]) },
+ new ItemStack[] { ItemList.Automation_SuperBuffer_HV.get(1L, new Object[0]),
+ ItemList.Tool_DataOrb.get(1L, new Object[0]),
+ ItemList.Conveyor_Module_HV.get(1L, new Object[0]), },
null,
null,
null,
@@ -151,12 +142,10 @@ public class GregtechThreadedBuffers {
-100);
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
true,
- new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_EV.get(1L, new Object[0])},
- new ItemStack[] {
- ItemList.Automation_SuperBuffer_EV.get(1L, new Object[0]),
- ItemList.Tool_DataOrb.get(1L, new Object[0]),
- ItemList.Conveyor_Module_EV.get(1L, new Object[0]),
- },
+ new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_EV.get(1L, new Object[0]) },
+ new ItemStack[] { ItemList.Automation_SuperBuffer_EV.get(1L, new Object[0]),
+ ItemList.Tool_DataOrb.get(1L, new Object[0]),
+ ItemList.Conveyor_Module_EV.get(1L, new Object[0]), },
null,
null,
null,
@@ -165,12 +154,10 @@ public class GregtechThreadedBuffers {
-100);
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
true,
- new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_IV.get(1L, new Object[0])},
- new ItemStack[] {
- ItemList.Automation_SuperBuffer_IV.get(1L, new Object[0]),
- ItemList.Tool_DataOrb.get(1L, new Object[0]),
- ItemList.Conveyor_Module_IV.get(1L, new Object[0]),
- },
+ new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_IV.get(1L, new Object[0]) },
+ new ItemStack[] { ItemList.Automation_SuperBuffer_IV.get(1L, new Object[0]),
+ ItemList.Tool_DataOrb.get(1L, new Object[0]),
+ ItemList.Conveyor_Module_IV.get(1L, new Object[0]), },
null,
null,
null,
@@ -179,12 +166,10 @@ public class GregtechThreadedBuffers {
-100);
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
true,
- new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_LuV.get(1L, new Object[0])},
- new ItemStack[] {
- ItemList.Automation_SuperBuffer_LuV.get(1L, new Object[0]),
- ItemList.Tool_DataOrb.get(1L, new Object[0]),
- ItemList.Conveyor_Module_LuV.get(1L, new Object[0]),
- },
+ new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_LuV.get(1L, new Object[0]) },
+ new ItemStack[] { ItemList.Automation_SuperBuffer_LuV.get(1L, new Object[0]),
+ ItemList.Tool_DataOrb.get(1L, new Object[0]),
+ ItemList.Conveyor_Module_LuV.get(1L, new Object[0]), },
null,
null,
null,
@@ -193,12 +178,10 @@ public class GregtechThreadedBuffers {
-100);
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
true,
- new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_ZPM.get(1L, new Object[0])},
- new ItemStack[] {
- ItemList.Automation_SuperBuffer_ZPM.get(1L, new Object[0]),
- ItemList.Tool_DataOrb.get(1L, new Object[0]),
- ItemList.Conveyor_Module_ZPM.get(1L, new Object[0]),
- },
+ new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_ZPM.get(1L, new Object[0]) },
+ new ItemStack[] { ItemList.Automation_SuperBuffer_ZPM.get(1L, new Object[0]),
+ ItemList.Tool_DataOrb.get(1L, new Object[0]),
+ ItemList.Conveyor_Module_ZPM.get(1L, new Object[0]), },
null,
null,
null,
@@ -207,12 +190,10 @@ public class GregtechThreadedBuffers {
-100);
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
true,
- new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_UV.get(1L, new Object[0])},
- new ItemStack[] {
- ItemList.Automation_SuperBuffer_UV.get(1L, new Object[0]),
- ItemList.Tool_DataOrb.get(1L, new Object[0]),
- ItemList.Conveyor_Module_UV.get(1L, new Object[0]),
- },
+ new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_UV.get(1L, new Object[0]) },
+ new ItemStack[] { ItemList.Automation_SuperBuffer_UV.get(1L, new Object[0]),
+ ItemList.Tool_DataOrb.get(1L, new Object[0]),
+ ItemList.Conveyor_Module_UV.get(1L, new Object[0]), },
null,
null,
null,
@@ -221,12 +202,10 @@ public class GregtechThreadedBuffers {
-100);
GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe(
true,
- new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_MAX.get(1L, new Object[0])},
- new ItemStack[] {
- ItemList.Automation_SuperBuffer_MAX.get(1L, new Object[0]),
- ItemList.Tool_DataOrb.get(1L, new Object[0]),
- GregtechItemList.Conveyor_Module_MAX.get(1L, new Object[0]),
- },
+ new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_MAX.get(1L, new Object[0]) },
+ new ItemStack[] { ItemList.Automation_SuperBuffer_MAX.get(1L, new Object[0]),
+ ItemList.Tool_DataOrb.get(1L, new Object[0]),
+ GregtechItemList.Conveyor_Module_MAX.get(1L, new Object[0]), },
null,
null,
null,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java
index 525b3f6110..a3d1b3f22f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java
@@ -6,6 +6,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader;
public class GregtechTieredChunkloaders {
+
public static void run() {
if (LoadedMods.Gregtech) {
Logger.INFO("Gregtech5u Content | Registering Chunk Loaders.");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
index 88984ac0c1..ac740b8210 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java
@@ -7,6 +7,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredTank;
public class GregtechTieredFluidTanks {
+
public static void run() {
if (LoadedMods.Gregtech) {
Logger.INFO("Gregtech5u Content | Registering Portable Fluid Tanks.");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java
index 38ef3e6b77..65c3e0b36a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java
@@ -6,6 +6,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaTreeFarmerStructural;
public class GregtechTreeFarmerTE {
+
public static void run() {
if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
Logger.INFO("Gregtech5u Content | Registering Tree Farmer Structural Block.");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
index fb14dad78f..413e9bb81c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java
@@ -14,86 +14,85 @@ public class GregtechWirelessChargers {
if (gtPlusPlus.core.lib.LoadedMods.Gregtech) {
Logger.INFO("Gregtech5u Content | Registering Wireless Chargers.");
- long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED;
int mID = 890;
Utils.registerEvent(new ChargingHelper());
- GregtechItemList.Charger_LV.set(new GregtechMetaWirelessCharger(
+ GregtechItemList.Charger_LV.set(
+ new GregtechMetaWirelessCharger(
mID++,
"wificharger.01.tier.single",
"Wireless Charger MK I",
1,
"Hopefully won't give you cancer.",
- 0)
- .getStackForm(1L));
- GregtechItemList.Charger_MV.set(new GregtechMetaWirelessCharger(
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_MV.set(
+ new GregtechMetaWirelessCharger(
mID++,
"wificharger.02.tier.single",
"Wireless Charger MK II",
2,
"Hopefully won't give you cancer.",
- 0)
- .getStackForm(1L));
- GregtechItemList.Charger_HV.set(new GregtechMetaWirelessCharger(
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_HV.set(
+ new GregtechMetaWirelessCharger(
mID++,
"wificharger.03.tier.single",
"Wireless Charger MK III",
3,
"Hopefully won't give you cancer.",
- 0)
- .getStackForm(1L));
- GregtechItemList.Charger_EV.set(new GregtechMetaWirelessCharger(
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_EV.set(
+ new GregtechMetaWirelessCharger(
mID++,
"wificharger.04.tier.single",
"Wireless Charger MK IV",
4,
"Hopefully won't give you cancer.",
- 0)
- .getStackForm(1L));
- GregtechItemList.Charger_IV.set(new GregtechMetaWirelessCharger(
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_IV.set(
+ new GregtechMetaWirelessCharger(
mID++,
"wificharger.05.tier.single",
"Wireless Charger MK V",
5,
"Hopefully won't give you cancer.",
- 0)
- .getStackForm(1L));
- GregtechItemList.Charger_LuV.set(new GregtechMetaWirelessCharger(
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_LuV.set(
+ new GregtechMetaWirelessCharger(
mID++,
"wificharger.06.tier.single",
"Wireless Charger MK VI",
6,
"Hopefully won't give you cancer.",
- 0)
- .getStackForm(1L));
- GregtechItemList.Charger_ZPM.set(new GregtechMetaWirelessCharger(
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_ZPM.set(
+ new GregtechMetaWirelessCharger(
mID++,
"wificharger.07.tier.single",
"Wireless Charger MK VII",
7,
"Hopefully won't give you cancer.",
- 0)
- .getStackForm(1L));
- GregtechItemList.Charger_UV.set(new GregtechMetaWirelessCharger(
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_UV.set(
+ new GregtechMetaWirelessCharger(
mID++,
"wificharger.08.tier.single",
"Wireless Charger MK VIII",
8,
"Hopefully won't give you cancer.",
- 0)
- .getStackForm(1L));
- GregtechItemList.Charger_MAX.set(new GregtechMetaWirelessCharger(
+ 0).getStackForm(1L));
+ GregtechItemList.Charger_MAX.set(
+ new GregtechMetaWirelessCharger(
mID++,
"wificharger.09.tier.single",
"Wireless Charger MK IX",
9,
"Hopefully won't give you cancer.",
- 0)
- .getStackForm(1L));
+ 0).getStackForm(1L));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java
index ceeed5128d..5ed7046a93 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java
@@ -20,221 +20,125 @@ public class NewHorizonsAccelerator {
}
private static void run1() {
- GregtechItemList.AcceleratorLV.set(new GT_MetaTileEntity_WorldAccelerator(
- 841, "basicmachine.accelerator.tier.01", "Basic World Accelerator", 1)
- .getStackForm(1L));
- GregtechItemList.AcceleratorMV.set(new GT_MetaTileEntity_WorldAccelerator(
- 842, "basicmachine.accelerator.tier.02", "Advanced World Accelerator", 2)
- .getStackForm(1L));
- GregtechItemList.AcceleratorHV.set(new GT_MetaTileEntity_WorldAccelerator(
- 843, "basicmachine.accelerator.tier.03", "Advanced World Accelerator II", 3)
- .getStackForm(1L));
- GregtechItemList.AcceleratorEV.set(new GT_MetaTileEntity_WorldAccelerator(
- 844, "basicmachine.accelerator.tier.04", "Advanced World Accelerator III", 4)
- .getStackForm(1L));
- GregtechItemList.AcceleratorIV.set(new GT_MetaTileEntity_WorldAccelerator(
- 845, "basicmachine.accelerator.tier.05", "Advanced World Accelerator IV", 5)
- .getStackForm(1L));
- GregtechItemList.AcceleratorLuV.set(new GT_MetaTileEntity_WorldAccelerator(
- 846, "basicmachine.accelerator.tier.06", "Elite World Accelerator", 6)
- .getStackForm(1L));
- GregtechItemList.AcceleratorZPM.set(new GT_MetaTileEntity_WorldAccelerator(
- 847, "basicmachine.accelerator.tier.07", "Elite World Accelerator II", 7)
- .getStackForm(1L));
- GregtechItemList.AcceleratorUV.set(new GT_MetaTileEntity_WorldAccelerator(
- 848, "basicmachine.accelerator.tier.08", "Ultimate Time Anomaly", 8)
- .getStackForm(1L));
+ GregtechItemList.AcceleratorLV.set(
+ new GT_MetaTileEntity_WorldAccelerator(
+ 841,
+ "basicmachine.accelerator.tier.01",
+ "Basic World Accelerator",
+ 1).getStackForm(1L));
+ GregtechItemList.AcceleratorMV.set(
+ new GT_MetaTileEntity_WorldAccelerator(
+ 842,
+ "basicmachine.accelerator.tier.02",
+ "Advanced World Accelerator",
+ 2).getStackForm(1L));
+ GregtechItemList.AcceleratorHV.set(
+ new GT_MetaTileEntity_WorldAccelerator(
+ 843,
+ "basicmachine.accelerator.tier.03",
+ "Advanced World Accelerator II",
+ 3).getStackForm(1L));
+ GregtechItemList.AcceleratorEV.set(
+ new GT_MetaTileEntity_WorldAccelerator(
+ 844,
+ "basicmachine.accelerator.tier.04",
+ "Advanced World Accelerator III",
+ 4).getStackForm(1L));
+ GregtechItemList.AcceleratorIV.set(
+ new GT_MetaTileEntity_WorldAccelerator(
+ 845,
+ "basicmachine.accelerator.tier.05",
+ "Advanced World Accelerator IV",
+ 5).getStackForm(1L));
+ GregtechItemList.AcceleratorLuV.set(
+ new GT_MetaTileEntity_WorldAccelerator(
+ 846,
+ "basicmachine.accelerator.tier.06",
+ "Elite World Accelerator",
+ 6).getStackForm(1L));
+ GregtechItemList.AcceleratorZPM.set(
+ new GT_MetaTileEntity_WorldAccelerator(
+ 847,
+ "basicmachine.accelerator.tier.07",
+ "Elite World Accelerator II",
+ 7).getStackForm(1L));
+ GregtechItemList.AcceleratorUV.set(
+ new GT_MetaTileEntity_WorldAccelerator(
+ 848,
+ "basicmachine.accelerator.tier.08",
+ "Ultimate Time Anomaly",
+ 8).getStackForm(1L));
GT_ModHandler.addCraftingRecipe(
GregtechItemList.AcceleratorLV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "RMR",
- "PBC",
- "IMI",
- 'R',
- ItemList.Robot_Arm_LV,
- 'M',
- ItemList.Electric_Motor_LV,
- 'P',
- ItemList.Electric_Pump_LV,
- 'B',
- ItemList.Hull_LV,
- 'C',
- ItemList.Conveyor_Module_LV,
- 'I',
- ItemList.Electric_Piston_LV
- });
+ new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_LV, 'M', ItemList.Electric_Motor_LV, 'P',
+ ItemList.Electric_Pump_LV, 'B', ItemList.Hull_LV, 'C', ItemList.Conveyor_Module_LV, 'I',
+ ItemList.Electric_Piston_LV });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.AcceleratorMV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "RMR",
- "PBC",
- "IMI",
- 'R',
- ItemList.Robot_Arm_MV,
- 'M',
- ItemList.Electric_Motor_MV,
- 'P',
- ItemList.Electric_Pump_MV,
- 'B',
- ItemList.Hull_MV,
- 'C',
- ItemList.Conveyor_Module_MV,
- 'I',
- ItemList.Electric_Piston_MV
- });
+ new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_MV, 'M', ItemList.Electric_Motor_MV, 'P',
+ ItemList.Electric_Pump_MV, 'B', ItemList.Hull_MV, 'C', ItemList.Conveyor_Module_MV, 'I',
+ ItemList.Electric_Piston_MV });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.AcceleratorHV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "RMR",
- "PBC",
- "IMI",
- 'R',
- ItemList.Robot_Arm_HV,
- 'M',
- ItemList.Electric_Motor_HV,
- 'P',
- ItemList.Electric_Pump_HV,
- 'B',
- ItemList.Hull_HV,
- 'C',
- ItemList.Conveyor_Module_HV,
- 'I',
- ItemList.Electric_Piston_HV
- });
+ new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_HV, 'M', ItemList.Electric_Motor_HV, 'P',
+ ItemList.Electric_Pump_HV, 'B', ItemList.Hull_HV, 'C', ItemList.Conveyor_Module_HV, 'I',
+ ItemList.Electric_Piston_HV });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.AcceleratorEV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "RMR",
- "PBC",
- "IMI",
- 'R',
- ItemList.Robot_Arm_EV,
- 'M',
- ItemList.Electric_Motor_EV,
- 'P',
- ItemList.Electric_Pump_EV,
- 'B',
- ItemList.Hull_EV,
- 'C',
- ItemList.Conveyor_Module_EV,
- 'I',
- ItemList.Electric_Piston_EV
- });
+ new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_EV, 'M', ItemList.Electric_Motor_EV, 'P',
+ ItemList.Electric_Pump_EV, 'B', ItemList.Hull_EV, 'C', ItemList.Conveyor_Module_EV, 'I',
+ ItemList.Electric_Piston_EV });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.AcceleratorIV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "RMR",
- "PBC",
- "IMI",
- 'R',
- ItemList.Robot_Arm_IV,
- 'M',
- ItemList.Electric_Motor_IV,
- 'P',
- ItemList.Electric_Pump_IV,
- 'B',
- ItemList.Hull_IV,
- 'C',
- ItemList.Conveyor_Module_IV,
- 'I',
- ItemList.Electric_Piston_IV
- });
+ new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_IV, 'M', ItemList.Electric_Motor_IV, 'P',
+ ItemList.Electric_Pump_IV, 'B', ItemList.Hull_IV, 'C', ItemList.Conveyor_Module_IV, 'I',
+ ItemList.Electric_Piston_IV });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.AcceleratorLuV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "RMR",
- "PBC",
- "IMI",
- 'R',
- ItemList.Robot_Arm_LuV,
- 'M',
- ItemList.Electric_Motor_LuV,
- 'P',
- ItemList.Electric_Pump_LuV,
- 'B',
- ItemList.Hull_LuV,
- 'C',
- ItemList.Conveyor_Module_LuV,
- 'I',
- ItemList.Electric_Piston_LuV
- });
+ new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_LuV, 'M', ItemList.Electric_Motor_LuV, 'P',
+ ItemList.Electric_Pump_LuV, 'B', ItemList.Hull_LuV, 'C', ItemList.Conveyor_Module_LuV, 'I',
+ ItemList.Electric_Piston_LuV });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.AcceleratorZPM.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "RMR",
- "PBC",
- "IMI",
- 'R',
- ItemList.Robot_Arm_ZPM,
- 'M',
- ItemList.Electric_Motor_ZPM,
- 'P',
- ItemList.Electric_Pump_ZPM,
- 'B',
- ItemList.Hull_ZPM,
- 'C',
- ItemList.Conveyor_Module_ZPM,
- 'I',
- ItemList.Electric_Piston_ZPM
- });
+ new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_ZPM, 'M', ItemList.Electric_Motor_ZPM, 'P',
+ ItemList.Electric_Pump_ZPM, 'B', ItemList.Hull_ZPM, 'C', ItemList.Conveyor_Module_ZPM, 'I',
+ ItemList.Electric_Piston_ZPM });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.AcceleratorUV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE
| GT_ModHandler.RecipeBits.BUFFERED,
- new Object[] {
- "RMR",
- "PBC",
- "IMI",
- 'R',
- ItemList.Robot_Arm_UV,
- 'M',
- ItemList.Electric_Motor_UV,
- 'P',
- ItemList.Electric_Pump_UV,
- 'B',
- ItemList.Hull_UV,
- 'C',
- ItemList.Conveyor_Module_UV,
- 'I',
- ItemList.Electric_Piston_UV
- });
+ new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_UV, 'M', ItemList.Electric_Motor_UV, 'P',
+ ItemList.Electric_Pump_UV, 'B', ItemList.Hull_UV, 'C', ItemList.Conveyor_Module_UV, 'I',
+ ItemList.Electric_Piston_UV });
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
index 2a86b80d00..e7abde5646 100644
--- a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
@@ -1,5 +1,10 @@
package gtPlusPlus.xmod.growthcraft.fishtrap;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
@@ -8,13 +13,10 @@ import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.item.ItemStack;
public class FishTrapHandler {
- private static final String[] fishTypes = {"fish", "junk", "treasure"};
+ private static final String[] fishTypes = { "fish", "junk", "treasure" };
private static Object mFishingRegistry;
private static Growthcraft_Old mHandler;
@@ -35,12 +37,8 @@ public class FishTrapHandler {
if (mFishingRegistry != null) {
return mFishingRegistry;
}
- } catch (NoSuchMethodException
- | SecurityException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException e) {
- }
+ } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException e) {}
return null;
}
@@ -70,38 +68,29 @@ public class FishTrapHandler {
return;
}
} /*
- else if (LoadedMods.getModVersion("Growthcraft").contains("2.7.2")){
- if (lootType.equals(fishTypes[0])){
- Growthcraft_New.addTrapFish(lootStack, lootChance);
- Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as an extra Fish for Growthcraft Fishtraps.");
- }
- else if (lootType.equals(fishTypes[1])){
- Growthcraft_New.addTrapJunk(lootStack, lootChance);
- Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as extra Junk for Growthcraft Fishtraps.");
- }
- else if (lootType.equals(fishTypes[2])){
- Growthcraft_New.addTrapTreasure(lootStack, lootChance);
- Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as extra Treasure for Growthcraft Fishtraps.");
- }
- else {
- return;
- }
- }*/ else {
- Logger.INFO("Extra Fish loot for Growthcraft Fishtraps disabled. Found V."
- + LoadedMods.getModVersion("Growthcraft"));
+ * else if (LoadedMods.getModVersion("Growthcraft").contains("2.7.2")){ if (lootType.equals(fishTypes[0])){
+ * Growthcraft_New.addTrapFish(lootStack, lootChance);
+ * Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as an extra Fish for Growthcraft Fishtraps."); } else
+ * if (lootType.equals(fishTypes[1])){ Growthcraft_New.addTrapJunk(lootStack, lootChance);
+ * Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as extra Junk for Growthcraft Fishtraps."); } else if
+ * (lootType.equals(fishTypes[2])){ Growthcraft_New.addTrapTreasure(lootStack, lootChance);
+ * Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as extra Treasure for Growthcraft Fishtraps."); } else
+ * { return; } }
+ */ else {
+ Logger.INFO(
+ "Extra Fish loot for Growthcraft Fishtraps disabled. Found V."
+ + LoadedMods.getModVersion("Growthcraft"));
}
}
+
// FishTrapHandler.pamsHarvestCraftCompat();
static final String prefix = "food";
static final String suffix = "raw";
static final String seaweed = "cropSeaweed";
static final String greenheartFish = "foodGreenheartfish";
- private static final String[] harvestcraftFish = {
- "Anchovy", "Bass", "Calamari", "Carp", "Catfish", "Charr", "Clam", "Crab", "Crayfish", "Eel", "Frog", "Grouper",
- "Herring",
- "Jellyfish", "Mudfish", "Octopus", "Perch", "Scallop", "Shrimp", "Snail", "Snapper", "Tilapia", "Trout", "Tuna",
- "Turtle", "Walley"
- };
+ private static final String[] harvestcraftFish = { "Anchovy", "Bass", "Calamari", "Carp", "Catfish", "Charr",
+ "Clam", "Crab", "Crayfish", "Eel", "Frog", "Grouper", "Herring", "Jellyfish", "Mudfish", "Octopus", "Perch",
+ "Scallop", "Shrimp", "Snail", "Snapper", "Tilapia", "Trout", "Tuna", "Turtle", "Walley" };
public static void pamsHarvestCraftCompat() {
for (int i = 0; i < harvestcraftFish.length; i++) {
@@ -217,11 +206,10 @@ public class FishTrapHandler {
if (CORE.GTNH) {
CORE.RA.addFluidExtractionRecipe(input, FluidUtils.getFluidStack("fishoil", 50), 16, 4);
} else {
- CORE.RA.addFluidExtractionRecipe(
- input,
- FluidUtils.getFluidStack("fishoil", 4),
- 16,
- 4); // 4eu/t total eu used = 64 so time = 64/4
+ CORE.RA.addFluidExtractionRecipe(input, FluidUtils.getFluidStack("fishoil", 4), 16, 4); // 4eu/t total
+ // eu used = 64
+ // so time =
+ // 64/4
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java
index dd8e6debc7..bd1481f6b3 100644
--- a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java
+++ b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.growthcraft.fishtrap;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
import net.minecraft.item.ItemStack;
public class Growthcraft_New {
@@ -18,8 +19,8 @@ public class Growthcraft_New {
void setFishTrapRegistry() {
try {
- Class<?> FishTrapRegistryClass =
- Class.forName("gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler.mFishingRegistry");
+ Class<?> FishTrapRegistryClass = Class
+ .forName("gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler.mFishingRegistry");
Class<?> FishTrapEntry = Class.forName("growthcraft.api.fishtrap.FishTrapEntry");
if (FishTrapRegistryClass.isInstance(FishTrapHandler.getFishingRegistry())) {
addTrapJunk = FishTrapRegistryClass.getDeclaredMethod("addTrapJunk", FishTrapEntry);
@@ -44,14 +45,8 @@ public class Growthcraft_New {
return x;
}
}
- } catch (ClassNotFoundException
- | NoSuchMethodException
- | SecurityException
- | InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException e) {
- }
+ } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException
+ | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
return null;
}
@@ -61,8 +56,7 @@ public class Growthcraft_New {
Object I = createFishTrapEntry(o, p);
m.invoke(FishTrapRegistryO, I);
return true;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java
index 76a025667b..0d1fd8e7dd 100644
--- a/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java
+++ b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.growthcraft.fishtrap;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
import net.minecraft.item.ItemStack;
public class Growthcraft_Old {
@@ -18,8 +19,8 @@ public class Growthcraft_Old {
void setFishTrapRegistry() {
try {
- Class<?> FishTrapRegistryClass =
- Class.forName("gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler.mFishingRegistry");
+ Class<?> FishTrapRegistryClass = Class
+ .forName("gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler.mFishingRegistry");
Class<?> FishTrapEntry = Class.forName("growthcraft.api.fishtrap.FishTrapEntry");
if (FishTrapRegistryClass.isInstance(FishTrapHandler.getFishingRegistry())) {
addTrapJunk = FishTrapRegistryClass.getDeclaredMethod("addTrapJunk", FishTrapEntry);
@@ -44,14 +45,8 @@ public class Growthcraft_Old {
return x;
}
}
- } catch (ClassNotFoundException
- | NoSuchMethodException
- | SecurityException
- | InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException e) {
- }
+ } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException
+ | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
return null;
}
@@ -61,8 +56,7 @@ public class Growthcraft_Old {
Object I = createFishTrapEntry(o, p);
m.invoke(FishTrapRegistryO, I);
return true;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java b/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java
index 6ac8a86504..14ad5cff60 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java
@@ -1,8 +1,9 @@
package gtPlusPlus.xmod.ic2;
-import ic2.core.init.InternalName;
import net.minecraftforge.common.util.EnumHelper;
+import ic2.core.init.InternalName;
+
public class CustomInternalName {
public static InternalName aHazmatHelmetEx;
@@ -11,12 +12,12 @@ public class CustomInternalName {
public static InternalName aHazmatBootsEx;
public static void init() {
- aHazmatHelmetEx =
- EnumHelper.addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {});
- aHazmatChestEx =
- EnumHelper.addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {});
- aHazmatLegsEx =
- EnumHelper.addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {});
+ aHazmatHelmetEx = EnumHelper
+ .addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {});
+ aHazmatChestEx = EnumHelper
+ .addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {});
+ aHazmatLegsEx = EnumHelper
+ .addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {});
aHazmatBootsEx = EnumHelper.addEnum(InternalName.class, "itemArmorRubBootsEx", new Class[] {}, new Object[] {});
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
index 03a2606f71..6e8cf675e8 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
@@ -1,5 +1,19 @@
package gtPlusPlus.xmod.ic2.block.RTGGenerator;
+import java.util.List;
+import java.util.Random;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+import org.apache.commons.lang3.mutable.MutableObject;
+
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -13,19 +27,9 @@ import ic2.core.block.BlockMultiID;
import ic2.core.block.TileEntityBlock;
import ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric;
import ic2.core.init.InternalName;
-import java.util.List;
-import java.util.Random;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import org.apache.commons.lang3.mutable.MutableObject;
public class BlockRTG extends BlockMultiID {
+
public BlockRTG(final InternalName internalName1) {
super(internalName1, Material.iron, ItemGenerators.class);
this.setCreativeTab(AddToCreativeTab.tabMachines);
@@ -39,7 +43,7 @@ public class BlockRTG extends BlockMultiID {
GameRegistry.registerTileEntity(TileEntityKineticWindGenerator.class, "Wind Ripper Mach II");
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void getSubBlocks(final Item j, final CreativeTabs tabs, final List itemList) {
final Item item = Item.getItemFromBlock(this);
@@ -71,8 +75,8 @@ public class BlockRTG extends BlockMultiID {
}
@Override
- public Class<? extends TileEntity> getTeClass(
- final int meta, final MutableObject<Class<?>[]> ctorArgTypes, final MutableObject<Object[]> ctorArgs) {
+ public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes,
+ final MutableObject<Object[]> ctorArgs) {
try {
switch (meta) {
case 0:
@@ -87,33 +91,13 @@ public class BlockRTG extends BlockMultiID {
}
/*
- *
- * {
- case 0:
- return TileEntityGenerator.class;
- case 1:
- return TileEntityGeoGenerator.class;
- case 2:
- return TileEntityWaterGenerator.class;
- case 3:
- return TileEntitySolarGenerator.class;
- case 4:
- return TileEntityWindGenerator.class;
- case 5:
- return TileEntityNuclearReactorElectric.class;
- case 6:
- return TileEntityRTGenerator.class;
- case 7:
- return TileEntitySemifluidGenerator.class;
- case 8:
- return TileEntityStirlingGenerator.class;
- case 9:
- return TileEntityKineticGenerator.class;
- }
- *
- * (non-Javadoc)
- * @see net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World, int, int, int, java.util.Random)
- */
+ * { case 0: return TileEntityGenerator.class; case 1: return TileEntityGeoGenerator.class; case 2: return
+ * TileEntityWaterGenerator.class; case 3: return TileEntitySolarGenerator.class; case 4: return
+ * TileEntityWindGenerator.class; case 5: return TileEntityNuclearReactorElectric.class; case 6: return
+ * TileEntityRTGenerator.class; case 7: return TileEntitySemifluidGenerator.class; case 8: return
+ * TileEntityStirlingGenerator.class; case 9: return TileEntityKineticGenerator.class; } (non-Javadoc)
+ * @see net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World, int, int, int, java.util.Random)
+ */
@Override
public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random random) {
@@ -150,8 +134,8 @@ public class BlockRTG extends BlockMultiID {
world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D);
}
} else if (meta == 5) {
- final TileEntityNuclearReactorElectric te =
- (TileEntityNuclearReactorElectric) this.getOwnTe(world, x, y, z);
+ final TileEntityNuclearReactorElectric te = (TileEntityNuclearReactorElectric) this
+ .getOwnTe(world, x, y, z);
if (te == null) {
return;
}
@@ -162,27 +146,31 @@ public class BlockRTG extends BlockMultiID {
puffs = world.rand.nextInt(puffs);
for (int n = 0; n < puffs; n++) {
world.spawnParticle(
- "smoke", x + random.nextFloat(), y + 0.95F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D);
+ "smoke",
+ x + random.nextFloat(),
+ y + 0.95F,
+ z + random.nextFloat(),
+ 0.0D,
+ 0.0D,
+ 0.0D);
}
puffs -= world.rand.nextInt(4) + 3;
for (int n = 0; n < puffs; n++) {
world.spawnParticle(
- "flame", x + random.nextFloat(), y + 1.0F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D);
+ "flame",
+ x + random.nextFloat(),
+ y + 1.0F,
+ z + random.nextFloat(),
+ 0.0D,
+ 0.0D,
+ 0.0D);
}
}
}
@Override
- public boolean onBlockActivated(
- final World world,
- final int i,
- final int j,
- final int k,
- final EntityPlayer entityplayer,
- final int side,
- final float a,
- final float b,
- final float c) {
+ public boolean onBlockActivated(final World world, final int i, final int j, final int k,
+ final EntityPlayer entityplayer, final int side, final float a, final float b, final float c) {
if ((entityplayer.getCurrentEquippedItem() != null)
&& (entityplayer.getCurrentEquippedItem().isItemEqual(Ic2Items.reactorChamber))) {
return false;
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
index 19602273c3..097e3bf50d 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.ic2.block.RTGGenerator;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RTG;
@@ -9,15 +13,13 @@ import ic2.core.Ic2Items;
import ic2.core.block.generator.tileentity.TileEntityRTGenerator;
import ic2.core.block.invslot.InvSlotConsumable;
import ic2.core.block.invslot.InvSlotConsumableId;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
public class TileEntityRTG extends TileEntityRTGenerator {
+
public final InvSlotConsumable fuelSlot;
public TileEntityRTG() {
- this.fuelSlot = new InvSlotConsumableId(this, "fuelSlot", 0, 12, new Item[] {Ic2Items.RTGPellets.getItem()});
+ this.fuelSlot = new InvSlotConsumableId(this, "fuelSlot", 0, 12, new Item[] { Ic2Items.RTGPellets.getItem() });
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
index 9ac5476ed9..22a48e8916 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
@@ -1,12 +1,15 @@
package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+
import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG;
import ic2.core.block.generator.container.ContainerRTGenerator;
import ic2.core.slot.SlotInvSlot;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
public class CONTAINER_RTG extends ContainerRTGenerator {
+
public CONTAINER_RTG(final EntityPlayer entityPlayer, final TileEntityRTG tileEntity1) {
super(entityPlayer, tileEntity1);
for (int i = 0; i < 4; i++) {
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
index 913d456553..1e22f66f32 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
@@ -1,17 +1,20 @@
package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG;
import ic2.core.IC2;
import ic2.core.block.generator.gui.GuiRTGenerator;
import ic2.core.util.GuiTooltipHelper;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GUI_RTG extends GuiRTGenerator {
+
public CONTAINER_RTG container;
public GUI_RTG(final CONTAINER_RTG container1) {
@@ -23,15 +26,15 @@ public class GUI_RTG extends GuiRTGenerator {
@Override
protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
- this.fontRendererObj.drawString(
- this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 4, 4210752);
+ this.fontRendererObj
+ .drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 4, 4210752);
GuiTooltipHelper.drawAreaTooltip(
par1 - this.guiLeft,
par2 - this.guiTop,
StatCollector.translateToLocalFormatted(
"ic2.generic.text.bufferEU",
- new Object[] {Double.valueOf(((TileEntityRTG) this.container.base).storage)}),
+ new Object[] { Double.valueOf(((TileEntityRTG) this.container.base).storage) }),
117,
38,
150,
@@ -50,6 +53,7 @@ public class GUI_RTG extends GuiRTGenerator {
this.drawTexturedModalRect(j + 119, k + 40, 179, 3, i1, 8);
}
- private static final ResourceLocation background =
- new ResourceLocation(IC2.textureDomain, "textures/gui/GUIRTGenerator.png");
+ private static final ResourceLocation background = new ResourceLocation(
+ IC2.textureDomain,
+ "textures/gui/GUIRTGenerator.png");
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
index 4f9a2ccab1..2391809eb7 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.ic2.block.kieticgenerator;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+import org.apache.commons.lang3.mutable.MutableObject;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gtPlusPlus.core.creative.AddToCreativeTab;
import ic2.core.block.BlockMultiID;
@@ -7,14 +15,9 @@ import ic2.core.block.kineticgenerator.tileentity.TileEntityManualKineticGenerat
import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
import ic2.core.init.InternalName;
import ic2.core.item.block.ItemKineticGenerator;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import org.apache.commons.lang3.mutable.MutableObject;
public class IC2_BlockKineticGenerator extends BlockMultiID {
+
public IC2_BlockKineticGenerator(final InternalName internalName1) {
super(internalName1, Material.iron, ItemKineticGenerator.class);
@@ -36,8 +39,8 @@ public class IC2_BlockKineticGenerator extends BlockMultiID {
}
@Override
- public Class<? extends TileEntity> getTeClass(
- final int meta, final MutableObject<Class<?>[]> ctorArgTypes, final MutableObject<Object[]> ctorArgs) {
+ public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes,
+ final MutableObject<Object[]> ctorArgs) {
try {
switch (meta) {
case 0:
@@ -50,16 +53,8 @@ public class IC2_BlockKineticGenerator extends BlockMultiID {
}
@Override
- public boolean onBlockActivated(
- final World world,
- final int x,
- final int y,
- final int z,
- final EntityPlayer entityPlayer,
- final int side,
- final float a,
- final float b,
- final float c) {
+ public boolean onBlockActivated(final World world, final int x, final int y, final int z,
+ final EntityPlayer entityPlayer, final int side, final float a, final float b, final float c) {
if (entityPlayer.isSneaking()) {
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
index 6b851e2666..fe08f7f959 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
@@ -1,13 +1,16 @@
package gtPlusPlus.xmod.ic2.block.kieticgenerator;
-import ic2.core.block.TileEntityBlock;
import java.io.DataInput;
import java.io.IOException;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
+import ic2.core.block.TileEntityBlock;
+
public abstract class IC2_TEComponent {
+
protected final TileEntityBlock parent;
public IC2_TEComponent(final TileEntityBlock parent) {
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
index 6bc79849c3..8c4e099889 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
@@ -1,14 +1,17 @@
package gtPlusPlus.xmod.ic2.block.kieticgenerator.container;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+
import ic2.core.ContainerFullInv;
import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
import ic2.core.slot.SlotInvSlot;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
public class ContainerKineticWindgenerator extends ContainerFullInv<TileEntityWindKineticGenerator> {
- public ContainerKineticWindgenerator(
- final EntityPlayer entityPlayer, final TileEntityWindKineticGenerator tileEntity1) {
+
+ public ContainerKineticWindgenerator(final EntityPlayer entityPlayer,
+ final TileEntityWindKineticGenerator tileEntity1) {
super(entityPlayer, tileEntity1, 166);
this.addSlotToContainer(new SlotInvSlot(tileEntity1.rotorSlot, 0, 80, 26));
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
index b432bf4e15..29eaa6d69c 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
@@ -1,3 +1,4 @@
package gtPlusPlus.xmod.ic2.block.kieticgenerator.container;
-public class IC2_ContainerBase {}
+public class IC2_ContainerBase {
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
index 27d4f014bb..33a59ee35a 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
@@ -1,17 +1,20 @@
package gtPlusPlus.xmod.ic2.block.kieticgenerator.gui;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+import org.lwjgl.opengl.GL11;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.core.IC2;
import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
import ic2.core.util.GuiTooltipHelper;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class GuiKineticWindGenerator extends GuiContainer {
+
public ContainerWindKineticGenerator container;
public String name;
@@ -24,22 +27,31 @@ public class GuiKineticWindGenerator extends GuiContainer {
@Override
protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
- this.fontRendererObj.drawString(
- this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6, 4210752);
+ this.fontRendererObj
+ .drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6, 4210752);
if (this.container.base.checkrotor()) {
if (!this.container.base.rotorspace()) {
this.fontRendererObj.drawString(
- StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"), 20, 52, 2157374);
+ StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"),
+ 20,
+ 52,
+ 2157374);
} else if ((this.container.base.checkrotor()) && (!this.container.base.guiisminWindStrength())) {
this.fontRendererObj.drawString(
- StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), 27, 52, 2157374);
+ StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"),
+ 27,
+ 52,
+ 2157374);
this.fontRendererObj.drawString(
- StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak2"), 24, 69, 2157374);
+ StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak2"),
+ 24,
+ 69,
+ 2157374);
} else {
this.fontRendererObj.drawString(
StatCollector.translateToLocalFormatted(
"ic2.WindKineticGenerator.gui.output",
- new Object[] {Integer.valueOf(this.container.base.getKuOutput())}),
+ new Object[] { Integer.valueOf(this.container.base.getKuOutput()) }),
55,
52,
2157374);
@@ -65,7 +77,10 @@ public class GuiKineticWindGenerator extends GuiContainer {
}
} else {
this.fontRendererObj.drawString(
- StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), 27, 52, 2157374);
+ StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"),
+ 27,
+ 52,
+ 2157374);
}
}
@@ -82,6 +97,7 @@ public class GuiKineticWindGenerator extends GuiContainer {
}
}
- private static final ResourceLocation background =
- new ResourceLocation(IC2.textureDomain, "textures/gui/GUIWindKineticGenerator.png");
+ private static final ResourceLocation background = new ResourceLocation(
+ IC2.textureDomain,
+ "textures/gui/GUIWindKineticGenerator.png");
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
index 1f9ebcc8bd..f86562f1de 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
@@ -1,5 +1,17 @@
package gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity;
+import java.util.List;
+import java.util.Vector;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.ChunkCache;
+import net.minecraftforge.common.util.ForgeDirection;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.energy.tile.IKineticSource;
@@ -11,18 +23,9 @@ import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
import ic2.core.util.Util;
-import java.util.List;
-import java.util.Vector;
-import net.minecraft.block.Block;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.ChunkCache;
-import net.minecraftforge.common.util.ForgeDirection;
public class TileEntityKineticWindGenerator extends TileEntityWindKineticGenerator implements IKineticSource, IHasGui {
+
public final InvSlotConsumableKineticRotor rotorSlot;
private double windStrength;
private int obstructedCrossSection;
@@ -76,8 +79,8 @@ public class TileEntityKineticWindGenerator extends TileEntityWindKineticGenerat
}
this.windStrength = this.calcWindStrength();
- final float speed = (float)
- Util.limit((this.windStrength - this.getMinWindStrength()) / this.getMaxWindStrength(), 0.0D, 2.0D);
+ final float speed = (float) Util
+ .limit((this.windStrength - this.getMinWindStrength()) / this.getMaxWindStrength(), 0.0D, 2.0D);
this.setRotationSpeed(speed * 2);
if (this.windStrength >= this.getMinWindStrength()) {
@@ -137,12 +140,12 @@ public class TileEntityKineticWindGenerator extends TileEntityWindKineticGenerat
@Override
public String getRotorhealth() {
if (!this.rotorSlot.isEmpty()) {
- return StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.rotorhealth", new Object[] {
- Integer.valueOf((int) (100.0F
- - ((this.rotorSlot.get().getItemDamage()
- / this.rotorSlot.get().getMaxDamage())
- * 100.0F)))
- });
+ return StatCollector.translateToLocalFormatted(
+ "ic2.WindKineticGenerator.gui.rotorhealth",
+ new Object[] { Integer.valueOf(
+ (int) (100.0F
+ - ((this.rotorSlot.get().getItemDamage() / this.rotorSlot.get().getMaxDamage())
+ * 100.0F))) });
}
return "";
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java
index 441e910f50..8dafc12de8 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java
@@ -1,14 +1,7 @@
package gtPlusPlus.xmod.ic2.item;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.lib.LoadedMods;
-import ic2.api.item.IKineticRotor;
-import ic2.core.IC2;
-import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
-import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
import java.util.List;
+
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -18,6 +11,15 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.lib.LoadedMods;
+import ic2.api.item.IKineticRotor;
+import ic2.core.IC2;
+import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
+import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
+
public class CustomKineticRotor extends Item implements IKineticRotor {
private final int mTier;
@@ -25,31 +27,24 @@ public class CustomKineticRotor extends Item implements IKineticRotor {
@SideOnly(Side.CLIENT)
private IIcon[] mTextures;
- private static final String[] mRegistrationNames =
- new String[] {"itemwoodrotor", "itemironrotor", "itemsteelrotor", "itemwcarbonrotor"};
-
- private static final String[] mUnlocalNames = new String[] {
- "itemEnergeticRotor",
- "itemTungstenSteelRotor",
- "itemVibrantRotor",
- "itemIridiumRotor",
- "itemMagnaliumRotor",
- "itemUltimetRotor",
- };
- private static final int[] mMaxDurability = new int[] {512000, 809600, 1600000, 3200000};
- private static final int[] mRadius = new int[] {9, 11, 13, 15};
- private static final float[] mEfficiency = new float[] {0.9f, 1.0f, 1.2f, 1.5f};
- private static final int[] mMinWindStrength = new int[] {12, 14, 16, 18};
- private static final int[] mMaxWindStrength = new int[] {80, 120, 160, 320};
+ private static final String[] mRegistrationNames = new String[] { "itemwoodrotor", "itemironrotor",
+ "itemsteelrotor", "itemwcarbonrotor" };
+
+ private static final String[] mUnlocalNames = new String[] { "itemEnergeticRotor", "itemTungstenSteelRotor",
+ "itemVibrantRotor", "itemIridiumRotor", "itemMagnaliumRotor", "itemUltimetRotor", };
+ private static final int[] mMaxDurability = new int[] { 512000, 809600, 1600000, 3200000 };
+ private static final int[] mRadius = new int[] { 9, 11, 13, 15 };
+ private static final float[] mEfficiency = new float[] { 0.9f, 1.0f, 1.2f, 1.5f };
+ private static final int[] mMinWindStrength = new int[] { 12, 14, 16, 18 };
+ private static final int[] mMaxWindStrength = new int[] { 80, 120, 160, 320 };
private static final ResourceLocation[] mResourceLocations = new ResourceLocation[] {
- new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png"),
- new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png"),
- new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png"),
- new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png"),
- new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png"),
- new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png"),
- };
+ new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png"),
+ new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png"),
+ new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png"),
+ new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png"),
+ new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png"),
+ new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png"), };
private final int maxWindStrength;
private final int minWindStrength;
@@ -88,8 +83,10 @@ public class CustomKineticRotor extends Item implements IKineticRotor {
@Override
public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) {
- info.add(StatCollector.translateToLocalFormatted(
- "ic2.itemrotor.wind.info", new Object[] {this.minWindStrength, this.maxWindStrength}));
+ info.add(
+ StatCollector.translateToLocalFormatted(
+ "ic2.itemrotor.wind.info",
+ new Object[] { this.minWindStrength, this.maxWindStrength }));
GearboxType type = null;
if (Minecraft.getMinecraft().currentScreen != null
@@ -97,8 +94,8 @@ public class CustomKineticRotor extends Item implements IKineticRotor {
type = GearboxType.WATER;
} else if (Minecraft.getMinecraft().currentScreen != null
&& Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator) {
- type = GearboxType.WIND;
- }
+ type = GearboxType.WIND;
+ }
if (type != null) {
info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + this.isAcceptedType(itemStack, type)));
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
index 2dd7274c7b..1ce01a5985 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
@@ -1,16 +1,19 @@
package gtPlusPlus.xmod.ic2.item;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.item.base.CoreItem;
import java.util.List;
+
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+
public class IC2_ItemGradual extends CoreItem {
+
public IC2_ItemGradual(final String internalName) {
super(internalName, AddToCreativeTab.tabMachines, 1, 10000, "", EnumRarity.uncommon);
this.setNoRepair();
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
index 2e4b82cfd2..817a902813 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
@@ -1,12 +1,14 @@
package gtPlusPlus.xmod.ic2.item;
-import ic2.api.item.ICustomDamageItem;
-import ic2.core.util.StackUtil;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
+import ic2.api.item.ICustomDamageItem;
+import ic2.core.util.StackUtil;
+
public class IC2_ItemGradualInteger extends IC2_ItemGradual implements ICustomDamageItem {
+
private final int maxDmg;
public IC2_ItemGradualInteger(final String internalName, final int maxdmg) {
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
index 2e11b11b2f..e3401dcbc8 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
@@ -1,17 +1,19 @@
package gtPlusPlus.xmod.ic2.item;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
public class IC2_ItemIC2 extends Item {
+
public IC2_ItemIC2(final String internalName) {
this.setUnlocalizedName(internalName);
this.setCreativeTab(AddToCreativeTab.tabMachines);
@@ -24,45 +26,20 @@ public class IC2_ItemIC2 extends Item {
return null;
}
- /* public String getTextureName(int index)
- {
- if ((!this.hasSubtypes) && (index > 0)) {
- return null;
- }
- String name = getUnlocalizedName(new ItemStack(this, 1, index));
- if ((name != null) && (name.length() > 4)) {
- return name.substring(4);
- }
- return name;
- }
-
- @Override
- @SideOnly(Side.CLIENT)
- public void registerIcons(IIconRegister iconRegister)
- {
- int indexCount = 0;
- while (getTextureName(indexCount) != null)
- {
- indexCount++;
- if (indexCount > 32767) {
- throw new RuntimeException("More Item Icons than actually possible @ " + getUnlocalizedName());
- }
- }
- this.textures = new IIcon[indexCount];
- for (int index = 0; index < indexCount; index++) {
- this.textures[index] = iconRegister.registerIcon(CORE.MODID + ":" + getUnlocalizedName());
- }
- }
-
- @Override
- @SideOnly(Side.CLIENT)
- public IIcon getIconFromDamage(int meta)
- {
- if (meta < this.textures.length) {
- return this.textures[meta];
- }
- return this.textures.length < 1 ? null : this.textures[0];
- }*/
+ /*
+ * public String getTextureName(int index) { if ((!this.hasSubtypes) && (index > 0)) { return null; } String name =
+ * getUnlocalizedName(new ItemStack(this, 1, index)); if ((name != null) && (name.length() > 4)) { return
+ * name.substring(4); } return name; }
+ * @Override
+ * @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { int indexCount = 0; while
+ * (getTextureName(indexCount) != null) { indexCount++; if (indexCount > 32767) { throw new
+ * RuntimeException("More Item Icons than actually possible @ " + getUnlocalizedName()); } } this.textures = new
+ * IIcon[indexCount]; for (int index = 0; index < indexCount; index++) { this.textures[index] =
+ * iconRegister.registerIcon(CORE.MODID + ":" + getUnlocalizedName()); } }
+ * @Override
+ * @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int meta) { if (meta < this.textures.length) { return
+ * this.textures[meta]; } return this.textures.length < 1 ? null : this.textures[0]; }
+ */
@Override
public String getUnlocalizedName() {
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
index df83bce648..87dbd83e65 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
@@ -1,10 +1,11 @@
package gtPlusPlus.xmod.ic2.item;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.CoreItem;
import gtPlusPlus.core.item.wearable.hazmat.ItemArmorHazmatEx;
import gtPlusPlus.core.lib.LoadedMods;
-import net.minecraft.item.ItemStack;
public class IC2_Items {
@@ -26,37 +27,66 @@ public class IC2_Items {
public static ItemStack blockRTG;
public static ItemStack blockKineticGenerator;
- private static final String[] mData1 = new String[] {"itemEnergeticRotorBlade", "itemMagnaliumRotorBlade"};
- private static final String[] mData2 = new String[] {"itemEnergeticShaft", "itemMagnaliumShaft"};
- private static final String[] mData3 = new String[] {"itemVibrantRotorBlade", "itemUltimetRotorBlade"};
- private static final String[] mData4 = new String[] {"itemVibrantShaft", "itemUltimetShaft"};
+ private static final String[] mData1 = new String[] { "itemEnergeticRotorBlade", "itemMagnaliumRotorBlade" };
+ private static final String[] mData2 = new String[] { "itemEnergeticShaft", "itemMagnaliumShaft" };
+ private static final String[] mData3 = new String[] { "itemVibrantRotorBlade", "itemUltimetRotorBlade" };
+ private static final String[] mData4 = new String[] { "itemVibrantShaft", "itemUltimetShaft" };
public static void register() {
int aIndexEIO = (LoadedMods.EnderIO ? 0 : 1);
// Rotor Blades
- rotor_Blade_Material_1 = new ItemStack(new CoreItem(
- mData1[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- rotor_Blade_Material_2 = new ItemStack(new CoreItem(
- "itemTungstenSteelRotorBlade",
- AddToCreativeTab.tabMachines,
- 16,
- "A part for an advanced Kinetic Rotor"));
- rotor_Blade_Material_3 = new ItemStack(new CoreItem(
- mData3[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- rotor_Blade_Material_4 = new ItemStack(new CoreItem(
- "itemIridiumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+ rotor_Blade_Material_1 = new ItemStack(
+ new CoreItem(
+ mData1[aIndexEIO],
+ AddToCreativeTab.tabMachines,
+ 16,
+ "A part for an advanced Kinetic Rotor"));
+ rotor_Blade_Material_2 = new ItemStack(
+ new CoreItem(
+ "itemTungstenSteelRotorBlade",
+ AddToCreativeTab.tabMachines,
+ 16,
+ "A part for an advanced Kinetic Rotor"));
+ rotor_Blade_Material_3 = new ItemStack(
+ new CoreItem(
+ mData3[aIndexEIO],
+ AddToCreativeTab.tabMachines,
+ 16,
+ "A part for an advanced Kinetic Rotor"));
+ rotor_Blade_Material_4 = new ItemStack(
+ new CoreItem(
+ "itemIridiumRotorBlade",
+ AddToCreativeTab.tabMachines,
+ 16,
+ "A part for an advanced Kinetic Rotor"));
// Rotor Shafts
- shaft_Material_1 = new ItemStack(new CoreItem(
- mData2[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- shaft_Material_2 = new ItemStack(new CoreItem(
- "itemTungstenSteelShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- shaft_Material_3 = new ItemStack(new CoreItem(
- mData4[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
- shaft_Material_4 = new ItemStack(new CoreItem(
- "itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+ shaft_Material_1 = new ItemStack(
+ new CoreItem(
+ mData2[aIndexEIO],
+ AddToCreativeTab.tabMachines,
+ 16,
+ "A part for an advanced Kinetic Rotor"));
+ shaft_Material_2 = new ItemStack(
+ new CoreItem(
+ "itemTungstenSteelShaft",
+ AddToCreativeTab.tabMachines,
+ 16,
+ "A part for an advanced Kinetic Rotor"));
+ shaft_Material_3 = new ItemStack(
+ new CoreItem(
+ mData4[aIndexEIO],
+ AddToCreativeTab.tabMachines,
+ 16,
+ "A part for an advanced Kinetic Rotor"));
+ shaft_Material_4 = new ItemStack(
+ new CoreItem(
+ "itemIridiumShaft",
+ AddToCreativeTab.tabMachines,
+ 16,
+ "A part for an advanced Kinetic Rotor"));
// Rotors
rotor_Material_1 = new ItemStack(new CustomKineticRotor(0));
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java b/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
index c0b6fd5427..e5809a0c98 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
@@ -1,13 +1,16 @@
package gtPlusPlus.xmod.ic2.item;
-import ic2.core.item.block.ItemBlockIC2;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
+import ic2.core.item.block.ItemBlockIC2;
+
public class ItemGenerators extends ItemBlockIC2 {
+
public ItemGenerators(final Block block) {
super(block);
@@ -37,12 +40,14 @@ public class ItemGenerators extends ItemBlockIC2 {
final int meta = itemStack.getItemDamage();
switch (meta) {
case 0:
- info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-32 EU/t "
- + StatCollector.translateToLocal("ic2.item.tooltip.max"));
+ info.add(
+ StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-32 EU/t "
+ + StatCollector.translateToLocal("ic2.item.tooltip.max"));
break;
case 1:
- info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-512 EU/t "
- + StatCollector.translateToLocal("ic2.item.tooltip.max"));
+ info.add(
+ StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-512 EU/t "
+ + StatCollector.translateToLocal("ic2.item.tooltip.max"));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java
index 4a3e1280c1..7ceb5b625f 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java
@@ -1,17 +1,19 @@
package gtPlusPlus.xmod.ic2.item;
-import ic2.api.item.IKineticRotor;
-import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
-import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
-import ic2.core.init.InternalName;
-import ic2.core.item.resources.ItemWindRotor;
import java.util.List;
+
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
+import ic2.api.item.IKineticRotor;
+import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
+import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
+import ic2.core.init.InternalName;
+import ic2.core.item.resources.ItemWindRotor;
+
public class RotorBase extends ItemWindRotor {
private final int maxWindStrength;
@@ -21,14 +23,8 @@ public class RotorBase extends ItemWindRotor {
private final ResourceLocation renderTexture;
private final boolean water;
- public RotorBase(
- final InternalName internalName,
- final int Radius,
- final int durability,
- final float efficiency,
- final int minWindStrength,
- final int maxWindStrength,
- final ResourceLocation RenderTexture) {
+ public RotorBase(final InternalName internalName, final int Radius, final int durability, final float efficiency,
+ final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture) {
super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture);
this.setMaxStackSize(1);
@@ -44,17 +40,18 @@ public class RotorBase extends ItemWindRotor {
@Override
public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) {
- info.add(StatCollector.translateToLocalFormatted(
- "ic2.itemrotor.wind.info",
- new Object[] {Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength)}));
+ info.add(
+ StatCollector.translateToLocalFormatted(
+ "ic2.itemrotor.wind.info",
+ new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) }));
IKineticRotor.GearboxType type = null;
if ((Minecraft.getMinecraft().currentScreen != null)
&& ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) {
type = IKineticRotor.GearboxType.WATER;
} else if ((Minecraft.getMinecraft().currentScreen != null)
&& ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) {
- type = IKineticRotor.GearboxType.WIND;
- }
+ type = IKineticRotor.GearboxType.WIND;
+ }
if (type != null) {
// info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type)));
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
index 46495fb965..410b106831 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
@@ -1,11 +1,7 @@
package gtPlusPlus.xmod.ic2.item;
-import ic2.api.item.IKineticRotor;
-import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
-import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
-import ic2.core.init.InternalName;
-import ic2.core.util.StackUtil;
import java.util.List;
+
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -14,6 +10,12 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
+import ic2.api.item.IKineticRotor;
+import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
+import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
+import ic2.core.init.InternalName;
+import ic2.core.util.StackUtil;
+
public class RotorIridium extends RotorBase {
private final int maxWindStrength;
@@ -23,14 +25,8 @@ public class RotorIridium extends RotorBase {
private final ResourceLocation renderTexture;
private final boolean water;
- public RotorIridium(
- final InternalName internalName,
- final int Radius,
- final int durability,
- final float efficiency,
- final int minWindStrength,
- final int maxWindStrength,
- final ResourceLocation RenderTexture) {
+ public RotorIridium(final InternalName internalName, final int Radius, final int durability, final float efficiency,
+ final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture) {
super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture);
this.setMaxStackSize(1);
@@ -46,17 +42,18 @@ public class RotorIridium extends RotorBase {
@Override
public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) {
- info.add(StatCollector.translateToLocalFormatted(
- "ic2.itemrotor.wind.info",
- new Object[] {Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength)}));
+ info.add(
+ StatCollector.translateToLocalFormatted(
+ "ic2.itemrotor.wind.info",
+ new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) }));
IKineticRotor.GearboxType type = null;
if ((Minecraft.getMinecraft().currentScreen != null)
&& ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) {
type = IKineticRotor.GearboxType.WATER;
} else if ((Minecraft.getMinecraft().currentScreen != null)
&& ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) {
- type = IKineticRotor.GearboxType.WIND;
- }
+ type = IKineticRotor.GearboxType.WIND;
+ }
if (type != null) {
// info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type)));
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java b/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java
index f8d9a6eaa5..69c08a0095 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java
@@ -1,8 +1,9 @@
package gtPlusPlus.xmod.ic2.item.reactor;
+import net.minecraft.item.ItemStack;
+
import ic2.api.reactor.IReactor;
import ic2.api.reactor.IReactorComponent;
-import net.minecraft.item.ItemStack;
public class IC2_FuelRod_Base implements IReactorComponent {
@@ -13,8 +14,8 @@ public class IC2_FuelRod_Base implements IReactorComponent {
}
@Override
- public boolean acceptUraniumPulse(
- IReactor var1, ItemStack var2, ItemStack var3, int var4, int var5, int var6, int var7, boolean var8) {
+ public boolean acceptUraniumPulse(IReactor var1, ItemStack var2, ItemStack var3, int var4, int var5, int var6,
+ int var7, boolean var8) {
// TODO Auto-generated method stub
return false;
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
index c7555d4fc1..0d76bd5db9 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
@@ -2,6 +2,9 @@ package gtPlusPlus.xmod.ic2.recipe;
import static gtPlusPlus.core.recipe.RECIPES_Tools.*;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
@@ -18,8 +21,6 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.ic2.item.IC2_Items;
import ic2.core.Ic2Items;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
public class RECIPE_IC2 {
@@ -194,52 +195,25 @@ public class RECIPE_IC2 {
// Shaft Extruder Recipe
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.BUFFERED
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE,
- new Object[] {
- "hXS",
- "XPX",
- "fXd",
- Character.valueOf('P'),
- ItemList.Shape_Extruder_Rod,
- Character.valueOf('X'),
- OrePrefixes.plate.get(Materials.DarkSteel),
- Character.valueOf('S'),
- OrePrefixes.screw.get(Materials.DarkSteel)
- });
+ new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod,
+ Character.valueOf('X'), OrePrefixes.plate.get(Materials.DarkSteel), Character.valueOf('S'),
+ OrePrefixes.screw.get(Materials.DarkSteel) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.BUFFERED
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE,
- new Object[] {
- "hXS",
- "XPX",
- "fXd",
- Character.valueOf('P'),
- ItemList.Shape_Extruder_Rod,
- Character.valueOf('X'),
- OrePrefixes.plate.get(Materials.TungstenSteel),
- Character.valueOf('S'),
- OrePrefixes.screw.get(Materials.TungstenSteel)
- });
+ new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod,
+ Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('S'),
+ OrePrefixes.screw.get(Materials.TungstenSteel) });
GT_ModHandler.addCraftingRecipe(
GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.BUFFERED
- | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE
| GT_ModHandler.RecipeBits.REVERSIBLE,
- new Object[] {
- "hXS",
- "XPX",
- "fXd",
- Character.valueOf('P'),
- ItemList.Shape_Extruder_Rod,
- Character.valueOf('X'),
- OrePrefixes.plate.get(Materials.Molybdenum),
- Character.valueOf('S'),
- OrePrefixes.screw.get(Materials.Molybdenum)
- });
+ new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod,
+ Character.valueOf('X'), OrePrefixes.plate.get(Materials.Molybdenum), Character.valueOf('S'),
+ OrePrefixes.screw.get(Materials.Molybdenum) });
Logger.INFO("Added recipe item for GT5 Extruder: Shaft Shape");
// Custm Recipes for Iron and Steel
@@ -448,12 +422,8 @@ public class RECIPE_IC2 {
private static void addAdvancedHazmat() {
- ItemStack[] aBasicHazmatPieces = new ItemStack[] {
- Ic2Items.hazmatHelmet.copy(),
- Ic2Items.hazmatChestplate.copy(),
- Ic2Items.hazmatLeggings.copy(),
- Ic2Items.hazmatBoots.copy()
- };
+ ItemStack[] aBasicHazmatPieces = new ItemStack[] { Ic2Items.hazmatHelmet.copy(),
+ Ic2Items.hazmatChestplate.copy(), Ic2Items.hazmatLeggings.copy(), Ic2Items.hazmatBoots.copy() };
Material aRubber = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubber);
ItemStack aYellowWool = ItemUtils.getSimpleStack(Blocks.wool, 4, 1);
@@ -461,62 +431,42 @@ public class RECIPE_IC2 {
ItemStack aCoilIC2 = Ic2Items.coil;
ItemStack aPlateCobalt = CI.getTieredComponentOfMaterial(Materials.Cobalt, OrePrefixes.plate, 1);
ItemStack aGearSmallSteel = CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGtSmall, 1);
- ItemStack aGearSmallAluminium =
- CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGtSmall, 1);
+ ItemStack aGearSmallAluminium = CI
+ .getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGtSmall, 1);
ItemStack aGearPotin = ALLOY.TUMBAGA.getGear(1);
ItemStack aGearSiliconCarbide = ALLOY.SILICON_CARBIDE.getGear(1);
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(2),
- aBasicHazmatPieces[0],
- ItemUtils.getSimpleStack(aYellowWool, 16),
- ItemUtils.getSimpleStack(aPlateCobalt, 4),
- ItemUtils.getSimpleStack(aCoilIC2, 8),
- ItemUtils.getSimpleStack(aGearSmallAluminium, 4),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[0],
+ ItemUtils.getSimpleStack(aYellowWool, 16), ItemUtils.getSimpleStack(aPlateCobalt, 4),
+ ItemUtils.getSimpleStack(aCoilIC2, 8), ItemUtils.getSimpleStack(aGearSmallAluminium, 4), },
aRubber.getFluidStack(144 * 4),
GregtechItemList.Armour_Hazmat_Advanced_Helmet.get(1),
30 * 20,
MaterialUtils.getVoltageForTier(2));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(2),
- aBasicHazmatPieces[1],
- ItemUtils.getSimpleStack(aYellowWool, 64),
- ItemUtils.getSimpleStack(aCoilIC2, 32),
- ItemUtils.getSimpleStack(aPlateCobalt, 16),
- ItemUtils.getSimpleStack(aGearSiliconCarbide, 8),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[1],
+ ItemUtils.getSimpleStack(aYellowWool, 64), ItemUtils.getSimpleStack(aCoilIC2, 32),
+ ItemUtils.getSimpleStack(aPlateCobalt, 16), ItemUtils.getSimpleStack(aGearSiliconCarbide, 8), },
aRubber.getFluidStack(144 * 10),
GregtechItemList.Armour_Hazmat_Advanced_Chest.get(1),
90 * 20,
MaterialUtils.getVoltageForTier(2));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(2),
- aBasicHazmatPieces[2],
- ItemUtils.getSimpleStack(aYellowWool, 32),
- ItemUtils.getSimpleStack(aCoilIC2, 16),
- ItemUtils.getSimpleStack(aPlateCobalt, 8),
- ItemUtils.getSimpleStack(aGearSiliconCarbide, 4),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[2],
+ ItemUtils.getSimpleStack(aYellowWool, 32), ItemUtils.getSimpleStack(aCoilIC2, 16),
+ ItemUtils.getSimpleStack(aPlateCobalt, 8), ItemUtils.getSimpleStack(aGearSiliconCarbide, 4), },
aRubber.getFluidStack(144 * 8),
GregtechItemList.Armour_Hazmat_Advanced_Legs.get(1),
75 * 20,
MaterialUtils.getVoltageForTier(2));
CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- CI.getNumberedAdvancedCircuit(2),
- aBasicHazmatPieces[3],
- ItemUtils.getSimpleStack(aBlackWool, 16),
- ItemUtils.getSimpleStack(aCoilIC2, 6),
- ItemUtils.getSimpleStack(aGearSmallSteel, 8),
- ItemUtils.getSimpleStack(aGearPotin, 4),
- },
+ new ItemStack[] { CI.getNumberedAdvancedCircuit(2), aBasicHazmatPieces[3],
+ ItemUtils.getSimpleStack(aBlackWool, 16), ItemUtils.getSimpleStack(aCoilIC2, 6),
+ ItemUtils.getSimpleStack(aGearSmallSteel, 8), ItemUtils.getSimpleStack(aGearPotin, 4), },
aRubber.getFluidStack(144 * 6),
GregtechItemList.Armour_Hazmat_Advanced_Boots.get(1),
45 * 20,
diff --git a/src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java b/src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java
index a2b2c83de0..f1b84c563d 100644
--- a/src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java
+++ b/src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java
@@ -1,15 +1,17 @@
package gtPlusPlus.xmod.mekanism;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.NBTUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
public class HANDLER_Mekanism {
@@ -41,25 +43,19 @@ public class HANDLER_Mekanism {
tSteelCasing);
// Energy Storage
- final ItemStack tAdvancedEnergyCube =
- ItemUtils.simpleMetaStack("Mekanism:EnergyCube", 0, 1).copy();
+ final ItemStack tAdvancedEnergyCube = ItemUtils.simpleMetaStack("Mekanism:EnergyCube", 0, 1).copy();
NBTUtils.setString(tAdvancedEnergyCube, "tier", "Advanced");
- final ItemStack tBasicEnergyCube =
- ItemUtils.simpleMetaStack("Mekanism:EnergyCube", 0, 1).copy();
+ final ItemStack tBasicEnergyCube = ItemUtils.simpleMetaStack("Mekanism:EnergyCube", 0, 1).copy();
NBTUtils.setString(tBasicEnergyCube, "tier", "Basic");
// Gas tanks
- final ItemStack tBasicGasTank =
- ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
+ final ItemStack tBasicGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
NBTUtils.setInteger(tBasicGasTank, "tier", 0);
- final ItemStack tAdvancedGasTank =
- ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
+ final ItemStack tAdvancedGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
NBTUtils.setInteger(tAdvancedGasTank, "tier", 1);
- final ItemStack tEliteGasTank =
- ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
+ final ItemStack tEliteGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
NBTUtils.setInteger(tEliteGasTank, "tier", 2);
- final ItemStack tMasterGasTank =
- ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
+ final ItemStack tMasterGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
NBTUtils.setInteger(tMasterGasTank, "tier", 3);
// Machines that use Osmium
@@ -347,25 +343,14 @@ public class HANDLER_Mekanism {
}
}
- private static boolean addNewRecipe(
- final Object InputItem1,
- final Object InputItem2,
- final Object InputItem3,
- final Object InputItem4,
- final Object InputItem5,
- final Object InputItem6,
- final Object InputItem7,
- final Object InputItem8,
- final Object InputItem9,
- final ItemStack OutputItem) {
+ private static boolean addNewRecipe(final Object InputItem1, final Object InputItem2, final Object InputItem3,
+ final Object InputItem4, final Object InputItem5, final Object InputItem6, final Object InputItem7,
+ final Object InputItem8, final Object InputItem9, final ItemStack OutputItem) {
- /*if (removeRecipe(OutputItem)){
- return RecipeUtils.recipeBuilder(
- InputItem1, InputItem2, InputItem3,
- InputItem4, InputItem5, InputItem6,
- InputItem7, InputItem8, InputItem9,
- OutputItem);
- }*/
+ /*
+ * if (removeRecipe(OutputItem)){ return RecipeUtils.recipeBuilder( InputItem1, InputItem2, InputItem3,
+ * InputItem4, InputItem5, InputItem6, InputItem7, InputItem8, InputItem9, OutputItem); }
+ */
removeRecipe(OutputItem);
return RecipeUtils.recipeBuilder(
@@ -395,12 +380,8 @@ public class HANDLER_Mekanism {
}
}
}
- } catch (ClassNotFoundException
- | NoSuchMethodException
- | SecurityException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException e) {
+ } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException e) {
Logger.INFO("[Mek] Failed to use the built-in recipe remover from Mekanism.");
}
if (!removed) {
diff --git a/src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java b/src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java
index bb079c42c1..45ccca163b 100644
--- a/src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java
@@ -1,23 +1,26 @@
package gtPlusPlus.xmod.ob;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
+
import org.apache.commons.lang3.StringUtils;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class GliderHandler {
private static final AutoMap<Integer> mDimensionalBlacklist = new AutoMap<Integer>();
@@ -40,13 +43,17 @@ public class GliderHandler {
if (!canPlayerGlideInThisDimension(event.entityPlayer)) {
event.setCanceled(true);
PlayerUtils.messagePlayer(event.entityPlayer, "Glider is blacklisted in this dimension.");
- Logger.WARNING("[OpenBlocks] " + event.entityPlayer.getCommandSenderName()
- + " tried to use glider in dimension "
- + event.entityPlayer.getEntityWorld().provider.dimensionId + ".");
+ Logger.WARNING(
+ "[OpenBlocks] " + event.entityPlayer.getCommandSenderName()
+ + " tried to use glider in dimension "
+ + event.entityPlayer.getEntityWorld().provider.dimensionId
+ + ".");
} else {
- Logger.WARNING("[OpenBlocks] " + event.entityPlayer.getCommandSenderName()
- + " used glider in dimension "
- + event.entityPlayer.getEntityWorld().provider.dimensionId + ".");
+ Logger.WARNING(
+ "[OpenBlocks] " + event.entityPlayer.getCommandSenderName()
+ + " used glider in dimension "
+ + event.entityPlayer.getEntityWorld().provider.dimensionId
+ + ".");
}
} else {
Logger.WARNING("[OpenBlocks] Item was not a glider.");
diff --git a/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java
index 7478d51dec..fadd712164 100644
--- a/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java
@@ -1,15 +1,19 @@
package gtPlusPlus.xmod.ob;
+import java.util.HashMap;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
import com.google.common.base.Objects;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import java.util.HashMap;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
/**
- * Wrapper Class to assist in handling the OB Sprinkler.
+ * Wrapper Class to assist in handling the OB Sprinkler.
+ *
* @author Alkalus
*
*/
diff --git a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
index e5611444ea..e41b744d18 100644
--- a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
+++ b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
@@ -2,6 +2,10 @@ package gtPlusPlus.xmod.railcraft;
import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -15,9 +19,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
public class HANDLER_Railcraft {
@@ -26,38 +27,57 @@ public class HANDLER_Railcraft {
// Register Custom Coal Coke
ModItems.itemCoalCoke = new BaseItemBurnable(
- "itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "fuelCoke", 3200, 0)
- .setTextureName(CORE.MODID + ":burnables/itemCoalCoke");
+ "itemCoalCoke",
+ "Coking Coal",
+ tabMisc,
+ 64,
+ 0,
+ "Used for metallurgy.",
+ "fuelCoke",
+ 3200,
+ 0).setTextureName(CORE.MODID + ":burnables/itemCoalCoke");
// Add in things that once existed in 1.5.2
ModItems.itemCactusCharcoal = new BaseItemBurnable(
- "itemCactusCharcoal",
- "Cactus Charcoal",
- tabMisc,
- 64,
- 0,
- "Used for smelting.",
- "fuelCactusCharcoal",
- 400,
- 0)
- .setTextureName(CORE.MODID + ":burnables/itemCactusCharcoal");
+ "itemCactusCharcoal",
+ "Cactus Charcoal",
+ tabMisc,
+ 64,
+ 0,
+ "Used for smelting.",
+ "fuelCactusCharcoal",
+ 400,
+ 0).setTextureName(CORE.MODID + ":burnables/itemCactusCharcoal");
ModItems.itemSugarCharcoal = new BaseItemBurnable(
- "itemSugarCharcoal",
- "Sugar Charcoal",
- tabMisc,
- 64,
- 0,
- "Used for smelting.",
- "fuelSugarCharcoal",
- 400,
- 0)
- .setTextureName(CORE.MODID + ":burnables/itemSugarCharcoal");
+ "itemSugarCharcoal",
+ "Sugar Charcoal",
+ tabMisc,
+ 64,
+ 0,
+ "Used for smelting.",
+ "fuelSugarCharcoal",
+ 400,
+ 0).setTextureName(CORE.MODID + ":burnables/itemSugarCharcoal");
ModItems.itemCactusCoke = new BaseItemBurnable(
- "itemCactusCoke", "Cactus Coke", tabMisc, 64, 0, "Used for smelting.", "fuelCactusCoke", 800, 0)
- .setTextureName(CORE.MODID + ":burnables/itemCactusCoke");
+ "itemCactusCoke",
+ "Cactus Coke",
+ tabMisc,
+ 64,
+ 0,
+ "Used for smelting.",
+ "fuelCactusCoke",
+ 800,
+ 0).setTextureName(CORE.MODID + ":burnables/itemCactusCoke");
ModItems.itemSugarCoke = new BaseItemBurnable(
- "itemSugarCoke", "Sugar Coke", tabMisc, 64, 0, "Used for smelting.", "fuelSugarCoke", 800, 0)
- .setTextureName(CORE.MODID + ":burnables/itemSugarCoke");
+ "itemSugarCoke",
+ "Sugar Coke",
+ tabMisc,
+ 64,
+ 0,
+ "Used for smelting.",
+ "fuelSugarCoke",
+ 800,
+ 0).setTextureName(CORE.MODID + ":burnables/itemSugarCoke");
ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal), "itemCharcoalCactus");
ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCoke), "itemCokeCactus");
@@ -76,14 +96,12 @@ public class HANDLER_Railcraft {
}
private static void generateCokeOvenRecipes() {
- ItemStack[] aInputs1 =
- new ItemStack[] {ItemUtils.getSimpleStack(Blocks.cactus), ItemUtils.getSimpleStack(Items.reeds)};
- ItemStack[] aInputs2 = new ItemStack[] {
- ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal), ItemUtils.getSimpleStack(ModItems.itemSugarCharcoal)
- };
- ItemStack[] aOutputs = new ItemStack[] {
- ItemUtils.getSimpleStack(ModItems.itemCactusCoke), ItemUtils.getSimpleStack(ModItems.itemSugarCoke)
- };
+ ItemStack[] aInputs1 = new ItemStack[] { ItemUtils.getSimpleStack(Blocks.cactus),
+ ItemUtils.getSimpleStack(Items.reeds) };
+ ItemStack[] aInputs2 = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal),
+ ItemUtils.getSimpleStack(ModItems.itemSugarCharcoal) };
+ ItemStack[] aOutputs = new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemCactusCoke),
+ ItemUtils.getSimpleStack(ModItems.itemSugarCoke) };
for (int i = 0; i < aOutputs.length; i++) {
// Recipes for the Charcoals and Cokes, outputting either Creosote or Charcoal Byproducts depending on the
// fluid input
@@ -170,11 +188,21 @@ public class HANDLER_Railcraft {
if (LoadedMods.Railcraft) {
for (int i = 0; i < aOutputs.length; i++) {
RailcraftUtils.addCokeOvenRecipe(
- aInputs1[i], true, true, aInputs2[i], FluidUtils.getFluidStack("creosote", 30), 500);
+ aInputs1[i],
+ true,
+ true,
+ aInputs2[i],
+ FluidUtils.getFluidStack("creosote", 30),
+ 500);
}
for (int i = 0; i < aOutputs.length; i++) {
RailcraftUtils.addCokeOvenRecipe(
- aInputs2[i], true, true, aOutputs[i], FluidUtils.getFluidStack("creosote", 30), 500);
+ aInputs2[i],
+ true,
+ true,
+ aOutputs[i],
+ FluidUtils.getFluidStack("creosote", 30),
+ 500);
}
if (LoadedMods.DreamCraft) {
diff --git a/src/main/java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java b/src/main/java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java
index 07a9fda03c..fd07206243 100644
--- a/src/main/java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java
+++ b/src/main/java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java
@@ -2,23 +2,19 @@ package gtPlusPlus.xmod.railcraft.utils;
import mods.railcraft.common.util.crafting.BlastFurnaceCraftingManager;
import mods.railcraft.common.util.crafting.CokeOvenCraftingManager;
+
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
public class RailcraftUtils {
- public static void addCokeOvenRecipe(
- ItemStack input,
- boolean matchDamage,
- boolean matchNBT,
- ItemStack output,
- FluidStack fluidOutput,
- int cookTime) {
+ public static void addCokeOvenRecipe(ItemStack input, boolean matchDamage, boolean matchNBT, ItemStack output,
+ FluidStack fluidOutput, int cookTime) {
CokeOvenCraftingManager.getInstance().addRecipe(input, matchDamage, matchNBT, output, fluidOutput, cookTime);
}
- public static void addAdvancedCokeOvenRecipe(
- ItemStack input, boolean matchDamage, boolean matchNBT, ItemStack output, int cookTime) {
+ public static void addAdvancedCokeOvenRecipe(ItemStack input, boolean matchDamage, boolean matchNBT,
+ ItemStack output, int cookTime) {
BlastFurnaceCraftingManager.getInstance().addRecipe(input, matchDamage, matchNBT, cookTime, output);
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java b/src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java
index 27505892d1..8dbf5d60b7 100644
--- a/src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java
+++ b/src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java
@@ -1,27 +1,28 @@
package gtPlusPlus.xmod.reliquary.item;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class ReliquaryItems {
private static Class<?> CLASS_MAIN = ReflectionUtils.getClass("xreliquary.Reliquary");
private static Field FIELD_CONTENT = ReflectionUtils.getField(CLASS_MAIN, "CONTENT");
private static Object OBJECT_CONTENT = ReflectionUtils.getFieldValue(FIELD_CONTENT);
- private static Method METHOD_GETITEM =
- ReflectionUtils.getMethod(OBJECT_CONTENT, "getItem", new Class[] {String.class});
+ private static Method METHOD_GETITEM = ReflectionUtils
+ .getMethod(OBJECT_CONTENT, "getItem", new Class[] { String.class });
public static Item getItem(String name) {
try {
return (Item) METHOD_GETITEM.invoke(OBJECT_CONTENT, name);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
return null;
}
diff --git a/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java b/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java
index 1418a8d086..2209afddc7 100644
--- a/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java
@@ -1,11 +1,14 @@
package gtPlusPlus.xmod.reliquary.util;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+
import net.minecraft.item.ItemStack;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class AlkahestRecipeWrapper {
+
public ItemStack item = null;
public int yield = 0;
public int cost = 0;
@@ -39,12 +42,8 @@ public class AlkahestRecipeWrapper {
return r;
}
- } catch (NoSuchMethodException
- | SecurityException
- | InstantiationException
- | IllegalAccessException
- | IllegalArgumentException
- | InvocationTargetException e) {
+ } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException e) {
// oops
}
return null;
diff --git a/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java
index c0f19fecbc..4a8d9cd3f3 100644
--- a/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java
@@ -2,6 +2,9 @@ package gtPlusPlus.xmod.reliquary.util;
import static gtPlusPlus.core.lib.CORE.GTNH;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
@@ -11,8 +14,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.reliquary.item.ReliquaryItems;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
public class ReliquaryRecipeHandler {
@@ -55,12 +56,9 @@ public class ReliquaryRecipeHandler {
Logger.INFO("Added new recipe for Glowing Water.");
}
if (CORE.RA.addSixSlotAssemblingRecipe(
- new ItemStack[] {
- ItemUtils.simpleMetaStack(Items.ender_eye, 0, 32),
- CI.getFieldGenerator(5, GTNH ? 8 : 4),
- CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 8),
- CI.getEmitter(3, 20)
- },
+ new ItemStack[] { ItemUtils.simpleMetaStack(Items.ender_eye, 0, 32),
+ CI.getFieldGenerator(5, GTNH ? 8 : 4),
+ CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 8), CI.getEmitter(3, 20) },
FluidUtils.getUUM(50),
ReliquaryItems.emptyVoidTear(),
20 * 2000,
diff --git a/src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java b/src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java
index 0f249b29e8..4453f55524 100644
--- a/src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java
+++ b/src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java
@@ -1,7 +1,7 @@
package gtPlusPlus.xmod.sc2;
-import gtPlusPlus.core.lib.LoadedMods;
import vswe.stevescarts.ModuleData.GppModuleData;
+import gtPlusPlus.core.lib.LoadedMods;
public class HANDLER_SC2 {
diff --git a/src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java b/src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java
index 762697b419..ba4f76ae34 100644
--- a/src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java
+++ b/src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java
@@ -2,18 +2,20 @@ package gtPlusPlus.xmod.sc2.modules;
import static net.minecraft.init.Blocks.farmland;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Field;
+
import net.minecraft.block.Block;
import net.minecraft.block.BlockCrops;
import net.minecraft.item.Item;
import net.minecraft.item.ItemSeeds;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.Modules.Addons.ModuleAddon;
import vswe.stevescarts.Modules.ICropModule;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
public class ModuleExoticSeeds extends ModuleAddon implements ICropModule {
@@ -27,8 +29,7 @@ public class ModuleExoticSeeds extends ModuleAddon implements ICropModule {
Item seedItem = seed.getItem();
if (!(seedItem instanceof ItemSeeds)) return null;
- Block cropBlock = (Block)
- ReflectionUtils.getField(ItemSeeds.class, "field_150925_a").get(seedItem);
+ Block cropBlock = (Block) ReflectionUtils.getField(ItemSeeds.class, "field_150925_a").get(seedItem);
return cropBlock;
} catch (Throwable t) {
@@ -54,22 +55,17 @@ public class ModuleExoticSeeds extends ModuleAddon implements ICropModule {
int m = world.getBlockMetadata(x, y, z);
// If Forestry is loaded, let's make this upgrade convert farmland to Humus.
- /*if (LoadedMods.Forestry) {
- Block mFarmLand = world.getBlock(x, y-1, z);
- if (mFarmLand == farmland) {
- Block h = tryGetHumus();
- if (h != farmland) {
- world.setBlock(x, y-1, z, h);
- }
- }
- }*/
+ /*
+ * if (LoadedMods.Forestry) { Block mFarmLand = world.getBlock(x, y-1, z); if (mFarmLand == farmland) { Block h
+ * = tryGetHumus(); if (h != farmland) { world.setBlock(x, y-1, z, h); } } }
+ */
return b instanceof BlockCrops && m == 7;
}
/**
- * Static Class & Block References for Forestry content.
- * Stops Forestry being a hard requirement for this feature without having to make @Optional annotations.
+ * Static Class & Block References for Forestry content. Stops Forestry being a hard requirement for this feature
+ * without having to make @Optional annotations.
*/
private static Class<?> mForestryHumusBlockClass;
@@ -86,8 +82,8 @@ public class ModuleExoticSeeds extends ModuleAddon implements ICropModule {
Field blocks = ReflectionUtils.getField(mForestryHumusBlockClass, "blocks");
if (blocks != null) {
Object blockRegistryCoreObject = blocks.get(null);
- mForestryBlockRegistryCoreClass =
- ReflectionUtils.getClass("forestry.core.blocks.BlockRegistryCore");
+ mForestryBlockRegistryCoreClass = ReflectionUtils
+ .getClass("forestry.core.blocks.BlockRegistryCore");
if (mForestryBlockRegistryCoreClass != null && blockRegistryCoreObject != null) {
Field soil = ReflectionUtils.getField(mForestryBlockRegistryCoreClass, "soil");
if (soil != null) {
diff --git a/src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java b/src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java
index 784cbc7683..5a945e6998 100644
--- a/src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java
+++ b/src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java
@@ -1,11 +1,13 @@
package gtPlusPlus.xmod.sol;
+import java.lang.reflect.Constructor;
+
+import net.minecraft.item.Item;
+
import cpw.mods.fml.common.registry.GameRegistry;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.Constructor;
-import net.minecraft.item.Item;
public class HANDLER_SpiceOfLife {
@@ -37,11 +39,12 @@ public class HANDLER_SpiceOfLife {
private static Item getNewLunchBox(String aItemName, int aSlots) {
Class aItemFoodContainer = ReflectionUtils.getClass("squeek.spiceoflife.items.ItemFoodContainer");
if (aItemFoodContainer != null) {
- Constructor aItemFoodContainerConstructor =
- ReflectionUtils.getConstructor(aItemFoodContainer, new Class[] {String.class, int.class});
+ Constructor aItemFoodContainerConstructor = ReflectionUtils
+ .getConstructor(aItemFoodContainer, new Class[] { String.class, int.class });
if (aItemFoodContainerConstructor != null) {
Object aNewObject = ReflectionUtils.createNewInstanceFromConstructor(
- aItemFoodContainerConstructor, new Object[] {aItemName, aSlots});
+ aItemFoodContainerConstructor,
+ new Object[] { aItemName, aSlots });
if (aNewObject instanceof Item) {
Item aNewInstance = (Item) aNewObject;
return aNewInstance;
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
index bbda74449b..082486dd62 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
@@ -1,21 +1,21 @@
package gtPlusPlus.xmod.thaumcraft;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat;
import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectStack;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
public class HANDLER_Thaumcraft {
public static GTPP_AspectCompat sThaumcraftCompat;
public static Item mResearchNotes;
- public static final AutoMap<Pair<ItemStack, GTPP_AspectStack[]>> sItemsToGetAspects =
- new AutoMap<Pair<ItemStack, GTPP_AspectStack[]>>();
+ public static final AutoMap<Pair<ItemStack, GTPP_AspectStack[]>> sItemsToGetAspects = new AutoMap<Pair<ItemStack, GTPP_AspectStack[]>>();
public static void preInit() {
if (LoadedMods.Thaumcraft) {}
@@ -24,8 +24,8 @@ public class HANDLER_Thaumcraft {
public static void init() {
if (LoadedMods.Thaumcraft) {
try {
- mResearchNotes = (Item) ReflectionUtils.getField(
- ReflectionUtils.getClass("thaumcraft.common.config.ConfigItems"), "itemResearchNotes")
+ mResearchNotes = (Item) ReflectionUtils
+ .getField(ReflectionUtils.getClass("thaumcraft.common.config.ConfigItems"), "itemResearchNotes")
.get(null);
} catch (IllegalArgumentException | IllegalAccessException e) {
mResearchNotes = Items.paper;
@@ -42,19 +42,14 @@ public class HANDLER_Thaumcraft {
// new Object[0]);
// sThaumcraftCompat = new GTPP_AspectCompat();
- /*if (!sItemsToGetAspects.isEmpty() && false) {
- for (Pair<ItemStack, GTPP_AspectStack[]> j : sItemsToGetAspects) {
- if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) {
- List<GTPP_AspectStack> list = Arrays.asList(j.getValue());
- if (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) {
- Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+".");
- }
- else {
- Logger.WARNING("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+".");
- }
- }
- }
- }*/
+ /*
+ * if (!sItemsToGetAspects.isEmpty() && false) { for (Pair<ItemStack, GTPP_AspectStack[]> j :
+ * sItemsToGetAspects) { if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) {
+ * List<GTPP_AspectStack> list = Arrays.asList(j.getValue()); if
+ * (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) {
+ * Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+"."); } else {
+ * Logger.WARNING("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+"."); } } } }
+ */
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
index c3d256a132..4f0c9873a1 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
@@ -1,5 +1,13 @@
package gtPlusPlus.xmod.thaumcraft.aspect;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import net.minecraft.util.ResourceLocation;
+
import gregtech.api.enums.TC_Aspects;
import gregtech.common.GT_ThaumcraftCompat;
import gtPlusPlus.api.objects.Logger;
@@ -7,12 +15,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import net.minecraft.util.ResourceLocation;
public class GTPP_AspectCompat {
@@ -26,55 +28,29 @@ public class GTPP_AspectCompat {
public static TC_Aspect_Wrapper ASPECT_TOXIC;
public static TC_Aspect_Wrapper ASPECT_HEAVEN;
- /* TC_Aspects.AER.mAspect = Aspect.AIR;
- TC_Aspects.ALIENIS.mAspect = Aspect.ELDRITCH;
- TC_Aspects.AQUA.mAspect = Aspect.WATER;
- TC_Aspects.ARBOR.mAspect = Aspect.TREE;
- TC_Aspects.AURAM.mAspect = Aspect.AURA;
- TC_Aspects.BESTIA.mAspect = Aspect.BEAST;
- TC_Aspects.COGNITIO.mAspect = Aspect.MIND;
- TC_Aspects.CORPUS.mAspect = Aspect.FLESH;
- TC_Aspects.EXANIMIS.mAspect = Aspect.UNDEAD;
- TC_Aspects.FABRICO.mAspect = Aspect.CRAFT;
- TC_Aspects.FAMES.mAspect = Aspect.HUNGER;
- TC_Aspects.GELUM.mAspect = Aspect.COLD;
- TC_Aspects.GRANUM.mAspect = Aspect.PLANT;
- TC_Aspects.HERBA.mAspect = Aspect.PLANT;
- TC_Aspects.HUMANUS.mAspect = Aspect.MAN;
- TC_Aspects.IGNIS.mAspect = Aspect.FIRE;
- TC_Aspects.INSTRUMENTUM.mAspect = Aspect.TOOL;
- TC_Aspects.ITER.mAspect = Aspect.TRAVEL;
- TC_Aspects.LIMUS.mAspect = Aspect.SLIME;
- TC_Aspects.LUCRUM.mAspect = Aspect.GREED;
- TC_Aspects.LUX.mAspect = Aspect.LIGHT;
- TC_Aspects.MACHINA.mAspect = Aspect.MECHANISM;
- TC_Aspects.MESSIS.mAspect = Aspect.CROP;
- TC_Aspects.METALLUM.mAspect = Aspect.METAL;
- TC_Aspects.METO.mAspect = Aspect.HARVEST;
- TC_Aspects.MORTUUS.mAspect = Aspect.DEATH;
- TC_Aspects.MOTUS.mAspect = Aspect.MOTION;
- TC_Aspects.ORDO.mAspect = Aspect.ORDER;
- TC_Aspects.PANNUS.mAspect = Aspect.CLOTH;
- TC_Aspects.PERDITIO.mAspect = Aspect.ENTROPY;
- TC_Aspects.PERFODIO.mAspect = Aspect.MINE;
- TC_Aspects.PERMUTATIO.mAspect = Aspect.EXCHANGE;
- TC_Aspects.POTENTIA.mAspect = Aspect.ENERGY;
- TC_Aspects.PRAECANTATIO.mAspect = Aspect.MAGIC;
- TC_Aspects.SANO.mAspect = Aspect.HEAL;
- TC_Aspects.SENSUS.mAspect = Aspect.SENSES;
- TC_Aspects.SPIRITUS.mAspect = Aspect.SOUL;
- TC_Aspects.TELUM.mAspect = Aspect.WEAPON;
- TC_Aspects.TERRA.mAspect = Aspect.EARTH;
- TC_Aspects.TEMPESTAS.mAspect = Aspect.WEATHER;
- TC_Aspects.TENEBRAE.mAspect = Aspect.DARKNESS;
- TC_Aspects.TUTAMEN.mAspect = Aspect.ARMOR;
- TC_Aspects.VACUOS.mAspect = Aspect.VOID;
- TC_Aspects.VENENUM.mAspect = Aspect.POISON;
- TC_Aspects.VICTUS.mAspect = Aspect.LIFE;
- TC_Aspects.VINCULUM.mAspect = Aspect.TRAP;
- TC_Aspects.VITIUM.mAspect = Aspect.TAINT;
- TC_Aspects.VITREUS.mAspect = Aspect.CRYSTAL;
- TC_Aspects.VOLATUS.mAspect = Aspect.FLIGHT;*/
+ /*
+ * TC_Aspects.AER.mAspect = Aspect.AIR; TC_Aspects.ALIENIS.mAspect = Aspect.ELDRITCH; TC_Aspects.AQUA.mAspect =
+ * Aspect.WATER; TC_Aspects.ARBOR.mAspect = Aspect.TREE; TC_Aspects.AURAM.mAspect = Aspect.AURA;
+ * TC_Aspects.BESTIA.mAspect = Aspect.BEAST; TC_Aspects.COGNITIO.mAspect = Aspect.MIND; TC_Aspects.CORPUS.mAspect =
+ * Aspect.FLESH; TC_Aspects.EXANIMIS.mAspect = Aspect.UNDEAD; TC_Aspects.FABRICO.mAspect = Aspect.CRAFT;
+ * TC_Aspects.FAMES.mAspect = Aspect.HUNGER; TC_Aspects.GELUM.mAspect = Aspect.COLD; TC_Aspects.GRANUM.mAspect =
+ * Aspect.PLANT; TC_Aspects.HERBA.mAspect = Aspect.PLANT; TC_Aspects.HUMANUS.mAspect = Aspect.MAN;
+ * TC_Aspects.IGNIS.mAspect = Aspect.FIRE; TC_Aspects.INSTRUMENTUM.mAspect = Aspect.TOOL; TC_Aspects.ITER.mAspect =
+ * Aspect.TRAVEL; TC_Aspects.LIMUS.mAspect = Aspect.SLIME; TC_Aspects.LUCRUM.mAspect = Aspect.GREED;
+ * TC_Aspects.LUX.mAspect = Aspect.LIGHT; TC_Aspects.MACHINA.mAspect = Aspect.MECHANISM; TC_Aspects.MESSIS.mAspect =
+ * Aspect.CROP; TC_Aspects.METALLUM.mAspect = Aspect.METAL; TC_Aspects.METO.mAspect = Aspect.HARVEST;
+ * TC_Aspects.MORTUUS.mAspect = Aspect.DEATH; TC_Aspects.MOTUS.mAspect = Aspect.MOTION; TC_Aspects.ORDO.mAspect =
+ * Aspect.ORDER; TC_Aspects.PANNUS.mAspect = Aspect.CLOTH; TC_Aspects.PERDITIO.mAspect = Aspect.ENTROPY;
+ * TC_Aspects.PERFODIO.mAspect = Aspect.MINE; TC_Aspects.PERMUTATIO.mAspect = Aspect.EXCHANGE;
+ * TC_Aspects.POTENTIA.mAspect = Aspect.ENERGY; TC_Aspects.PRAECANTATIO.mAspect = Aspect.MAGIC;
+ * TC_Aspects.SANO.mAspect = Aspect.HEAL; TC_Aspects.SENSUS.mAspect = Aspect.SENSES; TC_Aspects.SPIRITUS.mAspect =
+ * Aspect.SOUL; TC_Aspects.TELUM.mAspect = Aspect.WEAPON; TC_Aspects.TERRA.mAspect = Aspect.EARTH;
+ * TC_Aspects.TEMPESTAS.mAspect = Aspect.WEATHER; TC_Aspects.TENEBRAE.mAspect = Aspect.DARKNESS;
+ * TC_Aspects.TUTAMEN.mAspect = Aspect.ARMOR; TC_Aspects.VACUOS.mAspect = Aspect.VOID; TC_Aspects.VENENUM.mAspect =
+ * Aspect.POISON; TC_Aspects.VICTUS.mAspect = Aspect.LIFE; TC_Aspects.VINCULUM.mAspect = Aspect.TRAP;
+ * TC_Aspects.VITIUM.mAspect = Aspect.TAINT; TC_Aspects.VITREUS.mAspect = Aspect.CRYSTAL; TC_Aspects.VOLATUS.mAspect
+ * = Aspect.FLIGHT;
+ */
public GTPP_AspectCompat() {
@@ -95,7 +71,7 @@ public class GTPP_AspectCompat {
ASPECT_BALANCE = new TC_Aspect_Wrapper(
"Sagrausten",
Utils.rgbtoHexValue(125, 125, 125),
- new TC_Aspect_Wrapper[] {ASPECT_STARBOUND, get(TC_Aspects.RADIO)},
+ new TC_Aspect_Wrapper[] { ASPECT_STARBOUND, get(TC_Aspects.RADIO) },
new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Sagrausten.png"),
false,
1,
@@ -104,7 +80,7 @@ public class GTPP_AspectCompat {
ASPECT_LUST = new TC_Aspect_Wrapper(
"Slusium",
Utils.rgbtoHexValue(175, 125, 25),
- new TC_Aspect_Wrapper[] {ASPECT_BALANCE, get(TC_Aspects.NEBRISUM)},
+ new TC_Aspect_Wrapper[] { ASPECT_BALANCE, get(TC_Aspects.NEBRISUM) },
new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Slusium.png"),
false,
1,
@@ -113,7 +89,7 @@ public class GTPP_AspectCompat {
ASPECT_STARBOUND = new TC_Aspect_Wrapper(
"Xenil",
Utils.rgbtoHexValue(25, 25, 25),
- new TC_Aspect_Wrapper[] {get(TC_Aspects.MAGNETO), get(TC_Aspects.RADIO)},
+ new TC_Aspect_Wrapper[] { get(TC_Aspects.MAGNETO), get(TC_Aspects.RADIO) },
new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Xenil.png"),
false,
1,
@@ -122,7 +98,7 @@ public class GTPP_AspectCompat {
ASPECT_TOXIC = new TC_Aspect_Wrapper(
"Xablum",
Utils.rgbtoHexValue(25, 185, 25),
- new TC_Aspect_Wrapper[] {ASPECT_STARBOUND, ASPECT_LUST},
+ new TC_Aspect_Wrapper[] { ASPECT_STARBOUND, ASPECT_LUST },
new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Xablum.png"),
false,
1,
@@ -131,7 +107,7 @@ public class GTPP_AspectCompat {
ASPECT_HEAVEN = new TC_Aspect_Wrapper(
"Zetralt",
Utils.rgbtoHexValue(225, 225, 225),
- new TC_Aspect_Wrapper[] {get(TC_Aspects.AURAM), ASPECT_TOXIC},
+ new TC_Aspect_Wrapper[] { get(TC_Aspects.AURAM), ASPECT_TOXIC },
new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Zetralt.png"),
false,
1,
@@ -158,10 +134,7 @@ public class GTPP_AspectCompat {
if (m != null) {
o = (TC_AspectList_Wrapper) m.invoke(null, aAspects);
}
- } catch (NoSuchMethodException
- | SecurityException
- | IllegalAccessException
- | IllegalArgumentException
+ } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
e.printStackTrace();
}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java
index 6f1d53bc33..f44ba823db 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java
@@ -2,17 +2,20 @@ package gtPlusPlus.xmod.thaumcraft.commands;
import static gtPlusPlus.core.util.minecraft.PlayerUtils.messagePlayer;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.commands.CommandUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.thaumcraft.objects.ThreadAspectScanner;
import java.util.ArrayList;
import java.util.List;
+
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.commands.CommandUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.xmod.thaumcraft.objects.ThreadAspectScanner;
+
public class CommandDumpAspects implements ICommand {
+
private final List<String> aliases;
public static long mLastScanTime = System.currentTimeMillis();
@@ -56,7 +59,8 @@ public class CommandDumpAspects implements ICommand {
Thread t = createNewThread();
messagePlayer(P, "Beginning to dump information about all items/blocks & their aspects to file.");
messagePlayer(
- P, "Please do not close your game during this process, you will be notified upon completion.");
+ P,
+ "Please do not close your game during this process, you will be notified upon completion.");
t.start();
} else {
messagePlayer(
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
index 896c68aa3a..8fb8e2fc7d 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
@@ -1,12 +1,5 @@
package gtPlusPlus.xmod.thaumcraft.objects;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.data.FileUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -14,10 +7,19 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.data.FileUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects;
+
public class ThreadAspectScanner extends Thread {
public static boolean mDoWeScan = false;
@@ -55,7 +57,7 @@ public class ThreadAspectScanner extends Thread {
mAllGameContent.put(nameKey, m);
}
- @SuppressWarnings({"rawtypes"})
+ @SuppressWarnings({ "rawtypes" })
@Override
public void run() {
if (mDoWeScan) {
@@ -116,8 +118,8 @@ public class ThreadAspectScanner extends Thread {
continue;
}
for (ItemStack stack : group) {
- thaumcraft.api.aspects.AspectList a =
- thaumcraft.common.lib.crafting.ThaumcraftCraftingManager.getObjectTags(stack);
+ thaumcraft.api.aspects.AspectList a = thaumcraft.common.lib.crafting.ThaumcraftCraftingManager
+ .getObjectTags(stack);
if (a == null) {
continue;
} else {
@@ -129,8 +131,11 @@ public class ThreadAspectScanner extends Thread {
}
try {
List<String> mList = new ArrayList<String>();
- mList.add(stack.getDisplayName() + " | Meta: " + stack.getItemDamage() + " | Unlocal: "
- + stack.getUnlocalizedName());
+ mList.add(
+ stack.getDisplayName() + " | Meta: "
+ + stack.getItemDamage()
+ + " | Unlocal: "
+ + stack.getUnlocalizedName());
for (Pair<String, Integer> r : aspectPairs) {
if (r != null) {
mList.add(r.getKey() + " x" + r.getValue());
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
index 6847fcfe69..c847953cd8 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
@@ -1,22 +1,24 @@
package gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect;
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.util.GT_LanguageManager;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.LinkedHashMap;
import java.util.Map;
+
import net.minecraft.util.ResourceLocation;
+import gregtech.api.enums.TC_Aspects;
+import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
+
/**
- * Wrapper class for Thaumcraft Aspects.
- * Used to avoid compile time dependencies.
+ * Wrapper class for Thaumcraft Aspects. Used to avoid compile time dependencies.
+ *
* @author Alkalus
*
*/
@@ -48,6 +50,7 @@ public class TC_Aspect_Wrapper {
/**
* Gets the total aspect list from Thaumcraft, which should contain all other registered aspects.
+ *
* @return - A LinkedHashMap(String, Aspect);
*/
public static LinkedHashMap<String, Object> getVanillaAspectList() {
@@ -68,7 +71,8 @@ public class TC_Aspect_Wrapper {
/**
* Vanilla Aspect Constructor
- * @param tag - Aspect Name
+ *
+ * @param tag - Aspect Name
* @param color
* @param chatcolor
* @param blend
@@ -81,7 +85,8 @@ public class TC_Aspect_Wrapper {
/**
*
* Vanilla Aspect Constructor
- * @param tag - Aspect Name
+ *
+ * @param tag - Aspect Name
* @param color
* @param components
*/
@@ -92,7 +97,8 @@ public class TC_Aspect_Wrapper {
/**
*
* Vanilla Aspect Constructor
- * @param tag - Aspect Name
+ *
+ * @param tag - Aspect Name
* @param color
* @param components
* @param blend
@@ -104,20 +110,20 @@ public class TC_Aspect_Wrapper {
/**
*
* Vanilla Aspect Constructor
- * @param tag - Aspect Name
+ *
+ * @param tag - Aspect Name
* @param color
* @param components
* @param image
* @param blend
*/
- public TC_Aspect_Wrapper(
- String tag, int color, TC_Aspect_Wrapper[] components, boolean vanilla, int blend, String aTooltip) {
+ public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, boolean vanilla, int blend,
+ String aTooltip) {
this(
tag,
color,
components,
- vanilla
- ? new ResourceLocation("thaumcraft", "textures/aspects/" + tag.toLowerCase() + ".png")
+ vanilla ? new ResourceLocation("thaumcraft", "textures/aspects/" + tag.toLowerCase() + ".png")
: new ResourceLocation(CORE.MODID, "textures/aspects/" + tag.toLowerCase() + ".png"),
vanilla,
blend,
@@ -126,14 +132,8 @@ public class TC_Aspect_Wrapper {
private static int aInternalAspectIDAllocation = 1;
- public TC_Aspect_Wrapper(
- String tag,
- int color,
- TC_Aspect_Wrapper[] components,
- ResourceLocation image,
- boolean vanilla,
- int blend,
- String aTooltip) {
+ public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, ResourceLocation image,
+ boolean vanilla, int blend, String aTooltip) {
if (components == null) {
components = new TC_Aspect_Wrapper[] {};
}
@@ -183,6 +183,7 @@ public class TC_Aspect_Wrapper {
/**
* Generates a TC_Aspect from an object, presummed to be a TC Aspect.
+ *
* @param aBaseAspect - The TC Aspect to generate from.
* @return
* @throws IllegalArgumentException
@@ -207,15 +208,14 @@ public class TC_Aspect_Wrapper {
aTag,
(int) ReflectionUtils.getField(mClass_Aspect, "color").get(aBaseAspect),
generateAspectArrayInternal(
- ReflectionUtils.getField(mClass_Aspect, "components"), (aBaseAspect)),
- (ResourceLocation)
- ReflectionUtils.getField(mClass_Aspect, "image").get(aBaseAspect),
+ ReflectionUtils.getField(mClass_Aspect, "components"),
+ (aBaseAspect)),
+ (ResourceLocation) ReflectionUtils.getField(mClass_Aspect, "image").get(aBaseAspect),
true,
(int) ReflectionUtils.getField(mClass_Aspect, "blend").get(aBaseAspect),
"");
if (aTemp != null) {
- aTemp.chatcolor = (String)
- ReflectionUtils.getField(mClass_Aspect, "chatcolor").get(aBaseAspect);
+ aTemp.chatcolor = (String) ReflectionUtils.getField(mClass_Aspect, "chatcolor").get(aBaseAspect);
return aTemp;
} else {
return null;
@@ -234,6 +234,7 @@ public class TC_Aspect_Wrapper {
/**
* Public getter for all TC_Aspects
+ *
* @param aAspectName - Aspect Name
* @return - A GT++ Aspect wrapper or null. (TC_Aspect)
*/
@@ -270,8 +271,7 @@ public class TC_Aspect_Wrapper {
if (aAspectArray.length > 0) {
int i = 0;
for (Object g : components) {
- aAspectArray[i] = getAspect((String)
- ReflectionUtils.getField(mClass_Aspect, "tag").get(g));
+ aAspectArray[i] = getAspect((String) ReflectionUtils.getField(mClass_Aspect, "tag").get(g));
i++;
}
}
@@ -284,6 +284,7 @@ public class TC_Aspect_Wrapper {
/**
* Tasty code to generate TC Aspects reflectively.
+ *
* @return
*/
public Object generateTcAspect() {
@@ -298,7 +299,11 @@ public class TC_Aspect_Wrapper {
}
}
Constructor constructor = mClass_Aspect.getConstructor(
- String.class, int.class, aAspectArray.getClass(), ResourceLocation.class, int.class);
+ String.class,
+ int.class,
+ aAspectArray.getClass(),
+ ResourceLocation.class,
+ int.class);
Object myObject = constructor.newInstance(tag, color, aAspectArray, image, blend);
// Set chat colour
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java
index 0130ca3b96..5ed57574d2 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java
@@ -1,17 +1,19 @@
package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
-import cpw.mods.fml.common.FMLLog;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
+
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
+
import org.apache.logging.log4j.Level;
+import cpw.mods.fml.common.FMLLog;
+
public class TC_ResearchCategories_Wrapper {
- public static LinkedHashMap<String, TC_ResearchCategoryList_Wrapper> researchCategories =
- new LinkedHashMap<String, TC_ResearchCategoryList_Wrapper>();
+ public static LinkedHashMap<String, TC_ResearchCategoryList_Wrapper> researchCategories = new LinkedHashMap<String, TC_ResearchCategoryList_Wrapper>();
public static TC_ResearchCategoryList_Wrapper getResearchList(String key) {
return (TC_ResearchCategoryList_Wrapper) researchCategories.get(key);
@@ -60,7 +62,9 @@ public class TC_ResearchCategories_Wrapper {
FMLLog.log(
Level.FATAL,
"[Thaumcraft] Research [" + ri.getName()
- + "] not added as it overlaps with existing research [" + rr.getName() + "]",
+ + "] not added as it overlaps with existing research ["
+ + rr.getName()
+ + "]",
new Object[0]);
return;
}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java
index 08c69cdca5..f8066abe2d 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java
@@ -2,9 +2,11 @@ package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
import java.util.HashMap;
import java.util.Map;
+
import net.minecraft.util.ResourceLocation;
public class TC_ResearchCategoryList_Wrapper {
+
public int minDisplayColumn;
public int minDisplayRow;
public int maxDisplayColumn;
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java
index be0ae26e61..1baefdc465 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java
@@ -1,12 +1,13 @@
package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
+
public class TC_ResearchItem_Wrapper {
public final String key;
@@ -45,14 +46,8 @@ public class TC_ResearchItem_Wrapper {
this.setVirtual();
}
- public TC_ResearchItem_Wrapper(
- String key,
- String category,
- TC_AspectList_Wrapper tags,
- int col,
- int row,
- int complex,
- ResourceLocation icon) {
+ public TC_ResearchItem_Wrapper(String key, String category, TC_AspectList_Wrapper tags, int col, int row,
+ int complex, ResourceLocation icon) {
this.key = key;
this.category = category;
this.tags = tags;
@@ -70,8 +65,8 @@ public class TC_ResearchItem_Wrapper {
}
}
- public TC_ResearchItem_Wrapper(
- String key, String category, TC_AspectList_Wrapper tags, int col, int row, int complex, ItemStack icon) {
+ public TC_ResearchItem_Wrapper(String key, String category, TC_AspectList_Wrapper tags, int col, int row,
+ int complex, ItemStack icon) {
this.key = key;
this.category = category;
this.tags = tags;
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java
index 83ddd106a5..4632909620 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java
@@ -1,18 +1,21 @@
package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_CrucibleRecipe_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_IArcaneRecipe_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionEnchantmentRecipe_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionRecipe_Wrapper;
import java.util.List;
+
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_CrucibleRecipe_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_IArcaneRecipe_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionEnchantmentRecipe_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionRecipe_Wrapper;
+
public class TC_ResearchPage_Wrapper {
+
public TC_PageType_Wrapper type;
public String text;
public String research;
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java
index 8489a4d50e..5376739106 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java
@@ -2,6 +2,18 @@ package gtPlusPlus.xmod.thaumcraft.util;
import static gtPlusPlus.xmod.thaumcraft.HANDLER_Thaumcraft.sItemsToGetAspects;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.world.World;
+
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.TC_Aspects;
@@ -23,16 +35,6 @@ import gtPlusPlus.xmod.thaumcraft.objects.wrapper.research.TC_ResearchCategoryLi
import gtPlusPlus.xmod.thaumcraft.objects.wrapper.research.TC_ResearchItem_Wrapper;
import gtPlusPlus.xmod.thaumcraft.objects.wrapper.research.TC_ResearchNoteData_Wrapper;
import gtPlusPlus.xmod.thaumcraft.objects.wrapper.research.TC_ResearchPage_Wrapper;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.world.World;
public class ThaumcraftUtils {
@@ -50,7 +52,7 @@ public class ThaumcraftUtils {
}
public static boolean addAspectToItem(ItemStack item, TC_Aspect_Wrapper aspect, int amount) {
- return addAspectToItem(item, new TC_Aspect_Wrapper[] {aspect}, new Integer[] {amount});
+ return addAspectToItem(item, new TC_Aspect_Wrapper[] { aspect }, new Integer[] { amount });
}
public static boolean addAspectToItem(ItemStack item, TC_Aspect_Wrapper[] aspect, Integer[] amounts) {
@@ -81,20 +83,9 @@ public class ThaumcraftUtils {
return r.mGtEnumField;
}
- public static Object addResearch(
- String aResearch,
- String aName,
- String aText,
- String[] aParentResearches,
- String aCategory,
- ItemStack aIcon,
- int aComplexity,
- int aType,
- int aX,
- int aY,
- List<GTPP_AspectStack> aAspects,
- ItemStack[] aResearchTriggers,
- Object[] aPages) {
+ public static Object addResearch(String aResearch, String aName, String aText, String[] aParentResearches,
+ String aCategory, ItemStack aIcon, int aComplexity, int aType, int aX, int aY,
+ List<GTPP_AspectStack> aAspects, ItemStack[] aResearchTriggers, Object[] aPages) {
if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.researches, aResearch, true)) {
return null;
}
@@ -102,7 +93,7 @@ public class ThaumcraftUtils {
if (tCategory == null) {
return null;
}
- for (Iterator<TC_ResearchItem_Wrapper> i$ = tCategory.research.values().iterator(); i$.hasNext(); ) {
+ for (Iterator<TC_ResearchItem_Wrapper> i$ = tCategory.research.values().iterator(); i$.hasNext();) {
TC_ResearchItem_Wrapper tResearch = (TC_ResearchItem_Wrapper) i$.next();
if ((tResearch.displayColumn == aX) && (tResearch.displayRow == aY)) {
aX += (aX > 0 ? 5 : -5);
@@ -110,7 +101,13 @@ public class ThaumcraftUtils {
}
}
TC_ResearchItem_Wrapper rResearch = new TC_ResearchItem_Wrapper(
- aResearch, aCategory, getAspectList_Ex(aAspects), aX, aY, aComplexity, aIcon);
+ aResearch,
+ aCategory,
+ getAspectList_Ex(aAspects),
+ aX,
+ aY,
+ aComplexity,
+ aIcon);
ArrayList<Object> tPages = new ArrayList<Object>(aPages.length);
GT_LanguageManager.addStringLocalization("tc.research_name." + aResearch, aName);
GT_LanguageManager.addStringLocalization("tc.research_text." + aResearch, "[GT++] " + aText);
@@ -172,13 +169,9 @@ public class ThaumcraftUtils {
return rResearch.registerResearchItem();
}
- public static Object addCrucibleRecipe(
- final String aResearch,
- final Object aInput,
- final ItemStack aOutput,
+ public static Object addCrucibleRecipe(final String aResearch, final Object aInput, final ItemStack aOutput,
final List<GTPP_AspectStack> aAspects) {
- if (GT_Utility.isStringInvalid((Object) aResearch)
- || aInput == null
+ if (GT_Utility.isStringInvalid((Object) aResearch) || aInput == null
|| aOutput == null
|| aAspects == null
|| aAspects.isEmpty()) {
@@ -186,20 +179,15 @@ public class ThaumcraftUtils {
}
return addCrucibleRecipe(
aResearch,
- GT_Utility.copy(new Object[] {aOutput}),
+ GT_Utility.copy(new Object[] { aOutput }),
(aInput instanceof ItemStack || aInput instanceof ArrayList) ? aInput : aInput.toString(),
getAspectList_Ex(aAspects));
}
- public static Object addInfusionRecipe(
- final String aResearch,
- final ItemStack aMainInput,
- final ItemStack[] aSideInputs,
- final ItemStack aOutput,
- final int aInstability,
+ public static Object addInfusionRecipe(final String aResearch, final ItemStack aMainInput,
+ final ItemStack[] aSideInputs, final ItemStack aOutput, final int aInstability,
final List<GTPP_AspectStack> aAspects) {
- if (GT_Utility.isStringInvalid((Object) aResearch)
- || aMainInput == null
+ if (GT_Utility.isStringInvalid((Object) aResearch) || aMainInput == null
|| aSideInputs == null
|| aOutput == null
|| aAspects == null
@@ -208,15 +196,15 @@ public class ThaumcraftUtils {
}
return addInfusionCraftingRecipe(
aResearch,
- (Object) GT_Utility.copy(new Object[] {aOutput}),
+ (Object) GT_Utility.copy(new Object[] { aOutput }),
aInstability,
getAspectList_Ex(aAspects),
aMainInput,
aSideInputs);
}
- public static boolean registerThaumcraftAspectsToItem(
- final ItemStack aExampleStack, final List<GTPP_AspectStack> aAspects, final String aOreDict) {
+ public static boolean registerThaumcraftAspectsToItem(final ItemStack aExampleStack,
+ final List<GTPP_AspectStack> aAspects, final String aOreDict) {
if (aAspects.isEmpty()) {
return false;
}
@@ -224,8 +212,8 @@ public class ThaumcraftUtils {
return true;
}
- public static boolean registerThaumcraftAspectsToItem(
- final ItemStack aStack, final List<GTPP_AspectStack> aAspects, final boolean aAdditive) {
+ public static boolean registerThaumcraftAspectsToItem(final ItemStack aStack, final List<GTPP_AspectStack> aAspects,
+ final boolean aAdditive) {
try {
if (aAspects.isEmpty()) {
return false;
@@ -276,14 +264,14 @@ public class ThaumcraftUtils {
/*
* Methods
*/
- mMethod_registerObjectTag1 = ReflectionUtils.getMethod(
- mClass_ThaumcraftApi, "registerObjectTag", ItemStack.class, mClass_AspectList);
+ mMethod_registerObjectTag1 = ReflectionUtils
+ .getMethod(mClass_ThaumcraftApi, "registerObjectTag", ItemStack.class, mClass_AspectList);
- mMethod_registerObjectTag2 =
- ReflectionUtils.getMethod(mClass_ThaumcraftApi, "registerObjectTag", String.class, mClass_AspectList);
+ mMethod_registerObjectTag2 = ReflectionUtils
+ .getMethod(mClass_ThaumcraftApi, "registerObjectTag", String.class, mClass_AspectList);
- mMethod_registerComplexObjectTag = ReflectionUtils.getMethod(
- mClass_ThaumcraftApi, "registerComplexObjectTag", ItemStack.class, mClass_AspectList);
+ mMethod_registerComplexObjectTag = ReflectionUtils
+ .getMethod(mClass_ThaumcraftApi, "registerComplexObjectTag", ItemStack.class, mClass_AspectList);
mMethod_addInfusionCraftingRecipe = ReflectionUtils.getMethod(
mClass_ThaumcraftApi,
@@ -303,8 +291,8 @@ public class ThaumcraftUtils {
Object.class,
mClass_AspectList);
- mMethod_getObjectAspects =
- ReflectionUtils.getMethod(mClass_ThaumcraftApiHelper, "getObjectAspects", ItemStack.class);
+ mMethod_getObjectAspects = ReflectionUtils
+ .getMethod(mClass_ThaumcraftApiHelper, "getObjectAspects", ItemStack.class);
mMethod_updateData = ReflectionUtils.getMethod(
mClass_ResearchManager,
@@ -352,8 +340,8 @@ public class ThaumcraftUtils {
return null;
}
- public static Object addCrucibleRecipe(
- String aResearch, ItemStack copy, Object aOutput, TC_AspectList_Wrapper aAspectList) {
+ public static Object addCrucibleRecipe(String aResearch, ItemStack copy, Object aOutput,
+ TC_AspectList_Wrapper aAspectList) {
try {
return mMethod_addCrucibleRecipe.invoke(null, aResearch, copy, aOutput, aAspectList);
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
@@ -362,16 +350,11 @@ public class ThaumcraftUtils {
return null;
}
- public static Object addInfusionCraftingRecipe(
- String aResearch,
- Object copy,
- int aInstability,
- TC_AspectList_Wrapper aAspectList,
- ItemStack aMainInput,
- ItemStack[] aSideInputs) {
+ public static Object addInfusionCraftingRecipe(String aResearch, Object copy, int aInstability,
+ TC_AspectList_Wrapper aAspectList, ItemStack aMainInput, ItemStack[] aSideInputs) {
try {
- return mMethod_addInfusionCraftingRecipe.invoke(
- null, aResearch, copy, aInstability, aAspectList, aMainInput, aSideInputs);
+ return mMethod_addInfusionCraftingRecipe
+ .invoke(null, aResearch, copy, aInstability, aAspectList, aMainInput, aSideInputs);
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
e.printStackTrace();
}
@@ -426,8 +409,7 @@ public class ThaumcraftUtils {
}
public static boolean isItemResearchNotes(ItemStack aStack) {
- if (aStack != null
- && aStack.getItem() == HANDLER_Thaumcraft.mResearchNotes
+ if (aStack != null && aStack.getItem() == HANDLER_Thaumcraft.mResearchNotes
&& HANDLER_Thaumcraft.mResearchNotes.getClass().isInstance(aStack.getItem())) {
return true;
}
@@ -449,39 +431,24 @@ public class ThaumcraftUtils {
return research;
}
- public static void placeAspectIntoResearchNote(
- ItemStack note, World aWorld, final int q, final int r, final TC_Aspect_Wrapper aspect) {
- /*TC_ResearchNoteData_Wrapper data = gatherResults(note);
- String mGTPP = CORE.gameProfile.getName();
- EntityPlayer player = CORE.getFakePlayer(aWorld);
-
- if (isItemResearchNotes(note) && data != null && note.getItemDamage() < 64) {
- final boolean r2 = ResearchManager.isResearchComplete(mGTPP, "RESEARCHER1");
- final boolean r3 = ResearchManager.isResearchComplete(mGTPP, "RESEARCHER2");
- final HexUtils.Hex hex = new HexUtils.Hex(q, r);
- ResearchManager.HexEntry he = null;
- if (aspect != null) {
- he = new ResearchManager.HexEntry(aspect, 2);
- if (r3 && aWorld.rand.nextFloat() < 0.1f) {
- aWorld.playSoundAtEntity((Entity) player, "random.orb", 0.2f, 0.9f + player.worldObj.rand.nextFloat() * 0.2f);
- }
- } else {
- final float f = aWorld.rand.nextFloat();
- if (data.hexEntries.get(hex.toString()).aspect != null
- && ((r2 && f < 0.25f) || (r3 && f < 0.5f))) {
- aWorld.playSoundAtEntity((Entity) player, "random.orb", 0.2f,
- 0.9f + player.worldObj.rand.nextFloat() * 0.2f);
- ResearchManager.scheduleSave(player);
- }
- he = new ResearchManager.HexEntry((Aspect) null, 0);
- }
- data.hexEntries.put(hex.toString(), he);
- data.hexes.put(hex.toString(), hex);
- updateResearchNote(note, data);
- if (!aWorld.isRemote && ResearchManager.checkResearchCompletion(note, data, player.getCommandSenderName())) {
- note.setItemDamage(64);
- }
- }*/
+ public static void placeAspectIntoResearchNote(ItemStack note, World aWorld, final int q, final int r,
+ final TC_Aspect_Wrapper aspect) {
+ /*
+ * TC_ResearchNoteData_Wrapper data = gatherResults(note); String mGTPP = CORE.gameProfile.getName();
+ * EntityPlayer player = CORE.getFakePlayer(aWorld); if (isItemResearchNotes(note) && data != null &&
+ * note.getItemDamage() < 64) { final boolean r2 = ResearchManager.isResearchComplete(mGTPP, "RESEARCHER1");
+ * final boolean r3 = ResearchManager.isResearchComplete(mGTPP, "RESEARCHER2"); final HexUtils.Hex hex = new
+ * HexUtils.Hex(q, r); ResearchManager.HexEntry he = null; if (aspect != null) { he = new
+ * ResearchManager.HexEntry(aspect, 2); if (r3 && aWorld.rand.nextFloat() < 0.1f) {
+ * aWorld.playSoundAtEntity((Entity) player, "random.orb", 0.2f, 0.9f + player.worldObj.rand.nextFloat() *
+ * 0.2f); } } else { final float f = aWorld.rand.nextFloat(); if (data.hexEntries.get(hex.toString()).aspect !=
+ * null && ((r2 && f < 0.25f) || (r3 && f < 0.5f))) { aWorld.playSoundAtEntity((Entity) player, "random.orb",
+ * 0.2f, 0.9f + player.worldObj.rand.nextFloat() * 0.2f); ResearchManager.scheduleSave(player); } he = new
+ * ResearchManager.HexEntry((Aspect) null, 0); } data.hexEntries.put(hex.toString(), he);
+ * data.hexes.put(hex.toString(), hex); updateResearchNote(note, data); if (!aWorld.isRemote &&
+ * ResearchManager.checkResearchCompletion(note, data, player.getCommandSenderName())) { note.setItemDamage(64);
+ * } }
+ */
}
public static void completeResearchNote(World aWorld, ItemStack aStack) {
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
index 2118df699a..bede18377f 100644
--- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
+++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java
@@ -1,13 +1,7 @@
package gtPlusPlus.xmod.thermalfoundation.block;
-import cofh.core.fluid.BlockFluidInteractive;
-import cofh.lib.util.BlockWrapper;
-import cofh.lib.util.helpers.DamageHelper;
-import cofh.lib.util.helpers.ServerHelper;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
@@ -22,7 +16,16 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import cofh.core.fluid.BlockFluidInteractive;
+import cofh.lib.util.BlockWrapper;
+import cofh.lib.util.helpers.DamageHelper;
+import cofh.lib.util.helpers.ServerHelper;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
+
public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive {
+
Random random = new Random();
public static final int LEVELS = 5;
public static final Material materialFluidCryotheum = new MaterialLiquid(MapColor.iceColor);
@@ -68,12 +71,8 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive {
}
@Override
- public void onEntityCollidedWithBlock(
- final World paramWorld,
- final int paramInt1,
- final int paramInt2,
- final int paramInt3,
- final Entity paramEntity) {
+ public void onEntityCollidedWithBlock(final World paramWorld, final int paramInt1, final int paramInt2,
+ final int paramInt3, final Entity paramEntity) {
paramEntity.extinguish();
if (!effect) {
return;
@@ -105,7 +104,7 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive {
paramEntity.setDead();
} else if (
- /*((paramEntity instanceof EntityBlizz)) ||*/ ((paramEntity instanceof EntitySnowman))) {
+ /* ((paramEntity instanceof EntityBlizz)) || */ ((paramEntity instanceof EntitySnowman))) {
((EntityLivingBase) paramEntity).addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 120, 0));
((EntityLivingBase) paramEntity).addPotionEffect(new PotionEffect(Potion.regeneration.id, 120, 0));
} else if ((paramEntity instanceof EntityBlaze)) {
@@ -118,17 +117,13 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive {
}
@Override
- public int getLightValue(
- final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2, final int paramInt3) {
+ public int getLightValue(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2,
+ final int paramInt3) {
return TF_Fluids.fluidCryotheum.getLuminosity();
}
@Override
- public void updateTick(
- final World paramWorld,
- final int paramInt1,
- final int paramInt2,
- final int paramInt3,
+ public void updateTick(final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3,
final Random paramRandom) {
if (effect) {
this.checkForInteraction(paramWorld, paramInt1, paramInt2, paramInt3);
@@ -145,8 +140,8 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive {
super.updateTick(paramWorld, paramInt1, paramInt2, paramInt3, paramRandom);
}
- protected void checkForInteraction(
- final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3) {
+ protected void checkForInteraction(final World paramWorld, final int paramInt1, final int paramInt2,
+ final int paramInt3) {
if (paramWorld.getBlock(paramInt1, paramInt2, paramInt3) != this) {
return;
}
@@ -166,8 +161,8 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive {
this.interactWithBlock(paramWorld, paramInt1 + 1, paramInt2, paramInt3 + 1);
}
- protected void interactWithBlock(
- final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3) {
+ protected void interactWithBlock(final World paramWorld, final int paramInt1, final int paramInt2,
+ final int paramInt3) {
final Block localBlock = paramWorld.getBlock(paramInt1, paramInt2, paramInt3);
if ((localBlock == Blocks.air) || (localBlock == this)) {
return;
@@ -175,14 +170,14 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive {
final int i = paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3);
if (this.hasInteraction(localBlock, i)) {
final BlockWrapper localBlockWrapper = this.getInteraction(localBlock, i);
- paramWorld.setBlock(
- paramInt1, paramInt2, paramInt3, localBlockWrapper.block, localBlockWrapper.metadata, 3);
+ paramWorld
+ .setBlock(paramInt1, paramInt2, paramInt3, localBlockWrapper.block, localBlockWrapper.metadata, 3);
} else if ((paramWorld.isSideSolid(paramInt1, paramInt2, paramInt3, ForgeDirection.UP))
&& (paramWorld.isAirBlock(paramInt1, paramInt2 + 1, paramInt3))) {
- paramWorld.setBlock(paramInt1, paramInt2 + 1, paramInt3, Blocks.snow_layer, 0, 3);
- }
+ paramWorld.setBlock(paramInt1, paramInt2 + 1, paramInt3, Blocks.snow_layer, 0, 3);
+ }
}
- protected void triggerInteractionEffects(
- final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3) {}
+ protected void triggerInteractionEffects(final World paramWorld, final int paramInt1, final int paramInt2,
+ final int paramInt3) {}
}
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java
index 5b2894c0fc..7800892f72 100644
--- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java
+++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java
@@ -1,10 +1,5 @@
package gtPlusPlus.xmod.thermalfoundation.block;
-import cofh.core.fluid.BlockFluidCoFHBase;
-import cofh.core.util.CoreUtils;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.material.MaterialLiquid;
@@ -12,7 +7,14 @@ import net.minecraft.entity.Entity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cofh.core.fluid.BlockFluidCoFHBase;
+import cofh.core.util.CoreUtils;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
+
public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase {
+
public static final int LEVELS = 4;
public static final Material materialFluidEnder = new MaterialLiquid(MapColor.greenColor);
private static boolean effect = true;
@@ -38,8 +40,8 @@ public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase {
}
@Override
- public void onEntityCollidedWithBlock(
- World paramWorld, int paramInt1, int paramInt2, int paramInt3, Entity paramEntity) {
+ public void onEntityCollidedWithBlock(World paramWorld, int paramInt1, int paramInt2, int paramInt3,
+ Entity paramEntity) {
if ((!effect) || (paramWorld.isRemote)) {
return;
}
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
index 637fefb2ea..649149e186 100644
--- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
+++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java
@@ -1,12 +1,7 @@
package gtPlusPlus.xmod.thermalfoundation.block;
-import cofh.core.fluid.BlockFluidInteractive;
-import cofh.lib.util.BlockWrapper;
-import cofh.lib.util.helpers.ServerHelper;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
import java.util.Random;
+
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
@@ -19,7 +14,15 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import cofh.core.fluid.BlockFluidInteractive;
+import cofh.lib.util.BlockWrapper;
+import cofh.lib.util.helpers.ServerHelper;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
+
public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive {
+
Random random = new Random();
public static final int LEVELS = 5;
public static final Material materialFluidPyrotheum = new MaterialLiquid(MapColor.tntColor);
@@ -63,12 +66,8 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive {
}
@Override
- public void onEntityCollidedWithBlock(
- final World paramWorld,
- final int paramInt1,
- final int paramInt2,
- final int paramInt3,
- final Entity paramEntity) {
+ public void onEntityCollidedWithBlock(final World paramWorld, final int paramInt1, final int paramInt2,
+ final int paramInt3, final Entity paramEntity) {
if (!effect) {
return;
}
@@ -90,59 +89,38 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive {
}
@Override
- public int getLightValue(
- final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2, final int paramInt3) {
+ public int getLightValue(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2,
+ final int paramInt3) {
return TF_Fluids.fluidPyrotheum.getLuminosity();
}
@Override
- public int getFireSpreadSpeed(
- final IBlockAccess paramIBlockAccess,
- final int paramInt1,
- final int paramInt2,
- final int paramInt3,
- final ForgeDirection paramForgeDirection) {
+ public int getFireSpreadSpeed(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2,
+ final int paramInt3, final ForgeDirection paramForgeDirection) {
return effect ? 800 : 0;
}
@Override
- public int getFlammability(
- final IBlockAccess paramIBlockAccess,
- final int paramInt1,
- final int paramInt2,
- final int paramInt3,
- final ForgeDirection paramForgeDirection) {
+ public int getFlammability(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2,
+ final int paramInt3, final ForgeDirection paramForgeDirection) {
return 0;
}
@Override
- public boolean isFlammable(
- final IBlockAccess paramIBlockAccess,
- final int paramInt1,
- final int paramInt2,
- final int paramInt3,
- final ForgeDirection paramForgeDirection) {
- return (effect)
- && (paramForgeDirection.ordinal() > ForgeDirection.UP.ordinal())
+ public boolean isFlammable(final IBlockAccess paramIBlockAccess, final int paramInt1, final int paramInt2,
+ final int paramInt3, final ForgeDirection paramForgeDirection) {
+ return (effect) && (paramForgeDirection.ordinal() > ForgeDirection.UP.ordinal())
&& (paramIBlockAccess.getBlock(paramInt1, paramInt2 - 1, paramInt3) != this);
}
@Override
- public boolean isFireSource(
- final World paramWorld,
- final int paramInt1,
- final int paramInt2,
- final int paramInt3,
+ public boolean isFireSource(final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3,
final ForgeDirection paramForgeDirection) {
return effect;
}
@Override
- public void updateTick(
- final World paramWorld,
- final int paramInt1,
- final int paramInt2,
- final int paramInt3,
+ public void updateTick(final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3,
final Random paramRandom) {
if (effect) {
this.checkForInteraction(paramWorld, paramInt1, paramInt2, paramInt3);
@@ -150,9 +128,8 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive {
if ((enableSourceFall) && (paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3) == 0)) {
final Block localBlock = paramWorld.getBlock(paramInt1, paramInt2 + this.densityDir, paramInt3);
final int i = paramWorld.getBlockMetadata(paramInt1, paramInt2 + this.densityDir, paramInt3);
- if (((localBlock == this) && (i != 0))
- || (localBlock.isFlammable(
- paramWorld, paramInt1, paramInt2 + this.densityDir, paramInt3, ForgeDirection.UP))) {
+ if (((localBlock == this) && (i != 0)) || (localBlock
+ .isFlammable(paramWorld, paramInt1, paramInt2 + this.densityDir, paramInt3, ForgeDirection.UP))) {
paramWorld.setBlock(paramInt1, paramInt2 + this.densityDir, paramInt3, this, 0, 3);
paramWorld.setBlockToAir(paramInt1, paramInt2, paramInt3);
return;
@@ -161,8 +138,8 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive {
super.updateTick(paramWorld, paramInt1, paramInt2, paramInt3, paramRandom);
}
- protected void checkForInteraction(
- final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3) {
+ protected void checkForInteraction(final World paramWorld, final int paramInt1, final int paramInt2,
+ final int paramInt3) {
if (paramWorld.getBlock(paramInt1, paramInt2, paramInt3) != this) {
return;
}
@@ -182,8 +159,8 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive {
this.interactWithBlock(paramWorld, paramInt1 + 1, paramInt2, paramInt3 + 1);
}
- protected void interactWithBlock(
- final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3) {
+ protected void interactWithBlock(final World paramWorld, final int paramInt1, final int paramInt2,
+ final int paramInt3) {
final Block localBlock = paramWorld.getBlock(paramInt1, paramInt2, paramInt3);
if ((localBlock == Blocks.air) || (localBlock == this)) {
return;
@@ -191,19 +168,19 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive {
final int i = paramWorld.getBlockMetadata(paramInt1, paramInt2, paramInt3);
if (this.hasInteraction(localBlock, i)) {
final BlockWrapper localBlockWrapper = this.getInteraction(localBlock, i);
- paramWorld.setBlock(
- paramInt1, paramInt2, paramInt3, localBlockWrapper.block, localBlockWrapper.metadata, 3);
+ paramWorld
+ .setBlock(paramInt1, paramInt2, paramInt3, localBlockWrapper.block, localBlockWrapper.metadata, 3);
this.triggerInteractionEffects(paramWorld, paramInt1, paramInt2, paramInt3);
} else if (localBlock.isFlammable(paramWorld, paramInt1, paramInt2, paramInt3, ForgeDirection.UP)) {
paramWorld.setBlock(paramInt1, paramInt2, paramInt3, Blocks.fire);
} else if ((paramWorld.isSideSolid(paramInt1, paramInt2, paramInt3, ForgeDirection.UP))
&& (paramWorld.isAirBlock(paramInt1, paramInt2 + 1, paramInt3))) {
- paramWorld.setBlock(paramInt1, paramInt2 + 1, paramInt3, Blocks.fire, 0, 3);
- }
+ paramWorld.setBlock(paramInt1, paramInt2 + 1, paramInt3, Blocks.fire, 0, 3);
+ }
}
- protected void triggerInteractionEffects(
- final World paramWorld, final int paramInt1, final int paramInt2, final int paramInt3) {
+ protected void triggerInteractionEffects(final World paramWorld, final int paramInt1, final int paramInt2,
+ final int paramInt3) {
if (this.random.nextInt(16) == 0) {
paramWorld.playSoundEffect(
paramInt1 + 0.5F,
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java
index bd4467c7b0..f554c82619 100644
--- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java
+++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java
@@ -1,17 +1,19 @@
package gtPlusPlus.xmod.thermalfoundation.fluid;
-import cofh.core.util.fluid.DispenserEmptyBucketHandler;
-import cofh.core.util.fluid.DispenserFilledBucketHandler;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.xmod.thermalfoundation.item.TF_Items;
import net.minecraft.block.BlockDispenser;
import net.minecraft.init.Items;
import net.minecraft.item.EnumRarity;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
+import cofh.core.util.fluid.DispenserEmptyBucketHandler;
+import cofh.core.util.fluid.DispenserFilledBucketHandler;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.thermalfoundation.item.TF_Items;
+
public class TF_Fluids {
+
public static Fluid fluidPyrotheum;
public static Fluid fluidCryotheum;
public static Fluid fluidEnder;
@@ -25,12 +27,8 @@ public class TF_Fluids {
if (pyrotheum == null) {
Logger.INFO("Registering Blazing Pyrotheum as it does not exist.");
- fluidPyrotheum = new Fluid("pyrotheum")
- .setLuminosity(15)
- .setDensity(2000)
- .setViscosity(1200)
- .setTemperature(4000)
- .setRarity(EnumRarity.rare);
+ fluidPyrotheum = new Fluid("pyrotheum").setLuminosity(15).setDensity(2000).setViscosity(1200)
+ .setTemperature(4000).setRarity(EnumRarity.rare);
registerFluid(fluidPyrotheum, "pyrotheum");
} else {
Logger.INFO("Registering Blazing Pyrotheum as it is an already existing Fluid.");
@@ -38,12 +36,8 @@ public class TF_Fluids {
}
if (cryotheum == null) {
Logger.INFO("Registering Gelid Cryotheum as it does not exist.");
- fluidCryotheum = new Fluid("cryotheum")
- .setLuminosity(0)
- .setDensity(4000)
- .setViscosity(3000)
- .setTemperature(50)
- .setRarity(EnumRarity.rare);
+ fluidCryotheum = new Fluid("cryotheum").setLuminosity(0).setDensity(4000).setViscosity(3000)
+ .setTemperature(50).setRarity(EnumRarity.rare);
registerFluid(fluidCryotheum, "cryotheum");
} else {
Logger.INFO("Registering Gelid Cryotheum as it is an already existing Fluid.");
@@ -52,11 +46,7 @@ public class TF_Fluids {
if (ender == null) {
Logger.INFO("Registering Resonant Ender as it does not exist.");
- fluidEnder = new Fluid("ender")
- .setLuminosity(3)
- .setDensity(4000)
- .setViscosity(3000)
- .setTemperature(300)
+ fluidEnder = new Fluid("ender").setLuminosity(3).setDensity(4000).setViscosity(3000).setTemperature(300)
.setRarity(EnumRarity.uncommon);
registerFluid(fluidEnder, "ender");
} else {
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
index 2ed0f07f36..849848fa94 100644
--- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
+++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.thermalfoundation.item;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+
import cofh.core.item.ItemBase;
import cofh.core.item.ItemBucket;
import cofh.core.util.energy.FurnaceFuelHandler;
@@ -11,9 +15,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks;
import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidContainerRegistry;
public class TF_Items {
@@ -34,10 +35,10 @@ public class TF_Items {
public static void preInit() {
- itemBucket = (ItemBucket)
- new ItemBucket("MiscUtils").setUnlocalizedName("bucket").setCreativeTab(AddToCreativeTab.tabMisc);
- itemMaterial = (ItemBase)
- new ItemBase("MiscUtils").setUnlocalizedName("material").setCreativeTab(AddToCreativeTab.tabMisc);
+ itemBucket = (ItemBucket) new ItemBucket("MiscUtils").setUnlocalizedName("bucket")
+ .setCreativeTab(AddToCreativeTab.tabMisc);
+ itemMaterial = (ItemBase) new ItemBase("MiscUtils").setUnlocalizedName("material")
+ .setCreativeTab(AddToCreativeTab.tabMisc);
bucketPyrotheum = itemBucket.addOreDictItem(1, "bucketPyrotheum");
bucketCryotheum = itemBucket.addOreDictItem(2, "bucketCryotheum");
@@ -48,8 +49,8 @@ public class TF_Items {
dustCryotheum = itemMaterial.addOreDictItem(4, "dustCryotheum");
if (ReflectionUtils.doesClassExist("cofh.core.util.energy.FurnaceFuelHandler")) {
- FurnaceFuelHandler.registerFuel(
- dustPyrotheum, 2400); // cofh.core.util.energy.FurnaceFuelHandler.registerFuel(ItemStack, int)
+ FurnaceFuelHandler.registerFuel(dustPyrotheum, 2400); // cofh.core.util.energy.FurnaceFuelHandler.registerFuel(ItemStack,
+ // int)
}
ItemUtils.addItemToOreDictionary(rodBlizz, "stickBlizz");
@@ -65,25 +66,28 @@ public class TF_Items {
BucketHandler.registerBucket(TF_Blocks.blockFluidPyrotheum, 0, bucketPyrotheum);
BucketHandler.registerBucket(TF_Blocks.blockFluidCryotheum, 0, bucketCryotheum);
BucketHandler.registerBucket(TF_Blocks.blockFluidEnder, 0, bucketEnder);
- FluidContainerRegistry.registerFluidContainer(
- TF_Fluids.fluidPyrotheum, bucketPyrotheum, FluidContainerRegistry.EMPTY_BUCKET);
- FluidContainerRegistry.registerFluidContainer(
- TF_Fluids.fluidCryotheum, bucketCryotheum, FluidContainerRegistry.EMPTY_BUCKET);
- FluidContainerRegistry.registerFluidContainer(
- TF_Fluids.fluidEnder, bucketEnder, FluidContainerRegistry.EMPTY_BUCKET);
+ FluidContainerRegistry
+ .registerFluidContainer(TF_Fluids.fluidPyrotheum, bucketPyrotheum, FluidContainerRegistry.EMPTY_BUCKET);
+ FluidContainerRegistry
+ .registerFluidContainer(TF_Fluids.fluidCryotheum, bucketCryotheum, FluidContainerRegistry.EMPTY_BUCKET);
+ FluidContainerRegistry
+ .registerFluidContainer(TF_Fluids.fluidEnder, bucketEnder, FluidContainerRegistry.EMPTY_BUCKET);
}
public static void postInit() {
if (!CORE.GTNH) {
- ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(
- ItemHelper.cloneStack(dustPyrotheum, 1),
- new Object[] {"dustCoal", "dustSulfur", "dustRedstone", "dustBlaze"}));
- ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(
- ItemHelper.cloneStack(dustCryotheum, 1),
- new Object[] {Items.snowball, "dustSaltpeter", "dustRedstone", "dustBlizz"}));
- ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(
- ItemHelper.cloneStack(dustCryotheum, 1),
- new Object[] {Items.snowball, "dustNitor", "dustRedstone", "dustBlizz"}));
+ ItemHelper.addRecipe(
+ ItemHelper.ShapelessRecipe(
+ ItemHelper.cloneStack(dustPyrotheum, 1),
+ new Object[] { "dustCoal", "dustSulfur", "dustRedstone", "dustBlaze" }));
+ ItemHelper.addRecipe(
+ ItemHelper.ShapelessRecipe(
+ ItemHelper.cloneStack(dustCryotheum, 1),
+ new Object[] { Items.snowball, "dustSaltpeter", "dustRedstone", "dustBlizz" }));
+ ItemHelper.addRecipe(
+ ItemHelper.ShapelessRecipe(
+ ItemHelper.cloneStack(dustCryotheum, 1),
+ new Object[] { Items.snowball, "dustNitor", "dustRedstone", "dustBlizz" }));
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
index 5391df38f1..7f3d4a636b 100644
--- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
+++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
@@ -1,5 +1,9 @@
package gtPlusPlus.xmod.thermalfoundation.recipe;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import cofh.lib.util.helpers.ItemHelper;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
@@ -8,9 +12,6 @@ import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class TF_Gregtech_Recipes {
@@ -41,11 +42,20 @@ public class TF_Gregtech_Recipes {
// Blizz Powder
GT_Values.RA.addChemicalBathRecipe(
- new ItemStack(Items.snowball, 4), moltenBlaze, dust_Blizz, GT_Values.NI, GT_Values.NI, null, 400, 240);
+ new ItemStack(Items.snowball, 4),
+ moltenBlaze,
+ dust_Blizz,
+ GT_Values.NI,
+ GT_Values.NI,
+ null,
+ 400,
+ 240);
// Blizz Rod
GT_Values.RA.addVacuumFreezerRecipe(
- new ItemStack(Items.blaze_rod), rod_Blizz, (int) Math.max((Materials.Blaze.getMass() * 4) * 3L, 1L));
+ new ItemStack(Items.blaze_rod),
+ rod_Blizz,
+ (int) Math.max((Materials.Blaze.getMass() * 4) * 3L, 1L));
GT_ModHandler.addPulverisationRecipe(rod_Blizz, dust_Blizz3, new ItemStack(Items.snowball, 1), 50, false);
ItemStack dustCoal = ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 1);
@@ -57,7 +67,7 @@ public class TF_Gregtech_Recipes {
ItemStack dustBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustBlizz", 1);
ItemStack dustNiter = ItemUtils.getItemStackOfAmountFromOreDict("dustNiter", 1);
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {dustCoal, dustSulfur, dustRedstone, dustBlaze})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { dustCoal, dustSulfur, dustRedstone, dustBlaze })) {
GT_Values.RA.addMixerRecipe(
dustCoal,
dustSulfur,
@@ -70,7 +80,7 @@ public class TF_Gregtech_Recipes {
120);
}
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {dustSaltpeter, dustSnow, dustRedstone, dustBlizz})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { dustSaltpeter, dustSnow, dustRedstone, dustBlizz })) {
GT_Values.RA.addMixerRecipe(
dustSaltpeter,
dustSnow,
@@ -83,7 +93,7 @@ public class TF_Gregtech_Recipes {
120);
}
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {dustNiter, dustSnow, dustRedstone, dustBlizz})) {
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] { dustNiter, dustSnow, dustRedstone, dustBlizz })) {
GT_Values.RA.addMixerRecipe(
dustNiter,
dustSnow,
diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java
index 25fa989551..cd25d068bb 100644
--- a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java
+++ b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.tinkers;
+import java.lang.reflect.Field;
+
+import net.minecraft.block.Block;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.lib.LoadedMods;
@@ -7,10 +13,6 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
import gtPlusPlus.xmod.tinkers.util.TinkersDryingRecipe;
import gtPlusPlus.xmod.tinkers.util.TinkersUtils;
-import java.lang.reflect.Field;
-import net.minecraft.block.Block;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
public class HANDLER_Tinkers {
@@ -92,8 +94,7 @@ public class HANDLER_Tinkers {
}
}
}
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
}
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java
index 6aa2fe8931..922b330443 100644
--- a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java
+++ b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java
@@ -2,19 +2,21 @@ package gtPlusPlus.xmod.tinkers.material;
import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.xmod.tinkers.HANDLER_Tinkers;
-import gtPlusPlus.xmod.tinkers.util.TinkersUtils;
import java.util.HashMap;
+
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.tinkers.HANDLER_Tinkers;
+import gtPlusPlus.xmod.tinkers.util.TinkersUtils;
+
public class BaseTinkersMaterial {
private static HashMap<String, Integer> aInternalMaterialIdMap = new HashMap<String, Integer>();
@@ -213,16 +215,20 @@ public class BaseTinkersMaterial {
}
// Smeltery.addMelting(new ItemStack(ExtraUtils.unstableIngot, 1, 0), ExtraUtils.decorative1, 5, 850,
- // aMaterial.getFluid(72));
+ // aMaterial.getFluid(72));
TinkersUtils.registerFluidType(mLocalName, aMatBlock, 0, aMelt, aFluid, true);
TinkersUtils.addMelting(aMaterial.getBlock(1), aMatBlock, 0, aMelt, aMaterial.getFluidStack(144 * 9));
TinkersUtils.addMelting(aMaterial.getIngot(1), aMatBlock, 0, aMelt, aMaterial.getFluidStack(144));
if (aMelt <= 3600) {
ItemStack ingotcast = TinkersUtils.getPattern(1);
TinkersUtils.addBasinRecipe(
- aMaterial.getBlock(1), aMaterial.getFluidStack(144 * 9), (ItemStack) null, true, 100);
- TinkersUtils.addCastingTableRecipe(
- aMaterial.getIngot(1), aMaterial.getFluidStack(144), ingotcast, false, 50);
+ aMaterial.getBlock(1),
+ aMaterial.getFluidStack(144 * 9),
+ (ItemStack) null,
+ true,
+ 100);
+ TinkersUtils
+ .addCastingTableRecipe(aMaterial.getIngot(1), aMaterial.getFluidStack(144), ingotcast, false, 50);
}
boolean extended = TinkersUtils.generateCastingRecipes(aMaterial, aID);
diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java
index 301302033e..020fee505d 100644
--- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java
+++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java
@@ -1,5 +1,11 @@
package gtPlusPlus.xmod.tinkers.util;
+import java.lang.reflect.Field;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
import gregtech.api.enums.GT_Values;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
@@ -7,10 +13,6 @@ import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.Field;
-import java.util.List;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
public class TinkersDryingRecipe {
@@ -24,22 +26,23 @@ public class TinkersDryingRecipe {
List<?> aRecipes = TinkersUtils.getDryingRecipes();
if (aRecipes != null && aRecipes.size() > 0) {
for (Object o : aRecipes) {
- Logger.INFO("Trying to generate recipe using object of type "
- + o.getClass().getSimpleName());
+ Logger.INFO("Trying to generate recipe using object of type " + o.getClass().getSimpleName());
generateFromTinkersRecipeObject(o);
}
} else {
- Logger.INFO("Error generating Drying recipes, map was either null or empty. Null? " + (aRecipes != null)
- + ", Size: " + aRecipes.size());
+ Logger.INFO(
+ "Error generating Drying recipes, map was either null or empty. Null? " + (aRecipes != null)
+ + ", Size: "
+ + aRecipes.size());
}
if (!recipes.isEmpty()) {
Logger.INFO("Adding " + recipes.size() + " drying rack recipes to the dehydrator.");
for (TinkersDryingRecipe r : recipes) {
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedCircuit(16), r.input},
+ new ItemStack[] { CI.getNumberedCircuit(16), r.input },
GT_Values.NF,
GT_Values.NF,
- new ItemStack[] {r.result},
+ new ItemStack[] { r.result },
new int[] {},
r.time / 10,
30);
@@ -51,11 +54,11 @@ public class TinkersDryingRecipe {
Field aTime;
Field aInput;
Field aOutput;
- Class aTinkerClass =
- ReflectionUtils.getClass("tconstruct.library.crafting.DryingRackRecipes.DryingRecipe"); // o.getClass();
+ Class aTinkerClass = ReflectionUtils.getClass("tconstruct.library.crafting.DryingRackRecipes.DryingRecipe"); // o.getClass();
if (aTinkerClass == null || !LoadedMods.TiCon) {
- Logger.INFO("Error generating Drying Recipe, could not find class. Exists? "
- + ReflectionUtils.doesClassExist("tconstruct.library.crafting.DryingRackRecipes.DryingRecipe"));
+ Logger.INFO(
+ "Error generating Drying Recipe, could not find class. Exists? " + ReflectionUtils
+ .doesClassExist("tconstruct.library.crafting.DryingRackRecipes.DryingRecipe"));
Class clazz = ReflectionUtils.getClass("tconstruct.library.crafting.DryingRackRecipes");
Class[] y = clazz.getDeclaredClasses();
if (y == null || y.length <= 0) {
@@ -67,8 +70,8 @@ public class TinkersDryingRecipe {
Logger.INFO("Found hidden inner class: " + h.getCanonicalName());
if (h.getSimpleName().toLowerCase().equals("dryingrecipe")) {
Logger.INFO("Found correct recipe. Caching at correct location.");
- ReflectionUtils.mCachedClasses.put(
- "tconstruct.library.crafting.DryingRackRecipes.DryingRecipe", h);
+ ReflectionUtils.mCachedClasses
+ .put("tconstruct.library.crafting.DryingRackRecipes.DryingRecipe", h);
aTinkerClass = h;
found = true;
break;
diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java
index 2446eea9f1..b37aad3aaf 100644
--- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java
+++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java
@@ -1,12 +1,5 @@
package gtPlusPlus.xmod.tinkers.util;
-import gregtech.api.enums.Materials;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -17,12 +10,21 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
+
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.enums.Materials;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class TinkersUtils {
private static final Class<?> mClass_Smeltery;
@@ -58,8 +60,8 @@ public class TinkersUtils {
mField_MoltenIronFluid = ReflectionUtils.getField(mClass_TinkerSmeltery, "moltenIronFluid");
mMethod_getFluidType = ReflectionUtils.getMethod(mClass_FluidType, "getFluidType", String.class);
- mMethod_getCastingRecipes =
- ReflectionUtils.getMethod(getCastingInstance(0), "getCastingRecipes", new Class[] {});
+ mMethod_getCastingRecipes = ReflectionUtils
+ .getMethod(getCastingInstance(0), "getCastingRecipes", new Class[] {});
}
/**
@@ -73,10 +75,8 @@ public class TinkersUtils {
if (mSmelteryInstance == null) {
if (mClass_Smeltery != null) {
try {
- mSmelteryInstance = ReflectionUtils.getField(mClass_Smeltery, "instance")
- .get(null);
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ mSmelteryInstance = ReflectionUtils.getField(mClass_Smeltery, "instance").get(null);
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
}
}
if (mTinkersRegistryInstance == null) {
@@ -84,8 +84,7 @@ public class TinkersUtils {
try {
mTinkersRegistryInstance = ReflectionUtils.getField(mClass_TConstructRegistry, "instance")
.get(null);
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
}
}
}
@@ -96,8 +95,7 @@ public class TinkersUtils {
try {
return (boolean) ReflectionUtils.getField(ReflectionUtils.getClass("PHConstruct"), "tconComesFirst")
.get(null);
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
}
return false;
}
@@ -107,32 +105,32 @@ public class TinkersUtils {
try {
ReflectionUtils.setFinalFieldValue(ReflectionUtils.getClass("PHConstruct"), "tconComesFirst", false);
if ((boolean) ReflectionUtils.getField(ReflectionUtils.getClass("PHConstruct"), "tconComesFirst")
- .get(null)
- == false) {
+ .get(null) == false) {
return true;
}
// Did not work, let's see where TiCon uses this and prevent it.
else {
ItemUtils.getNonTinkersDust("", 1);
}
- } catch (Exception e) {
- }
+ } catch (Exception e) {}
}
return false;
}
/**
* Add a new fluid as a valid Smeltery fuel.
- * @param fluid The fluid.
- * @param power The temperature of the fluid. This also influences the melting speed. Lava is 1000.
+ *
+ * @param fluid The fluid.
+ * @param power The temperature of the fluid. This also influences the melting speed. Lava is 1000.
* @param duration How long one "portion" of liquid fuels the smeltery. Lava is 10.
*/
public static void addSmelteryFuel(Fluid fluid, int power, int duration) {
setTiConDataInstance();
ReflectionUtils.invokeVoid(
- mSmelteryInstance, "addSmelteryFuel", new Class[] {Fluid.class, int.class, int.class}, new Object[] {
- fluid, power, duration
- });
+ mSmelteryInstance,
+ "addSmelteryFuel",
+ new Class[] { Fluid.class, int.class, int.class },
+ new Object[] { fluid, power, duration });
}
/**
@@ -140,8 +138,8 @@ public class TinkersUtils {
*/
public static boolean isSmelteryFuel(Fluid fluid) {
setTiConDataInstance();
- return ReflectionUtils.invoke(
- mSmelteryInstance, "isSmelteryFuel", new Class[] {Fluid.class}, new Object[] {fluid});
+ return ReflectionUtils
+ .invoke(mSmelteryInstance, "isSmelteryFuel", new Class[] { Fluid.class }, new Object[] { fluid });
}
/**
@@ -149,8 +147,8 @@ public class TinkersUtils {
*/
public static int getFuelPower(Fluid fluid) {
setTiConDataInstance();
- return (int) ReflectionUtils.invokeNonBool(
- mSmelteryInstance, "getFuelPower", new Class[] {Fluid.class}, new Object[] {fluid});
+ return (int) ReflectionUtils
+ .invokeNonBool(mSmelteryInstance, "getFuelPower", new Class[] { Fluid.class }, new Object[] { fluid });
}
/**
@@ -159,11 +157,14 @@ public class TinkersUtils {
public static int getFuelDuration(Fluid fluid) {
setTiConDataInstance();
return (int) ReflectionUtils.invokeNonBool(
- mSmelteryInstance, "getFuelDuration", new Class[] {Fluid.class}, new Object[] {fluid});
+ mSmelteryInstance,
+ "getFuelDuration",
+ new Class[] { Fluid.class },
+ new Object[] { fluid });
}
- public static boolean registerFluidType(
- String name, Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) {
+ public static boolean registerFluidType(String name, Block block, int meta, int baseTemperature, Fluid fluid,
+ boolean isToolpart) {
if (mMethodCache.get("registerFluidType") == null) {
Method m = ReflectionUtils.getMethod(
ReflectionUtils.getClass("tconstruct.library.crafting.FluidType"),
@@ -186,11 +187,11 @@ public class TinkersUtils {
public static boolean addBaseMeltingRecipes(Material aMaterial) {
return addMelting(
- aMaterial.getBlock(1),
- aMaterial.getBlock(),
- 0,
- aMaterial.getMeltingPointC(),
- aMaterial.getFluidStack(144 * 9))
+ aMaterial.getBlock(1),
+ aMaterial.getBlock(),
+ 0,
+ aMaterial.getMeltingPointC(),
+ aMaterial.getFluidStack(144 * 9))
&& addMelting(
aMaterial.getIngot(1),
aMaterial.getBlock(),
@@ -221,8 +222,8 @@ public class TinkersUtils {
public static boolean addMelting(Object type, ItemStack input, int temperatureDifference, int fluidAmount) {
if (mMethodCache.get("addMelting") == null) {
- Method m = ReflectionUtils.getMethod(
- mClass_Smeltery, "addMelting", mClass_FluidType, ItemStack.class, int.class, int.class);
+ Method m = ReflectionUtils
+ .getMethod(mClass_Smeltery, "addMelting", mClass_FluidType, ItemStack.class, int.class, int.class);
mMethodCache.put("addMelting", m);
}
try {
@@ -237,8 +238,8 @@ public class TinkersUtils {
return addBasinRecipe(aMaterial.getBlock(1), aMaterial.getFluidStack(144 * 9), (ItemStack) null, true, 100);
}
- public static boolean addBasinRecipe(
- ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay) {
+ public static boolean addBasinRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume,
+ int delay) {
if (mMethodCache.get("addBasinRecipe") == null) {
Method m = ReflectionUtils.getMethod(
ReflectionUtils.getClass("tconstruct.library.crafting.LiquidCasting"),
@@ -263,8 +264,8 @@ public class TinkersUtils {
return addCastingTableRecipe(aMaterial.getIngot(1), aMaterial.getFluidStack(144), ingotcast, false, 50);
}
- public static boolean addCastingTableRecipe(
- ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay) {
+ public static boolean addCastingTableRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume,
+ int delay) {
if (mMethodCache.get("addCastingTableRecipe") == null) {
Method m = ReflectionUtils.getMethod(
ReflectionUtils.getClass("tconstruct.library.crafting.LiquidCasting"),
@@ -277,8 +278,7 @@ public class TinkersUtils {
mMethodCache.put("addCastingTableRecipe", m);
}
try {
- mMethodCache
- .get("addCastingTableRecipe")
+ mMethodCache.get("addCastingTableRecipe")
.invoke(getCastingInstance(1), output, metal, cast, consume, delay);
return true;
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
@@ -288,6 +288,7 @@ public class TinkersUtils {
/**
* 0 For Table, 1 For Basin.
+ *
* @param aType - Casting Type
* @return - The casting instance.
*/
@@ -326,8 +327,7 @@ public class TinkersUtils {
if (m != null) {
try {
mTinkerMetalPattern = (Item) m.get(null);
- } catch (IllegalArgumentException | IllegalAccessException e) {
- }
+ } catch (IllegalArgumentException | IllegalAccessException e) {}
}
}
if (mTinkerMetalPattern != null) {
@@ -346,8 +346,8 @@ public class TinkersUtils {
AutoMap<Object> aData = new AutoMap<Object>();
int aCount = 0;
try {
- ArrayList<?> recipes = (ArrayList<?>) ReflectionUtils.getField(
- ReflectionUtils.getClass("tconstruct.library.crafting.DryingRackRecipes"), "recipes")
+ ArrayList<?> recipes = (ArrayList<?>) ReflectionUtils
+ .getField(ReflectionUtils.getClass("tconstruct.library.crafting.DryingRackRecipes"), "recipes")
.get(null);
if (recipes != null) {
for (Object o : recipes) {
@@ -367,6 +367,7 @@ public class TinkersUtils {
/**
* Generates Tinkers {@link ToolMaterial}'s reflectively.
+ *
* @param name
* @param localizationString
* @param level
@@ -380,18 +381,8 @@ public class TinkersUtils {
* @param primaryColor
* @return
*/
- public static Object generateToolMaterial(
- String name,
- String localizationString,
- int level,
- int durability,
- int speed,
- int damage,
- float handle,
- int reinforced,
- float stonebound,
- String style,
- int primaryColor) {
+ public static Object generateToolMaterial(String name, String localizationString, int level, int durability,
+ int speed, int damage, float handle, int reinforced, float stonebound, String style, int primaryColor) {
try {
Constructor<?> constructor = mClass_ToolMaterial.getConstructor(
String.class,
@@ -426,8 +417,8 @@ public class TinkersUtils {
public static void addToolMaterial(int id, Object aToolMaterial) {
if (mMethodCache.get("addToolMaterial") == null) {
- Method m = ReflectionUtils.getMethod(
- mClass_TConstructRegistry, "addtoolMaterial", int.class, mClass_ToolMaterial);
+ Method m = ReflectionUtils
+ .getMethod(mClass_TConstructRegistry, "addtoolMaterial", int.class, mClass_ToolMaterial);
mMethodCache.put("addToolMaterial", m);
}
try {
@@ -444,32 +435,29 @@ public class TinkersUtils {
}
try {
mMethodCache.get("addDefaultToolPartMaterial").invoke(mClass_TConstructRegistry, id);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
}
public static void addBowMaterial(int id, int drawspeed, float maxSpeed) {
if (mMethodCache.get("addBowMaterial") == null) {
- Method m = ReflectionUtils.getMethod(
- mClass_TConstructRegistry, "addBowMaterial", int.class, int.class, float.class);
+ Method m = ReflectionUtils
+ .getMethod(mClass_TConstructRegistry, "addBowMaterial", int.class, int.class, float.class);
mMethodCache.put("addBowMaterial", m);
}
try {
mMethodCache.get("addBowMaterial").invoke(mClass_TConstructRegistry, id, drawspeed, maxSpeed);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
}
public static void addArrowMaterial(int id, float mass, float fragility) {
if (mMethodCache.get("addArrowMaterial") == null) {
- Method m = ReflectionUtils.getMethod(
- mClass_TConstructRegistry, "addArrowMaterial", int.class, float.class, float.class);
+ Method m = ReflectionUtils
+ .getMethod(mClass_TConstructRegistry, "addArrowMaterial", int.class, float.class, float.class);
mMethodCache.put("addArrowMaterial", m);
}
try {
mMethodCache.get("addArrowMaterial").invoke(mClass_TConstructRegistry, id, mass, fragility);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
}
public static List<?> getTableCastingRecipes() {
@@ -504,8 +492,7 @@ public class TinkersUtils {
continue;
}
try {
- if (recipe.castingMetal.getFluid() == aMoltenIron
- && recipe.cast != null
+ if (recipe.castingMetal.getFluid() == aMoltenIron && recipe.cast != null
&& mClass_IPattern.isInstance(recipe.cast.getItem())
&& mClass_DynamicToolPart.isInstance(recipe.getResult().getItem())) {
newRecipies.add(recipe);
@@ -575,11 +562,9 @@ public class TinkersUtils {
}
public boolean matches(FluidStack metal, ItemStack inputCast) {
- return this.castingMetal.isFluidEqual(metal)
- && (this.cast != null
- && this.cast.getItemDamage() == 32767
- && inputCast.getItem() == this.cast.getItem()
- || ItemStack.areItemStacksEqual(this.cast, inputCast));
+ return this.castingMetal.isFluidEqual(metal) && (this.cast != null && this.cast.getItemDamage() == 32767
+ && inputCast.getItem() == this.cast.getItem()
+ || ItemStack.areItemStacksEqual(this.cast, inputCast));
}
public ItemStack getResult() {
diff --git a/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java b/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java
index b1e01eab7f..78a1bcba91 100644
--- a/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java
+++ b/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java
@@ -1,17 +1,20 @@
package gtPlusPlus.xmod.witchery;
-import com.mojang.authlib.GameProfile;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
import java.lang.reflect.Field;
import java.util.ArrayList;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.oredict.OreDictionary;
+import com.mojang.authlib.GameProfile;
+
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+
public class WitchUtils {
private static final GameProfile NORMAL_MINER_PROFILE;
@@ -26,8 +29,7 @@ public class WitchUtils {
a2 = getField("com.emoniph.witchery.entity.ai.EntityAIDigBlocks", "KOBOLDITE_MINER_PROFILE");
b1 = (GameProfile) a1.get(null);
b2 = (GameProfile) a2.get(null);
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
NORMAL_MINER_PROFILE = b1;
KOBOLDITE_MINER_PROFILE = b2;
@@ -38,8 +40,7 @@ public class WitchUtils {
if (LoadedMods.Witchery) {
- if (harvester != null
- && !harvester.worldObj.isRemote
+ if (harvester != null && !harvester.worldObj.isRemote
&& !event.isCanceled()
&& (isEqual(harvester.getGameProfile(), KOBOLDITE_MINER_PROFILE)
|| isEqual(harvester.getGameProfile(), NORMAL_MINER_PROFILE))) {
@@ -52,8 +53,7 @@ public class WitchUtils {
if (oreIDs.length > 0) {
final String oreName = OreDictionary.getOreName(oreIDs[0]);
if (oreName != null && oreName.startsWith("ore")) {
- final ItemStack smeltedDrop =
- FurnaceRecipes.smelting().getSmeltingResult(drop);
+ final ItemStack smeltedDrop = FurnaceRecipes.smelting().getSmeltingResult(drop);
if (smeltedDrop != null && hasKobolditePick && harvester.worldObj.rand.nextDouble() < 0.5) {
addOriginal = false;
newDrops.add(smeltedDrop.copy());
@@ -93,10 +93,6 @@ public class WitchUtils {
}
public static boolean isEqual(final GameProfile a, final GameProfile b) {
- return a != null
- && b != null
- && a.getId() != null
- && b.getId() != null
- && a.getId().equals(b.getId());
+ return a != null && b != null && a.getId() != null && b.getId() != null && a.getId().equals(b.getId());
}
}
diff --git a/src/main/java/vswe/stevescarts/ModuleData/GppModuleData.java b/src/main/java/vswe/stevescarts/ModuleData/GppModuleData.java
index 6d3596f2b1..cd073dc376 100644
--- a/src/main/java/vswe/stevescarts/ModuleData/GppModuleData.java
+++ b/src/main/java/vswe/stevescarts/ModuleData/GppModuleData.java
@@ -1,13 +1,15 @@
package vswe.stevescarts.ModuleData;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.sc2.modules.ModuleExoticSeeds;
import java.util.ArrayList;
import java.util.HashMap;
+
import net.minecraft.init.Items;
+
import vswe.stevescarts.Helpers.ComponentTypes;
import vswe.stevescarts.Items.ModItems;
import vswe.stevescarts.Modules.ModuleBase;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.sc2.modules.ModuleExoticSeeds;
public class GppModuleData extends ModuleData {
@@ -21,21 +23,23 @@ public class GppModuleData extends ModuleData {
@SuppressWarnings("unchecked")
public static void loadGpp() {
try {
- HashMap<Byte, ModuleData> moduleList = (HashMap<Byte, ModuleData>)
- (ReflectionUtils.getField(ModuleData.class, "moduleList").get(ModuleData.class));
+ HashMap<Byte, ModuleData> moduleList = (HashMap<Byte, ModuleData>) (ReflectionUtils
+ .getField(ModuleData.class, "moduleList").get(ModuleData.class));
ModuleData netherWartModule = moduleList.get((byte) 58);
ModuleDataGroup farmerGroup = netherWartModule.getRequirement().get(0);
ModuleData exoticSeedModule = new ModuleData(
- ID_ExoticSeedAddon, "Crop: Exotic Seeds", ModuleExoticSeeds.class, 20)
- .addRequirement(farmerGroup)
- .addRecipe(new Object[][] {{Items.wheat_seeds}, {ComponentTypes.EMPTY_DISK.getItemStack()}});
+ ID_ExoticSeedAddon,
+ "Crop: Exotic Seeds",
+ ModuleExoticSeeds.class,
+ 20).addRequirement(farmerGroup).addRecipe(
+ new Object[][] { { Items.wheat_seeds }, { ComponentTypes.EMPTY_DISK.getItemStack() } });
moduleListCustom.add(exoticSeedModule);
- HashMap<Byte, Boolean> validModules = (HashMap<Byte, Boolean>)
- (ReflectionUtils.getField(ModItems.class, "validModules").get(ModItems.class));
+ HashMap<Byte, Boolean> validModules = (HashMap<Byte, Boolean>) (ReflectionUtils
+ .getField(ModItems.class, "validModules").get(ModItems.class));
validModules.put(ID_ExoticSeedAddon, true);