From 67b48690b1078b489bcb017e8db9200f26b77a0c Mon Sep 17 00:00:00 2001 From: miozune Date: Fri, 26 May 2023 14:41:09 +0900 Subject: Deprecation cleanup (#637) --- .../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 -------- 52 files changed, 58 insertions(+), 382 deletions(-) (limited to 'src/main/java/gtPlusPlus/core') 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 @@ import net.minecraftforge.common.util.FakePlayerFactory; import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.FMLCommonHandler; -import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.random.XSTR; @@ -173,7 +172,6 @@ public class CORE { public static boolean enableMachine_Tesseracts = true; public static boolean enableMachine_SimpleWasher = true; public static boolean enableMachine_Pollution = true; - public static boolean enableMachine_ComponentAssemblers = false; public static boolean enableCustom_Pipes = true; public static boolean enableCustom_Cables = true; public static boolean enableMachine_RF_Convetor = false; @@ -271,8 +269,6 @@ public class CORE { public static class Everglades { - @Deprecated - public static final String MODID = Mods.Names.G_T_PLUS_PLUS_EVERGLADES; public static final String NAME = "GT++ Toxic Everglades"; public static final String VERSION = "GRADLETOKEN_VERSION"; } diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java index 1ee1b79cdd..ac94fa78ba 100644 --- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java @@ -52,7 +52,7 @@ public final class ELEMENT { public final Material ALUMINIUMOXIDE = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminiumoxide); public final Material SILICON = MaterialUtils.generateMaterialFromGtENUM(Materials.Silicon); public final Material SILICONDIOXIDE = MaterialUtils.generateMaterialFromGtENUM(Materials.SiliconDioxide); - public final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphor); + public final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphorus); public final Material SULFUR = MaterialUtils.generateMaterialFromGtENUM(Materials.Sulfur); public final Material CHLORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Chlorine); public final Material ARGON = MaterialUtils.generateMaterialFromGtENUM(Materials.Argon); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 06a1fb2841..5654dd00cf 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -517,7 +517,7 @@ public class RECIPES_GREGTECH { GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), ItemList.UV_Coil.get(16L, new Object() {}), ItemList.Conveyor_Module_UV.get(4L, new Object() {}), - new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8 }, new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 16 }, ItemList.Circuit_Chip_PPIC.get(16, new Object() {}), ALLOY.PIKYONIUM.getPlate(16), ALLOY.CINOBITE.getScrew(32) }, diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 57e7caf43f..f8c673de6c 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -3416,23 +3416,11 @@ public class RECIPES_Machines { } private static void fakeMachineCasingCovers() { - GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { GregtechItemList.FakeMachineCasingPlate_ULV, - GregtechItemList.FakeMachineCasingPlate_LV, GregtechItemList.FakeMachineCasingPlate_MV, - GregtechItemList.FakeMachineCasingPlate_HV, GregtechItemList.FakeMachineCasingPlate_EV, - GregtechItemList.FakeMachineCasingPlate_IV, GregtechItemList.FakeMachineCasingPlate_LuV, - GregtechItemList.FakeMachineCasingPlate_ZPM, GregtechItemList.FakeMachineCasingPlate_UV, - GregtechItemList.FakeMachineCasingPlate_MAX, }; int aMaxTier = GT_Values.VOLTAGE_NAMES.length; ItemStack aTier[] = new ItemStack[aMaxTier]; for (int i = 0; i < aMaxTier; i++) { aTier[i] = ItemUtils.simpleMetaStack(CoverManager.Cover_Gt_Machine_Casing, i, 7); } - // Deprecate old recipes - for (int i = 0; i < 10; i++) { - RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { mMachineCasingCovers[i].get(1) }, - ItemUtils.getSimpleStack(aTier[i], 1)); - } // Add recipes for new ones for (int i = 0; i < aMaxTier; i++) { GT_Values.RA diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index bb7704e530..98c77865a3 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -301,7 +301,6 @@ public class CI { return Materials._NULL; } - @Deprecated public static String getTieredComponent(OrePrefixes type, int tier) { Object material = getMaterialFromTier(tier); if (material != null) { @@ -445,11 +444,11 @@ public class CI { private static final Materials[] aMaterial_Cables = new Materials[] { Materials.Tin, Materials.Cobalt, Materials.AnnealedCopper, Materials.Gold, Materials.Titanium, Materials.Nichrome, Materials.Platinum, - Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium, Materials.Superconductor, }; + Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium, Materials.SuperconductorUHV, }; private static final Materials[] aMaterial_Circuits = new Materials[] { Materials.Primitive, Materials.Basic, Materials.Good, Materials.Advanced, Materials.Data, Materials.Data, Materials.Elite, Materials.Master, - Materials.Ultimate, Materials.Superconductor, Materials.Infinite, }; + Materials.Ultimate, Materials.SuperconductorUHV, Materials.Infinite, }; private static final Material[][] aMaster = new Material[][] { aMaterial_Main, aMaterial_Secondary, aMaterial_Tertiary }; @@ -608,7 +607,7 @@ public class CI { } else if (aTier == 8) { return ItemUtils.getOrePrefixStack(aPrefix, Materials.Ultimate, aAmount); } else if (aTier == 9) { - return ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.Superconductor, aAmount); + return ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.SuperconductorUHV, aAmount); } else if (aTier == 10) { return ItemUtils.getOrePrefixStack(aPrefix, Materials.Europium, aAmount); } else { diff --git a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java index 528ae6ef68..f7ed248669 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java +++ b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java @@ -1,7 +1,5 @@ package gtPlusPlus.core.tileentities; -import static gregtech.api.enums.Mods.Thaumcraft; - import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.general.BlockSuperLight.TileEntitySuperLight; @@ -23,7 +21,6 @@ import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner; -import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; public class ModTileEntities { @@ -49,19 +46,6 @@ public class ModTileEntities { GameRegistry.registerTileEntity(TileEntityEggBox.class, "TileEggBox"); GameRegistry.registerTileEntity(TileEntityVolumetricFlaskSetter.class, "TileEntityVolumetricFlaskSetter"); - - // Mod TEs - if (Thaumcraft.isModLoaded()) {} - - blacklistTilesFromAcceleration(); } - private static void blacklistTilesFromAcceleration() { - Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator( - "gtPlusPlus.core.tileentities.general.TileEntityFishTrap"); - Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator( - "gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest"); - Meta_GT_Proxy - .setTileEntityClassAsBlacklistedInWorldAccelerator("gtPlusPlus.core.tileentities.general.TileEggBox"); - } } diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java index 540005d8d1..563249672d 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java @@ -7,6 +7,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; +import gregtech.common.covers.CoverInfo; import gtPlusPlus.api.objects.minecraft.BTF_FluidTank; public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFluidTank { @@ -73,13 +74,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu public int fill(ForgeDirection side, FluidStack aFluid, boolean doFill) { if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mInputDisabled) - && (side == ForgeDirection.UNKNOWN - || (this.isLiquidInput(side) && getCoverBehaviorAtSide(side).letsFluidIn( - side, - getCoverIDAtSide(side), - getCoverDataAtSide(side), - aFluid == null ? null : aFluid.getFluid(), - this)))) + && (side == ForgeDirection.UNKNOWN || (this.isLiquidInput(side) + && getCoverInfoAtSide(side).letsFluidIn(aFluid == null ? null : aFluid.getFluid())))) return this.fillEx(side, aFluid, doFill); return 0; } @@ -88,13 +84,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu public FluidStack drain(ForgeDirection side, int maxDrain, boolean doDrain) { if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mOutputDisabled) - && (side == ForgeDirection.UNKNOWN - || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side).letsFluidOut( - side, - getCoverIDAtSide(side), - getCoverDataAtSide(side), - this.getFluid() == null ? null : this.getFluid().getFluid(), - this)))) + && (side == ForgeDirection.UNKNOWN || (this.isLiquidOutput(side) && getCoverInfoAtSide(side) + .letsFluidOut(this.getFluid() == null ? null : this.getFluid().getFluid())))) return this.drainEx(side, maxDrain, doDrain); return null; } @@ -103,13 +94,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu public FluidStack drain(ForgeDirection side, FluidStack aFluid, boolean doDrain) { if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mOutputDisabled) - && (side == ForgeDirection.UNKNOWN - || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side).letsFluidOut( - side, - getCoverIDAtSide(side), - getCoverDataAtSide(side), - aFluid == null ? null : aFluid.getFluid(), - this)))) + && (side == ForgeDirection.UNKNOWN || (this.isLiquidOutput(side) + && getCoverInfoAtSide(side).letsFluidOut(aFluid == null ? null : aFluid.getFluid())))) return this.drainEx(side, aFluid, doDrain); return null; } @@ -118,8 +104,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu public boolean canFill(ForgeDirection side, Fluid aFluid) { if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mInputDisabled) - && (side == ForgeDirection.UNKNOWN || (this.isLiquidInput(side) && getCoverBehaviorAtSide(side) - .letsFluidIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aFluid, this)))) + && (side == ForgeDirection.UNKNOWN + || (this.isLiquidInput(side) && getCoverInfoAtSide(side).letsFluidIn(aFluid)))) return this.canFillEx(side, aFluid); return false; } @@ -128,19 +114,18 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu public boolean canDrain(ForgeDirection side, Fluid aFluid) { if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mOutputDisabled) - && (side == ForgeDirection.UNKNOWN || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side) - .letsFluidOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aFluid, this)))) + && (side == ForgeDirection.UNKNOWN + || (this.isLiquidOutput(side) && getCoverInfoAtSide(side).letsFluidOut(aFluid)))) return this.canDrainEx(side, aFluid); return false; } @Override public FluidTankInfo[] getTankInfo(ForgeDirection side) { - if (canAccessData() && (side == ForgeDirection.UNKNOWN - || (this.isLiquidInput(side) && getCoverBehaviorAtSide(side) - .letsFluidIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), null, this)) - || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side) - .letsFluidOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), null, this)))) + CoverInfo coverInfo = getCoverInfoAtSide(side); + if (canAccessData() + && (side == ForgeDirection.UNKNOWN || (this.isLiquidInput(side) && coverInfo.letsFluidIn(null)) + || (this.isLiquidOutput(side) && coverInfo.letsFluidOut(null)))) return this.getTankInfoEx(side); return new FluidTankInfo[] {}; } diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java index 032fa62956..762d5a4d61 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java @@ -23,10 +23,10 @@ import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.net.GT_Packet_Block_Event; import gregtech.api.util.GT_CoverBehavior; -import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; +import gregtech.common.covers.CoverInfo; import gtPlusPlus.api.interfaces.ILazyCoverable; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BTF_Inventory; @@ -264,10 +264,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public int[] getAccessibleSlotsFromSide(int ordinalSide) { final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); - if (canAccessData() && (getCoverBehaviorAtSide(side) - .letsItemsOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), -1, this) - || getCoverBehaviorAtSide(side) - .letsItemsIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), -1, this))) + CoverInfo coverInfo = getCoverInfoAtSide(side); + if (canAccessData() && (coverInfo.letsItemsOut(-1) || coverInfo.letsItemsIn(-1))) return mInventory.getAccessibleSlotsFromSide(ordinalSide); return new int[0]; } @@ -279,8 +277,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); return canAccessData() && (mRunningThroughTick || !mInputDisabled) - && getCoverBehaviorAtSide(side) - .letsItemsIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aIndex, this) + && getCoverInfoAtSide(side).letsItemsIn(aIndex) && mInventory.canInsertItem(aIndex, aStack, ordinalSide); } @@ -291,8 +288,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT public boolean canExtractItem(int aIndex, ItemStack aStack, int ordinalSide) { final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); return canAccessData() && (mRunningThroughTick || !mOutputDisabled) - && getCoverBehaviorAtSide(side) - .letsItemsOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aIndex, this) + && getCoverInfoAtSide(side).letsItemsOut(aIndex) && mInventory.canExtractItem(aIndex, aStack, ordinalSide); } @@ -431,8 +427,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT private boolean isEnergyInputSide(ForgeDirection side) { if (side != ForgeDirection.UNKNOWN) { - if (!this.getCoverBehaviorAtSide(side) - .letsEnergyIn(side, this.getCoverIDAtSide(side), this.getCoverDataAtSide(side), this)) { + if (!this.getCoverInfoAtSide(side).letsEnergyIn()) { return false; } @@ -450,8 +445,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT private boolean isEnergyOutputSide(ForgeDirection side) { if (side != ForgeDirection.UNKNOWN) { - if (!this.getCoverBehaviorAtSide(side) - .letsEnergyOut(side, this.getCoverIDAtSide(side), this.getCoverDataAtSide(side), this)) { + if (!this.getCoverInfoAtSide(side).letsEnergyOut()) { return false; } @@ -872,10 +866,6 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT this.worldObj.setBlock(this.xCoord, this.yCoord, this.zCoord, Blocks.fire); } - public String trans(String aKey, String aEnglish) { - return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false); - } - @Override public byte getInternalInputRedstoneSignal(ForgeDirection side) { return (byte) (getCoverBehaviorAtSide(side).getRedstoneInput( @@ -955,7 +945,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT final int ordinalSide = side.ordinal(); mCoverSides[ordinalSide] = aID; mCoverData[ordinalSide] = 0; - mCoverBehaviors[ordinalSide] = GregTech_API.getCoverBehavior(aID); + mCoverBehaviors[ordinalSide] = (GT_CoverBehavior) GregTech_API.getCoverBehaviorNew(aID); return true; } return false; @@ -969,7 +959,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public void setCoverItemAtSide(ForgeDirection side, ItemStack aCover) { - GregTech_API.getCoverBehavior(aCover).placeCover(side, aCover, this); + GregTech_API.getCoverBehaviorNew(aCover).placeCover(side, aCover, this); } @Override diff --git a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java index 75a3daacad..57c75640a6 100644 --- a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java @@ -14,18 +14,6 @@ import gtPlusPlus.api.objects.data.AutoMap; public class ArrayUtils { - public static V[] expandArray(final V[] someArray, final V newValueToAdd) { - V[] series = someArray; - series = addElement(series, newValueToAdd); - return series; - } - - private static V[] addElement(V[] series, final V newValueToAdd) { - series = Arrays.copyOf(series, series.length + 1); - series[series.length - 1] = newValueToAdd; - return series; - } - public static V[] insertElementAtIndex(V[] aArray, int aIndex, V aObjectToInsert) { V[] newArray = Arrays.copyOf(aArray, aArray.length + 1); for (int i = 0; i < aIndex; i++) { @@ -38,13 +26,6 @@ public class ArrayUtils { return newArray; } - /* - * public static Object getMostCommonElement(List list) { Optional r = - * list.stream().map(V::getTextureSet).collect(Collectors.groupingBy(Function.identity(), - * Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey); return - * r.get(); } - */ - public static Object[] removeNulls(final Object[] v) { List list = new ArrayList(Arrays.asList(v)); list.removeAll(Collections.singleton((Object) null)); diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java index 187839e48a..e2922ee642 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java @@ -57,14 +57,6 @@ public class EntityUtils { return d; } - @Deprecated - public static Block findBlockUnderEntityNonBoundingBox(final Entity parEntity) { - final int blockX = MathHelper.floor_double(parEntity.posX); - final int blockY = MathHelper.floor_double(parEntity.posY - 0.2D - parEntity.yOffset); - final int blockZ = MathHelper.floor_double(parEntity.posZ); - return parEntity.worldObj.getBlock(blockX, blockY, blockZ); - } - public static Block findBlockUnderEntity(final Entity parEntity) { final int blockX = MathHelper.floor_double(parEntity.posX); final int blockY = MathHelper.floor_double(parEntity.boundingBox.minY) - 1; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java index f5920b5549..0646b26866 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -74,17 +74,6 @@ public class FluidUtils { return FluidUtils.getFluidStack("ic2superheatedsteam", amount); } - @Deprecated - /** - * Do not use - Gives third tier steam - Not implemented - * - * @param amount - * @return - */ - public static FluidStack getHyperSteam(final int amount) { - return FluidUtils.getFluidStack("water", amount); - } - public static FluidStack getUUA(final int amount) { return FluidUtils.getFluidStack("uuamplifier", amount); } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 6ecc4ab5df..0cfa4e7646 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -21,7 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; @@ -957,27 +956,6 @@ public class ItemUtils { return getItemStackOfAmountFromOreDictNoBroken(oredictName, amount); } - @Deprecated - public static ItemStack getGregtechOreStack(OrePrefixes mPrefix, Materials mMat, int mAmount) { - - ItemStack aTemp = getOrePrefixStack(mPrefix, mMat, mAmount); - if (aTemp != null) { - return aTemp; - } - - String mName = MaterialUtils.getMaterialName(mMat); - - String mItemName = mPrefix.name() + mName; - // Utils.LOG_INFO("[Component Maker] Trying to get "+mItemName+"."); - ItemStack gregstack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(mItemName, mAmount); - if (gregstack == null) { - // Utils.LOG_INFO("[Component Maker] Failed to get "+mItemName+"."); - return null; - } - // Utils.LOG_INFO("[Component Maker] Found "+mItemName+"."); - return (gregstack); - } - public static ItemStack getOrePrefixStack(OrePrefixes mPrefix, Material mMat, int mAmount) { String mName = Utils.sanitizeString(mMat.getLocalizedName()); @@ -1182,10 +1160,6 @@ public class ItemUtils { return aFluid != null ? aFluid.getFluid().getLocalizedName(aFluid) : "NULL"; } - public static String getFluidName(Fluid aFluid) { - return aFluid != null ? aFluid.getLocalizedName() : "NULL"; - } - public static String getItemName(ItemStack aStack) { if (aStack == null) { return "ERROR - Empty Stack"; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java index fc728960fd..eabaf46866 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java @@ -12,7 +12,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.LanguageRegistry; -import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -53,10 +52,6 @@ public class LangUtils { return false; } - public static String trans(String aNr, String aEnglish) { - return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_GTPP_" + aNr, aEnglish, false); - } - /** * Quick Block Name Lookup that is friendly to servers and locale. */ diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 78e6034b06..3fdef9f94f 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -31,7 +31,6 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; public class MaterialUtils { @@ -75,8 +74,7 @@ public class MaterialUtils { } try { - @SuppressWarnings("deprecation") - String name = material.name(); + String name = material.mName; final short[] rgba = (customRGB == null ? material.mRGBa : customRGB); final int melting = material.mMeltingPoint; final int boiling = material.mBlastFurnaceTemp; @@ -178,12 +176,12 @@ public class MaterialUtils { return M; } else { Logger.DEBUG_MATERIALS( - "Failed to generate GT++ material instance for " + material.name() + "Failed to generate GT++ material instance for " + material.mName + " | Valid RGB? " + (hasValidRGBA(rgba))); } } catch (Throwable t) { - Logger.DEBUG_MATERIALS("Failed to generate GT++ material instance for " + material.name()); + Logger.DEBUG_MATERIALS("Failed to generate GT++ material instan