From 072f6322fb789703f163030edf4b60bf5a0201af Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 27 Aug 2016 01:34:08 +1000 Subject: + Attempted to add custom IC2 generators. % Refactored the xmod package to be a parent, beside core. No longer is it a child, it needs room to grow. --- src/Java/miscutil/core/block/ModBlocks.java | 2 +- src/Java/miscutil/core/common/CommonProxy.java | 2 +- .../core/handler/COMPAT_IntermodStaging.java | 12 +- src/Java/miscutil/core/handler/GuiHandler.java | 22 +- .../events/PickaxeBlockBreakEventHandler.java | 2 +- .../handler/events/UnbreakableBlockManager.java | 2 +- .../registration/gregtech/GregtechConduits.java | 8 +- .../gregtech/GregtechEnergyBuffer.java | 8 +- .../gregtech/GregtechIndustrialCentrifuge.java | 4 +- .../gregtech/GregtechIndustrialCokeOven.java | 4 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 4 +- .../gregtech/GregtechIndustrialMacerator.java | 4 +- .../gregtech/GregtechIndustrialMassFabricator.java | 4 +- .../gregtech/GregtechIndustrialPlatePress.java | 4 +- .../gregtech/GregtechIndustrialSinter.java | 4 +- .../gregtech/GregtechIndustrialWiremill.java | 4 +- .../gregtech/GregtechIronBlastFurnace.java | 4 +- .../gregtech/GregtechRocketFuelGenerator.java | 4 +- .../registration/gregtech/GregtechSafeBlock.java | 4 +- .../gregtech/GregtechSolarGenerators.java | 4 +- .../gregtech/GregtechSteamCondenser.java | 4 +- .../gregtech/GregtechSuperConductionPoint.java | 4 +- src/Java/miscutil/core/item/ModItems.java | 4 +- .../core/item/general/ItemCloakingDevice.java | 21 +- src/Java/miscutil/core/lib/CORE.java | 10 +- src/Java/miscutil/core/lib/LoadedMods.java | 4 +- .../miscutil/core/recipe/RECIPES_GREGTECH.java | 2 +- .../core/recipe/RECIPES_LaserEngraver.java | 2 +- .../core/recipe/RECIPES_MachineComponents.java | 2 +- .../miscutil/core/recipe/RECIPES_Machines.java | 6 +- .../miscutil/core/recipe/RECIPE_Batteries.java | 2 +- .../miscutil/core/recipe/RECIPE_CONSTANTS.java | 2 +- src/Java/miscutil/core/slots/SlotRTG.java | 25 + .../miscutil/core/xmod/forestry/HANDLER_FR.java | 34 - .../bees/alveary/FR_AlvearyFrameBlock.java | 45 - .../forestry/bees/alveary/FR_BlockAlveary.java | 274 --- .../xmod/forestry/bees/alveary/FR_TileAlveary.java | 199 --- .../bees/alveary/IAlvearyComponentAdvanced.java | 28 - .../bees/alveary/ISidedFrameWearingInventory.java | 10 - .../bees/alveary/TileAlvearyFrameHousing.java | 301 ---- .../bees/alveary/gui/CONTAINER_FrameHousing.java | 98 -- .../bees/alveary/gui/GUI_FrameHousing.java | 49 - .../bees/alveary/gui/InventoryFrameHousing.java | 21 - .../xmod/forestry/bees/items/FR_ItemRegistry.java | 97 - .../xmod/forestry/bees/items/FR_StringUtil.java | 24 - .../xmod/forestry/bees/items/MB_FrameType.java | 119 -- .../xmod/forestry/bees/items/MB_ItemFrame.java | 140 -- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 82 - .../miscutil/core/xmod/gregtech/HANDLER_GT.java | 44 - .../xmod/gregtech/api/energy/IC2ElectricItem.java | 55 - .../api/energy/IC2ElectricItemManager.java | 95 - .../xmod/gregtech/api/enums/GregtechItemList.java | 221 --- .../gregtech/api/enums/GregtechOreDictNames.java | 39 - .../gregtech/api/enums/GregtechOrePrefixes.java | 797 --------- .../gregtech/api/enums/GregtechTextureSet.java | 144 -- .../xmod/gregtech/api/enums/GregtechTextures.java | 199 --- .../gregtech/api/enums/GregtechToolDictNames.java | 7 - .../api/gui/CONTAINER_IndustrialCentrifuge.java | 38 - .../api/gui/CONTAINER_IronBlastFurnace.java | 31 - .../gregtech/api/gui/CONTAINER_MultiMachine.java | 36 - .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 123 -- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 80 - .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 97 - .../gregtech/api/gui/GUI_IndustrialCentrifuge.java | 65 - .../gregtech/api/gui/GUI_IronBlastFurnace.java | 30 - .../xmod/gregtech/api/gui/GUI_MultiMachine.java | 64 - .../core/xmod/gregtech/api/gui/GUI_SafeBlock.java | 49 - .../xmod/gregtech/api/gui/GUI_SolarGenerator.java | 41 - .../xmod/gregtech/api/gui/GUI_SteamCondenser.java | 55 - .../api/interfaces/GregtechItemContainer.java | 24 - .../interfaces/internal/IGregtech_RecipeAdder.java | 36 - .../internal/Interface_IconContainer.java | 21 - .../internal/Interface_ItemBehaviour.java | 41 - .../internal/Interface_OreRecipeRegistrator.java | 16 - .../Interface_OreRecipeRegistrator_GT.java | 16 - .../api/interfaces/internal/Interface_Texture.java | 20 - .../interfaces/internal/Interface_ToolStats.java | 160 -- .../gregtech/api/items/Gregtech_Generic_Item.java | 186 -- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 323 ---- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 559 ------ .../gregtech/api/items/Gregtech_MetaItem_X32.java | 204 --- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 605 ------- .../gregtech/api/items/types/ToolType_Base.java | 84 - .../api/items/types/ToolType_HardHammer.java | 127 -- .../gregtech/api/items/types/ToolType_Wrench.java | 149 -- .../implementations/GregtechMetaCondensor.java | 165 -- .../implementations/GregtechMetaEnergyBuffer.java | 338 ---- .../GregtechMetaPipeEntity_Cable.java | 236 --- .../GregtechMetaPipeEntity_SuperConductor.java | 239 --- .../implementations/GregtechMetaSafeBlock.java | 76 - .../GregtechMetaSuperConductorNodeBase.java | 297 ---- .../base/GregtechMetaPipeEntityBase_Cable.java | 291 --- .../base/GregtechMetaTileEntity.java | 67 - .../base/GregtechMeta_MultiBlockBase.java | 828 --------- .../base/generators/GregtechMetaBoilerBase.java | 328 ---- .../generators/GregtechMetaSolarGenerator.java | 211 --- .../GregtechRocketFuelGeneratorBase.java | 263 --- .../GregtechBaseMetaTileEntityLossless.java | 1849 -------------------- .../GregtechMetaPipeEntity_BaseSuperConductor.java | 640 ------- .../lossless/GregtechMetaTileEntityLossless.java | 66 - .../GregtechMetaTileEntityLosslessBasicTank.java | 251 --- ...chMetaTileEntityLosslessTieredMachineBlock.java | 67 - .../base/lossless/MetaTileEntityLossless.java | 865 --------- .../base/machines/GregtechMetaSafeBlockBase.java | 350 ---- .../creative/GregtechMetaCreativeEnergyBuffer.java | 269 --- .../xmod/gregtech/api/objects/GregtechFluid.java | 27 - .../gregtech/api/objects/GregtechItemData.java | 130 -- .../api/objects/GregtechMaterialStack.java | 42 - .../api/objects/GregtechRenderedTexture.java | 162 -- .../ProcessingSkookumChoocherToolRecipes.java | 19 - .../api/util/GregtechOreDictUnificator.java | 366 ---- .../xmod/gregtech/api/util/GregtechRecipe.java | 751 -------- .../api/util/GregtechRecipeRegistrator.java | 339 ---- .../core/xmod/gregtech/common/Meta_GT_Proxy.java | 429 ----- .../common/blocks/GregtechMetaCasingBlocks.java | 76 - .../blocks/GregtechMetaCasingBlocksAbstract.java | 143 -- .../common/blocks/GregtechMetaCasingItems.java | 11 - .../common/blocks/GregtechMetaItemCasings1.java | 33 - .../blocks/GregtechMetaItemCasingsAbstract.java | 45 - .../common/blocks/fluid/GregtechFluidHandler.java | 39 - .../blocks/textures/CasingTextureHandler.java | 66 - .../common/blocks/textures/TexturesGregtech58.java | 441 ----- .../common/blocks/textures/TexturesGregtech59.java | 442 ----- .../common/items/MetaGeneratedGregtechItems.java | 163 -- .../common/items/MetaGeneratedGregtechTools.java | 39 - .../generators/GT_MetaTileEntity_Boiler_Solar.java | 144 -- .../GregtechMetaTileEntityRocketFuelGenerator.java | 119 -- .../GregtechMetaTileEntitySolarGenerator.java | 174 -- .../GregtechMetaTileEntitySuperCondensor.java | 104 -- ...GregtechMetaTileEntityIndustrialCentrifuge.java | 326 ---- .../GregtechMetaTileEntityIndustrialCokeOven.java | 272 --- ...egtechMetaTileEntityIndustrialElectrolyzer.java | 258 --- .../GregtechMetaTileEntityIndustrialMacerator.java | 278 --- ...GregtechMetaTileEntityIndustrialPlatePress.java | 204 --- .../GregtechMetaTileEntityIndustrialSinter.java | 263 --- .../GregtechMetaTileEntityIndustrialWireMill.java | 246 --- .../GregtechMetaTileEntityIronBlastFurnace.java | 373 ---- .../GregtechMetaTileEntityMassFabricator.java | 304 ---- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 168 -- .../tools/TOOL_Gregtech_BaseMultiblockItem.java | 49 - .../common/tools/TOOL_Gregtech_Choocher.java | 198 --- .../TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java | 27 - .../xmod/gregtech/loaders/Processing_Block.java | 107 -- .../gregtech/loaders/Processing_HotIngots.java | 23 - .../xmod/gregtech/loaders/Processing_Ingot1.java | 68 - .../xmod/gregtech/loaders/Processing_Plate1.java | 56 - .../loaders/Processing_Textures_Items.java | 10 - .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 136 -- .../recipes/machines/RECIPEHANDLER_CokeOven.java | 46 - .../machines/RECIPEHANDLER_MatterFabricator.java | 45 - .../miscutil/core/xmod/growthcraft/HANDLER_GC.java | 28 - .../xmod/growthcraft/booze/Register_Booze.java | 64 - src/Java/miscutil/core/xmod/ic2/HANDLER_IC2.java | 28 - .../core/xmod/ic2/item/IC2_ItemGradual.java | 41 - .../core/xmod/ic2/item/IC2_ItemGradualInteger.java | 53 - .../miscutil/core/xmod/ic2/item/IC2_ItemIC2.java | 104 -- .../miscutil/core/xmod/ic2/item/IC2_Items.java | 69 - .../miscutil/core/xmod/ic2/item/RotorBase.java | 99 -- .../miscutil/core/xmod/ic2/item/RotorIridium.java | 121 -- .../miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java | 151 -- .../core/xmod/psychedelicraft/HANDLER_Psych.java | 27 - .../xmod/psychedelicraft/fluids/PS_Fluids.java | 54 - .../core/xmod/thermalfoundation/HANDLER_TF.java | 37 - .../block/TF_Block_Fluid_Cryotheum.java | 188 -- .../block/TF_Block_Fluid_Pyrotheum.java | 181 -- .../xmod/thermalfoundation/block/TF_Blocks.java | 26 - .../xmod/thermalfoundation/fluid/TF_Fluids.java | 61 - .../core/xmod/thermalfoundation/item/TF_Items.java | 79 - .../recipe/TF_Gregtech_Recipes.java | 62 - 169 files changed, 113 insertions(+), 23413 deletions(-) create mode 100644 src/Java/miscutil/core/slots/SlotRTG.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_BlockAlveary.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_TileAlveary.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/alveary/IAlvearyComponentAdvanced.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/alveary/ISidedFrameWearingInventory.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/alveary/TileAlvearyFrameHousing.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/items/FR_StringUtil.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java delete mode 100644 src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItem.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItemManager.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOreDictNames.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextureSet.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechToolDictNames.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_MultiMachine.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SafeBlock.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SolarGenerator.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SteamCondenser.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/GregtechItemContainer.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_Texture.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaTool.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/types/ToolType_Base.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/types/ToolType_HardHammer.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/types/ToolType_Wrench.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_SuperConductor.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSuperConductorNodeBase.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechBaseMetaTileEntityLossless.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaPipeEntity_BaseSuperConductor.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLossless.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessBasicTank.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/GregtechMetaTileEntityLosslessTieredMachineBlock.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/lossless/MetaTileEntityLossless.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechFluid.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechItemData.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechMaterialStack.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechRenderedTexture.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/util/GregtechOreDictUnificator.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipe.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipeRegistrator.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySuperCondensor.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialSinter.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Block.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/loaders/Processing_HotIngots.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Ingot1.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Plate1.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Textures_Items.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/recipes/GregtechRecipeAdder.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java delete mode 100644 src/Java/miscutil/core/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java delete mode 100644 src/Java/miscutil/core/xmod/growthcraft/HANDLER_GC.java delete mode 100644 src/Java/miscutil/core/xmod/growthcraft/booze/Register_Booze.java delete mode 100644 src/Java/miscutil/core/xmod/ic2/HANDLER_IC2.java delete mode 100644 src/Java/miscutil/core/xmod/ic2/item/IC2_ItemGradual.java delete mode 100644 src/Java/miscutil/core/xmod/ic2/item/IC2_ItemGradualInteger.java delete mode 100644 src/Java/miscutil/core/xmod/ic2/item/IC2_ItemIC2.java delete mode 100644 src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java delete mode 100644 src/Java/miscutil/core/xmod/ic2/item/RotorBase.java delete mode 100644 src/Java/miscutil/core/xmod/ic2/item/RotorIridium.java delete mode 100644 src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java delete mode 100644 src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psych.java delete mode 100644 src/Java/miscutil/core/xmod/psychedelicraft/fluids/PS_Fluids.java delete mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_TF.java delete mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java delete mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java delete mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Blocks.java delete mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/fluid/TF_Fluids.java delete mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/item/TF_Items.java delete mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java (limited to 'src/Java/miscutil/core') diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java index a59ba21bc7..ce4ad6c19e 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -5,7 +5,7 @@ import miscutil.core.block.general.LightGlass; import miscutil.core.block.general.fluids.FluidRegistryHandler; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; +import miscutil.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index 6bad498027..eec65c0bb3 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -18,7 +18,7 @@ import miscutil.core.tileentities.ModTileEntities; import miscutil.core.util.Utils; import miscutil.core.util.debug.DEBUG_INIT; import miscutil.core.util.player.PlayerCache; -import miscutil.core.xmod.gregtech.common.Meta_GT_Proxy; +import miscutil.xmod.gregtech.common.Meta_GT_Proxy; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; diff --git a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java index 12cb385604..b9bb097ba4 100644 --- a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java +++ b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java @@ -1,11 +1,11 @@ package miscutil.core.handler; -import miscutil.core.xmod.forestry.HANDLER_FR; -import miscutil.core.xmod.gregtech.HANDLER_GT; -import miscutil.core.xmod.growthcraft.HANDLER_GC; -import miscutil.core.xmod.ic2.HANDLER_IC2; -import miscutil.core.xmod.psychedelicraft.HANDLER_Psych; -import miscutil.core.xmod.thermalfoundation.HANDLER_TF; +import miscutil.xmod.forestry.HANDLER_FR; +import miscutil.xmod.gregtech.HANDLER_GT; +import miscutil.xmod.growthcraft.HANDLER_GC; +import miscutil.xmod.ic2.HANDLER_IC2; +import miscutil.xmod.psychedelicraft.HANDLER_Psych; +import miscutil.xmod.thermalfoundation.HANDLER_TF; public class COMPAT_IntermodStaging { diff --git a/src/Java/miscutil/core/handler/GuiHandler.java b/src/Java/miscutil/core/handler/GuiHandler.java index a1a1ef98c1..b617ef645f 100644 --- a/src/Java/miscutil/core/handler/GuiHandler.java +++ b/src/Java/miscutil/core/handler/GuiHandler.java @@ -1,17 +1,17 @@ package miscutil.core.handler; import miscutil.MiscUtils; -import miscutil.core.container.Container_Charger; import miscutil.core.gui.beta.Gui_ID_Registry; import miscutil.core.gui.beta.MU_GuiId; -import miscutil.core.gui.machine.GUI_Charger; import miscutil.core.interfaces.IGuiManager; import miscutil.core.lib.CORE; -import miscutil.core.tileentities.machines.TileEntityCharger; import miscutil.core.util.Utils; -import miscutil.core.xmod.forestry.bees.alveary.TileAlvearyFrameHousing; -import miscutil.core.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing; -import miscutil.core.xmod.forestry.bees.alveary.gui.GUI_FrameHousing; +import miscutil.xmod.forestry.bees.alveary.TileAlvearyFrameHousing; +import miscutil.xmod.forestry.bees.alveary.gui.CONTAINER_FrameHousing; +import miscutil.xmod.forestry.bees.alveary.gui.GUI_FrameHousing; +import miscutil.xmod.ic2.block.RTGGenerator.TileEntityRTG; +import miscutil.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RadioThermalGenerator; +import miscutil.xmod.ic2.block.RTGGenerator.gui.GUI_RadioThermalGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; @@ -21,8 +21,8 @@ import cpw.mods.fml.common.network.NetworkRegistry; public class GuiHandler implements IGuiHandler { - private static final int GUI1 = 0; //Nuclear Helium Gen. - private static final int GUI2 = 1; //Energy Charger + private static final int GUI1 = 0; //Frame Alveary + private static final int GUI2 = 1; //RTG public static void init(){ @@ -45,7 +45,7 @@ public class GuiHandler implements IGuiHandler { } } else if (ID == GUI2){ - return new Container_Charger((TileEntityCharger)te, player); + return new CONTAINER_RadioThermalGenerator((TileEntityRTG)te, player); } @@ -66,8 +66,8 @@ public class GuiHandler implements IGuiHandler { } } else if (ID == GUI2){ - Utils.LOG_WARNING("Opening Gui with Id: "+ID+" Charger"); - return new GUI_Charger((TileEntityCharger) te, player); + Utils.LOG_WARNING("Opening Gui with Id: "+ID+" RTG"); + return new GUI_RadioThermalGenerator((TileEntityRTG) te, player); } } return null; diff --git a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java index dff067d9c7..ddf6372fed 100644 --- a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java +++ b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java @@ -8,7 +8,7 @@ import gregtech.api.metatileentity.BaseTileEntity; import java.util.UUID; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase; +import miscutil.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java b/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java index 4309079d31..14d3d6b177 100644 --- a/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java +++ b/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java @@ -5,7 +5,7 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.metatileentity.BaseTileEntity; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; +import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java index ed65802d0d..e10780a11d 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java @@ -7,10 +7,10 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes; -import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable; -import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_SuperConductor; +import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes; +import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; +import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable; +import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_SuperConductor; import net.minecraft.item.ItemStack; public class GregtechConduits { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java index 8766afc097..21e74c1614 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java @@ -5,10 +5,10 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.api.enums.GregtechOreDictNames; -import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer; -import miscutil.core.xmod.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.api.enums.GregtechOreDictNames; +import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer; +import miscutil.xmod.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer; public class GregtechEnergyBuffer { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java index 9475b213f2..6e0324966f 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge; public class GregtechIndustrialCentrifuge { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java index 208fb7883f..bd3d9f4d89 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven; public class GregtechIndustrialCokeOven { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java index 98386cf4b0..c4ad9c122b 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialElectrolyzer; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialElectrolyzer; public class GregtechIndustrialElectrolyzer { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java index ccd81e6dd2..fa3663fb81 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialMacerator; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialMacerator; public class GregtechIndustrialMacerator { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java index 72bf99b6b5..cbb4be3115 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMassFabricator; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityMassFabricator; public class GregtechIndustrialMassFabricator { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java index 87364565ea..4e25ff3475 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress; public class GregtechIndustrialPlatePress { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java index 0c0ffb8cbd..03ad7cce7f 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialSinter; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialSinter; public class GregtechIndustrialSinter{ diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java index d5ba679edb..5672775a56 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialWireMill; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialWireMill; public class GregtechIndustrialWiremill { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java index 8dea539053..d5271181f9 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace; public class GregtechIronBlastFurnace { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java index 01cf22e8b1..3a61884782 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java @@ -2,8 +2,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator; public class GregtechRocketFuelGenerator { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java index 99bb28e8c7..5def5e1a92 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java @@ -6,8 +6,8 @@ import gregtech.api.enums.OreDictNames; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; public class GregtechSafeBlock { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java index e4d9a36fe1..3c58d69209 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java @@ -3,8 +3,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.lib.CORE.configSwitches; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator; public class GregtechSolarGenerators { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java index 64c386dec0..7cd222205d 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor; public class GregtechSteamCondenser { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java index b7f5fb6157..d18a9ed3c3 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySuperCondensor; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySuperCondensor; public class GregtechSuperConductionPoint { diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 7406c3eca6..ef5dc581a7 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -166,6 +166,7 @@ public final class ModItems { public static Item RfEuBattery; public static Item itemPersonalCloakingDevice; + public static Item itemPersonalCloakingDeviceCharged; public static Item itemPersonalHealingDevice; @@ -350,7 +351,8 @@ public final class ModItems { FuelRod_Uranium = new FuelRod_Base("itemFuelRod_Uranium", "Uranium", 2500, 2500); FuelRod_Plutonium = new FuelRod_Base("itemFuelRod_Plutonium", "Plutonium", 5000, 5000); RfEuBattery = new RF2EU_Battery(); - itemPersonalCloakingDevice = new ItemCloakingDevice(); + itemPersonalCloakingDevice = new ItemCloakingDevice(0); + //itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set; itemPersonalHealingDevice = new ItemHealingDevice(); //Registry //GameRegistry.registerItem(FuelRod_Empty, "itemFuelRod_Empty"); diff --git a/src/Java/miscutil/core/item/general/ItemCloakingDevice.java b/src/Java/miscutil/core/item/general/ItemCloakingDevice.java index b54bb08a87..afd2fc5c58 100644 --- a/src/Java/miscutil/core/item/general/ItemCloakingDevice.java +++ b/src/Java/miscutil/core/item/general/ItemCloakingDevice.java @@ -27,16 +27,21 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric private final String unlocalizedName = "personalCloakingDevice"; private final ItemStack thisStack; - private final static int maxValueEU = 8196*20*5*60; + private final static int maxValueEU = 10000*20*500; protected double chargeEU = 0; - public ItemCloakingDevice(){ + public ItemCloakingDevice(double charge){ + this.chargeEU = charge; this.setCreativeTab(AddToCreativeTab.tabMachines); this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(1); this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice"); this.thisStack = UtilsItems.getSimpleStack(this); - GameRegistry.registerItem(this, unlocalizedName); + this.charge(thisStack, charge, 3, true, false); + if (charge == 10000*20*500){ + this.setDamage(thisStack, 13); + } + GameRegistry.registerItem(this, unlocalizedName+"-"+charge); } @Override @@ -119,7 +124,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric public int secondsLeft(ItemStack stack){ double r = 0; - r = getCharge(stack)/(8196*20); + r = getCharge(stack)/(10000*20); return (int) MathUtils.decimalRounding(r); } @@ -127,10 +132,10 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { list.add(""); list.add(EnumChatFormatting.GREEN+"Worn as a Belt within Baubles."+EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.GREEN+"Drains 8196Eu/t to provide invisibility."+EnumChatFormatting.GRAY); + list.add(EnumChatFormatting.GREEN+"Drains 10,000Eu/t to provide invisibility."+EnumChatFormatting.GRAY); list.add(""); list.add(EnumChatFormatting.GOLD+"IC2/EU Information"+EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.GRAY+"Tier: ["+EnumChatFormatting.YELLOW+getTier(thisStack)+EnumChatFormatting.GRAY+"] Transfer Limit: ["+EnumChatFormatting.YELLOW+getTransferLimit(thisStack)+EnumChatFormatting.GRAY +"Eu/t]"); + list.add(EnumChatFormatting.GRAY+"Tier: ["+EnumChatFormatting.YELLOW+getTier(thisStack)+EnumChatFormatting.GRAY+"] Input Limit: ["+EnumChatFormatting.YELLOW+getTransferLimit(thisStack)+EnumChatFormatting.GRAY +"Eu/t]"); list.add(EnumChatFormatting.GRAY+"Current Power: ["+EnumChatFormatting.YELLOW+(long) getCharge(stack)+EnumChatFormatting.GRAY+"Eu] ["+EnumChatFormatting.YELLOW+MathUtils.findPercentage(getCharge(stack), getMaxCharge(stack))+EnumChatFormatting.GRAY +"%]"); list.add(EnumChatFormatting.GRAY+"Time Remaining: ["+EnumChatFormatting.YELLOW+secondsLeft(stack)+ EnumChatFormatting.GRAY +" seconds]"); super.addInformation(stack, aPlayer, list, bool); @@ -236,9 +241,9 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric public void onWornTick(ItemStack arg0, EntityLivingBase arg1) { //Utils.LOG_INFO("Trying to Tick Belt. 1"); if (!arg1.worldObj.isRemote){ - if (getCharge(arg0) >= 2048){ + if (getCharge(arg0) >= 10000){ arg1.addPotionEffect(new PotionEffect(Potion.invisibility.id, 10, 2)); - discharge(arg0, 2048, 5, true, true, false); + discharge(arg0, 10000, 5, true, true, false); } else { if (arg1.isPotionActive((Potion.invisibility))){ diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index a02da08339..057d0f030a 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; import miscutil.core.creative.AddToCreativeTab; -import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import miscutil.core.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder; -import miscutil.core.xmod.gregtech.common.Meta_GT_Proxy; +import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; +import miscutil.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder; +import miscutil.xmod.gregtech.common.Meta_GT_Proxy; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.config.Configuration; @@ -18,8 +18,8 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.4.3.9-release"; - public static boolean DEBUG = true; + public static final String VERSION = "1.4.3.11-release"; + public static boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; public static Map PlayerCache; diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java index 6b25b197fe..d79f727560 100644 --- a/src/Java/miscutil/core/lib/LoadedMods.java +++ b/src/Java/miscutil/core/lib/LoadedMods.java @@ -2,8 +2,8 @@ package miscutil.core.lib; import miscutil.core.lib.CORE.configSwitches; import miscutil.core.util.Utils; -import miscutil.core.xmod.gregtech.api.enums.GregtechTextures; -import miscutil.core.xmod.gregtech.recipes.GregtechRecipeAdder; +import miscutil.xmod.gregtech.api.enums.GregtechTextures; +import miscutil.xmod.gregtech.recipes.GregtechRecipeAdder; import cpw.mods.fml.common.Loader; public class LoadedMods { diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java index e27963150a..724c0a2cac 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java @@ -10,7 +10,7 @@ import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.fluid.FluidUtils; import miscutil.core.util.item.UtilsItems; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; public class RECIPES_GREGTECH { diff --git a/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java b/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java index 8570a0d1b1..ba53337de3 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java +++ b/src/Java/miscutil/core/recipe/RECIPES_LaserEngraver.java @@ -7,7 +7,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { diff --git a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java index 4625263eee..9f9716fbbb 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java +++ b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java @@ -9,7 +9,7 @@ import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.recipe.UtilsRecipe; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; public class RECIPES_MachineComponents { diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java index dc1f3caabc..55584cf2ac 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java @@ -6,9 +6,9 @@ import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; import miscutil.core.util.recipe.UtilsRecipe; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes; -import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes; +import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import net.minecraft.item.ItemStack; public class RECIPES_Machines { diff --git a/src/Java/miscutil/core/recipe/RECIPE_Batteries.java b/src/Java/miscutil/core/recipe/RECIPE_Batteries.java index 9764e4d590..fcd3993745 100644 --- a/src/Java/miscutil/core/recipe/RECIPE_Batteries.java +++ b/src/Java/miscutil/core/recipe/RECIPE_Batteries.java @@ -4,7 +4,7 @@ import gregtech.api.enums.ItemList; import miscutil.core.lib.LoadedMods; import miscutil.core.util.item.UtilsItems; import miscutil.core.util.recipe.UtilsRecipe; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; public class RECIPE_Batteries { diff --git a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java b/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java index 9bb1b24bd8..569cd8cf15 100644 --- a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java +++ b/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java @@ -2,7 +2,7 @@ package miscutil.core.recipe; import miscutil.core.lib.CORE; import miscutil.core.util.item.UtilsItems; -import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; public class RECIPE_CONSTANTS { diff --git a/src/Java/miscutil/core/slots/SlotRTG.java b/src/Java/miscutil/core/slots/SlotRTG.java new file mode 100644 index 0000000000..b653cc62d1 --- /dev/null +++ b/src/Java/miscutil/core/slots/SlotRTG.java @@ -0,0 +1,25 @@ +package miscutil.core.slots; + +import ic2.core.Ic2Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class SlotRTG extends Slot{ + + public SlotRTG(IInventory inventory, int x, int y, int z) { + super(inventory, x, y, z); + + } + + @Override + public boolean isItemValid(ItemStack itemstack) { + return itemstack.getItem().getClass() == Ic2Items.RTGPellets.getItem().getClass(); + } + + @Override + public int getSlotStackLimit() { + return 1; + } + +} diff --git a/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java b/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java deleted file mode 100644 index 8f5426e1fa..0000000000 --- a/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java +++ /dev/null @@ -1,34 +0,0 @@ -package miscutil.core.xmod.forestry; - -import miscutil.core.lib.CORE; -import miscutil.core.lib.LoadedMods; -import miscutil.core.xmod.forestry.bees.alveary.TileAlvearyFrameHousing; -import miscutil.core.xmod.forestry.bees.items.FR_ItemRegistry; -import miscutil.core.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; -import cpw.mods.fml.common.registry.GameRegistry; - -public class HANDLER_FR { - - public static void preInit(){ - if (LoadedMods.Forestry){ - FR_ItemRegistry.Register(); - if (CORE.configSwitches.enableCustomAlvearyBlocks){ - GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing"); - } - //FR_BlockRegistryApiculture.RegistryApiculture(); - } - } - - public static void Init(){ - if (LoadedMods.Forestry){ - //FR_TileHandler.init(); - //new FR_GuiIDRegistry(); - } - } - - public static void postInit(){ - if (LoadedMods.Forestry){ - FR_Gregtech_Recipes.registerItems(); - } - } -} diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java b/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java deleted file mode 100644 index d8fb9827de..0000000000 --- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_AlvearyFrameBlock.java +++ /dev/null @@ -1,45 +0,0 @@ -package miscutil.core.xmod.forestry.bees.alveary; - -import net.minecraft.util.ChunkCoordinates; - -import com.mojang.authlib.GameProfile; - -import forestry.api.multiblock.IAlvearyComponent; -import forestry.api.multiblock.IMultiblockComponent; -import forestry.api.multiblock.IMultiblockController; -import forestry.api.multiblock.IMultiblockLogicAlveary; - -public class FR_AlvearyFrameBlock implements IAlvearyComponent, IMultiblockComponent{ - - @Override - public ChunkCoordinates getCoordinates() { - // TODO Auto-generated method stub - return null; - } - - @Override - public GameProfile getOwner() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void onMachineAssembled(IMultiblockController arg0, - ChunkCoordinates arg1, ChunkCoordinates arg2) { - // TODO Auto-generated method stub - - } - - @Override - public void onMachineBroken() { - // TODO Auto-generated method stub - - } - - @Override - public IMultiblockLogicAlveary getMultiblockLogic() { - // TODO Auto-generated method stub - return null; - } - -} diff --git a/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_BlockAlveary.java b/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_BlockAlveary.java deleted file mode 100644 index ff08464405..0000000000 --- a/src/Java/miscutil/core/xmod/forestry/bees/alveary/FR_BlockAlveary.java +++ /dev/null @@ -1,274 +0,0 @@ -package miscutil.core.xmod.forestry.bees.alveary; - -import java.util.ArrayList; -import java.util.List; - -import miscutil.MiscUtils; -import miscutil.core.creative.AddToCreativeTab; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.apiculture.MaterialBeehive; -import forestry.apiculture.multiblock.TileAlvearyPlain; -import forestry.core.blocks.BlockStructure; -import forestry.core.render.TextureManager; - -public class FR_BlockAlveary extends BlockStructure -{ - - public static enum Type - { - PLAIN, - ERROR, - FRAME, - MUTATOR, - - //Placeholder Values - HEATER, HYGRO, STABILIZER, SIEVE; - - public static final Type[] VALUES = values(); - - private Type() {} - } - - public FR_BlockAlveary() - { - super(new MaterialBeehive(false)); - setHardness(1.0F); - setCreativeTab(AddToCreativeTab.tabBlock); - setHarvestLevel("axe", 0); - - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) - { - if (world.isRemote) return true; - - TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te instanceof TileAlvearyFrameHousing) - { - player.openGui(MiscUtils.instance, 0, world, x, y, z); - return true; - } - /*else if (te != null && te instanceof TileAlvearyFrameHousing) - { - player.openGui(MiscUtils.instance, 0, world, x, y, z); - return true; - }*/ - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) - { - for (int i = 0; i < 4; i++) { - if (i != 1 && i != 0) { - list.add(new ItemStack(item, 1, i)); - } - } - } - - @Override - public int getRenderType() - { - return 0; - } - - @Override - public boolean renderAsNormalBlock() - { - return true; - } - - @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) - { - ArrayList drop = new ArrayList(); - drop.add(new ItemStack(this, 1, metadata != 1 ? metadata : 0)); - return drop; - } - - @Override - public int getDamageValue(World world, int x, int y, int z) - { - int meta = world.getBlockMetadata(x, y, z); - return meta != 1 ? meta : 0; - } - - @Override - public TileEntity createTileEntity(World world, int metadata) - { - if ((metadata < 0) || (metadata > Type.VALUES.length)) { - return null; - } - - - - Type type = Type.VALUES[metadata]; - switch (type) - { - case FRAME: - LanguageRegistry.addName(this, "Alveary Frame Housing"); - case MUTATOR: - LanguageRegistry.addName(this, "Alveary Mutator Block"); - case ERROR: - LanguageRegistry.addName(this, "Invalid Alveary Block"); - default: - LanguageRegistry.addName(this, "Unnamed Alveary Block"); - } - switch (type) - { - case FRAME: - return new TileAlvearyFrameHousing(); - case MUTATOR: - return new TileAlvearyPlain(); - case ERROR: - return new TileAlvearyPlain(); - default: - return new TileAlvearyPlain(); - }