More more patches
This commit is contained in:
Nassim Jahnke
@@ -403,9 +403,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ 3097,
|
||||
+ 3108,
|
||||
+ 3201,
|
||||
+ 3203,
|
||||
+ 3204,
|
||||
+ 3209,
|
||||
+ 3214
|
||||
+ // All up to 1.19.3-rc1
|
||||
+ 3214,
|
||||
+ 3319,
|
||||
+ 3322
|
||||
+ // All up to 1.19.4-pre1
|
||||
+ };
|
||||
+ Arrays.sort(converterVersions);
|
||||
+
|
||||
@@ -1013,6 +1017,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ public static final int V1_19_3_PRE2 = 3212;
|
||||
+ public static final int V1_19_3_PRE3 = 3213;
|
||||
+ public static final int V1_19_3_RC1 = 3215;
|
||||
+ public static final int V1_19_3 = 3218;
|
||||
+ public static final int V23W03A = 3320;
|
||||
+ public static final int V23W04A = 3321;
|
||||
+ public static final int V23W05A = 3323;
|
||||
+ public static final int V23W06A = 3326;
|
||||
+ public static final int V23W07A = 3329;
|
||||
+ public static final int V1_19_4_PRE1 = 3330;
|
||||
+
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterAbstractAdvancementsRename.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/advancements/ConverterAbstractAdvancementsRename.java
|
||||
@@ -6818,10 +6829,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ V3108.register();
|
||||
+ V3201.register();
|
||||
+ // V3202 registers a simple tile entity
|
||||
+ // V3203 registers a simple entity
|
||||
+ // V3204 registers a simple tile entity
|
||||
+ V3203.register();
|
||||
+ V3204.register();
|
||||
+ V3209.register();
|
||||
+ V3214.register();
|
||||
+ V3319.register();
|
||||
+ V3322.register();
|
||||
+ V3325.register();
|
||||
+ V3326.register();
|
||||
+ V3327.register();
|
||||
+ V3328.register();
|
||||
+ }
|
||||
+
|
||||
+ private MCTypeRegistry() {}
|
||||
@@ -17739,6 +17756,50 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ });
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3203.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3203.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3203.java
|
||||
@@ -0,0 +0,0 @@
|
||||
+package ca.spottedleaf.dataconverter.minecraft.versions;
|
||||
+
|
||||
+import ca.spottedleaf.dataconverter.minecraft.MCVersions;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItemLists;
|
||||
+
|
||||
+public final class V3203 {
|
||||
+
|
||||
+ private static final int VERSION = MCVersions.V1_19_2 + 83;
|
||||
+
|
||||
+ private static void registerMob(final String id) {
|
||||
+ MCTypeRegistry.ENTITY.addWalker(VERSION, id, new DataWalkerItemLists("ArmorItems", "HandItems"));
|
||||
+ }
|
||||
+
|
||||
+ public static void register() {
|
||||
+ registerMob("minecraft:camel");
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3204.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3204.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3204.java
|
||||
@@ -0,0 +0,0 @@
|
||||
+package ca.spottedleaf.dataconverter.minecraft.versions;
|
||||
+
|
||||
+import ca.spottedleaf.dataconverter.minecraft.MCVersions;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItemLists;
|
||||
+
|
||||
+public final class V3204 {
|
||||
+
|
||||
+ private static final int VERSION = MCVersions.V1_19_2 + 84;
|
||||
+
|
||||
+ public static void register() {
|
||||
+ MCTypeRegistry.TILE_ENTITY.addWalker(VERSION, "minecraft:chiseled_bookshelf", new DataWalkerItemLists("Items"));
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3209.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3209.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
@@ -17795,6 +17856,204 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ });
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3319.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3319.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3319.java
|
||||
@@ -0,0 +0,0 @@
|
||||
+package ca.spottedleaf.dataconverter.minecraft.versions;
|
||||
+
|
||||
+import ca.spottedleaf.dataconverter.converters.DataConverter;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.MCVersions;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
|
||||
+import ca.spottedleaf.dataconverter.types.MapType;
|
||||
+
|
||||
+public final class V3319 {
|
||||
+
|
||||
+ private static final int VERSION = MCVersions.V1_19_3 + 101;
|
||||
+
|
||||
+ public static void register() {
|
||||
+ MCTypeRegistry.OPTIONS.addStructureConverter(new DataConverter<>(VERSION) {
|
||||
+ @Override
|
||||
+ public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
|
||||
+ data.setBoolean("onboardAccessibility", false);
|
||||
+ return null;
|
||||
+ }
|
||||
+ });
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3322.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3322.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3322.java
|
||||
@@ -0,0 +0,0 @@
|
||||
+package ca.spottedleaf.dataconverter.minecraft.versions;
|
||||
+
|
||||
+import ca.spottedleaf.dataconverter.converters.DataConverter;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.MCVersions;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
|
||||
+import ca.spottedleaf.dataconverter.types.MapType;
|
||||
+import java.util.HashSet;
|
||||
+import java.util.Set;
|
||||
+
|
||||
+public final class V3322 {
|
||||
+
|
||||
+ private static final int VERSION = MCVersions.V23W04A + 1;
|
||||
+
|
||||
+ private static final Set<String> EFFECT_ITEM_TYPES = new HashSet<>(
|
||||
+ Set.of(
|
||||
+ "minecraft:potion",
|
||||
+ "minecraft:splash_potion",
|
||||
+ "minecraft:lingering_potion",
|
||||
+ "minecraft:tipped_arrow"
|
||||
+ )
|
||||
+ );
|
||||
+
|
||||
+ private static void updateEffectList(final MapType<String> root, final String path) {
|
||||
+ if (root == null) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ final MapType<String> data = root.getMap(path);
|
||||
+
|
||||
+ if (data == null) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ final MapType<String> factorData = data.getMap("FactorCalculationData");
|
||||
+ if (factorData == null) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ final int timestamp = factorData.getInt("effect_changed_timestamp", -1);
|
||||
+ factorData.remove("effect_changed_timestamp");
|
||||
+
|
||||
+ final int duration = data.getInt("Duration", -1);
|
||||
+
|
||||
+ final int ticksActive = timestamp - duration;
|
||||
+ factorData.setInt("ticks_active", ticksActive);
|
||||
+ }
|
||||
+
|
||||
+ public static void register() {
|
||||
+ final DataConverter<MapType<String>, MapType<String>> entityEffectFix = new DataConverter<>(VERSION) {
|
||||
+ @Override
|
||||
+ public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
|
||||
+ updateEffectList(data, "Effects");
|
||||
+ updateEffectList(data, "ActiveEffects");
|
||||
+ updateEffectList(data, "CustomPotionEffects");
|
||||
+ return null;
|
||||
+ }
|
||||
+ };
|
||||
+
|
||||
+ MCTypeRegistry.PLAYER.addStructureConverter(entityEffectFix);
|
||||
+ MCTypeRegistry.ENTITY.addStructureConverter(entityEffectFix);
|
||||
+
|
||||
+ MCTypeRegistry.ITEM_STACK.addStructureConverter(new DataConverter<>(VERSION) {
|
||||
+ @Override
|
||||
+ public MapType<String> convert(final MapType<String> data, final long sourceVersion, final long toVersion) {
|
||||
+ final String id = data.getString("id");
|
||||
+ if (!EFFECT_ITEM_TYPES.contains(id)) {
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ updateEffectList(data.getMap("tag"), "CustomPotionEffects");
|
||||
+
|
||||
+ return null;
|
||||
+ }
|
||||
+ });
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3325.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3325.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3325.java
|
||||
@@ -0,0 +0,0 @@
|
||||
+package ca.spottedleaf.dataconverter.minecraft.versions;
|
||||
+
|
||||
+import ca.spottedleaf.dataconverter.minecraft.MCVersions;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.walkers.generic.DataWalkerTypePaths;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItems;
|
||||
+
|
||||
+public final class V3325 {
|
||||
+
|
||||
+ private static final int VERSION = MCVersions.V23W05A + 2;
|
||||
+
|
||||
+ public static void register() {
|
||||
+ MCTypeRegistry.ENTITY.addWalker(VERSION, "minecraft:item_display", new DataWalkerItems("item"));
|
||||
+ MCTypeRegistry.ENTITY.addWalker(VERSION, "minecraft:block_display", new DataWalkerTypePaths<>(MCTypeRegistry.BLOCK_STATE, "block_state"));
|
||||
+ // text_display is a simple entity
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3326.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3326.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3326.java
|
||||
@@ -0,0 +0,0 @@
|
||||
+package ca.spottedleaf.dataconverter.minecraft.versions;
|
||||
+
|
||||
+import ca.spottedleaf.dataconverter.minecraft.MCVersions;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItemLists;
|
||||
+
|
||||
+public final class V3326 {
|
||||
+
|
||||
+ private static final int VERSION = MCVersions.V23W06A;
|
||||
+
|
||||
+ private static void registerMob(final String id) {
|
||||
+ MCTypeRegistry.ENTITY.addWalker(VERSION, id, new DataWalkerItemLists("ArmorItems", "HandItems"));
|
||||
+ }
|
||||
+
|
||||
+ public static void register() {
|
||||
+ registerMob("minecraft:sniffer");
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3327.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3327.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3327.java
|
||||
@@ -0,0 +0,0 @@
|
||||
+package ca.spottedleaf.dataconverter.minecraft.versions;
|
||||
+
|
||||
+import ca.spottedleaf.dataconverter.minecraft.MCVersions;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItemLists;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.walkers.itemstack.DataWalkerItems;
|
||||
+
|
||||
+public final class V3327 {
|
||||
+
|
||||
+ private static final int VERSION = MCVersions.V23W06A + 1;
|
||||
+
|
||||
+ public static void register() {
|
||||
+ MCTypeRegistry.TILE_ENTITY.addWalker(VERSION, "minecraft:decorated_pot", new DataWalkerItemLists("shards"));
|
||||
+ MCTypeRegistry.TILE_ENTITY.addWalker(VERSION, "minecraft:suspicious_sand", new DataWalkerItems("item"));
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3328.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3328.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3328.java
|
||||
@@ -0,0 +0,0 @@
|
||||
+package ca.spottedleaf.dataconverter.minecraft.versions;
|
||||
+
|
||||
+import ca.spottedleaf.dataconverter.minecraft.MCVersions;
|
||||
+import ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry;
|
||||
+
|
||||
+public final class V3328 {
|
||||
+
|
||||
+ private static final int VERSION = MCVersions.V23W06A + 1;
|
||||
+
|
||||
+ public static void register() {
|
||||
+ // registers simple entity "minecraft:interaction"
|
||||
+ }
|
||||
+
|
||||
+}
|
||||
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V501.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V501.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
@@ -18308,6 +18567,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ ITEM_ID_TO_TILE_ENTITY_ID.put("minecraft:crimson_hanging_sign", "minecraft:sign");
|
||||
+ ITEM_ID_TO_TILE_ENTITY_ID.put("minecraft:warped_hanging_sign", "minecraft:sign");
|
||||
+ ITEM_ID_TO_TILE_ENTITY_ID.put("minecraft:piglin_head", "minecraft:skull");
|
||||
+ ITEM_ID_TO_TILE_ENTITY_ID.put("minecraft:suspicious_sand", "minecraft:suspicious_sand");
|
||||
+ ITEM_ID_TO_TILE_ENTITY_ID.put("minecraft:decorated_pot", "minecraft:decorated_pot");
|
||||
+ ITEM_ID_TO_TILE_ENTITY_ID.put("minecraft:cherry_sign", "minecraft:sign");
|
||||
+ ITEM_ID_TO_TILE_ENTITY_ID.put("minecraft:cherry_hanging_sign", "minecraft:sign");
|
||||
+ }
|
||||
+
|
||||
+ // This class is responsible for also integrity checking the item id to tile id map here, we just use the item registry to figure it out
|
||||
|
||||
Reference in New Issue
Block a user