From 96a384c09cebeb9c39f748b9cd8d3a41b0c25829 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Wed, 18 Jun 2025 11:51:09 +0200 Subject: [PATCH] fix modern tile states not applying --- build.gradle.kts | 1 + .../main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java | 2 +- .../main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java | 2 +- .../main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java | 2 +- .../main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java | 2 +- .../main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java | 2 +- .../main/java/com/volmit/iris/core/nms/v1_21_R2/NMSBinding.java | 2 +- .../main/java/com/volmit/iris/core/nms/v1_21_R3/NMSBinding.java | 2 +- .../main/java/com/volmit/iris/core/nms/v1_21_R4/NMSBinding.java | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bdccca70d..91007d4db 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -90,6 +90,7 @@ nmsBindings.forEach { key, value -> dependencies { compileOnly(project(":core")) + compileOnly(project(":scheduler")) compileOnly("org.jetbrains:annotations:26.0.2") } } diff --git a/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java b/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java index 8f974008b..b0f332d2e 100644 --- a/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java +++ b/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java @@ -211,7 +211,7 @@ public class NMSBinding implements INMSBinding { net.minecraft.nbt.CompoundTag tag = (net.minecraft.nbt.CompoundTag) convertToTag(map, 0, 64); var level = ((CraftWorld) pos.getWorld()).getHandle(); var blockPos = new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()); - J.s(() -> merge(level, blockPos, tag)); + Iris.scheduler.region().run(pos, () -> merge(level, blockPos, tag)); } private void merge(ServerLevel level, BlockPos blockPos, net.minecraft.nbt.CompoundTag tag) { diff --git a/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java b/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java index c68a8a19e..bd02f244d 100644 --- a/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java +++ b/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java @@ -208,7 +208,7 @@ public class NMSBinding implements INMSBinding { net.minecraft.nbt.CompoundTag tag = (net.minecraft.nbt.CompoundTag) convertToTag(map, 0, 64); var level = ((CraftWorld) pos.getWorld()).getHandle(); var blockPos = new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()); - J.s(() -> merge(level, blockPos, tag)); + Iris.scheduler.region().run(pos, () -> merge(level, blockPos, tag)); } private void merge(ServerLevel level, BlockPos blockPos, net.minecraft.nbt.CompoundTag tag) { diff --git a/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java b/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java index 2d0e08931..1cd08a88c 100644 --- a/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java +++ b/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java @@ -208,7 +208,7 @@ public class NMSBinding implements INMSBinding { net.minecraft.nbt.CompoundTag tag = (net.minecraft.nbt.CompoundTag) convertToTag(map, 0, 64); var level = ((CraftWorld) pos.getWorld()).getHandle(); var blockPos = new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()); - J.s(() -> merge(level, blockPos, tag)); + Iris.scheduler.region().run(pos, () -> merge(level, blockPos, tag)); } private void merge(ServerLevel level, BlockPos blockPos, net.minecraft.nbt.CompoundTag tag) { diff --git a/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java b/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java index ec076e7df..a3685828d 100644 --- a/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java +++ b/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java @@ -217,7 +217,7 @@ public class NMSBinding implements INMSBinding { net.minecraft.nbt.CompoundTag tag = (net.minecraft.nbt.CompoundTag) convertToTag(map, 0, 64); var level = ((CraftWorld) pos.getWorld()).getHandle(); var blockPos = new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()); - J.s(() -> merge(level, blockPos, tag)); + Iris.scheduler.region().run(pos, () -> merge(level, blockPos, tag)); } private void merge(ServerLevel level, BlockPos blockPos, net.minecraft.nbt.CompoundTag tag) { diff --git a/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java b/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java index 7613bf71f..b9b043836 100644 --- a/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java +++ b/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java @@ -214,7 +214,7 @@ public class NMSBinding implements INMSBinding { net.minecraft.nbt.CompoundTag tag = (net.minecraft.nbt.CompoundTag) convertToTag(map, 0, 64); var level = ((CraftWorld) pos.getWorld()).getHandle(); var blockPos = new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()); - J.s(() -> merge(level, blockPos, tag)); + Iris.scheduler.region().run(pos, () -> merge(level, blockPos, tag)); } private void merge(ServerLevel level, BlockPos blockPos, net.minecraft.nbt.CompoundTag tag) { diff --git a/nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/NMSBinding.java b/nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/NMSBinding.java index 41b75953b..1b2ed64b2 100644 --- a/nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/NMSBinding.java +++ b/nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/NMSBinding.java @@ -204,7 +204,7 @@ public class NMSBinding implements INMSBinding { net.minecraft.nbt.CompoundTag tag = (net.minecraft.nbt.CompoundTag) convertToTag(map, 0, 64); var level = ((CraftWorld) pos.getWorld()).getHandle(); var blockPos = new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()); - J.s(() -> merge(level, blockPos, tag)); + Iris.scheduler.region().run(pos, () -> merge(level, blockPos, tag)); } private void merge(ServerLevel level, BlockPos blockPos, net.minecraft.nbt.CompoundTag tag) { diff --git a/nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/NMSBinding.java b/nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/NMSBinding.java index c6ba0e6dd..f7a5b5f9a 100644 --- a/nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/NMSBinding.java +++ b/nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/NMSBinding.java @@ -203,7 +203,7 @@ public class NMSBinding implements INMSBinding { net.minecraft.nbt.CompoundTag tag = (net.minecraft.nbt.CompoundTag) convertToTag(map, 0, 64); var level = ((CraftWorld) pos.getWorld()).getHandle(); var blockPos = new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()); - J.s(() -> merge(level, blockPos, tag)); + Iris.scheduler.region().run(pos, () -> merge(level, blockPos, tag)); } private void merge(ServerLevel level, BlockPos blockPos, net.minecraft.nbt.CompoundTag tag) { diff --git a/nms/v1_21_R4/src/main/java/com/volmit/iris/core/nms/v1_21_R4/NMSBinding.java b/nms/v1_21_R4/src/main/java/com/volmit/iris/core/nms/v1_21_R4/NMSBinding.java index 3b11e017b..465a78f8c 100644 --- a/nms/v1_21_R4/src/main/java/com/volmit/iris/core/nms/v1_21_R4/NMSBinding.java +++ b/nms/v1_21_R4/src/main/java/com/volmit/iris/core/nms/v1_21_R4/NMSBinding.java @@ -201,7 +201,7 @@ public class NMSBinding implements INMSBinding { net.minecraft.nbt.CompoundTag tag = (net.minecraft.nbt.CompoundTag) convertToTag(map, 0, 64); var level = ((CraftWorld) pos.getWorld()).getHandle(); var blockPos = new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()); - J.s(() -> merge(level, blockPos, tag)); + Iris.scheduler.region().run(pos, () -> merge(level, blockPos, tag)); } private void merge(ServerLevel level, BlockPos blockPos, net.minecraft.nbt.CompoundTag tag) {