Pre rewrite/fabric/1.21 dev remove chunk render task schematic lock

build.gradle

@@ -7,7 +7,7 @@ targetCompatibility = JavaVersion.VERSION_21
 
 repositories {
 	maven { url 'https://masa.dy.fi/maven' }
-	maven { url 'https://maven.terraformersmc.com/releases/' }
+	maven {	url 'https://maven.terraformersmc.com/releases/' }
 	// maven { url 'https://maven.quiltmc.org/repository/release/' }
 	maven { url 'https://jitpack.io' }
 }

src/main/java/fi/dy/masa/litematica/gui/GuiConfigs.java

@@ -2,6 +2,8 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+
 import fi.dy.masa.litematica.Reference;
 import fi.dy.masa.litematica.config.Configs;
 import fi.dy.masa.litematica.config.Hotkeys;
@@ -82,32 +84,14 @@ public List<ConfigOptionWrapper> getConfigs()
     {
         List<? extends IConfigBase> configs;
         ConfigGuiTab tab = DataManager.getConfigGuiTab();
-
-        if (tab == ConfigGuiTab.GENERIC)
-        {
-            configs = Configs.Generic.OPTIONS;
-        }
-        else if (tab == ConfigGuiTab.INFO_OVERLAYS)
-        {
-            configs = Configs.InfoOverlays.OPTIONS;
-        }
-        else if (tab == ConfigGuiTab.VISUALS)
-        {
-            configs = Configs.Visuals.OPTIONS;
-        }
-        else if (tab == ConfigGuiTab.COLORS)
-        {
-            configs = Configs.Colors.OPTIONS;
-        }
-        else if (tab == ConfigGuiTab.HOTKEYS)
-        {
-            configs = Hotkeys.HOTKEY_LIST;
-        }
-        else
-        {
-            return Collections.emptyList();
-        }
-
+        configs = switch (tab) {
+            case GENERIC -> Configs.Generic.OPTIONS;
+            case INFO_OVERLAYS -> Configs.InfoOverlays.OPTIONS;
+            case VISUALS -> Configs.Visuals.OPTIONS;
+            case COLORS -> Configs.Colors.OPTIONS;
+            case HOTKEYS -> Hotkeys.HOTKEY_LIST;
+            case RENDER_LAYERS -> Collections.emptyList();
+        };
         return ConfigOptionWrapper.createFor(configs);
     }
 
@@ -119,34 +103,21 @@ protected void onSettingsChanged()
         SchematicWorldRefresher.INSTANCE.updateAll();
     }
 
-    private static class ButtonListener implements IButtonActionListener
-    {
-        private final GuiConfigs parent;
-        private final ConfigGuiTab tab;
-
-        public ButtonListener(ConfigGuiTab tab, GuiConfigs parent)
-        {
-            this.tab = tab;
-            this.parent = parent;
-        }
+    private record ButtonListener(ConfigGuiTab tab, GuiConfigs parent) implements IButtonActionListener {
 
         @Override
-        public void actionPerformedWithButton(ButtonBase button, int mouseButton)
-        {
-            DataManager.setConfigGuiTab(this.tab);
-
-            if (this.tab != ConfigGuiTab.RENDER_LAYERS)
-            {
-                this.parent.reCreateListWidget(); // apply the new config width
-                this.parent.getListWidget().resetScrollbarPosition();
-                this.parent.initGui();
-            }
-            else
-            {
-                GuiBase.openGui(new GuiRenderLayer());
+            public void actionPerformedWithButton(ButtonBase button, int mouseButton) {
+                DataManager.setConfigGuiTab(this.tab);
+
+                if (this.tab != ConfigGuiTab.RENDER_LAYERS) {
+                    this.parent.reCreateListWidget(); // apply the new config width
+                    Objects.requireNonNull(this.parent.getListWidget()).resetScrollbarPosition();
+                    this.parent.initGui();
+                } else {
+                    GuiBase.openGui(new GuiRenderLayer());
+                }
             }
         }
-    }
 
     public enum ConfigGuiTab
     {

src/main/java/fi/dy/masa/litematica/materials/MaterialListSorter.java

@@ -1,7 +1,6 @@
 package fi.dy.masa.litematica.materials;
 
 import java.util.Comparator;
-import fi.dy.masa.litematica.materials.MaterialListBase.SortCriteria;
 
 public class MaterialListSorter implements Comparator<MaterialListEntry>
 {
@@ -15,23 +14,14 @@ public MaterialListSorter(MaterialListBase materialList)
     @Override
     public int compare(MaterialListEntry entry1, MaterialListEntry entry2)
     {
-        boolean reverse = this.materialList.getSortInReverse();
-        SortCriteria sortCriteria = this.materialList.getSortCriteria();
-        int nameCompare = entry1.getStack().getName().getString().compareTo(entry2.getStack().getName().getString());
-
-        if (sortCriteria == SortCriteria.COUNT_TOTAL)
-        {
-            return entry1.getCountTotal() == entry2.getCountTotal() ? nameCompare : ((entry1.getCountTotal() > entry2.getCountTotal()) != reverse ? -1 : 1);
-        }
-        else if (sortCriteria == SortCriteria.COUNT_MISSING)
-        {
-            return entry1.getCountMissing() == entry2.getCountMissing() ? nameCompare : ((entry1.getCountMissing() > entry2.getCountMissing()) != reverse ? -1 : 1);
-        }
-        else if (sortCriteria == SortCriteria.COUNT_AVAILABLE)
-        {
-            return entry1.getCountAvailable() == entry2.getCountAvailable() ? nameCompare : ((entry1.getCountAvailable() > entry2.getCountAvailable()) != reverse ? -1 : 1);
-        }
-
-        return reverse == false ? nameCompare * -1 : nameCompare;
+        int cmp = switch (this.materialList.getSortCriteria()) {
+            case COUNT_TOTAL -> entry1.getCountTotal() - entry2.getCountTotal();
+            case COUNT_MISSING -> entry1.getCountMissing() - entry2.getCountMissing();
+            case COUNT_AVAILABLE -> entry1.getCountAvailable() - entry2.getCountAvailable();
+            default -> 0;
+        };
+        if(cmp==0)
+            cmp = entry1.getStack().getName().getString().compareTo(entry2.getStack().getName().getString());
+        return this.materialList.getSortInReverse()? -cmp: cmp;
     }
 }

src/main/java/fi/dy/masa/litematica/render/BlockInfo.java

@@ -24,7 +24,6 @@ public class BlockInfo
     private final List<String> props;
     private final int totalWidth;
     private final int totalHeight;
-    private final int columnWidth;
 
     public BlockInfo(BlockState state, String titleKey)
     {
@@ -34,28 +33,26 @@ public BlockInfo(BlockState state, String titleKey)
         this.stack = ItemUtils.getItemForState(this.state);
 
         Identifier rl = Registries.BLOCK.getId(this.state.getBlock());
-        this.blockRegistryname = rl != null ? rl.toString() : "<null>";
+        this.blockRegistryname = rl.toString();
 
         this.stackName = this.stack.getName().getString();
 
         int w = StringUtils.getStringWidth(this.stackName) + 20;
         w = Math.max(w, StringUtils.getStringWidth(this.blockRegistryname));
         w = Math.max(w, StringUtils.getStringWidth(this.title));
-        this.columnWidth = w;
-
         this.props = BlockUtils.getFormattedBlockStateProperties(this.state, " = ");
-        this.totalWidth = this.columnWidth + 40;
+        this.totalWidth = w + 40;
         this.totalHeight = this.props.size() * (StringUtils.getFontHeight() + 2) + 60;
     }
 
     public int getTotalWidth()
     {
-        return this.totalWidth;
+        return totalWidth;
     }
 
     public int getTotalHeight()
     {
-        return this.totalHeight;
+        return totalHeight;
     }
 
     public void render(int x, int y, MinecraftClient mc, DrawContext drawContext)

src/main/java/fi/dy/masa/litematica/render/LitematicaRenderer.java

@@ -68,7 +68,7 @@ private void calculateFinishTime()
         }
         else
         {
-            this.finishTimeNano = System.nanoTime() + Math.max(1000000000L / fpsTarget / 2L, 0L);
+            this.finishTimeNano = System.nanoTime() + 1000000000L / fpsTarget / 2L;
         }
     }
 

src/main/java/fi/dy/masa/litematica/render/schematic/BufferBuilderCache.java

@@ -1,68 +1,58 @@
 package fi.dy.masa.litematica.render.schematic;
 
 import javax.annotation.Nonnull;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 import net.minecraft.client.render.BuiltBuffer;
 import net.minecraft.client.render.RenderLayer;
 
 public class BufferBuilderCache implements AutoCloseable
 {
-    private final Map<RenderLayer, BufferBuilderPatch> blockBufferBuilders = new HashMap<>();
-    private final Map<ChunkRendererSchematicVbo.OverlayRenderType, BufferBuilderPatch> overlayBufferBuilders = new HashMap<>();
+    private final ConcurrentHashMap<RenderLayer, BufferBuilderPatch> blockBufferBuilders = new ConcurrentHashMap<>();
+    private final Map<ChunkRendererSchematicVbo.OverlayRenderType, BufferBuilderPatch> overlayBufferBuilders = new ConcurrentHashMap<>();
 
     protected BufferBuilderCache() { }
 
     protected boolean hasBufferByLayer(RenderLayer layer)
     {
-        return this.blockBufferBuilders.containsKey(layer);
+        return blockBufferBuilders.containsKey(layer);
     }
 
     protected boolean hasBufferByOverlay(ChunkRendererSchematicVbo.OverlayRenderType type)
     {
-        return this.overlayBufferBuilders.containsKey(type);
+        return overlayBufferBuilders.containsKey(type);
     }
 
     protected BufferBuilderPatch getBufferByLayer(RenderLayer layer, @Nonnull BufferAllocatorCache allocators)
     {
-        if (this.hasBufferByLayer(layer) == false)
-        {
-            this.blockBufferBuilders.put(layer, new BufferBuilderPatch(allocators.getBufferByLayer(layer), layer.getDrawMode(), layer.getVertexFormat()));
-        }
-
-        return this.blockBufferBuilders.get(layer);
+        return blockBufferBuilders.computeIfAbsent(layer, (key) -> new BufferBuilderPatch(allocators.getBufferByLayer(key), key.getDrawMode(), key.getVertexFormat()));
     }
 
     protected BufferBuilderPatch getBufferByOverlay(ChunkRendererSchematicVbo.OverlayRenderType type, @Nonnull BufferAllocatorCache allocators)
     {
-        if (this.hasBufferByOverlay(type) == false)
-        {
-            this.overlayBufferBuilders.put(type, new BufferBuilderPatch(allocators.getBufferByOverlay(type), type.getDrawMode(), type.getVertexFormat()));
-        }
-
-        return this.overlayBufferBuilders.get(type);
-    }
-
-    private void clear(BufferBuilderPatch buffer)
-    {
-        try
-        {
-            BuiltBuffer built = buffer.endNullable();
-
-            if (built != null)
-            {
-                built.close();
-            }
-        }
-        catch (Exception ignored) { }
+        return overlayBufferBuilders.computeIfAbsent(type,(key) -> new BufferBuilderPatch(allocators.getBufferByOverlay(key), key.getDrawMode(), key.getVertexFormat()));
     }
 
     protected void clearAll()
     {
-        this.blockBufferBuilders.forEach((layer, buffer) -> this.clear(buffer));
-        this.overlayBufferBuilders.forEach((type, buffer) -> this.clear(buffer));
-        this.blockBufferBuilders.clear();
-        this.overlayBufferBuilders.clear();
+        ArrayList<BufferBuilderPatch> buffers;
+        synchronized (blockBufferBuilders) {
+            buffers = new ArrayList<>(blockBufferBuilders.values());
+            blockBufferBuilders.clear();
+        }
+        synchronized (overlayBufferBuilders) {
+            buffers.addAll(overlayBufferBuilders.values());
+            overlayBufferBuilders.clear();
+        }
+        for(BufferBuilderPatch buffer:buffers) {
+            try{
+                BuiltBuffer built = buffer.endNullable();
+                if(built!=null)
+                    built.close();
+            } catch (Exception ignored) {}
+        }
     }
 
     @Override