From 867af762b9a04c6e8456a583d3f4aa1702aabf18 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Thu, 30 Jun 2016 13:47:04 +1000 Subject: %Refactored all of the GT related code into the xmod package instead of being in its own. %Renamed intermod package to xmod. --- src/Java/miscutil/core/block/ModBlocks.java | 2 +- src/Java/miscutil/core/common/CommonProxy.java | 2 +- src/Java/miscutil/core/handler/COMPAT_HANDLER.java | 2 +- .../core/handler/COMPAT_IntermodStaging.java | 10 +- .../events/PickaxeBlockBreakEventHandler.java | 2 +- .../handler/events/UnbreakableBlockManager.java | 2 +- .../gregtech/GregtechCobbleGenerator.java | 4 +- .../registration/gregtech/GregtechConduits.java | 2 +- .../gregtech/GregtechEnergyBuffer.java | 8 +- .../gregtech/GregtechIndustrialCentrifuge.java | 4 +- .../gregtech/GregtechIndustrialCokeOven.java | 4 +- .../gregtech/GregtechIndustrialPlatePress.java | 4 +- .../gregtech/GregtechRocketFuelGenerator.java | 8 +- .../registration/gregtech/GregtechSafeBlock.java | 4 +- .../gregtech/GregtechSteamCondenser.java | 8 +- .../core/intermod/forestry/HANDLER_Forestry.java | 28 - .../apiculture/blocks/FR_BlockAlveary.java | 219 ------ .../blocks/FR_BlockRegistryApiculture.java | 41 -- .../apiculture/items/FR_ItemHiveFrame.java | 67 -- .../items/FR_ItemRegistryApiculture.java | 58 -- .../items/magicbees/FR_StringManager.java | 30 - .../items/magicbees/MB_HiveFrameType.java | 107 --- .../items/magicbees/MB_ItemMagicHiveFrame.java | 62 -- .../apiculture/multiblock/FR_TileAlveary.java | 199 ----- .../apiculture/multiblock/TileAlvearyMutatron.java | 232 ------ .../inventory/FR_ContainerAlvearyMutatron.java | 28 - .../inventory/FR_GuiAlvearyMutatron.java | 26 - .../multiblock/inventory/FR_InventoryMutatron.java | 29 - .../multiblock/inventory/MutatronHandler.java | 22 - .../forestry/apiculture/tiles/FR_TileHandler.java | 14 - .../forestry/core/gui/FR_FontRenderer.java | 111 --- .../intermod/forestry/core/gui/FR_GuiForestry.java | 272 ------- .../forestry/core/gui/FR_GuiForestryTitled.java | 33 - .../intermod/forestry/core/gui/FR_GuiUtil.java | 145 ---- .../forestry/core/gui/FR_WidgetManager.java | 90 --- .../intermod/growthcraft/HANDLER_Growthcraft.java | 65 -- .../psychedelicraft/HANDLER_Psychedelicraft.java | 27 - .../intermod/psychedelicraft/fluids/PS_Fluids.java | 54 -- .../HANDLER_ThermalFoundation.java | 37 - .../block/TF_Block_Fluid_Cryotheum.java | 188 ----- .../block/TF_Block_Fluid_Pyrotheum.java | 181 ----- .../thermalfoundation/block/TF_Blocks.java | 26 - .../thermalfoundation/fluid/TF_Fluids.java | 53 -- .../intermod/thermalfoundation/item/TF_Items.java | 79 -- .../recipe/TF_Gregtech_Recipes.java | 61 -- src/Java/miscutil/core/lib/CORE.java | 4 +- src/Java/miscutil/core/lib/LoadedMods.java | 2 +- .../core/recipe/RECIPES_LaserEngraver.java | 2 +- .../core/recipe/RECIPES_MachineComponents.java | 2 +- .../miscutil/core/recipe/RECIPES_Machines.java | 2 +- .../core/xmod/forestry/HANDLER_Forestry.java | 28 + .../apiculture/blocks/FR_BlockAlveary.java | 219 ++++++ .../blocks/FR_BlockRegistryApiculture.java | 41 ++ .../apiculture/items/FR_ItemHiveFrame.java | 67 ++ .../items/FR_ItemRegistryApiculture.java | 58 ++ .../items/magicbees/FR_StringManager.java | 30 + .../items/magicbees/MB_HiveFrameType.java | 107 +++ .../items/magicbees/MB_ItemMagicHiveFrame.java | 62 ++ .../apiculture/multiblock/FR_TileAlveary.java | 199 +++++ .../apiculture/multiblock/TileAlvearyMutatron.java | 232 ++++++ .../inventory/FR_ContainerAlvearyMutatron.java | 28 + .../inventory/FR_GuiAlvearyMutatron.java | 26 + .../multiblock/inventory/FR_InventoryMutatron.java | 29 + .../multiblock/inventory/MutatronHandler.java | 22 + .../forestry/apiculture/tiles/FR_TileHandler.java | 14 + .../xmod/forestry/core/gui/FR_FontRenderer.java | 111 +++ .../xmod/forestry/core/gui/FR_GuiForestry.java | 272 +++++++ .../forestry/core/gui/FR_GuiForestryTitled.java | 33 + .../core/xmod/forestry/core/gui/FR_GuiUtil.java | 145 ++++ .../xmod/forestry/core/gui/FR_WidgetManager.java | 90 +++ .../core/xmod/gregtech/HANDLER_Gregtech.java | 41 ++ .../xmod/gregtech/api/energy/IC2ElectricItem.java | 55 ++ .../api/energy/IC2ElectricItemManager.java | 95 +++ .../xmod/gregtech/api/enums/GregtechItemList.java | 203 ++++++ .../gregtech/api/enums/GregtechOreDictNames.java | 39 + .../gregtech/api/enums/GregtechOrePrefixes.java | 776 ++++++++++++++++++++ .../gregtech/api/enums/GregtechTextureSet.java | 144 ++++ .../xmod/gregtech/api/enums/GregtechTextures.java | 200 +++++ .../api/gui/CONTAINER_IronBlastFurnace.java | 31 + .../gregtech/api/gui/CONTAINER_MultiMachine.java | 35 + .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 120 +++ .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 97 +++ .../gregtech/api/gui/GUI_IronBlastFurnace.java | 30 + .../xmod/gregtech/api/gui/GUI_MultiMachine.java | 63 ++ .../core/xmod/gregtech/api/gui/GUI_SafeBlock.java | 49 ++ .../xmod/gregtech/api/gui/GUI_SteamCondenser.java | 55 ++ .../api/interfaces/GregtechItemContainer.java | 24 + .../interfaces/internal/IGregtech_RecipeAdder.java | 24 + .../internal/Interface_ItemBehaviour.java | 41 ++ .../internal/Interface_OreRecipeRegistrator.java | 16 + .../Interface_OreRecipeRegistrator_GT.java | 16 + .../interfaces/internal/Interface_ToolStats.java | 155 ++++ .../gregtech/api/items/Gregtech_Generic_Item.java | 176 +++++ .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 323 +++++++++ .../gregtech/api/items/Gregtech_MetaItem_Base.java | 549 ++++++++++++++ .../gregtech/api/items/Gregtech_MetaItem_X32.java | 194 +++++ .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 605 ++++++++++++++++ .../implementations/GregtechMetaCondensor.java | 164 +++++ .../implementations/GregtechMetaEnergyBuffer.java | 402 ++++++++++ .../GregtechMetaPipeEntity_Cable.java | 235 ++++++ .../implementations/GregtechMetaSafeBlock.java | 76 ++ .../base/GregtechMetaBoilerBase.java | 328 +++++++++ .../base/GregtechMetaSafeBlockBase.java | 343 +++++++++ .../base/GregtechMetaTileEntity.java | 67 ++ .../base/GregtechMeta_MultiBlockBase.java | 805 +++++++++++++++++++++ .../base/GregtechRocketFuelGeneratorBase.java | 263 +++++++ .../implementations/base/GregtechSteelBoiler.java | 290 ++++++++ .../creative/GregtechMetaCreativeEnergyBuffer.java | 268 +++++++ .../xmod/gregtech/api/objects/GregtechFluid.java | 27 + .../gregtech/api/objects/GregtechItemData.java | 130 ++++ .../api/objects/GregtechMaterialStack.java | 42 ++ .../api/objects/GregtechRenderedTexture.java | 162 +++++ .../api/util/GregtechOreDictUnificator.java | 366 ++++++++++ .../xmod/gregtech/api/util/GregtechRecipe.java | 677 +++++++++++++++++ .../api/util/GregtechRecipeRegistrator.java | 339 +++++++++ .../xmod/gregtech/common/GregtechRecipeAdder.java | 119 +++ .../core/xmod/gregtech/common/Meta_GT_Proxy.java | 386 ++++++++++ .../common/blocks/GregtechMetaCasingBlocks.java | 457 ++++++++++++ .../blocks/GregtechMetaCasingBlocksAbstract.java | 140 ++++ .../common/blocks/GregtechMetaCasingItems.java | 11 + .../common/blocks/GregtechMetaItemCasings1.java | 33 + .../blocks/GregtechMetaItemCasingsAbstract.java | 45 ++ .../common/blocks/fluid/GregtechFluidHandler.java | 36 + .../common/items/MetaGeneratedGregtechItems.java | 155 ++++ .../common/items/MetaGeneratedGregtechTools.java | 24 + .../GregtechMetaTileEntityRocketFuelGenerator.java | 119 +++ ...GregtechMetaTileEntityElectricBlastFurnace.java | 236 ++++++ ...GregtechMetaTileEntityIndustrialCentrifuge.java | 452 ++++++++++++ .../GregtechMetaTileEntityIndustrialCokeOven.java | 267 +++++++ ...GregtechMetaTileEntityIndustrialPlatePress.java | 249 +++++++ .../GregtechMetaTileEntityIronBlastFurnace.java | 369 ++++++++++ .../gregtech/common/tools/TOOL_Gregtech_Base.java | 168 +++++ .../tools/TOOL_Gregtech_BaseMultiblockItem.java | 49 ++ .../TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java | 27 + .../xmod/gregtech/loaders/Processing_Block.java | 107 +++ .../xmod/gregtech/loaders/Processing_Ingot1.java | 68 ++ .../xmod/gregtech/loaders/Processing_Plate1.java | 56 ++ .../core/xmod/growthcraft/HANDLER_Growthcraft.java | 65 ++ .../psychedelicraft/HANDLER_Psychedelicraft.java | 27 + .../xmod/psychedelicraft/fluids/PS_Fluids.java | 54 ++ .../HANDLER_ThermalFoundation.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 | 53 ++ .../core/xmod/thermalfoundation/item/TF_Items.java | 79 ++ .../recipe/TF_Gregtech_Recipes.java | 62 ++ 147 files changed, 15337 insertions(+), 2623 deletions(-) delete mode 100644 src/Java/miscutil/core/intermod/forestry/HANDLER_Forestry.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockAlveary.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemHiveFrame.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemRegistryApiculture.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/FR_StringManager.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/FR_TileAlveary.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/TileAlvearyMutatron.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/FR_ContainerAlvearyMutatron.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/FR_GuiAlvearyMutatron.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/FR_InventoryMutatron.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/inventory/MutatronHandler.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/apiculture/tiles/FR_TileHandler.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/core/gui/FR_FontRenderer.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/core/gui/FR_GuiForestry.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/core/gui/FR_GuiForestryTitled.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/core/gui/FR_GuiUtil.java delete mode 100644 src/Java/miscutil/core/intermod/forestry/core/gui/FR_WidgetManager.java delete mode 100644 src/Java/miscutil/core/intermod/growthcraft/HANDLER_Growthcraft.java delete mode 100644 src/Java/miscutil/core/intermod/psychedelicraft/HANDLER_Psychedelicraft.java delete mode 100644 src/Java/miscutil/core/intermod/psychedelicraft/fluids/PS_Fluids.java delete mode 100644 src/Java/miscutil/core/intermod/thermalfoundation/HANDLER_ThermalFoundation.java delete mode 100644 src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java delete mode 100644 src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java delete mode 100644 src/Java/miscutil/core/intermod/thermalfoundation/block/TF_Blocks.java delete mode 100644 src/Java/miscutil/core/intermod/thermalfoundation/fluid/TF_Fluids.java delete mode 100644 src/Java/miscutil/core/intermod/thermalfoundation/item/TF_Items.java delete mode 100644 src/Java/miscutil/core/intermod/thermalfoundation/recipe/TF_Gregtech_Recipes.java create mode 100644 src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockAlveary.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemHiveFrame.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistryApiculture.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringManager.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/FR_TileAlveary.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/TileAlvearyMutatron.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/FR_ContainerAlvearyMutatron.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/FR_GuiAlvearyMutatron.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/FR_InventoryMutatron.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/multiblock/inventory/MutatronHandler.java create mode 100644 src/Java/miscutil/core/xmod/forestry/apiculture/tiles/FR_TileHandler.java create mode 100644 src/Java/miscutil/core/xmod/forestry/core/gui/FR_FontRenderer.java create mode 100644 src/Java/miscutil/core/xmod/forestry/core/gui/FR_GuiForestry.java create mode 100644 src/Java/miscutil/core/xmod/forestry/core/gui/FR_GuiForestryTitled.java create mode 100644 src/Java/miscutil/core/xmod/forestry/core/gui/FR_GuiUtil.java create mode 100644 src/Java/miscutil/core/xmod/forestry/core/gui/FR_WidgetManager.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/HANDLER_Gregtech.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItem.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/energy/IC2ElectricItemManager.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOreDictNames.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextureSet.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_MultiMachine.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SafeBlock.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/gui/GUI_SteamCondenser.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/GregtechItemContainer.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaTool.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaBoilerBase.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechRocketFuelGeneratorBase.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechSteelBoiler.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechFluid.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechItemData.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechMaterialStack.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechRenderedTexture.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/util/GregtechOreDictUnificator.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipe.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/api/util/GregtechRecipeRegistrator.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/GregtechRecipeAdder.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityElectricBlastFurnace.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Block.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Ingot1.java create mode 100644 src/Java/miscutil/core/xmod/gregtech/loaders/Processing_Plate1.java create mode 100644 src/Java/miscutil/core/xmod/growthcraft/HANDLER_Growthcraft.java create mode 100644 src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psychedelicraft.java create mode 100644 src/Java/miscutil/core/xmod/psychedelicraft/fluids/PS_Fluids.java create mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_ThermalFoundation.java create mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java create mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java create mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/block/TF_Blocks.java create mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/fluid/TF_Fluids.java create mode 100644 src/Java/miscutil/core/xmod/thermalfoundation/item/TF_Items.java create 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 7ab4a4c5c0..10918c9d06 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -3,7 +3,7 @@ package miscutil.core.block; import miscutil.core.block.base.BasicBlock; import miscutil.core.block.general.fluids.FluidRegistryHandler; import miscutil.core.util.Utils; -import miscutil.gregtech.common.blocks.GregtechMetaCasingBlocks; +import miscutil.core.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 1d67860537..3a983916c5 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -17,7 +17,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.gregtech.common.Meta_GT_Proxy; +import miscutil.core.xmod.gregtech.common.Meta_GT_Proxy; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index a62d7c6734..e57288f963 100644 --- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -36,7 +36,7 @@ import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; import miscutil.core.util.recipe.UtilsRecipe; -import miscutil.gregtech.common.items.MetaGeneratedGregtechItems; +import miscutil.core.xmod.gregtech.common.items.MetaGeneratedGregtechItems; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java index 53e070a2d2..035049e40d 100644 --- a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java +++ b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java @@ -1,10 +1,10 @@ package miscutil.core.handler; -import miscutil.core.intermod.forestry.HANDLER_Forestry; -import miscutil.core.intermod.growthcraft.HANDLER_Growthcraft; -import miscutil.core.intermod.psychedelicraft.HANDLER_Psychedelicraft; -import miscutil.core.intermod.thermalfoundation.HANDLER_ThermalFoundation; -import miscutil.gregtech.HANDLER_Gregtech; +import miscutil.core.xmod.forestry.HANDLER_Forestry; +import miscutil.core.xmod.gregtech.HANDLER_Gregtech; +import miscutil.core.xmod.growthcraft.HANDLER_Growthcraft; +import miscutil.core.xmod.psychedelicraft.HANDLER_Psychedelicraft; +import miscutil.core.xmod.thermalfoundation.HANDLER_ThermalFoundation; public class COMPAT_IntermodStaging { diff --git a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java index 524adfc97f..9f5cdb943e 100644 --- a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java +++ b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.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.gregtech.api.metatileentity.implementations.base.GregtechMetaSafeBlockBase; +import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.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 9ce59cb2c2..4309079d31 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.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; +import miscutil.core.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/GregtechCobbleGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java index 00323bce33..c68c3dc831 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java @@ -5,8 +5,8 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OreDictNames; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; -import miscutil.gregtech.api.enums.GregtechItemList; -import miscutil.gregtech.api.metatileentity.implementations.base.GregtechSteelBoiler; +import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechSteelBoiler; import cpw.mods.fml.common.FMLLog; public class GregtechCobbleGenerator diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java index 370a5d94a8..6844e707f4 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java @@ -7,7 +7,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable; +import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable; 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 b6fe9fe07d..e36a11748e 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.gregtech.api.enums.GregtechOreDictNames; -import miscutil.gregtech.api.enums.GregtechItemList; -import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer; -import miscutil.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer; +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; 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 324131155d..096b0e7b69 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.gregtech.api.enums.GregtechItemList; -import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCentrifuge; +import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.core.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 53f540609c..dd589a61a1 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.gregtech.api.enums.GregtechItemList; -import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven; +import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialCokeOven; public class GregtechIndustrialCokeOven { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java index eba567ea42..1a4698482b 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java @@ -1,7 +1,7 @@ package miscutil.core.handler.registration.gregtech; -import miscutil.gregtech.api.enums.GregtechItemList; -import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress; +import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIndustrialPlatePress; public class GregtechIndustrialPlatePress { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java index 13e15e35ab..df1f58aca4 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java @@ -6,10 +6,10 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.gregtech.api.enums.GregtechItemList; -import miscutil.gregtech.api.enums.GregtechOrePrefixes; -import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import miscutil.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator; +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.core.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 a285970602..6149a4f39d 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.gregtech.api.enums.GregtechItemList; -import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; +import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; public class GregtechSafeBlock { diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java index 781daccde3..a0c9ab5553 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java @@ -1,10 +1,10 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; -import miscutil.gregtech.api.enums.GregtechItemList; -import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCondensor; -import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityElectricBlastFurnace; -import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace; +import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.core.xmod.gregtech.api.metatileentity.implementations.GregtechMetaCondensor; +import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityElectricBlastFurnace; +import miscutil.core.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace; public class GregtechSteamCondenser { diff --git a/src/Java/miscutil/core/intermod/forestry/HANDLER_Forestry.java b/src/Java/miscutil/core/intermod/forestry/HANDLER_Forestry.java deleted file mode 100644 index 166dd1ce01..0000000000 --- a/src/Java/miscutil/core/intermod/forestry/HANDLER_Forestry.java +++ /dev/null @@ -1,28 +0,0 @@ -package miscutil.core.intermod.forestry; - -import miscutil.core.intermod.forestry.apiculture.blocks.FR_BlockRegistryApiculture; -import miscutil.core.intermod.forestry.apiculture.items.FR_ItemRegistryApiculture; -import miscutil.core.intermod.forestry.apiculture.tiles.FR_TileHandler; -import miscutil.core.lib.LoadedMods; - -public class HANDLER_Forestry { - - public static void preInit(){ - if (LoadedMods.Forestry){ - FR_ItemRegistryApiculture.RegisterApiculture(); - FR_BlockRegistryApiculture.RegistryApiculture(); - } - } - - public static void Init(){ - if (LoadedMods.Forestry){ - FR_TileHandler.init(); - } - } - - public static void postInit(){ - if (LoadedMods.Forestry){ - - } - } -} diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockAlveary.java b/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockAlveary.java deleted file mode 100644 index f22404e2f0..0000000000 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockAlveary.java +++ /dev/null @@ -1,219 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package miscutil.core.intermod.forestry.apiculture.blocks; - -import java.util.ArrayList; -import java.util.List; - -import miscutil.core.creative.AddToCreativeTab; -import miscutil.core.intermod.forestry.apiculture.multiblock.TileAlvearyMutatron; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -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.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.apiculture.MaterialBeehive; -import forestry.apiculture.multiblock.TileAlveary; -import forestry.core.blocks.BlockStructure; -import forestry.core.render.TextureManager; - -public class FR_BlockAlveary extends BlockStructure { - public enum Type { - PLAIN, - MUTATRON; - public static final Type[] VALUES = values(); - } - - public FR_BlockAlveary() { - super(new MaterialBeehive(false)); - setHardness(1.0f); - setCreativeTab(AddToCreativeTab.tabMisc); - setHarvestLevel("axe", 0); - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 8; i++) { - if (i == 1) { - continue; - } - 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; - } - - /* TILE ENTITY CREATION */ - @Override - public TileEntity createTileEntity(World world, int metadata) { - if (metadata < 0 || metadata > Type.VALUES.length) { - return null; - } - return new TileAlvearyMutatron(); - } - - @Override - public TileEntity createNewTileEntity(World world, int meta) { - return createTileEntity(world, meta); - } - - /* ICONS */ - public static final int PLAIN = 0; - public static final int ENTRANCE = 1; - public static final int BOTTOM = 2; - public static final int LEFT = 3; - public static final int RIGHT = 4; - public static final int MUTATRON_OFF = 5; - public static final int MUTATRON_ON = 6; - - @SideOnly(Side.CLIENT) - private IIcon[] icons; - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[7]; - icons[0] = TextureManager.registerTex(register, "apiculture/alveary.plain"); - icons[1] = TextureManager.registerTex(register, "apiculture/alveary.entrance"); - icons[2] = TextureManager.registerTex(register, "apiculture/alveary.bottom"); - icons[3] = TextureManager.registerTex(register, "apiculture/alveary.left"); - icons[4] = TextureManager.registerTex(register, "apiculture/alveary.right"); - icons[5] = TextureManager.registerTex(register, "apiculture/alveary.mutatron.off"); - icons[6] = TextureManager.registerTex(register, "apiculture/alveary.mutatron.on"); - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon(int side, int metadata) { - if ((metadata <= 1 /*|| metadata == Type.MUTATRON.ordinal()*/) && (side == 1 || side == 0)) { - return icons[BOTTOM]; - } - return icons[MUTATRON_OFF]; - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - int meta = world.getBlockMetadata(x, y, z); - - if (meta == 1) { - return this.getIcon(side, meta); - } else if (meta > 1) { - return getBlockTextureFromSideAndTile(world, x, y, z, side); - } - - Block blockXP = world.getBlock(x + 1, y, z); - Block blockXM = world.getBlock(x - 1, y, z); - - if (blockXP == this && blockXM != this) { - - if (world.getBlockMetadata(x + 1, y, z) == 1) { - - if (world.getBlock(x, y, z + 1) != this) { - return switchForSide(42, side); - } else { - return switchForSide(41, side); - } - - } else { - return this.getIcon(side, meta); - } - - } else if (blockXP != this && blockXM == this) { - if (world.getBlockMetadata(x - 1, y, z) == 1) { - - if (world.getBlock(x, y, z + 1) != this) { - return switchForSide(41, side); - } else { - return switchForSide(42, side); - } - - } else { - return this.getIcon(side, meta); - } - } - - return this.getIcon(side, meta); - } - - @SideOnly(Side.CLIENT) - private IIcon getBlockTextureFromSideAndTile(IBlockAccess world, int x, int y, int z, int side) { - TileEntity tile = world.getTileEntity(x, y, z); - if (!(tile instanceof TileAlveary)) { - return getIcon(side, 0); - } - - return icons[((TileAlveary) tile).getIcon(side)]; - } - - @SideOnly(Side.CLIENT) - private IIcon switchForSide(int textureId, int side) { - - if (side == 4 || side == 5) { - if (textureId == 41) { - return icons[LEFT]; - } else { - return icons[RIGHT]; - } - } else if (textureId == 41) { - return icons[RIGHT]; - } else { - return icons[LEFT]; - } - - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - super.onNeighborBlockChange(world, x, y, z, block); - - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileEntity instanceof TileAlveary) { - TileAlveary tileAlveary = (TileAlveary) tileEntity; - - // We must check that the slabs on top were not removed - tileAlveary.getMultiblockLogic().getController().reassemble(); - } - } - - public ItemStack get(Type type) { - return new ItemStack(this, 1, type.ordinal()); - } -} diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java b/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java deleted file mode 100644 index 499c20ff95..0000000000 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/blocks/FR_BlockRegistryApiculture.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package miscutil.core.intermod.forestry.apiculture.blocks; - -import miscutil.core.lib.CORE; -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.registry.GameRegistry; -import forestry.core.blocks.BlockRegistry; -import forestry.core.items.ItemBlockForestry; -import forestry.core.utils.StringUtil; -public class FR_BlockRegistryApiculture extends BlockRegistry { - - public static FR_BlockAlveary alveary; - - public static void RegistryApiculture() { - if (CORE.DEBUG){ - alveary = registerBlock2(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary"); - } - } - - protected static T registerBlock2(T block, Class itemClass, String name, Object... itemCtorArgs) { - block.setBlockName(name); - GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs); - return block; - } - - protected static void registerOreDictWildcard(String oreDictName, Block block) { - OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE)); - } -} \ No newline at end of file diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemHiveFrame.java b/src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemHiveFrame.java deleted file mode 100644 index de8de491af..0000000000 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemHiveFrame.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package miscutil.core.intermod.forestry.apiculture.items; - -import miscutil.core.creative.AddToCreativeTab; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import forestry.api.apiculture.DefaultBeeModifier; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IHiveFrame; - -public class FR_ItemHiveFrame extends Item implements IHiveFrame { - - private final IBeeModifier beeModifier; - - public FR_ItemHiveFrame(int maxDamage, float geneticDecay) { - setMaxStackSize(1); - setMaxDamage(maxDamage); - setCreativeTab(AddToCreativeTab.tabMisc); - - this.beeModifier = new HiveFrameBeeModifier(geneticDecay); - } - - @Override - public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) { - frame.setItemDamage(frame.getItemDamage() + wear); - if (frame.getItemDamage() >= frame.getMaxDamage()) { - return null; - } else { - return frame; - } - } - - @Override - public IBeeModifier getBeeModifier() { - return beeModifier; - } - - private static class HiveFrameBeeModifier extends DefaultBeeModifier { - private final float geneticDecay; - - public HiveFrameBeeModifier(float geneticDecay) { - this.geneticDecay = geneticDecay; - } - - @Override - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return (currentModifier < 10f) ? 2f : 1f; - } - - @Override - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return this.geneticDecay; - } - } -} diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemRegistryApiculture.java b/src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemRegistryApiculture.java deleted file mode 100644 index f648077f4e..0000000000 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/items/FR_ItemRegistryApiculture.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package miscutil.core.intermod.forestry.apiculture.items; -import miscutil.core.intermod.forestry.apiculture.items.magicbees.MB_HiveFrameType; -import miscutil.core.intermod.forestry.apiculture.items.magicbees.MB_ItemMagicHiveFrame; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; -import cpw.mods.fml.common.registry.GameRegistry; -import forestry.core.items.ItemRegistry; -import forestry.core.utils.StringUtil; - -public class FR_ItemRegistryApiculture extends ItemRegistry { - - - //----- Apiary Frames ---------------------- - public static FR_ItemHiveFrame frameUntreated; - public static FR_ItemHiveFrame frameImpregnated; - public static FR_ItemHiveFrame frameProven; - //Magic Bee Frame Items - public static MB_ItemMagicHiveFrame hiveFrameMetabolic; - public static MB_ItemMagicHiveFrame hiveFrameOblivion; - - public static void RegisterApiculture() { - - //Forestry Frames - //frameUntreated = registerItem(new FR_ItemHiveFrame(80, 0.9f), "frameUntreated"); - //frameImpregnated = registerItem(new FR_ItemHiveFrame(240, 0.4f), "frameImpregnated"); - //frameProven = registerItem(new FR_ItemHiveFrame(720, 0.3f), "frameProven"); - - //Magic Bee like Frames - hiveFrameMetabolic = new MB_ItemMagicHiveFrame(MB_HiveFrameType.ACCELERATED); - hiveFrameOblivion = new MB_ItemMagicHiveFrame(MB_HiveFrameType.VOID); - ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameOblivion), 1, 1, 18)); - ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameOblivion), 1, 3, 23)); - - - - - } - - protected static T registerItem(T item, String name) { - item.setUnlocalizedName(name); - GameRegistry.registerItem(item, StringUtil.cleanItemName(item)); - return item; - } -} - - diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/FR_StringManager.java b/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/FR_StringManager.java deleted file mode 100644 index 991b961ba9..0000000000 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/FR_StringManager.java +++ /dev/null @@ -1,30 +0,0 @@ -package miscutil.core.intermod.forestry.apiculture.items.magicbees; - -import net.minecraft.util.StatCollector; - -public class FR_StringManager -{ - public static String getLocalizedString(String key) - { - if(StatCollector.canTranslate(key)) - { - return StatCollector.translateToLocal(key); - } - else - { - return StatCollector.translateToFallback(key); - } - } - - public static String getLocalizedString(String key, Object... objects) - { - if(StatCollector.canTranslate(key)) - { - return String.format(StatCollector.translateToLocal(key), objects); - } - else - { - return String.format(StatCollector.translateToFallback(key), objects); - } - } -} diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java b/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java deleted file mode 100644 index a168c8157b..0000000000 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_HiveFrameType.java +++ /dev/null @@ -1,107 +0,0 @@ -package miscutil.core.intermod.forestry.apiculture.items.magicbees; - -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeModifier; - -public enum MB_HiveFrameType implements IBeeModifier -{ - ACCELERATED("Accelerated", 175, 1f, 2.5f, 0.9f, 1.8f, 1f), - VOID("Void", 20, 1f, 1f, 0.0001f, 10f, 1f); - - private final String frameName; - public final int maxDamage; - - private final float territoryMod; - private final float mutationMod; - private final float lifespanMod; - private final float productionMod; - private final float floweringMod; - private final float geneticDecayMod; - private final boolean isSealed; - private final boolean isLit; - private final boolean isSunlit; - private final boolean isHellish; - - MB_HiveFrameType(String name, int damage, float territory, float mutation, float lifespan, float production, float geneticDecay) { - this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false); - } - - MB_HiveFrameType(String name, int damage, - float territory, float mutation, float lifespan, float production, float flowering, float geneticDecay, - boolean sealed, boolean lit, boolean sunlit, boolean hellish) - { - this.frameName = name; - this.maxDamage = damage; - - this.territoryMod = territory; - this.mutationMod = mutation; - this.lifespanMod = lifespan; - this.productionMod = production; - this.floweringMod = flowering; - this.geneticDecayMod = geneticDecay; - this.isSealed = sealed; - this.isLit = lit; - this.isSunlit = sunlit; - this.isHellish = hellish; - } - - public String getName() - { - return this.frameName; - } - - public String getLocalizedName() - { - return FR_StringManager.getLocalizedString("frame." + this.frameName); - } - - @Override - public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return territoryMod; - } - - @Override - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return mutationMod; - } - - @Override - public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return lifespanMod; - } - - @Override - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return productionMod; - } - - @Override - public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return floweringMod; - } - - @Override - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return geneticDecayMod; - } - - @Override - public boolean isSealed() { - return isSealed; - } - - @Override - public boolean isSelfLighted() { - return isLit; - } - - @Override - public boolean isSunlightSimulated() { - return isSunlit; - } - - @Override - public boolean isHellish() { - return isHellish; - } -} diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java b/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java deleted file mode 100644 index 14234e7aae..0000000000 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/items/magicbees/MB_ItemMagicHiveFrame.java +++ /dev/null @@ -1,62 +0,0 @@ -package miscutil.core.intermod.forestry.apiculture.items.magicbees; - -import miscutil.core.creative.AddToCreativeTab; -import miscutil.core.lib.CORE; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IHiveFrame; - -public class MB_ItemMagicHiveFrame extends Item implements IHiveFrame -{ - private MB_HiveFrameType type; - - public MB_ItemMagicHiveFrame(MB_HiveFrameType frameType) - { - super(); - this.type = frameType; - this.setMaxDamage(this.type.maxDamage); - this.setMaxStackSize(1); - this.setCreativeTab(AddToCreativeTab.tabMisc); - this.setUnlocalizedName("frame" + frameType.getName()); - GameRegistry.registerItem(this, "frame" + frameType.getName()); - } - - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) - { - this.itemIcon = par1IconRegister.registerIcon(CORE.MODID + ":frame" + type.getName()); - } - - // --------- IHiveFrame functions ----------------------------------------- - - @Override - public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) { - frame.setItemDamage(frame.getItemDamage() + wear); - - if (frame.getItemDamage() >= frame.getMaxDamage()) { - // Break the frame. - frame = null; - } - - return frame; - } - - @Override - public IBeeModifier getBeeModifier() { - return type; - } - - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) - { - return false; - } - -} diff --git a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/FR_TileAlveary.java b/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/FR_TileAlveary.java deleted file mode 100644 index 29c4a7f445..0000000000 --- a/src/Java/miscutil/core/intermod/forestry/apiculture/multiblock/FR_TileAlveary.java +++ /dev/null @@ -1,199 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package miscutil.core.intermod.forestry.apiculture.multiblock; - -import java.io.IOException; -import java.util.List; - -import miscutil.core.intermod.forestry.apiculture.blocks.FR_BlockAlveary; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.Vec3; -import net.minecraft.world.biome.BiomeGenBase; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeHousingInventory; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IBeekeepingLogic; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.core.IErrorLogic; -import forestry.api.multiblock.IAlvearyComponent; -import forestry.api.multiblock.IMultiblockController; -import forestry.apiculture.multiblock.MultiblockLogicAlveary; -import forestry.core.access.EnumAccess; -import forestry.core.access.IAccessHandler; -import forestry.core.access.IRestrictedAccess; -import forestry.core.config.Config; -import forestry.core.gui.IHintSource; -import forestry.core.inventory.IInventoryAdapter; -import forestry.core.multiblock.MultiblockTileEntityForestry; -import forestry.core.network.DataInputStreamForestry; -import forestry.core.network.DataOutputStreamForestry; -import forestry.core.network.IStreamableGui; -import forestry.core.tiles.IClimatised; -import forestry.core.tiles.ITitled; - -public abstract class FR_TileAlveary extends MultiblockTileEntityForestry implements IBeeHousing, IAlvearyComponent, IRestrictedAccess, IStreamableGui, ITitled, IClimatised, IHintSource { - private final String unlocalizedTitle; - - protected FR_TileAlveary() { - this(FR_BlockAlveary.Type.PLAIN); - } - - protected FR_TileAlveary(FR_BlockAlveary.Type type) { - super(new MultiblockLogicAlveary()); - this.unlocalizedTitle = "tile.alveary." + type.ordinal() + ".name"; - } - - /* TEXTURES */ - public int getIcon(int side) { - return FR_BlockAlveary.PLAIN; - } - - @Override - public void onMachineAssembled(IMultiblockController multiblockController, ChunkCoordinates minCoord, ChunkCoordinates maxCoord) { - // Re-render this block on the client - if (worldObj.isRemote) { - this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - markDirty(); - } - - @Override - public void onMachineBroken() { - // Re-render this block on the client - if (worldObj.isRemote) { - this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - markDirty(); - } - - /* IHousing */ - @Override - public BiomeGenBase getBiome() { - return getMultiblockLogic().getController().getBiome(); - } - - /* IBeeHousing */ - @Override - public Iterable getBeeModifiers() { - return getMultiblockLogic().getController().getBeeModifiers(); - } - - @Override - public Iterable getBeeListeners() { - return getMultiblockLogic().getController().getBeeListeners(); - } - - @Override - public IBeeHousingInventory getBeeInventory() { - return getMultiblockLogic().getController().getBeeInventory(); - } - - @Override - public IBeekeepingLogic getBeekeepingLogic() { - return getMultiblockLogic().getController().getBeekeepingLogic(); - } - - @Override - public Vec3 getBeeFXCoordinates() { - return getMultiblockLogic().getController().getBeeFXCoordinates(); - } - - /* IClimatised */ - @Override - public EnumTemperature getTemperature() { - return getMultiblockLogic().getController().getTemperature(); - } - - @Override - public EnumHumidity getHumidity() { - return getMultiblockLogic().getController().getHumidity(); - } - - @Override - public int getBlockLightValue() { - return getMultiblockLogic().getController().getBlockLightValue(); - } - - @Override - public boolean canBlockSeeTheSky() { - return getMultiblockLogic().getController().canBlockSeeTheSky(); - } - - @Override - public IErrorLogic getErrorLogic() { - return getMultiblockLogic().getController().getErrorLogic(); - } - - @Override - public IAccessHandler getAccessHandler() { - return getMultiblockLogic().getController().getAccessHandler(); - } - - @Override - public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) { - getMultiblockLogic().getController().onSwitchAccess(oldAccess, newAccess); - } - - @Override - public IInventoryAdapter getInternalInventory() { - return getMultiblockLogic().getController().getInternalInventory(); - } - - @Override - public String getUnlocalizedTitle() { - return unlocalizedTitle; - } - - /* IHintSource */ - @Override - public List getHints() { - return Config.hints.get("apiary"); - } - - /* IClimatised */ - @Override - public float getExactTemperature() { - return getMultiblockLogic().getController().getExactTemperature(); - } - - @Override - public float getExactHumidity() { - return getMultiblockLogic().getController().getExactHumidity(); - } - - /* IStreamableGui */ - @Override - public void writeGuiData(DataOutputStreamForestry data) throws IOException { - getMultiblockLogic().getController().writeGuiData(data); - } - - @Override - public void readGuiData(DataInputStreamForestry data) throws IOException { - getMultiblockLogic().getController().readGuiData(data); - } - - @Override - public Object getGui(EntityPlayer player, int data) { - //return new GuiAlveary(player.inventory, this); - return null; //TODO - } - - @Override - public Object getContainer(EntityPlayer player, int data) { - //return new ContainerAlveary(player.inventory, this); - return null; //TODO - } -} diff --git a/src/Java/miscutil/core/intermod/forestry