From 67b48690b1078b489bcb017e8db9200f26b77a0c Mon Sep 17 00:00:00 2001 From: miozune Date: Fri, 26 May 2023 14:41:09 +0900 Subject: Deprecation cleanup (#637) --- src/main/java/gregtech/api/util/GTPP_Recipe.java | 92 +- .../gregtech/api/util/GasSpargingRecipeMap.java | 4 +- .../gtPlusPlus/api/helpers/MaterialHelper.java | 4 - .../api/objects/minecraft/BTF_Inventory.java | 37 +- .../gtPlusPlus/core/block/base/BlockBaseNBT.java | 1 - .../core/block/general/BlockTankXpConverter.java | 1 - .../gtPlusPlus/core/block/general/FirePit.java | 1 - .../core/block/general/FluidTankInfinite.java | 3 - .../gtPlusPlus/core/block/general/HellFire.java | 12 - .../general/redstone/BlockGenericRedstone.java | 3 - .../core/block/machine/CircuitProgrammer.java | 1 - .../core/block/machine/DecayablesChest.java | 21 - .../java/gtPlusPlus/core/block/machine/EggBox.java | 21 - .../gtPlusPlus/core/block/machine/FishTrap.java | 11 - .../core/block/machine/HeliumGenerator.java | 1 - .../block/machine/Machine_ModularityTable.java | 1 - .../core/block/machine/Machine_PestKiller.java | 1 - .../core/block/machine/Machine_ProjectTable.java | 1 - .../core/block/machine/VolumetricFlaskSetter.java | 1 - .../commands/CommandEnableDebugWhileRunning.java | 2 +- .../java/gtPlusPlus/core/config/ConfigHandler.java | 13 - .../core/fluids/ItemGenericFluidBucket.java | 8 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 2 - .../java/gtPlusPlus/core/item/base/BaseEuItem.java | 2 +- .../core/item/base/BaseItemColourable.java | 2 +- .../core/item/base/BaseItemDamageable.java | 8 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 2 +- .../core/item/base/itemblock/ItemBlockMeta.java | 2 +- .../base/itemblock/ItemBlockRoundRobinator.java | 2 +- .../chemistry/general/ItemGenericChemBase.java | 5 - .../chemistry/general/ItemNuclearChemBase.java | 5 - .../core/item/food/BaseItemMetaFood.java | 5 - .../core/item/general/ItemGenericToken.java | 14 +- .../core/item/tool/misc/GregtechPump.java | 2 +- .../core/item/tool/misc/SandstoneHammer.java | 2 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 2 +- .../core/item/tool/staballoy/MultiSpadeBase.java | 2 +- .../core/item/tool/staballoy/StaballoyAxe.java | 2 +- .../core/item/tool/staballoy/StaballoyPickaxe.java | 2 +- .../core/item/tool/staballoy/StaballoySpade.java | 2 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 4 - .../java/gtPlusPlus/core/material/ELEMENT.java | 2 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 2 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 12 - .../java/gtPlusPlus/core/recipe/common/CI.java | 7 +- .../core/tileentities/ModTileEntities.java | 16 - .../core/tileentities/base/TileBasicTank.java | 45 +- .../core/tileentities/base/TileEntityBase.java | 28 +- .../java/gtPlusPlus/core/util/data/ArrayUtils.java | 19 - .../core/util/minecraft/EntityUtils.java | 8 - .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 11 - .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 26 - .../gtPlusPlus/core/util/minecraft/LangUtils.java | 5 - .../core/util/minecraft/MaterialUtils.java | 30 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 42 - .../core/util/reflect/ReflectionUtils.java | 17 - .../everglades/chunk/ChunkProviderModded.java | 5 +- .../everglades/gen/gt/WorldGen_GT_Ore_Layer.java | 9 +- .../agrichem/item/algae/ItemAgrichemBase.java | 5 - .../plugin/agrichem/item/algae/ItemAlgaeBase.java | 5 - .../xmod/bop/blocks/base/LeavesBase.java | 1 - .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 1 - .../xmod/forestry/bees/custom/GTPP_Bees.java | 4 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 2 +- .../galacticraft/handler/HandlerTooltip_GC.java | 1 + .../xmod/gregtech/api/enums/GregtechItemList.java | 37 - .../gregtech/api/enums/GregtechOrePrefixes.java | 2 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 13 - .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 2 +- .../custom/power/GTPP_MTE_TieredMachineBlock.java | 7 - .../custom/power/MetaTileEntityCustomPower.java | 10 +- .../GT_MetaTileEntity_Hatch_AirIntake.java | 4 +- .../GT_MetaTileEntity_Hatch_AirIntake_Extreme.java | 8 +- .../GT_MetaTileEntity_Hatch_ControlCore.java | 4 +- .../GT_MetaTileEntity_Hatch_DynamoBuffer.java | 13 +- ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 6 - .../GT_MetaTileEntity_Hatch_FluidGenerator.java | 2 +- .../GT_MetaTileEntity_Hatch_InputBattery.java | 8 +- .../GT_MetaTileEntity_Hatch_Naquadah.java | 9 +- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 8 +- .../GT_MetaTileEntity_Hatch_Reservoir.java | 4 +- .../GT_MetaTileEntity_Hatch_Steam_BusInput.java | 10 +- .../GT_MetaTileEntity_Hatch_Turbine.java | 12 +- .../GT_MetaTileEntity_Hatch_TurbineProvider.java | 13 +- .../GT_MetaTileEntity_SuperBus_Input.java | 7 +- .../GT_MetaTileEntity_SuperBus_Output.java | 7 +- .../GregtechMetaPipeEntityFluid.java | 18 +- .../GregtechMetaTreeFarmerStructural.java | 14 +- .../GT_MetaTileEntity_Hatch_CustomFluidBase.java | 9 +- .../base/GregtechMetaTransformerHiAmp.java | 13 +- .../base/GregtechMeta_MultiBlockBase.java | 10 +- .../base/generators/GregtechMetaBoilerBase.java | 7 +- .../generators/GregtechMetaSolarGenerator.java | 6 +- .../GregtechRocketFuelGeneratorBase.java | 11 +- .../base/machines/GregtechMetaSafeBlockBase.java | 3 +- .../base/machines/GregtechMetaTreeFarmerBase.java | 5 +- .../GT_MetaTileEntity_Hatch_Catalysts.java | 10 +- .../GT_MetaTileEntity_Hatch_MillingBalls.java | 10 +- .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 8 - .../xmod/gregtech/common/Meta_GT_Proxy.java | 25 - .../common/covers/GTPP_Cover_Overflow.java | 7 +- .../common/covers/GTPP_Cover_ToggleVisual.java | 16 +- .../gregtech/common/helpers/TreeFarmHelper.java | 1015 -------------------- .../common/items/MetaGeneratedGregtechItems.java | 40 +- .../behaviours/Behaviour_Electric_Lighter.java | 22 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 19 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 54 -- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 10 +- ...GT_MetaTileEntity_ElectricInventoryManager.java | 9 +- .../GT_MetaTileEntity_TesseractGenerator.java | 12 +- .../GT_MetaTileEntity_TesseractTerminal.java | 15 +- .../generators/GT_MetaTileEntity_Boiler_Base.java | 15 +- .../generators/GT_MetaTileEntity_Boiler_HV.java | 4 +- .../generators/GT_MetaTileEntity_Boiler_LV.java | 4 +- .../generators/GT_MetaTileEntity_Boiler_MV.java | 4 +- .../GT_MetaTileEntity_SemiFluidGenerator.java | 20 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 19 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 11 +- .../GregtechMetaTileEntitySolarGenerator.java | 13 +- .../generators/GregtechMetaTileEntity_RTG.java | 14 +- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 17 +- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 21 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 15 +- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 311 ------ .../GregtechMetaAtmosphericReconditioner.java | 30 +- .../machines/basic/GregtechMetaCondensor.java | 13 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 4 +- .../basic/GregtechMetaTileEntity_AutoChisel.java | 13 +- .../basic/GregtechMetaTileEntity_BasicWasher.java | 15 +- .../GregtechMetaTileEntity_ReactorColdTrap.java | 8 +- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 8 +- .../machines/multi/misc/GMTE_AmazonPackager.java | 6 +- .../multi/misc/GregtechMTE_TeslaTower.java | 2 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 4 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 12 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 2 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 7 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 8 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 6 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 2 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 8 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 6 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 4 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 6 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 7 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 11 +- ...aTileEntity_IndustrialMolecularTransformer.java | 11 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 8 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 6 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 9 +- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 4 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 2 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 8 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 11 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 2 +- .../processing/GregtechMetaTileEntity_IsaMill.java | 2 +- .../GregtechMetaTileEntity_SpargeTower.java | 2 +- ...egtechMetaTileEntity_Adv_DistillationTower.java | 4 +- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 2 +- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 3 +- .../GregtechMetaTileEntity_Adv_Fusion_MK5.java | 3 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 2 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 9 +- .../GregtechMetaTileEntity_SteamCompressor.java | 4 +- .../GregtechMetaTileEntity_SteamMacerator.java | 4 +- .../multi/production/GT4Entity_ThermalBoiler.java | 2 +- .../GregtechMTE_ElementalDuplicator.java | 18 +- .../production/GregtechMTE_FrothFlotationCell.java | 10 +- .../production/GregtechMTE_NuclearReactor.java | 20 +- .../GregtechMetaTileEntityGeneratorArray.java | 2 +- .../production/GregtechMetaTileEntityTreeFarm.java | 7 +- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 8 +- .../GregtechMetaTileEntity_Cyclotron.java | 38 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 6 +- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 11 +- .../GregtechMetaTileEntity_LargeRocketEngine.java | 7 +- ...techMetaTileEntity_LargeSemifluidGenerator.java | 9 +- .../GregtechMetaTileEntity_MassFabricator.java | 10 +- ...techMetaTileEntity_QuantumForceTransformer.java | 17 +- .../GregtechMetaTileEntity_Refinery.java | 7 +- .../GregtechMetaTileEntity_SolarTower.java | 14 +- .../algae/GregtechMTE_AlgaePondBase.java | 10 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 3 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 2 +- ...chMetaTileEntity_PowerSubStationController.java | 2 +- .../tileentities/misc/TileEntitySolarHeater.java | 8 +- .../redstone/GT_MetaTileEntity_RedstoneBase.java | 9 +- .../GT_MetaTileEntity_RedstoneButtonPanel.java | 4 +- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 9 +- .../redstone/GT_MetaTileEntity_RedstoneLamp.java | 4 +- .../GT_MetaTileEntity_RedstoneStrengthDisplay.java | 4 +- .../GT_MetaTileEntity_RedstoneStrengthScale.java | 4 +- .../GT_MetaTileEntity_AdvancedCraftingTable.java | 17 +- .../GT_MetaTileEntity_BronzeCraftingTable.java | 11 +- .../GT_MetaTileEntity_ConnectableCrate.java | 7 +- .../storage/GT_MetaTileEntity_TieredChest.java | 13 +- .../storage/GT_MetaTileEntity_TieredTank.java | 24 +- .../storage/GregtechMetaEnergyBuffer.java | 28 - .../storage/GregtechMetaSafeBlock.java | 13 +- .../GT_MetaTileEntity_InfiniteItemHolder.java | 10 +- .../storage/shelving/GT4Entity_Shelf.java | 21 +- .../shelving/GT4Entity_Shelf_Compartment.java | 4 +- .../storage/shelving/GT4Entity_Shelf_Desk.java | 4 +- .../shelving/GT4Entity_Shelf_FileCabinet.java | 4 +- .../storage/shelving/GT4Entity_Shelf_Iron.java | 4 +- .../storage/shelving/GT4Entity_Shelf_Large.java | 8 +- .../common/tools/TOOL_Gregtech_AngleGrinder.java | 11 +- .../common/tools/TOOL_Gregtech_Choocher.java | 11 +- .../tools/TOOL_Gregtech_ElectricButcherKnife.java | 11 +- .../tools/TOOL_Gregtech_ElectricLighter.java | 11 +- .../loaders/ProcessingToolHeadChoocher.java | 15 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 7 - .../gregtech/GregtechBufferDynamos.java | 2 +- .../gregtech/GregtechComponentAssembler.java | 665 ------------- .../registration/gregtech/GregtechConduits.java | 30 +- .../gregtech/GregtechEnergyBuffer.java | 2 +- .../GregtechGeothermalThermalGenerator.java | 2 +- .../registration/gregtech/GregtechSafeBlock.java | 2 +- .../gregtech/GregtechThreadedBuffers.java | 78 -- .../xmod/ic2/item/CustomKineticRotor.java | 5 - .../xmod/thaumcraft/util/ThaumcraftUtils.java | 20 - 221 files changed, 727 insertions(+), 3468 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java (limited to 'src/main/java') diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java index 9e3d7f7102..f5bd29947d 100644 --- a/src/main/java/gregtech/api/util/GTPP_Recipe.java +++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java @@ -1,8 +1,6 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.E; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; -import static gregtech.api.enums.Mods.GTPlusPlus; import static net.minecraft.util.EnumChatFormatting.GRAY; import java.util.ArrayList; @@ -146,7 +144,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.cokeoven", "Coke Oven", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 1, @@ -162,7 +160,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.matterfab2", "Matter Fabricator", null, - RES_PATH_GUI + "basicmachines/Default", + "", 2, 0, 0, @@ -179,7 +177,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.rocketenginefuel", "Rocket Engine Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + "", 0, 0, 0, @@ -196,7 +194,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.quantumforcesmelter", "Quantum Force Transformer", null, - RES_PATH_GUI + "basicmachines/LCRNEI", + "", 6, 6, 1, @@ -214,7 +212,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.geothermalfuel", "GeoThermal Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + "", 1, 1, 0, @@ -230,7 +228,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.chemicaldehydrator", "Dehydrator", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 0, @@ -246,7 +244,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.vacfurnace", "Vacuum Furnace", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 1, @@ -262,7 +260,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.alloyblastsmelter", "Alloy Blast Smelter", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 1, @@ -278,7 +276,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.steamturbinefuel", "GeoThermal Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + "", 1, 1, 0, @@ -296,7 +294,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 0, 0, @@ -321,7 +319,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.nuclearsaltprocessingplant", "Nuclear Salt Processing Plant", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 6, 0, @@ -339,7 +337,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.oremill", "Milling", null, - RES_PATH_GUI + "basicmachines/LFTR", + "", 3, 3, 1, @@ -377,7 +375,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.fissionfuel", "Nuclear Fuel Processing", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 0, 0, @@ -395,7 +393,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.coldtrap", "Cold Trap", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 0, @@ -413,7 +411,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.reactorprocessingunit", "Reactor Processing Unit", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 0, @@ -431,7 +429,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.simplewasher", "Simple Dust Washer", null, - RES_PATH_GUI + "basicmachines/PotionBrewer", + "", 1, 1, 0, @@ -450,7 +448,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.moleculartransformer", "Molecular Transformer", null, - RES_PATH_GUI + "basicmachines/Scanner", + "", 1, 1, 0, @@ -468,7 +466,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.elementaldupe", "Elemental Duplicator", null, - RES_PATH_GUI + "basicmachines/Replicator", + "", 1, 1, 0, @@ -485,7 +483,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.fluidchemicaleactor", "Chemical Plant", null, - GTPlusPlus.ID + ":textures/gui/FluidReactor", + "", 4, 4, 0, @@ -503,7 +501,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.RTGgenerators", "RTG", null, - "gregtech:textures/gui/basicmachines/Default", + "", 1, 0, 0, @@ -521,7 +519,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.thermalgeneratorfuel", "Thermal Generator Fuel", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 0, @@ -539,7 +537,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.solartower", "Solar Tower", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 0, 0, @@ -561,7 +559,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.cyclotron", "COMET - Compact Cyclotron", null, - RES_PATH_GUI + "basicmachines/BlastSmelter", + "", 9, 9, 0, @@ -579,7 +577,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.slowfusionreactor", "Mimir - Slow Fusion", null, - "gregtech:textures/gui/basicmachines/LFTR", + "", 0, 0, 0, @@ -591,31 +589,13 @@ public class GTPP_Recipe extends GT_Recipe { true, true).useModularUI(true); - // Component Assembler - public static final GT_Recipe_Map sComponentAssemblerRecipes = new GT_Recipe_Map_Assembler( - new HashSet<>(300), - "gtpp.recipe.componentassembler", - "Component Assembler", - null, - RES_PATH_GUI + "basicmachines/Assembler", - 6, - 1, - 1, - 0, - 1, - E, - 1, - E, - true, - true).useModularUI(true); - // Special Maps for Multis public static final GT_Recipe_Map sFishPondRecipes = new GT_Recipe_Map( new HashSet<>(3), "gtpp.recipe.fishpond", "Zhuhai - Fishing Port", null, - RES_PATH_GUI + "basicmachines/PotionBrewer", + "", 1, 1, 0, @@ -632,7 +612,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.spargetower", "Sparging", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 0, @@ -649,7 +629,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.cryogenicfreezer", "Cryogenic Freezer", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 1, 1, 0, @@ -665,7 +645,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multicentrifuge", "Multiblock Centrifuge", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 6, 6, 0, @@ -682,7 +662,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multielectro", "Multiblock Electrolyzer", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 6, 6, 0, @@ -701,7 +681,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.temp4", "temp4", null, - RES_PATH_GUI + "basicmachines/PotionBrewer", + "", 0, 0, 0, @@ -717,7 +697,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multimixer", "Multiblock Mixer", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 0, @@ -735,7 +715,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multidehydrator", "Multiblock Dehydrator", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 6, 9, 0, @@ -753,7 +733,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.semifluidgeneratorfuels", "Semifluid Generator Fuels", null, - RES_PATH_GUI + "basicmachines/Default", + "", 0, 0, 0, @@ -771,7 +751,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.flotationcell", "Flotation Cell", null, - RES_PATH_GUI + "basicmachines/LFTR", + "", 6, 0, 1, @@ -789,7 +769,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.treefarm", "Tree Growth Simulator", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 1, 2, 1, @@ -810,6 +790,7 @@ public class GTPP_Recipe extends GT_Recipe { @Override protected List handleNEIItemOutputTooltip(List currentTip, FixedPositionedStack pStack) { if (ModItems.fluidFertBasic != null && pStack.isChanceBased()) { + // noinspection deprecation currentTip .add(GRAY + "Outputted if " + ModItems.fluidFertBasic.getLocalizedName() + " is provided"); } else { @@ -824,6 +805,7 @@ public class GTPP_Recipe extends GT_Recipe { List result = new ArrayList<>(); if (ModItems.fluidFertBasic != null) { result.add("The sapling is not consumed."); + // noinspection deprecation result.add("If " + ModItems.fluidFertBasic.getLocalizedName() + " is provided,"); result.add("Saplings are made instead"); } diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java index f6618cb1f8..094ef5a08c 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java @@ -1,6 +1,6 @@ package gregtech.api.util; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GregTech; import net.minecraftforge.fluids.FluidStack; @@ -12,7 +12,7 @@ public class GasSpargingRecipeMap extends AutoMap { public static final String mUnlocalizedName = "gtpp.recipe.lftr.sparging"; public static final String mNEIName = mUnlocalizedName; public static final String mNEIDisplayName = "LFTR Gas Sparging"; - public static final String mNEIGUIPath = RES_PATH_GUI + "basicmachines/FissionFuel.png"; + public static final String mNEIGUIPath = GregTech.getResourcePath("textures", "gui/basicmachines/FissionFuel.png"); public static boolean addRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack aSpargedFuel, FluidStack[] aOutputs, int[] aMaxOutputs) { diff --git a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java index 61e582c7a3..4bfa15855c 100644 --- a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java +++ b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java @@ -18,10 +18,6 @@ public class MaterialHelper { return ItemUtils.getOrePrefixStack(oreprefix, material, amount); } - public static ItemStack getComponentFromGtMaterial(OrePrefixes oreprefix, Materials material, int amount) { - return ItemUtils.getGregtechOreStack(oreprefix, material, amount); - } - /** * Generates a 16 Fluid Pipe * diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java index cc3c2cd36e..7718f68176 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.util.GT_Utility; +import gregtech.common.covers.CoverInfo; import gtPlusPlus.core.tileentities.base.TileEntityBase; import gtPlusPlus.core.util.data.ArrayUtils; @@ -90,43 +91,21 @@ public class BTF_Inventory implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int ordinalSide) { final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); - ArrayList tList = new ArrayList(); - TileEntityBase tTileEntity = this.mTile; - boolean tSkip = tTileEntity.getCoverBehaviorAtSide(side).letsItemsIn( - side, - tTileEntity.getCoverIDAtSide(side), - tTileEntity.getCoverDataAtSide(side), - -2, - tTileEntity) - || tTileEntity.getCoverBehaviorAtSide(side).letsItemsOut( - side, - tTileEntity.getCoverIDAtSide(side), - tTileEntity.getCoverDataAtSide(side), - -2, - tTileEntity); + ArrayList tList = new ArrayList<>(); + CoverInfo coverInfo = this.mTile.getCoverInfoAtSide(side); + boolean tSkip = coverInfo.letsItemsIn(-2) || coverInfo.letsItemsIn(-2); for (int rArray = 0; rArray < this.getSizeInventory(); ++rArray) { - if (this.isValidSlot(rArray) && (tSkip - || tTileEntity.getCoverBehaviorAtSide(side).letsItemsOut( - side, - tTileEntity.getCoverIDAtSide(side), - tTileEntity.getCoverDataAtSide(side), - rArray, - tTileEntity) - || tTileEntity.getCoverBehaviorAtSide(side).letsItemsIn( - side, - tTileEntity.getCoverIDAtSide(side), - tTileEntity.getCoverDataAtSide(side), - rArray, - tTileEntity))) { - tList.add(Integer.valueOf(rArray)); + if (this.isValidSlot(rArray) + && (tSkip || coverInfo.letsItemsOut(rArray) || coverInfo.letsItemsIn(rArray))) { + tList.add(rArray); } } int[] arg6 = new int[tList.size()]; for (int i = 0; i < arg6.length; ++i) { - arg6[i] = ((Integer) tList.get(i)).intValue(); + arg6[i] = tList.get(i); } return arg6; diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java index 08462c6c65..55f1df240f 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java @@ -28,7 +28,6 @@ public abstract class BlockBaseNBT extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - @SuppressWarnings("deprecation") public BlockBaseNBT(final Material material, final String unlocalName, final String displayName) { super(material); this.setBlockName(unlocalName); diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index 79b24e2405..57b70c1927 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -31,7 +31,6 @@ public class BlockTankXpConverter extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - @SuppressWarnings("deprecation") public BlockTankXpConverter() { super(Material.iron); this.setBlockName("blockTankXpConverter"); diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java index e73c88bee0..4b4390bc78 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java @@ -35,7 +35,6 @@ public class FirePit extends BasicBlock { public static final int META_ANTIBUILDER = 2; private int meta; - @SuppressWarnings("deprecation") public FirePit() { super("blockFirePit", Material.wood); this.setBlockName("blockFirePit"); diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java index dbcd3ed57c..0a09e902f7 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java @@ -17,7 +17,6 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.ItemFluidContainer; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; @@ -35,13 +34,11 @@ public class FluidTankInfinite extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - @SuppressWarnings("deprecation") public FluidTankInfinite() { super(Material.iron); this.setBlockName("blockInfiniteFluidTank"); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, "blockInfiniteFluidTank"); - LanguageRegistry.addName(this, "Infinite Fluid Tank"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java index 1e864a13c8..916385647c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java +++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java @@ -35,10 +35,8 @@ import gtPlusPlus.core.util.math.MathUtils; public class HellFire extends BlockFire { - @Deprecated private final int[] field_149849_a = new int[Short.MAX_VALUE]; - @Deprecated private final int[] field_149848_b = new int[Short.MAX_VALUE]; @SideOnly(Side.CLIENT) @@ -251,16 +249,6 @@ public class HellFire extends BlockFire { } } - /** - * Checks the specified block coordinate to see if it can catch fire. Args: blockAccess, x, y, z - */ - @Override - @Deprecated - public boolean canBlockCatchFire(final IBlockAccess p_149844_1_, final int p_149844_2_, final int p_149844_3_, - final int p_149844_4_) { - return this.canCatchFire(p_149844_1_, p_149844_2_, p_149844_3_, p_149844_4_, UP); - } - /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java index 4d974b9a61..2d2a407057 100644 --- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java @@ -23,7 +23,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.common.items.GT_MetaGenerated_Tool_01; @@ -37,14 +36,12 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils; public abstract class BlockGenericRedstone extends BlockContainer { - @SuppressWarnings("deprecation") public BlockGenericRedstone(String aUnlocalizedSuffix, String aDisplayName) { super(Material.redstoneLight); this.setBlockName("blockGenericRedstone." + aUnlocalizedSuffix); this.setHardness(3f); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockGenericRedstone." + aUnlocalizedSuffix); - LanguageRegistry.addName(this, aDisplayName); } private final HashMap> mTextures = new HashMap>(); diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index bf4fa41296..0fc3b5b666 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -34,7 +34,6 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { return this.mTooltipID; } - @SuppressWarnings("deprecation") public CircuitProgrammer() { super(Material.iron); } diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java index e5ee4633f5..1a2dba6e65 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java @@ -50,7 +50,6 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - @SuppressWarnings("deprecation") public DecayablesChest() { super(Material.iron); this.setBlockName("blockDecayablesChest"); @@ -184,24 +183,4 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { final int z) { return false; } - - /* - * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te = - * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te); - * super.breakBlock(world, pos, blockstate); } - * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, - * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap) - * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } } - */ - - /** - * Update Chest Meta - Stub - * - * @param aWorld - * @param xPos - * @param yPos - * @param zPos - */ - @Deprecated - public void func_149954_e(World aWorld, int xPos, int yPos, int zPos) {} } diff --git a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java index 74ed902b0d..90d74c5d37 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java @@ -49,7 +49,6 @@ public class EggBox extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - @SuppressWarnings("deprecation") public EggBox() { super(Material.wood); this.setBlockName("blockEggBox"); @@ -147,24 +146,4 @@ public class EggBox extends BlockContainer implements ITileTooltip { final int z) { return false; } - - /* - * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te = - * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te); - * super.breakBlock(world, pos, blockstate); } - * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, - * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap) - * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } } - */ - - /** - * Update Chest Meta - Stub - * - * @param aWorld - * @param xPos - * @param yPos - * @param zPos - */ - @Deprecated - public void func_149954_e(World aWorld, int xPos, int yPos, int zPos) {} } diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java index 569a7d5762..1fb1e97703 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java @@ -46,7 +46,6 @@ public class FishTrap extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - @SuppressWarnings("deprecation") public FishTrap() { super(Material.iron); this.setBlockName("blockFishTrap"); @@ -134,14 +133,4 @@ public class FishTrap extends BlockContainer implements ITileTooltip { final int z) { return false; } - - /* - * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te = - * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te); - * super.breakBlock(world, pos, blockstate); } - * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, - * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap) - * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } } - */ - } diff --git a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java index 8b83713d3b..a89de43744 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java @@ -28,7 +28,6 @@ public class HeliumGenerator extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - @SuppressWarnings("deprecation") public HeliumGenerator() { super(Material.wood); this.setBlockName("blockHeliumGenerator"); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java index a3cd9fb408..8c388f1408 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java @@ -43,7 +43,6 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool return this.mTooltipID; } - @SuppressWarnings("deprecation") public Machine_ModularityTable() { super(Material.iron); this.setBlockName("blockModularity"); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java index f833774683..68532bc478 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java @@ -47,7 +47,6 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - @SuppressWarnings("deprecation") public Machine_PestKiller() { super(Material.wood); this.setBlockName("blockPestKiller"); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java index f2e848a1ee..4d34d96b21 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java @@ -52,7 +52,6 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip return this.mTooltipID; } - @SuppressWarnings("deprecation") public Machine_ProjectTable() { super(Material.iron); this.setBlockName("blockProjectBench"); diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java index e3f09dc25c..982b29ed97 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java @@ -41,7 +41,6 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { return ItemBlockBasicTile.class; } - @SuppressWarnings("deprecation") public VolumetricFlaskSetter() { super(Material.iron); } diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java index 102cff2232..76b27ce93e 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java @@ -158,7 +158,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { aFluidContainerData.put("FluidStack Local Name: " + aHeldItemFluid.getLocalizedName()); aFluidContainerData .put("Fluid Unlocal Name: " + aHeldItemFluid.getFluid().getUnlocalizedName()); - aFluidContainerData.put("Fluid Local Name: " + aHeldItemFluid.getFluid().getLocalizedName()); + aFluidContainerData.put("Fluid Local Name: " + aHeldItemFluid.getLocalizedName()); aFluidContainerData.put("Fluid Name: " + aHeldItemFluid.getFluid().getName()); } diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index 296fc0518d..fd8d317fe6 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -23,7 +23,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCircuits; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Cables; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Pipes; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_ComponentAssemblers; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Dehydrators; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_FluidTanks; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_GeothermalEngines; @@ -117,7 +116,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.showHiddenNEIItems; import static gtPlusPlus.core.lib.CORE.EVERGLADESBIOME_ID; import static gtPlusPlus.core.lib.CORE.EVERGLADES_ID; import static gtPlusPlus.core.lib.CORE.turbineCutoffBase; -import static gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames; import java.io.File; @@ -250,8 +248,6 @@ public class ConfigHandler { GregTech.ID, false, "These may be overpowered, Consult a local electrician."); - enableMachine_ComponentAssemblers = config - .getBoolean("enableComponentAssemblers", GregTech.ID, true, "These construct machine components."); enableMachine_Safes = config .getBoolean("enableMachineSafes", GregTech.ID, true, "These protect your goodies/rare stuff."); enableMachine_Dehydrators = config @@ -428,15 +424,6 @@ public class ConfigHandler { EVERGLADESBIOME_ID = config .getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension."); - // Blacklisted Accelerator TileEntities - BlacklistedTileEntiyClassNames = new String[] { - "com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry" }; - BlacklistedTileEntiyClassNames = config.getStringList( - "BlacklistedTileEntiyClassNames", - GregTech.ID, - BlacklistedTileEntiyClassNames, - "The Canonical Class-Names of TileEntities that should be ignored by the WorldAccelerator"); - // Pollution pollutionPerSecondMultiPackager = config .get( diff --git a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java index 120488acbb..46e56d3f1d 100644 --- a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java +++ b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java @@ -45,15 +45,15 @@ public class ItemGenericFluidBucket extends ItemBucket { if (FluidFactory.mMetaToBucketMap.containsKey(aID)) { try { + // noinspection deprecation throw new GregtechException( - "" + aID - + " is already registered! Unable to register fluid: " + aID + " is already registered! Unable to register fluid: " + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); } catch (GregtechException e) { e.printStackTrace(); + // noinspection deprecation CORE.crash( - "" + aID - + " is already registered! Unable to register fluid: " + aID + " is already registered! Unable to register fluid: " + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); } } diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index a326c7e693..eef430bd4e 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -48,7 +48,6 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAdvancedBoilers; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAlgaeContent; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAmazonWarehouse; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechBufferDynamos; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechComponentAssembler; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCustomHatches; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCyclotron; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator; @@ -185,7 +184,6 @@ public class COMPAT_HANDLER { GregtechWirelessChargers.run(); GregtechIndustrialGeneratorArray.run(); GregtechIndustrialCuttingFactory.run(); - GregtechComponentAssembler.run(); GregtechTeslaTower.run(); GregtechSuperChests.run(); GregtechIndustrialFishPond.run(); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java index a4040e14b2..194e585c0d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java @@ -128,7 +128,7 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { if (this.hasEffect.get(par1ItemStack.getItemDamage() - this.mOffset) != null) { return this.hasEffect.get(par1ItemStack.getItemDamage() - this.mOffset).getValue(); } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java index 8c3fdeb0f9..e846603070 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java @@ -86,7 +86,7 @@ public class BaseItemColourable extends Item { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return this.hasEffect; } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java index 9f026e0192..8fbc005ce8 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java @@ -76,7 +76,7 @@ public class BaseItemDamageable extends Item { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { int dmg = (int) getItemDamage(par1ItemStack); if (dmg > 200) { return true; @@ -173,14 +173,8 @@ public class BaseItemDamageable extends Item { return true; } - @Override - public boolean hasContainerItem() { - return true; - } - @Override public boolean hasContainerItem(ItemStack stack) { - Logger.INFO("hasContainerItem? " + stack.getDisplayName()); return true; } diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java index 1e2ddb4aea..b1b9e05b9e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java @@ -232,7 +232,7 @@ public class CoreItem extends Item { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return this.hasEffect; } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java index f0f14c264d..8befe3c3ab 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java @@ -91,7 +91,7 @@ public class ItemBlockMeta extends ItemBlockWithMetadata { } @Override - public int getDisplayDamage(ItemStack stack) { + public int getDamage(ItemStack stack) { return 0; } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java index 414fd8c13b..80178b6c31 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java @@ -84,7 +84,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata { } @Override - public int getDisplayDamage(ItemStack stack) { + public int getDamage(ItemStack stack) { return 0; } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 90258da65b..004ae5f3e2 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -114,11 +114,6 @@ public class ItemGenericChemBase extends Item { return false; } - @Override - public int getDisplayDamage(ItemStack stack) { - return stack.getItemDamage(); - } - @Override public int getItemEnchantability() { return 0; diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java index e176dc603a..0f9f7d0e5c 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java @@ -95,11 +95,6 @@ public class ItemNuclearChemBase extends Item { return false; } - @Override - public int getDisplayDamage(ItemStack stack) { - return stack.getItemDamage(); - } - @Override public int getItemEnchantability() { return 0; diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index d2ae1efca0..0b1c8eeadd 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -348,11 +348,6 @@ public class BaseItemMetaFood extends ItemFood { return false; } - @Override - public int getDisplayDamage(ItemStack stack) { - return stack.getItemDamage(); - } - @Override public boolean showDurabilityBar(ItemStack stack) { return false; diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java index c48a54bc67..87ebded077 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java @@ -53,6 +53,7 @@ public class ItemGenericToken extends CoreItem { mCustomNameColours = new HashMap(); mIcons = new HashMap(); mTextureDir = aTextureDir; + setMaxStackSize(64); } public boolean register(int id, String aLocalName, int aMaxStack, String aDescript) { @@ -135,7 +136,7 @@ public class ItemGenericToken extends CoreItem { } @Override - public boolean hasEffect(ItemStack par1ItemStack) { + public boolean hasEffect(ItemStack par1ItemStack, final int pass) { return false; } @@ -145,7 +146,7 @@ public class ItemGenericToken extends CoreItem { } @Override - public int getDisplayDamage(ItemStack stack) { + public int getDamage(ItemStack stack) { return 0; } @@ -164,21 +165,16 @@ public class ItemGenericToken extends CoreItem { return false; } - @Override - public int getItemStackLimit() { - return 64; - } - @Override public int getItemStackLimit(ItemStack aStack) { if (aStack == null) { - return getItemStackLimit(); + return maxStackSize; } else { Integer aSize = mMaxStackSizes.get(aStack.getItemDamage()); if (aSize != null) { return aSize; } else { - return getItemStackLimit(); + return maxStackSize; } } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java index a8a279299b..a614a2b737 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java @@ -173,7 +173,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { int h = getCorrectMetaForItemstack(par1ItemStack); if (this.hasEffect.get(h) != null) { return this.hasEffect.get(h); diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java index 044519028d..dbaee70bd0 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java @@ -69,7 +69,7 @@ public class SandstoneHammer extends BaseItemWithDamageValue { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index 8df0ca1e55..d4caadc7f7 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -222,7 +222,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return false; } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java index 6dd6973749..ab154c2b24 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java @@ -131,7 +131,7 @@ public class MultiSpadeBase extends StaballoySpade { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java index 7ec3be72ca..660ec408c1 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java @@ -366,7 +366,7 @@ public class StaballoyAxe extends ItemAxe { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return true; } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java index 4fa76cc288..9601662c39 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java @@ -436,7 +436,7 @@ public class StaballoyPickaxe extends ItemPickaxe { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return true; } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java index 3be95912fe..c9a4def88c 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java @@ -383,7 +383,7 @@ public class StaballoySpade extends ItemSpade { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return true; } diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 71a812e95a..b846434665 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -23,7 +23,6 @@ imp