From 0669f5eb9d5029a8b94ec552171b0837605f7747 Mon Sep 17 00:00:00 2001 From: draknyte1 Date: Fri, 4 Nov 2016 15:23:26 +1000 Subject: $ Cleaned up the entire project. > Much neat, very nices. --- src/Java/gtPlusPlus/GTplusplus.java | 340 +- src/Java/gtPlusPlus/core/block/ModBlocks.java | 53 +- .../gtPlusPlus/core/block/base/AdvancedBlock.java | 38 +- .../gtPlusPlus/core/block/base/BasicBlock.java | 80 +- .../core/block/base/BlockBaseModular.java | 188 +- src/Java/gtPlusPlus/core/block/base/MetaBlock.java | 36 +- .../core/block/base/MultiTextureBlock.java | 47 +- .../gtPlusPlus/core/block/general/LightGlass.java | 143 +- .../core/block/general/antigrief/TowerDevice.java | 478 ++- .../general/fluids/BlockFluidJackDaniels.java | 74 +- .../core/block/machine/BlockGtFrameBox.java | 33 +- .../core/block/machine/Machine_Charger.java | 126 +- .../gtPlusPlus/core/block/machine/Machine_NHG.java | 126 +- .../core/block/machine/Machine_WireiusDeletus.java | 3 +- .../core/block/machine/Machine_Workbench.java | 121 +- .../block/machine/Machine_WorkbenchAdvanced.java | 82 +- .../machine/heliumgen/block/HeliumGenerator.java | 270 +- .../container/ContainerHeliumGenerator.java | 64 +- .../machine/heliumgen/gui/GUIHeliumGenerator.java | 104 +- .../machine/heliumgen/slots/InvSlotRadiation.java | 88 +- .../tileentity/TileEntityHeliumGenerator.java | 845 ++-- src/Java/gtPlusPlus/core/commands/CommandMath.java | 230 +- .../gtPlusPlus/core/commands/CommandUtils.java | 8 +- src/Java/gtPlusPlus/core/common/CommonProxy.java | 123 +- .../core/common/compat/COMPAT_Baubles.java | 28 +- .../core/common/compat/COMPAT_BigReactors.java | 10 +- .../common/compat/COMPAT_CompactWindmills.java | 317 +- .../core/common/compat/COMPAT_EnderIO.java | 10 +- .../core/common/compat/COMPAT_ExtraUtils.java | 21 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 83 +- .../core/common/compat/COMPAT_MorePlanets.java | 23 +- .../core/common/compat/COMPAT_PneumaticCraft.java | 12 +- .../core/common/compat/COMPAT_RFTools.java | 12 +- .../core/common/compat/COMPAT_SimplyJetpacks.java | 12 +- .../core/common/compat/COMPAT_Thaumcraft.java | 46 +- .../core/container/Container_BackpackBase.java | 231 +- .../core/container/Container_Charger.java | 71 +- .../gtPlusPlus/core/container/Container_NHG.java | 100 +- .../core/container/Container_Workbench.java | 566 +-- .../container/Container_WorkbenchAdvanced.java | 497 +-- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 30 +- .../creative/tabs/MiscUtilCreativeTabBlock.java | 2 +- .../creative/tabs/MiscUtilCreativeTabMachines.java | 5 +- .../creative/tabs/MiscUtilCreativeTabMisc.java | 2 +- .../creative/tabs/MiscUtilCreativeTabOther.java | 2 +- .../creative/tabs/MiscUtilCreativeTabTools.java | 2 +- .../gtPlusPlus/core/entity/EntityTeleportFX.java | 440 +-- .../gtPlusPlus/core/fluids/BlockFluidBase.java | 159 +- .../core/fluids/FluidRegistryHandler.java | 79 +- src/Java/gtPlusPlus/core/fluids/GenericFluid.java | 113 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 61 +- src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java | 12 +- src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java | 51 +- .../gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 147 +- .../gtPlusPlus/core/gui/machine/GUI_Charger.java | 71 +- src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java | 72 +- .../gtPlusPlus/core/gui/machine/GUI_Workbench.java | 81 +- .../core/gui/machine/GUI_WorkbenchAdvanced.java | 27 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 143 +- .../core/handler/COMPAT_IntermodStaging.java | 25 +- .../gtPlusPlus/core/handler/CraftingManager.java | 14 +- src/Java/gtPlusPlus/core/handler/GuiHandler.java | 180 +- .../handler/Recipes/LateRegistrationHandler.java | 30 +- .../core/handler/Recipes/RegistrationHandler.java | 26 +- .../core/handler/events/LoginEventHandler.java | 127 +- .../events/PickaxeBlockBreakEventHandler.java | 63 +- .../handler/events/UnbreakableBlockManager.java | 175 +- .../workbench/Workbench_CraftingHandler.java | 199 +- .../handler/workbench/Workbench_RecipeSorter.java | 40 +- .../gtPlusPlus/core/interfaces/IGuiManager.java | 8 +- .../core/interfaces/IGuiManagerMiscUtils.java | 3 +- .../gtPlusPlus/core/interfaces/IItemBlueprint.java | 74 +- .../core/inventories/BaseInventoryBackpack.java | 252 +- .../core/inventories/InventoryWorkbenchChest.java | 231 +- .../inventories/InventoryWorkbenchCrafting.java | 256 +- .../InventoryWorkbenchHoloCrafting.java | 180 +- .../inventories/InventoryWorkbenchHoloSlots.java | 344 +- .../core/inventories/InventoryWorkbenchTools.java | 232 +- .../InventoryWorkbenchToolsElectric.java | 234 +- src/Java/gtPlusPlus/core/item/ModItems.java | 719 ++-- src/Java/gtPlusPlus/core/item/base/BaseEuItem.java | 893 +++-- .../core/item/base/BaseItemBackpack.java | 100 +- .../gtPlusPlus/core/item/base/BaseItemBrain.java | 104 +- .../core/item/base/BaseItemComponent.java | 187 +- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 26 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 130 +- .../core/item/base/BaseItemWithCharge.java | 62 +- .../core/item/base/BaseItemWithDamageValue.java | 24 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 413 +- src/Java/gtPlusPlus/core/item/base/CoreItem.java | 119 +- .../core/item/base/bolts/BaseItemBolt.java | 4 +- .../core/item/base/cell/BaseItemCell.java | 41 +- .../core/item/base/dusts/BaseItemDust.java | 320 +- .../core/item/base/dusts/BaseItemDustAbstract.java | 35 +- .../core/item/base/dusts/BaseItemDustUnique.java | 120 +- .../item/base/dusts/decimal/BaseItemCentidust.java | 47 +- .../item/base/dusts/decimal/BaseItemDecidust.java | 47 +- .../core/item/base/foods/BaseItemFood.java | 31 +- .../core/item/base/foods/BaseItemHotFood.java | 82 +- .../core/item/base/gears/BaseItemGear.java | 6 +- .../core/item/base/ingots/BaseItemIngot.java | 120 +- .../core/item/base/ingots/BaseItemIngotHot.java | 61 +- .../core/item/base/itemblock/ItemBlockBase.java | 21 +- .../core/item/base/itemblock/ItemBlockFluid.java | 79 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 54 +- .../item/base/itemblock/ItemBlockGtFrameBox.java | 19 +- .../item/base/itemblock/ItemBlockTileEntity.java | 46 +- .../core/item/base/nugget/BaseItemNugget.java | 6 +- .../core/item/base/plates/BaseItemPlate.java | 15 +- .../core/item/base/plates/BaseItemPlateDouble.java | 10 +- .../core/item/base/rings/BaseItemRing.java | 4 +- .../core/item/base/rods/BaseItemRod.java | 25 +- .../core/item/base/rods/BaseItemRodLong.java | 45 +- .../core/item/base/rotors/BaseItemRotor.java | 4 +- .../core/item/base/screws/BaseItemScrew.java | 25 +- .../gtPlusPlus/core/item/effects/RarityEffect.java | 16 +- .../gtPlusPlus/core/item/effects/RarityEpic.java | 12 +- .../gtPlusPlus/core/item/effects/RarityRare.java | 12 +- .../core/item/effects/RarityUncommon.java | 10 +- .../core/item/general/BedLocator_Base.java | 102 +- .../gtPlusPlus/core/item/general/BufferCore.java | 91 +- .../core/item/general/ItemBlueprint.java | 377 +- .../core/item/general/ItemCloakingDevice.java | 293 +- .../core/item/general/ItemHealingDevice.java | 263 +- .../core/item/general/NuclearFuelRodBase.java | 329 +- .../core/item/general/RF2EU_Battery.java | 359 +- .../core/item/general/fuelrods/FuelRod_Base.java | 297 +- .../item/general/fuelrods/FuelRod_Thorium.java | 4 +- src/Java/gtPlusPlus/core/item/init/ItemsFoods.java | 66 +- .../core/item/materials/MaterialHandler.java | 4 +- .../core/item/tool/misc/SandstoneHammer.java | 64 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 258 +- .../core/item/tool/staballoy/MultiSpadeBase.java | 128 +- .../core/item/tool/staballoy/StaballoyAxe.java | 491 ++- .../core/item/tool/staballoy/StaballoyPickaxe.java | 509 +-- .../core/item/tool/staballoy/StaballoySpade.java | 466 +-- src/Java/gtPlusPlus/core/lib/CORE.java | 180 +- src/Java/gtPlusPlus/core/lib/LoadedMods.java | 262 +- src/Java/gtPlusPlus/core/material/ALLOY.java | 1268 ++++-- src/Java/gtPlusPlus/core/material/ELEMENT.java | 171 +- src/Java/gtPlusPlus/core/material/Material.java | 598 ++- .../core/material/MaterialGenerator.java | 82 +- .../gtPlusPlus/core/material/MaterialStack.java | 98 +- src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 101 +- src/Java/gtPlusPlus/core/proxy/ServerProxy.java | 14 +- .../core/recipe/Gregtech_Recipe_Adder.java | 144 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 607 +-- .../gtPlusPlus/core/recipe/RECIPES_General.java | 60 +- .../core/recipe/RECIPES_LaserEngraver.java | 34 +- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 216 +- .../core/recipe/RECIPES_MachineComponents.java | 621 +-- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 1259 +++--- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 61 +- src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 317 +- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 69 +- .../gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java | 218 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 39 +- src/Java/gtPlusPlus/core/slots/SlotBlueprint.java | 22 +- src/Java/gtPlusPlus/core/slots/SlotCrafting.java | 282 +- src/Java/gtPlusPlus/core/slots/SlotFrame.java | 12 +- src/Java/gtPlusPlus/core/slots/SlotGeneric.java | 12 +- src/Java/gtPlusPlus/core/slots/SlotGtTool.java | 22 +- .../gtPlusPlus/core/slots/SlotGtToolElectric.java | 74 +- .../gtPlusPlus/core/slots/SlotItemBackpackInv.java | 9 +- src/Java/gtPlusPlus/core/slots/SlotNoInput.java | 12 +- src/Java/gtPlusPlus/core/slots/SlotOutput.java | 92 +- src/Java/gtPlusPlus/core/slots/SlotRTG.java | 12 +- .../core/tileentities/ModTileEntities.java | 20 +- .../core/tileentities/base/TILE_ENTITY_BASE.java | 33 +- .../tileentities/general/TileEntityReverter.java | 466 ++- .../tileentities/machines/TileEntityCharger.java | 215 +- .../core/tileentities/machines/TileEntityNHG.java | 715 ++-- .../tileentities/machines/TileEntityWorkbench.java | 189 +- .../machines/TileEntityWorkbenchAdvanced.java | 288 +- src/Java/gtPlusPlus/core/util/BaseHandler.java | 8 +- src/Java/gtPlusPlus/core/util/ClassUtils.java | 79 +- src/Java/gtPlusPlus/core/util/Log.java | 41 +- src/Java/gtPlusPlus/core/util/LoggingUtils.java | 55 +- src/Java/gtPlusPlus/core/util/Quality.java | 87 +- src/Java/gtPlusPlus/core/util/Utils.java | 711 ++-- .../gtPlusPlus/core/util/UtilsChatFormatting.java | 266 +- src/Java/gtPlusPlus/core/util/UtilsRarity.java | 29 +- src/Java/gtPlusPlus/core/util/UtilsText.java | 24 +- .../gtPlusPlus/core/util/array/ArrayUtils.java | 16 +- src/Java/gtPlusPlus/core/util/array/Pair.java | 28 +- src/Java/gtPlusPlus/core/util/array/Triplet.java | 38 +- .../core/util/debug/DEBUG_BLOCK_ShapeSpawner.java | 145 +- .../gtPlusPlus/core/util/debug/DEBUG_INIT.java | 27 +- .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 43 +- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 1700 ++++---- .../core/util/debug/DEBUG_ScreenOverlay.java | 54 +- .../core/util/debug/DEBUG_TimerThread.java | 68 +- .../core/util/debug/UtilityGL11Debug.java | 853 ++-- .../gtPlusPlus/core/util/entity/EntityUtils.java | 85 +- src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java | 42 +- .../gtPlusPlus/core/util/fluid/FluidUtils.java | 529 +-- .../gregtech/recipehandlers/GregtechRecipe.java | 69 +- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 672 ++-- .../core/util/materials/MaterialUtils.java | 331 +- src/Java/gtPlusPlus/core/util/math/MathUtils.java | 372 +- .../core/util/networking/NetworkUtils.java | 42 +- .../util/particles/EntityParticleFXMysterious.java | 19 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 261 +- .../gtPlusPlus/core/util/player/PlayerUtils.java | 170 +- .../gtPlusPlus/core/util/player/UtilsMining.java | 204 +- .../gtPlusPlus/core/util/recipe/RecipeUtils.java | 635 +-- .../core/util/recipe/shapeless/ShapelessUtils.java | 43 +- .../core/util/reflect/ClientProxyFinder.java | 43 +- .../core/util/reflect/ReflectionUtils.java | 75 +- src/Java/gtPlusPlus/core/util/wrapper/var.java | 116 +- .../xmod/Computronics/HANDLER_Computronics.java | 35 +- src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 36 +- .../forestry/bees/alveary/AlvearyBeeListener.java | 8 +- .../bees/alveary/FR_AlvearyFrameBlock.java | 18 +- .../forestry/bees/alveary/FR_BlockAlveary.java | 373 +- .../xmod/forestry/bees/alveary/FR_TileAlveary.java | 151 +- .../bees/alveary/IAlvearyComponentAdvanced.java | 22 +- .../bees/alveary/IAlvearyFrameHousing.java | 1 + .../bees/alveary/ISidedFrameWearingInventory.java | 6 +- .../bees/alveary/TileAlvearyFrameHousing.java | 417 +- .../bees/alveary/gui/CONTAINER_FrameHousing.java | 93 +- .../bees/alveary/gui/GUI_FrameHousing.java | 72 +- .../bees/alveary/gui/InventoryFrameHousing.java | 76 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 126 +- .../xmod/forestry/bees/items/FR_StringUtil.java | 15 +- .../xmod/forestry/bees/items/MB_FrameType.java | 126 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 127 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 118 +- src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 36 +- .../xmod/gregtech/api/energy/IC2ElectricItem.java | 7 +- .../api/energy/IC2ElectricItemManager.java | 142 +- .../xmod/gregtech/api/enums/CustomGtTextures.java | 146 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 399 +- .../gregtech/api/enums/GregtechOreDictNames.java | 16 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 1908 ++++++--- .../gregtech/api/enums/GregtechTextureSet.java | 284 +- .../xmod/gregtech/api/enums/GregtechTextures.java | 323 +- .../gregtech/api/enums/GregtechToolDictNames.java | 6 +- .../gregtech/api/gui/CONTAINER_DeluxeTank.java | 98 +- .../api/gui/CONTAINER_IndustrialCentrifuge.java | 50 +- .../api/gui/CONTAINER_IronBlastFurnace.java | 36 +- .../xmod/gregtech/api/gui/CONTAINER_MatterFab.java | 44 +- .../gregtech/api/gui/CONTAINER_MultiMachine.java | 36 +- .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 173 +- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 130 +- .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 163 +- .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 48 +- .../gregtech/api/gui/GUI_IndustrialCentrifuge.java | 96 +- .../gregtech/api/gui/GUI_IronBlastFurnace.java | 43 +- .../xmod/gregtech/api/gui/GUI_MatterFab.java | 110 +- .../xmod/gregtech/api/gui/GUI_MultiMachine.java | 96 +- .../xmod/gregtech/api/gui/GUI_SafeBlock.java | 86 +- .../xmod/gregtech/api/gui/GUI_SolarGenerator.java | 67 +- .../xmod/gregtech/api/gui/GUI_SteamCondenser.java | 89 +- .../api/interfaces/GregtechItemContainer.java | 37 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 151 +- .../internal/Interface_IconContainer.java | 24 +- .../internal/Interface_ItemBehaviour.java | 28 +- .../internal/Interface_OreRecipeRegistrator.java | 25 +- .../Interface_OreRecipeRegistrator_GT.java | 22 +- .../api/interfaces/internal/Interface_Texture.java | 14 +- .../interfaces/internal/Interface_ToolStats.java | 181 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 283 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 581 +-- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 1197 +++--- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 359 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 712 ++-- .../gregtech/api/items/tools/GT_MetaGenTool.java | 723 ++-- .../gregtech/api/items/types/ToolType_Base.java | 114 +- .../api/items/types/ToolType_HardHammer.java | 201 +- .../gregtech/api/items/types/ToolType_Wrench.java | 281 +- .../GT_MetaTileEntity_DeluxeTank.java | 418 +- .../implementations/GregtechMetaCondensor.java | 301 +- .../implementations/GregtechMetaEnergyBuffer.java | 564 +-- .../GregtechMetaPipeEntityFluid.java | 547 +-- .../GregtechMetaPipeEntity_Cable.java | 443 ++- .../GregtechMetaPipeEntity_SuperConductor.java | 450 ++- .../implementations/GregtechMetaSafeBlock.java | 110 +- .../GregtechMetaSuperConductorNodeBase.java | 610 +-- .../base/GregtechMetaPipeEntityBase_Cable.java | 541 ++- .../base/GregtechMetaTileEntity.java | 86 +- .../base/GregtechMeta_MultiBlockBase.java | 1826 +++++---- .../GregtechDoubleFuelGeneratorBase.java | 597 +-- .../base/generators/GregtechMetaBoilerBase.java | 621 +-- .../generators/GregtechMetaSolarGenerator.java | 377 +- .../GregtechRocketFuelGeneratorBase.java | 554 +-- .../GregtechBaseMetaTileEntityLossless.java | 4173 +++++++++++--------- .../GregtechMetaPipeEntity_BaseSuperConductor.java | 1292 +++--- .../lossless/GregtechMetaTileEntityLossless.java | 86 +- .../GregtechMetaTileEntityLosslessBasicTank.java | 494 +-- ...chMetaTileEntityLosslessTieredMachineBlock.java | 111 +- .../base/lossless/MetaTileEntityLossless.java | 1758 +++++---- .../base/machines/GregtechMetaSafeBlockBase.java | 479 ++- .../creative/GregtechMetaCreativeEnergyBuffer.java | 380 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 33 +- .../gregtech/api/objects/GregtechItemData.java | 256 +- .../api/objects/GregtechMaterialStack.java | 84 +- .../api/objects/GregtechRenderedTexture.java | 310 +- .../ProcessingSkookumChoocherToolRecipes.java | 20 +- .../api/util/GregtechOreDictUnificator.java | 798 ++-- .../api/util/GregtechRecipeRegistrator.java | 955 +++-- .../xmod/gregtech/common/Meta_GT_Proxy.java | 1198 +++--- .../common/blocks/GregtechMetaCasingBlocks.java | 67 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 52 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 217 +- .../common/blocks/GregtechMetaCasingItems.java | 9 +- .../common/blocks/GregtechMetaItemCasings1.java | 40 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 78 +- .../common/blocks/fluid/GregtechFluidHandler.java | 339 +- .../blocks/textures/CasingTextureHandler.java | 125 +- .../blocks/textures/CasingTextureHandler2.java | 105 +- .../textures/TexturesCentrifugeMultiblock.java | 791 ++-- .../common/blocks/textures/TexturesGregtech58.java | 802 ++-- .../common/blocks/textures/TexturesGregtech59.java | 901 +++-- .../common/blocks/textures/TexturesGtBlock.java | 285 +- .../common/blocks/textures/TexturesGtTools.java | 77 +- .../common/items/MetaGeneratedGregtechItems.java | 965 ++++- .../common/items/MetaGeneratedGregtechTools.java | 26 +- .../items/behaviours/Behaviour_Choocher.java | 76 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 194 +- .../GT_MetaTileEntity_TesseractGenerator.java | 726 ++-- .../GT_MetaTileEntity_TesseractTerminal.java | 628 ++- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 267 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 255 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 156 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 253 +- .../GregtechMetaTileEntitySolarGenerator.java | 234 +- .../GregtechMetaTileEntitySuperCondensor.java | 212 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 253 +- .../machines/multi/GregtechMTE_NuclearReactor.java | 329 +- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 434 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 351 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 476 +-- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 347 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 346 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 284 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 327 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 289 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 778 ++-- .../GregtechMetaTileEntity_MassFabricator.java | 528 +-- .../multi/GregtechMetaTileEntity_MultiTank.java | 602 +-- ...chMetaTileEntity_PowerSubStationController.java | 274 +- .../storage/GT_MetaTileEntity_TieredTank.java | 258 +- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 152 +- .../common/tools/TOOL_Gregtech_Choocher.java | 315 +- .../xmod/gregtech/loaders/Gregtech_Blocks.java | 32 +- .../loaders/ProcessingToolHeadChoocher.java | 136 +- .../loaders/Processing_Textures_Items.java | 5 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 265 +- .../gregtech/loaders/RecipeGen_BlastSmelterGT.java | 225 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 153 +- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 126 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 162 +- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 259 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 460 ++- .../recipes/machines/RECIPEHANDLER_CokeOven.java | 47 +- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 66 +- .../machines/RECIPEHANDLER_MatterFabricator.java | 49 +- .../registration/gregtech/Gregtech4Content.java | 46 +- .../registration/gregtech/GregtechConduits.java | 564 +-- .../registration/gregtech/GregtechDehydrator.java | 123 +- .../gregtech/GregtechEnergyBuffer.java | 199 +- .../GregtechGeothermalThermalGenerator.java | 76 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 19 +- .../gregtech/GregtechIndustrialCentrifuge.java | 22 +- .../gregtech/GregtechIndustrialCokeOven.java | 22 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 22 +- .../gregtech/GregtechIndustrialMacerator.java | 22 +- .../gregtech/GregtechIndustrialMassFabricator.java | 22 +- .../gregtech/GregtechIndustrialMultiTank.java | 26 +- .../gregtech/GregtechIndustrialPlatePress.java | 22 +- .../gregtech/GregtechIndustrialWiremill.java | 22 +- .../gregtech/GregtechIronBlastFurnace.java | 18 +- .../registration/gregtech/GregtechLFTR.java | 23 +- .../gregtech/GregtechPowerSubStation.java | 22 +- .../gregtech/GregtechRocketFuelGenerator.java | 76 +- .../registration/gregtech/GregtechSafeBlock.java | 149 +- .../gregtech/GregtechSolarGenerators.java | 52 +- .../gregtech/GregtechSteamCondenser.java | 22 +- .../gregtech/GregtechSuperConductionPoint.java | 22 +- .../gregtech/GregtechTieredFluidTanks.java | 54 +- .../gtPlusPlus/xmod/growthcraft/HANDLER_GC.java | 19 +- .../xmod/growthcraft/booze/Register_Booze.java | 94 +- .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 191 +- .../xmod/growthcraft/fishtrap/Growthcraft_Old.java | 12 +- src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java | 26 +- .../xmod/ic2/block/RTGGenerator/BlockRTG.java | 219 +- .../xmod/ic2/block/RTGGenerator/TileEntityRTG.java | 72 +- .../ic2/block/RTGGenerator/gui/CONTAINER_RTG.java | 18 +- .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 72 +- .../kieticgenerator/IC2_BlockKineticGenerator.java | 106 +- .../ic2/block/kieticgenerator/IC2_TEComponent.java | 73 +- .../container/ContainerKineticWindgenerator.java | 30 +- .../gui/GuiKineticWindGenerator.java | 122 +- .../tileentity/TileEntityKineticWindGenerator.java | 472 +-- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 26 +- .../xmod/ic2/item/IC2_ItemGradualInteger.java | 81 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 120 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 134 +- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 81 +- src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 80 +- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 154 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 242 +- .../xmod/psychedelicraft/HANDLER_Psych.java | 23 +- .../xmod/thermalfoundation/HANDLER_TF.java | 38 +- .../block/TF_Block_Fluid_Cryotheum.java | 315 +- .../block/TF_Block_Fluid_Pyrotheum.java | 320 +- .../xmod/thermalfoundation/block/TF_Blocks.java | 39 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 80 +- .../xmod/thermalfoundation/item/TF_Items.java | 99 +- .../recipe/TF_Gregtech_Recipes.java | 69 +- 411 files changed, 47753 insertions(+), 40384 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index b3847da83d..34b5851dda 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -1,13 +1,5 @@ package gtPlusPlus; -import static gtPlusPlus.core.lib.CORE.DEBUG; -import static gtPlusPlus.core.lib.CORE.configSwitches.disableEnderIOIntegration; -import static gtPlusPlus.core.lib.CORE.configSwitches.disableIC2Recipes; -import static gtPlusPlus.core.lib.CORE.configSwitches.enableAlternativeBatteryAlloy; -import static gtPlusPlus.core.lib.CORE.configSwitches.enableAlternativeDivisionSigilRecipe; -import static gtPlusPlus.core.lib.CORE.configSwitches.enableCustomAlvearyBlocks; -import static gtPlusPlus.core.lib.CORE.configSwitches.enableThaumcraftShardUnification; - import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -28,6 +20,7 @@ import gtPlusPlus.core.handler.Recipes.RegistrationHandler; import gtPlusPlus.core.handler.events.LoginEventHandler; import gtPlusPlus.core.item.general.RF2EU_Battery; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.CORE.configSwitches; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; @@ -38,200 +31,227 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; import net.minecraftforge.common.config.Configuration; -@Mod(modid=CORE.MODID, name=CORE.name, version=CORE.VERSION, dependencies="required-after:Forge; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO;") -public class GTplusplus -implements ActionListener -{ +@Mod(modid = CORE.MODID, name = CORE.name, version = CORE.VERSION, dependencies = "required-after:Forge; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO;") +public class GTplusplus implements ActionListener { @Mod.Instance(CORE.MODID) - public static GTplusplus instance; - - protected static Meta_GT_Proxy gregtechproxy; + public static GTplusplus instance; - @SidedProxy(clientSide="gtPlusPlus.core.proxy.ClientProxy", serverSide="gtPlusPlus.core.proxy.ServerProxy") - public static CommonProxy proxy; + protected static Meta_GT_Proxy gregtechproxy; + @SidedProxy(clientSide = "gtPlusPlus.core.proxy.ClientProxy", serverSide = "gtPlusPlus.core.proxy.ServerProxy") + public static CommonProxy proxy; + public static String randomDust_A; - public static void handleConfigFile(FMLPreInitializationEvent event) { - Configuration config = new Configuration(event.getSuggestedConfigurationFile()); + public static String randomDust_B; + public static String randomDust_C; + public static String randomDust_D; + public static void handleConfigFile(final FMLPreInitializationEvent event) { + final Configuration config = new Configuration(event.getSuggestedConfigurationFile()); config.load(); - - //Debug - DEBUG = config.getBoolean("debugMode", "debug", false, "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)"); - disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration."); - - - //Machines - enableThaumcraftShardUnification = config.getBoolean("enableThaumcraftShardUnification", "machines", false, "Allows the use of TC shards across many recipes by oreDicting them into a common group."); - enableAlternativeBatteryAlloy = config.getBoolean("enableAlternativeBatteryAlloy", "machines", false, "Adds a non-Antimony using Battery Alloy. Not Balanced at all.."); - disableIC2Recipes = config.getBoolean("disableIC2Recipes", "machines", false, "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks."); - enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", "machines", false, "Utilizes Neutronium instead."); - - - //Pipes & Cables - CORE.configSwitches.enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", "gregtech", true, "Adds Custom GT Fluid Pipes."); - CORE.configSwitches.enableCustom_Cables = config.getBoolean("enableCustom_Cables", "gregtech", true, "Adds Custom GT Cables."); - - - //Single machines - CORE.configSwitches.enableMachine_SolarGenerators = config.getBoolean("enableSolarGenerators", "gregtech", false, "These may be overpowered, Consult a local electrician."); - CORE.configSwitches.enableMachine_Dehydrators = config.getBoolean("enableMachineDehydrators", "gregtech", true, "These dehydrate stuff."); - CORE.configSwitches.enableMachine_SteamConverter = config.getBoolean("enableMachineSteamConverter", "gregtech", true, "Converts IC2 steam -> Railcraft steam."); - CORE.configSwitches.enableMachine_FluidTanks = config.getBoolean("enableMachineFluidTanks", "gregtech", true, "Portable fluid tanks."); - CORE.configSwitches.enableMachine_RocketEngines = config.getBoolean("enableMachineRocketEngines", "gregtech", true, "Diesel egines with different internals, they consume less fuel overall."); - CORE.configSwitches.enableMachine_GeothermalEngines = config.getBoolean("enableMachineGeothermalEngines", "gregtech", true, "These may be overpowered, Consult a local geologist."); - - - //Multi machines - CORE.configSwitches.enabledMultiblock_AlloyBlastSmelter = config.getBoolean("enabledMultiblockAlloyBlastSmelter", "gregtech", true, "Required to smelt most high tier materials from GT++. Also smelts everything else to molten metal."); - CORE.configSwitches.enabledMultiblock_IndustrialCentrifuge = config.getBoolean("enabledMultiblockIndustrialCentrifuge", "gregtech", true, "Spin, Spin, Spiiiin."); - CORE.configSwitches.enabledMultiblock_IndustrialCokeOven = config.getBoolean("enabledMultiblockIndustrialCokeOven", "gregtech", true, "Pyro Oven Alternative, older, more realistic, better."); - CORE.configSwitches.enabledMultiblock_IndustrialElectrolyzer = config.getBoolean("enabledMultiblockIndustrialElectrolyzer", "gregtech", true, "Electrolyzes things with extra bling factor."); - CORE.configSwitches.enabledMultiblock_IndustrialMacerationStack = config.getBoolean("enabledMultiblockIndustrialMacerationStack", "gregtech", true, "A hyper efficient maceration tower, nets more bonus outputs."); - CORE.configSwitches.enabledMultiblock_IndustrialPlatePress = config.getBoolean("enabledMultiblockIndustrialPlatePress", "gregtech", true, "Industrial bendering machine thingo."); - CORE.configSwitches.enabledMultiblock_IndustrialWireMill = config.getBoolean("enabledMultiblockIndustrialWireMill", "gregtech", true, "Produces fine wire and exotic cables."); - CORE.configSwitches.enabledMultiblock_IronBlastFurnace = config.getBoolean("enabledMultiblockIronBlastFurnace", "gregtech", true, "Skip the Bronze age, very slowly."); - CORE.configSwitches.enabledMultiblock_MatterFabricator = config.getBoolean("enabledMultiblockMatterFabricator", "gregtech", true, "?FAB?RIC?ATE MA?TT?ER."); - CORE.configSwitches.enabledMultiblock_MultiTank = config.getBoolean("enabledMultiblockMultiTank", "gregtech", true, "Tall tanks, each layer adds extra fluid storage."); - CORE.configSwitches.enabledMultiblock_PowerSubstation = config.getBoolean("enabledMultiblockPowerSubstation", "gregtech", true, "For managing large power grids."); - - - //Options - RF2EU_Battery.rfPerEU = config.getInt("rfUsedPerEUForUniversalBatteries", "configurables", 4, 1, 1000, "How much RF is a single unit of EU worth? (Most mods use 4:1 ratio)"); - - //Features - enableCustomAlvearyBlocks = config.getBoolean("enableCustomAlvearyBlocks", "features", false, "Enables Custom Alveary Blocks."); - - config.save(); - } - - public static String randomDust_A; - public static String randomDust_B; - public static String randomDust_C; - public static String randomDust_D; - - protected void FirstCall(){ - Utils.LOG_WARNING("Summoning up mystic powers."); - String[] infusedDusts = {"Fire", "Water", "Earth", "Air", "Order", "Entropy"}; - int a = MathUtils.randInt(0, 5); - int b = MathUtils.randInt(0, 5); - int c = MathUtils.randInt(0, 5); - int d = MathUtils.randInt(0, 5); - String infusedDust1 = "dustInfused"+infusedDusts[a]; - String infusedDust2 = "dustInfused"+infusedDusts[b]; - String infusedDust3 = "dustInfused"+infusedDusts[c]; - String infusedDust4 = "dustInfused"+infusedDusts[d]; - Utils.LOG_INFO("Found the aspect of "+infusedDusts[a]+" to embody into energy crystals."); - Utils.LOG_INFO("Found the aspect of "+infusedDusts[b]+" to embody into energy crystals."); - Utils.LOG_INFO("Found the aspect of "+infusedDusts[c]+" to embody into energy crystals."); - Utils.LOG_INFO("Found the aspect of "+infusedDusts[d]+" to embody into energy crystals."); - randomDust_A = infusedDust1; - randomDust_B = infusedDust2; - randomDust_C = infusedDust3; - randomDust_D = infusedDust4; - //ItemStack a1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[a], 8); - //ItemStack b1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[b], 8); - //ItemStack c1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[c], 8); - //ItemStack d1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[d], 8); - - + // Debug + CORE.DEBUG = config.getBoolean("debugMode", "debug", false, + "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)"); + configSwitches.disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false, + "Disables EnderIO Integration."); + + // Machines + configSwitches.enableThaumcraftShardUnification = config.getBoolean("enableThaumcraftShardUnification", + "machines", false, + "Allows the use of TC shards across many recipes by oreDicting them into a common group."); + configSwitches.enableAlternativeBatteryAlloy = config.getBoolean("enableAlternativeBatteryAlloy", "machines", + false, "Adds a non-Antimony using Battery Alloy. Not Balanced at all.."); + configSwitches.disableIC2Recipes = config.getBoolean("disableIC2Recipes", "machines", false, + "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks."); + configSwitches.enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", + "machines", false, "Utilizes Neutronium instead."); + + // Pipes & Cables + CORE.configSwitches.enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", "gregtech", true, + "Adds Custom GT Fluid Pipes."); + CORE.configSwitches.enableCustom_Cables = config.getBoolean("enableCustom_Cables", "gregtech", true, + "Adds Custom GT Cables."); + + // Single machines + CORE.configSwitches.enableMachine_SolarGenerators = config.getBoolean("enableSolarGenerators", "gregtech", + false, "These may be overpowered, Consult a local electrician."); + CORE.configSwitches.enableMachine_Dehydrators = config.getBoolean("enableMachineDehydrators", "gregtech", true, + "These dehydrate stuff."); + CORE.configSwitches.enableMachine_SteamConverter = config.getBoolean("enableMachineSteamConverter", "gregtech", + true, "Converts IC2 steam -> Railcraft steam."); + CORE.configSwitches.enableMachine_FluidTanks = config.getBoolean("enableMachineFluidTanks", "gregtech", true, + "Portable fluid tanks."); + CORE.configSwitches.enableMachine_RocketEngines = config.getBoolean("enableMachineRocketEngines", "gregtech", + true, "Diesel egines with different internals, they consume less fuel overall."); + CORE.configSwitches.enableMachine_GeothermalEngines = config.getBoolean("enableMachineGeothermalEngines", + "gregtech", true, "These may be overpowered, Consult a local geologist."); + + // Multi machines + CORE.configSwitches.enabledMultiblock_AlloyBlastSmelter = config.getBoolean( + "enabledMultiblockAlloyBlastSmelter", "gregtech", true, + "Required to smelt most high tier materials from GT++. Also smelts everything else to molten metal."); + CORE.configSwitches.enabledMultiblock_IndustrialCentrifuge = config + .getBoolean("enabledMultiblockIndustrialCentrifuge", "gregtech", true, "Spin, Spin, Spiiiin."); + CORE.configSwitches.enabledMultiblock_IndustrialCokeOven = config.getBoolean( + "enabledMultiblockIndustrialCokeOven", "gregtech", true, + "Pyro Oven Alternative, older, more realistic, better."); + CORE.configSwitches.enabledMultiblock_IndustrialElectrolyzer = config.getBoolean( + "enabledMultiblockIndustrialElectrolyzer", "gregtech", true, + "Electrolyzes things with extra bling factor."); + CORE.configSwitches.enabledMultiblock_IndustrialMacerationStack = config.getBoolean( + "enabledMultiblockIndustrialMacerationStack", "gregtech", true, + "A hyper efficient maceration tower, nets more bonus outputs."); + CORE.configSwitches.enabledMultiblock_IndustrialPlatePress = config.getBoolean( + "enabledMultiblockIndustrialPlatePress", "gregtech", true, "Industrial bendering machine thingo."); + CORE.configSwitches.enabledMultiblock_IndustrialWireMill = config.getBoolean( + "enabledMultiblockIndustrialWireMill", "gregtech", true, "Produces fine wire and exotic cables."); + CORE.configSwitches.enabledMultiblock_IronBlastFurnace = config.getBoolean("enabledMultiblockIronBlastFurnace", + "gregtech", true, "Skip the Bronze age, very slowly."); + CORE.configSwitches.enabledMultiblock_MatterFabricator = config.getBoolean("enabledMultiblockMatterFabricator", + "gregtech", true, "?FAB?RIC?ATE MA?TT?ER."); + CORE.configSwitches.enabledMultiblock_MultiTank = config.getBoolean("enabledMultiblockMultiTank", "gregtech", + true, "Tall tanks, each layer adds extra fluid storage."); + CORE.configSwitches.enabledMultiblock_PowerSubstation = config.getBoolean("enabledMultiblockPowerSubstation", + "gregtech", true, "For managing large power grids."); + + // Options + RF2EU_Battery.rfPerEU = config.getInt("rfUsedPerEUForUniversalBatteries", "configurables", 4, 1, 1000, + "How much RF is a single unit of EU worth? (Most mods use 4:1 ratio)"); + + // Features + configSwitches.enableCustomAlvearyBlocks = config.getBoolean("enableCustomAlvearyBlocks", "features", false, + "Enables Custom Alveary Blocks."); + + config.save(); } - @SideOnly(value=Side.CLIENT) - public static void loadTextures(){ + @SideOnly(value = Side.CLIENT) + public static void loadTextures() { Utils.LOG_INFO("Loading some textures on the client."); - //Tools - Utils.LOG_WARNING("Processing texture: "+TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath()); + // Tools + Utils.LOG_WARNING("Processing texture: " + TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath()); - //Blocks - Utils.LOG_WARNING("Processing texture: "+TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath()); + // Blocks + Utils.LOG_WARNING( + "Processing texture: " + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath()); } + @Override + public void actionPerformed(final ActionEvent arg0) { + } + protected void dumpGtRecipeMap(final GT_Recipe_Map r) { + final Collection x = r.mRecipeList; + Utils.LOG_INFO("Dumping " + r.mUnlocalizedName + " Recipes for Debug."); + for (final GT_Recipe newBo : x) { + Utils.LOG_INFO("========================"); + Utils.LOG_INFO("Dumping Input: " + ItemUtils.getArrayStackNames(newBo.mInputs)); + Utils.LOG_INFO("Dumping Inputs " + ItemUtils.getFluidArrayStackNames(newBo.mFluidInputs)); + Utils.LOG_INFO("Dumping Duration: " + newBo.mDuration); + Utils.LOG_INFO("Dumping EU/t: " + newBo.mEUt); + Utils.LOG_INFO("Dumping Output: " + ItemUtils.getArrayStackNames(newBo.mOutputs)); + Utils.LOG_INFO("Dumping Output: " + ItemUtils.getFluidArrayStackNames(newBo.mFluidOutputs)); + Utils.LOG_INFO("========================"); + } + } - //Pre-Init - @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) - { - Utils.LOG_INFO("Loading "+CORE.name+" V"+CORE.VERSION); - Utils.LOG_INFO("Latest is V"+CORE.MASTER_VERSION+". Updated? "+Utils.isModUpToDate()); - FirstCall(); - FMLCommonHandler.instance().bus().register(new LoginEventHandler()); - Utils.LOG_INFO("Login Handler Initialized"); + protected void FirstCall() { + Utils.LOG_WARNING("Summoning up mystic powers."); + final String[] infusedDusts = { + "Fire", "Water", "Earth", "Air", "Order", "Entropy" + }; + final int a = MathUtils.randInt(0, 5); + final int b = MathUtils.randInt(0, 5); + final int c = MathUtils.randInt(0, 5); + final int d = MathUtils.randInt(0, 5); + final String infusedDust1 = "dustInfused" + infusedDusts[a]; + final String infusedDust2 = "dustInfused" + infusedDusts[b]; + final String infusedDust3 = "dustInfused" + infusedDusts[c]; + final String infusedDust4 = "dustInfused" + infusedDusts[d]; + Utils.LOG_INFO("Found the aspect of " + infusedDusts[a] + " to embody into energy crystals."); + Utils.LOG_INFO("Found the aspect of " + infusedDusts[b] + " to embody into energy crystals."); + Utils.LOG_INFO("Found the aspect of " + infusedDusts[c] + " to embody into energy crystals."); + Utils.LOG_INFO("Found the aspect of " + infusedDusts[d] + " to embody into energy crystals."); + GTplusplus.randomDust_A = infusedDust1; + GTplusplus.randomDust_B = infusedDust2; + GTplusplus.randomDust_C = infusedDust3; + GTplusplus.randomDust_D = infusedDust4; + // ItemStack a1 = + // UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[a], + // 8); + // ItemStack b1 = + // UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[b], + // 8); + // ItemStack c1 = + // UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[c], + // 8); + // ItemStack d1 = + // UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[d], + // 8); - handleConfigFile(event); - proxy.registerTileEntities(); - proxy.registerRenderThings(); - HANDLER_GT.mMaterialProperties = new GT_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "MaterialProperties.cfg"))); - proxy.preInit(event); } - //Init + // Init @Mod.EventHandler - public void init(FMLInitializationEvent event) - { - proxy.init(event); - //MinecraftForge.EVENT_BUS.register(this); - //FMLCommonHandler.instance().bus().register(this); - proxy.registerNetworkStuff(); + public void init(final FMLInitializationEvent event) { + GTplusplus.proxy.init(event); + // MinecraftForge.EVENT_BUS.register(this); + // FMLCommonHandler.instance().bus().register(this); + GTplusplus.proxy.registerNetworkStuff(); } - //Post-Init + // Post-Init @Mod.EventHandler - public void postInit(FMLPostInitializationEvent event) { - proxy.postInit(event); + public void postInit(final FMLPostInitializationEvent event) { + GTplusplus.proxy.postInit(event); - if (DEBUG){ - dumpGtRecipeMap(Gregtech_Recipe_Map.sChemicalDehydratorRecipes); - dumpGtRecipeMap(Gregtech_Recipe_Map.sCokeOvenRecipes); - dumpGtRecipeMap(Gregtech_Recipe_Map.sMatterFab2Recipes); + if (CORE.DEBUG) { + this.dumpGtRecipeMap(Gregtech_Recipe_Map.sChemicalDehydratorRecipes); + this.dumpGtRecipeMap(Gregtech_Recipe_Map.sCokeOvenRecipes); + this.dumpGtRecipeMap(Gregtech_Recipe_Map.sMatterFab2Recipes); } - dumpGtRecipeMap(Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes); + this.dumpGtRecipeMap(Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes); - //~ + // ~ ReflectionUtils.becauseIWorkHard(); Utils.LOG_INFO("Activating GT OreDictionary Handler, this can take some time."); Utils.LOG_INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); - Utils.LOG_INFO("| Recipes succesfully Loaded: "+RegistrationHandler.recipesSuccess+" | Failed: "+RegistrationHandler.recipesFailed + " |"); + Utils.LOG_INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: " + + RegistrationHandler.recipesFailed + " |"); Utils.LOG_INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); Meta_GT_Proxy.activateOreDictHandler(); Utils.LOG_INFO("Finally, we are finished. Have some cripsy bacon as a reward."); } - @EventHandler - public void serverStarting(FMLServerStartingEvent event) - { - event.registerServerCommand(new CommandMath()); - } - + // Pre-Init @Mod.EventHandler - public void serverStopping(FMLServerStoppingEvent event) - { + public void preInit(final FMLPreInitializationEvent event) { + Utils.LOG_INFO("Loading " + CORE.name + " V" + CORE.VERSION); + Utils.LOG_INFO("Latest is V" + CORE.MASTER_VERSION + ". Updated? " + Utils.isModUpToDate()); + this.FirstCall(); + FMLCommonHandler.instance().bus().register(new LoginEventHandler()); + Utils.LOG_INFO("Login Handler Initialized"); + GTplusplus.handleConfigFile(event); + GTplusplus.proxy.registerTileEntities(); + GTplusplus.proxy.registerRenderThings(); + HANDLER_GT.mMaterialProperties = new GT_Config(new Configuration( + new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "MaterialProperties.cfg"))); + GTplusplus.proxy.preInit(event); } - @Override - public void actionPerformed(ActionEvent arg0) { - + @EventHandler + public void serverStarting(final FMLServerStartingEvent event) { + event.registerServerCommand(new CommandMath()); } - protected void dumpGtRecipeMap(GT_Recipe_Map r){ - Collection x = r.mRecipeList; - Utils.LOG_INFO("Dumping "+r.mUnlocalizedName+" Recipes for Debug."); - for(GT_Recipe newBo : x){ - Utils.LOG_INFO("========================"); - Utils.LOG_INFO("Dumping Input: "+ItemUtils.getArrayStackNames(newBo.mInputs)); - Utils.LOG_INFO("Dumping Inputs "+ItemUtils.getFluidArrayStackNames(newBo.mFluidInputs)); - Utils.LOG_INFO("Dumping Duration: "+newBo.mDuration); - Utils.LOG_INFO("Dumping EU/t: "+newBo.mEUt); - Utils.LOG_INFO("Dumping Output: "+ItemUtils.getArrayStackNames(newBo.mOutputs)); - Utils.LOG_INFO("Dumping Output: "+ItemUtils.getFluidArrayStackNames(newBo.mFluidOutputs)); - Utils.LOG_INFO("========================"); - } + @Mod.EventHandler + public void serverStopping(final FMLServerStoppingEvent event) { + } } diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index 2e6a7c3e07..69ecb9ed5b 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -13,47 +13,48 @@ import net.minecraftforge.fluids.Fluid; public final class ModBlocks { - public static Block blockWorkbench; - public static Block blockWorkbenchAdvanced; - //Blocks - //public static Block blockBloodSteel; - //public static Block blockStaballoy; + public static Block blockWorkbench; + public static Block blockWorkbenchAdvanced; + // 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 blockMetaTileEntity; - public static Block blockHeliumGenerator; - public static Block blockNHG; - public static Block blockCharger; - - public static Block MatterFabricatorEffectBlock; - - public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels"); - public static Block blockFluidJackDaniels; - public static Block blockCasings2Misc; + public static Block blockGriefSaver; + public static Block blockCasingsMisc; + public static Block blockMetaTileEntity; + public static Block blockHeliumGenerator; + public static Block blockNHG; + public static Block blockCharger; + public static Block MatterFabricatorEffectBlock; + public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels"); + public static Block blockFluidJackDaniels; + public static Block blockCasings2Misc; public static void init() { Utils.LOG_INFO("Initializing Blocks."); - //blockGriefSaver = new TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); + // blockGriefSaver = new + // TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); - registerBlocks(); + ModBlocks.registerBlocks(); } - public static void registerBlocks(){ + public static void registerBlocks() { Utils.LOG_INFO("Registering Blocks."); - GameRegistry.registerBlock(MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F).setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), "blockMFEffect"); + GameRegistry.registerBlock( + ModBlocks.MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F) + .setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), + "blockMFEffect"); - //Fluids + // Fluids FluidRegistryHandler.registerFluids(); - //Workbench - blockWorkbench = new Machine_Workbench().setHardness(1.5F); - blockWorkbenchAdvanced = new Machine_WorkbenchAdvanced().setHardness(2.5F); + // Workbench + ModBlocks.blockWorkbench = new Machine_Workbench().setHardness(1.5F); + ModBlocks.blockWorkbenchAdvanced = new Machine_WorkbenchAdvanced().setHardness(2.5F); - } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java index b7ac24a71b..0160da883f 100644 --- a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java @@ -9,23 +9,25 @@ import net.minecraft.world.World; public class AdvancedBlock extends Block { - protected AdvancedBlock(String unlocalizedName, Material material, CreativeTabs x, float blockHardness, float blockResistance, float blockLightLevel, - String blockHarvestTool, int blockHarvestLevel, 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(World p_149727_1_, int p_149727_2_, int p_149727_3_, int p_149727_4_, EntityPlayer p_149727_5_, int p_149727_6_, float p_149727_7_, float p_149727_8_, 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 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; + } } diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java index c95f37d9c5..64ee68224e 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java @@ -8,45 +8,43 @@ import net.minecraft.block.material.Material; public class BasicBlock extends Block { - public BasicBlock(final String unlocalizedName, final Material material) { - super(material); - this.setBlockName(Utils.sanitizeString(unlocalizedName)); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabBlock); - this.setHardness(2.0F); - this.setResistance(6.0F); - this.setLightLevel(0.0F); - this.setHarvestLevel("pickaxe", 2); - this.setStepSound(soundTypeMetal); - } - - - public static enum BlockTypes { - STANDARD("blockBlock", "pickaxe", soundTypeStone), - FRAME("blockFrameGt", "wrench", soundTypeMetal); - - 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 TEXTURE_NAME; - } - - public String getHarvestTool(){ - return HARVEST_TOOL; - } - - public SoundType getBlockSoundType(){ - return soundOfBlock; - } - - } - + public static enum BlockTypes { + STANDARD("blockBlock", "pickaxe", Block.soundTypeStone), FRAME("blockFrameGt", "wrench", Block.soundTypeMetal); + + 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 SoundType getBlockSoundType() { + return this.soundOfBlock; + } + + public String getHarvestTool() { + return this.HARVEST_TOOL; + } + + public String getTexture() { + return this.TEXTURE_NAME; + } + + } + + public BasicBlock(final String unlocalizedName, final Material material) { + super(material); + this.setBlockName(Utils.sanitizeString(unlocalizedName)); + this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabBlock); + this.setHardness(2.0F); + this.setResistance(6.0F); + this.setLightLevel(0.0F); + this.setHarvestLevel("pickaxe", 2); + this.setStepSound(Block.soundTypeMetal); + } + } diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index 5d003fc2a3..f389f5bf32 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -13,137 +13,141 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; -public class BlockBaseModular extends BasicBlock{ +public class BlockBaseModular extends BasicBlock { - protected int blockColour; - protected BlockTypes thisBlock; - protected String thisBlockMaterial; - protected final String thisBlockType; + protected int blockColour; + protected BlockTypes thisBlock; + protected String thisBlockMaterial; + protected final String thisBlockType; - public BlockBaseModular(String unlocalizedName, String blockMaterial, BlockTypes blockType, int colour) { - super(blockType.getTexture()+unlocalizedName, Material.iron); + public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, + final int colour) { + super(blockType.getTexture() + unlocalizedName, Material.iron); this.setHarvestLevel(blockType.getHarvestTool(), 2); - this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture()); + this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture()); this.blockColour = colour; this.thisBlock = blockType; this.thisBlockMaterial = blockMaterial; this.thisBlockType = blockType.name().toUpperCase(); - this.setBlockName(GetProperName()); - - if (!CORE.DEBUG){ - //Utils.LOG_INFO("=============Block Info Dump============="); - //Utils.LOG_INFO("thisBlock.name().toLowerCase() - "+thisBlock.name().toLowerCase()); - //Utils.LOG_INFO("This Blocks Type - "+thisBlockType); - //Utils.LOG_INFO("BlockTypes.STANDARD.name().toLowerCase() - "+BlockTypes.STANDARD.name().toLowerCase()); - //Utils.LOG_INFO("BlockTypes.FRAME.name().toLowerCase() - "+BlockTypes.FRAME.name().toLowerCase()); - //Utils.LOG_INFO("blockMaterial - "+blockMaterial); - //Utils.LOG_INFO("=========================================="); + this.setBlockName(this.GetProperName()); + + if (!CORE.DEBUG) { + // Utils.LOG_INFO("=============Block Info Dump============="); + // Utils.LOG_INFO("thisBlock.name().toLowerCase() - + // "+thisBlock.name().toLowerCase()); + // Utils.LOG_INFO("This Blocks Type - "+thisBlockType); + // Utils.LOG_INFO("BlockTypes.STANDARD.name().toLowerCase() - + // "+BlockTypes.STANDARD.name().toLowerCase()); + // Utils.LOG_INFO("BlockTypes.FRAME.name().toLowerCase() - + // "+BlockTypes.FRAME.name().toLowerCase()); + // Utils.LOG_INFO("blockMaterial - "+blockMaterial); + // Utils.LOG_INFO("=========================================="); } - - if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){ - LanguageRegistry.addName(this, "Block of "+blockMaterial); - //Utils.LOG_INFO("Registered Block in Language Registry as: "+"Block of "+blockMaterial); + + if (this.thisBlockType == BlockTypes.STANDARD.name().toUpperCase()) { + LanguageRegistry.addName(this, "Block of " + blockMaterial); + // Utils.LOG_INFO("Registered Block in Language Registry as: + // "+"Block of "+blockMaterial); } - else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){ - LanguageRegistry.addName(this, blockMaterial+ " Frame Box"); - //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box"); + else if (this.thisBlockType == BlockTypes.FRAME.name().toUpperCase()) { + LanguageRegistry.addName(this, blockMaterial + " Frame Box"); + // Utils.LOG_INFO("Registered Block in Language Registry as: + // "+blockMaterial+ " Frame Box"); } else { LanguageRegistry.addName(this, blockMaterial); - //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial); - } - - //setOreDict(unlocalizedName, blockType); - if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){ - GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); - //Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block of "+blockMaterial); + // Utils.LOG_INFO("Registered Block in Language Registry as: + // "+blockMaterial); } - else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){ - GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); - //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box"); + + // setOreDict(unlocalizedName, blockType); + if (this.thisBlockType == BlockTypes.STANDARD.name().toUpperCase()) { + GameRegistry.registerBlock(this, ItemBlockGtBlock.class, + Utils.sanitizeString(blockType.getTexture() + unlocalizedName)); + // Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block + // of "+blockMaterial); + } + else if (this.thisBlockType == BlockTypes.FRAME.name().toUpperCase()) { + GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, + Utils.sanitizeString(blockType.getTexture() + unlocalizedName)); + // Utils.LOG_INFO("Registered Block in Block Registry as: + // "+blockMaterial+" Frame Box"); } else { - GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); - //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial); + GameRegistry.registerBlock(this, ItemBlockGtBlock.class, + Utils.sanitizeString(blockType.getTexture() + unlocalizedName)); + // Utils.LOG_INFO("Registered Block in Block Registry as: + // "+blockMaterial); } - - + } - /** - * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha - */ @Override - @SideOnly(Side.CLIENT) - public int getRenderBlockPass() - { - if (thisBlock == BlockTypes.FRAME){ - return 1; + public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4) { + + if (this.blockColour == 0) { + return MathUtils.generateSingularRandomHexValue(); } - return 0; + + return this.blockColour; } - - /*@Override - public String getLocalizedName() { - String tempIngot; - if (thisBlock == BlockTypes.STANDARD){ - tempIngot = "Block of "+thisBlockMaterial; - } - else if (thisBlock == BlockTypes.FRAME){ - tempIngot = thisBlockMaterial + " Frame Box"; - } - else { - tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot"); - } - return tempIngot; - }*/ - + /* + * @Override public String getLocalizedName() { String tempIngot; if + * (thisBlock == BlockTypes.STANDARD){ tempIngot = "Block of " + * +thisBlockMaterial; } else if (thisBlock == BlockTypes.FRAME){ tempIngot + * = thisBlockMaterial + " Frame Box"; } else { + * + * tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot"); } + * return tempIngot; } + */ + public String GetProperName() { - String tempIngot; - if (thisBlock == BlockTypes.STANDARD){ - tempIngot = "Block of "+thisBlockMaterial; + String tempIngot; + if (this.thisBlock == BlockTypes.STANDARD) { + tempIngot = "Block of " + this.thisBlockMaterial; } - else if (thisBlock == BlockTypes.FRAME){ - tempIngot = thisBlockMaterial + " Frame Box"; + else if (this.thisBlock == BlockTypes.FRAME) { + tempIngot = this.thisBlockMaterial + " Frame Box"; } else { - tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot"); + tempIngot = this.getUnlocalizedName().replace("tile.blockGt", "ingot"); } return tempIngot; } - @Override - public boolean isOpaqueCube() - { - return false; - } - + /** + * Returns which pass should this block be rendered on. 0 for solids and 1 + * for alpha + */ @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIcon) - { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + thisBlock.getTexture()); + public int getRenderBlockPass() { + if (this.thisBlock == BlockTypes