diff --git a/dependencies.gradle b/dependencies.gradle index 0b20dcb49..84ca833fa 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ dependencies { api('com.github.GTNewHorizons:BuildCraft:7.1.39:dev') implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.05:dev') implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.26-GTNH:dev') - implementation('com.github.GTNewHorizons:ModularUI2:2.1.1-1.7.10:dev') + implementation('com.github.GTNewHorizons:ModularUI2:2.1.2-1.7.10:dev') implementation('com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev') compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.20-GTNH:api') { transitive = false } diff --git a/src/main/java/logisticspipes/compat/ModularUIHelper.java b/src/main/java/logisticspipes/compat/ModularUIHelper.java index 4d7abfa6b..f9c296738 100644 --- a/src/main/java/logisticspipes/compat/ModularUIHelper.java +++ b/src/main/java/logisticspipes/compat/ModularUIHelper.java @@ -1,11 +1,8 @@ package logisticspipes.compat; -import java.util.function.Supplier; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.cleanroommc.modularui.api.drawable.IKey; import com.cleanroommc.modularui.drawable.UITexture; import com.cleanroommc.modularui.factory.TileEntityGuiFactory; @@ -23,8 +20,4 @@ public static void openPipeUI(EntityPlayer player, CoreUnroutedPipe pipe) { TileEntityGuiFactory.open(player, pipe.getX(), pipe.getY(), pipe.getZ()); } - - public static IKey reallyDynamicKey(Supplier keySupplier) { - return IKey.dynamic(() -> keySupplier.get().get()); - } } diff --git a/src/main/java/logisticspipes/pipes/PipeFluidSupplierMk2.java b/src/main/java/logisticspipes/pipes/PipeFluidSupplierMk2.java index 8dbaa9aee..451754e98 100644 --- a/src/main/java/logisticspipes/pipes/PipeFluidSupplierMk2.java +++ b/src/main/java/logisticspipes/pipes/PipeFluidSupplierMk2.java @@ -95,11 +95,10 @@ public void addUIWidgets(ModularPanel panel, PosGuiData data, PanelSyncManager s () -> this.requestPartials, value -> this.requestPartials = value)) .overlay( - ModularUIHelper.reallyDynamicKey( - () -> this.requestPartials ? IKey.lang( - "gui.fluidsuppliermk2.partial.yes") - : IKey.lang( - "gui.fluidsuppliermk2.partial.no"))) + IKey.lang( + () -> this.requestPartials + ? "gui.fluidsuppliermk2.partial.yes" + : "gui.fluidsuppliermk2.partial.no")) .tooltipBuilder((tooltip -> { tooltip.addLine( IKey.lang("gui.fluidsuppliermk2.partial.tip"));