From c2c2f14596de7995abd655f0342f47e2e9b2781d Mon Sep 17 00:00:00 2001 From: Caedis Date: Wed, 10 Jul 2024 14:06:07 -0500 Subject: [PATCH] Convert to threadsafe molten metal list (#120) * Convert to threadsafe molten metal list * back to foreach * wrap in sync bloc --- .../tconstruct/library/crafting/AlloyMix.java | 2 +- .../tconstruct/library/crafting/Smeltery.java | 2 +- .../smeltery/logic/SmelteryLogic.java | 3 +- .../smeltery/model/SmelteryRender.java | 83 ++++++++++--------- 4 files changed, 47 insertions(+), 43 deletions(-) diff --git a/src/main/java/tconstruct/library/crafting/AlloyMix.java b/src/main/java/tconstruct/library/crafting/AlloyMix.java index 96e868ef..2bcb2d5c 100644 --- a/src/main/java/tconstruct/library/crafting/AlloyMix.java +++ b/src/main/java/tconstruct/library/crafting/AlloyMix.java @@ -19,7 +19,7 @@ public class AlloyMix { * public boolean matches(List liquids) { ArrayList list = new ArrayList(mixers); return false; } */ - public FluidStack mix(ArrayList liquids) { + public FluidStack mix(List liquids) { ArrayList copyMix = new ArrayList<>(mixers); ArrayList effectiveAmount = new ArrayList<>(); diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index 2297641e..b4f43d81 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -171,7 +171,7 @@ public class Smeltery { return instance.renderIndex.get(new ItemMetaWrapper(input)); } - public static ArrayList mixMetals(ArrayList moltenMetal) { + public static ArrayList mixMetals(List moltenMetal) { ArrayList liquids = new ArrayList<>(); for (AlloyMix alloy : instance.alloys) { FluidStack liquid = alloy.mix(moltenMetal); diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index 98ac3529..9da553ed 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -1,6 +1,7 @@ package tconstruct.smeltery.logic; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Random; @@ -82,7 +83,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci public int[] meltingTemps; // values are multiplied by 10 private int tick; - public ArrayList moltenMetal = new ArrayList<>(); + public final List moltenMetal = Collections.synchronizedList(new ArrayList<>()); public int maxLiquid; public int currentLiquid; diff --git a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java index d4f85671..01d1d078 100644 --- a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java +++ b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java @@ -59,50 +59,53 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler { float base = 0F; int yBase = 0; int liquidBase = 0; - for (FluidStack liquid : logic.moltenMetal) { - int liquidSize = liquid.amount; - while (liquidSize > 0) { - int cap = logic.getCapacityPerLayer(); - int room = cap - liquidBase; - int countSize = Math.min(liquidSize, room); - liquidSize -= countSize; - float height = countSize > cap ? 1.0F : (float) countSize / (float) cap; - float renderBase = base; - float renderHeight = height + base; - base += height; - liquidBase += countSize; + synchronized (logic.moltenMetal) { + for (FluidStack liquid : logic.moltenMetal) { + int liquidSize = liquid.amount; + while (liquidSize > 0) { + int cap = logic.getCapacityPerLayer(); + int room = cap - liquidBase; + int countSize = Math.min(liquidSize, room); + liquidSize -= countSize; - if (renderHeight < 0.01) renderHeight = 0.01f; + float height = countSize > cap ? 1.0F : (float) countSize / (float) cap; + float renderBase = base; + float renderHeight = height + base; + base += height; + liquidBase += countSize; - renderer.setRenderBounds(0, renderBase, 0, 1, renderHeight, 1); - Fluid fluid = liquid.getFluid(); - for (int xi = from.x; xi <= to.x; xi++) for (int zi = from.z; zi <= to.z; zi++) { - float minX = xi == from.x ? -0.001F : 0F; - float minZ = zi == from.z ? -0.001F : 0F; - float maxX = xi == to.x ? 1.001F : 1F; - float maxZ = zi == to.z ? 1.001F : 1F; - renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); - if (fluid.canBePlacedInWorld()) BlockSkinRenderHelper - .renderMetadataBlock(fluid.getBlock(), 0, xi, from.y + yBase, zi, renderer, world); - else BlockSkinRenderHelper.renderLiquidBlock( - fluid.getStillIcon(), - fluid.getFlowingIcon(), - xi, - from.y + yBase, - zi, - renderer, - world, - false, - fluid.getColor(liquid)); + if (renderHeight < 0.01) renderHeight = 0.01f; + + renderer.setRenderBounds(0, renderBase, 0, 1, renderHeight, 1); + Fluid fluid = liquid.getFluid(); + for (int xi = from.x; xi <= to.x; xi++) for (int zi = from.z; zi <= to.z; zi++) { + float minX = xi == from.x ? -0.001F : 0F; + float minZ = zi == from.z ? -0.001F : 0F; + float maxX = xi == to.x ? 1.001F : 1F; + float maxZ = zi == to.z ? 1.001F : 1F; + renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); + if (fluid.canBePlacedInWorld()) BlockSkinRenderHelper + .renderMetadataBlock(fluid.getBlock(), 0, xi, from.y + yBase, zi, renderer, world); + else BlockSkinRenderHelper.renderLiquidBlock( + fluid.getStillIcon(), + fluid.getFlowingIcon(), + xi, + from.y + yBase, + zi, + renderer, + world, + false, + fluid.getColor(liquid)); + } + + if (countSize == room) { + base = 0F; + yBase++; + liquidBase = 0; + } + ret = true; } - - if (countSize == room) { - base = 0F; - yBase++; - liquidBase = 0; - } - ret = true; } } }