From ae21012d216df71f31aed6fbc9d76215fc24ceed Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 12:58:47 +1000 Subject: + New texture for the slow builders ring. + Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project. --- src/Java/gtPlusPlus/GTplusplus.java | 107 +- src/Java/gtPlusPlus/core/block/ModBlocks.java | 10 +- .../gtPlusPlus/core/block/base/AdvancedBlock.java | 36 +- .../gtPlusPlus/core/block/base/BasicBlock.java | 90 +- .../core/block/base/BlockBaseModular.java | 104 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 40 +- src/Java/gtPlusPlus/core/block/base/MetaBlock.java | 36 +- .../core/block/base/MultiTextureBlock.java | 48 +- .../gtPlusPlus/core/block/general/FirePit.java | 223 +- .../gtPlusPlus/core/block/general/LightGlass.java | 81 +- .../core/block/general/antigrief/TowerDevice.java | 513 +-- .../general/fluids/BlockFluidJackDaniels.java | 78 +- .../core/block/machine/BlockGtFrameBox.java | 28 +- .../gtPlusPlus/core/block/machine/FishTrap.java | 96 +- .../core/block/machine/Machine_Workbench.java | 134 +- .../block/machine/Machine_WorkbenchAdvanced.java | 32 +- .../machine/heliumgen/block/HeliumGenerator.java | 286 +- .../container/ContainerHeliumGenerator.java | 29 +- .../machine/heliumgen/gui/GUIHeliumGenerator.java | 107 +- .../machine/heliumgen/slots/InvSlotRadiation.java | 40 +- .../tileentity/TileEntityHeliumGenerator.java | 247 +- src/Java/gtPlusPlus/core/commands/CommandMath.java | 150 +- .../gtPlusPlus/core/commands/CommandUtils.java | 4 +- src/Java/gtPlusPlus/core/common/BasePlayer.java | 88 +- src/Java/gtPlusPlus/core/common/CommonProxy.java | 45 +- .../core/common/compat/COMPAT_BigReactors.java | 4 +- .../common/compat/COMPAT_CompactWindmills.java | 77 +- .../core/common/compat/COMPAT_EnderIO.java | 4 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 15 +- .../core/common/compat/COMPAT_MorePlanets.java | 8 +- .../core/common/compat/COMPAT_PneumaticCraft.java | 6 +- .../core/common/compat/COMPAT_RFTools.java | 6 +- .../core/common/compat/COMPAT_SimplyJetpacks.java | 6 +- .../core/common/compat/COMPAT_Thaumcraft.java | 8 +- .../core/container/Container_BackpackBase.java | 39 +- .../core/container/Container_FishTrap.java | 59 +- .../core/container/Container_Workbench.java | 186 +- .../container/Container_WorkbenchAdvanced.java | 170 +- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 2 +- .../creative/tabs/MiscUtilCreativeTabBlock.java | 2 +- .../creative/tabs/MiscUtilCreativeTabMachines.java | 4 +- .../creative/tabs/MiscUtilCreativeTabMisc.java | 2 +- .../creative/tabs/MiscUtilCreativeTabOther.java | 2 +- .../creative/tabs/MiscUtilCreativeTabTools.java | 2 +- .../gtPlusPlus/core/entity/EntityTeleportFX.java | 456 +-- .../gtPlusPlus/core/fluids/BlockFluidBase.java | 158 +- .../core/fluids/FluidRegistryHandler.java | 41 +- src/Java/gtPlusPlus/core/fluids/GenericFluid.java | 70 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 24 +- src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java | 10 +- src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java | 54 +- .../gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 48 +- .../gtPlusPlus/core/gui/machine/GUI_FishTrap.java | 25 +- .../gtPlusPlus/core/gui/machine/GUI_Workbench.java | 29 +- .../core/gui/machine/GUI_WorkbenchAdvanced.java | 25 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 88 +- .../core/handler/COMPAT_IntermodStaging.java | 4 +- .../gtPlusPlus/core/handler/CraftingManager.java | 4 +- src/Java/gtPlusPlus/core/handler/GuiHandler.java | 44 +- .../handler/Recipes/LateRegistrationHandler.java | 16 +- .../core/handler/Recipes/RegistrationHandler.java | 10 +- .../core/handler/events/BlockEventHandler.java | 60 +- .../core/handler/events/CustomMovementHandler.java | 38 +- .../core/handler/events/LoginEventHandler.java | 32 +- .../events/PickaxeBlockBreakEventHandler.java | 47 +- .../core/handler/events/SneakManager.java | 8 +- .../handler/events/UnbreakableBlockManager.java | 38 +- .../core/handler/render/CapeHandler.java | 184 +- .../core/handler/render/FirepitModel.java | 134 +- .../core/handler/render/FirepitRender.java | 30 +- .../workbench/Workbench_CraftingHandler.java | 80 +- .../handler/workbench/Workbench_RecipeSorter.java | 43 +- .../gtPlusPlus/core/interfaces/IItemBlueprint.java | 56 +- .../core/inventories/BaseInventoryBackpack.java | 105 +- .../core/inventories/InventoryFishTrap.java | 113 +- .../core/inventories/InventoryWorkbenchChest.java | 124 +- .../inventories/InventoryWorkbenchCrafting.java | 138 +- .../InventoryWorkbenchHoloCrafting.java | 54 +- .../inventories/InventoryWorkbenchHoloSlots.java | 96 +- .../core/inventories/InventoryWorkbenchTools.java | 122 +- .../InventoryWorkbenchToolsElectric.java | 126 +- src/Java/gtPlusPlus/core/item/ModItems.java | 148 +- src/Java/gtPlusPlus/core/item/base/BaseEuItem.java | 701 ++-- .../core/item/base/BaseItemBackpack.java | 88 +- .../gtPlusPlus/core/item/base/BaseItemBrain.java | 50 +- .../core/item/base/BaseItemComponent.java | 125 +- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 21 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 47 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 39 +- .../core/item/base/BaseItemWithCharge.java | 43 +- .../core/item/base/BaseItemWithDamageValue.java | 13 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 401 +- src/Java/gtPlusPlus/core/item/base/CoreItem.java | 94 +- .../core/item/base/bolts/BaseItemBolt.java | 2 +- .../core/item/base/cell/BaseItemCell.java | 34 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 52 +- .../core/item/base/dusts/BaseItemDust.java | 168 +- .../core/item/base/dusts/BaseItemDustAbstract.java | 23 +- .../core/item/base/dusts/BaseItemDustUnique.java | 186 +- .../item/base/dusts/decimal/BaseItemCentidust.java | 29 +- .../item/base/dusts/decimal/BaseItemDecidust.java | 29 +- .../core/item/base/foods/BaseItemFood.java | 19 +- .../core/item/base/foods/BaseItemHotFood.java | 47 +- .../core/item/base/gears/BaseItemGear.java | 4 +- .../core/item/base/ingots/BaseItemIngot.java | 30 +- .../core/item/base/ingots/BaseItemIngotHot.java | 36 +- .../core/item/base/ingots/BaseItemIngotOLD.java | 100 - .../core/item/base/ingots/BaseItemIngot_OLD.java | 100 + .../core/item/base/itemblock/ItemBlockBase.java | 22 +- .../core/item/base/itemblock/ItemBlockFluid.java | 57 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 69 +- .../item/base/itemblock/ItemBlockGtFrameBox.java | 12 +- .../item/base/itemblock/ItemBlockTileEntity.java | 44 +- .../core/item/base/nugget/BaseItemNugget.java | 4 +- .../core/item/base/plates/BaseItemPlate.java | 8 +- .../core/item/base/plates/BaseItemPlateDouble.java | 8 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 68 + .../core/item/base/rings/BaseItemRing.java | 2 +- .../core/item/base/rods/BaseItemRod.java | 16 +- .../core/item/base/rods/BaseItemRodLong.java | 28 +- .../core/item/base/rotors/BaseItemRotor.java | 2 +- .../core/item/base/screws/BaseItemScrew.java | 24 +- .../gtPlusPlus/core/item/effects/RarityEffect.java | 20 +- .../gtPlusPlus/core/item/effects/RarityEpic.java | 16 +- .../gtPlusPlus/core/item/effects/RarityRare.java | 16 +- .../core/item/effects/RarityUncommon.java | 12 +- .../core/item/general/BedLocator_Base.java | 77 +- .../gtPlusPlus/core/item/general/BufferCore.java | 59 +- .../core/item/general/ItemBasicFirestarter.java | 20 +- .../core/item/general/ItemBlueprint.java | 124 +- .../core/item/general/ItemCloakingDevice.java | 115 +- .../core/item/general/ItemHealingDevice.java | 117 +- .../core/item/general/ItemSlowBuildingRing.java | 61 +- .../core/item/general/NuclearFuelRodBase.java | 334 +- .../core/item/general/RF2EU_Battery.java | 145 +- .../core/item/general/fuelrods/FuelRod_Base.java | 171 +- .../item/general/fuelrods/FuelRod_Thorium.java | 2 +- src/Java/gtPlusPlus/core/item/init/ItemsFoods.java | 20 +- .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 88 +- .../core/item/materials/MaterialHandler.java | 6 +- .../core/item/tool/misc/SandstoneHammer.java | 27 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 137 +- .../core/item/tool/staballoy/MultiSpadeBase.java | 52 +- .../core/item/tool/staballoy/StaballoyAxe.java | 323 +- .../core/item/tool/staballoy/StaballoyPickaxe.java | 229 +- .../core/item/tool/staballoy/StaballoySpade.java | 203 +- src/Java/gtPlusPlus/core/lib/CORE.java | 65 +- src/Java/gtPlusPlus/core/lib/LoadedMods.java | 33 +- src/Java/gtPlusPlus/core/material/ALLOY.java | 152 +- src/Java/gtPlusPlus/core/material/ELEMENT.java | 26 +- src/Java/gtPlusPlus/core/material/Material.java | 322 +- .../core/material/MaterialGenerator.java | 60 +- .../gtPlusPlus/core/material/MaterialStack.java | 35 +- .../core/material/nuclear/FLUORIDES.java | 100 +- .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 16 +- .../core/material/state/MaterialState.java | 2 +- src/Java/gtPlusPlus/core/players/FakeFarmer.java | 29 +- src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 82 +- src/Java/gtPlusPlus/core/proxy/ServerProxy.java | 8 +- .../core/recipe/Gregtech_Recipe_Adder.java | 40 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 288 +- .../gtPlusPlus/core/recipe/RECIPES_General.java | 2 +- .../core/recipe/RECIPES_LaserEngraver.java | 12 +- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 47 +- .../core/recipe/RECIPES_MachineComponents.java | 24 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 143 +- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 50 +- src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 4 +- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 16 +- .../gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java | 8 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 16 +- src/Java/gtPlusPlus/core/slots/SlotBlueprint.java | 6 +- src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java | 22 +- src/Java/gtPlusPlus/core/slots/SlotCrafting.java | 295 +- src/Java/gtPlusPlus/core/slots/SlotFrame.java | 6 +- src/Java/gtPlusPlus/core/slots/SlotGeneric.java | 4 +- src/Java/gtPlusPlus/core/slots/SlotGtTool.java | 6 +- .../gtPlusPlus/core/slots/SlotGtToolElectric.java | 30 +- .../gtPlusPlus/core/slots/SlotItemBackpackInv.java | 4 +- src/Java/gtPlusPlus/core/slots/SlotNoInput.java | 4 +- src/Java/gtPlusPlus/core/slots/SlotOutput.java | 22 +- src/Java/gtPlusPlus/core/slots/SlotRTG.java | 4 +- .../core/tileentities/ModTileEntities.java | 2 +- .../core/tileentities/base/TILE_ENTITY_BASE.java | 22 +- .../tileentities/general/TileEntityFirepit.java | 22 +- .../tileentities/general/TileEntityFishTrap.java | 88 +- .../tileentities/general/TileEntityReverter.java | 113 +- .../tileentities/machines/TileEntityWorkbench.java | 89 +- .../machines/TileEntityWorkbenchAdvanced.java | 89 +- src/Java/gtPlusPlus/core/util/BaseHandler.java | 6 +- src/Java/gtPlusPlus/core/util/ClassUtils.java | 18 +- src/Java/gtPlusPlus/core/util/Log.java | 42 +- src/Java/gtPlusPlus/core/util/LoggingUtils.java | 52 +- src/Java/gtPlusPlus/core/util/Quality.java | 21 +- src/Java/gtPlusPlus/core/util/Utils.java | 376 +- .../gtPlusPlus/core/util/UtilsChatFormatting.java | 282 +- src/Java/gtPlusPlus/core/util/UtilsRarity.java | 30 +- src/Java/gtPlusPlus/core/util/UtilsText.java | 4 +- .../gtPlusPlus/core/util/array/ArrayUtils.java | 14 +- src/Java/gtPlusPlus/core/util/array/Pair.java | 22 +- src/Java/gtPlusPlus/core/util/array/Triplet.java | 28 +- .../core/util/debug/DEBUG_BLOCK_ShapeSpawner.java | 61 +- .../gtPlusPlus/core/util/debug/DEBUG_INIT.java | 6 +- .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 34 +- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 1653 +++++---- .../core/util/debug/DEBUG_ScreenOverlay.java | 14 +- .../core/util/debug/DEBUG_TimerThread.java | 59 +- .../core/util/debug/UtilityGL11Debug.java | 618 ++-- .../gtPlusPlus/core/util/entity/EntityUtils.java | 40 +- src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java | 38 +- .../gtPlusPlus/core/util/fluid/FluidUtils.java | 168 +- .../gregtech/recipehandlers/GregtechRecipe.java | 35 +- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 285 +- .../core/util/materials/MaterialUtils.java | 85 +- src/Java/gtPlusPlus/core/util/math/MathUtils.java | 236 +- .../core/util/networking/NetworkUtils.java | 118 +- .../core/util/particles/BlockBreakParticles.java | 8 +- .../util/particles/EntityParticleFXMysterious.java | 18 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 79 +- .../gtPlusPlus/core/util/player/PlayerUtils.java | 78 +- .../gtPlusPlus/core/util/player/UtilsMining.java | 84 +- .../gtPlusPlus/core/util/recipe/RecipeUtils.java | 145 +- .../core/util/recipe/shapeless/ShapelessUtils.java | 15 +- .../core/util/reflect/ClientProxyFinder.java | 42 +- .../core/util/reflect/ReflectionUtils.java | 38 +- src/Java/gtPlusPlus/core/util/wrapper/var.java | 110 +- src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java | 1646 +++++---- src/Java/gtPlusPlus/nei/NEI_GT_Config.java | 36 +- src/Java/gtPlusPlus/xmod/forestry/Forestry.java | 66 +- src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 28 +- .../forestry/bees/alveary/AlvearyBeeListener.java | 8 +- .../xmod/forestry/bees/alveary/AlvearyHandler.java | 18 +- .../bees/alveary/FR_AlvearyFrameBlock.java | 11 +- .../forestry/bees/alveary/FR_BlockAlveary.java | 200 +- .../xmod/forestry/bees/alveary/FR_TileAlveary.java | 64 +- .../bees/alveary/IAlvearyComponentAdvanced.java | 4 +- .../bees/alveary/ISidedFrameWearingInventory.java | 6 +- .../bees/alveary/TileAlvearyFrameHousing.java | 197 +- .../bees/alveary/gui/CONTAINER_FrameHousing.java | 38 +- .../bees/alveary/gui/GUI_FrameHousing.java | 70 +- .../bees/alveary/gui/InventoryFrameHousing.java | 51 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 10 +- .../xmod/forestry/bees/items/FR_StringUtil.java | 4 +- .../xmod/forestry/bees/items/MB_FrameType.java | 56 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 95 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 68 +- .../xmod/forestry/trees/TreefarmManager.java | 36 +- src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 14 +- .../api/energy/IC2ElectricItemManager.java | 6 +- .../xmod/gregtech/api/enums/CustomGtTextures.java | 156 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 295 +- .../gregtech/api/enums/GregtechOreDictNames.java | 36 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 723 ++-- .../gregtech/api/enums/GregtechTextureSet.java | 270 +- .../xmod/gregtech/api/enums/GregtechTextures.java | 294 +- .../gregtech/api/enums/GregtechToolDictNames.java | 6 +- .../gregtech/api/gui/CONTAINER_DeluxeTank.java | 104 +- .../api/gui/CONTAINER_IndustrialCentrifuge.java | 48 +- .../api/gui/CONTAINER_IronBlastFurnace.java | 32 +- .../xmod/gregtech/api/gui/CONTAINER_MatterFab.java | 18 +- .../gregtech/api/gui/CONTAINER_MultiMachine.java | 14 +- .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 55 +- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 132 +- .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 43 +- .../gregtech/api/gui/CONTAINER_TreeFarmer.java | 91 +- .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 43 +- .../gregtech/api/gui/GUI_IndustrialCentrifuge.java | 68 +- .../gregtech/api/gui/GUI_IronBlastFurnace.java | 38 +- .../xmod/gregtech/api/gui/GUI_MatterFab.java | 105 +- .../xmod/gregtech/api/gui/GUI_MultiMachine.java | 89 +- .../xmod/gregtech/api/gui/GUI_SafeBlock.java | 78 +- .../xmod/gregtech/api/gui/GUI_SolarGenerator.java | 64 +- .../xmod/gregtech/api/gui/GUI_SteamCondenser.java | 88 +- .../xmod/gregtech/api/gui/GUI_TreeFarmer.java | 34 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 22 +- .../internal/Interface_IconContainer.java | 24 +- .../internal/Interface_ItemBehaviour.java | 29 +- .../internal/Interface_OreRecipeRegistrator.java | 16 +- .../Interface_OreRecipeRegistrator_GT.java | 16 +- .../api/interfaces/internal/Interface_Texture.java | 14 +- .../interfaces/internal/Interface_ToolStats.java | 37 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 272 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 566 +-- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 1129 +++--- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 301 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 440 ++- .../gregtech/api/items/tools/GT_MetaGenTool.java | 417 ++- .../gregtech/api/items/types/ToolType_Base.java | 107 +- .../api/items/types/ToolType_HardHammer.java | 191 +- .../gregtech/api/items/types/ToolType_Wrench.java | 251 +- .../GT_MetaTileEntity_DeluxeTank.java | 239 +- .../implementations/GregtechMetaCondensor.java | 279 +- .../implementations/GregtechMetaEnergyBuffer.java | 278 +- .../GregtechMetaPipeEntityFluid.java | 291 +- .../GregtechMetaPipeEntity_Cable.java | 258 +- .../GregtechMetaPipeEntity_SuperConductor.java | 260 +- .../implementations/GregtechMetaSafeBlock.java | 70 +- .../GregtechMetaSuperConductorNodeBase.java | 580 +-- .../GregtechMetaTreeFarmerStructural.java | 52 +- .../base/GregtechMetaPipeEntityBase_Cable.java | 306 +- .../base/GregtechMetaTileEntity.java | 59 +- .../base/GregtechMeta_MultiBlockBase.java | 1745 +++++---- .../GregtechDoubleFuelGeneratorBase.java | 288 +- .../base/generators/GregtechMetaBoilerBase.java | 637 ++-- .../generators/GregtechMetaSolarGenerator.java | 341 +- .../GregtechRocketFuelGeneratorBase.java | 530 +-- .../GregtechBaseMetaTileEntityLossless.java | 3865 +++++++++++--------- .../GregtechMetaPipeEntity_BaseSuperConductor.java | 1225 ++++--- .../lossless/GregtechMetaTileEntityLossless.java | 59 +- .../GregtechMetaTileEntityLosslessBasicTank.java | 472 +-- ...chMetaTileEntityLosslessTieredMachineBlock.java | 102 +- .../base/lossless/MetaTileEntityLossless.java | 1677 ++++----- .../base/machines/GregtechMetaSafeBlockBase.java | 184 +- .../base/machines/GregtechMetaTreeFarmerBase.java | 80 +- .../creative/GregtechMetaCreativeEnergyBuffer.java | 141 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 32 +- .../gregtech/api/objects/GregtechItemData.java | 250 +- .../api/objects/GregtechMaterialStack.java | 79 +- .../gtPlusPlus/xmod/gregtech/api/objects/XSTR.java | 387 +- .../ProcessingSkookumChoocherToolRecipes.java | 14 +- .../api/util/GregtechOreDictUnificator.java | 766 ++-- .../api/util/GregtechRecipeRegistrator.java | 646 ++-- .../xmod/gregtech/common/Meta_GT_Proxy.java | 31 +- .../common/blocks/GregtechMetaCasingBlocks.java | 54 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 42 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 211 +- .../common/blocks/GregtechMetaCasingItems.java | 8 +- .../common/blocks/GregtechMetaItemCasings1.java | 8 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 23 +- .../common/blocks/fluid/GregtechFluidHandler.java | 12 +- .../blocks/textures/CasingTextureHandler.java | 20 +- .../blocks/textures/CasingTextureHandler2.java | 44 +- .../textures/TexturesCentrifugeMultiblock.java | 84 +- .../common/blocks/textures/TexturesGregtech58.java | 78 +- .../common/blocks/textures/TexturesGregtech59.java | 718 ++-- .../common/blocks/textures/TexturesGtBlock.java | 114 +- .../common/blocks/textures/TexturesGtTools.java | 86 +- .../gregtech/common/helpers/TreeFarmHelper.java | 97 +- .../common/items/MetaGeneratedGregtechItems.java | 354 +- .../common/items/MetaGeneratedGregtechTools.java | 18 +- .../items/behaviours/Behaviour_Choocher.java | 33 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 182 +- .../GT_MetaTileEntity_TesseractGenerator.java | 225 +- .../GT_MetaTileEntity_TesseractTerminal.java | 220 +- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 237 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 210 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 52 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 210 +- .../GregtechMetaTileEntitySolarGenerator.java | 77 +- .../GregtechMetaTileEntitySuperCondensor.java | 160 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 228 +- .../machines/multi/GregtechMTE_NuclearReactor.java | 233 +- .../multi/GregtechMetaTileEntityAnimalFarm.java | 157 +- .../multi/GregtechMetaTileEntityTreeFarm.java | 404 +- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 405 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 118 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 406 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 255 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 105 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 218 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 115 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 139 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 660 ++-- .../GregtechMetaTileEntity_MassFabricator.java | 131 +- .../multi/GregtechMetaTileEntity_MultiTank.java | 328 +- ...chMetaTileEntity_PowerSubStationController.java | 82 +- .../multi/GregtechMetaTileEntity_Refinery.java | 193 +- .../storage/GT_MetaTileEntity_TieredTank.java | 200 +- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 44 +- .../common/tools/TOOL_Gregtech_Choocher.java | 249 +- .../xmod/gregtech/loaders/Gregtech_Blocks.java | 2 +- .../loaders/ProcessingToolHeadChoocher.java | 107 +- .../loaders/Processing_Textures_Items.java | 4 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 22 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 30 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 102 +- .../gregtech/loaders/RecipeGen_BlastSmelterGT.java | 70 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 60 +- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 24 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 52 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 28 +- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 60 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 109 +- .../recipes/machines/RECIPEHANDLER_CokeOven.java | 10 +- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 22 +- .../machines/RECIPEHANDLER_MatterFabricator.java | 14 +- .../registration/gregtech/Gregtech4Content.java | 8 +- .../registration/gregtech/GregtechConduits.java | 105 +- .../registration/gregtech/GregtechDehydrator.java | 16 +- .../gregtech/GregtechEnergyBuffer.java | 28 +- .../GregtechGeothermalThermalGenerator.java | 51 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 6 +- .../gregtech/GregtechIndustrialCentrifuge.java | 6 +- .../gregtech/GregtechIndustrialCokeOven.java | 6 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 6 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 6 +- .../gregtech/GregtechIndustrialMacerator.java | 6 +- .../gregtech/GregtechIndustrialMassFabricator.java | 6 +- .../gregtech/GregtechIndustrialMultiTank.java | 6 +- .../gregtech/GregtechIndustrialPlatePress.java | 6 +- .../gregtech/GregtechIndustrialTreeFarm.java | 6 +- .../gregtech/GregtechIndustrialWiremill.java | 6 +- .../gregtech/GregtechIronBlastFurnace.java | 4 +- .../registration/gregtech/GregtechLFTR.java | 6 +- .../gregtech/GregtechPowerSubStation.java | 6 +- .../gregtech/GregtechRocketFuelGenerator.java | 51 +- .../registration/gregtech/GregtechSafeBlock.java | 4 +- .../gregtech/GregtechSolarGenerators.java | 29 +- .../gregtech/GregtechSteamCondenser.java | 6 +- .../gregtech/GregtechSuperConductionPoint.java | 2 +- .../gregtech/GregtechTieredFluidTanks.java | 6 +- .../gregtech/GregtechTreeFarmerTE.java | 4 +- .../gtPlusPlus/xmod/growthcraft/HANDLER_GC.java | 2 +- .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 60 +- .../xmod/growthcraft/fishtrap/Growthcraft_New.java | 10 +- .../xmod/growthcraft/fishtrap/Growthcraft_Old.java | 10 +- src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java | 10 +- .../xmod/ic2/block/RTGGenerator/BlockRTG.java | 108 +- .../xmod/ic2/block/RTGGenerator/TileEntityRTG.java | 42 +- .../ic2/block/RTGGenerator/gui/CONTAINER_RTG.java | 15 +- .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 75 +- .../kieticgenerator/IC2_BlockKineticGenerator.java | 117 +- .../ic2/block/kieticgenerator/IC2_TEComponent.java | 71 +- .../container/ContainerKineticWindgenerator.java | 34 +- .../gui/GuiKineticWindGenerator.java | 126 +- .../tileentity/TileEntityKineticWindGenerator.java | 132 +- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 21 +- .../xmod/ic2/item/IC2_ItemGradualInteger.java | 84 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 26 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 2 +- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 85 +- src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 28 +- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 138 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 48 +- .../xmod/thermalfoundation/HANDLER_TF.java | 14 +- .../block/TF_Block_Fluid_Cryotheum.java | 333 +- .../block/TF_Block_Fluid_Pyrotheum.java | 333 +- .../xmod/thermalfoundation/block/TF_Blocks.java | 38 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 50 +- .../xmod/thermalfoundation/item/TF_Items.java | 10 +- .../recipe/TF_Gregtech_Recipes.java | 22 +- 441 files changed, 28908 insertions(+), 26927 deletions(-) delete mode 100644 src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOLD.java create mode 100644 src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java create mode 100644 src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 79e943d9bd..045e0a535b 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -2,7 +2,19 @@ package gtPlusPlus; import static gtPlusPlus.core.lib.CORE.DEBUG; import static gtPlusPlus.core.lib.CORE.configSwitches.*; -import gregtech.api.util.*; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.util.Collection; + +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_Config; +import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; import gtPlusPlus.core.commands.CommandMath; @@ -18,23 +30,12 @@ import gtPlusPlus.xmod.gregtech.HANDLER_GT; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import java.util.Collection; - import net.minecraftforge.common.config.Configuration; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @Mod(modid=CORE.MODID, name=CORE.name, version=CORE.VERSION, dependencies="required-after:Forge; after:PlayerAPI; after:dreamcraft; 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; @@ -46,16 +47,16 @@ implements ActionListener - public static void handleConfigFile(FMLPreInitializationEvent event) { - Configuration config = new Configuration(new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg")); + public static void handleConfigFile(final FMLPreInitializationEvent event) { + final Configuration config = new Configuration(new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg")); config.load(); - + //Debug DEBUG = config.getBoolean("debugMode", "debug", false, "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)"); disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration."); - - + + //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.."); @@ -65,16 +66,16 @@ implements ActionListener //Tools CORE.configSwitches.enableSkookumChoochers = config.getBoolean("enableSkookumChoochers", "gregtech", true, "Adds Custom GT Tools, called Skookum Choochers, functioning as a hard hammer and a wrench."); CORE.configSwitches.enableMultiSizeTools = config.getBoolean("enableMultiSizeTools", "gregtech", true, "Adds Custom GT Shovels and Pickaxes which mine in a 3x3 style. One of each whill be generated for each Gregtech Material which has Dense Plates and Long Rods available."); - + //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."); - + //Block Drops CORE.configSwitches.chanceToDropDrainedShard = config.getInt("chanceToDropDrainedShard", "blockdrops", 196, 0, 10000, "Drained shards have a 1 in X chance to drop."); CORE.configSwitches.chanceToDropFluoriteOre = config.getInt("chanceToDropFluoriteOre", "blockdrops", 32, 0, 10000, "Fluorite Ore has a 1 in X chance to drop from Limestone and a 1 in X*20 from Sandstone.."); - - + + //Single machines CORE.configSwitches.enableMachine_SolarGenerators = config.getBoolean("enableSolarGenerators", "gregtech", false, "These may be overpowered, Consult a local electrician."); CORE.configSwitches.enableMachine_Safes = config.getBoolean("enableMachineSafes", "gregtech", true, "These protect your goodies/rare stuff."); @@ -83,8 +84,8 @@ implements ActionListener 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.enableMultiblock_AlloyBlastSmelter = config.getBoolean("enableMultiblockAlloyBlastSmelter", "gregtech", true, "Required to smelt most high tier materials from GT++. Also smelts everything else to molten metal."); CORE.configSwitches.enableMultiblock_IndustrialCentrifuge = config.getBoolean("enableMultiblockIndustrialCentrifuge", "gregtech", true, "Spin, Spin, Spiiiin."); @@ -99,15 +100,15 @@ implements ActionListener CORE.configSwitches.enableMultiblock_PowerSubstation = config.getBoolean("enableMultiblockPowerSubstation", "gregtech", true, "For managing large power grids."); CORE.configSwitches.enableMultiblock_LiquidFluorideThoriumReactor = config.getBoolean("enableMultiblockLiquidFluorideThoriumReactor", "gregtech", true, "For supplying large power grids."); CORE.configSwitches.enableMultiblock_NuclearFuelRefinery = config.getBoolean("enableMultiblock_NuclearFuelRefinery", "gregtech", true, "Refines molten chemicals into nuclear fuels."); - - + + //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(); + config.save(); } public static String randomDust_A; @@ -117,15 +118,15 @@ implements ActionListener 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]; + 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."); @@ -137,7 +138,7 @@ implements ActionListener //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); + //ItemStack d1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[d], 8); } @@ -157,12 +158,12 @@ implements ActionListener //Pre-Init @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) + public void preInit(final FMLPreInitializationEvent event) { Utils.LOG_INFO("Loading "+CORE.name+" V"+CORE.VERSION); Utils.LOG_INFO("Latest is "+CORE.MASTER_VERSION+". Updated? "+Utils.isModUpToDate()); //FirstCall(); - FMLCommonHandler.instance().bus().register(new LoginEventHandler()); + FMLCommonHandler.instance().bus().register(new LoginEventHandler()); Utils.LOG_INFO("Login Handler Initialized"); handleConfigFile(event); @@ -174,9 +175,9 @@ implements ActionListener //Init @Mod.EventHandler - public void init(FMLInitializationEvent event) + public void init(final FMLInitializationEvent event) { - proxy.init(event); + proxy.init(event); //MinecraftForge.EVENT_BUS.register(this); //FMLCommonHandler.instance().bus().register(this); proxy.registerNetworkStuff(); @@ -184,14 +185,14 @@ implements ActionListener //Post-Init @Mod.EventHandler - public void postInit(FMLPostInitializationEvent event) { - proxy.postInit(event); + public void postInit(final FMLPostInitializationEvent event) { + proxy.postInit(event); if (DEBUG){ - dumpGtRecipeMap(Gregtech_Recipe_Map.sChemicalDehydratorRecipes); - dumpGtRecipeMap(Gregtech_Recipe_Map.sCokeOvenRecipes); - dumpGtRecipeMap(Gregtech_Recipe_Map.sMatterFab2Recipes); - dumpGtRecipeMap(Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes); + this.dumpGtRecipeMap(Gregtech_Recipe_Map.sChemicalDehydratorRecipes); + this.dumpGtRecipeMap(Gregtech_Recipe_Map.sCokeOvenRecipes); + this.dumpGtRecipeMap(Gregtech_Recipe_Map.sMatterFab2Recipes); + this.dumpGtRecipeMap(Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes); } //~ @@ -206,26 +207,26 @@ implements ActionListener } @EventHandler - public void serverStarting(FMLServerStartingEvent event) + public void serverStarting(final FMLServerStartingEvent event) { event.registerServerCommand(new CommandMath()); } @Mod.EventHandler - public void serverStopping(FMLServerStoppingEvent event) + public void serverStopping(final FMLServerStoppingEvent event) { } @Override - public void actionPerformed(ActionEvent arg0) { + public void actionPerformed(final ActionEvent arg0) { } - protected void dumpGtRecipeMap(GT_Recipe_Map r){ - Collection x = r.mRecipeList; + protected void dumpGtRecipeMap(final GT_Recipe_Map r){ + final Collection x = r.mRecipeList; Utils.LOG_INFO("Dumping "+r.mUnlocalizedName+" Recipes for Debug."); - for(GT_Recipe newBo : x){ + 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)); diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index 1f8ca23b30..8acb757063 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.block; +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseOre; import gtPlusPlus.core.block.general.FirePit; @@ -11,7 +12,6 @@ import gtPlusPlus.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.common.registry.GameRegistry; public final class ModBlocks { @@ -34,9 +34,9 @@ public final class ModBlocks { public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels"); public static Block blockFluidJackDaniels; public static Block blockCasings2Misc; - + public static Block blockFirePit; - + public static Block blockOreFluorite; @@ -45,7 +45,7 @@ public final class ModBlocks { Utils.LOG_INFO("Initializing Blocks."); //blockGriefSaver = new TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); - registerBlocks(); + registerBlocks(); } public static void registerBlocks(){ @@ -63,7 +63,7 @@ public final class ModBlocks { blockFishTrap = new FishTrap(); blockOreFluorite = new BlockBaseOre("oreFluorite", "Fluorite", Material.rock, BlockTypes.ORE, Utils.rgbtoHexValue(120, 120, 30), 3); - + } } \ 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..7a0b715138 100644 --- a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java @@ -9,23 +9,23 @@ 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 2823fcc5b7..9e3a5fc37f 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java @@ -10,56 +10,56 @@ import net.minecraft.world.World; public class BasicBlock extends BlockContainer { - public BasicBlock(final String unlocalizedName, final Material material) { - this(unlocalizedName, material, 2); - } - - public BasicBlock(final String unlocalizedName, final Material material, int harvestLevel) { - 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", harvestLevel); - this.setStepSound(soundTypeMetal); - } + public BasicBlock(final String unlocalizedName, final Material material) { + this(unlocalizedName, material, 2); + } + + public BasicBlock(final String unlocalizedName, final Material material, final int harvestLevel) { + 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", harvestLevel); + this.setStepSound(soundTypeMetal); + } + + + public static enum BlockTypes { + STANDARD("blockBlock", "pickaxe", soundTypeMetal), + FRAME("blockFrameGt", "wrench", soundTypeMetal), + ORE("blockStone", "pickaxe", soundTypeStone); - - 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; - } + 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 String getTexture() { + return this.TEXTURE_NAME; + } + + public String getHarvestTool(){ + return this.HARVEST_TOOL; + } + + public SoundType getBlockSoundType(){ + return this.soundOfBlock; + } + + } @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) { return null; } - + } diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index d694557f55..c8923a9301 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.block.base; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock; import gtPlusPlus.core.item.base.itemblock.ItemBlockGtFrameBox; import gtPlusPlus.core.lib.CORE; @@ -8,10 +12,6 @@ import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockBaseModular extends BasicBlock{ @@ -21,11 +21,11 @@ public class BlockBaseModular extends BasicBlock{ protected final String thisBlockType; - public BlockBaseModular(String unlocalizedName, String blockMaterial, BlockTypes blockType, int colour) { + public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, final int colour) { this(unlocalizedName, blockMaterial, Material.iron, blockType, colour, 2); } - - public BlockBaseModular(String unlocalizedName, String blockMaterial, Material vanillaMaterial, BlockTypes blockType, int colour, int miningLevel) { + + public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final Material vanillaMaterial, final BlockTypes blockType, final int colour, final int miningLevel) { super(unlocalizedName, vanillaMaterial); this.setHarvestLevel(blockType.getHarvestTool(), miningLevel); this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture()); @@ -33,8 +33,8 @@ public class BlockBaseModular extends BasicBlock{ this.thisBlock = blockType; this.thisBlockMaterial = blockMaterial; this.thisBlockType = blockType.name().toUpperCase(); - this.setBlockName(GetProperName()); - + this.setBlockName(this.GetProperName()); + if (!CORE.DEBUG){ //Utils.LOG_INFO("=============Block Info Dump============="); //Utils.LOG_INFO("thisBlock.name().toLowerCase() - "+thisBlock.name().toLowerCase()); @@ -44,43 +44,43 @@ public class BlockBaseModular extends BasicBlock{ //Utils.LOG_INFO("blockMaterial - "+blockMaterial); //Utils.LOG_INFO("=========================================="); } - - if (thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){ + + if (this.thisBlockType.equals(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.equals(BlockTypes.FRAME.name().toUpperCase())){ + else if (this.thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){ LanguageRegistry.addName(this, blockMaterial+ " Frame Box"); //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box"); } - else if (thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){ + else if (this.thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){ LanguageRegistry.addName(this, blockMaterial+ " Ore"); //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.equals(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); + if (this.thisBlockType.equals(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 (thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){ + else if (this.thisBlockType.equals(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"); + //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box"); } - else if (thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){ + else if (this.thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){ GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); - //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box"); + //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); + //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial); } - - + + } /** @@ -90,15 +90,15 @@ public class BlockBaseModular extends BasicBlock{ @SideOnly(Side.CLIENT) public int getRenderBlockPass() { - if (thisBlock == BlockTypes.FRAME){ - return 1; + if (this.thisBlock == BlockTypes.FRAME){ + return 1; } return 0; } - + /*@Override public String getLocalizedName() { - String tempIngot; + String tempIngot; if (thisBlock == BlockTypes.STANDARD){ tempIngot = "Block of "+thisBlockMaterial; } @@ -111,55 +111,55 @@ public class BlockBaseModular extends BasicBlock{ } 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 if (thisBlock == BlockTypes.ORE){ - tempIngot = thisBlockMaterial + " Ore"; + else if (this.thisBlock == BlockTypes.ORE){ + tempIngot = this.thisBlockMaterial + " Ore"; } else { - tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot"); + tempIngot = this.getUnlocalizedName().replace("tile.blockGt", "ingot"); } return tempIngot; } @Override public boolean isOpaqueCube() - { - return false; - } + { + return false; + } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIcon) + public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + thisBlock.getTexture()); + this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); } @Override - public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){ - + public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){ + if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } - + return this.blockColour; } - - @Override - public int getRenderColor(int aMeta) { - if (this.blockColour == 0){ + + @Override + public int getRenderColor(final int aMeta) { + if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } - + return this.blockColour; - } + } } diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java index c57aa248b4..c1e58e9393 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -1,13 +1,13 @@ package gtPlusPlus.core.block.base; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockBaseOre extends BlockBaseModular{ @@ -21,18 +21,18 @@ public class BlockBaseOre extends BlockBaseModular{ return true; }*/ - public BlockBaseOre(String unlocalizedName, String blockMaterial, BlockTypes blockType, int colour) { + public BlockBaseOre(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, final int colour) { this(unlocalizedName, blockMaterial, Material.iron, blockType, colour, 2); } - - public BlockBaseOre(String unlocalizedName, String blockMaterial, Material vanillaMaterial, BlockTypes blockType, int colour, int miningLevel) { - super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); + + public BlockBaseOre(final String unlocalizedName, final String blockMaterial, final Material vanillaMaterial, final BlockTypes blockType, final int colour, final int miningLevel) { + super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); } /** * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha */ - + /*@Override @SideOnly(Side.CLIENT) public int getRenderBlockPass() @@ -48,30 +48,30 @@ public class BlockBaseOre extends BlockBaseModular{ @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIcon) + public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + thisBlock.getTexture()); - //this.base = iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); + this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); + //this.base = iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(CORE.MODID + ":" + "blockOre_Overlay"); } @Override - public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){ + public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){ if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); - } + } return this.blockColour; } - - @Override - public int getRenderColor(int aMeta) { - if (this.blockColour == 0){ + + @Override + public int getRenderColor(final int aMeta) { + if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } return this.blockColour; - } - - - + } + + + } diff --git a/src/Java/gtPlusPlus/core/block/base/MetaBlock.java b/src/Java/gtPlusPlus/core/block/base/MetaBlock.java index 4009c36726..3e116eeb7f 100644 --- a/src/Java/gtPlusPlus/core/block/base/MetaBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/MetaBlock.java @@ -7,22 +7,22 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class MetaBlock extends MultiTextureBlock { +public class MetaBlock extends MultiTextureBlock { - protected MetaBlock(String unlocalizedName, Material material, SoundType soundType) { - super(unlocalizedName, material, soundType); - } - - @Override - public int damageDropped(int meta) { - return meta; - } - - @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 6; i ++) { - list.add(new ItemStack(item, 1, i)); - } - } - -} \ No newline at end of file + protected MetaBlock(final String unlocalizedName, final Material material, final SoundType soundType) { + super(unlocalizedName, material, soundType); + } + + @Override + public int damageDropped(final int meta) { + return meta; + } + + @Override + public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { + for (int i = 0; i < 6; i ++) { + list.add(new ItemStack(item, 1, i)); + } + } + +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java index 4f022bae6d..4e91509c6e 100644 --- a/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java @@ -7,30 +7,30 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -public class MultiTextureBlock extends Block { +public class MultiTextureBlock extends Block { public IIcon[] icons = new IIcon[6]; - - protected MultiTextureBlock(String unlocalizedName, Material material, SoundType blockSound) - { - super(material); - this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabBlock); - this.setHardness(2.0F); - this.setResistance(6.0F); - this.setStepSound(blockSound); - } - - @Override - public void registerBlockIcons(IIconRegister reg) { - for (int i = 0; i < 6; i ++) { - this.icons[i] = reg.registerIcon(this.textureName + "_" + i); - } - } - - @Override - public IIcon getIcon(int side, int meta) { - return this.icons[side]; - } + + protected MultiTextureBlock(final String unlocalizedName, final Material material, final SoundType blockSound) + { + super(material); + this.setBlockName(unlocalizedName); + this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabBlock); + this.setHardness(2.0F); + this.setResistance(6.0F); + this.setStepSound(blockSound); + } + + @Override + public void registerBlockIcons(final IIconRegister reg) { + for (int i = 0; i < 6; i ++) { + this.icons[i] = reg.registerIcon(this.textureName + "_" + i); + } + } + + @Override + public IIcon getIcon(final int side, final int meta) { + return this.icons[side]; + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/block/general/FirePit.java b/src/Java/gtPlusPlus/core/block/general/FirePit.java index 4dd58df6a4..cf24025124 100644 --- a/src/Java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/Java/gtPlusPlus/core/block/general/FirePit.java @@ -1,13 +1,17 @@ package gtPlusPlus.core.block.general; import static net.minecraftforge.common.util.ForgeDirection.*; -import gtPlusPlus.core.block.base.BasicBlock; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.tileentities.general.TileEntityFirepit; import java.util.List; import java.util.Random; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.block.base.BasicBlock; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.tileentities.general.TileEntityFirepit; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,10 +23,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class FirePit extends BasicBlock{ private static IIcon[] TEXTURE; @@ -40,44 +40,44 @@ public class FirePit extends BasicBlock{ GameRegistry.registerBlock(this, "blockFirePit"); LanguageRegistry.addName(this, "Fire Pit"); } - + @Override - public int tickRate(World aParWorld) { - return 30; - } - - @Override - public TileEntity createNewTileEntity(World world, int i) { - return new TileEntityFirepit(); - } - + public int tickRate(final World aParWorld) { + return 30; + } + + @Override + public TileEntity createNewTileEntity(final World world, final int i) { + return new TileEntityFirepit(); + } + @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister){ + public void registerBlockIcons(final IIconRegister par1IconRegister){ TEXTURE = new IIcon[] {par1IconRegister.registerIcon(this.getTextureName() + "_layer_0"), par1IconRegister.registerIcon(this.getTextureName() + "_layer_1")}; } @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List){ + public void getSubBlock