mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-01 23:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix modern tile states not applying properly

Browse Source
This commit is contained in:
Julian Krings 2025-02-05 15:20:34 +01:00
parent ece905ec6e
commit 4796fe98cb
No known key found for this signature in database
GPG Key ID: 208C6E08C3B718D2
8 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/volmit/iris/engine/object/TileData.java
View File

@ -35,7 +35,6 @@ import java.io.IOException;
@SuppressWarnings("ALL") @SuppressWarnings("ALL")
@Getter @Getter
@ToString
@EqualsAndHashCode @EqualsAndHashCode
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor(access = AccessLevel.PROTECTED)
@ -137,4 +136,9 @@ public class TileData implements Cloneable {
clone.properties = properties.copy(); //TODO make a deep copy clone.properties = properties.copy(); //TODO make a deep copy
return clone; return clone;
} }
@Override
public String toString() {
return material.getKey() + gson.toJson(properties);
}
} }

2
nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java
View File

@ -214,7 +214,7 @@ public class NMSBinding implements INMSBinding {
.newBlockEntity(blockPos, state); .newBlockEntity(blockPos, state);
} }
var accessor = new BlockDataAccessor(blockEntity, blockPos); 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) { private Tag convertToTag(Object object, int depth, int maxDepth) {

2
nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java
View File

@ -212,7 +212,7 @@ public class NMSBinding implements INMSBinding {
.newBlockEntity(blockPos, state); .newBlockEntity(blockPos, state);
} }
var accessor = new BlockDataAccessor(blockEntity, blockPos); 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) { private Tag convertToTag(Object object, int depth, int maxDepth) {

2
nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java
View File

@ -212,7 +212,7 @@ public class NMSBinding implements INMSBinding {
.newBlockEntity(blockPos, state); .newBlockEntity(blockPos, state);
} }
var accessor = new BlockDataAccessor(blockEntity, blockPos); 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) { private Tag convertToTag(Object object, int depth, int maxDepth) {

2
nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java
View File

@ -216,7 +216,7 @@ public class NMSBinding implements INMSBinding {
.newBlockEntity(blockPos, state); .newBlockEntity(blockPos, state);
} }
var accessor = new BlockDataAccessor(blockEntity, blockPos); 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) { private Tag convertToTag(Object object, int depth, int maxDepth) {

2
nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java
View File

@ -215,7 +215,7 @@ public class NMSBinding implements INMSBinding {
.newBlockEntity(blockPos, state); .newBlockEntity(blockPos, state);
} }
var accessor = new BlockDataAccessor(blockEntity, blockPos); 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) { private Tag convertToTag(Object object, int depth, int maxDepth) {

2
nms/v1_21_R2/src/main/java/com/volmit/iris/core/nms/v1_21_R2/NMSBinding.java
View File

@ -202,7 +202,7 @@ public class NMSBinding implements INMSBinding {
.newBlockEntity(blockPos, state); .newBlockEntity(blockPos, state);
} }
var accessor = new BlockDataAccessor(blockEntity, blockPos); 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) { private Tag convertToTag(Object object, int depth, int maxDepth) {

2
nms/v1_21_R3/src/main/java/com/volmit/iris/core/nms/v1_21_R3/NMSBinding.java
View File

@ -201,7 +201,7 @@ public class NMSBinding implements INMSBinding {
.newBlockEntity(blockPos, state); .newBlockEntity(blockPos, state);
} }
var accessor = new BlockDataAccessor(blockEntity, blockPos); 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) { private Tag convertToTag(Object object, int depth, int maxDepth) {