diff options
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_CoverBehavior.java | 29 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java | 35 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_ModHandler.java | 54 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_PlayedSound.java | 11 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 100 |
5 files changed, 2 insertions, 227 deletions
diff --git a/src/main/java/gregtech/api/util/GT_CoverBehavior.java b/src/main/java/gregtech/api/util/GT_CoverBehavior.java index 3c3a8607fe..9394b3957f 100644 --- a/src/main/java/gregtech/api/util/GT_CoverBehavior.java +++ b/src/main/java/gregtech/api/util/GT_CoverBehavior.java @@ -7,15 +7,12 @@ import java.lang.ref.WeakReference; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import gregtech.api.enums.GT_Values; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.net.GT_Packet_TileEntityCoverGUI; /** * For Covers with a special behavior. Has fixed storage format of 4 byte. Not very convenient... @@ -85,14 +82,6 @@ public abstract class GT_CoverBehavior extends GT_CoverBehaviorBase<ISerializabl return onCoverShiftRightclick(side, aCoverID, convert(aCoverVariable), aTileEntity, aPlayer); } - @Deprecated - @Override - protected Object getClientGUIImpl(ForgeDirection side, int aCoverID, - ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, - World aWorld) { - return getClientGUI(side, aCoverID, convert(aCoverVariable), aTileEntity); - } - @Override protected boolean onCoverRemovalImpl(ForgeDirection side, int aCoverID, ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, boolean aForced) { @@ -256,28 +245,12 @@ public abstract class GT_CoverBehavior extends GT_CoverBehaviorBase<ISerializabl if (hasCoverGUI() && aPlayer instanceof EntityPlayerMP) { lastPlayer = new WeakReference<>(aPlayer); mPlayerNotified = false; - if (useModularUI()) { - GT_UIInfos.openCoverUI(aTileEntity, aPlayer, side); - } else { - GT_Values.NW.sendToPlayer( - new GT_Packet_TileEntityCoverGUI( - side, - aCoverID, - aCoverVariable, - aTileEntity, - (EntityPlayerMP) aPlayer), - (EntityPlayerMP) aPlayer); - } + GT_UIInfos.openCoverUI(aTileEntity, aPlayer, side); return true; } return false; } - @Deprecated - public Object getClientGUI(ForgeDirection side, int aCoverID, int coverData, ICoverable aTileEntity) { - return null; - } - /** * Removes the Cover if this returns true, or if aForced is true. Doesn't get called when the Machine Block is * getting broken, only if you break the Cover away from the Machine. diff --git a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java index 76408e59c0..c66251439b 100644 --- a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java +++ b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagInt; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -28,14 +27,12 @@ import com.gtnewhorizons.modularui.common.widget.ButtonWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; import gregtech.api.gui.GT_GUIColorOverride; import gregtech.api.gui.modularui.GT_CoverUIBuildContext; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.gui.widgets.GT_CoverTickRateButton; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.net.GT_Packet_TileEntityCoverGUI; import gregtech.common.covers.CoverInfo; /** @@ -223,12 +220,6 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { return onCoverShiftRightClickImpl(side, aCoverID, forceCast(aCoverVariable), aTileEntity, aPlayer); } - @Deprecated - public final Object getClientGUI(ForgeDirection side, int aCoverID, ISerializableObject aCoverVariable, - ICoverable aTileEntity, EntityPlayer aPlayer, World aWorld) { - return getClientGUIImpl(side, aCoverID, forceCast(aCoverVariable), aTileEntity, aPlayer, aWorld); - } - /** * Removes the Cover if this returns true, or if aForced is true. Doesn't get called when the Machine Block is * getting broken, only if you break the Cover away from the Machine. @@ -420,13 +411,6 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { protected GT_GUIColorOverride colorOverride; private static final String guiTexturePath = "gregtech:textures/gui/GuiCover.png"; - /** - * For back compatibility, you need to override this if this cover uses ModularUI. - */ - public boolean useModularUI() { - return false; - } - public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) { return new UIFactory(buildContext).createWindow(); } @@ -632,29 +616,12 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { ICoverable aTileEntity, EntityPlayer aPlayer) { if (hasCoverGUI() && aPlayer instanceof EntityPlayerMP) { lastPlayer = new WeakReference<>(aPlayer); - if (useModularUI()) { - GT_UIInfos.openCoverUI(aTileEntity, aPlayer, side); - } else { - GT_Values.NW.sendToPlayer( - new GT_Packet_TileEntityCoverGUI( - side, - aCoverID, - aCoverVariable, - aTileEntity, - (EntityPlayerMP) aPlayer), - (EntityPlayerMP) aPlayer); - } + GT_UIInfos.openCoverUI(aTileEntity, aPlayer, side); return true; } return false; } - @Deprecated - protected Object getClientGUIImpl(ForgeDirection side, int aCoverID, T aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, World aWorld) { - return null; - } - /** * Removes the Cover if this returns true, or if aForced is true. Doesn't get called when the Machine Block is * getting broken, only if you break the Cover away from the Machine. diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index 18f52d1bd0..b91bb810b6 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -290,11 +290,6 @@ public class GT_ModHandler { return FluidRegistry.getFluidStack("milk", (int) aAmount); } - @Deprecated - public static ItemStack getEmptyFuelCan(long aAmount) { - return null; - } - public static ItemStack getEmptyCell(long aAmount) { return ItemList.Cell_Empty.get(aAmount); } @@ -331,23 +326,6 @@ public class GT_ModHandler { } /** - * @param aValue Fuel value in EU - */ - @Deprecated - public static ItemStack getFuelCan(int aValue) { - return null; - } - - /** - * @param aFuelCan the Item you want to check - * @return the exact Value in EU the Fuel Can is worth if its even a Fuel Can. - */ - @Deprecated - public static int getFuelCanValue(ItemStack aFuelCan) { - return 0; - } - - /** * Gets an Item from IndustrialCraft, and returns a Replacement Item if not possible */ public static ItemStack getIC2Item(String aItem, long aAmount, ItemStack aReplacement) { @@ -1664,33 +1642,6 @@ public class GT_ModHandler { } /** - * Used in my own Macerator. Decreases StackSize of the Input if wanted. - */ - @Deprecated - public static ItemStack getMaceratorOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) { - return GT_Utility.copyOrNull( - getMachineOutput(aInput, getMaceratorRecipeList(), aRemoveInput, new NBTTagCompound(), aOutputSlot)[0]); - } - - /** - * Used in my own Extractor. Decreases StackSize of the Input if wanted. - */ - @Deprecated - public static ItemStack getExtractorOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) { - return GT_Utility.copyOrNull( - getMachineOutput(aInput, getExtractorRecipeList(), aRemoveInput, new NBTTagCompound(), aOutputSlot)[0]); - } - - /** - * Used in my own Compressor. Decreases StackSize of the Input if wanted. - */ - @Deprecated - public static ItemStack getCompressorOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) { - return GT_Utility.copyOrNull( - getMachineOutput(aInput, getCompressorRecipeList(), aRemoveInput, new NBTTagCompound(), aOutputSlot)[0]); - } - - /** * Used in my own Furnace. */ public static ItemStack getSmeltingOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) { @@ -2114,11 +2065,6 @@ public class GT_ModHandler { } } - @Deprecated - public static void registerBoxableItemToToolBox(Item aItem) { - registerBoxableItemToToolBox(new ItemStack(aItem, 1, GT_Values.W)); - } - public static int getCapsuleCellContainerCountMultipliedWithStackSize(ItemStack... aStacks) { int rAmount = 0; for (ItemStack tStack : aStacks) diff --git a/src/main/java/gregtech/api/util/GT_PlayedSound.java b/src/main/java/gregtech/api/util/GT_PlayedSound.java index 05d61e9833..8604d9b81f 100644 --- a/src/main/java/gregtech/api/util/GT_PlayedSound.java +++ b/src/main/java/gregtech/api/util/GT_PlayedSound.java @@ -1,7 +1,5 @@ package gregtech.api.util; -import static gregtech.api.enums.GT_Values.E; - import net.minecraft.util.ResourceLocation; public class GT_PlayedSound { @@ -16,15 +14,6 @@ public class GT_PlayedSound { mZ = (int) aZ; } - /** - * @inheritDoc - * @deprecated Use {@link GT_PlayedSound(ResourceLocation, double, double, double)} - */ - @Deprecated - public GT_PlayedSound(String aSoundName, double aX, double aY, double aZ) { - this(new ResourceLocation(aSoundName == null ? E : aSoundName), aX, aY, aZ); - } - @Override public boolean equals(Object aObject) { if (aObject instanceof GT_PlayedSound) { diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index fb1b026cc7..65504dda75 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -2312,24 +2312,6 @@ public class GT_Utility { return true; } - /** - * @inheritDoc - * @Deprecated Use {@link #doSoundAtClient(ResourceLocation, int, float, float, double, double, double)} - */ - @Deprecated - public static boolean doSoundAtClient(String aSoundName, int aTimeUntilNextSound, float aSoundStrength, - float aSoundModulation, double aX, double aY, double aZ) { - if (isStringInvalid(aSoundName)) return false; - return doSoundAtClient( - new ResourceLocation(aSoundName), - aTimeUntilNextSound, - aSoundStrength, - aSoundModulation, - aX, - aY, - aZ); - } - public static boolean sendSoundToPlayers(World aWorld, String aSoundName, float aSoundStrength, float aSoundModulation, int aX, int aY, int aZ) { if (isStringInvalid(aSoundName) || aWorld == null || aWorld.isRemote) return false; @@ -2432,11 +2414,6 @@ public class GT_Utility { return rList; } - @Deprecated // why do you use Objects? - public static Block getBlock(Object aBlock) { - return (Block) aBlock; - } - public static Block getBlockFromStack(ItemStack itemStack) { if (isStackInvalid(itemStack)) return Blocks.air; return getBlockFromItem(itemStack.getItem()); @@ -2446,16 +2423,6 @@ public class GT_Utility { return Block.getBlockFromItem(item); } - @Deprecated // why do you use Objects? And if you want to check your block to be not null, check it directly! - public static boolean isBlockValid(Object aBlock) { - return (aBlock instanceof Block); - } - - @Deprecated // why do you use Objects? And if you want to check your block to be null, check it directly! - public static boolean isBlockInvalid(Object aBlock) { - return !(aBlock instanceof Block); - } - public static boolean isStringValid(Object aString) { return aString != null && !aString.toString() .isEmpty(); @@ -2614,16 +2581,6 @@ public class GT_Utility { * * @return casing texture 0 to 16383 */ - @Deprecated - public static int getTextureId(ItemStack stack) { - return getTextureId(Block.getBlockFromItem(stack.getItem()), (byte) stack.getItemDamage()); - } - - /** - * Return texture id from item stack, unoptimized but readable? - * - * @return casing texture 0 to 16383 - */ public static int getTextureId(Block blockFromBlock, byte metaFromBlock) { for (int page = 0; page < Textures.BlockIcons.casingTexturePages.length; page++) { ITexture[] casingTexturePage = Textures.BlockIcons.casingTexturePages[page]; @@ -2902,13 +2859,6 @@ public class GT_Utility { return false; } - @Deprecated - public static ItemStack setStack(Object aSetStack, Object aToStack) { - if (aSetStack instanceof ItemStack setStack && aToStack instanceof ItemStack toStack) - return setStack(setStack, toStack); - return null; - } - public static ItemStack setStack(ItemStack aSetStack, ItemStack aToStack) { if (isStackInvalid(aSetStack) || isStackInvalid(aToStack)) return null; aSetStack.func_150996_a(aToStack.getItem()); @@ -2991,14 +2941,6 @@ public class GT_Utility { return rStack; } - /** - * @deprecated use {@link #multiplyStack(int, ItemStack)} instead - */ - @Deprecated - public static ItemStack multiplyStack(long aMultiplier, Object... aStacks) { - return multiplyStack((int) aMultiplier, firstStackOrNull(aStacks)); - } - public static ItemStack multiplyStack(int aMultiplier, ItemStack aStack) { ItemStack rStack = copy(aStack); if (isStackInvalid(rStack)) return null; @@ -3011,14 +2953,6 @@ public class GT_Utility { } /** - * @deprecated use {@link #copyAmountUnsafe(int, ItemStack)} instead - */ - @Deprecated - public static ItemStack copyAmountUnsafe(long aAmount, Object... aStacks) { - return copyAmountUnsafe((int) aAmount, firstStackOrNull(aStacks)); - } - - /** * Unlike {@link #copyAmount(int, ItemStack)}, this method does not restrict stack size by 64. */ public static ItemStack copyAmountUnsafe(int aAmount, ItemStack aStack) { @@ -3029,14 +2963,6 @@ public class GT_Utility { return rStack; } - /** - * @deprecated use {@link #copyMetaData(int, ItemStack)} instead - */ - @Deprecated - public static ItemStack copyMetaData(long aMetaData, Object... aStacks) { - return copyMetaData((int) aMetaData, firstStackOrNull(aStacks)); - } - public static ItemStack copyMetaData(int aMetaData, ItemStack aStack) { ItemStack rStack = copy(aStack); if (isStackInvalid(rStack)) return null; @@ -3048,14 +2974,6 @@ public class GT_Utility { * @deprecated use {@link #copyAmountAndMetaData(int, int, ItemStack)} instead */ @Deprecated - public static ItemStack copyAmountAndMetaData(long aAmount, long aMetaData, Object... aStacks) { - return copyAmountAndMetaData(aAmount, aMetaData, firstStackOrNull(aStacks)); - } - - /** - * @deprecated use {@link #copyAmountAndMetaData(int, int, ItemStack)} instead - */ - @Deprecated public static ItemStack copyAmountAndMetaData(long aAmount, long aMetaData, ItemStack aStack) { return copyAmountAndMetaData((int) aAmount, (int) aMetaData, aStack); } @@ -3068,14 +2986,6 @@ public class GT_Utility { } /** - * @deprecated use {@link #mul(int, ItemStack)} instead - */ - @Deprecated - public static ItemStack mul(long aMultiplier, Object... aStacks) { - return mul((int) aMultiplier, firstStackOrNull(aStacks)); - } - - /** * returns a copy of an ItemStack with its Stacksize being multiplied by aMultiplier */ public static ItemStack mul(int aMultiplier, ItemStack aStack) { @@ -4710,16 +4620,6 @@ public class GT_Utility { return null; } - /** - * @deprecated typo in method name. use {@link #isAnyIntegratedCircuit(ItemStack)} instead. - */ - @Deprecated - public static boolean checkIfSameIntegratedCircuit(ItemStack itemStack) { - if (itemStack == null) return false; - for (int i = 0; i < 25; i++) if (itemStack.isItemEqual(GT_Utility.getIntegratedCircuit(i))) return true; - return false; - } - public static boolean isAnyIntegratedCircuit(ItemStack itemStack) { if (itemStack == null) return false; return itemStack.getItem() == ItemList.Circuit_Integrated.getItem() && 0 <= itemStack.getItemDamage() |