diff options
| author | miozune <miozune@gmail.com> | 2023-10-13 17:59:39 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 10:59:39 +0200 |
| commit | 4c8b94dd91fa5e16534d48415d5a4f75ea0bbb6f (patch) | |
| tree | b9222d444b42514e265640aab7c3488816ddccd8 /src/main/java/gregtech/common/tileentities/machines/multi | |
| parent | b43e65f3784a7978656a4e2a72a2734b37d7b735 (diff) | |
| download | GT5-Unofficial-4c8b94dd91fa5e16534d48415d5a4f75ea0bbb6f.tar.gz GT5-Unofficial-4c8b94dd91fa5e16534d48415d5a4f75ea0bbb6f.tar.bz2 GT5-Unofficial-4c8b94dd91fa5e16534d48415d5a4f75ea0bbb6f.zip | |
Fix Stocking Bus bug (#2326)
* Shut down machine with message if stocking bus fail to extract items
* Better way to handle message persistent on shutdown
* Minor cleanup
* Allow more localizations
* Add network status display
* Fix auto-pull mode accepting shift insert
* Remove workaround for issue with multiple ME buses in a multiblock
* Some tweak for appearance
* Correct inconsistent variable naming in GT_UITextures
* Update .gitignore
* Fix typo
* Remove isScheduledForResetCheckRecipeResult by using persistsOnShutdown
* Apply "cannot set slot" tooltip for empty slots too
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
2 files changed, 10 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index 6470065923..e884922710 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -845,9 +845,10 @@ public abstract class GT_MetaTileEntity_DrillerBase .setBackground(() -> { if (mChunkLoadingEnabled) { return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED, - GT_UITextures.OVERLAY_CHUNK_LOADING }; + GT_UITextures.OVERLAY_BUTTON_CHUNK_LOADING }; } - return new IDrawable[] { GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_CHUNK_LOADING_OFF }; + return new IDrawable[] { GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_CHUNK_LOADING_OFF }; }) .attachSyncer( new FakeSyncWidget.BooleanSyncer( @@ -869,9 +870,10 @@ public abstract class GT_MetaTileEntity_DrillerBase .setBackground(() -> { if (workState == STATE_ABORT) { return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED, - GT_UITextures.OVERLAY_RETRACT_PIPE, GT_UITextures.OVERLAY_BUTTON_LOCKED }; + GT_UITextures.OVERLAY_BUTTON_RETRACT_PIPE, GT_UITextures.OVERLAY_BUTTON_LOCKED }; } - return new IDrawable[] { GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_RETRACT_PIPE }; + return new IDrawable[] { GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_RETRACT_PIPE }; }) .attachSyncer( new FakeSyncWidget.IntegerSyncer(() -> workState, (newInt) -> workState = newInt), diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java index a48bb1dee8..935c8c0032 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java @@ -638,7 +638,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile (ButtonWidget) new GT_LockedWhileActiveButton(this.getBaseMetaTileEntity(), builder) .setOnClick((clickData, widget) -> adjustChunkRadius(clickData.mouseButton == 0)) .setPlayClickSound(true) - .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_WORK_AREA) + .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_WORK_AREA) .attachSyncer( new FakeSyncWidget.IntegerSyncer(() -> chunkRadiusConfig, (val) -> chunkRadiusConfig = val), builder, @@ -657,9 +657,10 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile .setBackground(() -> { if (replaceWithCobblestone) { return new IDrawable[] { GT_UITextures.BUTTON_STANDARD_PRESSED, - GT_UITextures.OVERLAY_REPLACE_COBBLE_ON }; + GT_UITextures.OVERLAY_BUTTON_REPLACE_COBBLE_ON }; } - return new IDrawable[] { GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_REPLACE_COBBLE_OFF }; + return new IDrawable[] { GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_REPLACE_COBBLE_OFF }; }) .attachSyncer( new FakeSyncWidget.BooleanSyncer( |