From f4f6557f2c8b776bf14be3538edfbc4463d10105 Mon Sep 17 00:00:00 2001 From: Nadja Reitzenstein Date: Sun, 24 Mar 2024 16:52:46 +0100 Subject: [PATCH] status commit --- build.gradle | 5 +++-- gradle.properties | 4 ++-- minecraft.gradle | 2 +- .../li/cil/oc2/common/blockentity/VxlanBlockEntity.java | 3 ++- .../oc2/common/vm/provider/PciRootPortDeviceProvider.java | 6 ++---- .../META-INF/libraries/commons-collections4-4.4.jar.meta | 1 + 6 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/META-INF/libraries/commons-collections4-4.4.jar.meta diff --git a/build.gradle b/build.gradle index 07de11c4..a50982c9 100644 --- a/build.gradle +++ b/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" ]) } } diff --git a/gradle.properties b/gradle.properties index 3dc993a9..8af4161c 100644 --- a/gradle.properties +++ b/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 diff --git a/minecraft.gradle b/minecraft.gradle index 03af5590..1cdd335a 100644 --- a/minecraft.gradle +++ b/minecraft.gradle @@ -1,4 +1,4 @@ ext { - minecraft_version = '1.18.2' + minecraft_version = '1.19.4' minecraft_sdk = 'forge' } diff --git a/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java index 7ef030d8..63778158 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java +++ b/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 packetQueue = QueueUtils.synchronizedQueue(new CircularFifoQueue<>(32)); + private final Queue packetQueue = new ArrayBlockingQueue(32); /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/vm/provider/PciRootPortDeviceProvider.java b/src/main/java/li/cil/oc2/common/vm/provider/PciRootPortDeviceProvider.java index d13690db..514af517 100644 --- a/src/main/java/li/cil/oc2/common/vm/provider/PciRootPortDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/vm/provider/PciRootPortDeviceProvider.java @@ -24,10 +24,8 @@ public final class PciRootPortDeviceProvider implements DeviceTreeProvider { public Optional createNode(final DeviceTree root, final MemoryMap memoryMap, final Device device, final String deviceName) { final Optional 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()); }); } diff --git a/src/main/resources/META-INF/libraries/commons-collections4-4.4.jar.meta b/src/main/resources/META-INF/libraries/commons-collections4-4.4.jar.meta new file mode 100644 index 00000000..7f6c74b1 --- /dev/null +++ b/src/main/resources/META-INF/libraries/commons-collections4-4.4.jar.meta @@ -0,0 +1 @@ +Maven-Artifact: org.apache.commons:commons-collections4:4.4