From 7d1f51a8937e0a86486267437d444696e81e8aa0 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:04:28 +0200 Subject: Buildscript + Spotless (#318) * Convert AES.java to readable class * Buildscript * Spotless --- src/main/java/gtPlusPlus/core/block/ModBlocks.java | 266 +- .../gtPlusPlus/core/block/base/AdvancedBlock.java | 63 +- .../gtPlusPlus/core/block/base/BasicBlock.java | 134 +- .../core/block/base/BasicTileBlockWithTooltip.java | 576 +- .../gtPlusPlus/core/block/base/BlockBaseFluid.java | 147 +- .../core/block/base/BlockBaseModular.java | 399 +- .../gtPlusPlus/core/block/base/BlockBaseNBT.java | 114 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 418 +- .../java/gtPlusPlus/core/block/base/MetaBlock.java | 45 +- .../core/block/base/MultiTextureBlock.java | 48 +- .../block/general/BlockCompressedObsidian.java | 149 +- .../gtPlusPlus/core/block/general/BlockNet.java | 53 +- .../core/block/general/BlockSuperLight.java | 384 +- .../core/block/general/BlockTankXpConverter.java | 350 +- .../gtPlusPlus/core/block/general/FirePit.java | 429 +- .../core/block/general/FluidTankInfinite.java | 208 +- .../gtPlusPlus/core/block/general/HellFire.java | 1088 +-- .../gtPlusPlus/core/block/general/LightGlass.java | 233 +- .../core/block/general/MiningExplosives.java | 325 +- .../gtPlusPlus/core/block/general/PlayerDoors.java | 895 +-- .../block/general/antigrief/BlockWitherProof.java | 308 +- .../core/block/general/antigrief/TowerDevice.java | 519 +- .../block/general/fluids/BlockFluidSludge.java | 93 +- .../general/redstone/BlockGenericRedstone.java | 689 +- .../redstone/BlockGenericRedstoneDetector.java | 226 +- .../redstone/BlockGenericRedstoneEmitter.java | 4 +- .../general/redstone/BlockGenericRedstoneTest.java | 359 +- .../core/block/machine/BlockGtFrameBox.java | 67 +- .../core/block/machine/CircuitProgrammer.java | 279 +- .../core/block/machine/DecayablesChest.java | 387 +- .../java/gtPlusPlus/core/block/machine/EggBox.java | 306 +- .../gtPlusPlus/core/block/machine/FishTrap.java | 281 +- .../core/block/machine/HeliumGenerator.java | 147 +- .../block/machine/Machine_ModularityTable.java | 162 +- .../core/block/machine/Machine_PestKiller.java | 233 +- .../core/block/machine/Machine_PooCollector.java | 319 +- .../core/block/machine/Machine_ProjectTable.java | 294 +- .../core/block/machine/Machine_RoundRobinator.java | 227 +- .../core/block/machine/Machine_SuperJukebox.java | 1061 ++- .../core/block/machine/Machine_TradeTable.java | 132 +- .../core/block/machine/Machine_WireiusDeletus.java | 3 +- .../core/block/machine/VolumetricFlaskSetter.java | 285 +- .../block/machine/bedrock/Mining_Head_Fake.java | 298 +- .../block/machine/bedrock/Mining_Pipe_Fake.java | 234 +- .../core/chunkloading/GTPP_ChunkManager.java | 147 +- .../gtPlusPlus/core/client/CustomTextureSet.java | 37 +- .../gtPlusPlus/core/client/model/ModelBatKing.java | 59 +- .../core/client/model/ModelDecayChest.java | 11 +- .../gtPlusPlus/core/client/model/ModelEggBox.java | 50 +- .../core/client/model/ModelGiantChicken.java | 61 +- .../core/client/model/ModelSickBlaze.java | 58 +- .../core/client/model/ModelStaballoyConstruct.java | 66 +- .../core/client/model/tabula/ModelTabulaBase.java | 16 +- .../client/renderer/CustomItemBlockRenderer.java | 99 +- .../client/renderer/CustomOreBlockRenderer.java | 3572 +++++---- .../core/client/renderer/RenderBatKing.java | 292 +- .../core/client/renderer/RenderDecayChest.java | 118 +- .../core/client/renderer/RenderGiantChicken.java | 5 +- .../renderer/RenderMiningExplosivesPrimed.java | 196 +- .../core/client/renderer/RenderPlasmaBolt.java | 317 +- .../core/client/renderer/RenderPotionthrow.java | 42 +- .../core/client/renderer/RenderSickBlaze.java | 76 +- .../client/renderer/RenderStaballoyConstruct.java | 293 +- .../core/client/renderer/RenderToxinball.java | 47 +- .../renderer/particle/EntityDropParticleFX.java | 175 +- .../client/renderer/tabula/RenderTabulaBase.java | 59 +- .../core/commands/CommandDebugChunks.java | 266 +- .../commands/CommandEnableDebugWhileRunning.java | 451 +- .../java/gtPlusPlus/core/commands/CommandMath.java | 166 +- .../gtPlusPlus/core/commands/CommandUtils.java | 20 +- .../java/gtPlusPlus/core/common/BasePlayer.java | 402 +- .../java/gtPlusPlus/core/common/CommonProxy.java | 515 +- .../core/common/compat/COMPAT_Baubles.java | 89 +- .../core/common/compat/COMPAT_BigReactors.java | 21 +- .../common/compat/COMPAT_CompactWindmills.java | 372 +- .../core/common/compat/COMPAT_EnderIO.java | 33 +- .../core/common/compat/COMPAT_ExtraUtils.java | 47 +- .../core/common/compat/COMPAT_HarvestCraft.java | 13 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 108 +- .../core/common/compat/COMPAT_MorePlanets.java | 56 +- .../core/common/compat/COMPAT_OpenBlocks.java | 35 +- .../core/common/compat/COMPAT_PlayerAPI.java | 55 +- .../core/common/compat/COMPAT_PneumaticCraft.java | 17 +- .../core/common/compat/COMPAT_RFTools.java | 18 +- .../core/common/compat/COMPAT_Railcraft.java | 12 +- .../core/common/compat/COMPAT_SimplyJetpacks.java | 18 +- .../core/common/compat/COMPAT_Thaumcraft.java | 74 +- .../core/common/compat/COMPAT_Witchery.java | 29 +- .../java/gtPlusPlus/core/config/ConfigHandler.java | 754 +- .../core/container/Container_BackpackBase.java | 381 +- .../container/Container_CircuitProgrammer.java | 352 +- .../core/container/Container_DecayablesChest.java | 238 +- .../core/container/Container_EggBox.java | 238 +- .../core/container/Container_FishTrap.java | 247 +- .../core/container/Container_Grindle.java | 305 +- .../core/container/Container_HeliumGenerator.java | 341 +- .../core/container/Container_ModularityTable.java | 443 +- .../core/container/Container_PestKiller.java | 257 +- .../core/container/Container_ProjectTable.java | 405 +- .../core/container/Container_RoundRobinator.java | 442 +- .../core/container/Container_SuperJukebox.java | 452 +- .../core/container/Container_TradeTable.java | 414 +- .../container/Container_VolumetricFlaskSetter.java | 326 +- .../core/container/box/LunchBoxContainer.java | 12 +- .../core/container/box/MagicBagContainer.java | 12 +- .../core/container/box/ToolBoxContainer.java | 8 +- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 50 +- .../creative/tabs/MiscUtilCreativeTabBlock.java | 26 +- .../creative/tabs/MiscUtilCreativeTabMachines.java | 18 +- .../creative/tabs/MiscUtilCreativeTabMisc.java | 17 +- .../creative/tabs/MiscUtilCreativeTabOther.java | 17 +- .../creative/tabs/MiscUtilCreativeTabTools.java | 17 +- .../core/entity/EntityPrimedMiningExplosive.java | 597 +- .../gtPlusPlus/core/entity/EntityTeleportFX.java | 460 +- .../core/entity/EntityTeslaTowerLightning.java | 313 +- .../core/entity/InternalEntityRegistry.java | 168 +- .../entity/ai/batking/EntityAIBatKingAttack.java | 810 +- .../core/entity/item/ItemEntityGiantEgg.java | 210 +- .../core/entity/monster/EntityBatKing.java | 1358 ++-- .../entity/monster/EntityGiantChickenBase.java | 285 +- .../core/entity/monster/EntitySickBlaze.java | 427 +- .../entity/monster/EntityStaballoyConstruct.java | 1136 +-- .../projectile/EntityHydrofluoricAcidPotion.java | 237 +- .../entity/projectile/EntityLightningAttack.java | 93 +- .../projectile/EntitySulfuricAcidPotion.java | 220 +- .../entity/projectile/EntityThrowableBomb.java | 410 +- .../core/entity/projectile/EntityToxinball.java | 627 +- .../entity/projectile/EntityToxinballSmall.java | 147 +- .../gtPlusPlus/core/fluids/BlockFluidBase.java | 167 +- .../java/gtPlusPlus/core/fluids/FactoryFluid.java | 105 +- .../java/gtPlusPlus/core/fluids/FluidFactory.java | 349 +- .../java/gtPlusPlus/core/fluids/FluidPackage.java | 83 +- .../core/fluids/FluidRegistryHandler.java | 80 +- .../core/fluids/ItemGenericFluidBucket.java | 582 +- .../gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java | 11 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 96 +- .../java/gtPlusPlus/core/gui/beta/Gui_Types.java | 11 +- .../java/gtPlusPlus/core/gui/beta/MU_GuiId.java | 43 +- .../gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 205 +- .../gtPlusPlus/core/gui/item/GuiBaseGrindle.java | 1125 +-- .../gtPlusPlus/core/gui/item/GuiScreenGrindle.java | 957 +-- .../gtPlusPlus/core/gui/item/box/GuiBaseBox.java | 198 +- .../gtPlusPlus/core/gui/item/box/LunchBoxGui.java | 6 +- .../gtPlusPlus/core/gui/item/box/MagicBagGui.java | 6 +- .../gtPlusPlus/core/gui/item/box/ToolBoxGui.java | 6 +- .../core/gui/machine/GUI_CircuitProgrammer.java | 64 +- .../core/gui/machine/GUI_DecayablesChest.java | 90 +- .../gtPlusPlus/core/gui/machine/GUI_EggBox.java | 89 +- .../gtPlusPlus/core/gui/machine/GUI_FishTrap.java | 90 +- .../core/gui/machine/GUI_HeliumGenerator.java | 53 +- .../core/gui/machine/GUI_ModularityTable.java | 132 +- .../core/gui/machine/GUI_PestKiller.java | 257 +- .../core/gui/machine/GUI_ProjectTable.java | 98 +- .../core/gui/machine/GUI_RoundRobinator.java | 201 +- .../core/gui/machine/GUI_ScrollTest.java | 146 +- .../core/gui/machine/GUI_SuperJukebox.java | 135 +- .../core/gui/machine/GUI_TradeTable.java | 75 +- .../gui/machine/GUI_VolumetricFlaskSetter.java | 473 +- .../gtPlusPlus/core/gui/widget/GuiValueField.java | 172 +- .../core/handler/AchievementHandler.java | 787 +- .../java/gtPlusPlus/core/handler/BookHandler.java | 774 +- .../core/handler/BurnableFuelHandler.java | 45 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 500 +- .../core/handler/COMPAT_IntermodStaging.java | 124 +- .../gtPlusPlus/core/handler/CraftingManager.java | 16 +- .../gtPlusPlus/core/handler/EnumHelperHandler.java | 18 +- .../java/gtPlusPlus/core/handler/GuiHandler.java | 383 +- .../java/gtPlusPlus/core/handler/MobMentality.java | 85 +- .../gtPlusPlus/core/handler/OldCircuitHandler.java | 119 +- .../gtPlusPlus/core/handler/PacketHandler.java | 132 +- .../core/handler/Recipes/DecayableRecipe.java | 50 +- .../handler/Recipes/LateRegistrationHandler.java | 33 +- .../core/handler/Recipes/RegistrationHandler.java | 31 +- .../handler/StopAnnoyingFuckingAchievements.java | 66 +- .../core/handler/events/BlockEventHandler.java | 411 +- .../core/handler/events/CustomMovementHandler.java | 279 +- .../handler/events/EnderDragonDeathHandler.java | 95 +- .../core/handler/events/EntityDeathHandler.java | 211 +- .../handler/events/GeneralTooltipEventHandler.java | 228 +- .../core/handler/events/LoginEventHandler.java | 225 +- .../core/handler/events/MissingMappingsEvent.java | 81 +- .../events/PickaxeBlockBreakEventHandler.java | 132 +- .../handler/events/PlayerSleepEventHandler.java | 168 +- .../core/handler/events/PlayerTickHandler.java | 12 +- .../core/handler/events/SneakManager.java | 241 +- .../handler/events/UnbreakableBlockManager.java | 242 +- .../events/ZombieBackupSpawnEventHandler.java | 82 +- .../core/handler/render/CapeHandler.java | 201 +- .../core/handler/render/FirepitModel.java | 223 +- .../core/handler/render/FirepitRender.java | 89 +- .../workbench/Workbench_CraftingHandler.java | 340 +- .../handler/workbench/Workbench_RecipeSorter.java | 65 +- .../gtPlusPlus/core/interfaces/IGuiManager.java | 10 +- .../core/interfaces/IGuiManagerMiscUtils.java | 2 +- .../gtPlusPlus/core/interfaces/IItemBlueprint.java | 79 +- .../core/inventories/BaseInventoryBackpack.java | 435 +- .../core/inventories/BaseInventoryGrindle.java | 420 +- .../inventories/InventoryCircuitProgrammer.java | 311 +- .../core/inventories/InventoryFishTrap.java | 318 +- .../core/inventories/InventoryHeliumGenerator.java | 318 +- .../core/inventories/InventoryPestKiller.java | 318 +- .../core/inventories/InventoryWorkbenchChest.java | 333 +- .../inventories/InventoryWorkbenchCrafting.java | 359 +- .../InventoryWorkbenchHoloCrafting.java | 294 +- .../inventories/InventoryWorkbenchHoloSlots.java | 435 +- .../core/inventories/InventoryWorkbenchTools.java | 332 +- .../InventoryWorkbenchToolsElectric.java | 340 +- .../inventories/Inventory_DecayablesChest.java | 318 +- .../core/inventories/Inventory_EggBox.java | 318 +- .../core/inventories/Inventory_RoundRobinator.java | 311 +- .../core/inventories/Inventory_SuperJukebox.java | 311 +- .../Inventory_VolumetricFlaskSetter.java | 311 +- .../core/inventories/box/LunchBoxInventory.java | 15 +- .../core/inventories/box/MagicBagInventory.java | 15 +- .../core/inventories/box/ToolBoxInventory.java | 15 +- .../modulartable/InventoryModularMain.java | 361 +- .../modulartable/InventoryModularOutput.java | 359 +- .../projecttable/InventoryProjectMain.java | 359 +- .../projecttable/InventoryProjectOutput.java | 333 +- .../inventories/tradetable/InventoryTradeMain.java | 359 +- .../tradetable/InventoryTradeOutput.java | 333 +- src/main/java/gtPlusPlus/core/item/ModItems.java | 2664 ++++--- .../java/gtPlusPlus/core/item/base/BaseEuItem.java | 1197 +-- .../core/item/base/BaseItemBackpack.java | 149 +- .../gtPlusPlus/core/item/base/BaseItemBrain.java | 167 +- .../core/item/base/BaseItemBurnable.java | 75 +- .../core/item/base/BaseItemColourable.java | 169 +- .../core/item/base/BaseItemComponent.java | 2048 +++-- .../core/item/base/BaseItemDamageable.java | 368 +- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 34 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 193 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 137 +- .../core/item/base/BaseItemTickable.java | 645 +- .../core/item/base/BaseItemWithCharge.java | 113 +- .../core/item/base/BaseItemWithDamageValue.java | 38 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 458 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 535 +- .../core/item/base/bolts/BaseItemBolt.java | 8 +- .../core/item/base/cell/BaseItemCell.java | 97 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 126 +- .../core/item/base/dusts/BaseItemDust.java | 267 +- .../core/item/base/dusts/BaseItemDustAbstract.java | 68 +- .../core/item/base/dusts/BaseItemDustEx.java | 209 +- .../core/item/base/dusts/BaseItemDustUnique.java | 288 +- .../item/base/dusts/decimal/BaseItemCentidust.java | 94 +- .../item/base/dusts/decimal/BaseItemDecidust.java | 94 +- .../core/item/base/foil/BaseItemFoil.java | 8 +- .../core/item/base/foods/BaseItemFood.java | 81 +- .../core/item/base/foods/BaseItemHotFood.java | 131 +- .../core/item/base/gears/BaseItemGear.java | 8 +- .../core/item/base/gears/BaseItemSmallGear.java | 8 +- .../core/item/base/ingots/BaseItemIngot.java | 23 +- .../core/item/base/ingots/BaseItemIngotHot.java | 193 +- .../core/item/base/ingots/BaseItemIngot_OLD.java | 173 +- .../core/item/base/itemblock/FluidItemBlock.java | 111 +- .../item/base/itemblock/ItemBlockBasicTile.java | 106 +- .../core/item/base/itemblock/ItemBlockDoor.java | 191 +- .../item/base/itemblock/ItemBlockEntityBase.java | 57 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 337 +- .../item/base/itemblock/ItemBlockGtFrameBox.java | 149 +- .../core/item/base/itemblock/ItemBlockMeta.java | 173 +- .../core/item/base/itemblock/ItemBlockNBT.java | 180 +- .../core/item/base/itemblock/ItemBlockOre.java | 291 +- .../base/itemblock/ItemBlockRoundRobinator.java | 202 +- .../core/item/base/itemblock/ItemBlockSpawner.java | 51 +- .../core/item/base/misc/BaseItemMisc.java | 304 +- .../core/item/base/misc/BaseItemParticle.java | 94 +- .../core/item/base/nugget/BaseItemNugget.java | 9 +- .../base/ore/BaseItemCentrifugedCrushedOre.java | 8 +- .../core/item/base/ore/BaseItemCrushedOre.java | 8 +- .../core/item/base/ore/BaseItemImpureDust.java | 8 +- .../core/item/base/ore/BaseItemMilledOre.java | 26 +- .../item/base/ore/BaseItemPurifiedCrushedOre.java | 8 +- .../core/item/base/ore/BaseItemPurifiedDust.java | 8 +- .../core/item/base/ore/BaseOreComponent.java | 501 +- .../core/item/base/plates/BaseItemPlate.java | 22 +- .../core/item/base/plates/BaseItemPlateDouble.java | 22 +- .../core/item/base/plates/BaseItemPlateHeavy.java | 70 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 157 +- .../core/item/base/rings/BaseItemRing.java | 9 +- .../core/item/base/rods/BaseItemRod.java | 9 +- .../core/item/base/rods/BaseItemRodLong.java | 17 +- .../core/item/base/rotors/BaseItemRotor.java | 8 +- .../core/item/base/screws/BaseItemScrew.java | 9 +- .../core/item/base/wire/BaseItemFineWire.java | 9 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 338 +- .../core/item/bauble/BatteryPackBaseBauble.java | 457 +- .../core/item/bauble/ElectricBaseBauble.java | 352 +- .../core/item/bauble/FireProtectionBauble.java | 234 +- .../core/item/bauble/HealthBoostBauble.java | 46 +- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 786 +- .../core/item/bauble/MonsterKillerBaseBauble.java | 298 +- .../core/item/chemistry/AgriculturalChem.java | 1196 +-- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 710 +- .../core/item/chemistry/GenericChem.java | 2366 +++--- .../core/item/chemistry/IonParticles.java | 277 +- .../core/item/chemistry/MilledOreProcessing.java | 1565 ++-- .../core/item/chemistry/NuclearChem.java | 198 +- .../gtPlusPlus/core/item/chemistry/OilChem.java | 66 +- .../core/item/chemistry/RocketFuels.java | 2223 +++--- .../core/item/chemistry/StandardBaseParticles.java | 286 +- .../chemistry/general/ItemGenericChemBase.java | 587 +- .../chemistry/general/ItemNuclearChemBase.java | 260 +- .../core/item/circuit/ItemAdvancedChip.java | 432 +- .../core/item/crafting/ItemDummyResearch.java | 169 +- .../gtPlusPlus/core/item/effects/RarityEffect.java | 32 +- .../gtPlusPlus/core/item/effects/RarityEpic.java | 28 +- .../gtPlusPlus/core/item/effects/RarityRare.java | 28 +- .../core/item/effects/RarityUncommon.java | 20 +- .../core/item/food/BaseItemMetaFood.java | 928 ++- .../core/item/general/BaseItemGrindle.java | 117 +- .../core/item/general/BedLocator_Base.java | 184 +- .../gtPlusPlus/core/item/general/BufferCore.java | 100 +- .../core/item/general/ItemAirFilter.java | 247 +- .../core/item/general/ItemAreaClear.java | 371 +- .../core/item/general/ItemBasicFirestarter.java | 157 +- .../item/general/ItemBasicScrubberTurbine.java | 272 +- .../core/item/general/ItemBlueprint.java | 516 +- .../core/item/general/ItemCloakingDevice.java | 496 +- .../core/item/general/ItemControlCore.java | 202 +- .../core/item/general/ItemCreativeTab.java | 88 +- .../gtPlusPlus/core/item/general/ItemEmpty.java | 22 +- .../core/item/general/ItemGemShards.java | 139 +- .../core/item/general/ItemGenericToken.java | 341 +- .../gtPlusPlus/core/item/general/ItemGiantEgg.java | 515 +- .../core/item/general/ItemHalfCompleteCasings.java | 97 +- .../core/item/general/ItemHealingDevice.java | 748 +- .../core/item/general/ItemLavaFilter.java | 201 +- .../core/item/general/ItemMagicFeather.java | 447 +- .../core/item/general/ItemSlowBuildingRing.java | 245 +- .../core/item/general/ItemSunnariumBit.java | 19 +- .../core/item/general/NuclearFuelRodBase.java | 366 +- .../core/item/general/RF2EU_Battery.java | 595 +- .../core/item/general/books/ItemBaseBook.java | 199 +- .../item/general/capture/ItemEntityCatcher.java | 463 +- .../item/general/chassis/ItemBoilerChassis.java | 127 +- .../item/general/chassis/ItemDehydratorCoil.java | 140 +- .../general/chassis/ItemDehydratorCoilWire.java | 140 +- .../core/item/general/fuelrods/FuelRod_Base.java | 412 +- .../item/general/fuelrods/FuelRod_Thorium.java | 17 +- .../general/rfchargingpack/ChargingPackBase.java | 133 +- .../item/general/spawn/ItemCustomSpawnEgg.java | 534 +- .../throwables/ItemHydrofluoricAcidPotion.java | 49 +- .../general/throwables/ItemSulfuricAcidPotion.java | 49 +- .../item/general/throwables/ItemThrowableBomb.java | 190 +- .../java/gtPlusPlus/core/item/init/ItemsFoods.java | 113 +- .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 102 +- .../core/item/materials/DustDecayable.java | 159 +- .../core/item/materials/MaterialHandler.java | 7 +- .../core/item/tool/misc/ConnectedBlockFinder.java | 248 +- .../core/item/tool/misc/DebugScanner.java | 168 +- .../core/item/tool/misc/FakeGregtechTool.java | 109 +- .../core/item/tool/misc/GregtechPump.java | 2562 +++---- .../core/item/tool/misc/SandstoneHammer.java | 131 +- .../core/item/tool/misc/box/AutoLunchBox.java | 16 +- .../core/item/tool/misc/box/BaseBoxItem.java | 90 +- .../core/item/tool/misc/box/ContainerBoxBase.java | 634 +- .../item/tool/misc/box/CustomBoxInventory.java | 433 +- .../core/item/tool/misc/box/MagicToolBag.java | 14 +- .../core/item/tool/misc/box/UniversalToolBox.java | 17 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 585 +- .../core/item/tool/staballoy/MultiSpadeBase.java | 237 +- .../core/item/tool/staballoy/StaballoyAxe.java | 648 +- .../core/item/tool/staballoy/StaballoyPickaxe.java | 884 ++- .../core/item/tool/staballoy/StaballoySpade.java | 789 +- .../core/item/wearable/WearableLoader.java | 15 +- .../core/item/wearable/armour/ArmourLoader.java | 56 +- .../core/item/wearable/armour/base/BaseArmour.java | 7 +- .../item/wearable/armour/base/BaseArmourBoots.java | 9 +- .../item/wearable/armour/base/BaseArmourChest.java | 9 +- .../item/wearable/armour/base/BaseArmourHelm.java | 9 +- .../item/wearable/armour/base/BaseArmourLegs.java | 9 +- .../item/wearable/armour/hazmat/ArmourHazmat.java | 186 +- .../wearable/armour/tinfoil/ArmourTinFoilHat.java | 290 +- .../core/item/wearable/base/BaseItemWearable.java | 100 +- .../item/wearable/hazmat/ItemArmorHazmatEx.java | 37 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 669 +- src/main/java/gtPlusPlus/core/lib/LoadedMods.java | 725 +- .../java/gtPlusPlus/core/lib/VanillaColours.java | 51 +- src/main/java/gtPlusPlus/core/material/ALLOY.java | 2003 +++-- .../java/gtPlusPlus/core/material/ELEMENT.java | 1157 ++- src/main/java/gtPlusPlus/core/material/Ion.java | 44 +- .../gtPlusPlus/core/material/MISC_MATERIALS.java | 1188 ++- .../java/gtPlusPlus/core/material/Material.java | 3296 ++++---- .../core/material/MaterialGenerator.java | 767 +- .../gtPlusPlus/core/material/MaterialStack.java | 214 +- .../java/gtPlusPlus/core/material/NONMATERIAL.java | 70 +- src/main/java/gtPlusPlus/core/material/ORES.java | 1669 +++-- .../java/gtPlusPlus/core/material/Particle.java | 280 +- .../core/material/gregtech/CustomGTMaterials.java | 148 +- .../core/material/nuclear/FLUORIDES.java | 510 +- .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 686 +- .../core/material/state/MaterialState.java | 30 +- .../handler/AbstractClientMessageHandler.java | 9 +- .../network/handler/AbstractMessageHandler.java | 45 +- .../handler/AbstractServerMessageHandler.java | 7 +- .../core/network/packet/AbstractPacket.java | 3 +- .../network/packet/Packet_VolumetricFlaskGui.java | 224 +- .../network/packet/Packet_VolumetricFlaskGui2.java | 222 +- .../java/gtPlusPlus/core/players/FakeFarmer.java | 133 +- .../gtPlusPlus/core/potion/GtPotionEffect.java | 7 +- .../java/gtPlusPlus/core/proxy/ClientProxy.java | 460 +- .../java/gtPlusPlus/core/proxy/ServerProxy.java | 34 +- .../core/recipe/Gregtech_Recipe_Adder.java | 175 +- .../core/recipe/LOADER_Machine_Components.java | 467 +- .../gtPlusPlus/core/recipe/RECIPES_Extruder.java | 81 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 4834 ++++++------ .../gtPlusPlus/core/recipe/RECIPES_General.java | 1227 +-- .../core/recipe/RECIPES_LaserEngraver.java | 293 +- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 40 +- .../core/recipe/RECIPES_MachineComponents.java | 1140 ++- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 7875 +++++++++++--------- .../core/recipe/RECIPES_Old_Circuits.java | 1092 +-- .../core/recipe/RECIPES_RareEarthProcessing.java | 429 +- .../core/recipe/RECIPES_SeleniumProcessing.java | 319 +- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 50 +- .../java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 358 +- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 85 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 80 +- .../java/gtPlusPlus/core/recipe/common/CI.java | 2589 +++---- .../java/gtPlusPlus/core/slots/SlotAirFilter.java | 35 +- .../java/gtPlusPlus/core/slots/SlotBlueprint.java | 38 +- .../java/gtPlusPlus/core/slots/SlotBuzzSaw.java | 122 +- .../core/slots/SlotChemicalPlantInput.java | 57 +- .../java/gtPlusPlus/core/slots/SlotCrafting.java | 279 +- .../core/slots/SlotCraftingNoCollect.java | 271 +- .../java/gtPlusPlus/core/slots/SlotDataStick.java | 59 +- .../java/gtPlusPlus/core/slots/SlotElectric.java | 71 +- src/main/java/gtPlusPlus/core/slots/SlotFrame.java | 27 +- .../java/gtPlusPlus/core/slots/SlotFuelRod.java | 88 +- .../java/gtPlusPlus/core/slots/SlotGeneric.java | 23 +- .../java/gtPlusPlus/core/slots/SlotGtTool.java | 44 +- .../gtPlusPlus/core/slots/SlotGtToolElectric.java | 169 +- .../core/slots/SlotIntegratedCircuit.java | 175 +- .../gtPlusPlus/core/slots/SlotItemBackpackInv.java | 35 +- .../java/gtPlusPlus/core/slots/SlotJukebox.java | 52 +- .../gtPlusPlus/core/slots/SlotLockedInput.java | 94 +- .../java/gtPlusPlus/core/slots/SlotLunchBox.java | 40 +- .../gtPlusPlus/core/slots/SlotMagicToolBag.java | 39 +- .../gtPlusPlus/core/slots/SlotModularBauble.java | 44 +- .../core/slots/SlotModularBaubleUpgrades.java | 85 +- .../java/gtPlusPlus/core/slots/SlotNoInput.java | 23 +- .../gtPlusPlus/core/slots/SlotNoInputLogging.java | 44 +- .../java/gtPlusPlus/core/slots/SlotOutput.java | 159 +- .../core/slots/SlotPollutionScrubber.java | 95 +- src/main/java/gtPlusPlus/core/slots/SlotRTG.java | 27 +- .../java/gtPlusPlus/core/slots/SlotToolBox.java | 204 +- .../gtPlusPlus/core/slots/SlotVolumetricFlask.java | 30 +- .../core/tileentities/ModTileEntities.java | 75 +- .../core/tileentities/base/TILE_ENTITY_BASE.java | 56 +- .../core/tileentities/base/TileBasicTank.java | 278 +- .../core/tileentities/base/TileEntityBase.java | 2017 ++--- .../core/tileentities/base/TilePoweredGT.java | 95 +- .../general/TileEntityCircuitProgrammer.java | 578 +- .../general/TileEntityDecayablesChest.java | 692 +- .../tileentities/general/TileEntityEggBox.java | 692 +- .../tileentities/general/TileEntityFirepit.java | 48 +- .../tileentities/general/TileEntityFishTrap.java | 797 +- .../general/TileEntityHeliumGenerator.java | 224 +- .../general/TileEntityInfiniteFluid.java | 249 +- .../general/TileEntityPlayerDoorBase.java | 487 +- .../tileentities/general/TileEntityReverter.java | 558 +- .../general/TileEntityVolumetricFlaskSetter.java | 764 +- .../general/TileEntityXpConverter.java | 518 +- .../redstone/TileEntityRedstoneHandler.java | 762 +- .../machines/TileEntityAdvPooCollector.java | 231 +- .../machines/TileEntityBaseFluidCollector.java | 411 +- .../machines/TileEntityModularityTable.java | 922 ++- .../machines/TileEntityPestKiller.java | 927 ++- .../machines/TileEntityPooCollector.java | 216 +- .../machines/TileEntityProjectTable.java | 558 +- .../machines/TileEntityRoundRobinator.java | 1348 ++-- .../machines/TileEntityTradeTable.java | 235 +- .../gtPlusPlus/core/util/MovingAverageLong.java | 3 +- src/main/java/gtPlusPlus/core/util/Utils.java | 1808 ++--- src/main/java/gtPlusPlus/core/util/data/AES.java | 154 +- .../java/gtPlusPlus/core/util/data/ArrayUtils.java | 192 +- .../java/gtPlusPlus/core/util/data/EnumUtils.java | 75 +- .../java/gtPlusPlus/core/util/data/FileUtils.java | 164 +- .../gtPlusPlus/core/util/data/LocaleUtils.java | 136 +- .../gtPlusPlus/core/util/data/LoggingUtils.java | 76 +- .../gtPlusPlus/core/util/data/StringUtils.java | 425 +- .../java/gtPlusPlus/core/util/data/UUIDUtils.java | 29 +- .../gtPlusPlus/core/util/debug/DEBUG_INIT.java | 51 +- .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 83 +- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 1849 ++--- .../core/util/debug/DEBUG_ScreenOverlay.java | 54 +- .../core/util/debug/DEBUG_TimerThread.java | 104 +- .../core/util/debug/UtilityGL11Debug.java | 1426 +++- .../java/gtPlusPlus/core/util/math/MathUtils.java | 1559 ++-- .../core/util/minecraft/ClientUtils.java | 15 +- .../core/util/minecraft/EnchantingUtils.java | 173 +- .../core/util/minecraft/EnergyUtils.java | 233 +- .../core/util/minecraft/EntityUtils.java | 458 +- .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 1446 ++-- .../gtPlusPlus/core/util/minecraft/FoodUtils.java | 94 +- .../core/util/minecraft/HazmatUtils.java | 1141 ++- .../core/util/minecraft/InventoryUtils.java | 131 +- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 2777 +++---- .../gtPlusPlus/core/util/minecraft/LangUtils.java | 264 +- .../core/util/minecraft/MaterialUtils.java | 1012 +-- .../core/util/minecraft/MiningUtils.java | 483 +- .../core/util/minecraft/ModularArmourUtils.java | 305 +- .../gtPlusPlus/core/util/minecraft/NBTUtils.java | 1128 ++- .../core/util/minecraft/OreDictUtils.java | 29 +- .../core/util/minecraft/PlayerUtils.java | 460 +- .../core/util/minecraft/RecipeUtils.java | 1538 ++-- .../core/util/minecraft/ShapelessUtils.java | 72 +- .../util/minecraft/gregtech/PollutionUtils.java | 322 +- .../gregtech/material/MaterialBuilder.java | 482 +- .../gregtech/recipehandlers/GregtechRecipe.java | 2 +- .../core/util/minecraft/network/CustomPacket.java | 52 +- .../core/util/minecraft/network/PacketBuilder.java | 33 +- .../util/minecraft/network/PacketDispatcher.java | 127 +- .../core/util/minecraft/network/PacketHandler.java | 94 +- .../util/minecraft/network/PacketTileEntity.java | 114 +- .../minecraft/particles/BlockBreakParticles.java | 16 +- .../particles/EntityParticleFXMysterious.java | 25 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 289 +- .../core/util/reflect/AddGregtechRecipe.java | 466 +- .../gtPlusPlus/core/util/reflect/ProxyFinder.java | 90 +- .../core/util/reflect/ReflectionUtils.java | 2172 +++--- .../gtPlusPlus/core/util/sys/KeyboardUtils.java | 61 +- src/main/java/gtPlusPlus/core/util/sys/Log.java | 26 +- .../java/gtPlusPlus/core/util/sys/SystemUtils.java | 153 +- .../core/world/damage/BaseCustomDamageSource.java | 23 +- .../core/world/explosions/ExplosionHandler.java | 58 +- .../core/world/explosions/MiningExplosion.java | 626 +- 528 files changed, 91655 insertions(+), 86723 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 4842cb891e..1a93d35ce2 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -36,136 +36,136 @@ import net.minecraftforge.fluids.Fluid; public final class ModBlocks { - public static Block blockRoundRobinator; - public static Block blockCircuitProgrammer; - public static Block blockVolumetricFlaskSetter; - public static Block blockFakeMiningPipe; - public static Block blockFakeMiningHead; - - public static Block blockFishTrap; - public static Block blockDecayablesChest; - public static Block blockEggBox; - - //Blocks - //public static Block blockBloodSteel; - //public static Block blockStaballoy; - // WIP TODO public static Block blockToolBuilder; - public static Block blockGriefSaver; - - public static Block blockCasingsMisc; - public static Block blockCasings2Misc; - public static Block blockCasings3Misc; - public static Block blockCasings4Misc; - public static Block blockCasings5Misc; - public static Block blockCasingsTieredGTPP; - public static Block blockSpecialMultiCasings; - public static Block blockSpecialMultiCasings2; - public static Block blockCustomMachineCasings; - public static Block blockCustomPipeGearCasings; - - public static Block blockMetaTileEntity; - public static Block blockHeliumGenerator; - public static Block blockNHG; - public static Block blockCharger; - - public static Block MatterFabricatorEffectBlock; - - public static Fluid fluidSludge = new Fluid("fluid.sludge"); - public static Block blockFluidSludge; - - public static Block blockFirePit; - - public static Block blockOreFluorite; - - public static Block blockMiningExplosive; - - public static Block blockHellfire; - public static Block blockInfiniteFLuidTank; - public static Block blockProjectTable; - public static Block blockTradeTable; - public static Block blockModularTable; - - public static Block blockWitherGuard; - public static Block blockXpConverter; - public static Block blockCompressedObsidian; - public static Block blockNet; - - public static Block blockPlayerDoorWooden; - public static Block blockPlayerDoorIron; - public static Block blockPlayerDoorCustom_Glass; - public static Block blockPlayerDoorCustom_Ice; - public static Block blockPlayerDoorCustom_Cactus; - - public static Block blockCustomMobSpawner; - public static Block blockCustomSuperLight; - public static Block blockCustomJukebox; - - public static Block blockPooCollector; - - public static Block blockPestKiller; - - public static void init() { - Logger.INFO("Initializing Blocks."); - //blockGriefSaver = new TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); - - registerBlocks(); - } - - public static void registerBlocks(){ - - Logger.INFO("Registering Blocks."); - MatterFabricatorEffectBlock = new LightGlass(false); - - //Fluids - FluidRegistryHandler.registerFluids(); - - //Workbench - blockHeliumGenerator = new HeliumGenerator(); - blockFirePit = new FirePit(); - blockFishTrap = new FishTrap(); - blockInfiniteFLuidTank = new FluidTankInfinite(); - //blockOreFluorite = new BlockBaseOre.oldOreBlock("oreFluorite", "Fluorite", Material.rock, BlockTypes.ORE, Utils.rgbtoHexValue(120, 120, 30), 3); - blockMiningExplosive = new MiningExplosives(); - blockHellfire = new HellFire(); - blockProjectTable = new Machine_ProjectTable(); - blockTradeTable = new Machine_TradeTable(); - blockModularTable = new Machine_ModularityTable(); - blockWitherGuard = new BlockWitherProof(); - blockXpConverter = new BlockTankXpConverter(); - blockCompressedObsidian = new BlockCompressedObsidian(); - blockNet = new BlockNet(); - - blockFakeMiningPipe = new Mining_Pipe_Fake(); - blockFakeMiningHead = new Mining_Head_Fake(); - - blockCircuitProgrammer = new CircuitProgrammer(); - - blockDecayablesChest = new DecayablesChest(); - blockEggBox = new EggBox(); - - blockPlayerDoorWooden = new PlayerDoors(Material.wood, "door_wood", true); - 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"); - - //blockCustomSuperLight = new BlockSuperLight(); - blockCustomJukebox = new Machine_SuperJukebox(); - - blockPooCollector = new Machine_PooCollector(); - - blockPestKiller = new Machine_PestKiller(); - - blockRoundRobinator = new Machine_RoundRobinator(); - - if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) { - blockVolumetricFlaskSetter = new VolumetricFlaskSetter(); - } - - new BlockGenericRedstoneDetector(); - new BlockGenericRedstoneTest(); - - } - - -} \ No newline at end of file + public static Block blockRoundRobinator; + public static Block blockCircuitProgrammer; + public static Block blockVolumetricFlaskSetter; + public static Block blockFakeMiningPipe; + public static Block blockFakeMiningHead; + + public static Block blockFishTrap; + public static Block blockDecayablesChest; + public static Block blockEggBox; + + // Blocks + // public static Block blockBloodSteel; + // public static Block blockStaballoy; + // WIP TODO public static Block blockToolBuilder; + public static Block blockGriefSaver; + + public static Block blockCasingsMisc; + public static Block blockCasings2Misc; + public static Block blockCasings3Misc; + public static Block blockCasings4Misc; + public static Block blockCasings5Misc; + public static Block blockCasingsTieredGTPP; + public static Block blockSpecialMultiCasings; + public static Block blockSpecialMultiCasings2; + public static Block blockCustomMachineCasings; + public static Block blockCustomPipeGearCasings; + + public static Block blockMetaTileEntity; + public static Block blockHeliumGenerator; + public static Block blockNHG; + public static Block blockCharger; + + public static Block MatterFabricatorEffectBlock; + + public static Fluid fluidSludge = new Fluid("fluid.sludge"); + public static Block blockFluidSludge; + + public static Block blockFirePit; + + public static Block blockOreFluorite; + + public static Block blockMiningExplosive; + + public static Block blockHellfire; + public static Block blockInfiniteFLuidTank; + public static Block blockProjectTable; + public static Block blockTradeTable; + public static Block blockModularTable; + + public static Block blockWitherGuard; + public static Block blockXpConverter; + public static Block blockCompressedObsidian; + public static Block blockNet; + + public static Block blockPlayerDoorWooden; + public static Block blockPlayerDoorIron; + public static Block blockPlayerDoorCustom_Glass; + public static Block blockPlayerDoorCustom_Ice; + public static Block blockPlayerDoorCustom_Cactus; + + public static Block blockCustomMobSpawner; + public static Block blockCustomSuperLight; + public static Block blockCustomJukebox; + + public static Block blockPooCollector; + + public static Block blockPestKiller; + + public static void init() { + Logger.INFO("Initializing Blocks."); + // blockGriefSaver = new + // TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); + + registerBlocks(); + } + + public static void registerBlocks() { + + Logger.INFO("Registering Blocks."); + MatterFabricatorEffectBlock = new LightGlass(false); + + // Fluids + FluidRegistryHandler.registerFluids(); + + // Workbench + blockHeliumGenerator = new HeliumGenerator(); + blockFirePit = new FirePit(); + blockFishTrap = new FishTrap(); + blockInfiniteFLuidTank = new FluidTankInfinite(); + // blockOreFluorite = new BlockBaseOre.oldOreBlock("oreFluorite", "Fluorite", Material.rock, BlockTypes.ORE, + // Utils.rgbtoHexValue(120, 120, 30), 3); + blockMiningExplosive = new MiningExplosives(); + blockHellfire = new HellFire(); + blockProjectTable = new Machine_ProjectTable(); + blockTradeTable = new Machine_TradeTable(); + blockModularTable = new Machine_ModularityTable(); + blockWitherGuard = new BlockWitherProof(); + blockXpConverter = new BlockTankXpConverter(); + blockCompressedObsidian = new BlockCompressedObsidian(); + blockNet = new BlockNet(); + + blockFakeMiningPipe = new Mining_Pipe_Fake(); + blockFakeMiningHead = new Mining_Head_Fake(); + + blockCircuitProgrammer = new CircuitProgrammer(); + + blockDecayablesChest = new DecayablesChest(); + blockEggBox = new EggBox(); + + blockPlayerDoorWooden = new PlayerDoors(Material.wood, "door_wood", true); + 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"); + + // blockCustomSuperLight = new BlockSuperLight(); + blockCustomJukebox = new Machine_SuperJukebox(); + + blockPooCollector = new Machine_PooCollector(); + + blockPestKiller = new Machine_PestKiller(); + + blockRoundRobinator = new Machine_RoundRobinator(); + + if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) { + blockVolumetricFlaskSetter = new VolumetricFlaskSetter(); + } + + new BlockGenericRedstoneDetector(); + new BlockGenericRedstoneTest(); + } +} diff --git a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java index f63762a2d7..61c7071a3e 100644 --- a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java @@ -1,5 +1,6 @@ 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; @@ -8,32 +9,46 @@ 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) { - super(material); - this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); - this.setCreativeTab(x); - this.setHardness(blockHardness); //block Hardness - this.setResistance(blockResistance); - this.setLightLevel(blockLightLevel); - this.setHarvestLevel(blockHarvestTool, blockHarvestLevel); - this.setStepSound(BlockSound); - } - - @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_) - { - return false; - } + 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); + this.setCreativeTab(x); + this.setHardness(blockHardness); // block Hardness + this.setResistance(blockResistance); + this.setLightLevel(blockLightLevel); + this.setHarvestLevel(blockHarvestTool, blockHarvestLevel); + this.setStepSound(BlockSound); + } - @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { - return false; - } + @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_) { + return false; + } + @Override + 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 6014388cda..876f27e5b6 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java @@ -1,5 +1,8 @@ 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; @@ -7,75 +10,68 @@ 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) { - this(BlockTypes.STANDARD, unlocalizedName, material, 2); - } - - public BasicBlock(final BlockTypes type, final String unlocalizedName, final Material material) { - this(type, unlocalizedName, material, 2); - } - - public BasicBlock(BlockTypes type, final String unlocalizedName, final Material material, final int harvestLevel) { - super(material); - this.setBlockName(Utils.sanitizeString(unlocalizedName)); - - if (type != BlockTypes.ORE && !unlocalizedName.toLowerCase().contains("ore")) { - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); - } - - this.setCreativeTab(AddToCreativeTab.tabBlock); - this.setResistance(6.0F); - this.setLightLevel(0.0F); - this.setHardness(1.0f*harvestLevel); - this.setHarvestLevel("pickaxe", harvestLevel); - this.setStepSound(soundTypeMetal); - } - - - public static enum BlockTypes { - STANDARD("blockBlock", "pickaxe", soundTypeMetal), - FRAME("blockFrameGt", "wrench", soundTypeMetal), - ORE("blockStone", "pickaxe", soundTypeStone); - - private String TEXTURE_NAME; - private String HARVEST_TOOL; - private SoundType soundOfBlock; - private BlockTypes (final String textureName, final String harvestTool, final SoundType blockSound) - { - this.TEXTURE_NAME = textureName; - this.HARVEST_TOOL = harvestTool; - this.soundOfBlock = blockSound; - } - - public String getTexture() { - return this.TEXTURE_NAME; - } - - public String getHarvestTool(){ - return this.HARVEST_TOOL; - } - - public SoundType getBlockSoundType(){ - return this.soundOfBlock; - } - - } - - - @Override - public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) { - return null; - } - - @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { - return false; - } - + public BasicBlock(final String unlocalizedName, final Material material) { + this(BlockTypes.STANDARD, unlocalizedName, material, 2); + } + + public BasicBlock(final BlockTypes type, final String unlocalizedName, final Material material) { + this(type, unlocalizedName, material, 2); + } + + public BasicBlock(BlockTypes type, final String unlocalizedName, final Material material, final int harvestLevel) { + super(material); + this.setBlockName(Utils.sanitizeString(unlocalizedName)); + + if (type != BlockTypes.ORE && !unlocalizedName.toLowerCase().contains("ore")) { + this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + } + + this.setCreativeTab(AddToCreativeTab.tabBlock); + this.setResistance(6.0F); + this.setLightLevel(0.0F); + this.setHardness(1.0f * harvestLevel); + this.setHarvestLevel("pickaxe", harvestLevel); + this.setStepSound(soundTypeMetal); + } + + public static enum BlockTypes { + STANDARD("blockBlock", "pickaxe", soundTypeMetal), + FRAME("blockFrameGt", "wrench", soundTypeMetal), + ORE("blockStone", "pickaxe", soundTypeStone); + + private String TEXTURE_NAME; + private String HARVEST_TOOL; + private SoundType soundOfBlock; + + private BlockTypes(final String textureName, final String harvestTool, final SoundType blockSound) { + this.TEXTURE_NAME = textureName; + this.HARVEST_TOOL = harvestTool; + this.soundOfBlock = blockSound; + } + + public String getTexture() { + return this.TEXTURE_NAME; + } + + public String getHarvestTool() { + return this.HARVEST_TOOL; + } + + public SoundType getBlockSoundType() { + return this.soundOfBlock; + } + } + + @Override + public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) { + return null; + } + + @Override + 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 2bfd09d848..05a995cbb5 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -1,9 +1,5 @@ package gtPlusPlus.core.block.base; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -16,6 +12,9 @@ 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; @@ -32,297 +31,284 @@ import net.minecraft.world.World; public abstract class BasicTileBlockWithTooltip extends BlockContainer implements ITileTooltip { - /** - * Each mapped object holds the data for the six sides. - */ - @SideOnly(Side.CLIENT) - private AutoMap> mSidedTextureArray; - - /** - * Holds the data for the six sides, each side holds an array of data for each respective meta. - */ - @SideOnly(Side.CLIENT) - private AutoMap> mSidedTexturePathArray; - - /** - * Does this block have any meta at all? - * @return - */ - public final boolean hasMeta() { - return getMetaCount() > 0; - } - - /** - * 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() { - return ItemBlock.class; - } - - /** - * 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() { - return getTooltipID() >= -1; - } - - /** - * 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}(). - * @return - */ - @Override - public abstract int getTooltipID(); - - public BasicTileBlockWithTooltip(Material aBlockMat){ - super(aBlockMat); - //Use Abstract method values - this.setHardness(initBlockHardness()); - this.setResistance(initBlockResistance()); - this.setBlockName(getUnlocalBlockName()); - this.setCreativeTab(initCreativeTab()); - // Register the block last. - GameRegistry.registerBlock(this, getItemBlockClass(), getUnlocalBlockName()); - Logger.INFO("Registered "+getTileEntityName()+"."); - if (Utils.isClient()) { - // Handle Textures - handleTextures(); - } - } - - /** - * 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() { - return Utils.sanitizeString(getTileEntityName().replace(" ", "")); - } - - /** - * 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(){ - return null; - } - - @Override - @SideOnly(Side.CLIENT) - public final IIcon getIcon(final int aSide, final int aMeta) { - return mSidedTextureArray.get(aMeta).get(aSide).getIcon(); - } - - @Override - public IIcon getIcon(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) { - return super.getIcon(aWorld, aX, aY, aZ, aSide); - } - - @SideOnly(Side.CLIENT) - private final void handleTextures() { - - Logger.INFO("[TeTexture] Building Texture Maps for "+getTileEntityName()+"."); - - // Init on the Client side only, to prevent Field initialisers existing in the Server side bytecode. - mSidedTextureArray = new AutoMap>(); - mSidedTexturePathArray = new AutoMap>(); - - - //Store them in forge order - //DOWN, UP, NORTH, SOUTH, WEST, EAST - - // 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; - // Construct a full path - String aTexPathBuilt = aPrefixTexPath + aTexPathMid; - // File Name Suffixes, without meta tags - String aStringBot; - String aStringTop; - String aStringBack; - String aStringFront; - String aStringLeft; - String aStringRight; - // Do we provide a matrix of custom data to be used for texture processing instead? - if (getCustomTextureDirectoryObject() != null) { - // Get custom provided texture data. - CubicObject[] aDataMap = getCustomTextureDirectoryObject(); - Logger.INFO("[TeTexture] Found custom texture data, using this instead. Size: "+aDataMap.length); - // Map each meta string data to the main map. - for (int i=0;i aMetaBlob = new CubicObject(aStringBot, aStringTop, aStringBack, aStringFront, aStringLeft, aStringRight); - mSidedTexturePathArray.put(aMetaBlob); - Logger.INFO("[TeTexture] Added Texture Path data to map for meta "+i); - } - } - Logger.INFO("[TeTexture] Map size for pathing: "+mSidedTexturePathArray.size()); - - // Iteration Index - int aIndex = 0; - - // Iterate each CubicObject, holding the six texture paths for each meta. - for (CubicObject aMetaBlob : mSidedTexturePathArray) { - // Make a Safe Texture for each side - SafeTexture aBottom = SafeTexture.register(aMetaBlob.DOWN); - SafeTexture aTop = SafeTexture.register(aMetaBlob.UP); - SafeTexture aBack = SafeTexture.register(aMetaBlob.NORTH); - SafeTexture aFont = SafeTexture.register(aMetaBlob.SOUTH); - 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 - }; - // Convenience Blob - CubicObject aMetaBlob2 = new CubicObject(aInjectBlob); - // Store this Blob into - mSidedTextureArray.put(aMetaBlob2); - Logger.INFO("[TeTexture] Added SafeTexture data to map for meta "+(aIndex++)); - } - Logger.INFO("[TeTexture] Map size for registration: "+mSidedTextureArray.size()); - - - } - - @Override - @SideOnly(Side.CLIENT) - public final void registerBlockIcons(final IIconRegister aRegisterer){ - this.blockIcon = aRegisterer.registerIcon(CORE.MODID + ":" + "net"); - } - - @Override - 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. - */ - 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) { - onBlockBreak(); - InventoryUtils.dropInventoryItems(world, x, y, z, block); - super.breakBlock(world, x, y, z, block, number); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - public final void getSubBlocks(Item aItem, CreativeTabs p_149666_2_, List aList) { - if (hasMeta()) { - for (int i=0;i> mSidedTextureArray; + + /** + * Holds the data for the six sides, each side holds an array of data for each respective meta. + */ + @SideOnly(Side.CLIENT) + private AutoMap> mSidedTexturePathArray; + + /** + * Does this block have any meta at all? + * @return + */ + public final boolean hasMeta() { + return getMetaCount() > 0; + } + + /** + * 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() { + return ItemBlock.class; + } + + /** + * 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() { + return getTooltipID() >= -1; + } + + /** + * 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}(). + * @return + */ + @Override + public abstract int getTooltipID(); + + public BasicTileBlockWithTooltip(Material aBlockMat) { + super(aBlockMat); + // Use Abstract method values + this.setHardness(initBlockHardness()); + this.setResistance(initBlockResistance()); + this.setBlockName(getUnlocalBlockName()); + this.setCreativeTab(initCreativeTab()); + // Register the block last. + GameRegistry.registerBlock(this, getItemBlockClass(), getUnlocalBlockName()); + Logger.INFO("Registered " + getTileEntityName() + "."); + if (Utils.isClient()) { + // Handle Textures + handleTextures(); + } + } + + /** + * The name of the Tile Entity. + * @return + */ + protected abstract String getTileEntityName(); + + /** + * The String used for texture pathing. + * @return Sanitized {