From 311ab89f93558233a40079f7cb16605b141b5346 Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Sun, 12 Dec 2021 19:38:06 +0100 Subject: Move sources and resources --- .../xmod/gregtech/api/energy/IC2ElectricItem.java | 55 - .../api/energy/IC2ElectricItemManager.java | 95 - .../xmod/gregtech/api/enums/CustomGtTextures.java | 81 - .../xmod/gregtech/api/enums/CustomOrePrefix.java | 112 - .../xmod/gregtech/api/enums/GregtechItemList.java | 903 ------- .../gregtech/api/enums/GregtechOreDictNames.java | 39 - .../gregtech/api/enums/GregtechOrePrefixes.java | 941 ------- .../gregtech/api/enums/GregtechTextureSet.java | 144 -- .../xmod/gregtech/api/enums/GregtechTextures.java | 203 -- .../gregtech/api/enums/GregtechToolDictNames.java | 7 - .../gregtech/api/gui/CONTAINER_AdvancedBoiler.java | 93 - .../xmod/gregtech/api/gui/CONTAINER_Cyclotron.java | 37 - .../gregtech/api/gui/CONTAINER_DeluxeTank.java | 80 - .../api/gui/CONTAINER_Hatch_Muffler_Advanced.java | 51 - .../api/gui/CONTAINER_IndustrialCentrifuge.java | 39 - .../api/gui/CONTAINER_IronBlastFurnace.java | 32 - .../xmod/gregtech/api/gui/CONTAINER_MatterFab.java | 42 - .../api/gui/CONTAINER_MetaTileMachineLong.java | 244 -- .../gregtech/api/gui/CONTAINER_MultiMachine.java | 283 --- .../CONTAINER_MultiMachine_NoPlayerInventory.java | 27 - .../api/gui/CONTAINER_PowerSubStation.java | 41 - .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 124 - .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 85 - .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 99 - .../gregtech/api/gui/CONTAINER_SuperChest.java | 78 - .../gregtech/api/gui/CONTAINER_TreeFarmer.java | 71 - .../xmod/gregtech/api/gui/GUI_AdvancedBoiler.java | 44 - .../xmod/gregtech/api/gui/GUI_Cyclotron.java | 44 - .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 37 - .../api/gui/GUI_Hatch_Muffler_Advanced.java | 46 - .../gregtech/api/gui/GUI_IndustrialCentrifuge.java | 73 - .../gregtech/api/gui/GUI_IronBlastFurnace.java | 32 - .../xmod/gregtech/api/gui/GUI_MatterFab.java | 81 - .../xmod/gregtech/api/gui/GUI_MultiMachine.java | 296 --- .../gregtech/api/gui/GUI_MultiMachine_Default.java | 68 - .../gregtech/api/gui/GUI_Multi_Basic_Slotted.java | 88 - .../xmod/gregtech/api/gui/GUI_PowerSubStation.java | 175 -- .../xmod/gregtech/api/gui/GUI_SafeBlock.java | 51 - .../xmod/gregtech/api/gui/GUI_SolarGenerator.java | 44 - .../xmod/gregtech/api/gui/GUI_SteamCondenser.java | 56 - .../xmod/gregtech/api/gui/GUI_SuperChest.java | 38 - .../xmod/gregtech/api/gui/GUI_TreeFarmer.java | 46 - .../api/gui/basic/CONTAINER_PollutionCleaner.java | 105 - .../api/gui/basic/GUI_PollutionCleaner.java | 65 - .../gui/fluidreactor/Container_FluidReactor.java | 184 -- .../api/gui/fluidreactor/GUI_FluidReactor.java | 122 - .../api/gui/hatches/CONTAINER_1by1_Turbine.java | 60 - .../gregtech/api/gui/hatches/CONTAINER_2by2.java | 32 - .../gregtech/api/gui/hatches/CONTAINER_4by4.java | 44 - .../gui/hatches/CONTAINER_HatchNbtConsumable.java | 282 --- .../gregtech/api/gui/hatches/GUI_1by1_Turbine.java | 36 - .../xmod/gregtech/api/gui/hatches/GUI_2by2.java | 36 - .../xmod/gregtech/api/gui/hatches/GUI_4by4.java | 36 - .../api/gui/hatches/GUI_HatchNbtConsumable.java | 59 - .../hatches/charge/CONTAINER_Electric_2by2.java | 24 - .../hatches/charge/CONTAINER_Electric_4by4.java | 37 - .../api/gui/hatches/charge/GUI_Electric_2by2.java | 21 - .../api/gui/hatches/charge/GUI_Electric_4by4.java | 22 - .../api/gui/power/CONTAINER_BasicTank.java | 69 - .../xmod/gregtech/api/gui/power/GUI_BasicTank.java | 36 - .../api/interfaces/GregtechItemContainer.java | 24 - .../xmod/gregtech/api/interfaces/IHeatEntity.java | 26 - .../xmod/gregtech/api/interfaces/IHeatSink.java | 13 - .../api/interfaces/IMetaTileEntityHeatPipe.java | 14 - .../interfaces/internal/IGregtech_RecipeAdder.java | 343 --- .../internal/Interface_IconContainer.java | 21 - .../internal/Interface_ItemBehaviour.java | 42 - .../internal/Interface_OreRecipeRegistrator.java | 21 - .../Interface_OreRecipeRegistrator_GT.java | 18 - .../api/interfaces/internal/Interface_Texture.java | 20 - .../interfaces/internal/Interface_ToolStats.java | 193 -- .../gregtech/api/items/Gregtech_Generic_Item.java | 192 -- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 345 --- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 675 ----- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 243 -- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 503 ---- .../gregtech/api/items/tools/GT_MetaGenTool.java | 546 ---- .../gregtech/api/items/types/ToolType_Base.java | 85 - .../api/items/types/ToolType_HardHammer.java | 125 - .../gregtech/api/items/types/ToolType_Pump.java | 150 -- .../gregtech/api/items/types/ToolType_Wrench.java | 150 -- .../api/metatileentity/BaseCustomTileEntity.java | 197 -- .../custom/power/BaseCustomPower_MTE.java | 280 --- .../power/GTPP_MTE_BasicLosslessGenerator.java | 313 --- .../custom/power/GTPP_MTE_BasicMachine.java | 860 ------- .../custom/power/GTPP_MTE_BasicTank.java | 266 -- .../custom/power/GTPP_MTE_TieredMachineBlock.java | 100 - .../custom/power/MetaTileEntityCustomPower.java | 91 - .../GT_MetaTileEntity_BasicBreaker.java | 283 --- ...GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java | 38 - .../GT_MetaTileEntity_Dehydrator.java | 163 -- .../GT_MetaTileEntity_DeluxeMachine.java | 862 ------- .../GT_MetaTileEntity_DeluxeTank.java | 345 --- .../GT_MetaTileEntity_Hatch_AirIntake.java | 290 --- .../GT_MetaTileEntity_Hatch_ControlCore.java | 148 -- .../GT_MetaTileEntity_Hatch_DynamoBuffer.java | 84 - ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 149 -- .../GT_MetaTileEntity_Hatch_Energy_RTG.java | 287 --- .../GT_MetaTileEntity_Hatch_InputBattery.java | 258 -- .../GT_MetaTileEntity_Hatch_Muffler_Adv.java | 329 --- .../GT_MetaTileEntity_Hatch_Naquadah.java | 208 -- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 236 -- .../GT_MetaTileEntity_Hatch_Plasma.java | 219 -- .../GT_MetaTileEntity_Hatch_Steam_BusInput.java | 234 -- .../GT_MetaTileEntity_Hatch_Steam_BusOutput.java | 175 -- .../GT_MetaTileEntity_Hatch_Turbine.java | 316 --- .../GT_MetaTileEntity_Hatch_TurbineProvider.java | 220 -- .../GT_MetaTileEntity_SuperBus_Input.java | 230 -- .../GT_MetaTileEntity_SuperBus_Output.java | 180 -- .../GregtechMetaPipeEntityFluid.java | 119 - .../GregtechMetaPipeEntity_Cable.java | 165 -- .../GregtechMetaTreeFarmerStructural.java | 56 - .../implementations/base/CustomMetaTileBase.java | 60 - .../GT_MetaTileEntity_Hatch_CustomFluidBase.java | 131 - .../base/GregtechMetaPipeEntityBase_Cable.java | 468 ---- .../base/GregtechMetaTileEntity.java | 77 - .../base/GregtechMetaTransformerHiAmp.java | 115 - .../base/GregtechMeta_MultiBlockBase.java | 2656 -------------------- .../base/GregtechMeta_SteamMultiBase.java | 796 ------ .../GregtechDoubleFuelGeneratorBase.java | 428 ---- .../base/generators/GregtechMetaBoilerBase.java | 382 --- .../generators/GregtechMetaSolarGenerator.java | 215 -- .../GregtechRocketFuelGeneratorBase.java | 372 --- .../base/machines/GregtechMetaSafeBlockBase.java | 291 --- .../base/machines/GregtechMetaTreeFarmerBase.java | 176 -- .../GT_MetaTileEntity_Hatch_Catalysts.java | 71 - .../GT_MetaTileEntity_Hatch_MillingBalls.java | 71 - .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 273 -- .../xmod/gregtech/api/objects/GregtechFluid.java | 28 - .../gregtech/api/objects/GregtechItemData.java | 144 -- .../api/objects/GregtechMaterialStack.java | 49 - .../gregtech/api/objects/MultiblockBlueprint.java | 469 ---- .../xmod/gregtech/api/objects/MultiblockLayer.java | 643 ----- .../api/objects/MultiblockRequirements.java | 108 - .../ProcessingSkookumChoocherToolRecipes.java | 22 - .../xmod/gregtech/api/util/GTPP_Config.java | 100 - .../api/util/GregtechOreDictUnificator.java | 402 --- .../api/util/SpecialBehaviourTooltipHandler.java | 35 - .../xmod/gregtech/api/world/GTPP_Worldgen.java | 61 - .../gregtech/api/world/GTPP_Worldgen_Boulder.java | 77 - .../api/world/GTPP_Worldgen_GT_Ore_Layer.java | 167 -- .../gregtech/api/world/GTPP_Worldgen_Handler.java | 41 - .../xmod/gregtech/api/world/GTPP_Worldgen_Ore.java | 33 - .../api/world/GTPP_Worldgen_Ore_Normal.java | 75 - .../xmod/gregtech/api/world/GT_OreVein_Object.java | 31 - .../xmod/gregtech/api/world/WorldGenUtils.java | 23 - 146 files changed, 27035 deletions(-) delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MetaTileMachineLong.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/GUI_FluidReactor.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_HatchNbtConsumable.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_1by1_Turbine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_HatchNbtConsumable.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/power/CONTAINER_BasicTank.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/gui/power/GUI_BasicTank.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockBlueprint.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java b/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java deleted file mode 100644 index 4ec4589c03..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java +++ /dev/null @@ -1,55 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.energy; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -/** - * Provides the ability to store energy on the implementing item. - * - * The item should have a maximum damage of 13. - */ -public interface IC2ElectricItem { - /** - * Determine if the item can be used in a machine or as an armor part to supply energy. - * - * @return Whether the item can supply energy - */ - boolean canProvideEnergy(ItemStack itemStack); - - /** - * Get the item ID to use for a charge energy greater than 0. - * - * @return Item ID to use - */ - Item getChargedItem(ItemStack itemStack); - - /** - * Get the item ID to use for a charge energy of 0. - * - * @return Item ID to use - */ - Item getEmptyItem(ItemStack itemStack); - - /** - * Get the item's maximum charge energy in EU. - * - * @return Maximum charge energy - */ - double getMaxCharge(ItemStack itemStack); - - /** - * Get the item's tier, lower tiers can't send energy to higher ones. - * Batteries are Tier 1, Energy Crystals are Tier 2, Lapotron Crystals are Tier 3. - * - * @return Item's tier - */ - int getTier(ItemStack itemStack); - - /** - * Get the item's transfer limit in EU per transfer operation. - * - * @return Transfer limit - */ - double getTransferLimit(ItemStack itemStack); -} - diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java b/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java deleted file mode 100644 index 8bf42578cc..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java +++ /dev/null @@ -1,95 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.energy; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * This interface specifies a manager to handle the various tasks for electric items. - * - * The default implementation does the following: - * - store and retrieve the charge - * - handle charging, taking amount, tier, transfer limit, canProvideEnergy and simulate into account - * - replace item IDs if appropriate (getChargedItemId() and getEmptyItemId()) - * - update and manage the damage value for the visual charge indicator - * - * @note If you're implementing your own variant (ISpecialElectricItem), you can delegate to the - * default implementations through ElectricItem.rawManager. The default implementation is designed - * to minimize its dependency on its own constraints/structure and delegates most work back to the - * more atomic features in the gateway manager. - */ -public interface IC2ElectricItemManager { - /** - * Charge an item with a specified amount of energy. - * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the charging device, has to be at least as high as the item to charge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually change the item, just determine the return value - * @return Energy transferred into the electric item - */ - double charge(ItemStack stack, double amount, int tier, boolean ignoreTransferLimit, boolean simulate); - - /** - * Discharge an item by a specified amount of energy - * - * @param itemStack electric item's stack - * @param amount amount of energy to discharge in EU - * @param tier tier of the discharging device, has to be at least as high as the item to discharge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param externally use the supplied item externally, i.e. to power something else as if it was a battery - * @param simulate don't actually discharge the item, just determine the return value - * @return Energy retrieved from the electric item - */ - double discharge(ItemStack stack, double amount, int tier, boolean ignoreTransferLimit, boolean externally, boolean simulate); - - /** - * Determine the charge level for the specified item. - * - * @param itemStack ItemStack containing the electric item - * @return charge level in EU - */ - double getCharge(ItemStack stack); - - /** - * Determine if the specified electric item has at least a specific amount of EU. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * BatPacks are not taken into account. - * - * @param itemStack electric item's stack - * @param amount minimum amount of energy required - * @return true if there's enough energy - */ - boolean canUse(ItemStack stack, double amount); - - /** - * Try to retrieve a specific amount of energy from an Item, and if applicable, a BatPack. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * - * @param itemStack electric item's stack - * @param amount amount of energy to discharge in EU - * @param entity entity holding the item - * @return true if the operation succeeded - */ - boolean use(ItemStack stack, double amount, EntityLivingBase entity); - - /** - * Charge an item from the BatPack a player is wearing. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * use() already contains this functionality. - * - * @param itemStack electric item's stack - * @param entity entity holding the item - */ - void chargeFromArmor(ItemStack stack, EntityLivingBase entity); - - /** - * Get the tool tip to display for electric items. - * - * @param itemStack ItemStack to determine the tooltip for - * @return tool tip string or null for none - */ - String getToolTip(ItemStack stack); - - // TODO: add tier getter -} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java deleted file mode 100644 index 554983c41c..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java +++ /dev/null @@ -1,81 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.enums; - -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import gregtech.api.GregTech_API; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.ITexture; -import gregtech.api.objects.GT_RenderedTexture; - -import gtPlusPlus.core.lib.CORE; - -public class CustomGtTextures { - public enum ItemIcons implements IIconContainer, Runnable { - VOID, // The Empty Texture - RENDERING_ERROR, - PUMP, - SKOOKUMCHOOCHER; - - public static final ITexture[] ERROR_RENDERING = new ITexture[]{new GT_RenderedTexture(RENDERING_ERROR)}; - - protected IIcon mIcon, mOverlay; - - private ItemIcons() { - GregTech_API.sGTItemIconload.add(this); - } - - @Override - public IIcon getIcon() { - return this.mIcon; - } - - @Override - public IIcon getOverlayIcon() { - return this.mOverlay; - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationItemsTexture; - } - - @Override - public void run() { - this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this); - this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this + "_OVERLAY"); - } - - public static class CustomIcon implements IIconContainer, Runnable { - protected IIcon mIcon, mOverlay; - protected String mIconName; - - public CustomIcon(final String aIconName) { - this.mIconName = aIconName; - GregTech_API.sGTItemIconload.add(this); - } - - @Override - public IIcon getIcon() { - return this.mIcon; - } - - @Override - public IIcon getOverlayIcon() { - return this.mOverlay; - } - - @Override - public void run() { - this.mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + this.mIconName); - this.mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + this.mIconName + "_OVERLAY"); - } - - @Override - public ResourceLocation getTextureFile() { - return TextureMap.locationItemsTexture; - } - } - } -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java deleted file mode 100644 index 9647b00578..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java +++ /dev/null @@ -1,112 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.enums; - -import static gregtech.api.enums.GT_Values.B; - -import gregtech.api.enums.OrePrefixes; -import net.minecraftforge.common.util.EnumHelper; - -public enum CustomOrePrefix { - - milled("Milled Ores", "Milled ", " Ore", true, true, false, false, false, false, false, false, false, true, B[3], -1, 64, -1); - - private final String mRegularLocalName; - private final String mLocalizedMaterialPre; - private final String mLocalizedMaterialPost; - private final boolean mIsUnificatable; - private final boolean mIsMaterialBased; - private final boolean mIsSelfReferencing; - private final boolean mIsContainer; - private final boolean mDontUnificateActively; - private final boolean mIsUsedForBlocks; - private final boolean mAllowNormalRecycling; - private final boolean mGenerateDefaultItem; - private final boolean mIsEnchantable; - private final boolean mIsUsedForOreProcessing; - private final int mMaterialGenerationBits; - private final long mMaterialAmount; - private final int mDefaultStackSize; - private final int mTextureindex; - - private OrePrefixes mSelfReference; - - private CustomOrePrefix( - String aRegularLocalName, - String aLocalizedMaterialPre, - String aLocalizedMaterialPost, - boolean aIsUnificatable, - boolean aIsMaterialBased, - boolean aIsSelfReferencing, - boolean aIsContainer, - boolean aDontUnificateActively, - boolean aIsUsedForBlocks, - boolean aAllowNormalRecycling, - boolean aGenerateDefaultItem, - boolean aIsEnchantable, - boolean aIsUsedForOreProcessing, - int aMaterialGenerationBits, - long aMaterialAmount, - int aDefaultStackSize, - int aTextureindex) { - - mRegularLocalName = aRegularLocalName; - mLocalizedMaterialPre = aLocalizedMaterialPre; - mLocalizedMaterialPost = aLocalizedMaterialPost; - mIsUnificatable = aIsUnificatable; - mIsMaterialBased = aIsMaterialBased; - mIsSelfReferencing = aIsSelfReferencing; - mIsContainer = aIsContainer; - mDontUnificateActively = aDontUnificateActively; - mIsUsedForBlocks = aIsUsedForBlocks; - mAllowNormalRecycling = aAllowNormalRecycling; - mGenerateDefaultItem = aGenerateDefaultItem; - mIsEnchantable = aIsEnchantable; - mIsUsedForOreProcessing = aIsUsedForOreProcessing; - mMaterialGenerationBits = aMaterialGenerationBits; - mMaterialAmount = aMaterialAmount; - mDefaultStackSize = aDefaultStackSize; - mTextureindex = aTextureindex; - - } - - public final boolean addToEnum() { - - mSelfReference = EnumHelper.addEnum(OrePrefixes.class, this.name(), - new Class[] { - String.class, - String.class, String.class, boolean.class, - boolean.class, boolean.class, boolean.class, - boolean.class, boolean.class, boolean.class, - boolean.class, boolean.class, boolean.class, - int.class, long.class, int.class, int.class - }, - new Object[] { - mRegularLocalName, - mLocalizedMaterialPre, - mLocalizedMaterialPost, - mIsUnificatable, - mIsMaterialBased, - mIsSelfReferencing, - mIsContainer, - mDontUnificateActively, - mIsUsedForBlocks, - mAllowNormalRecycling, - mGenerateDefaultItem, - mIsEnchantable, - mIsUsedForOreProcessing, - mMaterialGenerationBits, - mMaterialAmount, - mDefaultStackSize, - mTextureindex}); - - return mSelfReference != null; - } - - public static final boolean checkEntryWasAdded(CustomOrePrefix aCustomPrefixObject) { - return aCustomPrefixObject.mSelfReference != null; - } - - public OrePrefixes get() { - return mSelfReference; - } - -} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java deleted file mode 100644 index 8c814489f2..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ /dev/null @@ -1,903 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.enums; - -import static gregtech.api.enums.GT_Values.W; - -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -/** - * Class containing all non-OreDict Items of GregTech. - */ -public enum GregtechItemList implements GregtechItemContainer { - - /** - * Items - */ - - // Advanced Hazmat Suit - Armour_Hazmat_Advanced_Helmet, - Armour_Hazmat_Advanced_Chest, - Armour_Hazmat_Advanced_Legs, - Armour_Hazmat_Advanced_Boots, - - //Gregtech Machine Parts - Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_MAX, - Electric_Pump_LuV, Electric_Pump_ZPM, Electric_Pump_UV, Electric_Pump_MAX, - Conveyor_Module_LuV, Conveyor_Module_ZPM, Conveyor_Module_UV, Conveyor_Module_MAX, - Electric_Piston_LuV, Electric_Piston_ZPM, Electric_Piston_UV, Electric_Piston_MAX, - Robot_Arm_LuV, Robot_Arm_ZPM, Robot_Arm_UV, Robot_Arm_MAX, - Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, Field_Generator_MAX, - Emitter_LuV, Emitter_ZPM, Emitter_UV, Emitter_MAX, - Sensor_LuV, Sensor_ZPM, Sensor_UV, Sensor_MAX, - - //ULV Components - Electric_Motor_ULV, - Electric_Pump_ULV, - Conveyor_Module_ULV, - Electric_Piston_ULV, - Robot_Arm_ULV, - Field_Generator_ULV, - Emitter_ULV, - Sensor_ULV, - - // Mixed Components - TransmissionComponent_ULV, TransmissionComponent_LV, - TransmissionComponent_MV, TransmissionComponent_HV, - TransmissionComponent_EV, TransmissionComponent_IV, - TransmissionComponent_LuV, TransmissionComponent_ZPM, - TransmissionComponent_UV, TransmissionComponent_MAX, - - //Recipe Circuit - Circuit_BioRecipeSelector, - Circuit_T3RecipeSelector, - - //Circuits - Old_Circuit_Primitive, Old_Circuit_Basic, Old_Circuit_Good, - Old_Circuit_Advanced, Old_Circuit_Data, Old_Circuit_Elite, - Old_Circuit_Master, Old_Tool_DataOrb, Old_Circuit_Ultimate, Old_Tool_DataStick, - Circuit_IV, Circuit_LuV, Circuit_ZPM, - - //Circuit Parts - Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, - Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, - Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM, - Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM, - - //Old Style Circuits - Old_Circuit_Board_Basic, Old_Circuit_Board_Advanced, Old_Circuit_Board_Elite, - Old_Circuit_Parts_Crystal_Chip_Elite, Old_Circuit_Parts_Crystal_Chip_Master, Old_Circuit_Parts_Advanced, - Old_Circuit_Parts_Wiring_Basic, Old_Circuit_Parts_Wiring_Advanced, Old_Circuit_Parts_Wiring_Elite, - Old_Empty_Board_Basic, Old_Empty_Board_Elite, - - //Batteries - Battery_RE_EV_Sodium, - Battery_RE_EV_Cadmium, - Battery_RE_EV_Lithium, - - //Shapes for Extruder - Shape_Extruder_WindmillShaft, - Shape_Extruder_SmallGear, - - //Cooked Raisin Toast for ImQ009 - Food_Baked_Raisin_Bread, - - - //Fluid Cells to regulate flows. - Fluid_Cell_1L, Fluid_Cell_16L, - Fluid_Cell_36L, Fluid_Cell_144L, - - //Debug - TESTITEM, - - // Larger Volumetric Flasks - VOLUMETRIC_FLASK_8k, - VOLUMETRIC_FLASK_32k, - - //RTG Fuels - Pellet_RTG_PU238, Pellet_RTG_SR90, - Pellet_RTG_PO210, Pellet_RTG_AM241, - - //Computer Cube - Gregtech_Computer_Cube, - - //Casings for batteries - Battery_Casing_Gem_1, Battery_Casing_Gem_2, - Battery_Casing_Gem_3, Battery_Casing_Gem_4, - - //Custom Batteries - Battery_Gem_1, Battery_Gem_2, - Battery_Gem_3, Battery_Gem_4, - - //Compressed Fusion MK3 - Compressed_Fusion_Reactor, - - //Carbon Materials - NanoTube_Base_Substrate, - NanoTube_Finished, - Carbyne_Tube_Finished, - Carbyne_Sheet_Finished, - - //End Game Laser Engraver Lens - Laser_Lens_WoodsGlass, - Laser_Lens_Special, - - //Bombs - Bomb_Cast, Bomb_Cast_Molten, - Bomb_Cast_Set, Bomb_Cast_Broken, - Bomb_Cast_Mold, - - // Pellet Mold - Pellet_Mold, - - //Charged Items for Tree Farms - Farm_Processor_EV, - Farm_Processor_IV, - Farm_Processor_LuV, - Farm_Processor_ZPM, - Farm_Processor_UV, - - // Upgrade chip for Distillus - Distillus_Upgrade_Chip, - - - // Chips used to nerf my multis via custom behavioural attachments - Chip_MultiNerf_NoOutputBonus, - Chip_MultiNerf_NoSpeedBonus, - Chip_MultiNerf_NoEuBonus, - - // Milling Balls - Milling_Ball_Alumina, - Milling_Ball_Soapstone, - - - //---------------------------------------------------------------------------- - - - - /** - * MultiBlocks - */ - - - // Tier GT++ Casings - GTPP_Casing_ULV, GTPP_Casing_LV, - GTPP_Casing_MV, GTPP_Casing_HV, - GTPP_Casing_EV, GTPP_Casing_IV, - GTPP_Casing_LuV, GTPP_Casing_ZPM, - GTPP_Casing_UV, GTPP_Casing_MAX, - - //IronBlastFurnace Machine_Bronze_BlastFurnace - Machine_Iron_BlastFurnace, - Casing_IronPlatedBricks, - - //Large Centrifuge - Industrial_Centrifuge, - Casing_Centrifuge1, - - // Large Alloy Smelter - Industrial_AlloySmelter, - - //Coke Oven - Industrial_CokeOven, - Casing_CokeOven, - Casing_CokeOven_Coil1, - Casing_CokeOven_Coil2, - - //Bending Maching // Plate Press // Press - Industrial_PlatePress, - Casing_MaterialPress, - - //Matter Fab - Industrial_MassFab, - Casing_MatterGen, - Casing_MatterFab, - - //ABS - Industrial_AlloyBlastSmelter, - Casing_Coil_BlastSmelter, - Casing_BlastSmelter, - - //Industrial Electrolyzer - Industrial_Electrolyzer, - Casing_Electrolyzer, - - //Industrial Maceration Stack - Industrial_MacerationStack, - Casing_MacerationStack, - - //Industrial Wire Factory - Industrial_WireFactory, - Casing_WireFactory, - - //Power sub-station for mass storage. 3 hatches for input and output, whatever voltages you desire. - PowerSubStation, - Casing_Vanadium_Redox, - Casing_Vanadium_Redox_IV, - Casing_Vanadium_Redox_LuV, - Casing_Vanadium_Redox_ZPM, - Casing_Vanadium_Redox_UV, - Casing_Vanadium_Redox_MAX, - Casing_Power_SubStation, - - - //LFTR - ThoriumReactor, - Casing_Reactor_I, - Casing_Reactor_II, - - //Multitank - /*Industrial_MultiTank,*/ - Industrial_MultiTankDense, - Casing_MultitankExterior, - - - //Fission Fuel Refinery - Industrial_FuelRefinery, - Casing_Refinery_External, - Casing_Refinery_Structural, - Casing_Refinery_Internal, - - - //Industrial Sifter - Industrial_Sifter, - Casing_Sifter, - Casing_SifterGrate, - - - //Large Thermal Centrifuge - Industrial_ThermalCentrifuge, - Casing_ThermalCentrifuge, - - - //Cyclotron - COMET_Cyclotron, - Casing_Cyclotron_Coil, - Casing_Cyclotron_External, - - //Thermal Boiler - GT4_Thermal_Boiler, - Casing_ThermalContainment, - - - //Tree Farm - Industrial_TreeFarm, - TreeFarmer_Structural, - Casing_PLACEHOLDER_TreeFarmer, - - - //Fish Pond - Industrial_FishingPond, - Casing_FishPond, - - //Algae - AlgaeFarm_Controller, - - //Chemical Plant - ChemicalPlant_Controller, - - //GT4 autoCrafter - GT4_Multi_Crafter, - Casing_Autocrafter, - - - //industrial Ore-Washer - Industrial_WashPlant, - Casing_WashPlant, - - - //Generator Array - Generator_Array_Controller, - - - //Cutting Factory Controller - Industrial_CuttingFactoryController, - Casing_CuttingFactoryFrame, - - - //Tesla Tower - /*TelsaTower,*/ - Casing_TeslaTower, - - - //Large Extruder - Industrial_Extruder, - Casing_Extruder, - - - //Multi-Machine - Industrial_MultiMachine, - Casing_Multi_Use, - - - //Bedrock Mining Platforms - /*BedrockMiner_MKI, */ - /*BedrockMiner_MKII, */ - /*BedrockMiner_MKIII, */ - Casing_BedrockMiner, - - - //Large Packager - Amazon_Warehouse_Controller, - Casing_AmazonWarehouse, - - - //Advanced GT vanilla Multis - Machine_Adv_BlastFurnace, - Casing_Adv_BlastFurnace, - Machine_Adv_ImplosionCompressor, - Machine_Adv_DistillationTower, - - //Advanced Assembly Line - /*Machine_Adv_AssemblyLine,*/ - - //Advanced Vacuum Freezer - Industrial_Cryogenic_Freezer, - Casing_AdvancedVacuum, - - - //FusionTek MK IV - FusionComputer_UV2, - Casing_Fusion_External, - Casing_Fusion_Internal, - - - //large mixer - Industrial_Mixer, - - - //Naq Reactor - Casing_Naq_Reactor_A, - Casing_Naq_Reactor_B, - Casing_Naq_Reactor_C, - /*Controller_Naq_Reactor, */ - Casing_Containment, - - //Arc Furnace - Industrial_Arc_Furnace, - Casing_Industrial_Arc_Furnace, - - //Solar Tower - /*Industrial_Solar_Tower,*/ - Casing_SolarTower_Structural, - Casing_SolarTower_SaltContainment, - Casing_SolarTower_HeatContainment, - - //Larger Turbines - /*Large_Steam_Turbine, Large_HPSteam_Turbine, */ - Casing_Turbine_Shaft, - Casing_Turbine_LP, Casing_Turbine_HP, - Casing_Turbine_Gas, Casing_Turbine_Plasma, - - // Large Engine - Casing_Reinforced_Engine_Casing, - - //Large Vacuum Furnace - Casing_Vacuum_Furnace, - Controller_Vacuum_Furnace, - - // Large Rocket Engine - Casing_RocketEngine, - Controller_RocketEngine, - - // Large Semi-Fluid - Controller_LargeSemifluidGenerator, - - // IsaMill - Controller_IsaMill, - Casing_IsaMill_Casing, - Casing_IsaMill_Gearbox, - Casing_IsaMill_Pipe, - - // Flotation Cell - Controller_Flotation_Cell, - Casing_Flotation_Cell, - - // Sparge Tower - Controller_Sparge_Tower, - Casing_Sparge_Tower_Exterior, - Casing_Sparge_Tower_Interior, - - // Elemental Duplicator - Controller_ElementalDuplicator, - Casing_ElementalDuplicator, - - // Big Steam Macerator - Controller_SteamMaceratorMulti, - - // Custom Machine Casings - Casing_Machine_Custom_1, - Casing_Machine_Custom_2, - Casing_Machine_Custom_3, - Casing_Machine_Custom_4, - Casing_Machine_Custom_5, - Casing_Machine_Custom_6, - - - //---------------------------------------------------------------------------- - - /** - * Custom hatches/Busses - */ - - //Buffer Dynamos - Hatch_Buffer_Dynamo_ULV, Hatch_Buffer_Dynamo_LV, Hatch_Buffer_Dynamo_MV, Hatch_Buffer_Dynamo_HV, Hatch_Buffer_Dynamo_EV, - Hatch_Buffer_Dynamo_IV, Hatch_Buffer_Dynamo_LuV, Hatch_Buffer_Dynamo_ZPM, Hatch_Buffer_Dynamo_UV, Hatch_Buffer_Dynamo_MAX, - - //Air Intake hatch - Hatch_Air_Intake, - - //XL Turbine Rotor Hatch - /*Hatch_Turbine_Rotor,*/ - - //Standard Turbine Rotor Hatch - Hatch_Input_TurbineHousing, - - //Control Core - Hatch_Control_Core, - - // Milling Ball Bus - Bus_Milling_Balls, - - // Catalyst Bus - Bus_Catalysts, - - //Custom Fluid Hatches - Hatch_Input_Cryotheum, - Hatch_Input_Pyrotheum, - Hatch_Input_Naquadah, - Hatch_Input_Steam, - - //Steam Multi Buses - Hatch_Input_Bus_Steam, - Hatch_Output_Bus_Steam, - - //Elemental Duplicator Data Orb Bus - Hatch_Input_Elemental_Duplicator, - - //RTG Hatch - Hatch_RTG_LV, - Hatch_RTG_MV, - Hatch_RTG_HV, - - //Battery hatches for PSS - Hatch_Input_Battery_MV, - Hatch_Input_Battery_EV, - Hatch_Output_Battery_MV, - Hatch_Output_Battery_EV, - - //Advanced Mufflers - Hatch_Muffler_Adv_LV, Hatch_Muffler_Adv_MV, Hatch_Muffler_Adv_HV, - Hatch_Muffler_Adv_EV, Hatch_Muffler_Adv_IV, Hatch_Muffler_Adv_LuV, - Hatch_Muffler_Adv_ZPM, Hatch_Muffler_Adv_UV, Hatch_Muffler_Adv_MAX, - - //Super Input Busses - Hatch_SuperBus_Input_ULV, Hatch_SuperBus_Input_LV, Hatch_SuperBus_Input_MV, - Hatch_SuperBus_Input_HV, Hatch_SuperBus_Input_EV, Hatch_SuperBus_Input_IV, - Hatch_SuperBus_Input_LuV, Hatch_SuperBus_Input_ZPM, Hatch_SuperBus_Input_UV, - Hatch_SuperBus_Input_MAX, - - //Super Output Busses - Hatch_SuperBus_Output_ULV, Hatch_SuperBus_Output_LV, Hatch_SuperBus_Output_MV, - Hatch_SuperBus_Output_HV, Hatch_SuperBus_Output_EV, Hatch_SuperBus_Output_IV, - Hatch_SuperBus_Output_LuV, Hatch_SuperBus_Output_ZPM, Hatch_SuperBus_Output_UV, - Hatch_SuperBus_Output_MAX, - - - - - //---------------------------------------------------------------------------- - - - - - - /** - * Single Block Tile Entities - */ - - //ULV Generators - Generator_Diesel_ULV, Generator_Gas_Turbine_ULV, Generator_Steam_Turbine_ULV, - - //Crate Box - CrateStorage, - - //Auto TC Research Creator - Thaumcraft_Researcher, - - //Threaded Buffers - Automation_Threaded_SuperBuffer_ULV, Automation_Threaded_SuperBuffer_LV, Automation_Threaded_SuperBuffer_MV, Automation_Threaded_SuperBuffer_HV, Automation_Threaded_SuperBuffer_EV, - Automation_Threaded_SuperBuffer_IV, Automation_Threaded_SuperBuffer_LuV, Automation_Threaded_SuperBuffer_ZPM, Automation_Threaded_SuperBuffer_UV, Automation_Threaded_SuperBuffer_MAX, - - //infinite Items - Infinite_Item_Chest, - - - //Gt4 Workbenches - GT4_Workbench_Bronze, - GT4_Workbench_Advanced, - - - //Geothermal Engines - Geothermal_Engine_EV, - Geothermal_Engine_IV, - Geothermal_Engine_LuV, - - - //Tesseracts - GT4_Tesseract_Generator, - GT4_Tesseract_Terminal, - - - //Advanced Boilers - Boiler_Advanced_LV, - Boiler_Advanced_MV, - Boiler_Advanced_HV, - - - //Fancy Pollution Devices - Pollution_Detector, - Pollution_Cleaner_ULV, Pollution_Cleaner_LV, - Pollution_Cleaner_MV, Pollution_Cleaner_HV, - Pollution_Cleaner_EV, Pollution_Cleaner_IV, - Pollution_Cleaner_LuV, Pollution_Cleaner_ZPM, - Pollution_Cleaner_UV, Pollution_Cleaner_MAX, - - - //Debug machine - Pollution_Creator, - Garbage_Collector_Debug_Machine, - - - //Basically is an automatic Cauldron - SimpleDustWasher_ULV, - SimpleDustWasher_MV, - SimpleDustWasher_EV, - SimpleDustWasher_LuV, - SimpleDustWasher_UV, - - //Solar Tower Reflector - /*Solar_Tower_Reflector,*/ - - //Super Tier Chests - Super_Chest_LV, Super_Chest_MV, Super_Chest_HV, Super_Chest_EV, Super_Chest_IV, - - //Chunkloader - GT_Chunkloader_HV, GT_Chunkloader_ZPM, GT_Chunkloader_IV, - - - //Wireless Chargers - Charger_LV, Charger_MV, Charger_HV, - Charger_EV, Charger_IV, Charger_LuV, - Charger_ZPM, Charger_UV, Charger_MAX, - - - //Tiny Fusion - /*Miniature_Fusion, */ - - - //Component Makers - Machine_LV_Component_Maker, - Machine_MV_Component_Maker, - Machine_HV_Component_Maker, - Machine_EV_Component_Maker, - Machine_IV_Component_Maker, - Machine_LuV_Component_Maker, - Machine_ZPM_Component_Maker, - Machine_UV_Component_Maker, - - // Reactor Processing Unit - ReactorProcessingUnit_IV, - ReactorProcessingUnit_ZPM, - - // Cold Trap - ColdTrap_IV, - ColdTrap_ZPM, - - //Breakers - BreakerBox_ULV, BreakerBox_LV, BreakerBox_MV, - BreakerBox_HV, BreakerBox_EV, BreakerBox_IV, - BreakerBox_LuV, BreakerBox_ZPM, BreakerBox_UV, - BreakerBox_MAX, - - - //Solar Generators - GT_Solar_ULV, GT_Solar_LV, GT_Solar_MV, - GT_Solar_HV, GT_Solar_EV, GT_Solar_IV, - GT_Solar_LuV, GT_Solar_ZPM, GT_Solar_UV, GT_Solar_MAX, - - - //512v Creative Buffer - Energy_Buffer_CREATIVE, - //Variable voltage RF convertor - Energy_Buffer_RF_Convertor, - //Energy Buffers - Energy_Buffer_1by1_ULV, Energy_Buffer_1by1_LV, - Energy_Buffer_1by1_MV, Energy_Buffer_1by1_HV, - Energy_Buffer_1by1_EV, Energy_Buffer_1by1_IV, - Energy_Buffer_1by1_LuV, Energy_Buffer_1by1_ZPM, - Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX, - - - //Cobble Generators - Cobble_Generator_ULV, Cobble_Generator_LV, - Cobble_Generator_MV, Cobble_Generator_HV, - Cobble_Generator_EV, Cobble_Generator_IV, - Cobble_Generator_LuV, Cobble_Generator_ZPM, - Cobble_Generator_UV, Cobble_Generator_MAX, - - - //The max Steam condenser - Condensor_MAX, - - - //Player owned Safes - GT_Safe_ULV, GT_Safe_LV, - GT_Safe_MV, GT_Safe_HV, - GT_Safe_EV, GT_Safe_IV, - GT_Safe_LuV, GT_Safe_ZPM, - GT_Safe_UV, GT_Safe_MAX, - - - //Rocket Engines - Rocket_Engine_EV, - Rocket_Engine_IV, - Rocket_Engine_LuV, - - - //GT4 Shelves - GT4_Shelf, GT4_Shelf_Iron, - GT4_Shelf_FileCabinet, GT4_Shelf_Desk, - GT4_Shelf_Compartment, GT4_Shelf_Large, - - - //Hi Amp Transformers - Transformer_HA_LV_ULV, Transformer_HA_MV_LV, Transformer_HA_HV_MV, - Transformer_HA_EV_HV, Transformer_HA_IV_EV, Transformer_HA_LuV_IV, - Transformer_HA_ZPM_LuV, Transformer_HA_UV_ZPM, Transformer_HA_MAX_UV, - - - //Semi-Fluid generators - Generator_SemiFluid_LV, - Generator_SemiFluid_MV, - Generator_SemiFluid_HV, - - - //Advanced Mixer 4x4 - Machine_Advanced_LV_Mixer, Machine_Advanced_MV_Mixer, Machine_Advanced_HV_Mixer, - Machine_Advanced_EV_Mixer, Machine_Advanced_IV_Mixer, Machine_Advanced_LuV_Mixer, - Machine_Advanced_ZPM_Mixer, Machine_Advanced_UV_Mixer, - - - //Block that enables uplink to a superconductor network - SuperConductorInputNode, - - //Heat Pipes - HeatPipe_Tier_1, - HeatPipe_Tier_2, - HeatPipe_Tier_3, - - - //Chemical Dehydrators for nuclear fuels - GT_Dehydrator_MV, GT_Dehydrator_HV, - GT_Dehydrator_EV, GT_Dehydrator_IV, - GT_Dehydrator_LuV, GT_Dehydrator_ZPM, - - - //Fluid Storage Tanks - GT_FluidTank_ULV, GT_FluidTank_LV, - GT_FluidTank_MV, GT_FluidTank_HV, - GT_FluidTank_EV, GT_FluidTank_IV, - GT_FluidTank_LuV, GT_FluidTank_ZPM, - GT_FluidTank_UV, GT_FluidTank_MAX, - - //Tick Accelerators from GTNH - AcceleratorLV, AcceleratorMV, - AcceleratorHV, AcceleratorEV, - AcceleratorIV, AcceleratorLuV, - AcceleratorZPM, AcceleratorUV, - - //GT RTG - RTG, - - //Plasma Tank - /*Plasma_Tank,*/ - - - //---------------------------------------------------------------------------- - - - /** - * Covers - */ - - //Fluid Void Covers - Cover_Overflow_ULV, Cover_Overflow_LV, Cover_Overflow_MV, Cover_Overflow_HV, Cover_Overflow_EV, Cover_Overflow_IV, - - //Item Void Covers - Cover_Overflow_Item_ULV, Cover_Overflow_Item_LV, Cover_Overflow_Item_MV, Cover_Overflow_Item_HV, Cover_Overflow_Item_EV, Cover_Overflow_Item_IV, - - //Fake Hull Covers - FakeMachineCasingPlate_ULV, FakeMachineCasingPlate_LV, - FakeMachineCasingPlate_MV, FakeMachineCasingPlate_HV, - FakeMachineCasingPlate_EV, FakeMachineCasingPlate_IV, - FakeMachineCasingPlate_LuV, FakeMachineCasingPlate_ZPM, - FakeMachineCasingPlate_UV, FakeMachineCasingPlate_MAX, - - - - - //---------------------------------------------------------------------------- - - ; - - public static final GregtechItemList[] - DYE_ONLY_ITEMS = { - Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV }; - private ItemStack mStack; - private boolean mHasNotBeenSet = true; - - - @Override - public GregtechItemList set(final Item aItem) { - this.mHasNotBeenSet = false; - if (aItem == null) { - return this; - } - final ItemStack aStack = new ItemStack(aItem, 1, 0); - this.mStack = GT_Utility.copyAmount(1, aStack); - return this; - } - - @Override - public GregtechItemList set(final ItemStack aStack) { - this.mHasNotBeenSet = false; - this.mStack = GT_Utility.copyAmount(1, aStack); - return this; - } - - @Override - public Item getItem() { - if (this.mHasNotBeenSet) { - throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); - } - if (GT_Utility.isStackInvalid(this.mStack)) { - return null; - } - return this.mStack.getItem(); - } - - @Override - public Block getBlock() { - if (this.mHasNotBeenSet) { - throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); - } - return getBlockFromStack(this.getItem()); - } - - @Override - public final boolean hasBeenSet() { - return !this.mHasNotBeenSet; - } - - @Override - public boolean isStackEqual(final Object aStack) { - return this.isStackEqual(aStack, false, false); - } - - @Override - public boolean isStackEqual(final Object aStack, final boolean aWildcard, final boolean aIgnoreNBT) { - if (GT_Utility.isStackInvalid(aStack)) { - return false; - } - return GT_Utility.areUnificationsEqual((ItemStack)aStack, aWildcard?this.getWildcard(1):this.get(1), aIgnoreNBT); - } - - public static Block getBlockFromStack(Object aStack) { - if (GT_Utility.isStackInvalid(aStack)) - return Blocks.air; - return Block.getBlockFromItem(((ItemStack) aStack).getItem()); - } - - @Override - public ItemStack get(final long aAmount, final Object... aReplacements) { - if (this.mHasNotBeenSet) { - throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); - } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); - } - return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(this.mStack)); - } - - @Override - public ItemStack getWildcard(final long aAmount, final Object... aReplacements) { - if (this.mHasNotBeenSet) { - throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); - } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); - } - return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(this.mStack)); - } - - @Override - public ItemStack getUndamaged(final long aAmount, final Object... aReplacements) { - if (this.mHasNotBeenSet) { - throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); - } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); - } - return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(this.mStack)); - } - - @Override - public ItemStack getAlmostBroken(final long aAmount, final Object... aReplacements) { - if (this.mHasNotBeenSet) { - throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); - } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); - } - return GT_Utility.copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage()-1, GT_OreDictUnificator.get(this.mStack)); - } - - @Override - public ItemStack getWithName(final long aAmount, final String aDisplayName, final Object... aReplacements) { - final ItemStack rStack = this.get(1, aReplacements); - if (GT_Utility.isStackInvalid(rStack)) { - return null; - } - rStack.setStackDisplayName(aDisplayName); - return GT_Utility.copyAmount(aAmount, rStack); - } - - @Override - public ItemStack getWithCharge(final long aAmount, final int aEnergy, final Object... aReplacements) { - final ItemStack rStack = this.get(1, aReplacements); - if (GT_Utility.isStackInvalid(rStack)) { - return null; - } - GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false); - return GT_Utility.copyAmount(aAmount, rStack); - } - - @Override - public ItemStack getWithDamage(final long aAmount, final long aMetaValue, final Object... aReplacements) { - if (this.mHasNotBeenSet) { - throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); - } - if (GT_Utility.isStackInvalid(this.mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); - } - return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(this.mStack)); - } - - @Override - public GregtechItemList registerOre(final Object... aOreNames) { - if (this.mHasNotBeenSet) { - throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); - } - for (final Object tOreName : aOreNames) { - GT_OreDictUnificator.registerOre(tOreName, this.get(1)); - } - return this; - } - - @Override - public GregtechItemList registerWildcardAsOre(final Object... aOreNames) { - if (this.mHasNotBeenSet) { - throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); - } - for (final Object tOreName : aOreNames) { - GT_OreDictUnificator.registerOre(tOreName, this.getWildcard(1)); - } - return this; - } -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java deleted file mode 100644 index 7ef6b5701e..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java +++ /dev/null @@ -1,39 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.enums; - -/* Electric Components. - * - * usual Materials for this are: - * Primitive (Tier 1) - * Basic (Tier 2) as used by UE as well : IC2 Circuit and RE-Battery - * Good (Tier 3) - * Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium Battery - * Data (Tier 5) : Data Storage Circuit - * Elite (Tier 6) as used by UE as well : Energy Crystal and Data Control Circuit - * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal - * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb - * Infinite (Cheaty) - * -Circuits - Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced, - Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, - Circuit_IV, Circuit_LuV, Circuit_ZPM, -Circuit Parts - Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, - Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, - Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM, - Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM; - */ -public enum GregtechOreDictNames { - buffer_core, itemGregConduit, Circuit_IV, Circuit_LuV, Circuit_ZPM, - Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, - Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, - Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM, - Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM; - - public String unlocalisedName; - - private void ModObject() { - this.unlocalisedName = this.name(); - } - -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java deleted file mode 100644 index b17b4a26ff..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ /dev/null @@ -1,941 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.enums; - -import static gregtech.api.enums.GT_Values.*; -import static gtPlusPlus.core.util.Utils.getTcAspectStack; - -import java.util.*; - -import gregtech.api.enums.*; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; -import gregtech.api.interfaces.*; -import gregtech.api.objects.GT_FluidStack; -import gregtech.api.objects.MaterialStack; -import gregtech.api.util.*; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; -import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData; -import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -public enum GregtechOrePrefixes { - /* Electric Components. - * - * usual Materials for this are: - * Primitive (Tier 1) - * Basic (Tier 2) as used by UE as well : IC2 Circuit and RE-Battery - * Good (Tier 3) - * Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium Battery - * Data (Tier 5) : Data Storage Circuit - * Elite (Tier 6) as used by UE as well : Energy Crystal and Data Control Circuit - * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal - * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb - * Infinite (Cheaty) - */ - ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 16, 12), // A hot Ingot, which has to be cooled down by a Vacuum Freezer. - ingot("Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64, 11), // A regular Ingot. Introduced by Eloraam - dustTiny("Tiny Dusts", "Tiny Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M / 9, 64, 0), // 1/9th of a Dust. - dustSmall("Small Dusts", "Small Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M / 4, 64, 1), // 1/4th of a Dust. - dustImpure("Impure Dusts", "Impure Pile of ", " Dust", true, true, false, false, false, false, false, true, false, true, B[3