diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2022-11-07 23:09:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-07 16:09:55 +0100 |
| commit | 6c3d4537f1f98d66f09436a9fae99a7b4644ecf5 (patch) | |
| tree | adf57af6bd219bd80157800a24c0758e58ab1de3 /src/main/java/gregtech/api/util | |
| parent | acfa3dfed94b0e8c69ab6439593197338701b1c4 (diff) | |
| download | GT5-Unofficial-6c3d4537f1f98d66f09436a9fae99a7b4644ecf5.tar.gz GT5-Unofficial-6c3d4537f1f98d66f09436a9fae99a7b4644ecf5.tar.bz2 GT5-Unofficial-6c3d4537f1f98d66f09436a9fae99a7b4644ecf5.zip | |
remove compat with IC2 fuel can (#1506)
* remove compat with IC2 fuel can
* Spotless apply for branch feature/remove-ic2-fuel-can for #1506 (#1507)
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_ModHandler.java | 18 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 1 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index f861f2afc7..29dec07191 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -282,8 +282,9 @@ public class GT_ModHandler { return FluidRegistry.getFluidStack("milk", (int) aAmount); } + @Deprecated public static ItemStack getEmptyFuelCan(long aAmount) { - return ItemList.IC2_Fuel_Can_Empty.get(aAmount); + return null; } public static ItemStack getEmptyCell(long aAmount) { @@ -320,25 +321,18 @@ public class GT_ModHandler { /** * @param aValue Fuel value in EU */ + @Deprecated public static ItemStack getFuelCan(int aValue) { - if (aValue < 5) return ItemList.IC2_Fuel_Can_Empty.get(1); - ItemStack rFuelCanStack = ItemList.IC2_Fuel_Can_Filled.get(1); - if (rFuelCanStack == null) return null; - NBTTagCompound tNBT = new NBTTagCompound(); - tNBT.setInteger("value", aValue / 5); - rFuelCanStack.setTagCompound(tNBT); - return rFuelCanStack; + 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) { - if (GT_Utility.isStackInvalid(aFuelCan) || !ItemList.IC2_Fuel_Can_Filled.isStackEqual(aFuelCan, false, true)) - return 0; - NBTTagCompound tNBT = aFuelCan.getTagCompound(); - return tNBT == null ? 0 : tNBT.getInteger("value") * 5; + return 0; } /** diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index b49404926d..a4cea9ed2f 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1996,7 +1996,6 @@ public class GT_Utility { if (aStack.getItem().hasContainerItem(aStack)) return aStack.getItem().getContainerItem(aStack); /** These are all special Cases, in which it is intended to have only GT Blocks outputting those Container Items */ if (ItemList.Cell_Empty.isStackEqual(aStack, false, true)) return null; - if (ItemList.IC2_Fuel_Can_Filled.isStackEqual(aStack, false, true)) return ItemList.IC2_Fuel_Can_Empty.get(1); if (aStack.getItem() == Items.potionitem || aStack.getItem() == Items.experience_bottle || ItemList.TF_Vial_FieryBlood.isStackEqual(aStack) |
