From 327c97b58d13c152ea58b8fc53cf6ff08f47c51d Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 5 Nov 2023 00:21:26 +0100 Subject: [PATCH] fix: attempt to fix issue with grid not loading items when loading --- build.gradle | 9 +++++++++ .../network/grid/GridFluidUpdateMessage.java | 2 +- .../network/grid/GridItemUpdateMessage.java | 2 +- .../network/grid/PortableGridFluidUpdateMessage.java | 2 +- .../network/grid/PortableGridItemUpdateMessage.java | 2 +- .../refinedstorage/screen/grid/view/GridViewImpl.java | 11 ++++++++--- .../refinedstorage/screen/grid/view/IGridView.java | 2 ++ 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 665e633f0..bfceca683 100755 --- a/build.gradle +++ b/build.gradle @@ -43,3 +43,12 @@ dependencies { // can't depend on API due to Javadoc build error (CuriosApi imports stuff from common) compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:5.2.0-beta.3+1.20.1") } + +minecraft { + runs { + client { + property 'mixin.env.remapRefMap', 'true' + property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" + } + } +} \ No newline at end of file diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java index cf4198a8b..d37d35a03 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidUpdateMessage.java @@ -70,7 +70,7 @@ public class GridFluidUpdateMessage { grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters())); grid.getView().setCanCraft(message.canCraft); grid.getView().setStacks(message.stacks); - grid.getView().sort(); + grid.getView().forceSort(); }); ctx.get().setPacketHandled(true); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java index c5b263804..3439e4513 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemUpdateMessage.java @@ -70,7 +70,7 @@ public class GridItemUpdateMessage { grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters())); grid.getView().setCanCraft(message.canCraft); grid.getView().setStacks(message.stacks); - grid.getView().sort(); + grid.getView().forceSort(); }); ctx.get().setPacketHandled(true); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java index a9dc43f5c..e179f9169 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridFluidUpdateMessage.java @@ -54,7 +54,7 @@ public class PortableGridFluidUpdateMessage { BaseScreen.executeLater(GridScreen.class, grid -> { grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters())); grid.getView().setStacks(message.stacks); - grid.getView().sort(); + grid.getView().forceSort(); }); ctx.get().setPacketHandled(true); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridItemUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridItemUpdateMessage.java index f7e52b4de..e816c4535 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridItemUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridItemUpdateMessage.java @@ -54,7 +54,7 @@ public class PortableGridItemUpdateMessage { BaseScreen.executeLater(GridScreen.class, grid -> { grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters())); grid.getView().setStacks(message.stacks); - grid.getView().sort(); + grid.getView().forceSort(); }); ctx.get().setPacketHandled(true); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/GridViewImpl.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/GridViewImpl.java index 1600b836a..e3f44393c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/GridViewImpl.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/GridViewImpl.java @@ -63,11 +63,16 @@ public class GridViewImpl implements IGridView { return; } + forceSort(); + } + + @Override + public void forceSort() { if (screen.getGrid().isGridActive()) { this.stacks = map.values().stream() - .filter(getActiveFilters()) - .sorted(getActiveSort()) - .collect(Collectors.toCollection(ArrayList::new)); + .filter(getActiveFilters()) + .sorted(getActiveSort()) + .collect(Collectors.toCollection(ArrayList::new)); this.active = true; } else { this.stacks = new ArrayList<>(); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/IGridView.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/IGridView.java index bd4aa145c..0a6788836 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/IGridView.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/IGridView.java @@ -26,6 +26,8 @@ public interface IGridView { void sort(); + void forceSort(); + void addDeltaListener(Consumer listener); void removed();