diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisCompat.java b/core/src/main/java/com/volmit/iris/engine/object/IrisCompat.java index 7f2d8ed73..8d2b32fb6 100644 --- a/core/src/main/java/com/volmit/iris/engine/object/IrisCompat.java +++ b/core/src/main/java/com/volmit/iris/engine/object/IrisCompat.java @@ -122,6 +122,10 @@ public class IrisCompat { private static KList getDefaultBlockCompatabilityFilters() { KList filters = new KList<>(); + filters.add(new IrisCompatabilityBlockFilter("CHAIN", "IRON_CHAIN")); + filters.add(new IrisCompatabilityBlockFilter("GRASS", "SHORT_GRASS")); + filters.add(new IrisCompatabilityBlockFilter("SHORT_GRASS", "GRASS")); + // Below 1.16 filters.add(new IrisCompatabilityBlockFilter("WEEPING_VINES", "NETHER_FENCE")); filters.add(new IrisCompatabilityBlockFilter("WEEPING_VINES_PLANT", "NETHER_FENCE")); @@ -160,7 +164,7 @@ public class IrisCompat { filters.add(new IrisCompatabilityBlockFilter("CRACKED_NETHER_BRICKS", "NETHER_BRICKS")); filters.add(new IrisCompatabilityBlockFilter("CHISELED_NETHER_BRICKS", "NETHER_BRICKS")); filters.add(new IrisCompatabilityBlockFilter("NETHER_FENCE", "LEGACY_NETHER_FENCE")); - filters.add(new IrisCompatabilityBlockFilter("CHAIN", "IRON_BARS")); + filters.add(new IrisCompatabilityBlockFilter("IRON_CHAIN", "IRON_BARS")); filters.add(new IrisCompatabilityBlockFilter("NETHERITE_BLOCK", "QUARTZ_BLOCK")); filters.add(new IrisCompatabilityBlockFilter("BLACKSTONE", "COBBLESTONE")); filters.add(new IrisCompatabilityBlockFilter("BASALT", "STONE")); @@ -254,7 +258,6 @@ public class IrisCompat { filters.add(new IrisCompatabilityBlockFilter("BAMBOO", "BIRCH_FENCE")); filters.add(new IrisCompatabilityBlockFilter("BAMBOO_SAPLING", "BIRCH_SAPLING")); filters.add(new IrisCompatabilityBlockFilter("POTTED_BAMBOO", "POTTED_BIRCH_SAPLING")); - filters.add(new IrisCompatabilityBlockFilter("GRASS", "SHORT_GRASS")); return filters; } diff --git a/core/src/main/java/com/volmit/iris/util/data/IrisCustomData.java b/core/src/main/java/com/volmit/iris/util/data/IrisCustomData.java index 20076cf84..da60f704c 100644 --- a/core/src/main/java/com/volmit/iris/util/data/IrisCustomData.java +++ b/core/src/main/java/com/volmit/iris/util/data/IrisCustomData.java @@ -24,8 +24,7 @@ public interface IrisCustomData extends BlockData { case "merge" -> of(base.merge((BlockData) args[0]), custom); case "clone" -> of(base.clone(), custom); case "hashCode" -> Objects.hash(base, custom); - case "copyTo" -> throw new UnsupportedOperationException("Cannot copy from custom block data"); - case "matches" -> { + case "matches" -> { if (!(args[0] instanceof IrisCustomData store)) yield false; yield base.matches(store.getBase()) && custom.equals(store.getCustom());