status commit

build.gradle

@@ -86,8 +86,8 @@ dependencies {
 
     implementation fg.deobf("curse.maven:markdownmanual-502485:3738124")
 
-    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:9.7.0.180:api")
-    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:9.7.0.180")
+    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:13.1.0.6:api")
+    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:13.1.0.6")
 
     testImplementation "org.mockito:mockito-inline:4.3.1"
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2"
@@ -176,6 +176,7 @@ jar {
             "Implementation-Vendor"   : "Sangar",
             "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
             "MixinConfigs"            : "mixins.oc2.json",
+            "ContainedDeps"           : "commons-collections4-4.4.jar"
         ])
     }
 }

gradle.properties

@@ -3,8 +3,8 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-forge_version=40.1.68
+forge_version=43.2.0
 
-semver=0.0.0
+semver=1.0.15
 
 curse_project_id=437654

minecraft.gradle

@@ -1,4 +1,4 @@
 ext {
-    minecraft_version = '1.18.2'
+    minecraft_version = '1.19.4'
     minecraft_sdk = 'forge'
 }

src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java

@@ -20,6 +20,7 @@ import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Queue;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.stream.Stream;
 
 public final class VxlanBlockEntity extends ModBlockEntity implements NetworkInterface, TickableBlockEntity {
@@ -29,7 +30,7 @@ public final class VxlanBlockEntity extends ModBlockEntity implements NetworkInt
     private int frameCount;
     private long lastGameTime;
 
-    private final Queue<byte[]> packetQueue = QueueUtils.synchronizedQueue(new CircularFifoQueue<>(32));
+    private final Queue<byte[]> packetQueue = new ArrayBlockingQueue<byte[]>(32);
 
     ///////////////////////////////////////////////////////////////////
 

src/main/java/li/cil/oc2/common/vm/provider/PciRootPortDeviceProvider.java

@@ -24,10 +24,8 @@ public final class PciRootPortDeviceProvider implements DeviceTreeProvider {
     public Optional<DeviceTree> createNode(final DeviceTree root, final MemoryMap memoryMap, final Device device, final String deviceName) {
         final Optional<MappedMemoryRange> range = memoryMap.getMemoryRange((MemoryMappedDevice) device);
         return range.map(r -> {
-            final DeviceTree chosen = root.find("/soc");
-            //chosen.addProp(DevicePropertyNames.RANGES);
-
-            return chosen.getChild(deviceName, r.address());
+            final DeviceTree pci = root.find("/pci");
+            return pci.getChild(deviceName, r.address());
         });
     }
 

src/main/resources/META-INF/libraries/commons-collections4-4.4.jar.meta

@@ -0,0 +1 @@
+Maven-Artifact: org.apache.commons:commons-collections4:4.4