From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- src/main/java/gtPlusPlus/core/block/ModBlocks.java | 16 +- .../gtPlusPlus/core/block/base/AdvancedBlock.java | 33 +- .../gtPlusPlus/core/block/base/BasicBlock.java | 12 +- .../core/block/base/BasicTileBlockWithTooltip.java | 75 +- .../gtPlusPlus/core/block/base/BlockBaseFluid.java | 39 +- .../core/block/base/BlockBaseModular.java | 64 +- .../gtPlusPlus/core/block/base/BlockBaseNBT.java | 34 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 83 +- .../java/gtPlusPlus/core/block/base/MetaBlock.java | 5 +- .../core/block/base/MultiTextureBlock.java | 5 +- .../block/general/BlockCompressedObsidian.java | 18 +- .../gtPlusPlus/core/block/general/BlockNet.java | 10 +- .../core/block/general/BlockSuperLight.java | 43 +- .../core/block/general/BlockTankXpConverter.java | 110 +- .../gtPlusPlus/core/block/general/FirePit.java | 51 +- .../core/block/general/FluidTankInfinite.java | 41 +- .../gtPlusPlus/core/block/general/HellFire.java | 239 +- .../gtPlusPlus/core/block/general/LightGlass.java | 26 +- .../core/block/general/MiningExplosives.java | 87 +- .../gtPlusPlus/core/block/general/PlayerDoors.java | 82 +- .../block/general/antigrief/BlockWitherProof.java | 67 +- .../core/block/general/antigrief/TowerDevice.java | 54 +- .../block/general/fluids/BlockFluidSludge.java | 13 +- .../general/redstone/BlockGenericRedstone.java | 99 +- .../redstone/BlockGenericRedstoneDetector.java | 27 +- .../redstone/BlockGenericRedstoneEmitter.java | 3 +- .../general/redstone/BlockGenericRedstoneTest.java | 33 +- .../core/block/machine/BlockGtFrameBox.java | 23 +- .../core/block/machine/CircuitProgrammer.java | 63 +- .../core/block/machine/DecayablesChest.java | 82 +- .../java/gtPlusPlus/core/block/machine/EggBox.java | 76 +- .../gtPlusPlus/core/block/machine/FishTrap.java | 79 +- .../core/block/machine/HeliumGenerator.java | 34 +- .../block/machine/Machine_ModularityTable.java | 42 +- .../core/block/machine/Machine_PestKiller.java | 61 +- .../core/block/machine/Machine_PooCollector.java | 79 +- .../core/block/machine/Machine_ProjectTable.java | 44 +- .../core/block/machine/Machine_RoundRobinator.java | 48 +- .../core/block/machine/Machine_SuperJukebox.java | 144 +- .../core/block/machine/Machine_TradeTable.java | 34 +- .../core/block/machine/VolumetricFlaskSetter.java | 69 +- .../block/machine/bedrock/Mining_Head_Fake.java | 40 +- .../block/machine/bedrock/Mining_Pipe_Fake.java | 40 +- .../core/chunkloading/GTPP_ChunkManager.java | 24 +- .../gtPlusPlus/core/client/CustomTextureSet.java | 1 + .../gtPlusPlus/core/client/model/ModelBatKing.java | 19 +- .../core/client/model/ModelDecayChest.java | 6 +- .../gtPlusPlus/core/client/model/ModelEggBox.java | 12 +- .../core/client/model/ModelGiantChicken.java | 26 +- .../core/client/model/ModelSickBlaze.java | 26 +- .../core/client/model/ModelStaballoyConstruct.java | 29 +- .../core/client/model/tabula/ModelTabulaBase.java | 8 +- .../client/renderer/CustomItemBlockRenderer.java | 12 +- .../client/renderer/CustomOreBlockRenderer.java | 1146 +++++----- .../core/client/renderer/RenderBatKing.java | 112 +- .../core/client/renderer/RenderDecayChest.java | 35 +- .../core/client/renderer/RenderGiantChicken.java | 5 +- .../renderer/RenderMiningExplosivesPrimed.java | 38 +- .../core/client/renderer/RenderPlasmaBolt.java | 62 +- .../core/client/renderer/RenderPotionthrow.java | 14 +- .../core/client/renderer/RenderSickBlaze.java | 50 +- .../client/renderer/RenderStaballoyConstruct.java | 122 +- .../core/client/renderer/RenderToxinball.java | 25 +- .../renderer/particle/EntityDropParticleFX.java | 42 +- .../client/renderer/tabula/RenderTabulaBase.java | 15 +- .../core/commands/CommandDebugChunks.java | 13 +- .../commands/CommandEnableDebugWhileRunning.java | 65 +- .../java/gtPlusPlus/core/commands/CommandMath.java | 9 +- .../java/gtPlusPlus/core/common/BasePlayer.java | 81 +- .../java/gtPlusPlus/core/common/CommonProxy.java | 47 +- .../core/common/compat/COMPAT_Baubles.java | 51 +- .../core/common/compat/COMPAT_BigReactors.java | 3 +- .../common/compat/COMPAT_CompactWindmills.java | 3 +- .../core/common/compat/COMPAT_EnderIO.java | 3 +- .../core/common/compat/COMPAT_ExtraUtils.java | 3 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 9 +- .../core/common/compat/COMPAT_MorePlanets.java | 10 +- .../core/common/compat/COMPAT_OpenBlocks.java | 5 +- .../core/common/compat/COMPAT_PlayerAPI.java | 3 + .../core/common/compat/COMPAT_PneumaticCraft.java | 3 +- .../core/common/compat/COMPAT_RFTools.java | 3 +- .../core/common/compat/COMPAT_SimplyJetpacks.java | 3 +- .../core/common/compat/COMPAT_Thaumcraft.java | 22 +- .../core/common/compat/COMPAT_Witchery.java | 15 +- .../java/gtPlusPlus/core/config/ConfigHandler.java | 358 +-- .../core/container/Container_BackpackBase.java | 80 +- .../container/Container_CircuitProgrammer.java | 48 +- .../core/container/Container_DecayablesChest.java | 29 +- .../core/container/Container_EggBox.java | 29 +- .../core/container/Container_FishTrap.java | 31 +- .../core/container/Container_Grindle.java | 96 +- .../core/container/Container_HeliumGenerator.java | 52 +- .../core/container/Container_ModularityTable.java | 138 +- .../core/container/Container_PestKiller.java | 35 +- .../core/container/Container_ProjectTable.java | 86 +- .../core/container/Container_RoundRobinator.java | 22 +- .../core/container/Container_SuperJukebox.java | 46 +- .../core/container/Container_TradeTable.java | 83 +- .../container/Container_VolumetricFlaskSetter.java | 49 +- .../core/container/box/LunchBoxContainer.java | 10 +- .../core/container/box/MagicBagContainer.java | 10 +- .../core/container/box/ToolBoxContainer.java | 10 +- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 15 +- .../creative/tabs/MiscUtilCreativeTabBlock.java | 5 +- .../core/entity/EntityPrimedMiningExplosive.java | 26 +- .../gtPlusPlus/core/entity/EntityTeleportFX.java | 25 +- .../core/entity/EntityTeslaTowerLightning.java | 25 +- .../core/entity/InternalEntityRegistry.java | 84 +- .../entity/ai/batking/EntityAIBatKingAttack.java | 111 +- .../core/entity/item/ItemEntityGiantEgg.java | 26 +- .../core/entity/monster/EntityBatKing.java | 135 +- .../entity/monster/EntityGiantChickenBase.java | 19 +- .../core/entity/monster/EntitySickBlaze.java | 40 +- .../entity/monster/EntityStaballoyConstruct.java | 39 +- .../projectile/EntityHydrofluoricAcidPotion.java | 23 +- .../entity/projectile/EntityLightningAttack.java | 19 +- .../projectile/EntitySulfuricAcidPotion.java | 23 +- .../entity/projectile/EntityThrowableBomb.java | 29 +- .../core/entity/projectile/EntityToxinball.java | 42 +- .../entity/projectile/EntityToxinballSmall.java | 18 +- .../gtPlusPlus/core/fluids/BlockFluidBase.java | 16 +- .../java/gtPlusPlus/core/fluids/FactoryFluid.java | 20 +- .../java/gtPlusPlus/core/fluids/FluidFactory.java | 75 +- .../core/fluids/FluidRegistryHandler.java | 27 +- .../core/fluids/ItemGenericFluidBucket.java | 33 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 15 +- .../java/gtPlusPlus/core/gui/beta/Gui_Types.java | 1 + .../java/gtPlusPlus/core/gui/beta/MU_GuiId.java | 1 + .../gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 38 +- .../gtPlusPlus/core/gui/item/GuiBaseGrindle.java | 104 +- .../gtPlusPlus/core/gui/item/GuiScreenGrindle.java | 59 +- .../gtPlusPlus/core/gui/item/box/GuiBaseBox.java | 29 +- .../gtPlusPlus/core/gui/item/box/LunchBoxGui.java | 4 +- .../gtPlusPlus/core/gui/item/box/MagicBagGui.java | 4 +- .../gtPlusPlus/core/gui/item/box/ToolBoxGui.java | 4 +- .../core/gui/machine/GUI_CircuitProgrammer.java | 15 +- .../core/gui/machine/GUI_DecayablesChest.java | 15 +- .../gtPlusPlus/core/gui/machine/GUI_EggBox.java | 21 +- .../gtPlusPlus/core/gui/machine/GUI_FishTrap.java | 15 +- .../core/gui/machine/GUI_HeliumGenerator.java | 15 +- .../core/gui/machine/GUI_ModularityTable.java | 25 +- .../core/gui/machine/GUI_PestKiller.java | 40 +- .../core/gui/machine/GUI_ProjectTable.java | 17 +- .../core/gui/machine/GUI_RoundRobinator.java | 59 +- .../core/gui/machine/GUI_ScrollTest.java | 38 +- .../core/gui/machine/GUI_SuperJukebox.java | 18 +- .../core/gui/machine/GUI_TradeTable.java | 21 +- .../gui/machine/GUI_VolumetricFlaskSetter.java | 26 +- .../gtPlusPlus/core/gui/widget/GuiValueField.java | 46 +- .../core/handler/AchievementHandler.java | 193 +- .../java/gtPlusPlus/core/handler/BookHandler.java | 727 +++--- .../core/handler/BurnableFuelHandler.java | 5 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 31 +- .../java/gtPlusPlus/core/handler/GuiHandler.java | 45 +- .../java/gtPlusPlus/core/handler/MobMentality.java | 10 +- .../gtPlusPlus/core/handler/OldCircuitHandler.java | 8 +- .../gtPlusPlus/core/handler/PacketHandler.java | 26 +- .../core/handler/Recipes/DecayableRecipe.java | 6 +- .../handler/StopAnnoyingFuckingAchievements.java | 9 +- .../core/handler/events/BlockEventHandler.java | 117 +- .../core/handler/events/CustomMovementHandler.java | 17 +- .../handler/events/EnderDragonDeathHandler.java | 24 +- .../core/handler/events/EntityDeathHandler.java | 50 +- .../handler/events/GeneralTooltipEventHandler.java | 21 +- .../core/handler/events/LoginEventHandler.java | 73 +- .../core/handler/events/MissingMappingsEvent.java | 10 +- .../events/PickaxeBlockBreakEventHandler.java | 26 +- .../handler/events/PlayerSleepEventHandler.java | 29 +- .../core/handler/events/PlayerTickHandler.java | 3 +- .../core/handler/events/SneakManager.java | 5 +- .../handler/events/UnbreakableBlockManager.java | 39 +- .../events/ZombieBackupSpawnEventHandler.java | 19 +- .../core/handler/render/CapeHandler.java | 48 +- .../core/handler/render/FirepitModel.java | 24 +- .../core/handler/render/FirepitRender.java | 6 +- .../workbench/Workbench_CraftingHandler.java | 27 +- .../handler/workbench/Workbench_RecipeSorter.java | 2 + .../core/interfaces/IGuiManagerMiscUtils.java | 3 +- .../gtPlusPlus/core/interfaces/IItemBlueprint.java | 5 + .../core/inventories/BaseInventoryBackpack.java | 15 +- .../core/inventories/BaseInventoryGrindle.java | 19 +- .../inventories/InventoryCircuitProgrammer.java | 14 +- .../core/inventories/InventoryFishTrap.java | 11 +- .../core/inventories/InventoryHeliumGenerator.java | 11 +- .../core/inventories/InventoryPestKiller.java | 11 +- .../core/inventories/InventoryWorkbenchChest.java | 11 +- .../inventories/InventoryWorkbenchCrafting.java | 11 +- .../InventoryWorkbenchHoloCrafting.java | 40 +- .../inventories/InventoryWorkbenchHoloSlots.java | 92 +- .../core/inventories/InventoryWorkbenchTools.java | 14 +- .../InventoryWorkbenchToolsElectric.java | 18 +- .../inventories/Inventory_DecayablesChest.java | 11 +- .../core/inventories/Inventory_EggBox.java | 11 +- .../core/inventories/Inventory_RoundRobinator.java | 11 +- .../core/inventories/Inventory_SuperJukebox.java | 11 +- .../Inventory_VolumetricFlaskSetter.java | 14 +- .../core/inventories/box/LunchBoxInventory.java | 4 +- .../core/inventories/box/MagicBagInventory.java | 4 +- .../core/inventories/box/ToolBoxInventory.java | 4 +- .../modulartable/InventoryModularMain.java | 14 +- .../modulartable/InventoryModularOutput.java | 20 +- .../projecttable/InventoryProjectMain.java | 11 +- .../projecttable/InventoryProjectOutput.java | 11 +- .../inventories/tradetable/InventoryTradeMain.java | 11 +- .../tradetable/InventoryTradeOutput.java | 11 +- src/main/java/gtPlusPlus/core/item/ModItems.java | 410 ++-- .../java/gtPlusPlus/core/item/base/BaseEuItem.java | 166 +- .../core/item/base/BaseItemBackpack.java | 15 +- .../gtPlusPlus/core/item/base/BaseItemBrain.java | 40 +- .../core/item/base/BaseItemBurnable.java | 17 +- .../core/item/base/BaseItemColourable.java | 39 +- .../core/item/base/BaseItemComponent.java | 127 +- .../core/item/base/BaseItemDamageable.java | 40 +- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 7 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 28 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 26 +- .../core/item/base/BaseItemTickable.java | 45 +- .../core/item/base/BaseItemWithCharge.java | 31 +- .../core/item/base/BaseItemWithDamageValue.java | 7 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 53 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 134 +- .../core/item/base/cell/BaseItemCell.java | 15 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 19 +- .../core/item/base/dusts/BaseItemDust.java | 11 +- .../core/item/base/dusts/BaseItemDustAbstract.java | 10 +- .../core/item/base/dusts/BaseItemDustEx.java | 19 +- .../core/item/base/dusts/BaseItemDustUnique.java | 31 +- .../item/base/dusts/decimal/BaseItemCentidust.java | 12 +- .../item/base/dusts/decimal/BaseItemDecidust.java | 12 +- .../core/item/base/foods/BaseItemFood.java | 27 +- .../core/item/base/foods/BaseItemHotFood.java | 45 +- .../core/item/base/ingots/BaseItemIngotHot.java | 23 +- .../core/item/base/ingots/BaseItemIngot_OLD.java | 19 +- .../core/item/base/itemblock/FluidItemBlock.java | 40 +- .../item/base/itemblock/ItemBlockBasicTile.java | 6 +- .../core/item/base/itemblock/ItemBlockDoor.java | 40 +- .../item/base/itemblock/ItemBlockEntityBase.java | 20 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 36 +- .../item/base/itemblock/ItemBlockGtFrameBox.java | 20 +- .../core/item/base/itemblock/ItemBlockMeta.java | 13 +- .../core/item/base/itemblock/ItemBlockNBT.java | 30 +- .../core/item/base/itemblock/ItemBlockOre.java | 52 +- .../base/itemblock/ItemBlockRoundRobinator.java | 9 +- .../core/item/base/itemblock/ItemBlockSpawner.java | 15 +- .../core/item/base/misc/BaseItemMisc.java | 39 +- .../core/item/base/misc/BaseItemParticle.java | 10 +- .../core/item/base/ore/BaseItemMilledOre.java | 3 +- .../core/item/base/ore/BaseOreComponent.java | 79 +- .../core/item/base/plates/BaseItemPlate.java | 17 +- .../core/item/base/plates/BaseItemPlateHeavy.java | 5 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 34 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 32 +- .../core/item/bauble/BatteryPackBaseBauble.java | 80 +- .../core/item/bauble/ElectricBaseBauble.java | 98 +- .../core/item/bauble/FireProtectionBauble.java | 27 +- .../core/item/bauble/HealthBoostBauble.java | 9 +- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 230 +- .../core/item/bauble/MonsterKillerBaseBauble.java | 44 +- .../core/item/chemistry/AgriculturalChem.java | 130 +- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 143 +- .../core/item/chemistry/GenericChem.java | 658 +++--- .../core/item/chemistry/IonParticles.java | 32 +- .../core/item/chemistry/MilledOreProcessing.java | 284 +-- .../core/item/chemistry/NuclearChem.java | 42 +- .../core/item/chemistry/RocketFuels.java | 744 +++---- .../core/item/chemistry/StandardBaseParticles.java | 49 +- .../chemistry/general/ItemGenericChemBase.java | 57 +- .../chemistry/general/ItemNuclearChemBase.java | 17 +- .../item/circuit/GTPP_IntegratedCircuit_Item.java | 72 +- .../core/item/crafting/ItemDummyResearch.java | 21 +- .../gtPlusPlus/core/item/effects/RarityEffect.java | 21 +- .../gtPlusPlus/core/item/effects/RarityEpic.java | 5 +- .../gtPlusPlus/core/item/effects/RarityRare.java | 5 +- .../core/item/effects/RarityUncommon.java | 5 +- .../core/item/food/BaseItemMetaFood.java | 108 +- .../core/item/general/BaseItemGrindle.java | 16 +- .../core/item/general/BedLocator_Base.java | 27 +- .../gtPlusPlus/core/item/general/BufferCore.java | 39 +- .../core/item/general/ItemAirFilter.java | 10 +- .../core/item/general/ItemAreaClear.java | 26 +- .../core/item/general/ItemBasicFirestarter.java | 21 +- .../item/general/ItemBasicScrubberTurbine.java | 10 +- .../core/item/general/ItemBlueprint.java | 66 +- .../core/item/general/ItemCloakingDevice.java | 119 +- .../core/item/general/ItemControlCore.java | 26 +- .../core/item/general/ItemCreativeTab.java | 10 +- .../gtPlusPlus/core/item/general/ItemEmpty.java | 3 +- .../core/item/general/ItemGemShards.java | 31 +- .../core/item/general/ItemGenericToken.java | 31 +- .../gtPlusPlus/core/item/general/ItemGiantEgg.java | 76 +- .../core/item/general/ItemHalfCompleteCasings.java | 18 +- .../core/item/general/ItemHealingDevice.java | 122 +- .../core/item/general/ItemLavaFilter.java | 12 +- .../core/item/general/ItemMagicFeather.java | 43 +- .../core/item/general/ItemSlowBuildingRing.java | 35 +- .../core/item/general/ItemSunnariumBit.java | 5 +- .../core/item/general/NuclearFuelRodBase.java | 23 +- .../core/item/general/RF2EU_Battery.java | 102 +- .../core/item/general/books/ItemBaseBook.java | 41 +- .../item/general/capture/ItemEntityCatcher.java | 40 +- .../item/general/chassis/ItemBoilerChassis.java | 10 +- .../item/general/chassis/ItemDehydratorCoil.java | 32 +- .../general/chassis/ItemDehydratorCoilWire.java | 32 +- .../core/item/general/fuelrods/FuelRod_Base.java | 45 +- .../general/rfchargingpack/ChargingPackBase.java | 40 +- .../item/general/spawn/ItemCustomSpawnEgg.java | 68 +- .../throwables/ItemHydrofluoricAcidPotion.java | 9 +- .../general/throwables/ItemSulfuricAcidPotion.java | 9 +- .../item/general/throwables/ItemThrowableBomb.java | 32 +- .../java/gtPlusPlus/core/item/init/ItemsFoods.java | 79 +- .../core/item/materials/DustDecayable.java | 22 +- .../core/item/tool/misc/ConnectedBlockFinder.java | 29 +- .../core/item/tool/misc/DebugScanner.java | 26 +- .../core/item/tool/misc/FakeGregtechTool.java | 10 +- .../core/item/tool/misc/GregtechPump.java | 339 ++- .../core/item/tool/misc/SandstoneHammer.java | 15 +- .../core/item/tool/misc/box/AutoLunchBox.java | 8 +- .../core/item/tool/misc/box/BaseBoxItem.java | 23 +- .../core/item/tool/misc/box/ContainerBoxBase.java | 119 +- .../item/tool/misc/box/CustomBoxInventory.java | 12 +- .../core/item/tool/misc/box/MagicToolBag.java | 5 +- .../core/item/tool/misc/box/UniversalToolBox.java | 6 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 89 +- .../core/item/tool/staballoy/MultiSpadeBase.java | 26 +- .../core/item/tool/staballoy/StaballoyAxe.java | 77 +- .../core/item/tool/staballoy/StaballoyPickaxe.java | 137 +- .../core/item/tool/staballoy/StaballoySpade.java | 99 +- .../core/item/wearable/armour/ArmourLoader.java | 13 +- .../item/wearable/armour/hazmat/ArmourHazmat.java | 22 +- .../wearable/armour/tinfoil/ArmourTinFoilHat.java | 30 +- .../core/item/wearable/base/BaseItemWearable.java | 8 +- .../item/wearable/hazmat/ItemArmorHazmatEx.java | 21 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 102 +- src/main/java/gtPlusPlus/core/lib/LoadedMods.java | 7 +- .../java/gtPlusPlus/core/lib/VanillaColours.java | 4 +- src/main/java/gtPlusPlus/core/material/ALLOY.java | 635 +++--- .../java/gtPlusPlus/core/material/ELEMENT.java | 294 +-- .../gtPlusPlus/core/material/MISC_MATERIALS.java | 88 +- .../java/gtPlusPlus/core/material/Material.java | 449 ++-- .../core/material/MaterialGenerator.java | 93 +- .../gtPlusPlus/core/material/MaterialStack.java | 12 +- .../java/gtPlusPlus/core/material/NONMATERIAL.java | 8 +- src/main/java/gtPlusPlus/core/material/ORES.java | 630 +++--- .../java/gtPlusPlus/core/material/Particle.java | 21 +- .../core/material/gregtech/CustomGTMaterials.java | 94 +- .../core/material/nuclear/FLUORIDES.java | 116 +- .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 153 +- .../core/material/state/MaterialState.java | 2 + .../handler/AbstractClientMessageHandler.java | 3 +- .../network/handler/AbstractMessageHandler.java | 6 +- .../handler/AbstractServerMessageHandler.java | 3 +- .../network/packet/Packet_VolumetricFlaskGui.java | 7 +- .../network/packet/Packet_VolumetricFlaskGui2.java | 7 +- .../java/gtPlusPlus/core/players/FakeFarmer.java | 15 +- .../java/gtPlusPlus/core/proxy/ClientProxy.java | 88 +- .../core/recipe/Gregtech_Recipe_Adder.java | 55 +- .../core/recipe/LOADER_Machine_Components.java | 33 +- .../gtPlusPlus/core/recipe/RECIPES_Extruder.java | 31 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 1531 +++++-------- .../gtPlusPlus/core/recipe/RECIPES_General.java | 290 +-- .../core/recipe/RECIPES_LaserEngraver.java | 240 +- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 14 +- .../core/recipe/RECIPES_MachineComponents.java | 3 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 2131 ++++++------------ .../core/recipe/RECIPES_Old_Circuits.java | 324 +-- .../core/recipe/RECIPES_RareEarthProcessing.java | 43 +- .../core/recipe/RECIPES_SeleniumProcessing.java | 171 +- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 3 +- .../java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 7 +- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 3 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 17 +- .../java/gtPlusPlus/core/recipe/common/CI.java | 291 +-- .../java/gtPlusPlus/core/slots/SlotBuzzSaw.java | 10 +- .../core/slots/SlotChemicalPlantInput.java | 5 +- .../java/gtPlusPlus/core/slots/SlotCrafting.java | 36 +- .../core/slots/SlotCraftingNoCollect.java | 56 +- .../java/gtPlusPlus/core/slots/SlotDataStick.java | 5 +- src/main/java/gtPlusPlus/core/slots/SlotFrame.java | 3 +- .../java/gtPlusPlus/core/slots/SlotFuelRod.java | 5 +- .../java/gtPlusPlus/core/slots/SlotGtTool.java | 5 +- .../gtPlusPlus/core/slots/SlotGtToolElectric.java | 15 +- .../core/slots/SlotIntegratedCircuit.java | 10 +- .../gtPlusPlus/core/slots/SlotItemBackpackInv.java | 4 +- .../java/gtPlusPlus/core/slots/SlotLunchBox.java | 5 +- .../gtPlusPlus/core/slots/SlotMagicToolBag.java | 5 +- .../gtPlusPlus/core/slots/SlotModularBauble.java | 3 +- .../core/slots/SlotModularBaubleUpgrades.java | 16 +- .../java/gtPlusPlus/core/slots/SlotOutput.java | 27 +- src/main/java/gtPlusPlus/core/slots/SlotRTG.java | 3 +- .../java/gtPlusPlus/core/slots/SlotToolBox.java | 23 +- .../gtPlusPlus/core/slots/SlotVolumetricFlask.java | 3 +- .../core/tileentities/ModTileEntities.java | 4 +- .../core/tileentities/base/TileBasicTank.java | 144 +- .../core/tileentities/base/TileEntityBase.java | 238 +- .../core/tileentities/base/TilePoweredGT.java | 1436 +++--------- .../general/TileEntityCircuitProgrammer.java | 14 +- .../general/TileEntityDecayablesChest.java | 33 +- .../tileentities/general/TileEntityEggBox.java | 33 +- .../tileentities/general/TileEntityFirepit.java | 1 + .../tileentities/general/TileEntityFishTrap.java | 91 +- .../general/TileEntityHeliumGenerator.java | 9 +- .../general/TileEntityInfiniteFluid.java | 13 +- .../general/TileEntityPlayerDoorBase.java | 13 +- .../tileentities/general/TileEntityReverter.java | 64 +- .../general/TileEntityVolumetricFlaskSetter.java | 30 +- .../general/TileEntityXpConverter.java | 33 +- .../redstone/TileEntityRedstoneHandler.java | 73 +- .../machines/TileEntityAdvPooCollector.java | 22 +- .../machines/TileEntityBaseFluidCollector.java | 34 +- .../machines/TileEntityModularityTable.java | 74 +- .../machines/TileEntityPestKiller.java | 37 +- .../machines/TileEntityPooCollector.java | 9 +- .../machines/TileEntityProjectTable.java | 272 ++- .../machines/TileEntityRoundRobinator.java | 35 +- .../machines/TileEntityTradeTable.java | 7 +- .../gtPlusPlus/core/util/MovingAverageLong.java | 3 + src/main/java/gtPlusPlus/core/util/Utils.java | 224 +- src/main/java/gtPlusPlus/core/util/data/AES.java | 4 +- .../java/gtPlusPlus/core/util/data/ArrayUtils.java | 16 +- .../java/gtPlusPlus/core/util/data/EnumUtils.java | 9 +- .../java/gtPlusPlus/core/util/data/FileUtils.java | 14 +- .../gtPlusPlus/core/util/data/LocaleUtils.java | 19 +- .../gtPlusPlus/core/util/data/StringUtils.java | 5 +- .../gtPlusPlus/core/util/debug/DEBUG_INIT.java | 14 +- .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 12 +- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 138 +- .../core/util/debug/DEBUG_ScreenOverlay.java | 24 +- .../core/util/debug/DEBUG_TimerThread.java | 32 +- .../core/util/debug/UtilityGL11Debug.java | 2323 +++++++++++--------- .../java/gtPlusPlus/core/util/math/MathUtils.java | 136 +- .../core/util/minecraft/EnchantingUtils.java | 3 +- .../core/util/minecraft/EnergyUtils.java | 12 +- .../core/util/minecraft/EntityUtils.java | 193 +- .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 274 +-- .../gtPlusPlus/core/util/minecraft/FoodUtils.java | 3 +- .../core/util/minecraft/HazmatUtils.java | 87 +- .../core/util/minecraft/InventoryUtils.java | 35 +- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 277 +-- .../gtPlusPlus/core/util/minecraft/LangUtils.java | 27 +- .../core/util/minecraft/MaterialUtils.java | 205 +- .../core/util/minecraft/MiningUtils.java | 63 +- .../core/util/minecraft/ModularArmourUtils.java | 9 +- .../gtPlusPlus/core/util/minecraft/NBTUtils.java | 90 +- .../core/util/minecraft/OreDictUtils.java | 1 + .../core/util/minecraft/PlayerUtils.java | 31 +- .../core/util/minecraft/RecipeUtils.java | 295 +-- .../core/util/minecraft/ShapelessUtils.java | 4 +- .../util/minecraft/gregtech/PollutionUtils.java | 10 +- .../gregtech/material/MaterialBuilder.java | 291 +-- .../gregtech/recipehandlers/GregtechRecipe.java | 3 +- .../core/util/minecraft/network/CustomPacket.java | 8 +- .../core/util/minecraft/network/PacketBuilder.java | 3 +- .../util/minecraft/network/PacketDispatcher.java | 36 +- .../core/util/minecraft/network/PacketHandler.java | 18 +- .../util/minecraft/network/PacketTileEntity.java | 14 +- .../minecraft/particles/BlockBreakParticles.java | 3 +- .../particles/EntityParticleFXMysterious.java | 11 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 40 +- .../core/util/reflect/AddGregtechRecipe.java | 158 +- .../gtPlusPlus/core/util/reflect/ProxyFinder.java | 3 +- .../core/util/reflect/ReflectionUtils.java | 134 +- .../gtPlusPlus/core/util/sys/KeyboardUtils.java | 5 +- src/main/java/gtPlusPlus/core/util/sys/Log.java | 1 + .../java/gtPlusPlus/core/util/sys/SystemUtils.java | 4 +- .../core/world/explosions/ExplosionHandler.java | 22 +- .../core/world/explosions/MiningExplosion.java | 64 +- 466 files changed, 14482 insertions(+), 18410 deletions(-) (limited to 'src/main/java/gtPlusPlus/core') 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 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[] 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 aMetaBlob = new CubicObject( - 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 aMetaBlob2 = new CubicObject(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(); } 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 BlockBa