upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-12 00:07:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE with FCStackStringifyHandler (#129)

Browse Source
This commit is contained in:
miozune authored and GitHub committed 2023-05-13 19:03:22 +02:00
1 parent 2cd049d40e
commit 14853a2481
3 files changed
+12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/glodblock/github/common/item/ItemFluidDrop.java
+6
View File
@@ -86,6 +86,7 @@ public class ItemFluidDrop extends FCBaseItem {
shape = aIconRegister.registerIcon(NameConst.RES_KEY + NameConst.ITEM_FLUID_DROP);
}
@Nullable
public static ItemStack newStack(@Nullable FluidStack fluid) {
if (fluid == null || fluid.amount <= 0) {
return null;
@@ -97,6 +98,7 @@ public class ItemFluidDrop extends FCBaseItem {
return stack;
}
@Nullable
public static ItemStack newDisplayStack(FluidStack fluid) {
if (fluid == null) {
return null;
@@ -120,6 +122,7 @@ public class ItemFluidDrop extends FCBaseItem {
return getFluidStack(stack.getItemStack()) != null;
}
@Nullable
public static FluidStack getFluidStack(ItemStack stack) {
if (stack == null || stack.getItem() != ItemAndBlockHolder.DROP || !stack.hasTagCompound()) {
return null;
@@ -139,6 +142,7 @@ public class ItemFluidDrop extends FCBaseItem {
return fluidStack;
}
@Nullable
public static IAEFluidStack getAeFluidStack(@Nullable IAEItemStack stack) {
if (stack == null) {
return null;
@@ -151,6 +155,7 @@ public class ItemFluidDrop extends FCBaseItem {
return fluidStack;
}
@Nullable
public static IAEItemStack newAeStack(@Nullable FluidStack fluid) {
if (fluid == null || fluid.amount <= 0) {
return null;
@@ -163,6 +168,7 @@ public class ItemFluidDrop extends FCBaseItem {
return stack;
}
@Nullable
public static IAEItemStack newAeStack(@Nullable IAEFluidStack fluid) {
if (fluid == null || fluid.getStackSize() <= 0) {
return null;
src/main/java/com/glodblock/github/common/item/ItemFluidPacket.java
+5
View File
@@ -34,6 +34,7 @@ public class ItemFluidPacket extends FCBaseItem {
setMaxStackSize(1);
}
@Nullable
public static FluidStack getFluidStack(ItemStack stack) {
if (stack == null || !stack.hasTagCompound()) {
return null;
@@ -82,10 +83,12 @@ public class ItemFluidPacket extends FCBaseItem {
}
}
@Nullable
public static FluidStack getFluidStack(@Nullable IAEItemStack stack) {
return stack != null ? getFluidStack(stack.getItemStack()) : null;
}
@Nullable
public static ItemStack newStack(@Nullable FluidStack fluid) {
if (fluid == null || fluid.amount == 0) {
return null;
@@ -99,6 +102,7 @@ public class ItemFluidPacket extends FCBaseItem {
return stack;
}
@Nullable
public static ItemStack newStack(@Nullable IAEFluidStack fluid) {
if (fluid == null || fluid.getStackSize() == 0) {
return null;
@@ -106,6 +110,7 @@ public class ItemFluidPacket extends FCBaseItem {
return newStack(fluid.getFluidStack());
}
@Nullable
public static ItemStack newDisplayStack(@Nullable FluidStack fluid) {
if (fluid == null) {
return null;
src/main/java/com/glodblock/github/nei/FCStackStringifyHandler.java
+1
View File
@@ -25,6 +25,7 @@ public class FCStackStringifyHandler implements IStackStringifyHandler {
public FluidStack getFluid(ItemStack item) {
if (item.getItem() instanceof ItemFluidDrop) {
FluidStack fluid = ItemFluidDrop.getFluidStack(item);
if (fluid == null) return null;
fluid.amount /= Math.max(item.stackSize, 1);
return fluid;
} else if (item.getItem() instanceof ItemFluidPacket) {