-1.19.2 Backport fix to prevent concurrent modification exception whe…

…n updating voxel shapes(#133).

-Fix issue with persistent redstone signal on panel of different orientation if one panel is removed.
-Make silicon compound recipe shapeless (#122) and allow any sand.
-added tinyredstone:redstone_panel to list of blocks to treat as wires to prevent blocks of different orientations from causing orphaned signals (#123).

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'net.minecraftforge.gradle' version '5.1.+'
 }
 
-version = '1.19.2-4.1.4'
+version = '1.19.2-4.1.6'
 group = 'com.dannyandson.tinyredstone' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'tinyredstone'
 
@@ -139,7 +139,7 @@ dependencies {
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft 'net.minecraftforge:forge:1.19.2-43.1.1'
 
-    //implementation fg.deobf('curse.maven:jei-238222:3696757')
+    implementation fg.deobf('curse.maven:jei-238222:4615177')
     implementation fg.deobf('curse.maven:theoneprobe-245211:3871444')
     //implementation fg.deobf('curse.maven:jade-324717:3824831')
 

src/main/java/com/dannyandson/tinyredstone/Config.java

@@ -50,7 +50,7 @@ public class Config {
         ALLOW_WORLD_PLACEMENT = SERVER_BUILDER.comment("Allow components to be placed anywhere, not just on panels. (default: true)")
                 .define("allow_world_placement",true);
 
-        List<String> redstoneWires = new ArrayList<>(Arrays.asList("redstonepen:track", "cb_multipart:multipart", "cyclic:clock"));
+        List<String> redstoneWires = new ArrayList<>(Arrays.asList("redstonepen:track", "cb_multipart:multipart", "cyclic:clock", "tinyredstone:redstone_panel"));
         REDSTONE_WIRE_LIST = SERVER_BUILDER.comment("List of blocks from other mods to be treated as redstone wire.")
                         .define("redstone_wires",redstoneWires);
 

src/main/java/com/dannyandson/tinyredstone/blocks/PanelTile.java

@@ -1419,7 +1419,8 @@ private void updateVoxelShape()
             } else //we have no base, but we do have cells
                 voxelShape = Shapes.empty();
 
-            for (Integer index : cells.keySet()) {
+            Set<Integer> cellkeys = new HashSet<>(cells.keySet());
+            for (Integer index : cellkeys) {
                 PanelCellPos cellPos = PanelCellPos.fromIndex(this, index);
                 VoxelShape cellVoxelShape = getCellVoxelShape(cellPos);
                 if (cellVoxelShape != null)

src/main/resources/data/tinyredstone/recipes/silicon.json

@@ -1,5 +1,5 @@
 {
-  "type": "blasting",
+  "type": "minecraft:smelting",
   "ingredient": {
     "item": "tinyredstone:silicon_compound"
   },

src/main/resources/data/tinyredstone/recipes/silicon_compound.json

@@ -1,20 +1,16 @@
 {
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "SQ",
-    "C "
-  ],
-  "key": {
-    "S": {
-      "item": "minecraft:sand"
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "tag": "minecraft:sand"
     },
-    "Q": {
+    {
       "item": "minecraft:quartz"
     },
-    "C": {
+    {
       "item": "minecraft:charcoal"
     }
-  },
+  ],
   "result": {
     "item": "tinyredstone:silicon_compound",
     "count": 2