From cbe0e497be8e466c380a5b4fa781b314ede9ada3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 6 Nov 2016 19:32:27 +1000 Subject: Revert "$ Cleaned up the entire project." This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747. # Conflicts: # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java Revert "% Cleaned up Imports." This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966. --- src/Java/gregtech/api/util/Recipe_GT.java | 10 +- src/Java/gtPlusPlus/GTplusplus.java | 366 +- src/Java/gtPlusPlus/core/block/ModBlocks.java | 56 +- .../gtPlusPlus/core/block/base/AdvancedBlock.java | 38 +- .../gtPlusPlus/core/block/base/BasicBlock.java | 80 +- .../core/block/base/BlockBaseModular.java | 196 +- src/Java/gtPlusPlus/core/block/base/MetaBlock.java | 36 +- .../core/block/base/MultiTextureBlock.java | 47 +- .../gtPlusPlus/core/block/general/LightGlass.java | 152 +- .../core/block/general/antigrief/TowerDevice.java | 488 +-- .../general/fluids/BlockFluidJackDaniels.java | 78 +- .../core/block/machine/BlockGtFrameBox.java | 35 +- .../core/block/machine/Machine_Charger.java | 131 +- .../gtPlusPlus/core/block/machine/Machine_NHG.java | 131 +- .../core/block/machine/Machine_WireiusDeletus.java | 3 +- .../core/block/machine/Machine_Workbench.java | 133 +- .../block/machine/Machine_WorkbenchAdvanced.java | 94 +- .../machine/heliumgen/block/HeliumGenerator.java | 279 +- .../container/ContainerHeliumGenerator.java | 69 +- .../machine/heliumgen/gui/GUIHeliumGenerator.java | 111 +- .../machine/heliumgen/slots/InvSlotRadiation.java | 88 +- .../tileentity/TileEntityHeliumGenerator.java | 854 ++-- src/Java/gtPlusPlus/core/commands/CommandMath.java | 235 +- .../gtPlusPlus/core/commands/CommandUtils.java | 8 +- src/Java/gtPlusPlus/core/common/CommonProxy.java | 138 +- .../core/common/compat/COMPAT_Baubles.java | 28 +- .../core/common/compat/COMPAT_BigReactors.java | 10 +- .../common/compat/COMPAT_CompactWindmills.java | 316 +- .../core/common/compat/COMPAT_EnderIO.java | 10 +- .../core/common/compat/COMPAT_ExtraUtils.java | 21 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 84 +- .../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 | 104 +- .../core/container/Container_Workbench.java | 581 ++- .../container/Container_WorkbenchAdvanced.java | 512 ++- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 36 +- .../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 | 444 ++- .../gtPlusPlus/core/fluids/BlockFluidBase.java | 165 +- .../core/fluids/FluidRegistryHandler.java | 80 +- src/Java/gtPlusPlus/core/fluids/GenericFluid.java | 115 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 67 +- 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 | 153 +- .../gtPlusPlus/core/gui/machine/GUI_Charger.java | 73 +- src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java | 74 +- .../gtPlusPlus/core/gui/machine/GUI_Workbench.java | 90 +- .../core/gui/machine/GUI_WorkbenchAdvanced.java | 36 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 187 +- .../core/handler/COMPAT_IntermodStaging.java | 25 +- .../gtPlusPlus/core/handler/CraftingManager.java | 14 +- src/Java/gtPlusPlus/core/handler/GuiHandler.java | 188 +- .../handler/Recipes/LateRegistrationHandler.java | 30 +- .../core/handler/Recipes/RegistrationHandler.java | 33 +- .../core/handler/events/LoginEventHandler.java | 136 +- .../events/PickaxeBlockBreakEventHandler.java | 74 +- .../handler/events/UnbreakableBlockManager.java | 179 +- .../workbench/Workbench_CraftingHandler.java | 207 +- .../handler/workbench/Workbench_RecipeSorter.java | 44 +- .../gtPlusPlus/core/interfaces/IGuiManager.java | 8 +- .../core/interfaces/IGuiManagerMiscUtils.java | 3 +- .../gtPlusPlus/core/interfaces/IItemBlueprint.java | 74 +- .../core/inventories/BaseInventoryBackpack.java | 255 +- .../core/inventories/InventoryWorkbenchChest.java | 231 +- .../inventories/InventoryWorkbenchCrafting.java | 260 +- .../InventoryWorkbenchHoloCrafting.java | 180 +- .../inventories/InventoryWorkbenchHoloSlots.java | 344 +- .../core/inventories/InventoryWorkbenchTools.java | 232 +- .../InventoryWorkbenchToolsElectric.java | 234 +- src/Java/gtPlusPlus/core/item/ModItems.java | 744 ++-- src/Java/gtPlusPlus/core/item/base/BaseEuItem.java | 920 ++--- .../core/item/base/BaseItemBackpack.java | 106 +- .../gtPlusPlus/core/item/base/BaseItemBrain.java | 108 +- .../core/item/base/BaseItemComponent.java | 194 +- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 29 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 135 +- .../core/item/base/BaseItemWithCharge.java | 67 +- .../core/item/base/BaseItemWithDamageValue.java | 27 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 435 +- src/Java/gtPlusPlus/core/item/base/CoreItem.java | 132 +- .../core/item/base/bolts/BaseItemBolt.java | 4 +- .../core/item/base/cell/BaseItemCell.java | 43 +- .../core/item/base/dusts/BaseItemDust.java | 326 +- .../core/item/base/dusts/BaseItemDustAbstract.java | 40 +- .../core/item/base/dusts/BaseItemDustUnique.java | 126 +- .../item/base/dusts/decimal/BaseItemCentidust.java | 54 +- .../item/base/dusts/decimal/BaseItemDecidust.java | 54 +- .../core/item/base/foods/BaseItemFood.java | 33 +- .../core/item/base/foods/BaseItemHotFood.java | 87 +- .../core/item/base/gears/BaseItemGear.java | 6 +- .../core/item/base/ingots/BaseItemIngot.java | 127 +- .../core/item/base/ingots/BaseItemIngotHot.java | 66 +- .../core/item/base/itemblock/ItemBlockBase.java | 21 +- .../core/item/base/itemblock/ItemBlockFluid.java | 84 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 59 +- .../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 | 22 +- .../gtPlusPlus/core/item/effects/RarityEpic.java | 18 +- .../gtPlusPlus/core/item/effects/RarityRare.java | 18 +- .../core/item/effects/RarityUncommon.java | 14 +- .../core/item/general/BedLocator_Base.java | 107 +- .../gtPlusPlus/core/item/general/BufferCore.java | 100 +- .../core/item/general/ItemBlueprint.java | 384 +- .../core/item/general/ItemCloakingDevice.java | 308 +- .../core/item/general/ItemHealingDevice.java | 276 +- .../core/item/general/NuclearFuelRodBase.java | 331 +- .../core/item/general/RF2EU_Battery.java | 378 +- .../core/item/general/fuelrods/FuelRod_Base.java | 300 +- .../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 | 73 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 260 +- .../core/item/tool/staballoy/MultiSpadeBase.java | 134 +- .../core/item/tool/staballoy/StaballoyAxe.java | 519 +-- .../core/item/tool/staballoy/StaballoyPickaxe.java | 526 ++- .../core/item/tool/staballoy/StaballoySpade.java | 483 ++- src/Java/gtPlusPlus/core/lib/CORE.java | 187 +- src/Java/gtPlusPlus/core/lib/LoadedMods.java | 264 +- src/Java/gtPlusPlus/core/material/ALLOY.java | 1268 ++---- src/Java/gtPlusPlus/core/material/ELEMENT.java | 171 +- src/Java/gtPlusPlus/core/material/Material.java | 606 +-- .../core/material/MaterialGenerator.java | 88 +- .../gtPlusPlus/core/material/MaterialStack.java | 101 +- src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 108 +- src/Java/gtPlusPlus/core/proxy/ServerProxy.java | 18 +- .../core/recipe/Gregtech_Recipe_Adder.java | 144 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 612 ++- .../gtPlusPlus/core/recipe/RECIPES_General.java | 60 +- .../core/recipe/RECIPES_LaserEngraver.java | 39 +- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 217 +- .../core/recipe/RECIPES_MachineComponents.java | 627 ++- .../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 | 290 +- src/Java/gtPlusPlus/core/slots/SlotFrame.java | 14 +- 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 | 94 +- src/Java/gtPlusPlus/core/slots/SlotRTG.java | 12 +- .../core/tileentities/ModTileEntities.java | 22 +- .../core/tileentities/base/TILE_ENTITY_BASE.java | 33 +- .../tileentities/general/TileEntityReverter.java | 469 +-- .../tileentities/machines/TileEntityCharger.java | 215 +- .../core/tileentities/machines/TileEntityNHG.java | 715 ++-- .../tileentities/machines/TileEntityWorkbench.java | 201 +- .../machines/TileEntityWorkbenchAdvanced.java | 300 +- src/Java/gtPlusPlus/core/util/BaseHandler.java | 8 +- src/Java/gtPlusPlus/core/util/ClassUtils.java | 83 +- src/Java/gtPlusPlus/core/util/Log.java | 41 +- src/Java/gtPlusPlus/core/util/LoggingUtils.java | 60 +- src/Java/gtPlusPlus/core/util/Quality.java | 87 +- src/Java/gtPlusPlus/core/util/Utils.java | 741 ++-- .../gtPlusPlus/core/util/UtilsChatFormatting.java | 271 +- 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 | 29 +- .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 51 +- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 1722 ++++---- .../core/util/debug/DEBUG_ScreenOverlay.java | 60 +- .../core/util/debug/DEBUG_TimerThread.java | 71 +- .../core/util/debug/UtilityGL11Debug.java | 853 ++-- .../gtPlusPlus/core/util/entity/EntityUtils.java | 92 +- src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java | 42 +- .../gtPlusPlus/core/util/fluid/FluidUtils.java | 539 ++- .../gregtech/recipehandlers/GregtechRecipe.java | 74 +- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 681 ++-- .../core/util/materials/MaterialUtils.java | 343 +- src/Java/gtPlusPlus/core/util/math/MathUtils.java | 376 +- .../core/util/networking/NetworkUtils.java | 50 +- .../util/particles/EntityParticleFXMysterious.java | 19 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 282 +- .../gtPlusPlus/core/util/player/PlayerUtils.java | 179 +- .../gtPlusPlus/core/util/player/UtilsMining.java | 204 +- .../gtPlusPlus/core/util/recipe/RecipeUtils.java | 648 ++- .../core/util/recipe/shapeless/ShapelessUtils.java | 46 +- .../core/util/reflect/ClientProxyFinder.java | 43 +- .../core/util/reflect/ReflectionUtils.java | 81 +- src/Java/gtPlusPlus/core/util/wrapper/var.java | 116 +- .../xmod/Computronics/HANDLER_Computronics.java | 40 +- src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 38 +- .../forestry/bees/alveary/AlvearyBeeListener.java | 8 +- .../bees/alveary/FR_AlvearyFrameBlock.java | 26 +- .../forestry/bees/alveary/FR_BlockAlveary.java | 391 +- .../xmod/forestry/bees/alveary/FR_TileAlveary.java | 175 +- .../bees/alveary/IAlvearyComponentAdvanced.java | 22 +- .../bees/alveary/IAlvearyFrameHousing.java | 1 - .../bees/alveary/ISidedFrameWearingInventory.java | 8 +- .../bees/alveary/TileAlvearyFrameHousing.java | 459 ++- .../bees/alveary/gui/CONTAINER_FrameHousing.java | 103 +- .../bees/alveary/gui/GUI_FrameHousing.java | 74 +- .../bees/alveary/gui/InventoryFrameHousing.java | 98 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 137 +- .../xmod/forestry/bees/items/FR_StringUtil.java | 15 +- .../xmod/forestry/bees/items/MB_FrameType.java | 126 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 141 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 118 +- src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 40 +- .../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 | 402 +- .../gregtech/api/enums/GregtechOreDictNames.java | 16 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 1932 +++------ .../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 | 111 +- .../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 | 178 +- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 139 +- .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 172 +- .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 47 +- .../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 | 33 +- .../internal/Interface_OreRecipeRegistrator.java | 25 +- .../Interface_OreRecipeRegistrator_GT.java | 22 +- .../api/interfaces/internal/Interface_Texture.java | 14 +- .../interfaces/internal/Interface_ToolStats.java | 186 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 303 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 605 ++- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 1213 +++--- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 378 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 728 ++-- .../gregtech/api/items/tools/GT_MetaGenTool.java | 741 ++-- .../gregtech/api/items/types/ToolType_Base.java | 123 +- .../api/items/types/ToolType_HardHammer.java | 213 +- .../gregtech/api/items/types/ToolType_Wrench.java | 292 +- .../GT_MetaTileEntity_DeluxeTank.java | 418 +- .../implementations/GregtechMetaCondensor.java | 301 +- .../implementations/GregtechMetaEnergyBuffer.java | 563 ++- .../GregtechMetaPipeEntityFluid.java | 563 ++- .../GregtechMetaPipeEntity_Cable.java | 460 +-- .../GregtechMetaPipeEntity_SuperConductor.java | 466 +-- .../implementations/GregtechMetaSafeBlock.java | 110 +- .../GregtechMetaSuperConductorNodeBase.java | 614 ++- .../base/GregtechMetaPipeEntityBase_Cable.java | 559 +-- .../base/GregtechMetaTileEntity.java | 85 +- .../base/GregtechMeta_MultiBlockBase.java | 1849 ++++----- .../GregtechDoubleFuelGeneratorBase.java | 601 ++- .../base/generators/GregtechMetaBoilerBase.java | 625 ++- .../generators/GregtechMetaSolarGenerator.java | 376 +- .../GregtechRocketFuelGeneratorBase.java | 558 ++- .../GregtechBaseMetaTileEntityLossless.java | 4189 +++++++++----------- .../GregtechMetaPipeEntity_BaseSuperConductor.java | 1312 +++--- .../lossless/GregtechMetaTileEntityLossless.java | 85 +- .../GregtechMetaTileEntityLosslessBasicTank.java | 494 ++- ...chMetaTileEntityLosslessTieredMachineBlock.java | 110 +- .../base/lossless/MetaTileEntityLossless.java | 1779 ++++----- .../base/machines/GregtechMetaSafeBlockBase.java | 483 +-- .../creative/GregtechMetaCreativeEnergyBuffer.java | 388 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 33 +- .../gregtech/api/objects/GregtechItemData.java | 265 +- .../api/objects/GregtechMaterialStack.java | 84 +- .../api/objects/GregtechRenderedTexture.java | 314 +- .../ProcessingSkookumChoocherToolRecipes.java | 24 +- .../api/util/GregtechOreDictUnificator.java | 814 ++-- .../api/util/GregtechRecipeRegistrator.java | 966 ++--- .../xmod/gregtech/common/Meta_GT_Proxy.java | 1234 +++--- .../common/blocks/GregtechMetaCasingBlocks.java | 71 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 56 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 232 +- .../common/blocks/GregtechMetaCasingItems.java | 9 +- .../common/blocks/GregtechMetaItemCasings1.java | 40 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 81 +- .../common/blocks/fluid/GregtechFluidHandler.java | 343 +- .../blocks/textures/CasingTextureHandler.java | 125 +- .../blocks/textures/CasingTextureHandler2.java | 108 +- .../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 | 979 +---- .../common/items/MetaGeneratedGregtechTools.java | 26 +- .../items/behaviours/Behaviour_Choocher.java | 81 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 203 +- .../GT_MetaTileEntity_TesseractGenerator.java | 736 ++-- .../GT_MetaTileEntity_TesseractTerminal.java | 634 +-- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 267 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 261 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 162 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 259 +- .../GregtechMetaTileEntitySolarGenerator.java | 233 +- .../GregtechMetaTileEntitySuperCondensor.java | 212 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 252 +- .../machines/multi/GregtechMTE_NuclearReactor.java | 354 +- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 445 +-- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 360 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 486 ++- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 355 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 353 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 290 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 336 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 294 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 778 ++-- .../GregtechMetaTileEntity_MassFabricator.java | 547 ++- .../multi/GregtechMetaTileEntity_MultiTank.java | 609 ++- ...chMetaTileEntity_PowerSubStationController.java | 274 +- .../storage/GT_MetaTileEntity_TieredTank.java | 258 +- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 162 +- .../common/tools/TOOL_Gregtech_Choocher.java | 326 +- .../xmod/gregtech/loaders/Gregtech_Blocks.java | 36 +- .../loaders/ProcessingToolHeadChoocher.java | 141 +- .../loaders/Processing_Textures_Items.java | 5 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 270 +- .../gregtech/loaders/RecipeGen_BlastSmelterGT.java | 229 +- .../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 | 581 ++- .../registration/gregtech/GregtechDehydrator.java | 123 +- .../gregtech/GregtechEnergyBuffer.java | 203 +- .../GregtechGeothermalThermalGenerator.java | 80 +- .../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 | 80 +- .../registration/gregtech/GregtechSafeBlock.java | 154 +- .../gregtech/GregtechSolarGenerators.java | 54 +- .../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 | 98 +- .../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 | 241 +- .../xmod/ic2/block/RTGGenerator/TileEntityRTG.java | 76 +- .../ic2/block/RTGGenerator/gui/CONTAINER_RTG.java | 23 +- .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 79 +- .../kieticgenerator/IC2_BlockKineticGenerator.java | 109 +- .../ic2/block/kieticgenerator/IC2_TEComponent.java | 76 +- .../container/ContainerKineticWindgenerator.java | 33 +- .../gui/GuiKineticWindGenerator.java | 129 +- .../tileentity/TileEntityKineticWindGenerator.java | 488 ++- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 37 +- .../xmod/ic2/item/IC2_ItemGradualInteger.java | 81 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 130 +- src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 134 +- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 84 +- src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 85 +- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 159 +- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 251 +- .../xmod/psychedelicraft/HANDLER_Psych.java | 23 +- .../xmod/thermalfoundation/HANDLER_TF.java | 38 +- .../block/TF_Block_Fluid_Cryotheum.java | 339 +- .../block/TF_Block_Fluid_Pyrotheum.java | 337 +- .../xmod/thermalfoundation/block/TF_Blocks.java | 39 +- .../xmod/thermalfoundation/fluid/TF_Fluids.java | 84 +- .../xmod/thermalfoundation/item/TF_Items.java | 109 +- .../recipe/TF_Gregtech_Recipes.java | 73 +- 412 files changed, 41750 insertions(+), 48466 deletions(-) (limited to 'src') diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index 3d06104295..11a858f641 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -3,15 +3,19 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.E; import static gregtech.api.enums.GT_Values.RES_PATH_GUI; import static gregtech.api.enums.GT_Values.W; - -import java.util.*; - import gregtech.api.GregTech_API; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.objects.GT_ItemStack; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 34b5851dda..7065393c26 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -1,15 +1,12 @@ package gtPlusPlus; -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 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 gregtech.api.util.GT_Config; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; @@ -20,7 +17,6 @@ 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; @@ -29,229 +25,219 @@ 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.FMLCommonHandler; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.FMLServerStoppingEvent; +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: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; + public static GTplusplus instance; + + protected static Meta_GT_Proxy gregtechproxy; - protected static Meta_GT_Proxy gregtechproxy; + @SidedProxy(clientSide="gtPlusPlus.core.proxy.ClientProxy", serverSide="gtPlusPlus.core.proxy.ServerProxy") + public static CommonProxy proxy; - @SidedProxy(clientSide = "gtPlusPlus.core.proxy.ClientProxy", serverSide = "gtPlusPlus.core.proxy.ServerProxy") - public static CommonProxy proxy; - public static String randomDust_A; - 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()); + public static void handleConfigFile(FMLPreInitializationEvent event) { + Configuration config = new Configuration(event.getSuggestedConfigurationFile()); config.load(); - // 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(); + + //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(); } - @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()); + public static String randomDust_A; + public static String randomDust_B; + public static String randomDust_C; + public static String randomDust_D; - // Blocks - Utils.LOG_WARNING( - "Processing texture: " + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath()); - } + 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); - @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("========================"); - } + @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()); + + //Blocks + Utils.LOG_WARNING("Processing texture: "+TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath()); } - 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); + + + //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"); + + 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(final FMLInitializationEvent event) { - GTplusplus.proxy.init(event); - // MinecraftForge.EVENT_BUS.register(this); - // FMLCommonHandler.instance().bus().register(this); - GTplusplus.proxy.registerNetworkStuff(); + public void init(FMLInitializationEvent event) + { + proxy.init(event); + //MinecraftForge.EVENT_BUS.register(this); + //FMLCommonHandler.instance().bus().register(this); + proxy.registerNetworkStuff(); } - // Post-Init + //Post-Init @Mod.EventHandler - public void postInit(final FMLPostInitializationEvent event) { - GTplusplus.proxy.postInit(event); + public void postInit(FMLPostInitializationEvent event) { + proxy.postInit(event); - if (CORE.DEBUG) { - this.dumpGtRecipeMap(Gregtech_Recipe_Map.sChemicalDehydratorRecipes); - this.dumpGtRecipeMap(Gregtech_Recipe_Map.sCokeOvenRecipes); - this.dumpGtRecipeMap(Gregtech_Recipe_Map.sMatterFab2Recipes); + if (DEBUG){ + dumpGtRecipeMap(Gregtech_Recipe_Map.sChemicalDehydratorRecipes); + dumpGtRecipeMap(Gregtech_Recipe_Map.sCokeOvenRecipes); + dumpGtRecipeMap(Gregtech_Recipe_Map.sMatterFab2Recipes); } - this.dumpGtRecipeMap(Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes); + 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."); } - // Pre-Init - @Mod.EventHandler - 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); - } - @EventHandler - public void serverStarting(final FMLServerStartingEvent event) { + public void serverStarting(FMLServerStartingEvent event) + { event.registerServerCommand(new CommandMath()); } @Mod.EventHandler - public void serverStopping(final FMLServerStoppingEvent event) { + public void serverStopping(FMLServerStoppingEvent event) + { + + } + + @Override + public void actionPerformed(ActionEvent arg0) { } + 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("========================"); + } + } + } diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index 69ecb9ed5b..3b6f061ca7 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -1,60 +1,60 @@ package gtPlusPlus.core.block; -import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.block.general.LightGlass; import gtPlusPlus.core.block.machine.Machine_Workbench; import gtPlusPlus.core.block.machine.Machine_WorkbenchAdvanced; import gtPlusPlus.core.fluids.FluidRegistryHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks2; 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 { - 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 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 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"); - ModBlocks.registerBlocks(); + registerBlocks(); } - public static void registerBlocks() { + public static void registerBlocks(){ Utils.LOG_INFO("Registering Blocks."); - GameRegistry.registerBlock( - ModBlocks.MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F) - .setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), - "blockMFEffect"); + GameRegistry.registerBlock(MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F).setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), "blockMFEffect"); - // Fluids + //Fluids FluidRegistryHandler.registerFluids(); - // Workbench - ModBlocks.blockWorkbench = new Machine_Workbench().setHardness(1.5F); - ModBlocks.blockWorkbenchAdvanced = new Machine_WorkbenchAdvanced().setHardness(2.5F); + //Workbench + blockWorkbench = new Machine_Workbench().setHardness(1.5F); + 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 0160da883f..b7ac24a71b 100644 --- a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java @@ -9,25 +9,23 @@ import net.minecraft.world.World; public class AdvancedBlock extends Block { - protected AdvancedBlock(final String unlocalizedName, final Material material, final CreativeTabs x, - final float blockHardness, final float blockResistance, final float blockLightLevel, - final String blockHarvestTool, final int blockHarvestLevel, final SoundType BlockSound) { - super(material); - this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); - this.setCreativeTab(x); - this.setHardness(blockHardness); // block Hardness - this.setResistance(blockResistance); - this.setLightLevel(blockLightLevel); - this.setHarvestLevel(blockHarvestTool, blockHarvestLevel); - this.setStepSound(BlockSound); - } - - @Override - public boolean onBlockActivated(final World p_149727_1_, final int p_149727_2_, final int p_149727_3_, - final int p_149727_4_, final EntityPlayer p_149727_5_, final int p_149727_6_, final float p_149727_7_, - final float p_149727_8_, final float p_149727_9_) { - return false; - } + protected AdvancedBlock(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; + } } diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java index 64ee68224e..c95f37d9c5 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java @@ -8,43 +8,45 @@ import net.minecraft.block.material.Material; public class BasicBlock extends Block { - 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); - } - + 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; + } + + } + } diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index f389f5bf32..a2d2589f5e 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -1,9 +1,5 @@ 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; @@ -12,142 +8,142 @@ 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 { +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(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, - final int colour) { - super(blockType.getTexture() + unlocalizedName, Material.iron); + public BlockBaseModular(String unlocalizedName, String blockMaterial, BlockTypes blockType, 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(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("=========================================="); + 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("=========================================="); } - - 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); + + if (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 (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 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 { LanguageRegistry.addName(this, blockMaterial); - // Utils.LOG_INFO("Registered Block in Language Registry as: - // "+blockMaterial); - } - - // 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); + //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial); + } + +