aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-05-08 18:27:35 +0900
committerGitHub <noreply@github.com>2023-05-08 11:27:35 +0200
commit08a022a07cbc3b70ebfde85eb67cf1f914543d90 (patch)
treedd1e734f0cb3b42b081079a1ed1f537c13ccbff1
parentb709f5355c6b1680460d385d56f832fe993efcac (diff)
downloadGT5-Unofficial-08a022a07cbc3b70ebfde85eb67cf1f914543d90.tar.gz
GT5-Unofficial-08a022a07cbc3b70ebfde85eb67cf1f914543d90.tar.bz2
GT5-Unofficial-08a022a07cbc3b70ebfde85eb67cf1f914543d90.zip
Migrate to FluidSlotWidget (#321)
* Migrate to FluidSlotWidget * Update dependencies Former-commit-id: d5838d0e19b18af0c8fc60a1c50773c4b0a10461
-rw-r--r--dependencies.gradle2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_CompressedFluidHatch.java7
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_HumongousInputHatch.java6
3 files changed, 5 insertions, 10 deletions
diff --git a/dependencies.gradle b/dependencies.gradle
index f3860503c5..8b53649112 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,7 +1,7 @@
// Add your dependencies here
dependencies {
- api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.12:dev')
+ api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.20:dev')
api("com.github.GTNewHorizons:TecTech:5.2.4:dev")
implementation("com.github.GTNewHorizons:TinkersConstruct:1.9.30-GTNH:dev")
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_CompressedFluidHatch.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_CompressedFluidHatch.java
index b217d29445..b8331c93f9 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_CompressedFluidHatch.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_CompressedFluidHatch.java
@@ -15,13 +15,14 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.tiered;
import net.minecraftforge.fluids.FluidStack;
+import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
+
import gregtech.api.enums.Materials;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
import gregtech.api.util.GT_Utility;
-import gregtech.common.gui.modularui.widget.FluidDisplaySlotWidget;
public class GT_MetaTileEntity_CompressedFluidHatch extends GT_MetaTileEntity_Hatch_Input {
@@ -55,7 +56,7 @@ public class GT_MetaTileEntity_CompressedFluidHatch extends GT_MetaTileEntity_Ha
}
@Override
- protected FluidDisplaySlotWidget createDrainableFluidSlot() {
- return super.createDrainableFluidSlot().setEmptyCanFillFilter(f -> f == Materials.LiquidAir.mFluid);
+ protected FluidSlotWidget createFluidSlot() {
+ return super.createFluidSlot().setFilter(f -> f == Materials.LiquidAir.mFluid);
}
}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_HumongousInputHatch.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_HumongousInputHatch.java
index 2951c12d05..a5281e1b6a 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_HumongousInputHatch.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_HumongousInputHatch.java
@@ -17,7 +17,6 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.common.gui.modularui.widget.FluidDisplaySlotWidget;
public class GT_MetaTileEntity_HumongousInputHatch extends GT_MetaTileEntity_Hatch_Input {
@@ -44,9 +43,4 @@ public class GT_MetaTileEntity_HumongousInputHatch extends GT_MetaTileEntity_Hat
this.mDescriptionArray,
this.mTextures);
}
-
- @Override
- protected FluidDisplaySlotWidget createDrainableFluidSlot() {
- return super.createDrainableFluidSlot();
- }
}