From 04514282c08ebefdb3e68a46db34092f72be2316 Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 17 May 2023 00:01:01 +0900 Subject: Remove a lot of unused classes (#629) --- src/main/java/gtPlusPlus/GTplusplus.java | 1 - .../java/gtPlusPlus/api/enums/ParticleNames.java | 35 - src/main/java/gtPlusPlus/api/enums/Quality.java | 66 - .../api/helpers/GregtechPlusPlus_API.java | 174 --- .../gtPlusPlus/api/interfaces/IChunkLoader.java | 32 - .../api/interfaces/IComparableRecipe.java | 6 - .../gtPlusPlus/api/interfaces/IGeneratorWorld.java | 18 - .../api/interfaces/IGregtechPacketEntity.java | 12 - .../gtPlusPlus/api/interfaces/IGregtechPower.java | 142 --- .../api/interfaces/IRandomGenerator.java | 38 - .../java/gtPlusPlus/api/objects/data/ObjMap.java | 243 ---- .../api/objects/data/ReverseAutoMap.java | 176 --- .../api/objects/minecraft/DimChunkPos.java | 50 - .../api/objects/minecraft/GenericStack.java | 41 - .../objects/minecraft/NoConflictGTRecipeMap.java | 122 -- .../api/objects/minecraft/TexturePackage.java | 54 - .../api/objects/minecraft/ThreadPooCollector.java | 108 -- .../api/objects/random/CSPRNG_DO_NOT_USE.java | 236 ---- .../api/objects/random/UUIDGenerator.java | 436 ------- .../api/thermal/energy/IThermalConnection.java | 8 - .../api/thermal/energy/IThermalContainerItem.java | 14 - .../api/thermal/energy/IThermalHandler.java | 18 - .../api/thermal/energy/IThermalProvider.java | 12 - .../api/thermal/energy/IThermalReceiver.java | 12 - .../api/thermal/energy/IThermalStorage.java | 12 - .../api/thermal/energy/ThermalStorage.java | 117 -- .../api/thermal/energy/ThermalStorageAdv.java | 34 - .../api/thermal/sample/ItemThermalContainer.java | 89 -- .../api/thermal/sample/TileThermalHandler.java | 50 - .../api/thermal/tileentity/IThermalInfo.java | 12 - src/main/java/gtPlusPlus/core/block/ModBlocks.java | 4 - .../gtPlusPlus/core/block/base/AdvancedBlock.java | 41 - .../gtPlusPlus/core/block/base/BlockBaseOre.java | 74 -- .../java/gtPlusPlus/core/block/base/MetaBlock.java | 35 - .../core/block/base/MultiTextureBlock.java | 37 - .../core/block/general/antigrief/TowerDevice.java | 260 ---- .../redstone/BlockGenericRedstoneEmitter.java | 4 - .../core/block/machine/BlockGtFrameBox.java | 41 - .../core/block/machine/Machine_WireiusDeletus.java | 4 - .../gtPlusPlus/core/client/model/ModelEggBox.java | 68 - .../core/client/model/tabula/ModelTabulaBase.java | 36 - .../core/client/renderer/RenderPotionthrow.java | 98 -- .../client/renderer/tabula/RenderTabulaBase.java | 50 - .../java/gtPlusPlus/core/common/CommonProxy.java | 6 - .../gtPlusPlus/core/creative/AddToCreativeTab.java | 7 - .../creative/tabs/MiscUtilCreativeTabBlock.java | 26 - .../creative/tabs/MiscUtilCreativeTabMachines.java | 17 - .../creative/tabs/MiscUtilCreativeTabMisc.java | 17 - .../creative/tabs/MiscUtilCreativeTabOther.java | 17 - .../creative/tabs/MiscUtilCreativeTabTools.java | 17 - .../gtPlusPlus/core/entity/EntityTeleportFX.java | 242 ---- .../core/gui/machine/GUI_ScrollTest.java | 220 ---- .../gtPlusPlus/core/handler/CraftingManager.java | 13 - .../core/handler/events/PlayerTickHandler.java | 15 - .../handler/events/UnbreakableBlockManager.java | 123 -- .../core/handler/render/CapeHandler.java | 115 -- .../handler/workbench/Workbench_RecipeSorter.java | 37 - .../core/inventories/InventoryWorkbenchChest.java | 160 --- .../inventories/InventoryWorkbenchCrafting.java | 177 --- .../InventoryWorkbenchHoloCrafting.java | 120 -- .../inventories/InventoryWorkbenchHoloSlots.java | 206 --- .../core/inventories/InventoryWorkbenchTools.java | 160 --- .../InventoryWorkbenchToolsElectric.java | 165 --- src/main/java/gtPlusPlus/core/item/ModItems.java | 15 - .../gtPlusPlus/core/item/base/BaseItemBrain.java | 94 -- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 27 - .../gtPlusPlus/core/item/base/BaseItemLoot.java | 105 -- .../core/item/base/BaseItemWithCharge.java | 67 - .../gtPlusPlus/core/item/chemistry/OilChem.java | 35 - .../gtPlusPlus/core/item/effects/RarityEffect.java | 37 - .../gtPlusPlus/core/item/effects/RarityEpic.java | 28 - .../gtPlusPlus/core/item/effects/RarityRare.java | 28 - .../core/item/effects/RarityUncommon.java | 22 - .../core/item/general/BedLocator_Base.java | 95 -- .../core/item/general/ItemCreativeTab.java | 60 - .../core/item/general/NuclearFuelRodBase.java | 188 --- .../core/item/general/fuelrods/FuelRod_Base.java | 205 --- .../item/general/fuelrods/FuelRod_Thorium.java | 12 - .../general/rfchargingpack/ChargingPackBase.java | 107 -- .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 66 - .../core/item/materials/MaterialHandler.java | 7 - .../core/item/tool/misc/ConnectedBlockFinder.java | 127 -- .../core/item/tool/misc/FakeGregtechTool.java | 73 -- .../item/wearable/armour/base/BaseArmourBoots.java | 9 - .../item/wearable/armour/base/BaseArmourChest.java | 9 - .../item/wearable/armour/base/BaseArmourLegs.java | 9 - .../item/wearable/armour/hazmat/ArmourHazmat.java | 119 -- src/main/java/gtPlusPlus/core/material/Ion.java | 30 - .../core/material/gregtech/CustomGTMaterials.java | 39 - .../java/gtPlusPlus/core/proxy/ServerProxy.java | 1 + .../core/recipe/Gregtech_Recipe_Adder.java | 86 -- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 15 - .../core/slots/SlotChemicalPlantInput.java | 45 - src/main/java/gtPlusPlus/core/slots/SlotFrame.java | 24 - .../gtPlusPlus/core/slots/SlotGtToolElectric.java | 92 -- .../java/gtPlusPlus/core/slots/SlotOutput.java | 92 -- src/main/java/gtPlusPlus/core/slots/SlotRTG.java | 24 - .../core/tileentities/base/TILE_ENTITY_BASE.java | 39 - .../core/tileentities/base/TilePoweredGT.java | 289 ----- .../tileentities/general/TileEntityReverter.java | 288 ----- .../java/gtPlusPlus/core/util/data/EnumUtils.java | 45 - .../gtPlusPlus/core/util/data/LoggingUtils.java | 50 - .../java/gtPlusPlus/core/util/data/UUIDUtils.java | 24 - .../gtPlusPlus/core/util/debug/DEBUG_INIT.java | 30 - .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 53 - .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 953 -------------- .../core/util/debug/DEBUG_ScreenOverlay.java | 45 - .../core/util/debug/DEBUG_TimerThread.java | 84 -- .../core/util/debug/UtilityGL11Debug.java | 1338 -------------------- .../core/util/minecraft/ClientUtils.java | 17 - .../core/util/minecraft/EnergyUtils.java | 125 -- .../gregtech/material/MaterialBuilder.java | 55 - .../gregtech/recipehandlers/GregtechRecipe.java | 4 - .../core/util/minecraft/network/CustomPacket.java | 41 - .../core/util/minecraft/network/PacketBuilder.java | 25 - .../util/minecraft/network/PacketDispatcher.java | 99 -- .../core/util/minecraft/network/PacketHandler.java | 73 -- .../util/minecraft/network/PacketTileEntity.java | 83 -- src/main/java/gtPlusPlus/core/util/sys/Log.java | 25 - .../gtPlusPlus/everglades/object/BoxedQuad.java | 51 - .../everglades/world/CustomWorldType.java | 57 - .../everglades/world/EvergladesPortalPosition.java | 15 - .../gtPlusPlus/plugin/agrichem/Core_Agrichem.java | 2 + .../gtPlusPlus/plugin/fishing/Core_Fishing.java | 53 - .../plugin/fishing/block/BlockFishEggs.java | 11 - .../gtPlusPlus/plugin/fishing/item/BaseFish.java | 117 -- .../plugin/fishing/misc/BaseFishTypes.java | 124 -- .../plugin/fixes/vanilla/Core_VanillaFixes.java | 2 + .../plugin/sulfurchem/Core_SulfuricChemistry.java | 2 + .../plugin/villagers/Core_VillagerAdditions.java | 2 + .../gtPlusPlus/plugin/villagers/NameLists.java | 1028 --------------- .../plugin/villagers/VillagerEventHandler.java | 30 - .../gtPlusPlus/plugin/waila/Core_WailaPlugin.java | 59 - .../gtPlusPlus/preloader/CustomClassLoader.java | 51 - .../java/gtPlusPlus/xmod/bartworks/BW_Utils.java | 12 - .../xmod/bop/creative/MiscUtilsBOPTab.java | 19 - .../forestry/bees/blocks/BlockDenseBeeHouse.java | 22 - .../forestry/bees/blocks/FR_BlockRegistry.java | 26 - .../xmod/forestry/bees/gui/ContainerBeeHouse.java | 40 - .../xmod/forestry/bees/gui/GuiBeeHouse.java | 56 - .../bees/inventory/InventoryDenseBeeHouse.java | 97 -- .../bees/tileentities/TileDenseBeeHouse.java | 97 -- .../gtPlusPlus/xmod/goodgenerator/GG_Utils.java | 56 - .../java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 2 - .../xmod/gregtech/api/energy/IC2ElectricItem.java | 55 - .../api/energy/IC2ElectricItemManager.java | 94 -- .../xmod/gregtech/api/enums/CustomGtTextures.java | 83 -- .../gregtech/api/enums/GregtechTextureSet.java | 159 --- .../xmod/gregtech/api/enums/GregtechTextures.java | 188 --- .../xmod/gregtech/api/interfaces/IHeatEntity.java | 28 - .../xmod/gregtech/api/interfaces/IHeatSink.java | 10 - .../api/interfaces/IMetaTileEntityHeatPipe.java | 12 - .../internal/Interface_IconContainer.java | 22 - .../Interface_OreRecipeRegistrator_GT.java | 20 - .../api/interfaces/internal/Interface_Texture.java | 21 - .../gregtech/api/items/tools/GT_MetaGenTool.java | 617 --------- .../gregtech/api/items/types/ToolType_Base.java | 96 -- .../api/items/types/ToolType_HardHammer.java | 157 --- .../gregtech/api/items/types/ToolType_Wrench.java | 188 --- ...GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java | 81 -- .../GT_MetaTileEntity_Hatch_Plasma.java | 220 ---- .../base/GregtechMetaPipeEntityBase_Cable.java | 485 ------- .../base/machines/GregtechMetaSafeBlockBase.java | 1 - .../xmod/gregtech/api/objects/GregtechFluid.java | 31 - .../ProcessingSkookumChoocherToolRecipes.java | 26 - .../xmod/gregtech/api/world/GTPP_Worldgen.java | 64 - .../gregtech/api/world/GTPP_Worldgen_Boulder.java | 105 -- .../api/world/GTPP_Worldgen_GT_Ore_Layer.java | 252 ---- .../gregtech/api/world/GTPP_Worldgen_Handler.java | 46 - .../xmod/gregtech/api/world/GTPP_Worldgen_Ore.java | 36 - .../api/world/GTPP_Worldgen_Ore_Normal.java | 120 -- .../xmod/gregtech/api/world/GT_OreVein_Object.java | 30 - .../xmod/gregtech/api/world/WorldGenUtils.java | 32 - .../common/blocks/GregtechMetaItemCasings1.java | 37 - .../blocks/textures/CasingTextureHandler.java | 2 - .../common/blocks/textures/TexturesGregtech59.java | 532 -------- .../common/covers/GTPP_Cover_Overflow_Item.java | 185 --- .../gregtech/common/helpers/CraftingHelper.java | 39 - .../common/helpers/FlotationRecipeHandler.java | 4 +- .../common/helpers/treefarm/TreeGenerator.java | 410 ------ .../common/items/MetaGeneratedGregtechItems.java | 41 - .../common/items/behaviours/Behaviour_Grinder.java | 95 -- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 196 --- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 171 --- ...GregtechMetaTileEntityThaumcraftResearcher.java | 270 ---- .../GregtechMetaTileEntity_IndustrialSinter.java | 93 -- .../production/GregtechMTE_FastNeutronReactor.java | 48 - .../production/GregtechMTE_LargeNaqReactor.java | 164 --- .../production/GregtechMTE_MiniFusionPlant.java | 95 -- .../production/GregtechMetaTileEntityTreeFarm.java | 1 - ...gtechMetaTileEntity_BedrockMiningPlatform1.java | 12 - ...gtechMetaTileEntity_BedrockMiningPlatform2.java | 12 - ...chMetaTileEntity_BedrockMiningPlatformBase.java | 621 --------- .../storage/GregtechMetaTileEntity_MultiTank.java | 270 ---- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 186 --- .../loaders/Processing_Textures_Items.java | 9 - .../gregtech/loaders/misc/AssLineAchievements.java | 175 --- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 2 - .../machines/RECIPEHANDLER_AssemblyLine.java | 14 - .../recipes/machines/RECIPEHANDLER_CokeOven.java | 121 -- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 152 --- .../machines/RECIPEHANDLER_MatterFabricator.java | 101 -- .../gregtech/GregtechBedrockPlatforms.java | 6 - .../registration/gregtech/GregtechGeneratorsULV | 15 - .../gregtech/GregtechIndustrialMultiTank.java | 10 - .../gregtech/GregtechMiniRaFusion.java | 13 - .../registration/gregtech/GregtechNaqReactor.java | 7 - .../xmod/ic2/block/RTGGenerator/BlockRTG.java | 186 --- .../xmod/ic2/block/RTGGenerator/TileEntityRTG.java | 75 -- .../ic2/block/RTGGenerator/gui/CONTAINER_RTG.java | 34 - .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 59 - .../kieticgenerator/IC2_BlockKineticGenerator.java | 67 - .../ic2/block/kieticgenerator/IC2_TEComponent.java | 43 - .../container/ContainerKineticWindgenerator.java | 26 - .../container/IC2_ContainerBase.java | 4 - .../gui/GuiKineticWindGenerator.java | 103 -- .../tileentity/TileEntityKineticWindGenerator.java | 352 ----- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 37 - .../xmod/ic2/item/IC2_ItemGradualInteger.java | 47 - .../java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 73 -- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 53 - .../java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 94 -- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 118 -- .../xmod/ic2/item/reactor/IC2_FuelRod_Base.java | 52 - .../java/gtPlusPlus/xmod/ob/SprinklerHandler.java | 64 - .../java/gtPlusPlus/xmod/witchery/WitchUtils.java | 99 -- 226 files changed, 11 insertions(+), 21751 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/api/enums/ParticleNames.java delete mode 100644 src/main/java/gtPlusPlus/api/enums/Quality.java delete mode 100644 src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java delete mode 100644 src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java delete mode 100644 src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java delete mode 100644 src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java delete mode 100644 src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java delete mode 100644 src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/data/ObjMap.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/minecraft/GenericStack.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/energy/IThermalProvider.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/energy/IThermalStorage.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java delete mode 100644 src/main/java/gtPlusPlus/api/thermal/tileentity/IThermalInfo.java delete mode 100644 src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java delete mode 100644 src/main/java/gtPlusPlus/core/block/base/MetaBlock.java delete mode 100644 src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java delete mode 100644 src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java delete mode 100644 src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java delete mode 100644 src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java delete mode 100644 src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java delete mode 100644 src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java delete mode 100644 src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java delete mode 100644 src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java delete mode 100644 src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java delete mode 100644 src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java delete mode 100644 src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java delete mode 100644 src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/CraftingManager.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java delete mode 100644 src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java delete mode 100644 src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java delete mode 100644 src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java delete mode 100644 src/main/java/gtPlusPlus/core/item/effects/RarityRare.java delete mode 100644 src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java delete mode 100644 src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java delete mode 100644 src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java delete mode 100644 src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java delete mode 100644 src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java delete mode 100644 src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java delete mode 100644 src/main/java/gtPlusPlus/core/material/Ion.java delete mode 100644 src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java delete mode 100644 src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java delete mode 100644 src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotFrame.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotOutput.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotRTG.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java delete mode 100644 src/main/java/gtPlusPlus/core/util/data/EnumUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/data/UUIDUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/ClientUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java delete mode 100644 src/main/java/gtPlusPlus/core/util/sys/Log.java delete mode 100644 src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java delete mode 100644 src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java delete mode 100644 src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java delete mode 100644 src/main/java/gtPlusPlus/plugin/fishing/Core_Fishing.java delete mode 100644 src/main/java/gtPlusPlus/plugin/fishing/block/BlockFishEggs.java delete mode 100644 src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java delete mode 100644 src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/NameLists.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java delete mode 100644 src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java delete mode 100644 src/main/java/gtPlusPlus/preloader/CustomClassLoader.java delete mode 100644 src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java delete mode 100644 src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java delete mode 100644 src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java delete mode 100644 src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java delete mode 100644 src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java delete mode 100644 src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java delete mode 100644 src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java delete mode 100644 src/main/java/gtPlusPlus/xmod/goodgenerator/GG_Utils.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java delete mode 100644 src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java (limited to 'src/main/java/gtPlusPlus') diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index 9dfe9356e9..4383c31c3d 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -219,7 +219,6 @@ public class GTplusplus implements ActionListener { BookHandler.runLater(); Meta_GT_Proxy.postInit(); Core_Manager.postInit(); - // SprinklerHandler.registerModFerts(); ItemGiantEgg.postInit(ModItems.itemBigEgg); BlockEventHandler.init(); diff --git a/src/main/java/gtPlusPlus/api/enums/ParticleNames.java b/src/main/java/gtPlusPlus/api/enums/ParticleNames.java deleted file mode 100644 index 335442dbc7..0000000000 --- a/src/main/java/gtPlusPlus/api/enums/ParticleNames.java +++ /dev/null @@ -1,35 +0,0 @@ -package gtPlusPlus.api.enums; - -public enum ParticleNames { - explode, - largeexplode, - hugeexplosion, - bubble, - splash, - suspended, - depthsuspend, - crit, - magicCrit, - smoke, - largesmoke, - spell, - instantSpell, - mobSpell, - dripWater, - dripLava, - townaura, - note, - portal, - enchantmenttable, - flame, - lava, - footstep, - cloud, - reddust, - snowballpoof, - snowshovel, - slime, - heart, - iconcrack_, - tilecrack_; -} diff --git a/src/main/java/gtPlusPlus/api/enums/Quality.java b/src/main/java/gtPlusPlus/api/enums/Quality.java deleted file mode 100644 index efcf2a015f..0000000000 --- a/src/main/java/gtPlusPlus/api/enums/Quality.java +++ /dev/null @@ -1,66 +0,0 @@ -package gtPlusPlus.api.enums; - -import net.minecraft.util.EnumChatFormatting; - -import gtPlusPlus.core.util.math.MathUtils; - -public enum Quality { - - // Magic Blue - // Rare Yellow - // Set Green - // Unique Gold/Purple - // Trade-off Brown - - POOR("Poor", EnumChatFormatting.GRAY), - COMMON("Common", EnumChatFormatting.WHITE), - UNCOMMON("Uncommon", EnumChatFormatting.DARK_GREEN), - MAGIC("Magic", EnumChatFormatting.BLUE), - RARE("Rare", EnumChatFormatting.YELLOW), - UNIQUE("Unique", EnumChatFormatting.GOLD), - ARTIFACT("Artifact", EnumChatFormatting.AQUA), - SET("Set Piece", EnumChatFormatting.GREEN), - TRADEOFF("Trade-off", EnumChatFormatting.DARK_RED), - EPIC("Epic", EnumChatFormatting.LIGHT_PURPLE); - - private String LOOT; - private EnumChatFormatting COLOUR; - - private Quality(final String lootTier, final EnumChatFormatting tooltipColour) { - this.LOOT = lootTier; - this.COLOUR = tooltipColour; - } - - public String getQuality() { - return this.LOOT; - } - - protected EnumChatFormatting getColour() { - return this.COLOUR; - } - - public String formatted() { - return this.COLOUR + this.LOOT; - } - - public static Quality getRandomQuality() { - final int lootChance = MathUtils.randInt(0, 100); - if (lootChance <= 10) { - return Quality.POOR; - } else if (lootChance <= 45) { - return Quality.COMMON; - } else if (lootChance <= 65) { - return Quality.UNCOMMON; - } else if (lootChance <= 82) { - return Quality.MAGIC; - } else if (lootChance <= 92) { - return Quality.EPIC; - } else if (lootChance <= 97) { - return Quality.RARE; - } else if (lootChance <= 99) { - return Quality.ARTIFACT; - } else { - return null; - } - } -} diff --git a/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java b/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java index a85bd42213..24d2da3134 100644 --- a/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java +++ b/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java @@ -2,26 +2,13 @@ package gtPlusPlus.api.helpers; import java.util.HashMap; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.WeightedCollection; import gtPlusPlus.api.objects.minecraft.multi.SpecialMultiBehaviour; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG; import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler; public class GregtechPlusPlus_API { - public static class MolecularTransformer_API { - - public static boolean addRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEU) { - return CORE.RA.addMolecularTransformerRecipe(aInput, aOutput, aDuration, aEU, 1); - } - } - public static class Multiblock_API { private static final HashMap mSpecialBehaviourItemMap = new HashMap(); @@ -50,166 +37,5 @@ public class GregtechPlusPlus_API { public static final HashMap getSpecialBehaviourItemMap() { return mSpecialBehaviourItemMap; } - - /** - * Allows RTG Fuel pellets from other mods to be used in the RTG hatch. - * - * @param aStack - The Pellet Stack, sanitsed after passing through. - * @param aFuelValue - The Fuel Value of the Pellet to be added to the energy storage. - * @return - Did register? - */ - public static boolean registerPelletForRtgHatch(ItemStack aStack, long aFuelValue) { - return GT_MetaTileEntity_Hatch_Energy_RTG.registerPelletForHatch(aStack, aFuelValue); - } - } - - public static class VoidMiner_API { - - private static final HashMap>> mMinerLootCache; - - static { - mMinerLootCache = new HashMap>>(); - } - - /** - * - * Registers an ore block for a dimension. Uses a default weight of 100. - * - * @param aDim - The Dimension ID - * @param aOredictName - The OreDict name of the Ore to be mined. - * @return - If there was a valid Block found in the OreDict for the provided name. - */ - public static boolean registerOreForVoidMiner(int aDim, String aOredictName) { - return registerOreForVoidMiner(aDim, aOredictName, 100); - } - - /** - * - * Registers an ore block for a dimension. Uses a default weight of 100. - * - * @param aDim - The Dimension ID - * @param aOredictName - The OreDict name of the Ore to be mined. - * @param aWeight - The weight of this ore Block. - * @return - If there was a valid Block found in the OreDict for the provided name. - */ - public static boolean registerOreForVoidMiner(int aDim, String aOredictName, int aWeight) { - Block b = null; - ItemStack[] aValidItems = ItemUtils.validItemsForOreDict(aOredictName); - for (ItemStack g : aValidItems) { - if (g != null) { - b = Block.getBlockFromItem(g.getItem()); - if (b != null) { - break; - } - } - } - if (b != null) { - registerOreForVoidMiner(aDim, b, aWeight); - return true; - } - return false; - } - - /** - * Registers an ore block for a dimension. Uses a default weight of 100. - * - * @param aDim - The Dimension ID - * @param aOreBlock - The Ore Block to be mined. - */ - public static void registerOreForVoidMiner(int aDim, Block aOreBlock) { - registerOreForVoidMiner(aDim, aOreBlock, 100); - } - - /** - * Registers an ore block for a dimension. - * - * @param aDim - The Dimension ID - * @param aOreBlock - The Ore Block to be mined. - * @param aWeight - The weight of this ore Block. - */ - public static void registerOreForVoidMiner(int aDim, Block aOreBlock, int aWeight) { - GregtechPlusPlus_API_Internal.writeBlockToDimensionInCache(aDim, 0, aOreBlock, aWeight); - } - - /** - * Registers a surface block for a dimension. Uses a default weight of 100. - * - * @param aDim - The Dimension ID - * @param aDirtBlock - The Dirt/Grass Block to be mined. - */ - public static void registerEarthSurfaceForVoidMiner(int aDim, Block aDirtBlock) { - registerEarthSurfaceForVoidMiner(aDim, aDirtBlock, 100); - } - - /** - * Registers a surface block for a dimension. - * - * @param aDim - The Dimension ID - * @param aDirtBlock - The Dirt/Grass Block to be mined. - * @param aWeight - The weight of this Dirt/Grass Block. - */ - public static void registerEarthSurfaceForVoidMiner(int aDim, Block aDirtBlock, int aWeight) { - GregtechPlusPlus_API_Internal.writeBlockToDimensionInCache(aDim, 0, aDirtBlock, aWeight); - } - - /** - * Registers a stone block for a dimension. Uses a default weight of 100. - * - * @param aDim - The Dimension ID - * @param aStoneBlock - The Stone Block to be mined. - */ - public static void registerEarthStoneForVoidMiner(int aDim, Block aStoneBlock) { - registerEarthStoneForVoidMiner(aDim, aStoneBlock, 100); - } - - /** - * Registers a stone block for a dimension. - * - * @param aDim - The Dimension ID - * @param aStoneBlock - The Stone Block to be mined. - * @param aWeight - The weight of this Stone Block. - */ - public static void registerEarthStoneForVoidMiner(int aDim, Block aStoneBlock, int aWeight) { - GregtechPlusPlus_API_Internal.writeBlockToDimensionInCache(aDim, 0, aStoneBlock, aWeight); - } - - public static WeightedCollection getAllRegisteredOresForDimension(int aDim) { - return mMinerLootCache.get(aDim).get("ore"); - } - - public static WeightedCollection getAllRegisteredDirtTypesForDimension(int aDim) { - return mMinerLootCache.get(aDim).get("dirt"); - } - - public static WeightedCollection getAllRegisteredStoneTypesForDimension(int aDim) { - return mMinerLootCache.get(aDim).get("stone"); - } - - public static final HashMap>> getVoidMinerLootCache() { - return mMinerLootCache; - } - } - - private static class GregtechPlusPlus_API_Internal { - - private static void writeBlockToDimensionInCache(int aDim, int aType, Block aBlock, int aWeight) { - HashMap> aDimMap = VoidMiner_API.mMinerLootCache.get(aDim); - if (aDimMap == null) { - aDimMap = new HashMap>(); - } - WeightedCollection aMappedBlocks = getBlockMap(aType, aDimMap); - aMappedBlocks.put(aWeight, aBlock); - } - - private static WeightedCollection getBlockMap(int aType, - HashMap> aDimMap) { - WeightedCollection aMappedBlocks; - String aTypeName = ((aType == 0) ? "ore" : (aType == 1) ? "dirt" : (aType == 2) ? "stone" : "error"); - aMappedBlocks = aDimMap.get(aTypeName); - if (aMappedBlocks == null) { - aMappedBlocks = new WeightedCollection(); - } - return aMappedBlocks; - } } } diff --git a/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java b/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java deleted file mode 100644 index cec4d12716..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java +++ /dev/null @@ -1,32 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import java.util.Set; - -import net.minecraft.world.ChunkCoordIntPair; - -public interface IChunkLoader { - - public long getTicksRemaining(); - - public void setTicksRemaining(long aTicks); - - public ChunkCoordIntPair getResidingChunk(); - - public void setResidingChunk(ChunkCoordIntPair aCurrentChunk); - - public boolean getChunkLoadingActive(); - - public void setChunkLoadingActive(boolean aActive); - - public boolean getDoesWorkChunkNeedReload(); - - public void setDoesWorkChunkNeedReload(boolean aActive); - - public boolean addChunkToLoadedList(ChunkCoordIntPair aActiveChunk); - - public boolean removeChunkFromLoadedList(ChunkCoordIntPair aActiveChunk); - - public Set getManagedChunks(); - - public int getChunkloaderTier(); -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java b/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java deleted file mode 100644 index 06727167bf..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java +++ /dev/null @@ -1,6 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import gregtech.api.util.GT_Recipe; - -public interface IComparableRecipe extends Comparable { -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java b/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java deleted file mode 100644 index 95cd46e443..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java +++ /dev/null @@ -1,18 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import java.util.Random; - -import net.minecraft.world.World; - -public abstract interface IGeneratorWorld { - - public abstract boolean generate(World paramWorld, Random paramRandom, int paramInt1, int paramInt2); - - public abstract void initiate(); - - public abstract int getExtentX(); - - public abstract int getExtentZ(); - - public abstract int getRange(); -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java deleted file mode 100644 index 4a41e47a7b..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java +++ /dev/null @@ -1,12 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -public interface IGregtechPacketEntity { - - public void writePacketData(DataOutputStream data) throws IOException; - - public void readPacketData(DataInputStream data) throws IOException; -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java deleted file mode 100644 index f121926005..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java +++ /dev/null @@ -1,142 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.interfaces.IDescribable; -import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; -import gregtech.api.interfaces.tileentity.IGearEnergyTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; -import gregtech.api.interfaces.tileentity.ITurnable; - -public abstract interface IGregtechPower - extends IGearEnergyTileEntity, ITurnable, IGregTechDeviceInformation, IDescribable, IBasicEnergyContainer { - - @Override - public String[] getDescription(); - - @Override - default boolean isUniversalEnergyStored(long p0) { - return false; - } - - @Override - public long getOutputAmperage(); - - @Override - public long getOutputVoltage(); - - @Override - public long getInputAmperage(); - - @Override - public long getInputVoltage(); - - @Override - public boolean decreaseStoredEnergyUnits(long p0, boolean p1); - - @Override - public boolean increaseStoredEnergyUnits(long p0, boolean p1); - - @Override - public boolean drainEnergyUnits(ForgeDirection side, long p1, long p2); - - @Override - public long getAverageElectricInput(); - - @Override - public long getAverageElectricOutput(); - - @Override - public long getStoredEU(); - - @Override - public long getEUCapacity(); - - @Override - public long getStoredSteam(); - - @Override - public long getSteamCapacity(); - - @Override - public boolean increaseStoredSteam(long p0, boolean p1); - - @Override - public Block getBlockAtSide(ForgeDirection side); - - @Override - public Block getBlockAtSideAndDistance(ForgeDirection side, int p1); - - @Override - public Block getBlockOffset(int p0, int p1, int p2); - - @Override - public TileEntity getTileEntity(int p0, int p1, int p2); - - @Override - public TileEntity getTileEntityAtSide(ForgeDirection side); - - @Override - public TileEntity getTileEntityAtSideAndDistance(ForgeDirection side, int p1); - - @Override - public TileEntity getTileEntityOffset(int p0, int p1, int p2); - - @Override - public World getWorld(); - - @Override - public int getXCoord(); - - @Override - public short getYCoord(); - - @Override - public int getZCoord(); - - @Override - public boolean isClientSide(); - - @Override - public boolean isDead(); - - @Override - public boolean isInvalidTileEntity(); - - @Override - public boolean isServerSide(); - - @Override - public void readFromNBT(NBTTagCompound p0); - - @Override - public void writeToNBT(NBTTagCompound p0); - - @Override - public boolean acceptsRotationalEnergy(ForgeDirection side); - - @Override - public boolean injectRotationalEnergy(ForgeDirection side, long p1, long p2); - - @Override - public long injectEnergyUnits(ForgeDirection side, long p1, long p2); - - @Override - public boolean inputEnergyFrom(ForgeDirection side); - - @Override - public boolean outputsEnergyTo(ForgeDirection side); - - @Override - public String[] getInfoData(); - - @Override - public default boolean isGivingInformation() { - return true; - } - -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java b/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java deleted file mode 100644 index ddb4d4d2f1..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2005, Nick Galbreath -- nickg [at] modp [dot] com All rights reserved. Redistribution and use in source and - * binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following - * disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the - * following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of - * the modp.com nor the names of its contributors may be used to endorse or promote products derived from this software - * without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. This is the standard "new" BSD license: - * http://www.opensource.org/licenses/bsd-license.php - */ - -package gtPlusPlus.api.interfaces; - -/** - * Simplified interface for random number generation - * - * @author Nick Galbreath -- nickg [at] modp [dot] com - * @version 1 -- 06-Jul-2005 - */ -public interface IRandomGenerator { - - /** - * Returns N random bits - * - * See also java.util.Random#next - * - * @param numBits - * @return and int with the LSB being random - */ - public int next(int numBits); -} diff --git a/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java b/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java deleted file mode 100644 index eff314f9ae..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java +++ /dev/null @@ -1,243 +0,0 @@ -package gtPlusPlus.api.objects.data; - -import java.util.Arrays; - -/** - * Object-2-object map based on IntIntMap4a - */ -public class ObjMap { - - private static final Object FREE_KEY = new Object(); - private static final Object REMOVED_KEY = new Object(); - - /** Keys and values */ - private Object[] m_data; - - /** Value for the null key (if inserted into a map) */ - private Object m_nullValue; - - private boolean m_hasNull; - - /** Fill factor, must be between (0 and 1) */ - private final float m_fillFactor; - /** We will resize a map once it reaches this size */ - private int m_threshold; - /** Current map size */ - private int m_size; - /** Mask to calculate the original position */ - private int m_mask; - /** Mask to wrap the actual array pointer */ - private int m_mask2; - - public ObjMap(final int size, final float fillFactor) { - if (fillFactor <= 0 || fillFactor >= 1) throw new IllegalArgumentException("FillFactor must be in (0, 1)"); - if (size <= 0) throw new IllegalArgumentException("Size must be positive!"); - final int capacity = arraySize(size, fillFactor); - m_mask = capacity - 1; - m_mask2 = capacity * 2 - 1; - m_fillFactor = fillFactor; - - m_data = new Object[capacity * 2]; - Arrays.fill(m_data, FREE_KEY); - - m_threshold = (int) (capacity * fillFactor); - } - - @SuppressWarnings("unchecked") - public V get(final K key) { - if (key == null) return (V) m_nullValue; // we null it on remove, so safe not to check a flag here - - int ptr = (key.hashCode() & m_mask) << 1; - Object k = m_data[ptr]; - - if (k == FREE_KEY) return null; // end of chain already - if (k.equals(key)) // we check FREE and REMOVED prior to this call - return (V) m_data[ptr + 1]; - while (true) { - ptr = (ptr + 2) & m_mask2; // that's next index - k = m_data[ptr]; - if (k == FREE_KEY) return null; - if (k.equals(key)) return (V) m_data[ptr + 1]; - } - } - - @SuppressWarnings("unchecked") - public V put(final K key, final V value) { - if (key == null) return insertNullKey(value); - - int ptr = getStartIndex(key) << 1; - Object k = m_data[ptr]; - - if (k == FREE_KEY) // end of chain already - { - m_data[ptr] = key; - m_data[ptr + 1] = value; - if (m_size >= m_threshold) rehash(m_data.length * 2); // size is set inside - else++m_size; - return null; - } else if (k.equals(key)) // we check FREE and REMOVED prior to this call - { - final Object ret = m_data[ptr + 1]; - m_data[ptr + 1] = value; - return (V) ret; - } - - int firstRemoved = -1; - if (k == REMOVED_KEY) firstRemoved = ptr; // we may find a key later - - while (true) { - ptr = (ptr + 2) & m_mask2; // that's next index calculation - k = m_data[ptr]; - if (k == FREE_KEY) { - if (firstRemoved != -1) ptr = firstRemoved; - m_data[ptr] = key; - m_data[ptr + 1] = value; - if (m_size >= m_threshold) rehash(m_data.length * 2); // size is set inside - else++m_size; - return null; - } else if (k.equals(key)) { - final Object ret = m_data[ptr + 1]; - m_data[ptr + 1] = value; - return (V) ret; - } else if (k == REMOVED_KEY) { - if (firstRemoved == -1) firstRemoved = ptr; - } - } - } - - @SuppressWarnings("unchecked") - public V remove(final K key) { - if (key == null) return removeNullKey(); - - int ptr = getStartIndex(key) << 1; - Object k = m_data[ptr]; - if (k == FREE_KEY) return null; // end of chain already - else if (k.equals(key)) // we check FREE and REMOVED prior to this call - { - --m_size; - if (m_data[(ptr + 2) & m_mask2] == FREE_KEY) m_data[ptr] = FREE_KEY; - else m_data[ptr] = REMOVED_KEY; - final V ret = (V) m_data[ptr + 1]; - m_data[ptr + 1] = null; - return ret; - } - while (true) { - ptr = (ptr + 2) & m_mask2; // that's next index calculation - k = m_data[ptr]; - if (k == FREE_KEY) return null; - else if (k.equals(key)) { - --m_size; - if (m_data[(ptr + 2) & m_mask2] == FREE_KEY) m_data[ptr] = FREE_KEY; - else m_data[ptr] = REMOVED_KEY; - final V ret = (V) m_data[ptr + 1]; - m_data[ptr + 1] = null; - return ret; - } - } - } - - @SuppressWarnings("unchecked") - private V insertNullKey(final V value) { - if (m_hasNull) { - final Object ret = m_nullValue; - m_nullValue = value; - return (V) ret; - } else { - m_nullValue = value; - ++m_size; - return null; - } - } - - @SuppressWarnings("unchecked") - private V removeNullKey() { - if (m_hasNull) { - final Object ret = m_nullValue; - m_nullValue = null; - m_hasNull = false; - --m_size; - return (V) ret; - } else { - return null; - } - } - - public int size() { - return m_size; - } - - @SuppressWarnings("unchecked") - private void rehash(final int newCapacity) { - m_threshold = (int) (newCapacity / 2 * m_fillFactor); - m_mask = newCapacity / 2 - 1; - m_mask2 = newCapacity - 1; - - final int oldCapacity = m_data.length; - final Object[] oldData = m_data; - - m_data = new Object[newCapacity]; - Arrays.fill(m_data, FREE_KEY); - - m_size = m_hasNull ? 1 : 0; - - for (int i = 0; i < oldCapacity; i += 2) { - final Object oldKey = oldData[i]; - if (oldKey != FREE_KEY && oldKey != REMOVED_KEY) put((K) oldKey, (V) oldData[i + 1]); - } - } - - public int getStartIndex(final Object key) { - // key is not null here - return key.hashCode() & m_mask; - } - - public Object[] values() { - return m_data; - } - - /** Taken from FastUtil implementation */ - - /** - * Return the least power of two greater than or equal to the specified value. - * - *

- * Note that this function will return 1 when the argument is 0. - * - * @param x a long integer smaller than or equal to 262. - * @return the least power of two greater than or equal to the specified value. - */ - public static long nextPowerOfTwo(long x) { - if (x == 0) return 1; - x--; - x |= x >> 1; - x |= x >> 2; - x |= x >> 4; - x |= x >> 8; - x |= x >> 16; - return (x | x >> 32) + 1; - } - - /** - * Returns the least power of two smaller than or equal to 230 and larger than or equal to - * Math.ceil( expected / f ). - * - * @param expected the expected number of elements in a hash table. - * @param f the load factor. - * @return the minimum possible size for a backing array. - * @throws IllegalArgumentException if the necessary size is larger than 230. - */ - public static int arraySize(final int expected, final float f) { - final long s = Math.max(2, nextPowerOfTwo((long) Math.ceil(expected / f))); - if (s > (1 << 30)) throw new IllegalArgumentException( - "Too large (" + expected + " expected elements with load factor " + f + ")"); - return (int) s; - } - - // taken from FastUtil - private static final int INT_PHI = 0x9E3779B9; - - public static int phiMix(final int x) { - final int h = x * INT_PHI; - return h ^ (h >> 16); - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java deleted file mode 100644 index 275dad9d42..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java +++ /dev/null @@ -1,176 +0,0 @@ -package gtPlusPlus.api.objects.data; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -public class ReverseAutoMap extends AutoMap { - - /** - * The Internal Map - */ - private Map mInternalMapReverseLookup = new HashMap(); - - /** - * The Internal ID - */ - private int mInternalID = 0; - - private static final long serialVersionUID = 3771412318075131790L; - - @Override - public Iterator iterator() { - return values().iterator(); - } - - @Override - public synchronized boolean setValue(N object) { - int mOriginalID = this.mInternalID; - put(object); - if (this.mInternalMap.get(mOriginalID).equals(object) || mOriginalID > this.mInternalID) { - return true; - } else { - return false; - } - } - - @Override - public synchronized N put(N object) { - return set(object); - } - - @Override - public synchronized N set(N object) { - int newID = getNextFreeMapID(); - mInternalMapReverseLookup.put(object, newID); - return mInternalMap.put(newID, object); - } - - public synchronized int putToInternalMap(N object) { - return setInternalMap(object); - } - - public synchronized int setInternalMap(N object) { - int newID = getNextFreeMapID(); - mInternalMap.put(newID, object); - mInternalMapReverseLookup.put(object, newID); - return newID; - } - - public synchronized boolean injectCleanDataToAutoMap(Integer g, N object) { - if (!mInternalMap.containsKey(g) && !mInternalMapReverseLookup.containsKey(object)) { - int a1 = 0, a2 = 0, a11 = 0, a22 = 0; - a1 = mInternalMap.size(); - a2 = mInternalMapReverseLookup.size(); - a11 = a1; - a