diff --git a/adapters/fabric/build.gradle b/adapters/fabric/build.gradle index 264e015b1..903128853 100644 --- a/adapters/fabric/build.gradle +++ b/adapters/fabric/build.gradle @@ -56,7 +56,7 @@ apply from: file('../../gradle/volmlib-stamp.gradle') Properties rootProperties = new Properties() file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) } -String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.2-26.2')) +String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.3.0-26.2')) String minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.3')) String fabricLoaderVersion = providers.gradleProperty('fabricLoaderVersion').getOrElse(rootProperties.getProperty('fabricLoaderVersion', '0.19.5')) Closure irisArtifactName = { String platform, String targetVersion -> diff --git a/adapters/forge/build.gradle b/adapters/forge/build.gradle index cae2d8269..6e1add753 100644 --- a/adapters/forge/build.gradle +++ b/adapters/forge/build.gradle @@ -56,7 +56,7 @@ apply from: file('../../gradle/volmlib-stamp.gradle') Properties rootProperties = new Properties() file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) } -String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.2-26.2')) +String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.3.0-26.2')) String minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.3')) String forgeVersion = providers.gradleProperty('forgeVersion').getOrElse(rootProperties.getProperty('forgeVersion', '26.3-66.0.8')) Closure loaderDisplayVersion = { String loaderVersion -> diff --git a/adapters/neoforge/build.gradle b/adapters/neoforge/build.gradle index 0ffff3760..8d03ca16b 100644 --- a/adapters/neoforge/build.gradle +++ b/adapters/neoforge/build.gradle @@ -56,7 +56,7 @@ apply from: file('../../gradle/volmlib-stamp.gradle') Properties rootProperties = new Properties() file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) } -String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.2-26.2')) +String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.3.0-26.2')) String minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.3')) String neoForgeVersion = providers.gradleProperty('neoForgeVersion').getOrElse(rootProperties.getProperty('neoForgeVersion', '26.3.0.33-beta')) Closure irisArtifactName = { String platform, String targetVersion -> diff --git a/build.gradle b/build.gradle index 0fb075442..9decb4507 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ interface IrisFileOperations { IrisFileOperations irisFileOperations = objects.newInstance(IrisFileOperations) group = 'art.arcane' -version = providers.gradleProperty('irisVersion').getOrElse('4.1.2-26.2') +version = providers.gradleProperty('irisVersion').getOrElse('4.3.0-26.2') project(':core') { group = 'art.arcane' diff --git a/core/src/test/java/art/arcane/iris/world/pregen/AsyncPregenServerSaveOwnershipTest.java b/core/src/test/java/art/arcane/iris/world/pregen/AsyncPregenServerSaveOwnershipTest.java index 446ec3bd3..45117342b 100644 --- a/core/src/test/java/art/arcane/iris/world/pregen/AsyncPregenServerSaveOwnershipTest.java +++ b/core/src/test/java/art/arcane/iris/world/pregen/AsyncPregenServerSaveOwnershipTest.java @@ -351,7 +351,9 @@ public class AsyncPregenServerSaveOwnershipTest { } }, 10, 1_000_000, 0, 0, 127, 0); fixture.set("retention", retention); - try (SchedulingContext context = new SchedulingContext(fixture)) { + try (SchedulingContext context = new SchedulingContext(fixture); + MockedStatic pressure = mockStatic(MantleHeapPressure.class)) { + pressure.when(MantleHeapPressure::overHighWater).thenReturn(false); for (int region = 0; region < 128; region++) { long key = (long) region << 32; retention.retainAround(region << 5, 0); @@ -376,7 +378,9 @@ public class AsyncPregenServerSaveOwnershipTest { Fixture fixture = new Fixture(); AtomicInteger pendingChunks = new AtomicInteger(2); fixture.pendingRegions.put(0L, pendingChunks); - try (SchedulingContext context = new SchedulingContext(fixture)) { + try (SchedulingContext context = new SchedulingContext(fixture); + MockedStatic pressure = mockStatic(MantleHeapPressure.class)) { + pressure.when(MantleHeapPressure::overHighWater).thenReturn(false); CompletableFuture eviction = (CompletableFuture) invoke(fixture.method, "evictRegion", 0L); eviction.get(5L, TimeUnit.SECONDS); assertSame(pendingChunks, fixture.pendingRegions.get(0L)); diff --git a/gradle.properties b/gradle.properties index 46532118c..09164537f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ org.gradle.jvmargs=-Xmx3072m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF org.gradle.caching=true org.gradle.configureondemand=false -irisVersion=4.2.0-26.2 +irisVersion=4.3.0-26.2 minecraftVersion=26.3 # Bukkit plugin api-version: lowest supported Minecraft release line so one artifact loads on 26.1.2 through 26.3 apiVersion=26.1