fix: attempt to fix issue with grid not loading items when loading

This commit is contained in:
raoulvdberge
2023-11-05 00:21:26 +01:00
parent e46046418f
commit 327c97b58d
7 changed files with 23 additions and 7 deletions

View File

@@ -43,3 +43,12 @@ dependencies {
// can't depend on API due to Javadoc build error (CuriosApi imports stuff from common) // 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") 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"
}
}
}

View File

@@ -70,7 +70,7 @@ public class GridFluidUpdateMessage {
grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters())); grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters()));
grid.getView().setCanCraft(message.canCraft); grid.getView().setCanCraft(message.canCraft);
grid.getView().setStacks(message.stacks); grid.getView().setStacks(message.stacks);
grid.getView().sort(); grid.getView().forceSort();
}); });
ctx.get().setPacketHandled(true); ctx.get().setPacketHandled(true);

View File

@@ -70,7 +70,7 @@ public class GridItemUpdateMessage {
grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters())); grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters()));
grid.getView().setCanCraft(message.canCraft); grid.getView().setCanCraft(message.canCraft);
grid.getView().setStacks(message.stacks); grid.getView().setStacks(message.stacks);
grid.getView().sort(); grid.getView().forceSort();
}); });
ctx.get().setPacketHandled(true); ctx.get().setPacketHandled(true);

View File

@@ -54,7 +54,7 @@ public class PortableGridFluidUpdateMessage {
BaseScreen.executeLater(GridScreen.class, grid -> { BaseScreen.executeLater(GridScreen.class, grid -> {
grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters())); grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters()));
grid.getView().setStacks(message.stacks); grid.getView().setStacks(message.stacks);
grid.getView().sort(); grid.getView().forceSort();
}); });
ctx.get().setPacketHandled(true); ctx.get().setPacketHandled(true);

View File

@@ -54,7 +54,7 @@ public class PortableGridItemUpdateMessage {
BaseScreen.executeLater(GridScreen.class, grid -> { BaseScreen.executeLater(GridScreen.class, grid -> {
grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters())); grid.setView(new GridViewImpl(grid, GridScreen.getDefaultSorter(), GridScreen.getSorters()));
grid.getView().setStacks(message.stacks); grid.getView().setStacks(message.stacks);
grid.getView().sort(); grid.getView().forceSort();
}); });
ctx.get().setPacketHandled(true); ctx.get().setPacketHandled(true);

View File

@@ -63,6 +63,11 @@ public class GridViewImpl implements IGridView {
return; return;
} }
forceSort();
}
@Override
public void forceSort() {
if (screen.getGrid().isGridActive()) { if (screen.getGrid().isGridActive()) {
this.stacks = map.values().stream() this.stacks = map.values().stream()
.filter(getActiveFilters()) .filter(getActiveFilters())

View File

@@ -26,6 +26,8 @@ public interface IGridView {
void sort(); void sort();
void forceSort();
void addDeltaListener(Consumer<IGridStack> listener); void addDeltaListener(Consumer<IGridStack> listener);
void removed(); void removed();