99import net .minecraftforge .fluids .IFluidTank ;
1010
1111import codechicken .nei .recipe .StackInfo ;
12- import gregtech .api .util .GTUtility ;
1312
1413public class FluidInteractions {
1514
@@ -24,27 +23,14 @@ public static FluidStack getFluidForItem(ItemStack itemStack) {
2423 if (fluidStack == null && ModularUI .Mods .NEI .isLoaded ()) {
2524 fluidStack = StackInfo .getFluid (itemStack );
2625 }
27- if (fluidStack == null && ModularUI .Mods .GT5U .isLoaded ()) {
28- fluidStack = GTUtility .getFluidForFilledItem (itemStack , false );
29- }
3026 return fluidStack ;
3127 }
3228
3329 public static ItemStack getFullFluidContainer (ItemStack itemStack , FluidStack fluidToFill ) {
34- ItemStack filledContainer = null ;
35-
36- if (ModularUI .Mods .GT5U .isLoaded ()) {
37- filledContainer = GTUtility .fillFluidContainer (fluidToFill , itemStack , false , false );
38- }
39-
40- if (filledContainer == null && itemStack .getItem () instanceof IFluidContainerItem container ) {
30+ if (itemStack .getItem () instanceof IFluidContainerItem container ) {
4131 FluidStack containerFluid = container .getFluid (itemStack );
4232 int containerFluidAmount = containerFluid != null ? containerFluid .amount : 0 ;
4333
44- if (containerFluid != null && containerFluid .getFluid () != fluidToFill .getFluid ()) {
45- return null ;
46- }
47-
4834 ItemStack copyStack = itemStack .copy ();
4935 int filled = container .fill (copyStack , fluidToFill , true );
5036
@@ -55,27 +41,20 @@ public static ItemStack getFullFluidContainer(ItemStack itemStack, FluidStack fl
5541 return null ;
5642 }
5743
58- if (filledContainer == null ) {
59- filledContainer = FluidContainerRegistry .fillFluidContainer (fluidToFill , itemStack );
60- }
61-
62- return filledContainer ;
44+ return FluidContainerRegistry .fillFluidContainer (fluidToFill , itemStack );
6345 }
6446
6547 public static ItemStack getEmptyFluidContainer (ItemStack itemStack ) {
66- if (ModularUI . Mods . GT5U . isLoaded () ) {
67- ItemStack stack = GTUtility . getContainerForFilledItem (itemStack , false );
68- if (stack ! = null ) {
69- return stack ;
48+ if (itemStack . getItem () instanceof IFluidContainerItem container ) {
49+ FluidStack fluidStack = container . getFluid (itemStack );
50+ if (fluidStack = = null ) {
51+ return null ;
7052 }
71- }
7253
73- if (itemStack .getItem () instanceof IFluidContainerItem container ) {
7454 ItemStack stack = itemStack .copy ();
75- FluidStack fluidStack = container .getFluid (itemStack );
7655 FluidStack drained = container .drain (stack , Integer .MAX_VALUE , true );
7756
78- if (drained == null || fluidStack == null || drained .amount < fluidStack .amount ) {
57+ if (drained == null || drained .amount < fluidStack .amount ) {
7958 return null ;
8059 }
8160 return stack ;
0 commit comments