diff options
4 files changed, 15 insertions, 18 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index eeb34c0a3b..af9083972e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,10 +1,10 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.41:dev') - api('com.github.GTNewHorizons:bartworks:0.7.8:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.60:dev') + api('com.github.GTNewHorizons:bartworks:0.7.15:dev') implementation('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - implementation('com.github.GTNewHorizons:GTplusplus:1.9.13:dev') + implementation('com.github.GTNewHorizons:GTplusplus:1.9.24:dev') compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.2-GTNH:dev') {transitive = false} diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java b/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java index 88cfd990b2..1dfdfa91eb 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java @@ -324,7 +324,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_LongPowerUsageBase< } @Override - protected boolean isInputSeparationButtonEnabled() { + public boolean supportsInputSeparation() { return true; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java index c27e679d07..640cafb774 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java @@ -10,6 +10,7 @@ import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static gregtech.api.util.GT_StructureUtility.ofFrame; import java.util.ArrayList; +import java.util.Collections; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -29,7 +30,6 @@ import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureUtility; -import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget; @@ -458,21 +458,19 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { super.addUIWidgets(builder, buildContext); builder.widget( - new CycleButtonWidget().setToggle(() -> mode % 2 == 0, val -> mode = val ? 0 : 1) - .setPlayClickSound(true).setVariableBackgroundGetter((state) -> { - if (state == 0) { - return new IDrawable[] { GT_UITextures.BUTTON_STANDARD, - GG_UITextures.OVERLAY_BUTTON_ASSEMBLER_MODE }; - } - return new IDrawable[] { GT_UITextures.BUTTON_STANDARD, - GG_UITextures.OVERLAY_BUTTON_PRECISE_MODE }; - }).setPos(80, 91).setSize(16, 16) - .addTooltip(StatCollector.translateToLocal("gui.PreciseAssembler.mode")) - .setTooltipShowUpDelay(TOOLTIP_DELAY)); + new CycleButtonWidget().setToggle(() -> mode == 1, val -> mode = val ? 1 : 0) + .setTextureGetter( + state -> state == 1 ? GG_UITextures.OVERLAY_BUTTON_ASSEMBLER_MODE + : GG_UITextures.OVERLAY_BUTTON_PRECISE_MODE) + .setBackground(GT_UITextures.BUTTON_STANDARD).setPos(80, 91).setSize(16, 16) + .dynamicTooltip( + () -> Collections + .singletonList(StatCollector.translateToLocal("preciseassembler.chat." + mode))) + .setUpdateTooltipEveryTick(true).setTooltipShowUpDelay(TOOLTIP_DELAY)); } @Override - protected boolean isInputSeparationEnabled() { + public boolean isInputSeparationEnabled() { return true; } } diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang index 1255a1ec24..9767bcfad1 100644 --- a/src/main/resources/assets/goodgenerator/lang/en_US.lang +++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang @@ -307,7 +307,6 @@ gui.YOTTank.button.void=Void Excess gui.YOTTank.button.locking=Fluid locking gui.LargeFusion.0=Energy Capacity: gui.LargeFusion.1=Stored Energy: -gui.PreciseAssembler.mode=Mode #NEI Info tile.recipe.naquadah_reactor=Large Naquadah Reactor |