From 4796fe98cb0b4793eb28038fb2a843b64553728a Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Wed, 5 Feb 2025 15:20:34 +0100 Subject: [PATCH] fix modern tile states not applying properly --- .../main/java/com/volmit/iris/engine/object/TileData.java | 6 +++++- .../java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java | 2 +- .../java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java | 2 +- .../java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java | 2 +- .../java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java | 2 +- .../java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java | 2 +- .../java/com/volmit/iris/core/nms/v1_21_R2/NMSBinding.java | 2 +- .../java/com/volmit/iris/core/nms/v1_21_R3/NMSBinding.java | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/engine/object/TileData.java b/core/src/main/java/com/volmit/iris/engine/object/TileData.java index 094c48b00..9c0809545 100644 --- a/core/src/main/java/com/volmit/iris/engine/object/TileData.java +++ b/core/src/main/java/com/volmit/iris/engine/object/TileData.java @@ -35,7 +35,6 @@ import java.io.IOException; @SuppressWarnings("ALL") @Getter -@ToString @EqualsAndHashCode @AllArgsConstructor @NoArgsConstructor(access = AccessLevel.PROTECTED) @@ -137,4 +136,9 @@ public class TileData implements Cloneable { clone.properties = properties.copy(); //TODO make a deep copy return clone; } + + @Override + public String toString() { + return material.getKey() + gson.toJson(properties); + } } 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 d737ec6aa..a9ad26383 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 @@ -214,7 +214,7 @@ public class NMSBinding implements INMSBinding { .newBlockEntity(blockPos, state); } var accessor = new BlockDataAccessor(blockEntity, blockPos); - accessor.setData(tag.merge(accessor.getData())); + accessor.setData(accessor.getData().merge(tag)); } private Tag convertToTag(Object object, int depth, int maxDepth) { 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 c14400975..804f35074 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 @@ -212,7 +212,7 @@ public class NMSBinding implements INMSBinding { .newBlockEntity(blockPos, state); } var accessor = new BlockDataAccessor(blockEntity, blockPos); - accessor.setData(tag.merge(accessor.getData())); + accessor.setData(accessor.getData().merge(tag)); } private Tag convertToTag(Object object, int depth, int maxDepth) { 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 c69d2a66e..59a124514 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 @@ -212,7 +212,7 @@ public class NMSBinding implements INMSBinding { .newBlockEntity(blockPos, state); } var accessor = new BlockDataAccessor(blockEntity, blockPos); - accessor.setData(tag.merge(accessor.getData())); + accessor.setData(accessor.getData().merge(tag)); } private Tag convertToTag(Object object, int depth, int maxDepth) { 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 9933dbbb0..ea7518d6a 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 @@ -216,7 +216,7 @@ public class NMSBinding implements INMSBinding { .newBlockEntity(blockPos, state); } var accessor = new BlockDataAccessor(blockEntity, blockPos); - accessor.setData(tag.merge(accessor.getData())); + accessor.setData(accessor.getData().merge(tag)); } private Tag convertToTag(Object object, int depth, int maxDepth) { 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 7f5662d1d..be0a12f5b 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 @@ -215,7 +215,7 @@ public class NMSBinding implements INMSBinding { .newBlockEntity(blockPos, state); } var accessor = new BlockDataAccessor(blockEntity, blockPos); - accessor.setData(tag.merge(accessor.getData())); + accessor.setData(accessor.getData().merge(tag)); } private Tag convertToTag(Object object, int depth, int maxDepth) { 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 d5b2e82b6..0522d35f9 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 @@ -202,7 +202,7 @@ public class NMSBinding implements INMSBinding { .newBlockEntity(blockPos, state); } var accessor = new BlockDataAccessor(blockEntity, blockPos); - accessor.setData(tag.merge(accessor.getData())); + accessor.setData(accessor.getData().merge(tag)); } private Tag convertToTag(Object object, int depth, int maxDepth) { 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 bd332251c..7a5ac4f9d 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 @@ -201,7 +201,7 @@ public class NMSBinding implements INMSBinding { .newBlockEntity(blockPos, state); } var accessor = new BlockDataAccessor(blockEntity, blockPos); - accessor.setData(tag.merge(accessor.getData())); + accessor.setData(accessor.getData().merge(tag)); } private Tag convertToTag(Object object, int depth, int maxDepth) {